From 7e7aeafb04f67e0e96c316b0c1d8715be6ef89f5 Mon Sep 17 00:00:00 2001
From: Tsachi Herman <tsachi.herman@algorand.com>
Date: Fri, 16 Apr 2021 12:12:39 -0400
Subject: [PATCH 1/2] rollback
 https://github.com/algorand/go-algorand/pull/1756 (#2078)

Rollback https://github.com/algorand/go-algorand/pull/1756, as it was determined to cause proposal propagation issues.
This rollback would take the original work back onto the research stage, and would allow us to provide better testing before re-applying it.
---
 agreement/player.go | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/agreement/player.go b/agreement/player.go
index 445eaff78d..85c0c18058 100644
--- a/agreement/player.go
+++ b/agreement/player.go
@@ -555,29 +555,21 @@ func (p *player) handleMessageEvent(r routerHandle, e messageEvent) (actions []a
 		case payloadPipelined:
 			ep := ef.(payloadProcessedEvent)
 			if ep.Round == p.Round {
-				up := e.Input.UnauthenticatedProposal
-				uv := ef.(payloadProcessedEvent).Vote.u()
-
-				a := relayAction(e, protocol.ProposalPayloadTag, compoundMessage{Proposal: up, Vote: uv})
-				actions = append(actions, a)
 				return append(actions, verifyPayloadAction(e, ep.Round, ep.Period, ep.Pinned))
 			}
 		}
 
-		// relay as the proposer
-		if e.Input.MessageHandle == nil {
-			var uv unauthenticatedVote
-			switch ef.t() {
-			case payloadPipelined, payloadAccepted:
-				uv = ef.(payloadProcessedEvent).Vote.u()
-			case proposalCommittable:
-				uv = ef.(committableEvent).Vote.u()
-			}
-			up := e.Input.UnauthenticatedProposal
-
-			a := relayAction(e, protocol.ProposalPayloadTag, compoundMessage{Proposal: up, Vote: uv})
-			actions = append(actions, a)
+		var uv unauthenticatedVote
+		switch ef.t() {
+		case payloadPipelined, payloadAccepted:
+			uv = ef.(payloadProcessedEvent).Vote.u()
+		case proposalCommittable:
+			uv = ef.(committableEvent).Vote.u()
 		}
+		up := e.Input.UnauthenticatedProposal
+
+		a := relayAction(e, protocol.ProposalPayloadTag, compoundMessage{Proposal: up, Vote: uv})
+		actions = append(actions, a)
 
 		// If the payload is valid, check it against any received cert threshold.
 		// Of course, this should only trigger for payloadVerified case.

From 82a781dd0c991ddfed116e94907acacbb266f8f4 Mon Sep 17 00:00:00 2001
From: John Lee <john.lee@algorand.com>
Date: Fri, 16 Apr 2021 12:33:15 -0400
Subject: [PATCH 2/2] Bump build number

---
 buildnumber.dat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/buildnumber.dat b/buildnumber.dat
index b8626c4cff..7ed6ff82de 100644
--- a/buildnumber.dat
+++ b/buildnumber.dat
@@ -1 +1 @@
-4
+5