diff --git a/api/builder.go b/api/builder.go index 6ae5eec..a4c6041 100644 --- a/api/builder.go +++ b/api/builder.go @@ -4,6 +4,7 @@ import ( "bytes" "context" "encoding/json" + "errors" "fmt" "io/ioutil" "mergemock/types" @@ -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 { @@ -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 } @@ -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 diff --git a/consensus.go b/consensus.go index a3cff2d..2236971 100644 --- a/consensus.go +++ b/consensus.go @@ -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 } @@ -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) diff --git a/relay.go b/relay.go index dfdc034..71089c2 100644 --- a/relay.go +++ b/relay.go @@ -8,6 +8,7 @@ import ( "mergemock/rpc" "mergemock/types" "net/http" + "strconv" "time" "github.com/ethereum/go-ethereum/common" @@ -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") @@ -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() @@ -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) { @@ -195,7 +180,7 @@ 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) @@ -203,7 +188,9 @@ func (r *RelayBackend) handleRegisterValidator(w http.ResponseWriter, req *http. } // 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) { @@ -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") @@ -281,7 +283,7 @@ 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) @@ -289,7 +291,6 @@ func (r *RelayBackend) handleGetPayload(w http.ResponseWriter, req *http.Request } 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") @@ -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 -// } diff --git a/relay_test.go b/relay_test.go index 0d66f9b..b59e073 100644 --- a/relay_test.go +++ b/relay_test.go @@ -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") diff --git a/types/builder_encoding.go b/types/builder_encoding.go index 8f0269f..92d2e89 100644 --- a/types/builder_encoding.go +++ b/types/builder_encoding.go @@ -1,5 +1,5 @@ // Code generated by fastssz. DO NOT EDIT. -// Hash: 39d34b80b8b0276cf8d62c9f2890ad283a3f3d52e7bac7bf7dfd410c3ebf1f55 +// Hash: 98cb3d501946edd5e257aafa3caee0b3a4a8aba903858997024e07c95f829728 package types import ( @@ -1075,6 +1075,7 @@ func (e *ExecutionPayloadHeader) MarshalSSZ() ([]byte, error) { // MarshalSSZTo ssz marshals the ExecutionPayloadHeader object to a target array func (e *ExecutionPayloadHeader) MarshalSSZTo(buf []byte) (dst []byte, err error) { dst = buf + offset := int(536) // Field (0) 'ParentHash' dst = append(dst, e.ParentHash[:]...) @@ -1106,8 +1107,9 @@ func (e *ExecutionPayloadHeader) MarshalSSZTo(buf []byte) (dst []byte, err error // Field (9) 'Timestamp' dst = ssz.MarshalUint64(dst, e.Timestamp) - // Field (10) 'ExtraData' - dst = append(dst, e.ExtraData[:]...) + // Offset (10) 'ExtraData' + dst = ssz.WriteOffset(dst, offset) + offset += len(e.ExtraData) // Field (11) 'BaseFeePerGas' dst = append(dst, e.BaseFeePerGas[:]...) @@ -1118,6 +1120,13 @@ func (e *ExecutionPayloadHeader) MarshalSSZTo(buf []byte) (dst []byte, err error // Field (13) 'TransactionsRoot' dst = append(dst, e.TransactionsRoot[:]...) + // Field (10) 'ExtraData' + if len(e.ExtraData) > 2048 { + err = ssz.ErrBytesLength + return + } + dst = append(dst, e.ExtraData...) + return } @@ -1125,10 +1134,13 @@ func (e *ExecutionPayloadHeader) MarshalSSZTo(buf []byte) (dst []byte, err error func (e *ExecutionPayloadHeader) UnmarshalSSZ(buf []byte) error { var err error size := uint64(len(buf)) - if size != 564 { + if size < 536 { return ssz.ErrSize } + tail := buf + var o10 uint64 + // Field (0) 'ParentHash' copy(e.ParentHash[:], buf[0:32]) @@ -1159,24 +1171,45 @@ func (e *ExecutionPayloadHeader) UnmarshalSSZ(buf []byte) error { // Field (9) 'Timestamp' e.Timestamp = ssz.UnmarshallUint64(buf[428:436]) - // Field (10) 'ExtraData' - copy(e.ExtraData[:], buf[436:468]) + // Offset (10) 'ExtraData' + if o10 = ssz.ReadOffset(buf[436:440]); o10 > size { + return ssz.ErrOffset + } + + if o10 < 536 { + return ssz.ErrInvalidVariableOffset + } // Field (11) 'BaseFeePerGas' - copy(e.BaseFeePerGas[:], buf[468:500]) + copy(e.BaseFeePerGas[:], buf[440:472]) // Field (12) 'BlockHash' - copy(e.BlockHash[:], buf[500:532]) + copy(e.BlockHash[:], buf[472:504]) // Field (13) 'TransactionsRoot' - copy(e.TransactionsRoot[:], buf[532:564]) + copy(e.TransactionsRoot[:], buf[504:536]) + // Field (10) 'ExtraData' + { + buf = tail[o10:] + if len(buf) > 2048 { + return ssz.ErrBytesLength + } + if cap(e.ExtraData) == 0 { + e.ExtraData = make([]byte, 0, len(buf)) + } + e.ExtraData = append(e.ExtraData, buf...) + } return err } // SizeSSZ returns the ssz encoded size in bytes for the ExecutionPayloadHeader object func (e *ExecutionPayloadHeader) SizeSSZ() (size int) { - size = 564 + size = 536 + + // Field (10) 'ExtraData' + size += len(e.ExtraData) + return } @@ -1220,7 +1253,16 @@ func (e *ExecutionPayloadHeader) HashTreeRootWith(hh *ssz.Hasher) (err error) { hh.PutUint64(e.Timestamp) // Field (10) 'ExtraData' - hh.PutBytes(e.ExtraData[:]) + { + elemIndx := hh.Index() + byteLen := uint64(len(e.ExtraData)) + if byteLen > 2048 { + err = ssz.ErrIncorrectListSize + return + } + hh.PutBytes(e.ExtraData) + hh.MerkleizeWithMixin(elemIndx, byteLen, (2048+31)/32) + } // Field (11) 'BaseFeePerGas' hh.PutBytes(e.BaseFeePerGas[:]) @@ -1243,7 +1285,7 @@ func (b *BlindedBeaconBlockBody) MarshalSSZ() ([]byte, error) { // MarshalSSZTo ssz marshals the BlindedBeaconBlockBody object to a target array func (b *BlindedBeaconBlockBody) MarshalSSZTo(buf []byte) (dst []byte, err error) { dst = buf - offset := int(944) + offset := int(384) // Field (0) 'RandaoReveal' dst = append(dst, b.RandaoReveal[:]...) @@ -1293,13 +1335,12 @@ func (b *BlindedBeaconBlockBody) MarshalSSZTo(buf []byte) (dst []byte, err error return } - // Field (9) 'ExecutionPayloadHeader' + // Offset (9) 'ExecutionPayloadHeader' + dst = ssz.WriteOffset(dst, offset) if b.ExecutionPayloadHeader == nil { b.ExecutionPayloadHeader = new(ExecutionPayloadHeader) } - if dst, err = b.ExecutionPayloadHeader.MarshalSSZTo(dst); err != nil { - return - } + offset += b.ExecutionPayloadHeader.SizeSSZ() // Field (3) 'ProposerSlashings' if len(b.ProposerSlashings) > 16 { @@ -1370,6 +1411,11 @@ func (b *BlindedBeaconBlockBody) MarshalSSZTo(buf []byte) (dst []byte, err error } } + // Field (9) 'ExecutionPayloadHeader' + if dst, err = b.ExecutionPayloadHeader.MarshalSSZTo(dst); err != nil { + return + } + return } @@ -1377,12 +1423,12 @@ func (b *BlindedBeaconBlockBody) MarshalSSZTo(buf []byte) (dst []byte, err error func (b *BlindedBeaconBlockBody) UnmarshalSSZ(buf []byte) error { var err error size := uint64(len(buf)) - if size < 944 { + if size < 384 { return ssz.ErrSize } tail := buf - var o3, o4, o5, o6, o7 uint64 + var o3, o4, o5, o6, o7, o9 uint64 // Field (0) 'RandaoReveal' copy(b.RandaoReveal[:], buf[0:96]) @@ -1403,7 +1449,7 @@ func (b *BlindedBeaconBlockBody) UnmarshalSSZ(buf []byte) error { return ssz.ErrOffset } - if o3 < 944 { + if o3 < 384 { return ssz.ErrInvalidVariableOffset } @@ -1435,12 +1481,9 @@ func (b *BlindedBeaconBlockBody) UnmarshalSSZ(buf []byte) error { return err } - // Field (9) 'ExecutionPayloadHeader' - if b.ExecutionPayloadHeader == nil { - b.ExecutionPayloadHeader = new(ExecutionPayloadHeader) - } - if err = b.ExecutionPayloadHeader.UnmarshalSSZ(buf[380:944]); err != nil { - return err + // Offset (9) 'ExecutionPayloadHeader' + if o9 = ssz.ReadOffset(buf[380:384]); o9 > size || o7 > o9 { + return ssz.ErrOffset } // Field (3) 'ProposerSlashings' @@ -1525,7 +1568,7 @@ func (b *BlindedBeaconBlockBody) UnmarshalSSZ(buf []byte) error { // Field (7) 'VoluntaryExits' { - buf = tail[o7:] + buf = tail[o7:o9] num, err := ssz.DivideInt2(len(buf), 16, 16) if err != nil { return err @@ -1540,12 +1583,23 @@ func (b *BlindedBeaconBlockBody) UnmarshalSSZ(buf []byte) error { } } } + + // Field (9) 'ExecutionPayloadHeader' + { + buf = tail[o9:] + if b.ExecutionPayloadHeader == nil { + b.ExecutionPayloadHeader = new(ExecutionPayloadHeader) + } + if err = b.ExecutionPayloadHeader.UnmarshalSSZ(buf); err != nil { + return err + } + } return err } // SizeSSZ returns the ssz encoded size in bytes for the BlindedBeaconBlockBody object func (b *BlindedBeaconBlockBody) SizeSSZ() (size int) { - size = 944 + size = 384 // Field (3) 'ProposerSlashings' size += len(b.ProposerSlashings) * 416 @@ -1568,6 +1622,12 @@ func (b *BlindedBeaconBlockBody) SizeSSZ() (size int) { // Field (7) 'VoluntaryExits' size += len(b.VoluntaryExits) * 16 + // Field (9) 'ExecutionPayloadHeader' + if b.ExecutionPayloadHeader == nil { + b.ExecutionPayloadHeader = new(ExecutionPayloadHeader) + } + size += b.ExecutionPayloadHeader.SizeSSZ() + return } @@ -1896,14 +1956,14 @@ func (b *BuilderBid) MarshalSSZ() ([]byte, error) { // MarshalSSZTo ssz marshals the BuilderBid object to a target array func (b *BuilderBid) MarshalSSZTo(buf []byte) (dst []byte, err error) { dst = buf + offset := int(84) - // Field (0) 'Header' + // Offset (0) 'Header' + dst = ssz.WriteOffset(dst, offset) if b.Header == nil { b.Header = new(ExecutionPayloadHeader) } - if dst, err = b.Header.MarshalSSZTo(dst); err != nil { - return - } + offset += b.Header.SizeSSZ() // Field (1) 'Value' dst = append(dst, b.Value[:]...) @@ -1911,6 +1971,11 @@ func (b *BuilderBid) MarshalSSZTo(buf []byte) (dst []byte, err error) { // Field (2) 'Pubkey' dst = append(dst, b.Pubkey[:]...) + // Field (0) 'Header' + if dst, err = b.Header.MarshalSSZTo(dst); err != nil { + return + } + return } @@ -1918,30 +1983,51 @@ func (b *BuilderBid) MarshalSSZTo(buf []byte) (dst []byte, err error) { func (b *BuilderBid) UnmarshalSSZ(buf []byte) error { var err error size := uint64(len(buf)) - if size != 644 { + if size < 84 { return ssz.ErrSize } - // Field (0) 'Header' - if b.Header == nil { - b.Header = new(ExecutionPayloadHeader) + tail := buf + var o0 uint64 + + // Offset (0) 'Header' + if o0 = ssz.ReadOffset(buf[0:4]); o0 > size { + return ssz.ErrOffset } - if err = b.Header.UnmarshalSSZ(buf[0:564]); err != nil { - return err + + if o0 < 84 { + return ssz.ErrInvalidVariableOffset } // Field (1) 'Value' - copy(b.Value[:], buf[564:596]) + copy(b.Value[:], buf[4:36]) // Field (2) 'Pubkey' - copy(b.Pubkey[:], buf[596:644]) + copy(b.Pubkey[:], buf[36:84]) + // Field (0) 'Header' + { + buf = tail[o0:] + if b.Header == nil { + b.Header = new(ExecutionPayloadHeader) + } + if err = b.Header.UnmarshalSSZ(buf); err != nil { + return err + } + } return err } // SizeSSZ returns the ssz encoded size in bytes for the BuilderBid object func (b *BuilderBid) SizeSSZ() (size int) { - size = 644 + size = 84 + + // Field (0) 'Header' + if b.Header == nil { + b.Header = new(ExecutionPayloadHeader) + } + size += b.Header.SizeSSZ() + return } @@ -1977,18 +2063,23 @@ func (s *SignedBuilderBid) MarshalSSZ() ([]byte, error) { // MarshalSSZTo ssz marshals the SignedBuilderBid object to a target array func (s *SignedBuilderBid) MarshalSSZTo(buf []byte) (dst []byte, err error) { dst = buf + offset := int(100) - // Field (0) 'Message' + // Offset (0) 'Message' + dst = ssz.WriteOffset(dst, offset) if s.Message == nil { s.Message = new(BuilderBid) } - if dst, err = s.Message.MarshalSSZTo(dst); err != nil { - return - } + offset += s.Message.SizeSSZ() // Field (1) 'Signature' dst = append(dst, s.Signature[:]...) + // Field (0) 'Message' + if dst, err = s.Message.MarshalSSZTo(dst); err != nil { + return + } + return } @@ -1996,27 +2087,48 @@ func (s *SignedBuilderBid) MarshalSSZTo(buf []byte) (dst []byte, err error) { func (s *SignedBuilderBid) UnmarshalSSZ(buf []byte) error { var err error size := uint64(len(buf)) - if size != 740 { + if size < 100 { return ssz.ErrSize } - // Field (0) 'Message' - if s.Message == nil { - s.Message = new(BuilderBid) + tail := buf + var o0 uint64 + + // Offset (0) 'Message' + if o0 = ssz.ReadOffset(buf[0:4]); o0 > size { + return ssz.ErrOffset } - if err = s.Message.UnmarshalSSZ(buf[0:644]); err != nil { - return err + + if o0 < 100 { + return ssz.ErrInvalidVariableOffset } // Field (1) 'Signature' - copy(s.Signature[:], buf[644:740]) + copy(s.Signature[:], buf[4:100]) + // Field (0) 'Message' + { + buf = tail[o0:] + if s.Message == nil { + s.Message = new(BuilderBid) + } + if err = s.Message.UnmarshalSSZ(buf); err != nil { + return err + } + } return err } // SizeSSZ returns the ssz encoded size in bytes for the SignedBuilderBid object func (s *SignedBuilderBid) SizeSSZ() (size int) { - size = 740 + size = 100 + + // Field (0) 'Message' + if s.Message == nil { + s.Message = new(BuilderBid) + } + size += s.Message.SizeSSZ() + return } diff --git a/types/builder_test.go b/types/builder_test.go index e7c6564..ee97df7 100644 --- a/types/builder_test.go +++ b/types/builder_test.go @@ -62,7 +62,7 @@ func TestExecutionPayloadHeader(t *testing.T) { p, err := h2.HashTreeRoot() require.NoError(t, err) rootHex := fmt.Sprintf("%x", p) - require.Equal(t, "83d65af100ef0e0fb789cb249ee6176526687aaf10321c745a90e328930f0066", rootHex) + require.Equal(t, "7b7fd346d2b66aab2efce23959d7f90f36ff31a944ba867ae1c2827f85b2fbe5", rootHex) } func TestBlindedBeaconBlock(t *testing.T) { @@ -109,7 +109,7 @@ func TestBlindedBeaconBlock(t *testing.T) { // Get HashTreeRoot root, err := msg.HashTreeRoot() require.NoError(t, err) - require.Equal(t, "d3fd47a86c900f9a20ca4ae64e72fe0286bcb315f6a7d92a3bd009c6dc76b301", fmt.Sprintf("%x", root)) + require.Equal(t, "b3b6844756cbf0fdd996cb20a1439bfb59a640cdae1604dbd8a81c7c993a6a6b", fmt.Sprintf("%x", root)) // Marshalling b, err := json.Marshal(msg) @@ -167,7 +167,7 @@ func TestBlindedBeaconBlock(t *testing.T) { // HashTreeRoot p, err := msg2.HashTreeRoot() require.NoError(t, err) - require.Equal(t, "d3fd47a86c900f9a20ca4ae64e72fe0286bcb315f6a7d92a3bd009c6dc76b301", fmt.Sprintf("%x", p)) + require.Equal(t, "b3b6844756cbf0fdd996cb20a1439bfb59a640cdae1604dbd8a81c7c993a6a6b", fmt.Sprintf("%x", p)) } func TestExecutionPayloadREST(t *testing.T) { diff --git a/types/utils.go b/types/utils.go new file mode 100644 index 0000000..7baed17 --- /dev/null +++ b/types/utils.go @@ -0,0 +1,23 @@ +package types + +import "github.com/prysmaticlabs/prysm/shared/bls" + +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 +} diff --git a/types/utils_test.go b/types/utils_test.go new file mode 100644 index 0000000..3677684 --- /dev/null +++ b/types/utils_test.go @@ -0,0 +1,29 @@ +package types + +import ( + "testing" + + "github.com/prysmaticlabs/prysm/shared/bls/blst" + "github.com/stretchr/testify/require" +) + +func TestVerifySignatureManualPk(t *testing.T) { + msg2 := RegisterValidatorRequestMessage{ + FeeRecipient: Address{0x42}, + GasLimit: 15_000_000, + Timestamp: 1652369368, + Pubkey: PublicKey{0x0d}, + } + root2, err := msg2.HashTreeRoot() + require.NoError(t, err) + + // Verify expected signature with manual pk + pkBytes := make([]byte, 32) + pkBytes[0] = 0x01 + sk2, err := blst.SecretKeyFromBytes(pkBytes) + require.NoError(t, err) + sig2 := sk2.Sign(root2[:]).Marshal() + var signature2 Signature + signature2.FromSlice(sig2) + require.Equal(t, "0x8e09a0ae7af113da2043001cc19fb1b3b24bbe022c1b8050ba2297ad1186f4217dd7095edad1d16d83d10f3297883d9e1674c81da95f10d3358c5afdb2500279e720b32879219c9a3b33415239bf46a66cd92b9d1750a6dd7cc7ec936a357128", signature2.String()) +}