Merge remote-tracking branch 'upstream/master' into reject-unsolicite…

…d-blocks

.circleci/config.yml

@@ -6,7 +6,7 @@ version: 2.1
 
 orbs:
   win: circleci/windows@2.3.0
-  go: circleci/go@1.7.0
+  go: circleci/go@1.7.3
   slack: circleci/slack@4.10.1
 
 parameters:
@@ -461,7 +461,7 @@ commands:
           shell: bash.exe
           command: |
             choco install -y msys2 pacman make wget --force
-            choco install -y golang --version=1.17.13 --force
+            choco install -y golang --version=1.20.5 --force
             choco install -y python3 --version=3.7.3 --force
             export msys2='cmd //C RefreshEnv.cmd '
             export msys2+='& set MSYS=winsymlinks:nativestrict '

.github/workflows/benchmarks.yml

@@ -17,8 +17,8 @@ jobs:
     name: Performance regression check
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - uses: actions/checkout@v3.5.3
+      - uses: actions/setup-go@v4.0.1
         with:
           go-version-file: 'go.mod'
       - run: go version

.github/workflows/build.yml

@@ -17,19 +17,19 @@ jobs:
           update: true
           path-type: inherit
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 0
       - name: Determine Go version
         id: go_version
         run: echo "GO_VERSION=$(./scripts/get_golang_version.sh)" >> $GITHUB_ENV
       - name: Install golang
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4.0.1
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Restore libsodium from cache
         id: cache-libsodium
-        uses: actions/cache@v3
+        uses: actions/cache@v3.3.1
         with:
           path: crypto/libs
           key: libsodium-fork-v2-${{ runner.os }}-${{ hashFiles('crypto/libsodium-fork/**') }}

.github/workflows/codegen_verification.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Check out code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 0
           path: go-algorand

.github/workflows/container.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
 
       - name: Generate Container Metadata
         id: meta
@@ -59,7 +59,7 @@ jobs:
   #   if: github.ref == format('refs/heads/{0}', 'master')
   #   steps:
   #     - name: Checkout Code
-  #       uses: actions/checkout@v3
+  #       uses: actions/checkout@v3.5.3
 
   #     - name: Update DockerHub Repository Description
   #       uses: peter-evans/dockerhub-description@v3

.github/workflows/reviewdog.yml

@@ -10,19 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 0 # required for new-from-rev option in .golangci.yml
-      - name: Install libraries
-        run: sudo apt-get -y -q install libboost-math-dev
         # move go out of the way temporarily to avoid "go list ./..." from installing modules
       - name: Make libsodium.a
         run: sudo mv /usr/bin/go /usr/bin/go.bak && make crypto/libs/linux/amd64/lib/libsodium.a && sudo mv /usr/bin/go.bak /usr/bin/go
       - name: reviewdog-golangci-lint
-        uses: reviewdog/action-golangci-lint@v2
+        uses: reviewdog/action-golangci-lint@v2.3.1
         with:
           go_version_file: go.mod
-          golangci_lint_version: "v1.47.3"
+          golangci_lint_version: "v1.53.2"
           golangci_lint_flags: "-c .golangci.yml --allow-parallel-runners"
           reporter: "github-pr-check"
           tool_name: "Lint Errors"
@@ -34,11 +32,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v3.5.3
         with:
           fetch-depth: 0 # required for new-from-rev option in .golangci.yml
-      - name: Install libraries
-        run: sudo apt-get -y -q install libboost-math-dev
       # move go out of the way temporarily to avoid "go list ./..." from installing modules
       - name: Make libsodium.a
         run: sudo mv /usr/bin/go /usr/bin/go.bak && make crypto/libs/linux/amd64/lib/libsodium.a && sudo mv /usr/bin/go.bak /usr/bin/go
@@ -50,24 +46,24 @@ jobs:
         id: go_version
         run: echo "GO_VERSION=$(./scripts/get_golang_version.sh)" >> $GITHUB_ENV
       - name: Install specific golang
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4.0.1
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Create folders for golangci-lint
         run: mkdir -p cicdtmp/golangci-lint
       - name: Check if custom golangci-lint is already built
         id: cache-golangci-lint
