reichain
diff --git a/‎.github/CONTRIBUTING.md
+8-2 b/‎.github/CONTRIBUTING.md
+8-2
diff --git a/‎.github/ISSUE_TEMPLATE.md
-28 b/‎.github/ISSUE_TEMPLATE.md
-28
diff --git a/‎.github/ISSUE_TEMPLATE/bug.md b/‎.github/ISSUE_TEMPLATE/bug.md
diff --git a/‎.github/ISSUE_TEMPLATE/feature.md
+17 b/‎.github/ISSUE_TEMPLATE/feature.md
+17
diff --git a/‎.github/ISSUE_TEMPLATE/question.md
+9 b/‎.github/ISSUE_TEMPLATE/question.md
+9
diff --git a/‎.github/workflows/build.yml
+221-4 b/‎.github/workflows/build.yml
+221-4
diff --git a/‎.github/workflows/pr.yml
+2-1 b/‎.github/workflows/pr.yml
+2-1
diff --git a/‎.github/workflows/release.yml
+1-1 b/‎.github/workflows/release.yml
+1-1
diff --git a/‎.github/workflows/upgradebot.yml
+2 b/‎.github/workflows/upgradebot.yml
+2
@@ -1,6 +1,7 @@
 # Contributing
 
-Thank you for your interest in contributing to Quorum!
+Thank you for your interest in contributing to GoQuorum!
+
 We welcome contributions from anyone on the internet, and are grateful for even the
 smallest of fixes!
 
@@ -31,6 +32,11 @@ and help.
 
 ## Configuration, dependencies, and tests
 
