Merge pull request #2059 from onetechnical/onetechnical/relstable2.5.4

go-algorand 2.5.4-stable

Author: algojohnlee

.github/ISSUE_TEMPLATE/algorand-engineering-team-issue-template.md

@@ -9,10 +9,10 @@ assignees: ''
 ---
 
 ## Summary
-*Describe the problem identified or the general goal of this issue*
+<!-- *Describe the problem identified or the general goal of this issue* -->
 
 ## Scope/Requirements
-*What's involved in this issue? What's required to achieve the goal?*
+<!-- *What's involved in this issue? What's required to achieve the goal?* -->
 
 ## Urgency/Relative Priority
-*How urgent is this issue? What are the timing considerations to take into account?*
+<!-- *How urgent is this issue? What are the timing considerations to take into account?* -->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,27 +7,24 @@ assignees: ''
 
 ---
 
-<!--
-NOTE: If this issue relates to security, please use the vulnerability disclosure form here:
-https://www.algorand.com/resources/blog/security
-
-General, developer or support questions concerning Algorand should be directed to the Algorand Forums https://forum.algorand.org/.
--->
-
 ### Subject of the issue
-Describe your issue here.
+
+<!-- Describe your issue here. -->
 
 ### Your environment
+
+<!--
 * Software version: `algod -v`
 * Node status if applicable: `goal node status`
 * Operating System details. 
 * In many cases log files and cadaver files are also useful to include. Since these files may be large, an Algorand developer may request them later. These files may include public addresses that you're participating with. If that is a concern please be sure to scrub that data.
+-->
 
 ### Steps to reproduce
-Tell us how to reproduce this issue.
+
+1.
+2.
 
 ### Expected behaviour
-Tell us what should happen
 
 ### Actual behaviour
-Tell us what happens instead

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,4 @@
+contact_links:
+  - name: ❓ Question and Help
+    url: https://forum.algorand.org/
+    about: The issue tracker is not for support questions. Please join our community for help and discussion.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -7,27 +7,14 @@ assignees: ''
 
 ---
 
-<!--
-NOTE: If this issue relates to security, please use the vulnerability disclosure form here:
-https://www.algorand.com/resources/blog/security
+## Is your feature request related to a problem? Please describe.
 
-General, developer or support questions concerning Algorand should be directed to the Algorand Forums https://forum.algorand.org/.
--->
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
 
-<!--
-This project is focused on low level platform concerns. A good feature request would be related
-to protocol and network usage, debugging and monitoring tools, and goal commands.
+## Describe the solution you'd like.
 
-Higher level suggestions relating to layer 2 applications (like wallet apps) are not appropriate here.
--->
-**Is your feature request related to a problem? Please describe.**
+<!-- A clear and concise description of what you want to happen. -->
 
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+## Additional context.
 
-**Describe the solution you'd like**
-
-A clear and concise description of what you want to happen.
-
-**Additional context**
-
-Add any other context or screenshots about the feature request here.
+<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/question.md

@@ -15,8 +15,8 @@ It is also a good idea to run tests:
 
 ## Summary
 
-Explain the goal of this change and what problem it is solving. Format this cleanly so that it may be used for a commit message, as your changes will be squash-merged.
+<!-- Explain the goal of this change and what problem it is solving. Format this cleanly so that it may be used for a commit message, as your changes will be squash-merged. -->
 
 ## Test Plan
 
-How did you test these changes? Please provide the exact scenarios you tested in as much detail as possible including commands, output and rationale.
+<!-- How did you test these changes? Please provide the exact scenarios you tested in as much detail as possible including commands, output and rationale. -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -68,7 +68,7 @@ GOLDFLAGS := $(GOLDFLAGS_BASE) \
 UNIT_TEST_SOURCES := $(sort $(shell GOPATH=$(GOPATH) && GO111MODULE=off && go list ./... | grep -v /go-algorand/test/ ))
 ALGOD_API_PACKAGES := $(sort $(shell GOPATH=$(GOPATH) && GO111MODULE=off && cd daemon/algod/api; go list ./... ))
 