-        uses: actions/cache@v3
+        uses: actions/cache@v3.3.1
         with:
           path: cicdtmp/golangci-lint/golangci-lint-cgo
-          key: cicd-golangci-lint-cgo-v0.0.1
+          key: cicd-golangci-lint-cgo-v0.0.2
 
       - name: Build custom golangci-lint with CGO_ENABLED
         if: steps.cache-golangci-lint.outputs.cache-hit != 'true'
         run: |
           cd cicdtmp/golangci-lint
           git clone https://github.com/golangci/golangci-lint.git .
-          git checkout tags/v1.47.3
+          git checkout tags/v1.53.2
           CGO_ENABLED=true go build -trimpath -o golangci-lint-cgo ./cmd/golangci-lint
           ./golangci-lint-cgo --version
           cd ../../

.github/workflows/tools.yml

@@ -19,9 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out code into the Go module directory
-        uses: actions/checkout@v3
-      - name: Install libraries
-        run: sudo apt-get -y -q install libboost-math-dev
+        uses: actions/checkout@v3.5.3
       # move go out of the way temporarily to avoid "go list ./..." from installing modules
       - name: Make libsodium.a
         run: sudo mv /usr/bin/go /usr/bin/go.bak && make crypto/libs/linux/amd64/lib/libsodium.a && sudo mv /usr/bin/go.bak /usr/bin/go
@@ -33,7 +31,7 @@ jobs:
         id: go_version
         run: echo "GO_VERSION=$(./scripts/get_golang_version.sh)" >> $GITHUB_ENV
       - name: Install go version
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4.0.1
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: Test tools/block-generator

.gitignore

@@ -74,3 +74,6 @@ tools/block-generator/block-generator
 
 # cross repo types tool binary
 tools/x-repo-types/x-repo-types
+
+# python virtual environment
+.venv

.golangci-warnings.yml

@@ -5,11 +5,8 @@ run:
 linters:
   disable-all: true
   enable:
-    - deadcode
     - gosec
     - partitiontest
-    - structcheck
-    - varcheck
     - unused
 
 linters-settings:

.golangci.yml

@@ -100,7 +100,15 @@ issues:
     # "EXC0005 staticcheck: Developers tend to write in C-style with an explicit 'break' in a 'switch', so it's ok to ignore"
     - ineffective break statement. Did you mean to break out of the outer loop
     # revive: irrelevant error about naming
-    - "var-naming: don't use leading k in Go names"
+    - "^var-naming: don't use leading k in Go names"
+    # revive: ignore unused-paramter, package-comments, unexported-return, redefines-builtin-id, var-declaration, empty-block, superfluous-else
+    - "^unused-parameter: parameter"
+    - "^package-comments: should have a package comment"
+    - "^unexported-return: "
+    - "^redefines-builtin-id: redefinition of"
+    - "^var-declaration: should"
+    - "^empty-block: this block is empty, you can remove it"
+    - "^superfluous-else: if block ends with"
 
   exclude-rules:
     - path: _test\.go
@@ -121,6 +129,9 @@ issues:
       linters:
         - staticcheck
       text: "SA4006: this value" # of X is never used
+    - linters:
+        - staticcheck
+      text: "SA1019: rand*"
     # allow shadowing in test code
     - path: _test\.go
       linters:

Dockerfile

@@ -1,6 +1,6 @@
 FROM ubuntu:18.04 as builder
 
-ARG GO_VERSION="1.17.13"
+ARG GO_VERSION="1.20.5"
 
 ARG CHANNEL
 ARG URL

agreement/actor.go

@@ -62,7 +62,6 @@ type actorContract interface {
 }
 
 // A checkedActor wraps an actor, checking its contract on each call.
