getArcadiaBlock request with proposer signature

arcadia/arcadia.go

@@ -80,7 +80,7 @@
 	pathGetArcadiaBlock    = "/api/arcadia/v1/validator/block"    // validator requests arcadia block.
 )
 
 func NewArcadiaClient(url string, currEpoch uint64, currEpochBuilderPubKey *bls.PublicKey, availNs *[][]byte, vm VM) *Arcadia {
 	url = strings.TrimRight(url, "/")
 
 	cli := &Arcadia{
@@ -238,7 +238,7 @@
 				if websocket.IsCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) ||
 					websocket.IsUnexpectedCloseError(err, websocket.CloseGoingAway, websocket.CloseAbnormalClosure) ||
 					strings.Contains(err.Error(), "close 1006") ||
 					strings.Contains(err.Error(), "use of closed network connection") {
 
 					cli.vm.Logger().Error("WebSocket connection closed", zap.Error(err))
 					// Attempt reconnect to arcadia.
@@ -252,7 +252,7 @@
 			}
 			cli.vm.Logger().Info("received message from arcadia", zap.Int("msgType", msgType), zap.String("rawMsg", string(rawMsg)))
 
 			if msgType == websocket.TextMessage {
 				var newChunk ArcadiaToSEQChunkMessage
 				err := json.Unmarshal(rawMsg, &newChunk)
 				if err != nil {
@@ -585,17 +585,30 @@
 		MaxBandwidth: maxBw,
 		BlockNumber:  blockNumber,
 	}
-	reqRaw, err := json.Marshal(reqr)
+	reqRaw, err := reqr.Payload()
 	if err != nil {
 		return nil, err
 	}
 
+	uwm, err := warp.NewUnsignedMessage(cli.vm.NetworkID(), cli.vm.ChainID(), reqRaw)
+	if err != nil {
+		return nil, err
+	}
+	sig, err := cli.vm.Sign(uwm)
+	if err != nil {
+		return nil, err
+	}
+	sigStr := hexutil.Encode(sig)
+
+	cli.vm.Logger().Debug("signing GetArcadiaBlock request with", zap.String("pubkey", hexutil.Encode(cli.vm.Signer().Compress())), zap.Uint64("height", blockNumber), zap.String("chainID", cli.vm.ChainID().String()), zap.Uint32("networkID", cli.vm.NetworkID()))
+
 	req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewBuffer(reqRaw))
 	if err != nil {
 		return nil, err
 	}
 
 	req.Header.Set("Content-Type", "application/json")
+	req.Header.Set(GetArcadiaBlockSignatureHeader, sigStr)
 
 	resp, err := client.Do(req)
 	if err != nil {

arcadia/consts.go

@@ -3,3 +3,4 @@ package arcadia
 var DefaultNMTNamespace = make([]byte, 8)
 
 const DefaultBuilderLRUSize = 20
+const GetArcadiaBlockSignatureHeader = "X-Arcadia-GetBlock-Sig"

arcadia/types.go

@@ -1,6 +1,8 @@
 package arcadia
 
 import (
+	"encoding/json"
+
 	"github.com/ava-labs/avalanchego/ids"
 	"github.com/bits-and-blooms/bitset"
 
@@ -69,6 +71,10 @@ type GetBlockPayloadFromArcadia struct {
 	BlockNumber  uint64 `json:"blockNumber"`
 }
 
+func (req *GetBlockPayloadFromArcadia) Payload() ([]byte, error) {
+	return json.Marshal(req)
+}
+
 type ChunkInterface interface {
 	Marshal() ([]byte, error)
 	Transactions() []*chain.Transaction

arcadia/utils.go

@@ -34,7 +34,7 @@
 		buf := bytes.NewBuffer(chunk.RemovedBitSet)
 		_, err := bs.ReadFrom(buf)
 		if err != nil {
 			return fmt.Errorf("unable to parse remove bitset, raw: %+v, err: %s", chunk.removedBitSet, err)
 		}
 		chunk.removedBitSet = *bs
 		return nil
@@ -43,7 +43,7 @@
 		for _, tx := range chunk.Chunk.RoB.Txs {
 			_, stx, err := chain.UnmarshalTxs(tx, 1, actionReg, authReg)
 			if err != nil {
 				return fmt.Errorf("unable to unmarshal txs")
 			}
 			if len(stx) == 0 {
 				return ErrNoTxsInRoB
@@ -58,7 +58,7 @@
 		buf := bytes.NewBuffer(chunk.RemovedBitSet)
 		_, err := bs.ReadFrom(buf)
 		if err != nil {
 			return fmt.Errorf("unable to parse remove bitset, raw: %+v, err: %s", chunk.removedBitSet, err)
 		}
 		chunk.removedBitSet = *bs
 	}
@@ -97,7 +97,9 @@
 }
 
 func namespaceToChainIDStr(ns []byte) string {
-	chainIDu64 := binary.LittleEndian.Uint64(ns)
+	nsPadded := make([]byte, 8)
+	copy(nsPadded[:], ns)
+	chainIDu64 := binary.LittleEndian.Uint64(nsPadded)
 	chainID := big.NewInt(int64(chainIDu64))
 
 	return hexutil.EncodeBig(chainID)