Merge pull request #737 from celestiaorg/evan/manually-upgrade-v0.35

Add Celestia specifc logic to tendermint v0.35.x

.github/CODEOWNERS

@@ -7,4 +7,7 @@
 # global owners are only requested if there isn't a more specific
 # codeowner specified below. For this reason, the global codeowners
 # are often repeated in package-level definitions.
-*      @ebuchman @cmwaters @tychoish @williambanfield @creachadair
+*       @liamsi @evan-forbes @Wondertan
+
+# Overrides for tooling packages
+docs/ @liamsi @adlerjohn

.github/ISSUE_TEMPLATE/bug-report.md

@@ -10,15 +10,7 @@ Be ready for followup questions, and please respond in a timely
 manner. We might ask you to provide additional logs and data (tendermint & app).
 -->
 
-**Tendermint version** (use `tendermint version` or `git rev-parse --verify HEAD` if installed from source):
-
-
-**ABCI app** (name for built-in, URL for self-written if it's publicly available):
-
-**Environment**:
-- **OS** (e.g. from /etc/os-release):
-- **Install tools**:
-- **Others**:
+**Version** (use `git rev-parse --verify HEAD`):
 
 
 **What happened**:
@@ -27,16 +19,14 @@ manner. We might ask you to provide additional logs and data (tendermint & app).
 **What you expected to happen**:
 
 
-**Have you tried the latest version**: yes/no
-
 **How to reproduce it** (as minimally and precisely as possible):
 
 **Logs (paste a small part showing an error (< 10 lines) or link a pastebin, gist, etc. containing more of the log file)**:
 
-**Config (you can paste only the changes you've made)**:
+**Config (you can paste only the changes you've made to the config)**:
 
 **node command runtime flags**:
 
 **Please provide the output from the `http://<ip>:<port>/dump_consensus_state` RPC endpoint for consensus bugs**
 
-**Anything else we need to know**:
+**Anything else**:

.github/ISSUE_TEMPLATE/implement-feature.md

@@ -0,0 +1,45 @@
+---
+name: Actionable implementation task
+about: A well-defined, already decided-on, actionable implementation task.
+
+---
+
+## Summary
+
+<!-- Short, concise description of what feature the implementation will cover -->
+
+## Details
+
+<!--
+Particularly if this implementation was not already discussed in a Proposal issue,
+or even in an ADR, please include as many details as possible about what this
+implementation task covers.
+
+Also cover WHY this is needed!
+-->
+
+### Action Items
+<!-- Short, concise list of actionable sub-tasks -->
+- [ ] sub-task 1
+<!-- open issues for sub-tasks where it makes sense
+rule of thumb: is a sub-task more than 1-2 days of work? -> requires own issue -->
+
+### References
+
+<!--
+Add references and all relations to:
+ - other issues
+    - particularly Proposals (if applicable)
+    - Important: related tracking issue!
+ - other pull requests
+ - discussions
+ - and ADRs
+
+examples:
+blocked by: #XXX
+depends on: #XXX
+implements ADR: link to ADR
+included in: #link to tracking issue
+reference to specification: perma-link to spec
+-->
+

.github/ISSUE_TEMPLATE/proposal.md

@@ -0,0 +1,35 @@
+---
+name: proposal
+about: Propose an improvement, feature, or change to core components
+
+---
+
+<!-- < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < ☺
+v          ✰  Thanks for proposing an improvement or feature! ✰
+v    Before smashing the submit button please review the template.
+v    Word of caution: poorly thought-out proposals may be rejected
+v                     without deliberation
+☺ > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > >  -->
+
+## Summary
+
+<!-- Short, concise description of the proposed feature / change -->
+
+## Problem Definition
+
+<!-- Why do we need this feature?
+What problems may be addressed by introducing this feature?
+What benefits does we gain by including this feature?
+Are there any disadvantages of including this feature? -->
+
+## Proposal
+
+<!-- Detailed description of requirements of implementation -->
+
+### Implementation
+
+<!-- Include details on how the implementation would look like -->
+<!-- Point to branches, draft PRs with spike, proof of concept or tracer implementations -->
+
+<!-- If the change is large, how will the changes be broken up for ease of review? -->
+

.github/ISSUE_TEMPLATE/write-adr.md

@@ -0,0 +1,43 @@
+---
+name: ADR
+about: Write an ADR for certain aspect of the system
+
+---
+
+## Summary
+
+<!-- Short, concise description of what this ADR should cover -->
+
+## Details
+
+<!-- Add more details about the nature of this ADR -->
+
+<!-- Jot down expectations as clearly as possible
+Does this ADR cover changes to:
+ - public API?
+ - changes to Tendermint core types?
+ - the p2p networking layer?
+ - storage?
+ - user interface?
+ - some other core component (mempool, gossiping etc)
+-->
+
+<!--
+If this ADR is part of some time critical, urgent feature, please be
+explicit about this in the issue already.
+This will help guiding the author on decision for the implementation plan.
+-->
+
+## References and Context
+
+<!-- Usually, before we decide to write ADR about a certain aspect,
+there are pre-existing:
+ - reference to specification (perma-link to spec)
+ - discussions
+ - issues (e.g. Proposals)
+ - or even draft PRs.
+
+Make sure to link those here to facilitate writing the ADR and
+to give the author all required context (this can be helpful even
+if you are the author yourself).
+-->

.github/dependabot.yml

@@ -20,8 +20,5 @@ updates:
       interval: daily
       time: "11:00"
     open-pull-requests-limit: 10
-    reviewers:
-      - melekes
-      - tessr
     labels:
       - T:dependencies

.github/workflows/build.yml

@@ -58,25 +58,26 @@ jobs:
         shell: bash
         if: "env.GIT_DIFF != ''"
 
-  test_apps:
-    runs-on: ubuntu-latest
-    needs: build
-    timeout-minutes: 5
-    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "1.17"
-      - uses: actions/checkout@v3
-      - uses: technote-space/get-diff-action@v6
-        with:
-          PATTERNS: |
-            **/**.go
-            go.mod
-            go.sum
-      - name: install
-        run: make install install_abci
-        if: "env.GIT_DIFF != ''"
-      - name: test_apps
-        run: test/app/test.sh
-        shell: bash
-        if: "env.GIT_DIFF != ''"
+  # TODO: re-enable this test after upgrading to v0.36.x
+  # test_apps:
+  #   runs-on: ubuntu-latest
+  #   needs: build
+  #   timeout-minutes: 5
+  #   steps:
+  #     - uses: actions/setup-go@v3
+  #       with:
+  #         go-version: "1.17"
+  #     - uses: actions/checkout@v3
+  #     - uses: technote-space/get-diff-action@v6
+  #       with:
+  #         PATTERNS: |
+  #           **/**.go
+  #           go.mod
+  #           go.sum
+  #     - name: install
+  #       run: make install install_abci
+  #       if: "env.GIT_DIFF != ''"
+  #     - name: test_apps
+  #       run: test/app/test.sh
+  #       shell: bash
+  #       if: "env.GIT_DIFF != ''"

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

@@ -27,7 +27,7 @@ jobs:
 
       - uses: actions/checkout@v3
         with:
-          ref: 'v0.34.x'
+          ref: 'v0.35.x'
 
       - name: Build
         working-directory: test/e2e
@@ -56,7 +56,7 @@ jobs:
           SLACK_USERNAME: Nightly E2E Tests
           SLACK_ICON_EMOJI: ':skull:'
           SLACK_COLOR: danger
-          SLACK_MESSAGE: Nightly E2E tests failed on v0.34.x
+          SLACK_MESSAGE: Nightly E2E tests failed on v0.35.x
           SLACK_FOOTER: ''
 
   e2e-nightly-success:  # may turn this off once they seem to pass consistently
@@ -72,5 +72,5 @@ jobs:
           SLACK_USERNAME: Nightly E2E Tests
           SLACK_ICON_EMOJI: ':white_check_mark:'
           SLACK_COLOR: good
-          SLACK_MESSAGE: Nightly E2E tests passed on v0.34.x
+          SLACK_MESSAGE: Nightly E2E tests passed on v0.35.x
           SLACK_FOOTER: ''

.github/workflows/e2e.yml

@@ -12,7 +12,7 @@ on:
 jobs:
   e2e-test:
     runs-on: ubuntu-latest
-    timeout-minutes: 15
+    timeout-minutes: 25
     steps:
       - uses: actions/setup-go@v3
         with:

.github/workflows/linter.yml

@@ -12,6 +12,7 @@ on:
     paths:
       - "**.md"
       - "**.yml"
+      - "**.yaml"
 
 jobs:
   build:
@@ -20,11 +21,14 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
+        with:
+          # Full git history is needed to get a proper list of changed files within `super-linter`
+          fetch-depth: 0
       - name: Lint Code Base
         uses: docker://github/super-linter:v4
         env:
           VALIDATE_ALL_CODEBASE: true
-          DEFAULT_BRANCH: master
+          DEFAULT_BRANCH: v0.35.x-celestia
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VALIDATE_MD: true
           VALIDATE_OPENAPI: true

DOCKER/Dockerfile

@@ -1,5 +1,5 @@
 # stage 1 Generate Tendermint Binary
-FROM golang:1.16-alpine as builder
+FROM golang:1.17-alpine as builder
 RUN apk update && \
     apk upgrade && \
     apk --no-cache add make

Makefile

@@ -4,6 +4,8 @@ BUILDDIR ?= $(CURDIR)/build
 
 BUILD_TAGS?=tendermint
 
+IMAGE := ghcr.io/tendermint/docker-build-proto:latest
+
 # If building a release, please checkout the version tag to get the correct version setting
 ifneq ($(shell git symbolic-ref -q --short HEAD),)
 VERSION := unreleased-$(shell git symbolic-ref -q --short HEAD)-$(shell git rev-parse HEAD)
@@ -15,7 +17,7 @@ LD_FLAGS = -X github.com/tendermint/tendermint/version.TMVersion=$(VERSION)
 BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)"
 HTTPS_GIT := https://github.com/tendermint/tendermint.git
 BUILD_IMAGE := ghcr.io/tendermint/docker-build-proto
-BASE_BRANCH := v0.35.x
+BASE_BRANCH := v0.35.x-celestia
 DOCKER_PROTO := docker run -v $(shell pwd):/workspace --workdir /workspace $(BUILD_IMAGE)
 CGO_ENABLED ?= 0