Merge pull request #3700 from Algo-devops-service/relstable3.4.2

go-algorand 3.4.2-stable

Author: algojohnlee

.circleci/config.yml

@@ -166,7 +166,6 @@ workflows:
           context:
             - slack-secrets
             - aws-secrets
-
       #- windows_x64_build
 
 commands:
@@ -322,8 +321,7 @@ commands:
             export PACKAGE_NAMES=$(echo $PACKAGES | tr -d '\n')
             export PARTITION_TOTAL=${CIRCLE_NODE_TOTAL}
             export PARTITION_ID=${CIRCLE_NODE_INDEX}
-            export PARALLEL_FLAG="-p 1"
-            gotestsum --format testname --junitfile << parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}/results.xml --jsonfile << parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}/testresults.json -- --tags "sqlite_unlock_notify sqlite_omit_load_extension" << parameters.short_test_flag >> -race -timeout 1h -coverprofile=coverage.txt -covermode=atomic -p 1 $PACKAGE_NAMES
+            gotestsum --format standard-verbose --junitfile << parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}/results.xml --jsonfile << parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}/testresults.json -- --tags "sqlite_unlock_notify sqlite_omit_load_extension" << parameters.short_test_flag >> -race -timeout 1h -coverprofile=coverage.txt -covermode=atomic -p 1 $PACKAGE_NAMES
       - store_artifacts:
           path: << parameters.result_path >>
           destination: test-results
@@ -432,6 +430,7 @@ commands:
             export TEST_RESULTS=<< parameters.result_path >>/<< parameters.result_subdir >>/${CIRCLE_NODE_INDEX}
             export PARTITION_TOTAL=${CIRCLE_NODE_TOTAL}
             export PARTITION_ID=${CIRCLE_NODE_INDEX}
+            export PARALLEL_FLAG="-p 1"
             test/scripts/run_integration_tests.sh
       - store_artifacts:
           path: << parameters.result_path >>
@@ -478,11 +477,14 @@ commands:
         - attach_workspace:
             at: << parameters.build_dir >>
         - run:
-            name: Upload binaries << parameters.platform >>
+            name: Upload Binaries << parameters.platform >>
             command: |
+              if [ "${CIRCLE_BRANCH}" = "rel/nightly" ]
+              then
+                export NO_BUILD="true"
+              fi
               export PATH=$(echo "$PATH" | sed -e "s|:${HOME}/\.go_workspace/bin||g" | sed -e 's|:/usr/local/go/bin||g')
               export GOPATH="<< parameters.build_dir >>/go"
-              export NO_BUILD=true
               export TRAVIS_BRANCH=${CIRCLE_BRANCH}
               scripts/travis/deploy_packages.sh
         - when:

.dockerignore

@@ -29,6 +29,7 @@ cmd/updater/updater
 tmp/dev_pkg
 tmp/out
 tmp/node_pkgs
+tmp/go-cache
 
 # Ignore vim backup and swap files
 *~

.github/workflows/build.yml

@@ -0,0 +1,39 @@
+name: "Build workflow"
+on:
+  pull_request:
+jobs:
+  build-test-windows:
+    runs-on: windows-2022
+    defaults:
+      run:
+        shell: msys2 {0}
+    steps:
+      - name: Install msys2
+        uses: msys2/setup-msys2@v2
+        with:
+          update: true
+          path-type: inherit
+      - name: Check out code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Install golang
+        uses: actions/setup-go@v2
+        with:
+          go-version: '1.14.7'
+      - name: Build Test
+        run: |
+          export ALGORAND_DEADLOCK=enable
+          export SKIP_GO_INSTALLATION=True
+          scripts/travis/build_test.sh
+      # - name: Upload artifact to Github
+      #   uses: actions/upload-artifact@v2
+      #   with:
+      #     if-no-files-found: error
+      #     path: $(git ls-files -o | grep -v crypto/libs | grep -v crypto/copies | grep -v crypto/libsodium-fork | grep -v crypto/lib/ | grep -v ^gen/ | grep -v swagger.json.validated | tr "\n" ":")
+      - name: Slack Notification
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+        run: |
+          curl -X POST --data-urlencode "payload={\"text\": \"Nightly windows build test on Github failed. ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \"}" $SLACK_WEBHOOK
+        if: ${{ failure() && (contains(github.base_ref, 'rel/nightly') || contains(github.base_ref, 'rel/beta') || contains(github.base_ref, 'rel/stable')) }}