-//
 type checkedActor struct {
 	actor
 	actorContract

agreement/bundle_test.go

@@ -108,7 +108,7 @@ func makeBundlePanicWrapper(t *testing.T, message string, proposal proposalValue
 	return uab
 }
 
-//Test Bundle Creation with Validation for duplicate votes from same sender
+// Test Bundle Creation with Validation for duplicate votes from same sender
 func TestBundleCreationWithVotesFromSameAddress(t *testing.T) {
 	partitiontest.PartitionTest(t)
 
@@ -173,7 +173,7 @@ func TestBundleCreationWithVotesFromSameAddress(t *testing.T) {
 
 }
 
-//Test Bundle Creation with Validation
+// Test Bundle Creation with Validation
 func TestBundleCreationWithEquivocationVotes(t *testing.T) {
 	partitiontest.PartitionTest(t)
 
@@ -283,7 +283,7 @@ func TestBundleCreationWithEquivocationVotes(t *testing.T) {
 
 }
 
-//Test Bundle Creation with Validation
+// Test Bundle Creation with Validation
 func TestBundleCertificationWithEquivocationVotes(t *testing.T) {
 	partitiontest.PartitionTest(t)
 

agreement/cryptoRequestContext.go

@@ -47,6 +47,7 @@ type roundRequestsContext struct {
 }
 
 // pendingRequests keeps the context for all pending requests
+//
 //msgp:ignore pendingRequestsContext
 type pendingRequestsContext map[round]roundRequestsContext
 

agreement/doc.go

@@ -23,20 +23,27 @@
 //
 // Clients instantiate an Service by providing it several
 // parameters:
-//  - Ledger represents a data store which supports the reading and
-//    writing of data stored within Blocks.
-//  - BlockFactory produces Blocks for a given round.
-//  - BlockValidator validates Blocks for a given round.
-//  - KeyManager holds the participation keys necessary to participate
-//    in the protocol.
-//  - Network provides an abstraction over the underlying network.
-//  - timers.Clock provides timekeeping services for timeouts.
-//  - db.Accessor provides persistent storage for internal state.
-//
-//  Blocks for which consensus is completed are written using
-//  Ledger.EnsureBlock alongside Certificate objects, which are
-//  cryptographic proofs that a Block was confirmed for a given
-//  round.
+//
+//   - Ledger represents a data store which supports the reading and
+//     writing of data stored within Blocks.
+//
+//   - BlockFactory produces Blocks for a given round.
+//
+//   - BlockValidator validates Blocks for a given round.
+//
+//   - KeyManager holds the participation keys necessary to participate
+//     in the protocol.
+//
+//   - Network provides an abstraction over the underlying network.
+//
+//   - timers.Clock provides timekeeping services for timeouts.
+//
+//   - db.Accessor provides persistent storage for internal state.
+//
+//     Blocks for which consensus is completed are written using
+//     Ledger.EnsureBlock alongside Certificate objects, which are
+//     cryptographic proofs that a Block was confirmed for a given
+//     round.
 //
 // If Ledger and db.Accessor provide crash-safe storage, agreement
 // will also recover safely after crashes.

agreement/events.go

@@ -669,12 +669,12 @@ func (e thresholdEvent) ComparableStr() string {
 //
 // The ordering is given as follows:
 //
-//  - certThreshold events are fresher than all other non-certThreshold events.
-//  - Events from a later period are fresher than events from an older period.
-//  - nextThreshold events are fresher than softThreshold events from the same
-//    period.
-//  - nextThreshold events for the bottom proposal-value are fresher than
-//    nextThreshold events for some other value.
+//   - certThreshold events are fresher than all other non-certThreshold events.
+//   - Events from a later period are fresher than events from an older period.
+//   - nextThreshold events are fresher than softThreshold events from the same
+//     period.
+//   - nextThreshold events for the bottom proposal-value are fresher than
+//     nextThreshold events for some other value.
 //
 // Precondition: e.Round == o.Round if e.T != none and o.T != none
 func (e thresholdEvent) fresherThan(o thresholdEvent) bool {

agreement/proposalManager.go

@@ -43,15 +43,15 @@ func (m *proposalManager) underlying() listener {
 
 // A proposalManager handles eight types of events:
 //
-// - It applies message relay rules to votePresent, voteVerified,
-//   payloadPresent, and payloadVerified events.
+//   - It applies message relay rules to votePresent, voteVerified,
+//     payloadPresent, and payloadVerified events.
 //
 // - It enters a new round given a roundInterruption.
 //
-// - It enters a new period given a nextThreshold event.  It also enters a new
-//   period given a softThreshold/certThreshold event, if necessary.
-//    - On entering a new period due to a softThreshold/certThreshold, it
-//      dispatches this event to the proposalMachineRound.
+//   - It enters a new period given a nextThreshold event.  It also enters a new
+//     period given a softThreshold/certThreshold event, if necessary.
+//   - On entering a new period due to a softThreshold/certThreshold, it
+//     dispatches this event to the proposalMachineRound.
 //
 // For more details, see each method's respective documentation below.
 func (m *proposalManager) handle(r routerHandle, p player, e event) event {
@@ -99,30 +99,30 @@ func (m *proposalManager) handleNewPeriod(r routerHandle, p player, e thresholdE
 
 // handleMessageEvent is called for {vote,payload}{Present,Verified} events.
 //
-// - A votePresent event is delivered when the state machine receives a new
-//   proposal-vote.  A voteFiltered event is returned if the proposal-vote is
-//   not fresh or is a duplicate.  Otherwise, an empty event is returned.
+//   - A votePresent event is delivered when the state machine receives a new
+//     proposal-vote.  A voteFiltered event is returned if the proposal-vote is
+//     not fresh or is a duplicate.  Otherwise, an empty event is returned.
 //
-// - A voteVerified event is delievered after verification was attempted on a
-//   proposal-vote.  A voteMalformed event is returned if the proposal-vote is
-//   ill-formed and resulted from a corrupt process.  A voteFiltered event is
-//   emitted if the vote is not fresh or is a duplicate.  Otherwise the
-//   proposal-vote is dispatched to the proposalMachineRound, and a voteFiltered
-//   or a proposalAccepted event is returned.
+//   - A voteVerified event is delievered after verification was attempted on a
+//     proposal-vote.  A voteMalformed event is returned if the proposal-vote is
+//     ill-formed and resulted from a corrupt process.  A voteFiltered event is
+//     emitted if the vote is not fresh or is a duplicate.  Otherwise the
+//     proposal-vote is dispatched to the proposalMachineRound, and a voteFiltered
+//     or a proposalAccepted event is returned.
 //
-// - A payloadPresent event is delivered when the state machine receives a new
-//   proposal payload.  The payload is dispatched to both the
-//   proposalMachineRound for the current round and the proposalMachineRound for
-//   the next round.  If both state machines return payloadRejected,
-//   proposalManager also returns payloadRejected.  Otherwise, one state machine
-//   returned payloadPipelined, and the proposalManager propagates this event to
-//   the parent, setting the event's round properly.
+//   - A payloadPresent event is delivered when the state machine receives a new
+//     proposal payload.  The payload is dispatched to both the
+//     proposalMachineRound for the current round and the proposalMachineRound for
+//     the next round.  If both state machines return payloadRejected,
+//     proposalManager also returns payloadRejected.  Otherwise, one state machine
+//     returned payloadPipelined, and the proposalManager propagates this event to
+//     the parent, setting the event's round properly.
 //
-// - A payloadVerified event is delivered after validation was attempted on a
-//   proposal payload.  If the proposal payload was invalid, a payloadMalformed
-//   event is returned.  Otherwise, the event is dispatched to the
-//   proposalMachineRound, and then the resulting payload{Rejected,Accepted} or
-//   proposalCommittable event is returned.
+//   - A payloadVerified event is delivered after validation was attempted on a
+//     proposal payload.  If the proposal payload was invalid, a payloadMalformed
+//     event is returned.  Otherwise, the event is dispatched to the
+//     proposalMachineRound, and then the resulting payload{Rejected,Accepted} or
+//     proposalCommittable event is returned.
 func (m *proposalManager) handleMessageEvent(r routerHandle, p player, e filterableMessageEvent) (res event) {
 	var pipelinedRound round
 	var pipelinedPeriod period