Pull most recent changes from upstream

.github/workflows/coverage.yml

@@ -12,7 +12,7 @@ jobs:
   split-test-files:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - name: Create a file with all the pkgs
         run: go list ./... > pkgs.txt
       - name: Split pkgs into 4 files
@@ -47,7 +47,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: "1.17"
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - uses: technote-space/get-diff-action@v5
         with:
           PATTERNS: |
@@ -70,7 +70,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: "1.17"
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - uses: technote-space/get-diff-action@v5
         with:
           PATTERNS: |
@@ -99,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: tests
     steps:
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - uses: technote-space/get-diff-action@v5
         with:
           PATTERNS: |

.github/workflows/docker.yml

@@ -14,7 +14,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - name: Prepare
         id: prep
         run: |

.github/workflows/e2e-nightly-34x.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           go-version: '1.17'
 
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
         with:
           ref: 'v0.34.x'
 

.github/workflows/e2e-nightly-35x.yml

@@ -25,7 +25,7 @@ jobs:
         with:
           go-version: '1.17'
 
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
         with:
           ref: 'v0.35.x'
 

.github/workflows/e2e-nightly-master.yml

@@ -24,7 +24,7 @@ jobs:
         with:
           go-version: '1.17'
 
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
 
       - name: Build
         working-directory: test/e2e

.github/workflows/e2e.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: '1.17'
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - uses: technote-space/get-diff-action@v5
         with:
           PATTERNS: |

.github/workflows/fuzz-nightly.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           go-version: '1.17'
 
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
 
       - name: Install go-fuzz
         working-directory: test/fuzz

.github/workflows/jepsen.yml

@@ -46,7 +46,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the Jepsen repository
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           repository: 'tendermint/jepsen'
 

.github/workflows/linkchecker.yml

@@ -6,7 +6,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - uses: gaurav-nelson/[email protected]
         with:
           folder-path: "docs"

.github/workflows/lint.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 8
     steps:
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - uses: technote-space/get-diff-action@v5
         with:
           PATTERNS: |

.github/workflows/linter.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
       - name: Lint Code Base
         uses: docker://github/super-linter:v3
         env:

.github/workflows/proto.yml

@@ -11,13 +11,13 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 4
     steps:
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - name: lint
         run: make proto-lint
   proto-breakage:
     runs-on: ubuntu-latest
     timeout-minutes: 4
     steps:
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - name: check-breakage
         run: make proto-check-breaking-ci

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/[email protected].4
+        uses: actions/[email protected].5
         with:
           fetch-depth: 0
 

.github/workflows/tests.yml

@@ -18,7 +18,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: "1.17"
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - uses: technote-space/get-diff-action@v5
         with:
           PATTERNS: |
@@ -50,7 +50,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: "1.17"
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - uses: technote-space/get-diff-action@v5
         with:
           PATTERNS: |
@@ -81,7 +81,7 @@ jobs:
       - uses: actions/setup-go@v2
         with:
           go-version: "1.17"
-      - uses: actions/[email protected].4
+      - uses: actions/[email protected].5
       - uses: technote-space/get-diff-action@v5
         with:
           PATTERNS: |

.gitignore

@@ -46,3 +46,10 @@ test/fuzz/**/corpus
 test/fuzz/**/crashers
 test/fuzz/**/suppressions
 test/fuzz/**/*.zip
+proto/tendermint/blocksync/types.proto
+proto/tendermint/consensus/types.proto
+proto/tendermint/mempool/*.proto
+proto/tendermint/p2p/*.proto
+proto/tendermint/statesync/*.proto
+proto/tendermint/types/*.proto
+proto/tendermint/version/*.proto

CHANGELOG_PENDING.md

@@ -15,6 +15,7 @@ Special thanks to external contributors on this release:
   - [rpc] Remove the deprecated gRPC interface to the RPC service (@creachadair).
 
 - Apps
+  - [proto/tendermint] \#6976 Remove core protobuf files in favor of only housing them in the [tendermint/spec](https://github.com/tendermint/spec) repository.
 
 - P2P Protocol
 

CONTRIBUTING.md

@@ -109,7 +109,7 @@ We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along
 
 For linting, checking breaking changes and generating proto stubs, we use [buf](https://buf.build/). If you would like to run linting and check if the changes you have made are breaking then you will need to have docker running locally. Then the linting cmd will be `make proto-lint` and the breaking changes check will be `make proto-check-breaking`.
 
-We use [Docker](https://www.docker.com/) to generate the protobuf stubs. To generate the stubs yourself, make sure docker is running then run `make proto-gen`.
+We use [Docker](https://www.docker.com/) to generate the protobuf stubs. To generate the stubs yourself, make sure docker is running then run `make proto-gen`. This command uses the spec repo to get the necessary protobuf files for generating the go code. If you are modifying the proto files manually for changes in the core data structures, you will need to clone them into the go repo and comment out lines 22-37 of the file `./scripts/protocgen.sh`.
 
 ### Visual Studio Code