.github/workflows/pr-type-category.yml

@@ -0,0 +1,37 @@
+name: Check PR category and type
+on:
+  pull_request:
+    branches:
+      - master
+    types: [opened, synchronize, reopened, labeled, unlabeled, edited]
+jobs:
+  check_label:
+    runs-on: ubuntu-latest
+    name: Check PR Category and Type
+    steps:
+      - name: "Failed to find proper PR Type label. Please add one of the following: 'New Feature', 'Enhancement', or 'Bug-Fix'"
+        run: exit 1
+        if: |
+          !contains(github.event.pull_request.labels.*.name, 'New Feature') &&
+          !contains(github.event.pull_request.labels.*.name, 'Enhancement') &&
+          !contains(github.event.pull_request.labels.*.name, 'Bug-Fix')
+      - name: "Found more than one PR Type label. Please add only one of the following: 'New Feature', 'Enhancement', or 'Bug-Fix'"
+        run: exit 1
+        if: |
+          (
+            contains(github.event.pull_request.labels.*.name, 'New Feature') &&
+            contains(github.event.pull_request.labels.*.name, 'Enhancement')
+          ) || (
+            contains(github.event.pull_request.labels.*.name, 'New Feature') &&
+            contains(github.event.pull_request.labels.*.name, 'Bug-Fix')
+          ) || (
+            contains(github.event.pull_request.labels.*.name, 'Enhancement') &&
+            contains(github.event.pull_request.labels.*.name, 'Bug-Fix')
+          )
+      - name: "PR Category is missing from PR title. Please add it like '<category>: <pr title>'"
+        run: |
+          if [[ ! "${{ github.event.pull_request.title }}" =~ ^.{2,}\:.{2,} ]]; then
+            exit 1
+          fi
+      - name: "Found at least one PR Type label and Category in the title. Good job!"
+        run: exit 0

.gitignore

@@ -65,3 +65,5 @@ assets
 
 index.html
 
+# test summary
+testresults.json

.travis.yml

@@ -61,6 +61,10 @@ EXTLDFLAGS := -static -static-libstdc++ -static-libgcc
 export GOBUILDMODE := -buildmode=exe
 endif
 
+ifeq ($(SHORT_PART_PERIOD), 1)
+export SHORT_PART_PERIOD_FLAG := -s
+endif
+
 GOTAGS      := --tags "$(GOTAGSLIST)"
 GOTRIMPATH	:= $(shell GOPATH=$(GOPATH) && go help build | grep -q .-trimpath && echo -trimpath)
 
@@ -76,7 +80,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 ./protocol/test ./crypto ./crypto/compactcert ./data/basics ./data/transactions ./data/committee ./data/bookkeeping ./data/hashable ./agreement ./rpcs ./node ./ledger ./ledger/ledgercore ./compactcert ./data/account
+MSGP_GENERATE	:= ./protocol ./protocol/test ./crypto ./crypto/merklearray ./crypto/merklesignature ./crypto/compactcert ./data/basics ./data/transactions ./data/committee ./data/bookkeeping ./data/hashable ./agreement ./rpcs ./node ./ledger ./ledger/ledgercore ./compactcert ./data/account
 
 default: build
 
@@ -290,7 +294,7 @@ gen/%/genesis.dump: gen/%/genesis.json
 	./scripts/dump_genesis.sh $< > $@
 
 gen/%/genesis.json: gen/%.json gen/generate.go buildsrc
-	$(GOPATH1)/bin/genesis -q -n $(shell basename $(shell dirname $@)) -c $< -d $(subst .json,,$<)
+	$(GOPATH1)/bin/genesis -q $(SHORT_PART_PERIOD_FLAG) -n $(shell basename $(shell dirname $@)) -c $< -d $(subst .json,,$<)
 
 gen: $(addsuffix gen, $(NETWORKS)) mainnetgen
 