-Please see the [Developers' Guide](https://github.com/ethereum/go-ethereum/wiki/Developers'-Guide)
+Please see the [Developers' Guide](https://geth.ethereum.org/docs/developers/devguide)
 for more details on configuring your environment, managing project dependencies
 and testing procedures.
+
+## Issue reproductibility
+
+Before you create an issue, please try to reproduce it with [quorum quick dev start framework](https://github.com/ConsenSys/quorum-dev-quickstart) with the latest release.
+Many issues have been creating under an environment we are not able to reproduce quickly.
@@ -0,0 +1,17 @@
+---
+name: Request a feature
+about: Report a missing feature - e.g. as a step before submitting a PR
+title: ''
+labels: 'type:feature'
+assignees: ''
+---
+
+# Rationale
+
+Why should this feature exist?
+What are the use-cases?
+
+# Implementation
+
+Do you have ideas regarding the implementation of this feature?
+Are you willing to implement this feature?
@@ -0,0 +1,9 @@
+---
+name: Ask a question
+about: Something is unclear
+title: ''
+labels: 'type:docs'
+assignees: ''
+---
+
+This should only be used in very rare cases e.g. if you are not 100% sure if something is a bug or asking a question that leads to improving the documentation. For general questions please use [discord](https://discord.gg/nthXNEv) or the Ethereum stack exchange at https://ethereum.stackexchange.com.
@@ -9,7 +9,7 @@ on:
     branches:
       - master
 env:
-  GO_VERSION: 1.15.5
+  GO_VERSION: 1.15.6
   GOPATH: ${{ github.workspace }}/go
   WORKING_DIR: ${{ github.workspace }}/go/src/github.com/ethereum/go-ethereum
 jobs:
@@ -69,13 +69,14 @@ jobs:
         with:
           name: docker-image
           path: ${{ steps.build.outputs.output_dir }}
-  acceptance-tests:
+  acceptance-tests-1:
     name: Acceptance tests (${{ matrix.tag }})
     needs:
       - docker-build
     if: success()
     strategy:
       fail-fast: false
+      max-parallel: 6
       matrix:
         # list of tag expression being executed in parallel
         # for PR, only selective tests are run.
@@ -101,6 +102,77 @@ jobs:
           - 'basic-rpc-security || networks/plugins::qbft-rpc-security'
           - 'basic-rpc-security || networks/plugins::istanbul-rpc-security'
           - 'migration && networks/template::raft-4nodes'
+          #- 'migration && networks/template::istanbul-4nodes'
+          #- 'migration && networks/template::raft-4nodes-ancientdb'
+          #- 'migration && networks/template::istanbul-4nodes-ancientdb'
+          #- 'permissions-v1 && networks/template::raft-3plus1'
+          #- 'permissions-v2 && networks/template::raft-3plus1'
+          #- 'privacy-enhancements-upgrade || networks/template::raft-4nodes-pe'
+          #- 'privacy-enhancements-upgrade || networks/template::istanbul-4nodes-pe'
+          #- 'multitenancy && networks/plugins::raft-multitenancy'
+          #- 'basic || basic-raft || (advanced && raft) || networks/typical::raft-simple-mps'
+          #- 'basic || basic-istanbul || (advanced && istanbul) || networks/typical::qbft-simple-mps'
+          #- 'basic || basic-istanbul || (advanced && istanbul) || networks/typical::istanbul-simple-mps'
+          #- 'basic || networks/typical::raftmps'
+          #- 'basic || networks/typical::qbftmps'
+          #- 'basic || networks/typical::istanbulmps'
+          #- 'mps-upgrade-txtrace || networks/template::raft-4nodes-mps'
+          #- 'mps-upgrade-txtrace || networks/template::istanbul-4nodes-mps'
+          #- '(basic && !nosupport && !mps && !(spam && !raw) && !eth-api-signed && !privacy-enhancements-disabled && !graphql && !async && !extension && !storage-root && !personal-api-signed) || networks/typical-besu::ibft2'
+          #- '(basic && !nosupport && !mps && !(spam && !raw) && !eth-api-signed && !privacy-enhancements-disabled && !graphql && !async && !extension && !storage-root && !personal-api-signed) || networks/typical-hybrid::hybrid'
+        privacy-enhancements:
+          - 'false'
+        #include:
+        #  - tag: '(basic && !privacy-enhancements-disabled) || privacy-enhancements || basic-raft || (advanced && raft) || networks/typical::raft'
+        #    privacy-enhancements: 'true'
+        #  - tag: '(basic && !privacy-enhancements-disabled) || privacy-enhancements || basic-istanbul || (advanced && istanbul) || networks/typical::istanbul'
+        #    privacy-enhancements: 'true'
+    runs-on: ubuntu-18.04
+    steps:
+      - name: 'Download workflow artifact - Docker image'
+        uses: actions/download-artifact@v1
+        with:
+          name: docker-image
+      - name: 'Load Docker image'
+        id: setup
+        run: |
+          tar xfvz docker-image/quorum-pr.tar.gz
+          docker load --input quorum-pr.tar
+          docker_env_file="${{ runner.temp }}/env.list"
+          echo "TF_VAR_quorum_docker_image={ name = \"quorumengineering/quorum:pr\", local = true }" >> $docker_env_file
+          echo "TF_VAR_privacy_enhancements={block=0, enabled=${{ matrix.privacy-enhancements}}}" >> $docker_env_file
+          echo "::set-output name=outputDir::${{ runner.temp }}"
+          echo "::set-output name=dockerEnvFile::$docker_env_file"
+      - name: 'Run acceptance tests'
+        run: |
+          cat ${{ steps.setup.outputs.dockerEnvFile }}
+          docker run --rm \
+            --network host \
+            -v /var/run/docker.sock:/var/run/docker.sock \
+            -v ${{ steps.setup.outputs.outputDir }}:${{ steps.setup.outputs.outputDir  }} \
+            --env-file ${{ steps.setup.outputs.dockerEnvFile }} \
+            quorumengineering/acctests:latest test \
+              -Pauto \
+              -Dauto.outputDir=${{ steps.setup.outputs.outputDir  }} \
+              -Dtags="${{ matrix.tag }}"
+      - name: 'Debug'
+        run: |
+          docker images
+          docker ps -a
+  acceptance-tests-2:
+    name: Acceptance tests (${{ matrix.tag }})
+    needs:
+      - docker-build
+      - acceptance-tests-1
+    if: success()
+    strategy:
+      fail-fast: false
+      max-parallel: 6
+      matrix:
+        # list of tag expression being executed in parallel
+        # for PR, only selective tests are run.
+        # More comprehensive suites are scheduled to run in master
+        tag:
           - 'migration && networks/template::istanbul-4nodes'
           - 'migration && networks/template::raft-4nodes-ancientdb'
           - 'migration && networks/template::istanbul-4nodes-ancientdb'
@@ -162,7 +234,7 @@ jobs:
     name: Publish Docker Image
     needs:
       - build
-      - acceptance-tests
+      - acceptance-tests-2
     runs-on: ubuntu-18.04
     steps:
       - name: 'Checkout'
@@ -380,4 +452,149 @@ jobs:
           _post() {
             curl -X POST ${{ secrets.SLACK_WEBHOOK_URL }} -H "Content-type: application/json" --data "@${1}"
           }
-          _post "long_message.json" || _post "short_message.json"
+          _post "long_message.json" || _post "short_message.json"
+  build-sentinel:
+    if: always()
+    needs:
+      - build
+      - docker-build
+      - acceptance-tests-1
+      - acceptance-tests-2
+      - publish-docker
+    runs-on: ubuntu-18.04
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: 14
+      - run: npm install @slack/web-api
+      - uses: actions/github-script@v4
+        env:
+          SLACK_TOKEN: "${{ secrets.BUILD_SENTINEL_SLACK_TOKEN }}"
+          CHANNEL_NAME: "${{ secrets.BUILD_SENTINEL_CHANNEL_NAME }}"
+          # The value of the WORKFLOW_ID variable must be equal of the workflow filename, in this case build.yml
+          WORKFLOW_ID: build.yml
+        with:
+          script: |
+            const { WebClient } = require('@slack/web-api')
+
+            const {
+              SLACK_TOKEN,
+              CHANNEL_NAME,
+              WORKFLOW_ID
+            } = process.env;
+
+            const { data: { workflow_runs: runs } } = await github.actions.listWorkflowRuns({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              workflow_id: WORKFLOW_ID
+            });
+
+            const runId = "${{ github.run_id }}"
+            const isLatestRun = runs[0].id == runId;
+
+            // Only the latest run may publish a new message
+            if (!isLatestRun) return;
+
+            const slackClient = new WebClient(SLACK_TOKEN);
+
+            const repository = "${{ github.repository }}";
+
+            const pipelineUrl = `https://github.com/${repository}/actions/runs/${runId}`;
+            const pipelineLinkBlock = {
+              "type": "actions",
+              "elements": [
+                {
+                  "type": "button",
+                  "url": pipelineUrl,
+                  "text": {
+                    "type": "plain_text",
+                    "text": "Visit pipeline",
+                    "emoji": true
+                  }
+                }
+              ]
+            };
+
+            const successEmoji = ":large_green_circle:";
+            const successBlocks = [
+              {
+                "type": "section",
+                "text": {
+                  "type": "plain_text",
+                  "text": `${successEmoji} The build on ${repository} is back to green!`,
+                  "emoji": true
+                }
+              },
+              pipelineLinkBlock
+            ];
+            
+            const failureEmoji = ":red_circle:";
+            const failureBlocks = [
+              {
+                "type": "section",
+                "text": {
+                  "type": "plain_text",
+                  "text": `${failureEmoji} A build job on ${repository} has failed!`,
+                  "emoji": true
+                }
+              },
+              pipelineLinkBlock
+            ];
+
+            const results = [
+              "${{ needs['build'].result }}",
+              "${{ needs['docker-build'].result }}",
+              "${{ needs['acceptance-tests-1'].result }}",
+              "${{ needs['acceptance-tests-2'].result }}",
+              "${{ needs['publish-docker'].result }}",
+            ];
+            const isCurrentRunSuccessful = results.every(r => r === "success");
+
+            // Find channel
+            const { channels } = await slackClient.conversations.list({ types: "private_channel" });
+            const channel = channels.find(c => c.name === CHANNEL_NAME);
+
+            // Find latest bot message among the 100 latest channel messages
+            // The number of loaded messages may be increased
+            const { messages } = await slackClient.conversations.history({
+              channel: channel.id,
+            });
+            const latestBotMessage = messages.find(m => {
+              const isWrittenByTheBot = Boolean(m.bot_profile);
+              if (!isWrittenByTheBot) return false;
+              const notificationText = m.text || "";
+              return notificationText.includes(repository) && (notificationText.startsWith(successEmoji) || notificationText.startsWith(failureEmoji));
+            });
+
+            if (!latestBotMessage) {
+              /** 
+               * The bot is optimistic, if the latest message has not been found
+               * and the run is successful, we assume the situation is fine
+               * if the run is not successful, we publish (possibly again) an error message
+               */
+              if (!isCurrentRunSuccessful) {
+                await slackClient.chat.postMessage({
+                  channel: channel.id,
+                  text: failureBlocks[0].text.text,
+                  blocks: failureBlocks
+                })
+              }
+              return;
+            }
+
+            const isInSuccessState = latestBotMessage.text.startsWith(successEmoji);
+
+            // If no change occurs, do not post any message
+            if (isInSuccessState === isCurrentRunSuccessful) return;
+
+            // Else, create the message and post it
+            const blocks = isCurrentRunSuccessful 
+              ? successBlocks
+              : failureBlocks;
+
+            await slackClient.chat.postMessage({
+              channel: channel.id,
+              text: blocks[0].text.text,
+              blocks
+            })
@@ -6,7 +6,7 @@ on:
       - '**.md'
       - .gitignore
 env:
-  GO_VERSION: 1.15.5
+  GO_VERSION: 1.15.6
 jobs:
   lint:
     name: 'Code linters'
@@ -80,6 +80,7 @@ jobs:
     if: success()
     strategy:
       fail-fast: false
+      max-parallel: 6
       matrix:
         # list of tag expression being executed in parallel
         # for PR, only selective tests are run.
 
@@ -4,7 +4,7 @@ on:
     tags:
       - 'v*'
 env:
-  GO_VERSION: 1.15.5
+  GO_VERSION: 1.15.6
   GOPATH: ${{ github.workspace }}/go
   WORKING_DIR: ${{ github.workspace }}/go/src/github.com/ethereum/go-ethereum
 jobs:
 
@@ -24,4 +24,6 @@ jobs:
           git clone https://github.com/Consensys/quorum-bots.git $GOPATH/src/upgradebot
       - name: Execute upgrade geth bot
         run: |
+          git config --global user.email "${{github.actor}}@users.noreply.github.com"
+          git config --global user.name "${{github.actor}}"
           go run upgradebot/cmd