Merge pull request algorand#2082 from onetechnical/onetechnical/relst…

…able2.5.5 go-algorand 2.5.5-stable
tsachiherman · Apr 17, 2021 · 304815d · 304815d
2 parents 7cd7aef + 14dd3bf
commit 304815d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git 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.

diff --git a/buildnumber.dat b/buildnumber.dat
@@ -1 +1 @@
-4
+5