@@ -303,6 +307,9 @@ gen/mainnet/genesis.dump: gen/mainnet/genesis.json
 
 mainnetgen: gen/mainnet/genesis.dump
 
+# The mainnet genesis.json file generated by this target does not have timestamp value so the hash is different from the deployed mainnet,
+# use a real genesis.json file from installer/genesis/mainnet/genesis.json if needed.
+# This target is preserved as part of the history on how mainnet genesis.json was generated from the CSV file.
 gen/mainnet/genesis.json: gen/pregen/mainnet/genesis.csv buildsrc
 	mkdir -p gen/mainnet
 	cat gen/pregen/mainnet/genesis.csv | $(GOPATH1)/bin/incorporate -m gen/pregen/mainnet/metadata.json > gen/mainnet/genesis.json

Makefile

@@ -1,4 +1,5 @@
-[![Build Status](https://travis-ci.com/algorand/go-algorand.svg?branch=master)](https://travis-ci.com/algorand/go-algorand)
+| rel/stable <br> [![CircleCI](https://circleci.com/gh/algorand/go-algorand/tree/rel%2Fstable.svg?style=svg)](https://circleci.com/gh/algorand/go-algorand/tree/rel%2Fstable) | rel/beta  <br> [![CircleCI](https://circleci.com/gh/algorand/go-algorand/tree/rel%2Fbeta.svg?style=svg)](https://circleci.com/gh/algorand/go-algorand/tree/rel%2Fbeta) | rel/nightly  <br> [![CircleCI](https://circleci.com/gh/algorand/go-algorand/tree/rel%2Fnightly.svg?style=svg)](https://circleci.com/gh/algorand/go-algorand/tree/rel%2Fnightly) |
+| --- | --- | --- |
 
 go-algorand
 ====================
@@ -163,13 +164,14 @@ The following packages allow developers to interface with the Algorand system:
      - `cmd/catchupsrv` ([README](cmd/catchupsrv/README.md)) is a tool to
        assist with processing historic blocks on a new node.
   - `libgoal` exports a Go interface useful for developers of Algorand clients.
-  - `debug` holds secondary commands which assist developers during debugging.
+  - `tools` ([README](tools/README.md)) various tools and utilities without a better place to go.
+  - `tools/debug` holds secondary commands which assist developers during debugging.
+  - `tools/misc` ([README](tools/misc/README.md)) small tools that are sometimes handy in a pinch.
 
 The following packages contain tools to help Algorand developers deploy networks
 of their own:
 
   - `nodecontrol`
-  - `tools`
   - `docker`
   - `commandandcontrol` ([README](test/commandandcontrol/README.md)) is a tool to
     automate a network of algod instances.
@@ -190,6 +192,6 @@ A number of packages provide utilities for the various components:
 
 Please see the [COPYING_FAQ](COPYING_FAQ) for details about how to apply our license.
 
-Copyright (C) 2019-2021, Algorand Inc.
+Copyright (C) 2019-2022, Algorand Inc.
 
 [developer site url]: https://developer.algorand.org/

README.md

@@ -4,15 +4,17 @@
 A big thank you to everyone who has contributed to the `go-algorand` codebase.
 
 ### External Contributors
-In no particular order:
-- zacharyestep
+- aybehrouz
+- fionnachan
+- jeapostrophe
 - jecassis
-- mxmauro
-- scnale
 - jsign
+- mxmauro
+- Olshansk
+- qkniep
 - RomitKumar
-- jeapostrophe
-- aybehrouz
+- scnale
+- zacharyestep
 
 ### Bug Reports
 - Nanyan

THANKS.md

@@ -43,7 +43,7 @@ will also recover safely after crashes.
 # Specification
 
 The specification for the protocol implemented by this package is
-located [here](https://github.com/algorand/spec).
+located [here](https://github.com/algorandfoundation/specs).
 
 Optimizations from and other deviations from the spec will be noted
 throughout this file.