egieseke · egieseke · Jun 24, 2019 · Jun 12, 2019 · Jun 12, 2019 · Jun 12, 2019
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+crypto/libsodium-fork/* linguist-vendored
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,30 @@
+---
+name: '🐜 Bug report'
+about: 'Report a reproducible bug.'
+title: ''
+labels: 'new-bug'
+---
+<!--
+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.
+
+### 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.
+
+### Expected behaviour
+Tell us what should happen
+
+### Actual behaviour
+Tell us what happens instead
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,30 @@
+---
+name: '🔔 Feature Request'
+about: 'Suggestions for how we can improve the algorand platform.'
+title: ''
+labels: 'new-feature-request'
+---
+<!--
+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/.
+-->
+
+<!--
+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.
+
+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 the problem is. Ex. I'm always frustrated when [...]
+
+**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.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,17 @@
+---
+name: '❓ Question'
+about: 'General questions related to the algorand platform.'
+title: ''
+labels: 'question'
+---
+<!--
+NOTE: If this issue relates to security, please use the vulnerability disclosure form here:
+https://www.algorand.com/resources/blog/security
+
+This issue tracker is not appropriate for most questions.
+If your question does not involve a compiler it probably shouldn't be asked here.
+
+General, developer or support questions concerning Algorand should be directed to the Algorand Forums https://forum.algorand.org/.
+
+Additional information is available here: https://developer.algorand.org/
+-->
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,23 @@
+<!--
+Thanks for submitting a pull request! We appreciate the time and effort you spent to get this far.
+
+If you haven't already, please make sure that you've reviewed the CONTRIBUTING guide:
+https://github.com/algorand/go-algorand/blob/master/CONTRIBUTING.md#code-guidelines
+
+In particular ensure that you've run the following:
+* make generate
+* make sanity (which runs make fmt, make lint, make fix and make vet)
+
+It is also a good idea to run tests:
+* make test
+* make integration
+-->
+
+## Summary
+
+Explain the goal of this change and what problem it is solving.
+
+## 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.
+
diff --git a/.travis.yml b/.travis.yml
@@ -33,26 +33,26 @@ jobs:
       script:
         - scripts/travis/build.sh || travis_terminate 1;
         - travis_wait 90 scripts/travis/test.sh
-#    - # same stage, parallel job
-#      os: linux
-#      env:
-#        - BUILD_TYPE: "integration"
-#      script:
-#        - scripts/travis/build.sh || travis_terminate 1;
-#        - travis_wait 90 scripts/travis/test.sh
+    - # same stage, parallel job
+      os: linux
+      env:
+        - BUILD_TYPE: "integration"
+      script:
+        - scripts/travis/build.sh || travis_terminate 1;
+        - travis_wait 90 scripts/travis/test.sh
 
     - stage: build_release
       os: linux
       script:
         - scripts/travis/build.sh || travis_terminate 1;
         - travis_wait 90 scripts/travis/test.sh
-#    - # same stage, parallel job
-#      os: linux
-#      env:
-#        - BUILD_TYPE: "integration"
-#      script:
-#        - scripts/travis/build.sh || travis_terminate 1;
-#        - travis_wait 90 scripts/travis/test.sh
+    - # same stage, parallel job
+      os: linux
+      env:
+        - BUILD_TYPE: "integration"
+      script:
+        - scripts/travis/build.sh || travis_terminate 1;
+        - travis_wait 90 scripts/travis/test.sh
     - # same stage, parallel job
       os: osx
       script:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -6,23 +6,33 @@ The algorand project is composed of several repositories on GitHub. Specifically
 
 # Filing Issues
 
-Did you discover a bug? Do you have a feature request? Filing issues is an easy way anyone can contribute and helps us improve Algorand. We use GitHub  Issues to track all known bugs and feature requests. 
+Did you discover a bug? Do you have a feature request? Filing issues is an easy way anyone can contribute and helps us improve Algorand. We use GitHub Issues to track all known bugs and feature requests.
 
 Before logging an issue be sure to check current issues, verify that your [node is synced](https://developer.algorand.org/docs/introduction-installing-node#sync-node), check the [Developer Frequently Asked Questions](https://developer.algorand.org/docs/developer-faq) and [GitHub issues][issues_url] to see if your issue is described there.
 
 If you’d like to contribute to any of the repositories, please file a [GitHub issue][issues_url] using the issues menu item. Make sure to specify whether you are describing a bug or a new enhancement using the **Bug report** or **Feature request** button.
 
-See the GitHub help guide for more information on [filing an issue](https://help.github.com/en/articles/creating-an-issue)
+See the GitHub help guide for more information on [filing an issue](https://help.github.com/en/articles/creating-an-issue).
+
+## Vulnerabilities
+
+Please don't create issues for any security vulnerabilities.  Instead, we would appreciate it if you reported them through our [vulnerability disclosure form][vuln_url].  This allows us to distribute a fix before the vulnerability is exploited.
+
+Additionally, if you believe that you've discovered a security vulnerability, you might qualify for our bug bounty program.  Visit our [bug bounty site][bug_bounty_url] for details.
+
+If you have any questions, don't hesitate to contact us at security@algorand.com.
 
 # Contribution Model
 
 For each of our repositories we use the same model for contributing code. Developers wanting to contribute must create pull requests. This process is described in the GitHub [Creating a pull request from a fork](https://help.github.com/en/articles/creating-a-pull-request-from-a-fork) documentation. Each pull request should be initiated against the master branch in the Algorand repository.  After a pull request is submitted the core development team will review the submission and communicate with the developer using the comments sections of the PR. After the submission is reviewed and approved, it will be merged into the master branch of the source. These changes will be merged to our release branch on the next viable release date. For the SDKs, this may be immediate. Changes to the node software may take more time as we must ensure and verify the security, as well as apply protocol upgrades in an orderly way.
 
+Again, if you have a patch for a critical security vulnerability, please use our [vulnerability disclosure form][vuln_url] instead of creating a PR.  We'll follow up with you on distributing the patch before we merge it.
+
 # Code Guidelines
 
-For Go code we use the [Golang guidelines defined here](https://golang.org/doc/effective_go.html)
+For Go code we use the [Golang guidelines defined here](https://golang.org/doc/effective_go.html).
 * Code must adhere to the official Go formatting guidelines (i.e. uses gofmt).
-* We use **gofmt** and **golint**. Also make sure to run `make fix` and `make generate` before opening a pull request.
+* We use **gofmt** and **golint**. Also make sure to run `make sanity` and `make generate` before opening a pull request.
 * Code must be documented adhering to the official Go commentary guidelines.
 
 For JavaScript code we use the [MDN formatting rules](https://developer.mozilla.org/en-US/docs/MDN/Contribute/Guidelines/Code_guidelines/JavaScript).
@@ -34,3 +44,5 @@ For Java code we use [Oracle’s standard formatting rules for Java](https://www
 The core development team monitors the Algorand community forums and regularly responds to questions and suggestions. Issues and Pull Requests are handled on GitHub.
 
 [issues_url]: https://github.com/algorand/go-algorand/issues
+[vuln_url]: https://www.algorand.com/resources/blog/security
+[bug_bounty_url]: https://bugcrowd.com/algorand
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -31,7 +31,6 @@
 
   [[prune.project]]
     name = "github.com/karalabe/hid"
-    non-go = false
     unused-packages = false
 
 # The current version of logrus, v1.2.0, implements UnmarshalText but not MarshalText.
@@ -75,10 +74,6 @@
   name = "github.com/jmoiron/sqlx"
   version = "1.2.0"
 
-[[constraint]]
-  name = "gopkg.in/yaml.v2"
-  version = "2.2.2"
-
 [[constraint]]
   name = "github.com/algorand/websocket"
   branch = "master"

diff --git a/README.md b/README.md
@@ -12,7 +12,7 @@ Our [developer website][developer site url] has the most up to date information
 
 ## Building from source ##
 
-Development is done using the [Go Programming Language](https://golang.org/), and this document assumes that you have a functioning environment setup. If you need assistance setting up an environment please visit the [official Go documentation website](https://golang.org/doc/).
+Development is done using the [Go Programming Language](https://golang.org/) version 1.12.x, and this document assumes that you have a functioning environment setup. If you need assistance setting up an environment please visit the [official Go documentation website](https://golang.org/doc/).
 
 ### Linux / OSX ###
 

diff --git a/agreement/actor.go b/agreement/actor.go
@@ -135,11 +135,11 @@ type ioLoggedActor struct {
 
 func (l ioLoggedActor) handle(h routerHandle, e event) []action {
 	if l.tracer.level >= top {
-		fmt.Printf("%23v  => %23v: %v\n", "", l.T(), e)
+		fmt.Fprintf(l.tracer.w, "%23v  => %23v: %v\n", "", l.T(), e)
 	}
 	a := l.checkedActor.handle(h, e)
 	if l.tracer.level >= top {
-		fmt.Printf("%23v <=  %23v: %v\n", "", l.T(), a)
+		fmt.Fprintf(l.tracer.w, "%23v <=  %23v: %v\n", "", l.T(), a)
 	}
 	return a
 }