txnsync: Add fields to txnsync msgs for proposal sending (#2572)

txnsync: Add fields to txnsync msgs for proposal sending

Author: nicholasguoalgorand

txnsync/exchange.go

@@ -17,13 +17,15 @@
 package txnsync
 
 import (
+	"github.com/algorand/go-algorand/crypto"
 	"github.com/algorand/go-algorand/data/basics"
 )
 
 const txnBlockMessageVersion = 1
 const maxBloomFilterSize = 100000
 const maxAcceptedMsgSeq = 64
 const maxEncodedTransactionGroupBytes = 10000000
+const maxProposalSize = 350000
 
 type transactionBlockMessage struct {
 	_struct struct{} `codec:",omitempty,omitemptyarray"` //nolint:structcheck,unused
@@ -34,6 +36,7 @@ type transactionBlockMessage struct {
 	UpdatedRequestParams requestParams           `codec:"p"`
 	TransactionGroups    packedTransactionGroups `codec:"g"`
 	MsgSync              timingParams            `codec:"t"`
+	RelayedProposal      relayedProposal         `codec:"rp"`
 }
 
 type encodedBloomFilter struct {
@@ -73,3 +76,16 @@ type timingParams struct {
 	AcceptedMsgSeq      []uint64 `codec:"a,allocbound=maxAcceptedMsgSeq"`
 	NextMsgMinDelay     uint64   `codec:"m"`
 }
+
+const (
+	noProposal byte = iota
+	transactionsForProposal
+)
+
+type relayedProposal struct {
+	_struct struct{} `codec:",omitempty,omitemptyarray"`
+
+	RawBytes        []byte        `codec:"b,allocbound=maxProposalSize"`
+	ExcludeProposal crypto.Digest `codec:"e"`
+	Content         byte          `codec:"c"`
+}

txnsync/incoming.go

@@ -231,6 +231,11 @@ func (s *syncState) evaluateIncomingMessage(message incomingMessage) {
 		// increase the message sequence number, since we're processing this message.
 		peer.nextReceivedMessageSeq++
 
+		// skip txnsync messages with proposalData for now
+		if !incomingMsg.message.RelayedProposal.MsgIsZero() {
+			continue
+		}
+
 		// update the round number if needed.
 		if incomingMsg.message.Round > peer.lastRound {
 			peer.lastRound = incomingMsg.message.Round