-MSGP_GENERATE	:= ./protocol ./crypto ./crypto/compactcert ./data/basics ./data/transactions ./data/committee ./data/bookkeeping ./data/hashable ./auction ./agreement ./rpcs ./node ./ledger
+MSGP_GENERATE	:= ./protocol ./crypto ./crypto/compactcert ./data/basics ./data/transactions ./data/committee ./data/bookkeeping ./data/hashable ./auction ./agreement ./rpcs ./node ./ledger ./ledger/ledgercore ./compactcert
 
 default: build
 

Makefile

@@ -0,0 +1,7 @@
+# Vulnerability Disclosures
+
+Algorand takes the security of the platform and of its users very seriously. We recognize the important role of external security researchers and developers in helping keep our community safe. As with most security reward programs, we ask that you use common sense when looking for security bugs. Vulnerabilities must be disclosed to us privately with reasonable time to respond, and avoid compromise of other users and accounts, or loss of funds that are not your own. We do not reward denial of service, spam, or social engineering vulnerabilities.
+
+If you believe that you have found a security vulnerability you may disclose it here:
+
+https://www.algorand.com/resources/blog/security

SECURITY.md

@@ -12,6 +12,7 @@ In no particular order:
 - jsign
 - RomitKumar
 - jeapostrophe
+- aybehrouz
 
 ### Bug Reports
 - Nanyan

THANKS.md

@@ -32,13 +32,23 @@ import (
 
 var (
 	voteBufferSize     = 10000
-	proposalBufferSize = 14
+	proposalBufferSize = 25
 	bundleBufferSize   = 7
 )
 
 var messagesHandled = metrics.MakeCounter(metrics.AgreementMessagesHandled)
 var messagesDropped = metrics.MakeCounter(metrics.AgreementMessagesDropped)
 
+var agreementVoteMessage = map[string]string{
+	"message_type": "vote",
+}
+var agreementProposalMessage = map[string]string{
+	"message_type": "proposal",
+}
+var agreementBundleMessage = map[string]string{
+	"message_type": "bundle",
+}
+
 type messageMetadata struct {
 	raw network.IncomingMessage
 }
@@ -92,32 +102,32 @@ func messageMetadataFromHandle(h agreement.MessageHandle) *messageMetadata {
 }
 
 func (i *networkImpl) processVoteMessage(raw network.IncomingMessage) network.OutgoingMessage {
-	return i.processMessage(raw, i.voteCh)
+	return i.processMessage(raw, i.voteCh, agreementVoteMessage)
 }
 
 func (i *networkImpl) processProposalMessage(raw network.IncomingMessage) network.OutgoingMessage {
 	if i.trace != nil {
 		i.trace.HashTrace(messagetracer.Proposal, raw.Data)
 	}
-	return i.processMessage(raw, i.proposalCh)
+	return i.processMessage(raw, i.proposalCh, agreementProposalMessage)
 }
 
 func (i *networkImpl) processBundleMessage(raw network.IncomingMessage) network.OutgoingMessage {
-	return i.processMessage(raw, i.bundleCh)
+	return i.processMessage(raw, i.bundleCh, agreementBundleMessage)
 }
 
 // i.e. process<Type>Message
-func (i *networkImpl) processMessage(raw network.IncomingMessage, submit chan<- agreement.Message) network.OutgoingMessage {
+func (i *networkImpl) processMessage(raw network.IncomingMessage, submit chan<- agreement.Message, msgType map[string]string) network.OutgoingMessage {
 	metadata := &messageMetadata{raw: raw}
 
 	select {
 	case submit <- agreement.Message{MessageHandle: agreement.MessageHandle(metadata), Data: raw.Data}:
 		// It would be slightly better to measure at de-queue
 		// time, but that happens in many places in code and
 		// this is much easier.
-		messagesHandled.Inc(nil)
+		messagesHandled.Inc(msgType)
 	default:
-		messagesDropped.Inc(nil)
+		messagesDropped.Inc(msgType)
 	}
 
 	// Immediately ignore everything here, sometimes Relay/Broadcast/Disconnect later based on API handles saved from IncomingMessage