remove ambiguous metric

add unit
add metrics documentation
2026-01-24 13:42:05 +00:00 · 2022-08-04 15:11:16 -04:00 · 2022-08-04 15:08:28 -04:00 · 2022-08-04 13:00:06 -04:00 · 2022-08-04 12:44:12 -04:00
581 changed files with 14121 additions and 25403 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,16 +10,6 @@ updates:
      - T:dependencies
      - S:automerge

-  - package-ecosystem: github-actions
-    directory: "/"
-    schedule:
-      interval: weekly
-    target-branch: "v0.37.x"
-    open-pull-requests-limit: 10
-    labels:
-      - T:dependencies
-      - S:automerge
-
  - package-ecosystem: github-actions
    directory: "/"
    schedule:
@@ -50,18 +40,6 @@ updates:
      - T:dependencies
      - S:automerge

-  - package-ecosystem: gomod
-    directory: "/"
-    schedule:
-      interval: weekly
-    target-branch: "v0.37.x"
-    # Only allow automated security-related dependency updates until we cut the
-    # final v0.37.0 release.
-    open-pull-requests-limit: 0
-    labels:
-      - T:dependencies
-      - S:automerge
-
  - package-ecosystem: gomod
    directory: "/"
    schedule:
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -17,14 +17,6 @@ pull_request_rules:
          {{ title }} (#{{ number }})

          {{ body }}
-  - name: backport patches to v0.37.x branch
-    conditions:
-      - base=main
-      - label=S:backport-to-v0.37.x
-    actions:
-      backport:
-        branches:
-          - v0.37.x
  - name: backport patches to v0.34.x branch
    conditions:
      - base=main
--- a/.github/workflows/check-generated.yml
+++ b/.github/workflows/check-generated.yml
@@ -18,7 +18,7 @@ jobs:
    steps:
      - uses: actions/setup-go@v3
        with:
-          go-version: "1.18"
+          go-version: '1.18'

      - uses: actions/checkout@v3

@@ -26,6 +26,8 @@ jobs:
        run: |
          set -euo pipefail

+          readonly MOCKERY=2.12.3  # N.B. no leading "v"
+          curl -sL "https://github.com/vektra/mockery/releases/download/v${MOCKERY}/mockery_${MOCKERY}_Linux_x86_64.tar.gz" | tar -C /usr/local/bin -xzf -
          make mockery 2>/dev/null

          if ! git diff --stat --exit-code ; then
@@ -42,11 +44,11 @@ jobs:
    steps:
      - uses: actions/setup-go@v3
        with:
-          go-version: "1.18"
+          go-version: '1.18'

      - uses: actions/checkout@v3
        with:
-          fetch-depth: 1 # we need a .git directory to run git diff
+          fetch-depth: 1  # we need a .git directory to run git diff

      - name: "Check protobuf generated code"
        run: |
@@ -59,7 +61,7 @@ jobs:
          export GOBIN="${tools}/bin"

          go install github.com/bufbuild/buf/cmd/buf
-          go install github.com/cosmos/gogoproto/protoc-gen-gogofaster@latest
+          go install github.com/gogo/protobuf/protoc-gen-gogofaster@latest

          make proto-gen

--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -6,10 +6,8 @@ on:
    branches:
      - main
    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+"               # Push events to matching v*, i.e. v1.0, v20.15.10
-      - "v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+"  # e.g. v0.37.0-alpha.1, v0.38.0-alpha.10
-      - "v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+"   # e.g. v0.37.0-beta.1, v0.38.0-beta.10
-      - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"      # e.g. v0.37.0-rc1, v0.38.0-rc10
+      - "v[0-9]+.[0-9]+.[0-9]+"  # Push events to matching v*, i.e. v1.0, v20.15.10
+      - "v[0-9]+.[0-9]+.[0-9]+-rc*"  # Push events to matching v*, i.e. v1.0-rc1, v20.15.10-rc5

 jobs:
  build:
@@ -51,7 +49,7 @@ jobs:
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Publish to Docker Hub
-        uses: docker/build-push-action@v3.1.1
+        uses: docker/build-push-action@v3.1.0
        with:
          context: .
          file: ./DOCKER/Dockerfile
--- a/.github/workflows/docs-deployment.yml
+++ b/.github/workflows/docs-deployment.yml
@@ -8,7 +8,6 @@ on:
  push:
    branches:
      - main
-      - v0.34.x
    paths:
      - docs/**
      - spec/**
@@ -41,7 +40,7 @@ jobs:
      - uses: actions/upload-artifact@v3
        with:
          name: build-output
-          path: /tmp/tendermint-core-docs
+          path: ~/output/

  deploy:
    name: Deploy to GitHub Pages
--- a/.github/workflows/docs-toc.yml
+++ b/.github/workflows/docs-toc.yml
@@ -1,20 +1,21 @@
+# TODO(thane): Re-enable once we've pulled in the ADRs and RFCs from master.
 # Verify that important design docs have ToC entries.
-name: Check documentation ToC
-on:
-  pull_request:
-    push:
-      branches:
-        - main
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: technote-space/get-diff-action@v6
-        with:
-          PATTERNS: |
-            docs/architecture/**
-            docs/rfc/**
-      - run: make check-docs-toc
-        if: env.GIT_DIFF
+#name: Check documentation ToC
+#on:
+#  pull_request:
+#    push:
+#      branches:
+#        - main
+#
+#jobs:
+#  check:
+#    runs-on: ubuntu-latest
+#    steps:
+#      - uses: actions/checkout@v3
+#      - uses: technote-space/get-diff-action@v6
+#        with:
+#          PATTERNS: |
+#            docs/architecture/**
+#            docs/rfc/**
+#      - run: ./docs/presubmit.sh
+#        if: env.GIT_DIFF
--- a/.github/workflows/e2e-nightly-34x.yml
+++ b/.github/workflows/e2e-nightly-34x.yml
@@ -15,7 +15,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        group: ['00', '01']
+        group: ['00', '01', '02', '03', "04"]
    runs-on: ubuntu-latest
    timeout-minutes: 60
    steps:
@@ -27,12 +27,6 @@ jobs:
        with:
          ref: 'v0.34.x'

-      - name: Capture git repo info
-        id: git-info
-        run: |
-          echo "::set-output name=branch::`git branch --show-current`"
-          echo "::set-output name=commit::`git rev-parse HEAD`"
-
      - name: Build
        working-directory: test/e2e
        # Run make jobs in parallel, since we can't run steps in parallel.
@@ -47,33 +41,18 @@ jobs:
        working-directory: test/e2e
        run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml

-    outputs:
-      git-branch: ${{ steps.git-info.outputs.branch }}
-      git-commit: ${{ steps.git-info.outputs.commit }}
-
  e2e-nightly-fail:
    needs: e2e-nightly-test
    if: ${{ failure() }}
    runs-on: ubuntu-latest
    steps:
      - name: Notify Slack on failure
-        uses: slackapi/slack-github-action@v1.22.0
+        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-          BRANCH: ${{ needs.e2e-nightly-test.outputs.git-branch }}
-          RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          COMMIT_URL: "${{ github.server_url }}/${{ github.repository }}/commit/${{ needs.e2e-nightly-test.outputs.git-commit }}"
-        with:
-          payload: |
-            {
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMIT_URL }}|commit> that caused the failure."
-                  }
-                }
-              ]
-            }
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_CHANNEL: tendermint-internal
+          SLACK_USERNAME: Nightly E2E Tests
+          SLACK_ICON_EMOJI: ':skull:'
+          SLACK_COLOR: danger
+          SLACK_MESSAGE: Nightly E2E tests failed on v0.34.x
+          SLACK_FOOTER: ''
--- a/.github/workflows/e2e-nightly-37x.yml
+++ b/.github/workflows/e2e-nightly-37x.yml
@@ -1,79 +0,0 @@
-# Runs randomly generated E2E testnets nightly on the v0.37.x branch.
-
-# !! This file should be kept in sync with the e2e-nightly-main.yml file,
-# modulo changes to the version labels.
-
-name: e2e-nightly-37x
-on:
-  schedule:
-    - cron: '0 2 * * *'
-
-jobs:
-  e2e-nightly-test:
-    # Run parallel jobs for the listed testnet groups (must match the
-    # ./build/generator -g flag)
-    strategy:
-      fail-fast: false
-      matrix:
-        group: ['00', '01', '02', '03', "04"]
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.18'
-
-      - uses: actions/checkout@v3
-        with:
-          ref: 'v0.37.x'
-
-      - name: Capture git repo info
-        id: git-info
-        run: |
-          echo "::set-output name=branch::`git branch --show-current`"
-          echo "::set-output name=commit::`git rev-parse HEAD`"
-
-      - name: Build
-        working-directory: test/e2e
-        # Run make jobs in parallel, since we can't run steps in parallel.
-        run: make -j2 docker generator runner tests
-
-      - name: Generate testnets
-        working-directory: test/e2e
-        # When changing -g, also change the matrix groups above
-        run: ./build/generator -g 5 -d networks/nightly/
-
-      - name: Run ${{ matrix.p2p }} p2p testnets
-        working-directory: test/e2e
-        run: ./run-multiple.sh networks/nightly/*-group${{ matrix.group }}-*.toml
-
-    outputs:
-      git-branch: ${{ steps.git-info.outputs.branch }}
-      git-commit: ${{ steps.git-info.outputs.commit }}
-
-  e2e-nightly-fail:
-    needs: e2e-nightly-test
-    if: ${{ failure() }}
-    runs-on: ubuntu-latest
-    steps:
-      - name: Notify Slack on failure
-        uses: slackapi/slack-github-action@v1.22.0
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-          BRANCH: ${{ needs.e2e-nightly-test.outputs.git-branch }}
-          RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          COMMIT_URL: "${{ github.server_url }}/${{ github.repository }}/commit/${{ needs.e2e-nightly-test.outputs.git-commit }}"
-        with:
-          payload: |
-            {
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMIT_URL }}|commit> that caused the failure."
-                  }
-                }
-              ]
-            }
--- a/.github/workflows/e2e-nightly-main.yml
+++ b/.github/workflows/e2e-nightly-main.yml
@@ -46,23 +46,28 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Notify Slack on failure
-        uses: slackapi/slack-github-action@v1.22.0
+        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-          BRANCH: ${{ github.ref_name }}
-          RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-          COMMIT_URL: "${{ github.server_url }}/${{ github.repository }}/commit/${{ github.sha }}"
-        with:
-          payload: |
-            {
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": ":skull: Nightly E2E tests for `${{ env.BRANCH }}` failed. See the <${{ env.RUN_URL }}|run details> and the <${{ env.COMMIT_URL }}|commit> that caused the failure."
-                  }
-                }
-              ]
-            }
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_CHANNEL: tendermint-internal
+          SLACK_USERNAME: Nightly E2E Tests
+          SLACK_ICON_EMOJI: ':skull:'
+          SLACK_COLOR: danger
+          SLACK_MESSAGE: Nightly E2E tests failed on main
+          SLACK_FOOTER: ''
+
+  e2e-nightly-success:  # may turn this off once they seem to pass consistently
+    needs: e2e-nightly-test
+    if: ${{ success() }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Notify Slack on success
+        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
+        env:
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_CHANNEL: tendermint-internal
+          SLACK_USERNAME: Nightly E2E Tests
+          SLACK_ICON_EMOJI: ':white_check_mark:'
+          SLACK_COLOR: good
+          SLACK_MESSAGE: Nightly E2E tests passed on main
+          SLACK_FOOTER: ''
--- a/.github/workflows/fuzz-nightly.yml
+++ b/.github/workflows/fuzz-nightly.yml
@@ -75,24 +75,13 @@ jobs:
    if: ${{ needs.fuzz-nightly-test.outputs.crashers-count != 0 }}
    runs-on: ubuntu-latest
    steps:
-      - name: Notify Slack on failure
-        uses: slackapi/slack-github-action@v1.22.0
+      - name: Notify Slack if any crashers
+        uses: rtCamp/action-slack-notify@12e36fc18b0689399306c2e0b3e0f2978b7f1ee7
        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
-          SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
-          BRANCH: ${{ github.ref_name }}
-          CRASHERS: ${{ needs.fuzz-nightly-test.outputs.crashers-count }}
-          RUN_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
-        with:
-          payload: |
-            {
-              "blocks": [
-                {
-                  "type": "section",
-                  "text": {
-                    "type": "mrkdwn",
-                    "text": ":skull: Nightly fuzz tests for `${{ env.BRANCH }}` failed with ${{ env.CRASHERS }} crasher(s). See the <${{ env.RUN_URL }}|run details>."
-                  }
-                }
-              ]
-            }
+          SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
+          SLACK_CHANNEL: tendermint-internal
+          SLACK_USERNAME: Nightly Fuzz Tests
+          SLACK_ICON_EMOJI: ':firecracker:'
+          SLACK_COLOR: danger
+          SLACK_MESSAGE: Crashers found in Nightly Fuzz tests
+          SLACK_FOOTER: ''
--- a/.github/workflows/gosec.yml
+++ b/.github/workflows/gosec.yml
@@ -1,41 +0,0 @@
-name: Run Gosec
-on:
-  pull_request:
-    paths:
-      - '**/*.go'
-      - 'go.mod'
-      - 'go.sum'
-  push:
-    branches:
-      - main
-      - 'feature/*'
-      - 'v0.37.x'
-      - 'v0.34.x'
-    paths:
-      - '**/*.go'
-      - 'go.mod'
-      - 'go.sum'
-
-jobs:
-  Gosec:
-    permissions:
-      security-events: write
-
-    runs-on: ubuntu-latest
-    env:
-      GO111MODULE: on
-    steps:
-      - name: Checkout Source
-        uses: actions/checkout@v3
-
-      - name: Run Gosec Security Scanner
-        uses: cosmos/gosec@master
-        with:
-          # Let the report trigger a failure with the Github Security scanner features.
-          args: "-no-fail -fmt sarif -out results.sarif ./..."
-
-      - name: Upload SARIF file
-        uses: github/codeql-action/upload-sarif@v2
-        with:
-          # Path to SARIF file relative to the root of the repository
-          sarif_file: results.sarif
--- a/.github/workflows/janitor.yml
+++ b/.github/workflows/janitor.yml
@@ -10,7 +10,7 @@ jobs:
    runs-on: ubuntu-latest
    timeout-minutes: 3
    steps:
-      - uses: styfle/cancel-workflow-action@0.10.1
+      - uses: styfle/cancel-workflow-action@0.10.0
        with:
          workflow_id: 1041851,1401230,2837803
          access_token: ${{ github.token }}
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -1,40 +0,0 @@
-name: "Pre-release"
-
-on:
-  push:
-    tags:
-      - "v[0-9]+.[0-9]+.[0-9]+-alpha.[0-9]+"  # e.g. v0.37.0-alpha.1, v0.38.0-alpha.10
-      - "v[0-9]+.[0-9]+.[0-9]+-beta.[0-9]+"   # e.g. v0.37.0-beta.1, v0.38.0-beta.10
-      - "v[0-9]+.[0-9]+.[0-9]+-rc[0-9]+"      # e.g. v0.37.0-rc1, v0.38.0-rc10
-
-jobs:
-  goreleaser:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.18'
-
-      - name: Build
-        uses: goreleaser/goreleaser-action@v3
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
-          version: latest
-          args: build --skip-validate   # skip validate skips initial sanity checks in order to be able to fully run
-
-      # Link to CHANGELOG_PENDING.md as release notes.
-      - run: echo https://github.com/tendermint/tendermint/blob/${GITHUB_REF#refs/tags/}/CHANGELOG_PENDING.md > ../release_notes.md
-
-      - name: Release
-        uses: goreleaser/goreleaser-action@v3
-        if: startsWith(github.ref, 'refs/tags/')
-        with:
-          version: latest
-          args: release --rm-dist --release-notes=../release_notes.md
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/proto-lint.yml
+++ b/.github/workflows/proto-lint.yml
@@ -15,7 +15,7 @@ jobs:
    timeout-minutes: 5
    steps:
      - uses: actions/checkout@v3
-      - uses: bufbuild/buf-setup-action@v1.8.0
+      - uses: bufbuild/buf-setup-action@v1.7.0
      - uses: bufbuild/buf-lint-action@v1
        with:
          input: 'proto'
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -7,7 +7,7 @@ jobs:
  stale:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/stale@v6
+      - uses: actions/stale@v5
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          stale-pr-message: "This pull request has been automatically marked as stale because it has not had
--- a/.gitignore
+++ b/.gitignore
@@ -38,7 +38,6 @@ terraform.tfstate
 terraform.tfstate.backup
 terraform.tfstate.d
 test/app/grpc_client
-test/loadtime/build
 test/e2e/build
 test/e2e/networks/*/
 test/logs
@@ -52,6 +51,7 @@ proto/spec/**/*.pb.go
 *.aux
 *.bbl
 *.blg
+*.log
 *.pdf
 *.gz
 *.dvi
--- a/.goreleaser.yml
+++ b/.goreleaser.yml
@@ -25,8 +25,7 @@ checksum:
  algorithm: sha256

 release:
-  prerelease: auto
-  name_template: "{{.Version}}"
+  name_template: "{{.Version}} (WARNING: BETA SOFTWARE)"

 archives:
  - files:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,38 +2,6 @@

 Friendly reminder, we have a [bug bounty program](https://hackerone.com/cosmos).

-## v0.34.21
-
-Release highlights include:
-
- A new `[storage]` configuration section and flag `discard_abci_responses`,
-  which, if enabled, discards all ABCI responses except the latest one in order
-  to reduce disk space usage in the state store. When enabled, the
-  `block_results` RPC endpoint can no longer function and will return an error.
- A new CLI command, `reindex-event`, to re-index block and tx events to the
-  event sinks. You can run this command when the event store backend
-  dropped/disconnected or you want to replace the backend. When
-  `discard_abci_responses` is enabled, you will not be able to use this command.
-
-Special thanks to external contributors on this release: @rootwarp & @animart
-
-### FEATURES
-
- [cli] [\#9083](https://github.com/tendermint/tendermint/issues/9083) Backport command to reindex missed events (@cmwaters)
- [cli] [\#9107](https://github.com/tendermint/tendermint/issues/9107) Add the `p2p.external-address` argument to set the node P2P external address (@amimart)
-
-### IMPROVEMENTS
-
- [config] [\#9054](https://github.com/tendermint/tendermint/issues/9054) `discard_abci_responses` flag added to discard all ABCI
-  responses except the last in order to save on storage space in the state
-  store (@samricotta)
-
-### BUG FIXES
-
- [mempool] [\#9033](https://github.com/tendermint/tendermint/issues/9033) Rework lock discipline to mitigate callback deadlocks in the
-  priority mempool
- [cli] [\#9103](https://github.com/tendermint/tendermint/issues/9103) fix unsafe-reset-all for working with home path (@rootwarp)
-
 ## v0.34.20

 Special thanks to external contributors on this release: @joeabbey @yihuang
@@ -470,7 +438,7 @@ Special thanks to external contributors on this release: @james-ray, @fedekunze,
 - [abci] [\#5174](https://github.com/tendermint/tendermint/pull/5174) Remove `MockEvidence` in favor of testing with actual evidence types (`DuplicateVoteEvidence` & `LightClientAttackEvidence`) (@cmwaters)
 - [abci] [\#5191](https://github.com/tendermint/tendermint/pull/5191) Add `InitChain.InitialHeight` field giving the initial block height (@erikgrinaker)
 - [abci] [\#5227](https://github.com/tendermint/tendermint/pull/5227) Add `ResponseInitChain.app_hash` which is recorded in genesis block (@erikgrinaker)
- [config] [\#5147](https://github.com/tendermint/tendermint/pull/5147) Add `--consensus.double_sign_check_height` flag and `DoubleSignCheckHeight` config variable. See [ADR-51](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-051-double-signing-risk-reduction.md) (@dongsam)
+- [config] [\#5147](https://github.com/tendermint/tendermint/pull/5147) Add `--consensus.double_sign_check_height` flag and `DoubleSignCheckHeight` config variable. See [ADR-51](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-051-double-signing-risk-reduction.md) (@dongsam)
 - [db] [\#5233](https://github.com/tendermint/tendermint/pull/5233) Add support for `badgerdb` database backend (@erikgrinaker)
 - [evidence] [\#4532](https://github.com/tendermint/tendermint/pull/4532) Handle evidence from light clients (@melekes)
 - [evidence] [#4821](https://github.com/tendermint/tendermint/pull/4821) Amnesia (light client attack) evidence can be detected, verified and committed (@cmwaters)
@@ -484,7 +452,7 @@ Special thanks to external contributors on this release: @james-ray, @fedekunze,
 - [rpc] [\#5017](https://github.com/tendermint/tendermint/pull/5017) Add `/check_tx` endpoint to check transactions without executing them or adding them to the mempool (@melekes)
 - [rpc] [\#5108](https://github.com/tendermint/tendermint/pull/5108) Subscribe using the websocket for new evidence events (@cmwaters)
 - [statesync] Add state sync support, where a new node can be rapidly bootstrapped by fetching state snapshots from peers instead of replaying blocks. See the `[statesync]` config section.
- [evidence] [\#5361](https://github.com/tendermint/tendermint/pull/5361) Add LightClientAttackEvidence and refactor evidence lifecycle - for more information see [ADR-059](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-059-evidence-composition-and-lifecycle.md) (@cmwaters)
+- [evidence] [\#5361](https://github.com/tendermint/tendermint/pull/5361) Add LightClientAttackEvidence and refactor evidence lifecycle - for more information see [ADR-059](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-059-evidence-composition-and-lifecycle.md) (@cmwaters)

 ### IMPROVEMENTS

@@ -564,7 +532,7 @@ This security release fixes:
 Tendermint 0.33.0 and above allow block proposers to include signatures for the
 wrong block. This may happen naturally if you start a network, have it run for
 some time and restart it **without changing the chainID**. (It is a
-[misconfiguration](https://docs.tendermint.com/v0.33/tendermint-core/using-tendermint.html)
+[misconfiguration](https://docs.tendermint.com/master/tendermint-core/using-tendermint.html)
 to reuse chainIDs.) Correct block proposers will accidentally include signatures
 for the wrong block if they see these signatures, and then commits won't validate,
 making all proposed blocks invalid. A malicious validator (even with a minimal
@@ -863,7 +831,7 @@ and a validator address plus a timestamp. Note we may remove the validator
 address & timestamp fields in the future (see ADR-25).

 `lite2` package has been added to solve `lite` issues and introduce weak
-subjectivity interface. Refer to the [spec](https://github.com/tendermint/tendermint/tree/main/spec/consensus/light-client) for complete details.
+subjectivity interface. Refer to the [spec](https://github.com/tendermint/spec/blob/master/spec/consensus/light-client.md) for complete details.
 `lite` package is now deprecated and will be removed in v0.34 release.

 ### BREAKING CHANGES:
@@ -1223,8 +1191,8 @@ Special thanks to external contributors on this release: @jon-certik, @gracenoah

 *August 28, 2019*

-@climber73 wrote the [Writing a Tendermint Core application in Java 
-(gRPC)](https://docs.tendermint.com/v0.34/tutorials/java.html)
+@climber73 wrote the [Writing a Tendermint Core application in Java
+(gRPC)](https://github.com/tendermint/tendermint/blob/master/docs/guides/java.md)
 guide.

 Special thanks to external contributors on this release:
@@ -1257,7 +1225,7 @@ Special thanks to external contributors on this release:

 ### FEATURES:

- [blockchain] [\#3561](https://github.com/tendermint/tendermint/issues/3561) Add early version of the new blockchain reactor, which is supposed to be more modular and testable compared to the old version. To try it, you'll have to change `version` in the config file, [here](https://github.com/tendermint/tendermint/blob/main/config/toml.go#L303) NOTE: It's not ready for a production yet. For further information, see [ADR-40](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-040-blockchain-reactor-refactor.md) & [ADR-43](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-043-blockchain-riri-org.md)
+- [blockchain] [\#3561](https://github.com/tendermint/tendermint/issues/3561) Add early version of the new blockchain reactor, which is supposed to be more modular and testable compared to the old version. To try it, you'll have to change `version` in the config file, [here](https://github.com/tendermint/tendermint/blob/master/config/toml.go#L303) NOTE: It's not ready for a production yet. For further information, see [ADR-40](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-040-blockchain-reactor-refactor.md) & [ADR-43](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-043-blockchain-riri-org.md)
 - [mempool] [\#3826](https://github.com/tendermint/tendermint/issues/3826) Make `max_msg_bytes` configurable(@bluele)
 - [node] [\#3846](https://github.com/tendermint/tendermint/pull/3846) Allow replacing existing p2p.Reactor(s) using [`CustomReactors`
  option](https://godoc.org/github.com/tendermint/tendermint/node#CustomReactors).
@@ -1574,7 +1542,7 @@ Special thanks to external contributors on this release:
 - [libs/db] [\#3611](https://github.com/tendermint/tendermint/issues/3611) Conditional compilation
  * Use `cleveldb` tag instead of `gcc` to compile Tendermint with CLevelDB or
    use `make build_c` / `make install_c` (full instructions can be found at
-    <https://docs.tendermint.com>)
+    https://docs.tendermint.com/master/introduction/install.html#compile-with-cleveldb-support)
  * Use `boltdb` tag to compile Tendermint with bolt db
 - [node] [\#3362](https://github.com/tendermint/tendermint/issues/3362) Return an error if `persistent_peers` list is invalid (except
  when IP lookup fails)
@@ -1798,7 +1766,7 @@ more details.
  - [rpc] [\#3269](https://github.com/tendermint/tendermint/issues/2826) Limit number of unique clientIDs with open subscriptions. Configurable via `rpc.max_subscription_clients`
  - [rpc] [\#3269](https://github.com/tendermint/tendermint/issues/2826) Limit number of unique queries a given client can subscribe to at once. Configurable via `rpc.max_subscriptions_per_client`.
  - [rpc] [\#3435](https://github.com/tendermint/tendermint/issues/3435) Default ReadTimeout and WriteTimeout changed to 10s. WriteTimeout can increased by setting `rpc.timeout_broadcast_tx_commit` in the config.
-  - [rpc/client] [\#3269](https://github.com/tendermint/tendermint/issues/3269) Update `EventsClient` interface to reflect new pubsub/eventBus API [ADR-33](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-033-pubsub.md). This includes `Subscribe`, `Unsubscribe`, and `UnsubscribeAll` methods.
+  - [rpc/client] [\#3269](https://github.com/tendermint/tendermint/issues/3269) Update `EventsClient` interface to reflect new pubsub/eventBus API [ADR-33](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-033-pubsub.md). This includes `Subscribe`, `Unsubscribe`, and `UnsubscribeAll` methods.

 * Apps
  - [abci] [\#3403](https://github.com/tendermint/tendermint/issues/3403) Remove `time_iota_ms` from BlockParams. This is a
@@ -1851,7 +1819,7 @@ more details.
 - [blockchain] [\#3358](https://github.com/tendermint/tendermint/pull/3358) Fix timer leak in `BlockPool` (@guagualvcha)
 - [cmd] [\#3408](https://github.com/tendermint/tendermint/issues/3408) Fix `testnet` command's panic when creating non-validator configs (using `--n` flag) (@srmo)
 - [libs/db/remotedb/grpcdb] [\#3402](https://github.com/tendermint/tendermint/issues/3402) Close Iterator/ReverseIterator after use
- [libs/pubsub] [\#951](https://github.com/tendermint/tendermint/issues/951), [\#1880](https://github.com/tendermint/tendermint/issues/1880) Use non-blocking send when dispatching messages [ADR-33](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-033-pubsub.md)
+- [libs/pubsub] [\#951](https://github.com/tendermint/tendermint/issues/951), [\#1880](https://github.com/tendermint/tendermint/issues/1880) Use non-blocking send when dispatching messages [ADR-33](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-033-pubsub.md)
 - [lite] [\#3364](https://github.com/tendermint/tendermint/issues/3364) Fix `/validators` and `/abci_query` proxy endpoints
  (@guagualvcha)
 - [p2p/conn] [\#3347](https://github.com/tendermint/tendermint/issues/3347) Reject all-zero shared secrets in the Diffie-Hellman step of secret-connection
@@ -2549,7 +2517,7 @@ Special thanks to external contributors on this release:
 This release is mostly about the ConsensusParams - removing fields and enforcing MaxGas.
 It also addresses some issues found via security audit, removes various unused
 functions from `libs/common`, and implements
-[ADR-012](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-012-peer-transport.md).
+[ADR-012](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-012-peer-transport.md).

 BREAKING CHANGES:

@@ -2614,7 +2582,7 @@ are affected by a change.

 A few more breaking changes are in the works - each will come with a clear
 Architecture Decision Record (ADR) explaining the change. You can review ADRs
-[here](https://github.com/tendermint/tendermint/tree/main/docs/architecture)
+[here](https://github.com/tendermint/tendermint/tree/develop/docs/architecture)
 or in the [open Pull Requests](https://github.com/tendermint/tendermint/pulls).
 You can also check in on the [issues marked as
 breaking](https://github.com/tendermint/tendermint/issues?q=is%3Aopen+is%3Aissue+label%3Abreaking).
@@ -2630,7 +2598,7 @@ BREAKING CHANGES:
  - [abci] Added address of the original proposer of the block to Header
  - [abci] Change ABCI Header to match Tendermint exactly
  - [abci] [\#2159](https://github.com/tendermint/tendermint/issues/2159) Update use of `Validator` (see
-    [ADR-018](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-018-ABCI-Validators.md)):
+    [ADR-018](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-018-ABCI-Validators.md)):
    - Remove PubKey from `Validator` (so it's just Address and Power)
    - Introduce `ValidatorUpdate` (with just PubKey and Power)
    - InitChain and EndBlock use ValidatorUpdate
@@ -2652,7 +2620,7 @@ BREAKING CHANGES:
  - [state] [\#1815](https://github.com/tendermint/tendermint/issues/1815) Validator set changes are now delayed by one block (!)
    - Add NextValidatorSet to State, changes on-disk representation of state
  - [state] [\#2184](https://github.com/tendermint/tendermint/issues/2184) Enforce ConsensusParams.BlockSize.MaxBytes (See
-    [ADR-020](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-020-block-size.md)).
+    [ADR-020](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-020-block-size.md)).
    - Remove ConsensusParams.BlockSize.MaxTxs
    - Introduce maximum sizes for all components of a block, including ChainID
  - [types] Updates to the block Header:
@@ -2663,7 +2631,7 @@ BREAKING CHANGES:
  - [consensus] [\#2203](https://github.com/tendermint/tendermint/issues/2203) Implement BFT time
    - Timestamp in block must be monotonic and equal the median of timestamps in block's LastCommit
  - [crypto] [\#2239](https://github.com/tendermint/tendermint/issues/2239) Secp256k1 signature changes (See
-    [ADR-014](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-014-secp-malleability.md)):
+    [ADR-014](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-014-secp-malleability.md)):
    - format changed from DER to `r || s`, both little endian encoded as 32 bytes.
    - malleability removed by requiring `s` to be in canonical form.

@@ -2893,7 +2861,7 @@ BREAKING CHANGES:
 FEATURES
 - [cmd] Added metrics (served under `/metrics` using a Prometheus client;
  disabled by default). See the new `instrumentation` section in the config and
-  [metrics](https://github.com/tendermint/tendermint/blob/main/docs/tendermint-core/metrics.md)
+  [metrics](https://tendermint.readthedocs.io/projects/tools/en/develop/metrics.html)
  guide.
 - [p2p] Add IPv6 support to peering.
 - [p2p] Add `external_address` to config to allow specifying the address for
@@ -3007,7 +2975,7 @@ BREAKING:

 FEATURES

- [rpc] the RPC documentation is now published to https://github.com/tendermint/tendermint/tree/main/spec/rpc
+- [rpc] the RPC documentation is now published to https://tendermint.github.io/slate
 - [p2p] AllowDuplicateIP config option to refuse connections from same IP.
    - true by default for now, false by default in next breaking release
 - [docs] Add docs for query, tx indexing, events, pubsub
@@ -3463,7 +3431,7 @@ Also includes the Grand Repo-Merge of 2017.
 BREAKING CHANGES:

 - Config and Flags:
-  - The `config` map is replaced with a [`Config` struct](https://github.com/tendermint/tendermint/blob/main/config/config.go#L11),
+  - The `config` map is replaced with a [`Config` struct](https://github.com/tendermint/tendermint/blob/master/config/config.go#L11),
 containing substructs: `BaseConfig`, `P2PConfig`, `MempoolConfig`, `ConsensusConfig`, `RPCConfig`
  - This affects the following flags:
    - `--seeds` is now `--p2p.seeds`
@@ -3486,7 +3454,7 @@ containing substructs: `BaseConfig`, `P2PConfig`, `MempoolConfig`, `ConsensusCon

 - Logger
  - Replace static `log15` logger with a simple interface, and provide a new implementation using `go-kit`.
-See our new [logging library](https://github.com/tendermint/tendermint/blob/main/libs/log/logger.go) and [blog post](https://blog.cosmos.network/abstracting-the-logger-interface-in-go-4cf96bf90bb7) for more details
+See our new [logging library](https://github.com/tendermint/tmlibs/log) and [blog post](https://tendermint.com/blog/abstracting-the-logger-interface-in-go) for more details
  - Levels `warn` and `notice` are removed (you may need to change them in your `config.toml`!)
  - Change some [function and method signatures](https://gist.github.com/ebuchman/640d5fc6c2605f73497992fe107ebe0b) to accept a logger

--- a/CHANGELOG_PENDING.md
+++ b/CHANGELOG_PENDING.md
@@ -1,37 +1,5 @@
 # Unreleased Changes

-## v0.38.0
-
-### BREAKING CHANGES
-
- CLI/RPC/Config
-
- Apps
-
- P2P Protocol
-
- Go API
-
- Blockchain Protocol
-
- Data Storage
-  - [state] \#6541 Move pruneBlocks from consensus/state to state/execution. (@JayT106)
-  
- Tooling
-  - [tools/tm-signer-harness] \#6498 Set OS home dir to instead of the hardcoded PATH. (@JayT106)
-
-### FEATURES
-
-### IMPROVEMENTS
-
- [pubsub] \#7319 Performance improvements for the event query API (@creachadair)
- [p2p/pex] \#6509 Improve addrBook.hash performance (@cuonglm)
- [crypto/merkle] \#6443 & \#6513 Improve HashAlternatives performance (@cuonglm, @marbar3778)
-
-### BUG FIXES
-
- [docker] \#9462 ensure Docker image uses consistent version of Go
-
 ## v0.37.0

 Special thanks to external contributors on this release:
@@ -41,58 +9,24 @@ Friendly reminder, we have a [bug bounty program](https://hackerone.com/tendermi
 ### BREAKING CHANGES

 - CLI/RPC/Config
-  - [config] \#9259 Rename the fastsync section and the fast_sync key blocksync and block_sync respectively

 - Apps
+
  - [abci/counter] \#6684 Delete counter example app
-  - [abci] \#5783 Make length delimiter encoding consistent (`uint64`) between ABCI and P2P wire-level protocols
-  - [abci] \#9145 Removes unused Response/Request `SetOption` from ABCI (@samricotta)
-  - [abci/params] \#9287 Deduplicate `ConsensusParams` and `BlockParams` so only `types` proto definitions are used (@cmwaters)
-    - Remove `TimeIotaMs` and use a hard-coded 1 millisecond value to ensure monotonically increasing block times.
-    - Rename `AppVersion` to `App` so as to not stutter.
-  - [types] \#9287 Reduce the use of protobuf types in core logic. (@cmwaters)
-    - `ConsensusParams`, `BlockParams`, `ValidatorParams`, `EvidenceParams`, `VersionParams` have become native types.
-      They still utilize protobuf when being sent over the wire or written to disk.
-    - Moved `ValidateConsensusParams` inside (now native type) `ConsensusParams`, and renamed it to `ValidateBasic`.
-  - [abci] \#9301 New ABCI methods `PrepareProposal` and `ProcessProposal` which give the app control over transactions proposed and allows for verification of proposed blocks.
-  - [abci] \#8216 Renamed `EvidenceType` to `MisbehaviorType` and `Evidence` to `Misbehavior` as a more accurate label of their contents. (@williambanfield, @sergio-mena)
-  - [abci] \#9122 Renamed `LastCommitInfo` to `CommitInfo` in preparation for vote extensions. (@cmwaters)
-  - [abci] \#8656, \#8901 Added cli commands for `PrepareProposal` and `ProcessProposal`. (@jmalicevic, @hvanz)
-  - [abci] \#6403 Change the `key` and `value` fields from `[]byte` to `string` in the `EventAttribute` type. (@alexanderbez)

 - P2P Protocol

 - Go API
-    - [all] \#9144 Change spelling from British English to American (@cmwaters)
+
+    - [all] [#9144] Change spelling from British English to American (@cmwaters)
        - Rename "Subscription.Cancelled()" to "Subscription.Canceled()" in libs/pubsub
-    - [crypto/sr25519] \#6526 Do not re-execute the Ed25519-style key derivation step when doing signing and verification.  The derivation is now done once and only once.  This breaks `sr25519.GenPrivKeyFromSecret` output compatibility. (@Yawning)

 - Blockchain Protocol

 ### FEATURES

- [abci] \#9301 New ABCI methods `PrepareProposal` and `ProcessProposal` which give the app control over transactions proposed and allows for verification of proposed blocks.
-
 ### IMPROVEMENTS
- [crypto] \#9250 Update to use btcec v2 and the latest btcutil. (@wcsiu)
-
- [cli] \#9171 add `--hard` flag to rollback command (and a boolean to the `RollbackState` method). This will rollback
-  state and remove the last block. This command can be triggered multiple times. The application must also rollback
-  state to the same height. (@tsutsu, @cmwaters)
- [proto] \#9356 Migrate from `gogo/protobuf` to `cosmos/gogoproto` (@julienrbrt)
- [rpc] \#9276 Added `header` and `header_by_hash` queries to the RPC client (@samricotta)
- [abci] \#5706 Added `AbciVersion` to `RequestInfo` allowing applications to check ABCI version when connecting to Tendermint. (@marbar3778)
- [node] \#6059 Validate and complete genesis doc before saving to state store (@silasdavis)
-
- [crypto/ed25519] \#5632 Adopt zip215 `ed25519` verification. (@marbar3778)
- [crypto/ed25519] \#6526 Use [curve25519-voi](https://github.com/oasisprotocol/curve25519-voi) for `ed25519` signing and verification. (@Yawning)
- [crypto/sr25519] \#6526 Use [curve25519-voi](https://github.com/oasisprotocol/curve25519-voi) for `sr25519` signing and verification. (@Yawning)
- [crypto] \#6120 Implement batch verification interface for ed25519 and sr25519. (@marbar3778 & @Yawning)
- [types] \#6120 use batch verification for verifying commits signatures. (@marbar3778 & @cmwaters & @Yawning)
-    - If the key type supports the batch verification API it will try to batch verify. If the verification fails we will single verify each signature.
- [state] \#9505 Added logic so when pruning, the evidence period is taken into consideration and only deletes unecessary data (@samricotta)

 ### BUG FIXES

- [consensus] \#9229 fix round number of `enterPropose` when handling `RoundStepNewRound` timeout. (@fatcat22)
- [docker] \#9073 enable cross platform build using docker buildx
+[docker] \#9073 enable cross platform build using docker buildx
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -7,7 +7,7 @@ support permissionless value-carrying networks. While all contributions are
 welcome, contributors should bear this goal in mind in deciding if they should
 target the main Tendermint project or a potential fork. When targeting the
 main Tendermint project, the following process leads to the best chance of
-landing changes in `main`.
+landing changes in master.

 All work on the code base should be motivated by a [Github
 Issue](https://github.com/tendermint/tendermint/issues).
@@ -26,7 +26,7 @@ will indicate their support with a heartfelt emoji.

 If the issue would benefit from thorough discussion, maintainers may
 request that you create a [Request For
-Comment](https://github.com/tendermint/tendermint/tree/main/docs/rfc)
+Comment](https://github.com/tendermint/spec/tree/master/rfc)
 in the Tendermint spec repo. Discussion
 at the RFC stage will build collective understanding of the dimensions
 of the problems and help structure conversations around trade-offs.
@@ -46,7 +46,7 @@ Find the largest existing ADR number and bump it by 1.
 When the problem as well as proposed solution are well understood,
 changes should start with a [draft
 pull request](https://github.blog/2019-02-14-introducing-draft-pull-requests/)
-against `main`. The draft signals that work is underway. When the work
+against master. The draft signals that work is underway. When the work
 is ready for feedback, hitting "Ready for Review" will signal to the
 maintainers to take a look.

@@ -54,7 +54,7 @@ maintainers to take a look.

 Each stage of the process is aimed at creating feedback cycles which align contributors and maintainers to make sure:

- Contributors don’t waste their time implementing/proposing features which won’t land in `main`.
+- Contributors don’t waste their time implementing/proposing features which won’t land in master.
 - Maintainers have the necessary context in order to support and review contributions.

 ## Forking
@@ -73,19 +73,19 @@ For instance, to create a fork and work on a branch of it, I would:
 - `git remote add origin git@github.com:ebuchman/basecoin.git`

 Now `origin` refers to my fork and `upstream` refers to the Tendermint version.
-So I can `git push -u origin main` to update my fork, and make pull requests to tendermint from there.
+So I can `git push -u origin master` to update my fork, and make pull requests to tendermint from there.
 Of course, replace `ebuchman` with your git handle.

 To pull in updates from the origin repo, run

 - `git fetch upstream`
- `git rebase upstream/main` (or whatever branch you want)
+- `git rebase upstream/master` (or whatever branch you want)

 ## Dependencies

 We use [go modules](https://github.com/golang/go/wiki/Modules) to manage dependencies.

-That said, the `main` branch of every Tendermint repository should just build
+That said, the master branch of every Tendermint repository should just build
 with `go get`, which means they should be kept up-to-date with their
 dependencies so we can get away with telling people they can just `go get` our
 software.
@@ -106,7 +106,7 @@ specify exactly the dependency you want to update, eg.
 ## Protobuf

 We use [Protocol Buffers](https://developers.google.com/protocol-buffers) along
-with [`gogoproto`](https://github.com/cosmos/gogoproto) to generate code for use
+with [`gogoproto`](https://github.com/gogo/protobuf) to generate code for use
 across Tendermint Core.

 To generate proto stubs, lint, and check protos for breaking changes, you will
@@ -142,6 +142,7 @@ If you are a VS Code user, you may want to add the following to your `.vscode/se
  "protoc": {
    "options": [
      "--proto_path=${workspaceRoot}/proto",
+      "--proto_path=${workspaceRoot}/third_party/proto"
    ]
  }
 }
@@ -152,47 +153,10 @@ If you are a VS Code user, you may want to add the following to your `.vscode/se
 Every fix, improvement, feature, or breaking change should be made in a
 pull-request that includes an update to the `CHANGELOG_PENDING.md` file.

-A feature can also be worked on a feature branch, if its size and/or risk
-justifies it (see #branching-model-and-release) below.
-
-### What does a good changelog entry look like?
-
-Changelog entries should answer the question: "what is important about this
-change for users to know?" or "what problem does this solve for users?". It
-should not simply be a reiteration of the title of the associated PR, unless the
-title of the PR _very_ clearly explains the benefit of a change to a user.
-
-Some good examples of changelog entry descriptions:
-
-```md
- [consensus] \#1111 Small transaction throughput improvement (approximately
-  3-5\% from preliminary tests) through refactoring the way we use channels
- [mempool] \#1112 Refactor Go API to be able to easily swap out the current
-  mempool implementation in Tendermint forks
- [p2p] \#1113 Automatically ban peers when their messages are unsolicited or
-  are received too frequently
-```
-
-Some bad examples of changelog entry descriptions:
-
-```md
- [consensus] \#1111 Refactor channel usage
- [mempool] \#1112 Make API generic
- [p2p] \#1113 Ban for PEX message abuse
-```
-
-For more on how to write good changelog entries, see:
-
- <https://keepachangelog.com>
- <https://docs.gitlab.com/ee/development/changelog.html#writing-good-changelog-entries>
- <https://depfu.com/blog/what-makes-a-good-changelog>
-
-### Changelog entry format
-
 Changelog entries should be formatted as follows:

 ```md
- [module] \#xxx Some description of the change (@contributor)
+- [module] \#xxx Some description about the change (@contributor)
 ```

 Here, `module` is the part of the code that changed (typically a
@@ -220,31 +184,22 @@ removed from the header in RPC responses as well.

 ## Branching Model and Release

-The main development branch is `main`.
+The main development branch is master.

 Every release is maintained in a release branch named `vX.Y.Z`.

-Pending minor releases have long-lived release candidate ("RC") branches. Minor release changes should be merged to these long-lived RC branches at the same time that the changes are merged to `main`.
-
-If a feature's size is big and/or its risk is high, it can be implemented in a feature branch.
-While the feature work is in progress,
-pull requests are open and squash merged against the feature branch.
-Branch `main` is periodically merged (merge commit) into the feature branch,
-to reduce branch divergence.
-When the feature is complete, the feature branch is merged back (merge commit) into `main`.
-The moment of the final merge can be carefully chosen
-so as to land different features in different releases.
+Pending minor releases have long-lived release candidate ("RC") branches. Minor release changes should be merged to these long-lived RC branches at the same time that the changes are merged to master.

 Note all pull requests should be squash merged except for merging to a release branch (named `vX.Y`). This keeps the commit history clean and makes it
 easy to reference the pull request where a change was introduced.

 ### Development Procedure

-The latest state of development is on `main`, which must never fail `make test`. _Never_ force push `main`, unless fixing broken git history (which we rarely do anyways).
+The latest state of development is on `master`, which must never fail `make test`. _Never_ force push `master`, unless fixing broken git history (which we rarely do anyways).

 To begin contributing, create a development branch either on `github.com/tendermint/tendermint`, or your fork (using `git remote add origin`).

-Make changes, and before submitting a pull request, update the `CHANGELOG_PENDING.md` to record your change. Also, run either `git rebase` or `git merge` on top of the latest `main`. (Since pull requests are squash-merged, either is fine!)
+Make changes, and before submitting a pull request, update the `CHANGELOG_PENDING.md` to record your change. Also, run either `git rebase` or `git merge` on top of the latest `master`. (Since pull requests are squash-merged, either is fine!)

 Update the `UPGRADING.md` if the change you've made is breaking and the
 instructions should be in place for a user on how he/she can upgrade it's
@@ -252,7 +207,7 @@ software (ABCI application, Tendermint-based blockchain, light client, wallet).

 Once you have submitted a pull request label the pull request with either `R:minor`, if the change should be included in the next minor release, or `R:major`, if the change is meant for a major release.

-Sometimes (often!) pull requests get out-of-date with `main`, as other people merge different pull requests to `main`. It is our convention that pull request authors are responsible for updating their branches with `main`. (This also means that you shouldn't update someone else's branch for them; even if it seems like you're doing them a favor, you may be interfering with their git flow in some way!)
+Sometimes (often!) pull requests get out-of-date with master, as other people merge different pull requests to master. It is our convention that pull request authors are responsible for updating their branches with master. (This also means that you shouldn't update someone else's branch for them; even if it seems like you're doing them a favor, you may be interfering with their git flow in some way!)

 #### Merging Pull Requests

@@ -260,20 +215,20 @@ It is also our convention that authors merge their own pull requests, when possi

 Before merging a pull request:

- Ensure pull branch is up-to-date with a recent `main` (GitHub won't let you merge without this!)
+- Ensure pull branch is up-to-date with a recent `master` (GitHub won't let you merge without this!)
 - Run `make test` to ensure that all tests pass
 - [Squash](https://stackoverflow.com/questions/5189560/squash-my-last-x-commits-together-using-git) merge pull request

 #### Pull Requests for Minor Releases

-If your change should be included in a minor release, please also open a PR against the long-lived minor release candidate branch (e.g., `rc1/v0.33.5`) _immediately after your change has been merged to main_.
+If your change should be included in a minor release, please also open a PR against the long-lived minor release candidate branch (e.g., `rc1/v0.33.5`) _immediately after your change has been merged to master_.

-You can do this by cherry-picking your commit off `main`:
+You can do this by cherry-picking your commit off master:

 ```sh
 $ git checkout rc1/v0.33.5
 $ git checkout -b {new branch name}
-$ git cherry-pick {commit SHA from main}
+$ git cherry-pick {commit SHA from master}
 # may need to fix conflicts, and then use git add and git cherry-pick --continue
 $ git push origin {new branch name}
 ```
@@ -292,7 +247,7 @@ cmd/debug: execute p.Signal only when p is not nil
 Fixes #nnnn
 ```

-Each PR should have one commit once it lands on `main`; this can be accomplished by using the "squash and merge" button on Github. Be sure to edit your commit message, though!
+Each PR should have one commit once it lands on `master`; this can be accomplished by using the "squash and merge" button on Github. Be sure to edit your commit message, though!

 ## Testing

--- a/DOCKER/Dockerfile
+++ b/DOCKER/Dockerfile
@@ -1,9 +1,5 @@
-# Use a build arg to ensure that both stages use the same,
-# hopefully current, go version.
-ARG GOLANG_BASE_IMAGE=golang:1.18-alpine
-
 # stage 1 Generate Tendermint Binary
-FROM --platform=$BUILDPLATFORM $GOLANG_BASE_IMAGE as builder
+FROM --platform=$BUILDPLATFORM golang:1.15-alpine as builder
 RUN apk update && \
    apk upgrade && \
    apk --no-cache add make
@@ -12,7 +8,7 @@ WORKDIR /tendermint
 RUN TARGETPLATFORM=$TARGETPLATFORM make build-linux

 # stage 2
-FROM $GOLANG_BASE_IMAGE
+FROM golang:1.15-alpine
 LABEL maintainer="hello@tendermint.com"

 # Tendermint will be looking for the genesis file in /tendermint/config/genesis.json
--- a/DOCKER/README.md
+++ b/DOCKER/README.md
@@ -6,9 +6,9 @@ DockerHub tags for official releases are [here](https://hub.docker.com/r/tenderm

 Official releases can be found [here](https://github.com/tendermint/tendermint/releases).

-The Dockerfile for Tendermint is not expected to change in the near future. The main file used for all builds can be found [here](https://raw.githubusercontent.com/tendermint/tendermint/main/DOCKER/Dockerfile).
+The Dockerfile for tendermint is not expected to change in the near future. The master file used for all builds can be found [here](https://raw.githubusercontent.com/tendermint/tendermint/master/DOCKER/Dockerfile).

-Respective versioned files can be found at `https://raw.githubusercontent.com/tendermint/tendermint/vX.XX.XX/DOCKER/Dockerfile` (replace the Xs with the version number).
+Respective versioned files can be found <https://raw.githubusercontent.com/tendermint/tendermint/vX.XX.XX/DOCKER/Dockerfile> (replace the Xs with the version number).

 ## Quick reference

@@ -20,9 +20,9 @@ Respective versioned files can be found at `https://raw.githubusercontent.com/te

 Tendermint Core is Byzantine Fault Tolerant (BFT) middleware that takes a state transition machine, written in any programming language, and securely replicates it on many machines.

-For more background, see the [the docs](https://docs.tendermint.com/main/introduction/#quick-start).
+For more background, see the [the docs](https://docs.tendermint.com/master/introduction/#quick-start).

-To get started developing applications, see the [application developers guide](https://docs.tendermint.com/main/introduction/quick-start.html).
+To get started developing applications, see the [application developers guide](https://docs.tendermint.com/master/introduction/quick-start.html).

 ## How to use this image

@@ -37,7 +37,7 @@ docker run -it --rm -v "/tmp:/tendermint" tendermint/tendermint node --proxy_app

 ## Local cluster

-To run a 4-node network, see the `Makefile` in the root of [the repo](https://github.com/tendermint/tendermint/blob/main/Makefile) and run:
+To run a 4-node network, see the `Makefile` in the root of [the repo](https://github.com/tendermint/tendermint/blob/master/Makefile) and run:

 ```sh
 make build-linux
@@ -49,8 +49,8 @@ Note that this will build and use a different image than the ones provided here.

 ## License

- Tendermint's license is [Apache 2.0](https://github.com/tendermint/tendermint/blob/main/LICENSE).
+- Tendermint's license is [Apache 2.0](https://github.com/tendermint/tendermint/blob/master/LICENSE).

 ## Contributing

-Contributions are most welcome! See the [contributing file](https://github.com/tendermint/tendermint/blob/main/CONTRIBUTING.md) for more information.
+Contributions are most welcome! See the [contributing file](https://github.com/tendermint/tendermint/blob/master/CONTRIBUTING.md) for more information.
--- a/6
+++ b/6
@@ -1,3 +1,5 @@
+Tendermint Core
+License: Apache2.0

                                 Apache License
                           Version 2.0, January 2004
@@ -179,7 +181,7 @@
   APPENDIX: How to apply the Apache License to your work.

      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
+      boilerplate notice, with the fields enclosed by brackets "{}"
      replaced with your own identifying information. (Don't include
      the brackets!)  The text should be enclosed in the appropriate
      comment syntax for the file format. We also recommend that a
@@ -187,7 +189,7 @@
      same "printed page" as the copyright notice for easier
      identification within third-party archives.

-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2016 All in Bits, Inc

   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
--- a/57
+++ b/57
@@ -4,8 +4,14 @@ OUTPUT?=$(BUILDDIR)/tendermint

 BUILD_TAGS?=tendermint

-COMMIT_HASH := $(shell git rev-parse --short HEAD)
-LD_FLAGS = -X github.com/tendermint/tendermint/version.TMGitCommitHash=$(COMMIT_HASH)
+# 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)
+else
+VERSION := $(shell git describe)
+endif
+
+LD_FLAGS = -X github.com/tendermint/tendermint/version.TMCoreSemVer=$(VERSION)
 BUILD_FLAGS = -mod=readonly -ldflags "$(LD_FLAGS)"
 HTTPS_GIT := https://github.com/tendermint/tendermint.git
 CGO_ENABLED ?= 0
@@ -125,20 +131,6 @@ install:
 	CGO_ENABLED=$(CGO_ENABLED) go install $(BUILD_FLAGS) -tags $(BUILD_TAGS) ./cmd/tendermint
 .PHONY: install

-###############################################################################
-###                               Metrics                                   ###
-###############################################################################
-
-metrics: testdata-metrics
-	go generate -run="scripts/metricsgen" ./...
-.PHONY: metrics
-
-# By convention, the go tool ignores subdirectories of directories named
-# 'testdata'. This command invokes the generate command on the folder directly
-# to avoid this.
-testdata-metrics:
-	ls ./scripts/metricsgen/testdata | xargs -I{} go generate -v -run="scripts/metricsgen" ./scripts/metricsgen/testdata/{}
-.PHONY: testdata-metrics

 ###############################################################################
 ###                                Mocks                                    ###
@@ -154,7 +146,7 @@ mockery:

 check-proto-deps:
 ifeq (,$(shell which protoc-gen-gogofaster))
-	@go install github.com/cosmos/gogoproto/protoc-gen-gogofaster@latest
+	@go install github.com/gogo/protobuf/protoc-gen-gogofaster@latest
 endif
 .PHONY: check-proto-deps

@@ -168,7 +160,6 @@ proto-gen: check-proto-deps
 	@echo "Generating Protobuf files"
 	@go run github.com/bufbuild/buf/cmd/buf generate
 	@mv ./proto/tendermint/abci/types.pb.go ./abci/types/
-	@cp ./proto/tendermint/rpc/grpc/types.pb.go ./rpc/grpc
 .PHONY: proto-gen

 # These targets are provided for convenience and are intended for local
@@ -280,33 +271,16 @@ DESTINATION = ./index.html.md
 ###                           Documentation                                 ###
 ###############################################################################

-DOCS_OUTPUT?=/tmp/tendermint-core-docs
-
-# This builds a docs site for each branch/tag in `./docs/versions` and copies
-# each site to a version prefixed path. The last entry inside the `versions`
-# file will be the default root index.html. Only redirects that are built into
-# the "redirects" folder of each of the branches will be copied out to the root
-# of the build at the end.
 build-docs:
 	@cd docs && \
 	while read -r branch path_prefix; do \
 		(git checkout $${branch} && npm ci && VUEPRESS_BASE="/$${path_prefix}/" npm run build) ; \
-		mkdir -p $(DOCS_OUTPUT)/$${path_prefix} ; \
-		cp -r .vuepress/dist/* $(DOCS_OUTPUT)/$${path_prefix}/ ; \
-		cp $(DOCS_OUTPUT)/$${path_prefix}/index.html $(DOCS_OUTPUT) ; \
-		cp $(DOCS_OUTPUT)/$${path_prefix}/404.html $(DOCS_OUTPUT) ; \
-		cp -r $(DOCS_OUTPUT)/$${path_prefix}/redirects/* $(DOCS_OUTPUT) || true ; \
+		mkdir -p ~/output/$${path_prefix} ; \
+		cp -r .vuepress/dist/* ~/output/$${path_prefix}/ ; \
+		cp ~/output/$${path_prefix}/index.html ~/output ; \
 	done < versions ;
 .PHONY: build-docs

-# Build and serve the local version of the docs on the current branch from
-# http://0.0.0.0:8080
-serve-docs:
-	@cd docs && \
-		npm ci && \
-		npm run serve
-.PHONY: serve-docs
-
 sync-docs:
 	cd ~/output && \
 	echo "role_arn = ${DEPLOYMENT_ROLE_ARN}" >> /root/.aws/config ; \
@@ -315,11 +289,6 @@ sync-docs:
 	aws cloudfront create-invalidation --distribution-id ${CF_DISTRIBUTION_ID} --profile terraform --path "/*" ;
 .PHONY: sync-docs

-# Verify that important design docs have ToC entries.
-check-docs-toc:
-	@./docs/presubmit.sh
-.PHONY: check-docs-toc
-
 ###############################################################################
 ###                            Docker image                                 ###
 ###############################################################################
@@ -400,4 +369,4 @@ $(BUILDDIR)/packages.txt:$(GO_TEST_FILES) $(BUILDDIR)
 split-test-packages:$(BUILDDIR)/packages.txt
 	split -d -n l/$(NUM_SPLIT) $< $<.
 test-group-%:split-test-packages
-	cat $(BUILDDIR)/packages.txt.$* | xargs go test -mod=readonly -timeout=15m -race -coverprofile=$(BUILDDIR)/$*.profile.out
+	cat $(BUILDDIR)/packages.txt.$* | xargs go test -mod=readonly -timeout=5m -race -coverprofile=$(BUILDDIR)/$*.profile.out
--- a/README.md
+++ b/README.md
@@ -10,11 +10,12 @@
 [![Go version][go-badge]][go-url]
 [![Discord chat][discord-badge]][discord-url]
 [![License][license-badge]][license-url]
+[![tendermint/tendermint][loc-badge]][loc-url]
 [![Sourcegraph][sg-badge]][sg-url]

-| Branch | Tests                              | Linting                         |
-|--------|------------------------------------|---------------------------------|
-| main   | [![Tests][tests-badge]][tests-url] | [![Lint][lint-badge]][lint-url] |
+| Branch | Tests                 | Coverage                                 | Linting             |
+|--------|-----------------------|------------------------------------------|---------------------|
+| main   | ![Tests][tests-badge] | [![codecov][codecov-badge]][codecov-url] | ![Lint][lint-badge] |

 Tendermint Core is a Byzantine Fault Tolerant (BFT) middleware that takes a
 state transition machine - written in any programming language - and securely
@@ -70,8 +71,8 @@ See the [install instructions](./docs/introduction/install.md).
 ### Quick Start

 - [Single node](./docs/introduction/quick-start.md)
- [Local cluster using docker-compose](./docs/networks/docker-compose.md)
- [Remote cluster using Terraform and Ansible](./docs/networks/terraform-and-ansible.md)
+- [Local cluster using docker-compose](./docs/tools/docker-compose.md)
+- [Remote cluster using Terraform and Ansible](./docs/tools/terraform-and-ansible.md)

 ## Contributing

@@ -145,7 +146,7 @@ Upgrading instructions can be found in [UPGRADING.md](./UPGRADING.md).

 ## Join us!

-Tendermint Core is maintained by [Interchain GmbH](https://interchain.io).
+Tendermint Core is maintained by [Interchain GmbH](https://interchain.berlin).
 If you'd like to work full-time on Tendermint Core,
 [we're hiring](https://interchain-gmbh.breezy.hr/)!

@@ -154,22 +155,25 @@ Funding for Tendermint Core development comes primarily from the
 Tendermint trademark is owned by [Tendermint Inc.](https://tendermint.com), the
 for-profit entity that also maintains [tendermint.com](https://tendermint.com).

+
 [bft]: https://en.wikipedia.org/wiki/Byzantine_fault_tolerance
 [smr]: https://en.wikipedia.org/wiki/State_machine_replication
 [Blockchain]: https://en.wikipedia.org/wiki/Blockchain
-[version-badge]: https://img.shields.io/github/v/release/tendermint/tendermint.svg
+[version-badge]: https://img.shields.io/github/tag/tendermint/tendermint.svg
 [version-url]: https://github.com/tendermint/tendermint/releases/latest
 [api-badge]: https://camo.githubusercontent.com/915b7be44ada53c290eb157634330494ebe3e30a/68747470733a2f2f676f646f632e6f72672f6769746875622e636f6d2f676f6c616e672f6764646f3f7374617475732e737667
 [api-url]: https://pkg.go.dev/github.com/tendermint/tendermint
-[go-badge]: https://img.shields.io/badge/go-1.18-blue.svg
+[go-badge]: https://img.shields.io/badge/go-1.17-blue.svg
 [go-url]: https://github.com/moovweb/gvm
 [discord-badge]: https://img.shields.io/discord/669268347736686612.svg
 [discord-url]: https://discord.gg/cosmosnetwork
 [license-badge]: https://img.shields.io/github/license/tendermint/tendermint.svg
 [license-url]: https://github.com/tendermint/tendermint/blob/main/LICENSE
+[loc-badge]: https://tokei.rs/b1/github/tendermint/tendermint?category=lines
+[loc-url]: https://github.com/tendermint/tendermint
 [sg-badge]: https://sourcegraph.com/github.com/tendermint/tendermint/-/badge.svg
 [sg-url]: https://sourcegraph.com/github.com/tendermint/tendermint?badge
-[tests-url]: https://github.com/tendermint/tendermint/actions/workflows/tests.yml
-[tests-badge]: https://github.com/tendermint/tendermint/actions/workflows/tests.yml/badge.svg?branch=main
-[lint-badge]: https://github.com/tendermint/tendermint/actions/workflows/lint.yml/badge.svg
-[lint-url]: https://github.com/tendermint/tendermint/actions/workflows/lint.yml
+[tests-badge]: https://github.com/tendermint/tendermint/workflows/Tests/badge.svg?branch=main
+[codecov-badge]: https://codecov.io/gh/tendermint/tendermint/branch/main/graph/badge.svg
+[codecov-url]: https://codecov.io/gh/tendermint/tendermint
+[lint-badge]: https://github.com/tendermint/tendermint/workflows/Lint/badge.svg
--- a/RELEASES.md
+++ b/RELEASES.md
@@ -22,8 +22,8 @@ We use Mergify's [backport feature](https://mergify.io/features/backports) to
 automatically backport to the needed branch. There should be a label for any
 backport branch that you'll be targeting. To notify the bot to backport a pull
 request, mark the pull request with the label corresponding to the correct
-backport branch. For example, to backport to v0.38.x, add the label
-`S:backport-to-v0.38.x`. Once the original pull request is merged, the bot will
+backport branch. For example, to backport to v0.35.x, add the label
+`S:backport-to-v0.35.x`. Once the original pull request is merged, the bot will
 try to cherry-pick the pull request to the backport branch. If the bot fails to
 backport, it will open a pull request. The author of the original pull request
 is responsible for solving the conflicts and merging the pull request.
@@ -40,52 +40,37 @@ branches tags. See [#6072](https://github.com/tendermint/tendermint/pull/6072)
 for more context.

 In the following example, we'll assume that we're making a backport branch for
-the 0.38.x line.
+the 0.35.x line.

 1. Start on `main`

-2. Ensure that there is a [branch protection
-   rule](https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/defining-the-mergeability-of-pull-requests/managing-a-branch-protection-rule) for the
-   branch you are about to create (you will need admin access to the repository
-   in order to do this).
-
-3. Create and push the backport branch:
+2. Create and push the backport branch:
   ```sh
-   git checkout -b v0.38.x
-   git push origin v0.38.x
+   git checkout -b v0.35.x
+   git push origin v0.35.x
   ```

-4. Create a PR to update the documentation directory for the backport branch.
+3. Create a PR to update the documentation directory for the backport branch.

-   We rewrite any URLs pointing to `main` to point to the backport branch,
-   so that generated documentation will link to the correct versions of files
-   elsewhere in the repository. The following files are to be excluded from this
-   search:
+   We only maintain RFC and ADR documents on main, to avoid confusion. In
+   addition, we rewrite Markdown URLs pointing to main to point to the
+   backport branch, so that generated documentation will link to the correct
+   versions of files elsewhere in the repository. For context on the latter, see
+   https://github.com/tendermint/tendermint/issues/7675.

-   * [`README.md`](./README.md)
-   * [`CHANGELOG.md`](./CHANGELOG.md)
-   * [`UPGRADING.md`](./UPGRADING.md)
-
-   The following links are to always point to `main`, regardless of where they
-   occur in the codebase:
-
-   * `https://github.com/tendermint/tendermint/blob/main/LICENSE`
-
-   Be sure to search for all of the following links and replace `main` with your
-   corresponding branch label or version (e.g. `v0.38.x` or `v0.38`):
-
-   * `github.com/tendermint/tendermint/blob/main` ->
-     `github.com/tendermint/tendermint/blob/v0.38.x`
-   * `github.com/tendermint/tendermint/tree/main` ->
-     `github.com/tendermint/tendermint/tree/v0.38.x`
-   * `docs.tendermint.com/main` -> `docs.tendermint.com/v0.38`
-
-   Once you have updated all of the relevant documentation:
+   To prepare the PR:
   ```sh
+   # Remove the RFC and ADR documents from the backport.
+   # We only maintain these on main to avoid confusion.
+   git rm -r docs/rfc docs/architecture
+
+   # Update absolute links to point to the backport.
+   go run ./scripts/linkpatch -recur -target v0.35.x -skip-path docs/DOCS_README.md,docs/README.md docs
+
   # Create and push the PR.
-   git checkout -b update-docs-v038x
-   git commit -m "Update docs for v0.38.x backport branch."
-   git push -u origin update-docs-v038x
+   git checkout -b update-docs-v035x
+   git commit -m "Update docs for v0.35.x backport branch." docs
+   git push -u origin update-docs-v035x
   ```

   Be sure to merge this PR before making other changes on the newly-created
@@ -93,79 +78,69 @@ the 0.38.x line.

 After doing these steps, go back to `main` and do the following:

-1. Create a new workflow to run e2e nightlies for the new backport branch. (See
+1. Tag `main` as the dev branch for the _next_ minor version release and push
+   it up to GitHub.
+   For example:
+   ```sh
+   git tag -a v0.36.0-dev -m "Development base for Tendermint v0.36."
+   git push origin v0.36.0-dev
+   ```
+
+2. Create a new workflow to run e2e nightlies for the new backport branch. (See
   [e2e-nightly-main.yml][e2e] for an example.)

-2. Add a new section to the Mergify config (`.github/mergify.yml`) to enable the
-   backport bot to work on this branch, and add a corresponding `S:backport-to-v0.38.x`
+3. Add a new section to the Mergify config (`.github/mergify.yml`) to enable the
+   backport bot to work on this branch, and add a corresponding `S:backport-to-v0.35.x`
   [label](https://github.com/tendermint/tendermint/labels) so the bot can be triggered.

-3. Add a new section to the Dependabot config (`.github/dependabot.yml`) to
+4. Add a new section to the Dependabot config (`.github/dependabot.yml`) to
   enable automatic update of Go dependencies on this branch. Copy and edit one
   of the existing branch configurations to set the correct `target-branch`.

 [e2e]: https://github.com/tendermint/tendermint/blob/main/.github/workflows/e2e-nightly-main.yml

-## Pre-releases
+## Release candidates

 Before creating an official release, especially a minor release, we may want to
-create an alpha or beta version, or release candidate (RC) for our friends and
-partners to test out. We use git tags to create pre-releases, and we build them
-off of backport branches, for example:
+create a release candidate (RC) for our friends and partners to test out. We use
+git tags to create RCs, and we build them off of backport branches.

- `v0.38.0-alpha.1` - The first alpha release of `v0.38.0`. Subsequent alpha
-  releases will be numbered `v0.38.0-alpha.2`, `v0.38.0-alpha.3`, etc.
-
-  Alpha releases are to be considered the _most_ unstable of pre-releases, and
-  are most likely not yet properly QA'd. These are made available to allow early
-  adopters to start integrating and testing new functionality before we're done
-  with QA.
-
- `v0.38.0-beta.1` - The first beta release of `v0.38.0`. Subsequent beta
-  releases will be numbered `v0.38.0-beta.2`, `v0.38.0-beta.3`, etc.
-
-  Beta releases can be considered more stable than alpha releases in that we
-  will have QA'd them better than alpha releases, but there still may be
-  minor breaking API changes if users have strong demands for such changes.
-
- `v0.38.0-rc1` - The first release candidate (RC) of `v0.38.0`. Subsequent RCs
-  will be numbered `v0.38.0-rc2`, `v0.38.0-rc3`, etc.
-
-  RCs are considered more stable than beta releases in that we will have
-  completed our QA on them. APIs will most likely be stable at this point. The
-  difference between an RC and a release is that there may still be small
-  changes (bug fixes, features) that may make their way into the series before
-  cutting a final release.
+Tags for RCs should follow the "standard" release naming conventions, with
+`-rcX` at the end (for example, `v0.35.0-rc0`).

 (Note that branches and tags _cannot_ have the same names, so it's important
 that these branches have distinct names from the tags/release names.)

-If this is the first pre-release for a minor release, you'll have to make a new
-backport branch (see above). Otherwise:
+If this is the first RC for a minor release, you'll have to make a new backport
+branch (see above). Otherwise:

-1. Start from the backport branch (e.g. `v0.38.x`).
-2. Run the integration tests and the E2E nightlies
-   (which can be triggered from the GitHub UI;
-   e.g., https://github.com/tendermint/tendermint/actions/workflows/e2e-nightly-37x.yml).
-3. Prepare the pre-release documentation:
-   - Ensure that all relevant changes are in the `CHANGELOG_PENDING.md` file.
-     This file's contents must only be included in the `CHANGELOG.md` when we
-     cut final releases.
+1. Start from the backport branch (e.g. `v0.35.x`).
+2. Run the integration tests and the e2e nightlies
+   (which can be triggered from the Github UI;
+   e.g., https://github.com/tendermint/tendermint/actions/workflows/e2e-nightly-34x.yml).
+3. Prepare the changelog:
+   - Move the changes included in `CHANGELOG_PENDING.md` into `CHANGELOG.md`. Each RC should have
+     it's own changelog section. These will be squashed when the final candidate is released.
+   - Run `python ./scripts/linkify_changelog.py CHANGELOG.md` to add links for
+     all PRs
   - Ensure that `UPGRADING.md` is up-to-date and includes notes on any breaking changes
      or other upgrading flows.
-4. Prepare the versioning:
   - Bump TMVersionDefault version in  `version.go`
   - Bump P2P and block protocol versions in  `version.go`, if necessary.
     Check the changelog for breaking changes in these components.
   - Bump ABCI protocol version in `version.go`, if necessary
-5. Open a PR with these changes against the backport branch.
-6. Once these changes have landed on the backport branch, be sure to pull them back down locally.
-7. Once you have the changes locally, create the new tag, specifying a name and a tag "message":
-   `git tag -a v0.38.0-rc1 -m "Release Candidate v0.38.0-rc1`
-8. Push the tag back up to origin:
-   `git push origin v0.38.0-rc1`
+4. Open a PR with these changes against the backport branch.
+5. Once these changes have landed on the backport branch, be sure to pull them back down locally.
+6. Once you have the changes locally, create the new tag, specifying a name and a tag "message":
+   `git tag -a v0.35.0-rc0 -m "Release Candidate v0.35.0-rc0`
+7. Push the tag back up to origin:
+   `git push origin v0.35.0-rc0`
   Now the tag should be available on the repo's releases page.
-9. Future pre-releases will continue to be built off of this branch.
+8. Future RCs will continue to be built off of this branch.
+
+Note that this process should only be used for "true" RCs -- release candidates
+that, if successful, will be the next release. For more experimental "RCs,"
+create a new, short-lived branch and tag that instead.

 ## Minor release

@@ -176,14 +151,13 @@ branch, as described above.
 Before performing these steps, be sure the
 [Minor Release Checklist](#minor-release-checklist) has been completed.

-1. Start on the backport branch (e.g. `v0.38.x`)
+1. Start on the backport branch (e.g. `v0.35.x`)
 2. Run integration tests (`make test_integrations`) and the e2e nightlies.
 3. Prepare the release:
-   - "Squash" changes from the changelog entries for the pre-releases into a
-     single entry, and add all changes included in `CHANGELOG_PENDING.md`.
-     (Squashing includes both combining all entries, as well as removing or
-     simplifying any intra-pre-release changes. It may also help to alphabetize
-     the entries by package name.)
+   - "Squash" changes from the changelog entries for the RCs into a single entry,
+      and add all changes included in `CHANGELOG_PENDING.md`.
+      (Squashing includes both combining all entries, as well as removing or simplifying
+      any intra-RC changes. It may also help to alphabetize the entries by package name.)
   - Run `python ./scripts/linkify_changelog.py CHANGELOG.md` to add links for
     all PRs
   - Ensure that `UPGRADING.md` is up-to-date and includes notes on any breaking changes
@@ -193,12 +167,12 @@ Before performing these steps, be sure the
   - Bump ABCI protocol version in `version.go`, if necessary
 4. Open a PR with these changes against the backport branch.
 5. Once these changes are on the backport branch, push a tag with prepared release details.
-   This will trigger the actual release `v0.38.0`.
-   - `git tag -a v0.38.0 -m 'Release v0.38.0'`
-   - `git push origin v0.38.0`
+   This will trigger the actual release `v0.35.0`.
+   - `git tag -a v0.35.0 -m 'Release v0.35.0'`
+   - `git push origin v0.35.0`
 6. Make sure that `main` is updated with the latest `CHANGELOG.md`, `CHANGELOG_PENDING.md`, and `UPGRADING.md`.
 7. Add the release to the documentation site generator config (see
-   [DOCS\_README.md](./docs/DOCS_README.md) for more details). In summary:
+   [DOCS_README.md](./docs/DOCS_README.md) for more details). In summary:
   - Start on branch `main`.
   - Add a new line at the bottom of [`docs/versions`](./docs/versions) to
     ensure the newest release is the default for the landing page.
@@ -219,7 +193,7 @@ changes may merit a release candidate.

 To create a patch release:

-1. Checkout the long-lived backport branch: `git checkout v0.38.x`
+1. Checkout the long-lived backport branch: `git checkout v0.35.x`
 2. Run integration tests (`make test_integrations`) and the nightlies.
 3. Check out a new branch and prepare the release:
   - Copy `CHANGELOG_PENDING.md` to top of `CHANGELOG.md`
@@ -230,10 +204,10 @@ To create a patch release:
   - Bump the ABCI version number, if necessary.
     (Note that ABCI follows semver, and that ABCI versions are the only versions
     which can change during patch releases, and only field additions are valid patch changes.)
-4. Open a PR with these changes that will land them back on `v0.38.x`
+4. Open a PR with these changes that will land them back on `v0.35.x`
 5. Once this change has landed on the backport branch, make sure to pull it locally, then push a tag.
-   - `git tag -a v0.38.1 -m 'Release v0.38.1'`
-   - `git push origin v0.38.1`
+   - `git tag -a v0.35.1 -m 'Release v0.35.1'`
+   - `git push origin v0.35.1`
 6. Create a pull request back to main with the CHANGELOG & version changes from the latest release.
   - Remove all `R:patch` labels from the pull requests that were included in the release.
   - Do not merge the backport branch into main.
--- a/UPGRADING.md
+++ b/UPGRADING.md
@@ -1,36 +1,6 @@
 # Upgrading Tendermint Core

-This guide provides instructions for upgrading to specific versions of
-Tendermint Core.
-
-## Unreleased
-
-### ABCI Changes
-
-* The `ABCIVersion` is now `1.0.0`.
-
-* Added new ABCI methods `PrepareProposal` and `ProcessProposal`. For details,
-  please see the [spec](spec/abci/README.md). Applications upgrading to
-  v0.37.0 must implement these methods, at the very minimum, as described
-  [here](./spec/abci/abci++_app_requirements.md)
-* Deduplicated `ConsensusParams` and `BlockParams`.
-  In the v0.34 branch they are defined both in `abci/types.proto` and `types/params.proto`.
-  The definitions in `abci/types.proto` have been removed.
-  In-process applications should make sure they are not using the deleted
-  version of those structures.
-* In v0.34, messages on the wire used to be length-delimited with `int64` varint
-  values, which was inconsistent with the `uint64` varint length delimiters used
-  in the P2P layer. Both now consistently use `uint64` varint length delimiters.
-* Added `AbciVersion` to `RequestInfo`.
-  Applications should check that Tendermint's ABCI version matches the one they expect
-  in order to ensure compatibility.
-* The `SetOption` method has been removed from the ABCI `Client` interface.
-  The corresponding Protobuf types have been deprecated.
-* The `key` and `value` fields in the `EventAttribute` type have been changed
-  from type `bytes` to `string`. As per the [Protocol Buffers updating
-  guidelines](https://developers.google.com/protocol-buffers/docs/proto3#updating),
-  this should have no effect on the wire-level encoding for UTF8-encoded
-  strings.
+This guide provides instructions for upgrading to specific versions of Tendermint Core.

 ## v0.34.20

@@ -45,7 +15,7 @@ and gas cost).
 Operators can enable the priority mempool by setting `mempool.version` to
 `"v1"` in the `config.toml`. For more technical details about the priority
 mempool, see [ADR 067: Mempool
-Refactor](https://github.com/tendermint/tendermint/blob/main/docs/architecture/adr-067-mempool-refactor.md).
+Refactor](https://github.com/tendermint/tendermint/blob/master/docs/architecture/adr-067-mempool-refactor.md).

 ## v0.34.0

@@ -53,7 +23,7 @@ Refactor](https://github.com/tendermint/tendermint/blob/main/docs/architecture/a
 This release is not compatible with previous blockchains due to changes to
 the encoding format (see "Protocol Buffers," below) and the block header (see "Blockchain Protocol").

-Note also that Tendermint 0.34 also requires Go 1.16 or higher.
+Note also that Tendermint 0.34 also requires Go 1.15 or higher.

 ### ABCI Changes

@@ -63,7 +33,7 @@ Note also that Tendermint 0.34 also requires Go 1.16 or higher.
  were added to support the new State Sync feature.
  Previously, syncing a new node to a preexisting network could take days; but with State Sync,
  new nodes are able to join a network in a matter of seconds.
-  Read [the spec](https://github.com/tendermint/tendermint/blob/v0.34.x/spec/abci/apps.md#state-sync)
+  Read [the spec](https://docs.tendermint.com/master/spec/abci/apps.html#state-sync)
  if you want to learn more about State Sync, or if you'd like your application to use it.
  (If you don't want to support State Sync in your application, you can just implement these new
  ABCI methods as no-ops, leaving them empty.)
@@ -79,7 +49,7 @@ Note also that Tendermint 0.34 also requires Go 1.16 or higher.
  Applications should be able to handle these evidence types
  (i.e., through slashing or other accountability measures).

-* The [`PublicKey` type](https://github.com/tendermint/tendermint/blob/main/proto/tendermint/crypto/keys.proto#L13-L15)
+* The [`PublicKey` type](https://github.com/tendermint/tendermint/blob/master/proto/tendermint/crypto/keys.proto#L13-L15)
  (used in ABCI as part of `ValidatorUpdate`) now uses a `oneof` protobuf type.
  Note that since Tendermint only supports ed25519 validator keys, there's only one
  option in the `oneof`.  For more, see "Protocol Buffers," below.
@@ -94,9 +64,12 @@ directory. For more, see "Protobuf," below.

 ### Blockchain Protocol

-* `Header#LastResultsHash`, which is the root hash of a Merkle tree built from
-  `ResponseDeliverTx(Code, Data)` as of v0.34 also includes `GasWanted` and `GasUsed`
-  fields.
+* `Header#LastResultsHash` previously was the root hash of a Merkle tree built from `ResponseDeliverTx(Code, Data)` responses.
+  As of 0.34,`Header#LastResultsHash` is now the root hash of a Merkle tree built from:
+    * `BeginBlock#Events`
+    * Root hash of a Merkle tree built from `ResponseDeliverTx(Code, Data,
+      GasWanted, GasUsed, Events)` responses
+    * `BeginBlock#Events`

 * Merkle hashes of empty trees previously returned nothing, but now return the hash of an empty input,
  to conform with [RFC-6962](https://tools.ietf.org/html/rfc6962).
@@ -186,7 +159,7 @@ The `bech32` package has moved to the Cosmos SDK:
 ### CLI

 The `tendermint lite` command has been renamed to `tendermint light` and has a slightly different API.
-See [the docs](https://docs.tendermint.com/v0.33/tendermint-core/light-client-protocol.html#http-proxy) for details.
+See [the docs](https://docs.tendermint.com/master/tendermint-core/light-client-protocol.html#http-proxy) for details.

 ### Light Client

@@ -200,7 +173,6 @@ Other user-relevant changes include:
 * The `Verifier` was broken up into two pieces:
    * Core verification logic (pure `VerifyX` functions)
    * `Client` object, which represents the complete light client
-* The new light client stores headers and validator sets as `LightBlock`s
 * The RPC client can be found in the `/rpc` directory.
 * The HTTP(S) proxy is located in the `/proxy` directory.

@@ -342,7 +314,7 @@ Evidence Params has been changed to include duration.
 ### RPC Changes

 * `/validators` is now paginated (default: 30 vals per page)
-* `/block_results` response format updated [see RPC docs for details](https://docs.tendermint.com/v0.33/rpc/#/Info/block_results)
+* `/block_results` response format updated [see RPC docs for details](https://docs.tendermint.com/master/rpc/#/Info/block_results)
 * Event suffix has been removed from the ID in event responses
 * IDs are now integers not `json-client-XYZ`

@@ -461,7 +433,7 @@ the compilation tag:

 Use `cleveldb` tag instead of `gcc` to compile Tendermint with CLevelDB or
 use `make build_c` / `make install_c` (full instructions can be found at
-<https://docs.tendermint.com/v0.33/introduction/install.html#compile-with-cleveldb-support>)
+<https://tendermint.com/docs/introduction/install.html#compile-with-cleveldb-support>)

 ## v0.31.0

@@ -536,14 +508,14 @@ due to changes in how various data structures are hashed.
 Any implementations of Tendermint blockchain verification, including lite clients,
 will need to be updated. For specific details:

-* [Merkle tree](https://github.com/tendermint/tendermint/blob/main/spec/blockchain/encoding.md#merkle-trees)
-* [ConsensusParams](https://github.com/tendermint/tendermint/blob/main/spec/blockchain/state.md#consensusparams)
+* [Merkle tree](https://github.com/tendermint/spec/blob/master/spec/blockchain/encoding.md#merkle-trees)
+* [ConsensusParams](https://github.com/tendermint/spec/blob/master/spec/blockchain/state.md#consensusparams)

 There was also a small change to field ordering in the vote struct. Any
 implementations of an out-of-process validator (like a Key-Management Server)
 will need to be updated. For specific details:

-* [Vote](https://github.com/tendermint/tendermint/blob/main/spec/consensus/signing.md#votes)
+* [Vote](https://github.com/tendermint/spec/blob/master/spec/consensus/signing.md#votes)

 Finally, the proposer selection algorithm continues to evolve. See the
 [work-in-progress
--- a/abci/README.md
+++ b/abci/README.md
@@ -19,8 +19,8 @@ To get up and running quickly, see the [getting started guide](../docs/app-dev/g

 A detailed description of the ABCI methods and message types is contained in:

- [The main spec](https://github.com/tendermint/tendermint/blob/main/spec/abci/README.md)
- [A protobuf file](../proto/tendermint/types/types.proto)
+- [The main spec](https://github.com/tendermint/spec/blob/master/spec/abci/abci.md)
+- [A protobuf file](./types/types.proto)
 - [A Go interface](./types/application.go)

 ## Protocol Buffers
--- a/abci/client/client.go
+++ b/abci/client/client.go
@@ -14,8 +14,6 @@ const (
 	echoRetryIntervalSeconds = 1
 )

-//go:generate ../../scripts/mockery_generate.sh Client
-
 // Client defines an interface for an ABCI client.
 // All `Async` methods return a `ReqRes` object.
 // All `Sync` methods return the appropriate protobuf ResponseXxx struct and an error.
@@ -30,36 +28,34 @@ type Client interface {
 	FlushAsync() *ReqRes
 	EchoAsync(msg string) *ReqRes
 	InfoAsync(types.RequestInfo) *ReqRes
+	SetOptionAsync(types.RequestSetOption) *ReqRes
 	DeliverTxAsync(types.RequestDeliverTx) *ReqRes
 	CheckTxAsync(types.RequestCheckTx) *ReqRes
 	QueryAsync(types.RequestQuery) *ReqRes
 	CommitAsync() *ReqRes
 	InitChainAsync(types.RequestInitChain) *ReqRes
-	PrepareProposalAsync(types.RequestPrepareProposal) *ReqRes
 	BeginBlockAsync(types.RequestBeginBlock) *ReqRes
 	EndBlockAsync(types.RequestEndBlock) *ReqRes
 	ListSnapshotsAsync(types.RequestListSnapshots) *ReqRes
 	OfferSnapshotAsync(types.RequestOfferSnapshot) *ReqRes
 	LoadSnapshotChunkAsync(types.RequestLoadSnapshotChunk) *ReqRes
 	ApplySnapshotChunkAsync(types.RequestApplySnapshotChunk) *ReqRes
-	ProcessProposalAsync(types.RequestProcessProposal) *ReqRes

 	FlushSync() error
 	EchoSync(msg string) (*types.ResponseEcho, error)
 	InfoSync(types.RequestInfo) (*types.ResponseInfo, error)
+	SetOptionSync(types.RequestSetOption) (*types.ResponseSetOption, error)
 	DeliverTxSync(types.RequestDeliverTx) (*types.ResponseDeliverTx, error)
 	CheckTxSync(types.RequestCheckTx) (*types.ResponseCheckTx, error)
 	QuerySync(types.RequestQuery) (*types.ResponseQuery, error)
 	CommitSync() (*types.ResponseCommit, error)
 	InitChainSync(types.RequestInitChain) (*types.ResponseInitChain, error)
-	PrepareProposalSync(types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error)
 	BeginBlockSync(types.RequestBeginBlock) (*types.ResponseBeginBlock, error)
 	EndBlockSync(types.RequestEndBlock) (*types.ResponseEndBlock, error)
 	ListSnapshotsSync(types.RequestListSnapshots) (*types.ResponseListSnapshots, error)
 	OfferSnapshotSync(types.RequestOfferSnapshot) (*types.ResponseOfferSnapshot, error)
 	LoadSnapshotChunkSync(types.RequestLoadSnapshotChunk) (*types.ResponseLoadSnapshotChunk, error)
 	ApplySnapshotChunkSync(types.RequestApplySnapshotChunk) (*types.ResponseApplySnapshotChunk, error)
-	ProcessProposalSync(types.RequestProcessProposal) (*types.ResponseProcessProposal, error)
 }

 //----------------------------------------
--- a/abci/client/grpc_client.go
+++ b/abci/client/grpc_client.go
@@ -192,6 +192,15 @@ func (cli *grpcClient) InfoAsync(params types.RequestInfo) *ReqRes {
 	return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_Info{Info: res}})
 }

+func (cli *grpcClient) SetOptionAsync(params types.RequestSetOption) *ReqRes {
+	req := types.ToRequestSetOption(params)
+	res, err := cli.client.SetOption(context.Background(), req.GetSetOption(), grpc.WaitForReady(true))
+	if err != nil {
+		cli.StopForError(err)
+	}
+	return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_SetOption{SetOption: res}})
+}
+
 func (cli *grpcClient) DeliverTxAsync(params types.RequestDeliverTx) *ReqRes {
 	req := types.ToRequestDeliverTx(params)
 	res, err := cli.client.DeliverTx(context.Background(), req.GetDeliverTx(), grpc.WaitForReady(true))
@@ -291,25 +300,6 @@ func (cli *grpcClient) ApplySnapshotChunkAsync(params types.RequestApplySnapshot
 	return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_ApplySnapshotChunk{ApplySnapshotChunk: res}})
 }

-func (cli *grpcClient) PrepareProposalAsync(params types.RequestPrepareProposal) *ReqRes {
-	req := types.ToRequestPrepareProposal(params)
-	res, err := cli.client.PrepareProposal(context.Background(), req.GetPrepareProposal(), grpc.WaitForReady(true))
-	if err != nil {
-		cli.StopForError(err)
-	}
-	return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_PrepareProposal{PrepareProposal: res}})
-}
-
-func (cli *grpcClient) ProcessProposalAsync(params types.RequestProcessProposal) *ReqRes {
-	req := types.ToRequestProcessProposal(params)
-	res, err := cli.client.ProcessProposal(context.Background(), req.GetProcessProposal(), grpc.WaitForReady(true))
-	if err != nil {
-		cli.StopForError(err)
-	}
-
-	return cli.finishAsyncCall(req, &types.Response{Value: &types.Response_ProcessProposal{ProcessProposal: res}})
-}
-
 // finishAsyncCall creates a ReqRes for an async call, and immediately populates it
 // with the response. We don't complete it until it's been ordered via the channel.
 func (cli *grpcClient) finishAsyncCall(req *types.Request, res *types.Response) *ReqRes {
@@ -366,6 +356,11 @@ func (cli *grpcClient) InfoSync(req types.RequestInfo) (*types.ResponseInfo, err
 	return cli.finishSyncCall(reqres).GetInfo(), cli.Error()
 }

+func (cli *grpcClient) SetOptionSync(req types.RequestSetOption) (*types.ResponseSetOption, error) {
+	reqres := cli.SetOptionAsync(req)
+	return reqres.Response.GetSetOption(), cli.Error()
+}
+
 func (cli *grpcClient) DeliverTxSync(params types.RequestDeliverTx) (*types.ResponseDeliverTx, error) {
 	reqres := cli.DeliverTxAsync(params)
 	return cli.finishSyncCall(reqres).GetDeliverTx(), cli.Error()
@@ -422,14 +417,3 @@ func (cli *grpcClient) ApplySnapshotChunkSync(
 	reqres := cli.ApplySnapshotChunkAsync(params)
 	return cli.finishSyncCall(reqres).GetApplySnapshotChunk(), cli.Error()
 }
-
-func (cli *grpcClient) PrepareProposalSync(
-	params types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) {
-	reqres := cli.PrepareProposalAsync(params)
-	return cli.finishSyncCall(reqres).GetPrepareProposal(), cli.Error()
-}
-
-func (cli *grpcClient) ProcessProposalSync(params types.RequestProcessProposal) (*types.ResponseProcessProposal, error) {
-	reqres := cli.ProcessProposalAsync(params)
-	return cli.finishSyncCall(reqres).GetProcessProposal(), cli.Error()
-}
--- a/abci/client/local_client.go
+++ b/abci/client/local_client.go
@@ -75,6 +75,17 @@ func (app *localClient) InfoAsync(req types.RequestInfo) *ReqRes {
 	)
 }

+func (app *localClient) SetOptionAsync(req types.RequestSetOption) *ReqRes {
+	app.mtx.Lock()
+	defer app.mtx.Unlock()
+
+	res := app.Application.SetOption(req)
+	return app.callback(
+		types.ToRequestSetOption(req),
+		types.ToResponseSetOption(res),
+	)
+}
+
 func (app *localClient) DeliverTxAsync(params types.RequestDeliverTx) *ReqRes {
 	app.mtx.Lock()
 	defer app.mtx.Unlock()
@@ -196,28 +207,6 @@ func (app *localClient) ApplySnapshotChunkAsync(req types.RequestApplySnapshotCh
 	)
 }

-func (app *localClient) PrepareProposalAsync(req types.RequestPrepareProposal) *ReqRes {
-	app.mtx.Lock()
-	defer app.mtx.Unlock()
-
-	res := app.Application.PrepareProposal(req)
-	return app.callback(
-		types.ToRequestPrepareProposal(req),
-		types.ToResponsePrepareProposal(res),
-	)
-}
-
-func (app *localClient) ProcessProposalAsync(req types.RequestProcessProposal) *ReqRes {
-	app.mtx.Lock()
-	defer app.mtx.Unlock()
-
-	res := app.Application.ProcessProposal(req)
-	return app.callback(
-		types.ToRequestProcessProposal(req),
-		types.ToResponseProcessProposal(res),
-	)
-}
-
 //-------------------------------------------------------

 func (app *localClient) FlushSync() error {
@@ -236,6 +225,14 @@ func (app *localClient) InfoSync(req types.RequestInfo) (*types.ResponseInfo, er
 	return &res, nil
 }

+func (app *localClient) SetOptionSync(req types.RequestSetOption) (*types.ResponseSetOption, error) {
+	app.mtx.Lock()
+	defer app.mtx.Unlock()
+
+	res := app.Application.SetOption(req)
+	return &res, nil
+}
+
 func (app *localClient) DeliverTxSync(req types.RequestDeliverTx) (*types.ResponseDeliverTx, error) {
 	app.mtx.Lock()
 	defer app.mtx.Unlock()
@@ -326,22 +323,6 @@ func (app *localClient) ApplySnapshotChunkSync(
 	return &res, nil
 }

-func (app *localClient) PrepareProposalSync(req types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) {
-	app.mtx.Lock()
-	defer app.mtx.Unlock()
-
-	res := app.Application.PrepareProposal(req)
-	return &res, nil
-}
-
-func (app *localClient) ProcessProposalSync(req types.RequestProcessProposal) (*types.ResponseProcessProposal, error) {
-	app.mtx.Lock()
-	defer app.mtx.Unlock()
-
-	res := app.Application.ProcessProposal(req)
-	return &res, nil
-}
-
 //-------------------------------------------------------

 func (app *localClient) callback(req *types.Request, res *types.Response) *ReqRes {
--- a/abci/client/mocks/client.go
+++ b/abci/client/mocks/client.go
@@ -1,4 +1,4 @@
-// Code generated by mockery. DO NOT EDIT.
+// Code generated by mockery v1.1.1. DO NOT EDIT.

 package mocks

@@ -575,84 +575,6 @@ func (_m *Client) OnStop() {
 	_m.Called()
 }

-// PrepareProposalAsync provides a mock function with given fields: _a0
-func (_m *Client) PrepareProposalAsync(_a0 types.RequestPrepareProposal) *abcicli.ReqRes {
-	ret := _m.Called(_a0)
-
-	var r0 *abcicli.ReqRes
-	if rf, ok := ret.Get(0).(func(types.RequestPrepareProposal) *abcicli.ReqRes); ok {
-		r0 = rf(_a0)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*abcicli.ReqRes)
-		}
-	}
-
-	return r0
-}
-
-// PrepareProposalSync provides a mock function with given fields: _a0
-func (_m *Client) PrepareProposalSync(_a0 types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) {
-	ret := _m.Called(_a0)
-
-	var r0 *types.ResponsePrepareProposal
-	if rf, ok := ret.Get(0).(func(types.RequestPrepareProposal) *types.ResponsePrepareProposal); ok {
-		r0 = rf(_a0)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.ResponsePrepareProposal)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(types.RequestPrepareProposal) error); ok {
-		r1 = rf(_a0)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// ProcessProposalAsync provides a mock function with given fields: _a0
-func (_m *Client) ProcessProposalAsync(_a0 types.RequestProcessProposal) *abcicli.ReqRes {
-	ret := _m.Called(_a0)
-
-	var r0 *abcicli.ReqRes
-	if rf, ok := ret.Get(0).(func(types.RequestProcessProposal) *abcicli.ReqRes); ok {
-		r0 = rf(_a0)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*abcicli.ReqRes)
-		}
-	}
-
-	return r0
-}
-
-// ProcessProposalSync provides a mock function with given fields: _a0
-func (_m *Client) ProcessProposalSync(_a0 types.RequestProcessProposal) (*types.ResponseProcessProposal, error) {
-	ret := _m.Called(_a0)
-
-	var r0 *types.ResponseProcessProposal
-	if rf, ok := ret.Get(0).(func(types.RequestProcessProposal) *types.ResponseProcessProposal); ok {
-		r0 = rf(_a0)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(*types.ResponseProcessProposal)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(types.RequestProcessProposal) error); ok {
-		r1 = rf(_a0)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
 // QueryAsync provides a mock function with given fields: _a0
 func (_m *Client) QueryAsync(_a0 types.RequestQuery) *abcicli.ReqRes {
 	ret := _m.Called(_a0)
@@ -727,6 +649,45 @@ func (_m *Client) SetLogger(_a0 log.Logger) {
 	_m.Called(_a0)
 }

+// SetOptionAsync provides a mock function with given fields: _a0
+func (_m *Client) SetOptionAsync(_a0 types.RequestSetOption) *abcicli.ReqRes {
+	ret := _m.Called(_a0)
+
+	var r0 *abcicli.ReqRes
+	if rf, ok := ret.Get(0).(func(types.RequestSetOption) *abcicli.ReqRes); ok {
+		r0 = rf(_a0)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*abcicli.ReqRes)
+		}
+	}
+
+	return r0
+}
+
+// SetOptionSync provides a mock function with given fields: _a0
+func (_m *Client) SetOptionSync(_a0 types.RequestSetOption) (*types.ResponseSetOption, error) {
+	ret := _m.Called(_a0)
+
+	var r0 *types.ResponseSetOption
+	if rf, ok := ret.Get(0).(func(types.RequestSetOption) *types.ResponseSetOption); ok {
+		r0 = rf(_a0)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(*types.ResponseSetOption)
+		}
+	}
+
+	var r1 error
+	if rf, ok := ret.Get(1).(func(types.RequestSetOption) error); ok {
+		r1 = rf(_a0)
+	} else {
+		r1 = ret.Error(1)
+	}
+
+	return r0, r1
+}
+
 // SetResponseCallback provides a mock function with given fields: _a0
 func (_m *Client) SetResponseCallback(_a0 abcicli.Callback) {
 	_m.Called(_a0)
@@ -773,18 +734,3 @@ func (_m *Client) String() string {

 	return r0
 }
-
-type mockConstructorTestingTNewClient interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewClient creates a new instance of Client. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewClient(t mockConstructorTestingTNewClient) *Client {
-	mock := &Client{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
--- a/abci/client/socket_client.go
+++ b/abci/client/socket_client.go
@@ -231,6 +231,10 @@ func (cli *socketClient) InfoAsync(req types.RequestInfo) *ReqRes {
 	return cli.queueRequest(types.ToRequestInfo(req))
 }

+func (cli *socketClient) SetOptionAsync(req types.RequestSetOption) *ReqRes {
+	return cli.queueRequest(types.ToRequestSetOption(req))
+}
+
 func (cli *socketClient) DeliverTxAsync(req types.RequestDeliverTx) *ReqRes {
 	return cli.queueRequest(types.ToRequestDeliverTx(req))
 }
@@ -275,14 +279,6 @@ func (cli *socketClient) ApplySnapshotChunkAsync(req types.RequestApplySnapshotC
 	return cli.queueRequest(types.ToRequestApplySnapshotChunk(req))
 }

-func (cli *socketClient) PrepareProposalAsync(req types.RequestPrepareProposal) *ReqRes {
-	return cli.queueRequest(types.ToRequestPrepareProposal(req))
-}
-
-func (cli *socketClient) ProcessProposalAsync(req types.RequestProcessProposal) *ReqRes {
-	return cli.queueRequest(types.ToRequestProcessProposal(req))
-}
-
 //----------------------------------------

 func (cli *socketClient) FlushSync() error {
@@ -312,6 +308,15 @@ func (cli *socketClient) InfoSync(req types.RequestInfo) (*types.ResponseInfo, e
 	return reqres.Response.GetInfo(), cli.Error()
 }

+func (cli *socketClient) SetOptionSync(req types.RequestSetOption) (*types.ResponseSetOption, error) {
+	reqres := cli.queueRequest(types.ToRequestSetOption(req))
+	if err := cli.FlushSync(); err != nil {
+		return nil, err
+	}
+
+	return reqres.Response.GetSetOption(), cli.Error()
+}
+
 func (cli *socketClient) DeliverTxSync(req types.RequestDeliverTx) (*types.ResponseDeliverTx, error) {
 	reqres := cli.queueRequest(types.ToRequestDeliverTx(req))
 	if err := cli.FlushSync(); err != nil {
@@ -412,24 +417,6 @@ func (cli *socketClient) ApplySnapshotChunkSync(
 	return reqres.Response.GetApplySnapshotChunk(), cli.Error()
 }

-func (cli *socketClient) PrepareProposalSync(req types.RequestPrepareProposal) (*types.ResponsePrepareProposal, error) {
-	reqres := cli.queueRequest(types.ToRequestPrepareProposal(req))
-	if err := cli.FlushSync(); err != nil {
-		return nil, err
-	}
-
-	return reqres.Response.GetPrepareProposal(), cli.Error()
-}
-
-func (cli *socketClient) ProcessProposalSync(req types.RequestProcessProposal) (*types.ResponseProcessProposal, error) {
-	reqres := cli.queueRequest(types.ToRequestProcessProposal(req))
-	if err := cli.FlushSync(); err != nil {
-		return nil, err
-	}
-
-	return reqres.Response.GetProcessProposal(), cli.Error()
-}
-
 //----------------------------------------

 func (cli *socketClient) queueRequest(req *types.Request) *ReqRes {
@@ -481,6 +468,8 @@ func resMatchesReq(req *types.Request, res *types.Response) (ok bool) {
 		_, ok = res.Value.(*types.Response_Flush)
 	case *types.Request_Info:
 		_, ok = res.Value.(*types.Response_Info)
+	case *types.Request_SetOption:
+		_, ok = res.Value.(*types.Response_SetOption)
 	case *types.Request_DeliverTx:
 		_, ok = res.Value.(*types.Response_DeliverTx)
 	case *types.Request_CheckTx:
@@ -503,10 +492,6 @@ func resMatchesReq(req *types.Request, res *types.Response) (ok bool) {
 		_, ok = res.Value.(*types.Response_ListSnapshots)
 	case *types.Request_OfferSnapshot:
 		_, ok = res.Value.(*types.Response_OfferSnapshot)
-	case *types.Request_PrepareProposal:
-		_, ok = res.Value.(*types.Response_PrepareProposal)
-	case *types.Request_ProcessProposal:
-		_, ok = res.Value.(*types.Response_ProcessProposal)
 	}
 	return ok
 }
--- a/abci/cmd/abci-cli/abci-cli.go
+++ b/abci/cmd/abci-cli/abci-cli.go
@@ -83,11 +83,10 @@ var RootCmd = &cobra.Command{
 // Structure for data passed to print response.
 type response struct {
 	// generic abci response
-	Data   []byte
-	Code   uint32
-	Info   string
-	Log    string
-	Status int32
+	Data []byte
+	Code uint32
+	Info string
+	Log  string

 	Query *queryResponse
 }
@@ -139,13 +138,12 @@ func addCommands() {
 	RootCmd.AddCommand(consoleCmd)
 	RootCmd.AddCommand(echoCmd)
 	RootCmd.AddCommand(infoCmd)
+	RootCmd.AddCommand(setOptionCmd)
 	RootCmd.AddCommand(deliverTxCmd)
 	RootCmd.AddCommand(checkTxCmd)
 	RootCmd.AddCommand(commitCmd)
 	RootCmd.AddCommand(versionCmd)
 	RootCmd.AddCommand(testCmd)
-	RootCmd.AddCommand(prepareProposalCmd)
-	RootCmd.AddCommand(processProposalCmd)
 	addQueryFlags()
 	RootCmd.AddCommand(queryCmd)

@@ -166,6 +164,7 @@ you'd like to run:

 where example.file looks something like:

+    set_option serial on
    check_tx 0x00
    check_tx 0xff
    deliver_tx 0x00
@@ -187,7 +186,7 @@ This command opens an interactive console for running any of the other commands
 without opening a new connection each time
 `,
 	Args:      cobra.ExactArgs(0),
-	ValidArgs: []string{"echo", "info", "deliver_tx", "check_tx", "prepare_proposal", "process_proposal", "commit", "query"},
+	ValidArgs: []string{"echo", "info", "set_option", "deliver_tx", "check_tx", "commit", "query"},
 	RunE:      cmdConsole,
 }

@@ -205,6 +204,13 @@ var infoCmd = &cobra.Command{
 	Args:  cobra.ExactArgs(0),
 	RunE:  cmdInfo,
 }
+var setOptionCmd = &cobra.Command{
+	Use:   "set_option",
+	Short: "set an option on the application",
+	Long:  "set an option on the application",
+	Args:  cobra.ExactArgs(2),
+	RunE:  cmdSetOption,
+}

 var deliverTxCmd = &cobra.Command{
 	Use:   "deliver_tx",
@@ -241,22 +247,6 @@ var versionCmd = &cobra.Command{
 	},
 }

-var prepareProposalCmd = &cobra.Command{
-	Use:   "prepare_proposal",
-	Short: "prepare proposal",
-	Long:  "prepare proposal",
-	Args:  cobra.MinimumNArgs(0),
-	RunE:  cmdPrepareProposal,
-}
-
-var processProposalCmd = &cobra.Command{
-	Use:   "process_proposal",
-	Short: "process proposal",
-	Long:  "process proposal",
-	Args:  cobra.MinimumNArgs(0),
-	RunE:  cmdProcessProposal,
-}
-
 var queryCmd = &cobra.Command{
 	Use:   "query",
 	Short: "query the application state",
@@ -314,6 +304,7 @@ func cmdTest(cmd *cobra.Command, args []string) error {
 	return compose(
 		[]func() error{
 			func() error { return servertest.InitChain(client) },
+			func() error { return servertest.SetOption(client, "serial", "on") },
 			func() error { return servertest.Commit(client, nil) },
 			func() error { return servertest.DeliverTx(client, []byte("abc"), code.CodeTypeBadNonce, nil) },
 			func() error { return servertest.Commit(client, nil) },
@@ -328,16 +319,6 @@ func cmdTest(cmd *cobra.Command, args []string) error {
 				return servertest.DeliverTx(client, []byte{0x00, 0x00, 0x06}, code.CodeTypeBadNonce, nil)
 			},
 			func() error { return servertest.Commit(client, []byte{0, 0, 0, 0, 0, 0, 0, 5}) },
-			func() error {
-				return servertest.PrepareProposal(client, [][]byte{
-					{0x01},
-				}, [][]byte{{0x01}}, nil)
-			},
-			func() error {
-				return servertest.ProcessProposal(client, [][]byte{
-					{0x01},
-				}, types.ResponseProcessProposal_ACCEPT)
-			},
 		})
 }

@@ -438,10 +419,8 @@ func muxOnCommands(cmd *cobra.Command, pArgs []string) error {
 		return cmdInfo(cmd, actualArgs)
 	case "query":
 		return cmdQuery(cmd, actualArgs)
-	case "prepare_proposal":
-		return cmdPrepareProposal(cmd, actualArgs)
-	case "process_proposal":
-		return cmdProcessProposal(cmd, actualArgs)
+	case "set_option":
+		return cmdSetOption(cmd, actualArgs)
 	default:
 		return cmdUnimplemented(cmd, pArgs)
 	}
@@ -465,6 +444,7 @@ func cmdUnimplemented(cmd *cobra.Command, args []string) error {
 	fmt.Printf("%s: %s\n", deliverTxCmd.Use, deliverTxCmd.Short)
 	fmt.Printf("%s: %s\n", queryCmd.Use, queryCmd.Short)
 	fmt.Printf("%s: %s\n", commitCmd.Use, commitCmd.Short)
+	fmt.Printf("%s: %s\n", setOptionCmd.Use, setOptionCmd.Short)
 	fmt.Println("Use \"[command] --help\" for more information about a command.")

 	return nil
@@ -504,6 +484,25 @@ func cmdInfo(cmd *cobra.Command, args []string) error {

 const codeBad uint32 = 10

+// Set an option on the application
+func cmdSetOption(cmd *cobra.Command, args []string) error {
+	if len(args) < 2 {
+		printResponse(cmd, args, response{
+			Code: codeBad,
+			Log:  "want at least arguments of the form: <key> <value>",
+		})
+		return nil
+	}
+
+	key, val := args[0], args[1]
+	_, err := client.SetOptionSync(types.RequestSetOption{Key: key, Value: val})
+	if err != nil {
+		return err
+	}
+	printResponse(cmd, args, response{Log: "OK (SetOption doesn't return anything.)"}) // NOTE: Nothing to show...
+	return nil
+}
+
 // Append a new tx to application
 func cmdDeliverTx(cmd *cobra.Command, args []string) error {
 	if len(args) == 0 {
@@ -606,75 +605,17 @@ func cmdQuery(cmd *cobra.Command, args []string) error {
 	return nil
 }

-func cmdPrepareProposal(cmd *cobra.Command, args []string) error {
-	txsBytesArray := make([][]byte, len(args))
-
-	for i, arg := range args {
-		txBytes, err := stringOrHexToBytes(arg)
-		if err != nil {
-			return err
-		}
-		txsBytesArray[i] = txBytes
-	}
-
-	res, err := client.PrepareProposalSync(types.RequestPrepareProposal{
-		Txs: txsBytesArray,
-		// kvstore has to have this parameter in order not to reject a tx as the default value is 0
-		MaxTxBytes: 65536,
-	})
-	if err != nil {
-		return err
-	}
-	resps := make([]response, 0, len(res.Txs))
-	for _, tx := range res.Txs {
-		resps = append(resps, response{
-			Code: code.CodeTypeOK,
-			Log:  "Succeeded. Tx: " + string(tx),
-		})
-	}
-
-	printResponse(cmd, args, resps...)
-	return nil
-}
-
-func cmdProcessProposal(cmd *cobra.Command, args []string) error {
-	txsBytesArray := make([][]byte, len(args))
-
-	for i, arg := range args {
-		txBytes, err := stringOrHexToBytes(arg)
-		if err != nil {
-			return err
-		}
-		txsBytesArray[i] = txBytes
-	}
-
-	res, err := client.ProcessProposalSync(types.RequestProcessProposal{
-		Txs: txsBytesArray,
-	})
-	if err != nil {
-		return err
-	}
-
-	printResponse(cmd, args, response{
-		Status: int32(res.Status),
-	})
-	return nil
-}
-
 func cmdKVStore(cmd *cobra.Command, args []string) error {
 	logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))

 	// Create the application - in memory or persisted to disk
 	var app types.Application
 	if flagPersist == "" {
-		var err error
-		flagPersist, err = os.MkdirTemp("", "persistent_kvstore_tmp")
-		if err != nil {
-			return err
-		}
+		app = kvstore.NewApplication()
+	} else {
+		app = kvstore.NewPersistentKVStoreApplication(flagPersist)
+		app.(*kvstore.PersistentKVStoreApplication).SetLogger(logger.With("module", "kvstore"))
 	}
-	app = kvstore.NewPersistentKVStoreApplication(flagPersist)
-	app.(*kvstore.PersistentKVStoreApplication).SetLogger(logger.With("module", "kvstore"))

 	// Start the listener
 	srv, err := server.NewServer(flagAddress, flagAbci, app)
@@ -700,49 +641,44 @@ func cmdKVStore(cmd *cobra.Command, args []string) error {

 //--------------------------------------------------------------------------------

-func printResponse(cmd *cobra.Command, args []string, rsps ...response) {
+func printResponse(cmd *cobra.Command, args []string, rsp response) {

 	if flagVerbose {
 		fmt.Println(">", cmd.Use, strings.Join(args, " "))
 	}

-	for _, rsp := range rsps {
-		// Always print the status code.
-		if rsp.Code == types.CodeTypeOK {
-			fmt.Printf("-> code: OK\n")
-		} else {
-			fmt.Printf("-> code: %d\n", rsp.Code)
+	// Always print the status code.
+	if rsp.Code == types.CodeTypeOK {
+		fmt.Printf("-> code: OK\n")
+	} else {
+		fmt.Printf("-> code: %d\n", rsp.Code)

-		}
+	}

-		if len(rsp.Data) != 0 {
-			// Do no print this line when using the commit command
-			// because the string comes out as gibberish
-			if cmd.Use != "commit" {
-				fmt.Printf("-> data: %s\n", rsp.Data)
-			}
-			fmt.Printf("-> data.hex: 0x%X\n", rsp.Data)
-		}
-		if rsp.Log != "" {
-			fmt.Printf("-> log: %s\n", rsp.Log)
-		}
-		if cmd.Use == "process_proposal" {
-			fmt.Printf("-> status: %s\n", types.ResponseProcessProposal_ProposalStatus_name[rsp.Status])
+	if len(rsp.Data) != 0 {
+		// Do no print this line when using the commit command
+		// because the string comes out as gibberish
+		if cmd.Use != "commit" {
+			fmt.Printf("-> data: %s\n", rsp.Data)
 		}
+		fmt.Printf("-> data.hex: 0x%X\n", rsp.Data)
+	}
+	if rsp.Log != "" {
+		fmt.Printf("-> log: %s\n", rsp.Log)
+	}

-		if rsp.Query != nil {
-			fmt.Printf("-> height: %d\n", rsp.Query.Height)
-			if rsp.Query.Key != nil {
-				fmt.Printf("-> key: %s\n", rsp.Query.Key)
-				fmt.Printf("-> key.hex: %X\n", rsp.Query.Key)
-			}
-			if rsp.Query.Value != nil {
-				fmt.Printf("-> value: %s\n", rsp.Query.Value)
-				fmt.Printf("-> value.hex: %X\n", rsp.Query.Value)
-			}
-			if rsp.Query.ProofOps != nil {
-				fmt.Printf("-> proof: %#v\n", rsp.Query.ProofOps)
-			}
+	if rsp.Query != nil {
+		fmt.Printf("-> height: %d\n", rsp.Query.Height)
+		if rsp.Query.Key != nil {
+			fmt.Printf("-> key: %s\n", rsp.Query.Key)
+			fmt.Printf("-> key.hex: %X\n", rsp.Query.Key)
+		}
+		if rsp.Query.Value != nil {
+			fmt.Printf("-> value: %s\n", rsp.Query.Value)
+			fmt.Printf("-> value.hex: %X\n", rsp.Query.Value)
+		}
+		if rsp.Query.ProofOps != nil {
+			fmt.Printf("-> proof: %#v\n", rsp.Query.ProofOps)
 		}
 	}
 }
--- a/abci/example/code/code.go
+++ b/abci/example/code/code.go
@@ -7,5 +7,4 @@ const (
 	CodeTypeBadNonce      uint32 = 2
 	CodeTypeUnauthorized  uint32 = 3
 	CodeTypeUnknownError  uint32 = 4
-	CodeTypeExecuted      uint32 = 5
 )
--- a/abci/example/kvstore/kvstore.go
+++ b/abci/example/kvstore/kvstore.go
@@ -68,7 +68,6 @@ type Application struct {

 	state        State
 	RetainBlocks int64 // blocks to retain after commit (via ResponseCommit.RetainHeight)
-	txToRemove   map[string]struct{}
 }

 func NewApplication() *Application {
@@ -79,7 +78,7 @@ func NewApplication() *Application {
 func (app *Application) Info(req types.RequestInfo) (resInfo types.ResponseInfo) {
 	return types.ResponseInfo{
 		Data:             fmt.Sprintf("{\"size\":%v}", app.state.Size),
-		Version:          version.ABCISemVer,
+		Version:          version.ABCIVersion,
 		AppVersion:       ProtocolVersion,
 		LastBlockHeight:  app.state.Height,
 		LastBlockAppHash: app.state.AppHash,
@@ -88,19 +87,15 @@ func (app *Application) Info(req types.RequestInfo) (resInfo types.ResponseInfo)

 // tx is either "key=value" or just arbitrary bytes
 func (app *Application) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx {
-	if isReplacedTx(req.Tx) {
-		app.txToRemove[string(req.Tx)] = struct{}{}
-	}
-	var key, value string
-
+	var key, value []byte
 	parts := bytes.Split(req.Tx, []byte("="))
 	if len(parts) == 2 {
-		key, value = string(parts[0]), string(parts[1])
+		key, value = parts[0], parts[1]
 	} else {
-		key, value = string(req.Tx), string(req.Tx)
+		key, value = req.Tx, req.Tx
 	}

-	err := app.state.db.Set(prefixKey([]byte(key)), []byte(value))
+	err := app.state.db.Set(prefixKey(key), value)
 	if err != nil {
 		panic(err)
 	}
@@ -110,10 +105,10 @@ func (app *Application) DeliverTx(req types.RequestDeliverTx) types.ResponseDeli
 		{
 			Type: "app",
 			Attributes: []types.EventAttribute{
-				{Key: "creator", Value: "Cosmoshi Netowoko", Index: true},
-				{Key: "key", Value: key, Index: true},
-				{Key: "index_key", Value: "index is working", Index: true},
-				{Key: "noindex_key", Value: "index is working", Index: false},
+				{Key: []byte("creator"), Value: []byte("Cosmoshi Netowoko"), Index: true},
+				{Key: []byte("key"), Value: key, Index: true},
+				{Key: []byte("index_key"), Value: []byte("index is working"), Index: true},
+				{Key: []byte("noindex_key"), Value: []byte("index is working"), Index: false},
 			},
 		},
 	}
@@ -122,11 +117,6 @@ func (app *Application) DeliverTx(req types.RequestDeliverTx) types.ResponseDeli
 }

 func (app *Application) CheckTx(req types.RequestCheckTx) types.ResponseCheckTx {
-	if req.Type == types.CheckTxType_Recheck {
-		if _, ok := app.txToRemove[string(req.Tx)]; ok {
-			return types.ResponseCheckTx{Code: code.CodeTypeExecuted, GasWanted: 1}
-		}
-	}
 	return types.ResponseCheckTx{Code: code.CodeTypeOK, GasWanted: 1}
 }

@@ -136,8 +126,6 @@ func (app *Application) Commit() types.ResponseCommit {
 	binary.PutVarint(appHash, app.state.Size)
 	app.state.AppHash = appHash
 	app.state.Height++
-
-	// empty out the set of transactions to remove via rechecktx
 	saveState(app.state)

 	resp := types.ResponseCommit{Data: appHash}
@@ -182,18 +170,3 @@ func (app *Application) Query(reqQuery types.RequestQuery) (resQuery types.Respo

 	return resQuery
 }
-
-func (app *Application) BeginBlock(req types.RequestBeginBlock) types.ResponseBeginBlock {
-	app.txToRemove = map[string]struct{}{}
-	return types.ResponseBeginBlock{}
-}
-
-func (app *Application) ProcessProposal(
-	req types.RequestProcessProposal) types.ResponseProcessProposal {
-	for _, tx := range req.Txs {
-		if len(tx) == 0 {
-			return types.ResponseProcessProposal{Status: types.ResponseProcessProposal_REJECT}
-		}
-	}
-	return types.ResponseProcessProposal{Status: types.ResponseProcessProposal_ACCEPT}
-}
--- a/abci/example/kvstore/kvstore_test.go
+++ b/abci/example/kvstore/kvstore_test.go
@@ -2,7 +2,7 @@ package kvstore

 import (
 	"fmt"
-	"os"
+	"io/ioutil"
 	"sort"
 	"testing"

@@ -71,7 +71,7 @@ func TestKVStoreKV(t *testing.T) {
 }

 func TestPersistentKVStoreKV(t *testing.T) {
-	dir, err := os.MkdirTemp("/tmp", "abci-kvstore-test") // TODO
+	dir, err := ioutil.TempDir("/tmp", "abci-kvstore-test") // TODO
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -87,7 +87,7 @@ func TestPersistentKVStoreKV(t *testing.T) {
 }

 func TestPersistentKVStoreInfo(t *testing.T) {
-	dir, err := os.MkdirTemp("/tmp", "abci-kvstore-test") // TODO
+	dir, err := ioutil.TempDir("/tmp", "abci-kvstore-test") // TODO
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -119,7 +119,7 @@ func TestPersistentKVStoreInfo(t *testing.T) {

 // add a validator, remove a validator, update a validator
 func TestValUpdates(t *testing.T) {
-	dir, err := os.MkdirTemp("/tmp", "abci-kvstore-test") // TODO
+	dir, err := ioutil.TempDir("/tmp", "abci-kvstore-test") // TODO
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -162,7 +162,7 @@ func TestValUpdates(t *testing.T) {

 	makeApplyBlock(t, kvstore, 2, diff, tx1, tx2, tx3)

-	vals1 = append(vals[:nInit-2], vals[nInit+1]) //nolint: gocritic
+	vals1 = append(vals[:nInit-2], vals[nInit+1]) // nolint: gocritic
 	vals2 = kvstore.Validators()
 	valsEqual(t, vals1, vals2)

--- a/abci/example/kvstore/persistent_kvstore.go
+++ b/abci/example/kvstore/persistent_kvstore.go
@@ -45,10 +45,7 @@ func NewPersistentKVStoreApplication(dbDir string) *PersistentKVStoreApplication
 	state := loadState(db)

 	return &PersistentKVStoreApplication{
-		app: &Application{
-			state:      state,
-			txToRemove: map[string]struct{}{},
-		},
+		app:                &Application{state: state},
 		valAddrToPubKeyMap: make(map[string]pc.PublicKey),
 		logger:             log.NewNopLogger(),
 	}
@@ -65,6 +62,10 @@ func (app *PersistentKVStoreApplication) Info(req types.RequestInfo) types.Respo
 	return res
 }

+func (app *PersistentKVStoreApplication) SetOption(req types.RequestSetOption) types.ResponseSetOption {
+	return app.app.SetOption(req)
+}
+
 // tx is either "val:pubkey!power" or "key=value" or just arbitrary bytes
 func (app *PersistentKVStoreApplication) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx {
 	// if it starts with "val:", update the validator set
@@ -75,10 +76,6 @@ func (app *PersistentKVStoreApplication) DeliverTx(req types.RequestDeliverTx) t
 		return app.execValidatorTx(req.Tx)
 	}

-	if isPrepareTx(req.Tx) {
-		return app.execPrepareTx(req.Tx)
-	}
-
 	// otherwise, update the key-value store
 	return app.app.DeliverTx(req)
 }
@@ -129,7 +126,7 @@ func (app *PersistentKVStoreApplication) BeginBlock(req types.RequestBeginBlock)

 	// Punish validators who committed equivocation.
 	for _, ev := range req.ByzantineValidators {
-		if ev.Type == types.MisbehaviorType_DUPLICATE_VOTE {
+		if ev.Type == types.EvidenceType_DUPLICATE_VOTE {
 			addr := string(ev.Validator.Address)
 			if pubKey, ok := app.valAddrToPubKeyMap[addr]; ok {
 				app.updateValidator(types.ValidatorUpdate{
@@ -145,7 +142,7 @@ func (app *PersistentKVStoreApplication) BeginBlock(req types.RequestBeginBlock)
 		}
 	}

-	return app.app.BeginBlock(req)
+	return types.ResponseBeginBlock{}
 }

 // Update the validator set
@@ -173,21 +170,6 @@ func (app *PersistentKVStoreApplication) ApplySnapshotChunk(
 	return types.ResponseApplySnapshotChunk{Result: types.ResponseApplySnapshotChunk_ABORT}
 }

-func (app *PersistentKVStoreApplication) PrepareProposal(
-	req types.RequestPrepareProposal) types.ResponsePrepareProposal {
-	return types.ResponsePrepareProposal{Txs: app.substPrepareTx(req.Txs, req.MaxTxBytes)}
-}
-
-func (app *PersistentKVStoreApplication) ProcessProposal(
-	req types.RequestProcessProposal) types.ResponseProcessProposal {
-	for _, tx := range req.Txs {
-		if len(tx) == 0 || isPrepareTx(tx) {
-			return types.ResponseProcessProposal{Status: types.ResponseProcessProposal_REJECT}
-		}
-	}
-	return types.ResponseProcessProposal{Status: types.ResponseProcessProposal_ACCEPT}
-}
-
 //---------------------------------------------
 // update validators

@@ -302,42 +284,3 @@ func (app *PersistentKVStoreApplication) updateValidator(v types.ValidatorUpdate

 	return types.ResponseDeliverTx{Code: code.CodeTypeOK}
 }
-
-// -----------------------------
-
-const (
-	PreparePrefix = "prepare"
-	ReplacePrefix = "replace"
-)
-
-func isPrepareTx(tx []byte) bool { return bytes.HasPrefix(tx, []byte(PreparePrefix)) }
-
-func isReplacedTx(tx []byte) bool {
-	return bytes.HasPrefix(tx, []byte(ReplacePrefix))
-}
-
-// execPrepareTx is noop. tx data is considered as placeholder
-// and is substitute at the PrepareProposal.
-func (app *PersistentKVStoreApplication) execPrepareTx(tx []byte) types.ResponseDeliverTx {
-	// noop
-	return types.ResponseDeliverTx{}
-}
-
-// substPrepareTx substitutes all the transactions prefixed with 'prepare' in the
-// proposal for transactions with the prefix stripped.
-func (app *PersistentKVStoreApplication) substPrepareTx(blockData [][]byte, maxTxBytes int64) [][]byte {
-	txs := make([][]byte, 0, len(blockData))
-	var totalBytes int64
-	for _, tx := range blockData {
-		txMod := tx
-		if isPrepareTx(tx) {
-			txMod = bytes.Replace(tx, []byte(PreparePrefix), []byte(ReplacePrefix), 1)
-		}
-		totalBytes += int64(len(txMod))
-		if totalBytes > maxTxBytes {
-			break
-		}
-		txs = append(txs, txMod)
-	}
-	return txs
-}
--- a/abci/example/orderbook/app.go
+++ b/abci/example/orderbook/app.go
@@ -1,573 +0,0 @@
-package orderbook
-
-import (
-	"bytes"
-	"encoding/binary"
-	fmt "fmt"
-
-	"github.com/cosmos/gogoproto/proto"
-	dbm "github.com/tendermint/tm-db"
-
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	"github.com/tendermint/tendermint/crypto/tmhash"
-)
-
-var _ types.Application = (*StateMachine)(nil)
-
-const Version = 1
-
-const (
-	// In tendermint a zero code is okay and all non zero codes are errors
-	StatusOK = iota
-	StatusErrDecoding
-	StatusErrUnknownMessage
-	StatusErrValidateBasic
-	StatusErrNoAccount
-	StatusErrAccountExists
-	StatusErrNoPair
-	StatusErrPairExists
-	StatusErrInvalidOrder
-	StatusErrUnacceptableMessage
-	StatusErrNoCommodity
-)
-
-var (
-	stateKey   = []byte("state")
-	accountKey = []byte("account")
-	pairKey    = []byte("pair")
-)
-
-// StateMachine is the main struct that encompasses the logic of the orderbook
-type StateMachine struct {
-	// inherit all the abci methods so we don't have to implement everything
-	types.BaseApplication
-
-	// persisted state which is a key value store containing:
-	//   accountID -> account
-	//   pairID -> pair
-	db dbm.DB
-
-	// in-memory state
-	lastHeight int64  // the last height that was persisted
-	lastHash   []byte // the last hash that was persisted
-	// list of accounts (this is used for the app hash)
-	accounts    []*Account
-	pairs       map[string]*Pair    // lookup pairs
-	commodities map[string]struct{} // lookup commodities
-	publicKeys  map[string]struct{} // lookup existence of an account
-	// a list of transactions that have been modified by the most recent block
-	// and will need to result in an update to the db
-	touchedAccounts map[uint64]struct{}
-	// new pairs added in this block which will needed to be added to the
-	// db on "Commit"
-	newPairs []*Pair
-
-	// app-side mempool (also emphemeral)
-	// this takes ask and bid transactions from `CheckTx`
-	// and matches them as a "MatchedOrder" which is
-	// then proposed in a block
-	//
-	// it's important to note that there is no garbage collection
-	// here. Bids and asks, potentially even invalid, will
-	// continue to stay here until matched
-	markets map[string]*Market // i.e. ATOM/USDC
-}
-
-// New creates a StateMachine from a given database. If the database is
-// empty a fresh instance is created else the accounts, pairs and
-// state are loaded into memory.
-func New(db dbm.DB) (*StateMachine, error) {
-	// iterate over all the account keys
-	iter, err := db.Iterator(nil, nil)
-	if err != nil {
-		return nil, err
-	}
-	defer iter.Close()
-
-	var (
-		accounts    = make([]*Account, 0)
-		publicKeys  = make(map[string]struct{})
-		commodities = make(map[string]struct{})
-		pairs       = make(map[string]*Pair)
-		markets = make(map[string]*Market)
-		lastHeight  uint64
-		lastHash    []byte
-	)
-
-	for ; iter.Valid(); iter.Next() {
-		if bytes.HasPrefix(iter.Key(), pairKey) {
-			var pair Pair
-			if err := proto.Unmarshal(iter.Value(), &pair); err != nil {
-				return nil, err
-			}
-			pairs[pair.String()] = &pair
-			commodities[pair.BuyersDenomination] = struct{}{}
-			markets[pair.String()] = NewMarket(&pair)
-		}
-
-		if bytes.HasPrefix(iter.Key(), accountKey) {
-			var acc Account
-			if err := proto.Unmarshal(iter.Value(), &acc); err != nil {
-				return nil, err
-			}
-
-			accounts = append(accounts, &acc)
-			publicKeys[string(acc.PublicKey)] = struct{}{}
-		}
-
-		if bytes.HasPrefix(iter.Key(), stateKey) {
-			state := iter.Value()
-			lastHeight = binary.BigEndian.Uint64(state[:4])
-			lastHash = state[4:]
-		}
-	}
-
-	return &StateMachine{
-		accounts:    accounts,
-		pairs:       pairs,
-		commodities: commodities,
-		publicKeys:  publicKeys,
-		markets:     markets,
-		lastHeight:  int64(lastHeight),
-		lastHash:    lastHash,
-		db:          db,
-		touchedAccounts: make(map[uint64]struct{}),
-		newPairs: make([]*Pair, 0),
-	}, nil
-}
-
-// Info is used by Tendermint to understand the state of the application.
-// This is useful for replay and syncing modes.
-func (sm *StateMachine) Info(req types.RequestInfo) types.ResponseInfo {
-	return types.ResponseInfo{
-		AppVersion:       Version,
-		LastBlockHeight:  sm.lastHeight,
-		LastBlockAppHash: sm.lastHash,
-	}
-}
-
-// CheckTx indicates which transactions should be accepted in the mempool. It is
-// not a perfect validity check because we're unsure of the state that the transaction
-// will be executed against. We should treat this as a gatekeeper to the mempool.
-// Apart from adding transactions to the app-side mempool, this check is stateless.
-func (sm *StateMachine) CheckTx(req types.RequestCheckTx) types.ResponseCheckTx {
-	var msg = new(Msg)
-
-	err := proto.Unmarshal(req.Tx, msg)
-	if err != nil {
-		return types.ResponseCheckTx{Code: StatusErrDecoding, Log: err.Error()} // decoding error
-	}
-
-	if err := msg.ValidateBasic(); err != nil {
-		return types.ResponseCheckTx{Code: StatusErrValidateBasic, Log: err.Error()}
-	}
-
-	// add either bids or asks to the market which will match them in PrepareProposal
-	switch m := msg.Sum.(type) {
-	case *Msg_MsgAsk:
-		market, ok := sm.markets[m.MsgAsk.Pair.String()]
-		if !ok {
-			return types.ResponseCheckTx{Code: StatusErrNoPair}
-		}
-		market.AddAsk(m.MsgAsk.AskOrder)
-	case *Msg_MsgBid:
-		market, ok := sm.markets[m.MsgBid.Pair.String()]
-		if !ok {
-			return types.ResponseCheckTx{Code: StatusErrNoPair}
-		}
-		market.AddBid(m.MsgBid.BidOrder)
-	}
-
-	return types.ResponseCheckTx{Code: StatusOK}
-}
-
-// ValidateTx validates the transactions against state.
-func (sm *StateMachine) ValidateTx(msg *Msg) uint32 {
-	if err := msg.ValidateBasic(); err != nil {
-		return StatusErrValidateBasic
-	}
-
-	switch m := msg.Sum.(type) {
-	case *Msg_MsgRegisterPair:
-		pair := m.MsgRegisterPair.Pair
-		if _, ok := sm.pairs[pair.String()]; ok {
-			return StatusErrPairExists
-		}
-
-		reversePair := &Pair{BuyersDenomination: pair.SellersDenomination, SellersDenomination: pair.BuyersDenomination}
-		if _, ok := sm.pairs[reversePair.String()]; ok {
-			return StatusErrPairExists
-		}
-
-	case *Msg_MsgAsk, *Msg_MsgBid: // MsgAsk and MsgBid are not allowed individually - they need to be matched as a TradeSet
-		return StatusErrUnacceptableMessage //Todo add logic around msg ask and bid to allow
-
-	case *Msg_MsgCreateAccount:
-		// check for duplicate accounts in state machine
-		if _, ok := sm.publicKeys[string(m.MsgCreateAccount.PublicKey)]; ok {
-			return StatusErrAccountExists
-		}
-
-		// check that each of the commodities is present in at least one trading pair
-		for _, commodity := range m.MsgCreateAccount.Commodities {
-			if _, exists := sm.commodities[commodity.Denom]; !exists {
-				return StatusErrNoCommodity
-			}
-		}
-
-	case *Msg_MsgTradeSet:
-		// check the pair exists
-		if _, ok := sm.pairs[m.MsgTradeSet.TradeSet.Pair.String()]; !ok {
-			return StatusErrNoPair
-		}
-
-		for _, order := range m.MsgTradeSet.TradeSet.MatchedOrders {
-			// validate matched order i.e. users have funds and signatures are valid
-			if !sm.isMatchedOrderValid(order, m.MsgTradeSet.TradeSet.Pair) {
-				return StatusErrInvalidOrder
-			}
-		}
-
-	default:
-		return StatusErrUnknownMessage
-	}
-
-	return StatusOK
-}
-
-// PrepareProposal is called whenever the validator is the proposer for that round. First, it adds the non order
-// transactions provided by tendermint. The orderbook then loops through each market and tries to match as many
-// transactions as possible. For each new transaction it checks that the max bytes has not been exceeded.
-func (sm *StateMachine) PrepareProposal(req types.RequestPrepareProposal) types.ResponsePrepareProposal {
-	// declare transaction with the size of 0
-	txs := make([][]byte, 0)
-
-	// go through the transactions passed up via Tendermint first
-	for _, tx := range req.Txs {
-		var msg = new(Msg)
-		err := proto.Unmarshal(tx, msg)
-		if err != nil {
-			panic(err)
-		}
-
-		// skip over the bids and asks that are proposed. We already have them
-		if _, ok := msg.Sum.(*Msg_MsgBid); ok {
-			continue
-		}
-		if _, ok := msg.Sum.(*Msg_MsgAsk); ok {
-			continue
-		}
-
-		// make sure we're proposing valid transactions
-		if status := sm.ValidateTx(msg); status != StatusOK {
-			continue
-		}
-
-		if len(txs)+len(tx) > int(req.MaxTxBytes) {
-			return types.ResponsePrepareProposal{Txs: txs}
-		}
-		txs = append(txs, tx)
-	}
-
-	// fetch and match all the bids and asks for each market and add these
-	for _, market := range sm.markets {
-		tradeSet := market.Match()
-		// tradesets into bytes and bytes into a transaction
-		if tradeSet == nil {
-			continue
-		}
-
-		fmt.Println("we have a tradeset")
-
-		tradeSet = sm.validateTradeSetAgainstState(tradeSet)
-		if tradeSet == nil || len(tradeSet.MatchedOrders) == 0 {
-			continue
-		}
-
-		fmt.Println("we have a valid tradeset")
-
-		// wrap this as a message typ
-		msgTradeSet := &MsgTradeSet{TradeSet: tradeSet}
-		bz, err := proto.Marshal(msgTradeSet)
-		if err != nil {
-			panic(err)
-		}
-
-		// check to see that we don't over populate the block
-		if len(txs)+len(bz) > int(req.MaxTxBytes) {
-			return types.ResponsePrepareProposal{Txs: txs}
-		}
-		txs = append(txs, bz)
-	}
-
-	return types.ResponsePrepareProposal{Txs: req.Txs}
-}
-
-// Process Proposal either rejects or accepts transactions
-//
-// It uses the same validity function for prepare proposal. This ensures the coherence property
-// is adhered to i.e. all honest validators must accept a proposal by an honest proposer
-func (sm *StateMachine) ProcessProposal(req types.RequestProcessProposal) types.ResponseProcessProposal {
-	for _, tx := range req.Txs {
-		var msg = new(Msg)
-		err := proto.Unmarshal(tx, msg)
-		if err != nil {
-			return rejectProposal()
-		}
-
-		if status := sm.ValidateTx(msg); status != StatusOK {
-			fmt.Printf("tx failed validation, status: %d\n", status)
-			return rejectProposal()
-		}
-	}
-
-	return acceptProposal()
-}
-
-func (sm *StateMachine) BeginBlock(req types.RequestBeginBlock) types.ResponseBeginBlock {
-	// reset the new pairs
-	sm.newPairs = make([]*Pair, 0)
-	return types.ResponseBeginBlock{}
-}
-
-// DeliverTx is called for each tx in a block once it has been finalized. This is where the
-// execution code lives. Most importantly it's where we update the user accounts following
-// a successful order.
-func (sm *StateMachine) DeliverTx(req types.RequestDeliverTx) types.ResponseDeliverTx {
-	var msg = new(Msg)
-
-	err := proto.Unmarshal(req.Tx, msg)
-	if err != nil {
-		return types.ResponseDeliverTx{Code: StatusErrDecoding, Log: err.Error()} // decoding error
-	}
-
-	if status := sm.ValidateTx(msg); status != StatusOK {
-		return types.ResponseDeliverTx{Code: status}
-	}
-
-	switch m := msg.Sum.(type) {
-	case *Msg_MsgRegisterPair:
-		sm.markets[m.MsgRegisterPair.Pair.String()] = NewMarket(m.MsgRegisterPair.Pair)
-		sm.pairs[m.MsgRegisterPair.Pair.String()] = m.MsgRegisterPair.Pair
-		sm.commodities[m.MsgRegisterPair.Pair.BuyersDenomination] = struct{}{}
-		sm.commodities[m.MsgRegisterPair.Pair.SellersDenomination] = struct{}{}
-		sm.newPairs = append(sm.newPairs, m.MsgRegisterPair.Pair)
-
-	case *Msg_MsgCreateAccount:
-		nextAccountID := uint64(len(sm.accounts))
-		sm.accounts = append(sm.accounts, &Account{
-			Index:       nextAccountID,
-			PublicKey:   m.MsgCreateAccount.PublicKey,
-			Commodities: m.MsgCreateAccount.Commodities,
-		})
-		sm.touchedAccounts[nextAccountID] = struct{}{}
-		sm.publicKeys[string(m.MsgCreateAccount.PublicKey)] = struct{}{}
-
-	case *Msg_MsgTradeSet:
-		pair := m.MsgTradeSet.TradeSet.Pair
-		for _, order := range m.MsgTradeSet.TradeSet.MatchedOrders {
-			buyer := sm.accounts[order.OrderBid.OwnerId]
-			seller := sm.accounts[order.OrderAsk.OwnerId]
-
-			// the buyer gets quantity of the asset that the seller was selling
-			buyer.AddCommodity(NewCommodity(pair.SellersDenomination, order.OrderAsk.Quantity))
-			// the buyer gives up quantity * ask price of the buyers denomination
-			buyer.SubtractCommodity(NewCommodity(pair.BuyersDenomination, order.OrderAsk.Quantity*order.OrderAsk.AskPrice))
-
-			// the seller gets quantity * ask price of the asset that the buyer was paying with
-			seller.AddCommodity(NewCommodity(pair.BuyersDenomination, order.OrderAsk.Quantity*order.OrderAsk.AskPrice))
-			// the seller gives up quantity of the commodity they were selling
-			seller.SubtractCommodity(NewCommodity(pair.SellersDenomination, order.OrderAsk.Quantity))
-
-			// mark that these account have been touched
-			sm.touchedAccounts[order.OrderBid.OwnerId] = struct{}{}
-			sm.touchedAccounts[order.OrderAsk.OwnerId] = struct{}{}
-		}
-
-	default:
-		return types.ResponseDeliverTx{Code: StatusErrUnknownMessage}
-	}
-
-	return types.ResponseDeliverTx{Code: 0}
-}
-
-// EndBlock is used to update consensus params and the validator set. For the orderbook,
-// we keep both the same for thw
-func (sm *StateMachine) EndBlock(req types.RequestEndBlock) types.ResponseEndBlock {
-	return types.ResponseEndBlock{}
-}
-
-// Commit is called to tell the app it is safe to persist state to disk.
-// We now take the in-memory representation and update the parts that have
-// changed on to disk.
-func (sm *StateMachine) Commit() types.ResponseCommit {
-	batch := sm.db.NewBatch()
-
-	// write to accounts that were modified by the last block
-	for accountID := range sm.touchedAccounts {
-		value, err := proto.Marshal(sm.accounts[accountID])
-		if err != nil {
-			panic(err)
-		}
-		key := binary.BigEndian.AppendUint64(accountKey, accountID)
-		if err := batch.Set(key, value); err != nil {
-			panic(err)
-		}
-	}
-
-	// write the new pairs that were added by the last block
-	pairID := len(sm.pairs) - len(sm.newPairs)
-	for id, pair := range sm.newPairs {
-		value, err := proto.Marshal(pair)
-		if err != nil {
-			panic(err)
-		}
-		key := binary.BigEndian.AppendUint64(pairKey, uint64(pairID+id))
-		if err := batch.Set(key, value); err != nil {
-			panic(err)
-		}
-	}
-
-	hash := sm.hash()
-	err := sm.updateState(batch, sm.lastHeight+1, hash)
-	if err != nil {
-		panic(err)
-	}
-	err = batch.WriteSync()
-	if err != nil {
-		panic(err)
-	}
-
-	return types.ResponseCommit{Data: hash}
-}
-
-// hash is just the the sha256 of the byte representation of all accounts.
-// remember that this needs to be deterministic for all state machines
-func (sm *StateMachine) hash() []byte {
-	digest := bytes.NewBuffer(nil)
-	for _, account := range sm.accounts {
-		bz, err := proto.Marshal(account)
-		if err != nil {
-			panic(err)
-		}
-		digest.Write(bz)
-	}
-	return tmhash.Sum(digest.Bytes())
-}
-
-func (sm *StateMachine) updateState(batch dbm.Batch, height int64, hash []byte) error {
-	sm.lastHash = hash
-	sm.lastHeight = height
-	heightBytes := make([]byte, 8)
-	binary.BigEndian.PutUint64(heightBytes, uint64(height))
-	return batch.Set(stateKey, append(heightBytes, hash...))
-}
-
-func (sm *StateMachine) validateTradeSetAgainstState(tradeSet *TradeSet) *TradeSet {
-	output := &TradeSet{Pair: tradeSet.Pair}
-
-	for _, matchedOrder := range tradeSet.MatchedOrders {
-		if !sm.isMatchedOrderValid(matchedOrder, tradeSet.Pair) {
-			continue
-		}
-
-		// yayy! this matched order is still valid and can be executed
-		output.MatchedOrders = append(output.MatchedOrders, matchedOrder)
-	}
-
-	return output
-}
-
-// isMatchedOrderValid is a check against current state to ensure that the order
-// is valid and can execute.
-//
-// This method is also called when preparing a proposal since `CheckTx` doesn't have
-// strict validity guarantees and there could be invalid transactions within the mempool
-//
-// Note: if one of the two orders are invalid we discard both. In the future we could
-// improve this by adding back the part of the order that might still be valid.
-func (sm *StateMachine) isMatchedOrderValid(order *MatchedOrder, pair *Pair) bool {
-	if int(order.OrderBid.OwnerId) >= len(sm.accounts) {
-		return false
-	}
-	bidOwner := sm.accounts[order.OrderBid.OwnerId]
-	if bidOwner == nil {
-		return false
-	}
-
-	if int(order.OrderAsk.OwnerId) >= len(sm.accounts) {
-		return false
-	}
-	askOwner := sm.accounts[order.OrderAsk.OwnerId]
-	if askOwner == nil {
-		return false
-	}
-
-	askCommodities := askOwner.FindCommidity(pair.SellersDenomination)
-	if askCommodities == nil {
-		return false
-	}
-	buyCommodities := bidOwner.FindCommidity(pair.BuyersDenomination)
-	if buyCommodities == nil {
-		return false
-	}
-
-	// Seller has enough of the commodity
-	if askCommodities.Quantity-order.OrderAsk.Quantity < 0 {
-		return false
-	}
-
-	// Buyer has enough of the buying commodity
-	if buyCommodities.Quantity-(order.OrderAsk.AskPrice*order.OrderAsk.Quantity) < 0 {
-		return false
-	}
-
-	if !order.OrderAsk.ValidateSignature(ed25519.PubKey(askOwner.PublicKey), pair) {
-		return false
-	}
-	if !order.OrderBid.ValidateSignature(ed25519.PubKey(bidOwner.PublicKey), pair) {
-		return false
-	}
-
-	return true
-}
-
-// InitDB takes an empty DB instance and populates it with the
-// provided pairs and accounts. Note that the order here is important
-func InitDB(db dbm.DB, pairs []*Pair, accounts []*Account) error {
-	batch := db.NewBatch()
-
-	for id, account := range accounts {
-		value, err := proto.Marshal(account)
-		if err != nil {
-			return err
-		}
-		key := binary.BigEndian.AppendUint64(accountKey, uint64(id))
-		if err := batch.Set(key, value); err != nil {
-			return err
-		}
-	}
-
-	for id, pair := range pairs {
-		value, err := proto.Marshal(pair)
-		if err != nil {
-			return err
-		}
-		key := binary.BigEndian.AppendUint64(pairKey, uint64(id))
-		fmt.Println(key)
-		if err := batch.Set(key, value); err != nil {
-			return err
-		}
-	}
-
-	return batch.WriteSync()
-}
-
-func rejectProposal() types.ResponseProcessProposal {
-	return types.ResponseProcessProposal{Status: types.ResponseProcessProposal_REJECT}
-}
-
-func acceptProposal() types.ResponseProcessProposal {
-	return types.ResponseProcessProposal{Status: types.ResponseProcessProposal_ACCEPT}
-}
--- a/abci/example/orderbook/app_test.go
+++ b/abci/example/orderbook/app_test.go
@@ -1,327 +0,0 @@
-package orderbook_test
-
-import (
-	fmt "fmt"
-	"testing"
-
-	"github.com/cosmos/gogoproto/proto"
-	"github.com/stretchr/testify/require"
-	dbm "github.com/tendermint/tm-db"
-
-	"github.com/tendermint/tendermint/abci/example/orderbook"
-	"github.com/tendermint/tendermint/abci/types"
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-	params "github.com/tendermint/tendermint/types"
-)
-
-// TODO: we should also check that CheckTx adds bids and asks to the app-side mempool
-func TestCheckTx(t *testing.T) {
-	db := dbm.NewMemDB()
-	require.NoError(t, orderbook.InitDB(db, []*orderbook.Pair{testPair}, nil))
-	app, err := orderbook.New(db)
-	require.NoError(t, err)
-
-	testCases := []struct {
-		name         string
-		msg          *orderbook.Msg
-		responseCode uint32
-		expOrderSize int
-	}{
-		{
-			name:         "test empty tx",
-			msg:          &orderbook.Msg{},
-			responseCode: orderbook.StatusErrValidateBasic,
-			expOrderSize: 0,
-		},
-		{
-			name: "test msg ask",
-			msg: &orderbook.Msg{
-				Sum: &orderbook.Msg_MsgAsk{
-					MsgAsk: &orderbook.MsgAsk{
-						Pair: testPair,
-						AskOrder: &orderbook.OrderAsk{
-							Quantity:  10,
-							AskPrice:  1,
-							OwnerId:   1,
-							Signature: crypto.CRandBytes(ed25519.SignatureSize),
-						},
-					},
-				},
-			},
-			responseCode: orderbook.StatusOK,
-			expOrderSize: 1,
-		},
-		{
-			name: "test msg ask wrong signature",
-			msg: &orderbook.Msg{
-				Sum: &orderbook.Msg_MsgAsk{
-					MsgAsk: &orderbook.MsgAsk{
-						Pair: testPair,
-						AskOrder: &orderbook.OrderAsk{
-							Quantity:  10,
-							AskPrice:  1,
-							OwnerId:   1,
-							Signature: crypto.CRandBytes(62),
-						},
-					},
-				},
-			},
-			responseCode: orderbook.StatusErrValidateBasic,
-			expOrderSize: 1,
-		},
-		{
-			name: "test msg bid",
-			msg: &orderbook.Msg{Sum: &orderbook.Msg_MsgBid{MsgBid: &orderbook.MsgBid{
-				Pair: testPair,
-				BidOrder: &orderbook.OrderBid{
-					MaxQuantity: 15,
-					MaxPrice:    5,
-					OwnerId:     1,
-					Signature:   crypto.CRandBytes(ed25519.SignatureSize),
-				},
-			}}},
-			responseCode: orderbook.StatusOK,
-			expOrderSize: 2,
-		},
-		{
-			name: "test msg bid blank",
-			msg: &orderbook.Msg{Sum: &orderbook.Msg_MsgBid{MsgBid: &orderbook.MsgBid{
-				Pair: testPair,
-				BidOrder: &orderbook.OrderBid{
-					MaxQuantity: 0,
-					MaxPrice:    0,
-					OwnerId:     0,
-					Signature:   crypto.CRandBytes(ed25519.SignatureSize),
-				},
-			}}},
-			responseCode: orderbook.StatusErrValidateBasic,
-			expOrderSize: 2,
-		},
-		{
-			name: "test msg register duplicate pair",
-			msg: &orderbook.Msg{Sum: &orderbook.Msg_MsgRegisterPair{MsgRegisterPair: &orderbook.MsgRegisterPair{
-				Pair: &orderbook.Pair{BuyersDenomination: "ATOM", SellersDenomination: "ATOM"},
-			}}},
-			responseCode: orderbook.StatusErrValidateBasic,
-			expOrderSize: 2,
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			bz, err := proto.Marshal(tc.msg)
-			require.NoError(t, err)
-			resp := app.CheckTx(types.RequestCheckTx{Tx: bz})
-			require.Equal(t, tc.responseCode, resp.Code, resp.Log)
-			bids, asks := app.Orders(testPair)
-			require.Equal(t, tc.expOrderSize, len(bids)+len(asks))
-		})
-	}
-}
-
-// func ValidateTx(t *testing.T) {
-// 	db := dbm.NewMemDB()
-// 	require.NoError(t, orderbook.InitDB(db, []*orderbook.Pair{testPair}, nil))
-// 	app, err := orderbook.New(db)
-// 	require.NoError(t, err)
-
-// 	for _, tc := range testCases {
-// 		t.Run(tc.name, func(t *testing.T) {
-// 			bz, err := proto.Marshal(tc.msg)
-// 			require.NoError(t, err)
-// 			resp := app.CheckTx(types.RequestCheckTx{Tx: bz})
-// 			require.Equal(t, tc.responseCode, resp.Code, resp.Log)
-// 			bids, asks := app.Orders(testPair)
-// 			require.Equal(t, tc.expOrderSize, len(bids)+len(asks))
-// 		})
-// 	}
-// }
-
-// TODO: we should check that transactions in
-// a market are being validated and added to the proposal
-// // and that other transactions get in
-// func TestPrepareProposal(t *testing.T) {
-// 	db := dbm.NewMemDB()
-// 	require.NoError(t, orderbook.InitDB(db, []*orderbook.Pair{testPair}, nil))
-// 	app, err := orderbook.New(db)
-// 	require.NoError(t, err)
-
-// 	for _, tc := range testCases {
-// 		t.Run(tc.name, func(t *testing.T) {
-// 			bz, err := proto.Marshal(tc.msg)
-// 			require.NoError(t, err)
-// 			resp := app.CheckTx(types.RequestCheckTx{Tx: bz})
-// 			require.Equal(t, tc.responseCode, resp.Code, resp.Log)
-// 			bids, asks := app.Orders(testPair)
-// 			require.Equal(t, tc.expOrderSize, len(bids)+len(asks))
-// 		})
-// 	}
-// }
-
-// {
-// 	name: "test msg register pair",
-// 	msg: &orderbook.Msg{Sum: &orderbook.Msg_MsgRegisterPair{MsgRegisterPair: &orderbook.MsgRegisterPair{
-// 		Pair: &orderbook.Pair{BuyersDenomination: "ATOM", SellersDenomination: "AUD"},
-// 	}}},
-// 	responseCode: orderbook.StatusOK,
-// 	expOrderSize: 2,
-// 	pairSize:     2,
-// },
-
-// TODO: we should test that transactions are
-// always valid i.e. ValidateTx. We could potentially
-// combine this with PrepareProposal
-// func TestProcessProposal(t *testing.T) {
-// 	app := orderbook.New(dbm.NewMemDB())
-// }
-
-// TODO: we should test that a matched order
-// correctly updates the accounts. We should
-// also test that committing a block persists
-// it to the database and that we can now
-// query the new state
-// func TestFinalizeBlock(t *testing.T) {
-// 	app := orderbook.New(dbm.NewMemDB())
-// }
-
-// TODO: test that we can start from new
-// and from existing state
-// func TestNewStateMachine(t *testing.T) {}
-
-func TestEndToEnd(t *testing.T) {
-	db := dbm.NewMemDB()
-	app, err := orderbook.New(db)
-	require.NoError(t, err)
-	
-
-	var (
-		maxBytes = params.DefaultConsensusParams().Block.MaxBytes
-		commodityNZD    = &orderbook.Commodity{Denom: "NZD", Quantity: 100}
-		commodityAUD    = &orderbook.Commodity{Denom: "AUD", Quantity: 100}
-		registerPairMsg = newRegisterPair("NZD", "AUD")
-		pair            = registerPairMsg.GetMsgRegisterPair().Pair
-		pkAlice         = ed25519.GenPrivKey()
-		pkBob           = ed25519.GenPrivKey()
-		pubKeyAlice     = pkAlice.PubKey().Bytes()
-		pubKeyBob       = pkBob.PubKey().Bytes()
-		registerAlice   = newRegisterAccount(pubKeyAlice, []*orderbook.Commodity{commodityAUD})
-		registerBob     = newRegisterAccount(pubKeyBob, []*orderbook.Commodity{commodityNZD})
-		// bob is asking for 25 AUD for 5 NZD
-		ask = &orderbook.Msg{Sum: &orderbook.Msg_MsgAsk{MsgAsk: orderbook.NewMsgAsk(pair, 5, 5, 1)}}
-		// alice is bidding for 5 NZD for 25 AUD
-		bid = &orderbook.Msg{Sum: &orderbook.Msg_MsgBid{MsgBid: orderbook.NewMsgBid(pair, 5, 5, 0)}}
-	)
-
-	require.NoError(t, ask.GetMsgAsk().Sign(pkBob))
-	require.NoError(t, bid.GetMsgBid().Sign(pkAlice))
-
-	testCases := []struct {
-		txs      [][]byte
-		accepted bool
-		// assertions to be made about the state of the application
-		// after each block
-		assertions func(t *testing.T, app *orderbook.StateMachine)
-	}{
-		{
-			// block 1 sets up the trading pair
-			txs:      asTxs(registerPairMsg),
-			accepted: true,
-			assertions: func(t *testing.T, app *orderbook.StateMachine) {
-				pairs := app.Pairs()
-				require.Len(t, pairs, 1)
-				require.Equal(t, pair, &pairs[0])
-			},
-		},
-		{
-			// block 2 registers two accounts: alice and bob
-			txs:      asTxs(registerAlice, registerBob),
-			accepted: true,
-			assertions: func(t *testing.T, app *orderbook.StateMachine) {
-				alice := app.Account(0)
-				require.False(t, alice.IsEmpty(), alice)
-				require.Equal(t, pubKeyAlice, alice.PublicKey)
-				require.Len(t, alice.Commodities, 1)
-				require.Equal(t, alice.Commodities[0], commodityAUD)
-				bob := app.Account(1)
-				require.False(t, bob.IsEmpty(), bob)
-				require.Equal(t, pubKeyBob, bob.PublicKey)
-				require.Len(t, bob.Commodities, 1)
-				require.Equal(t, bob.Commodities[0], commodityNZD)
-				require.True(t, app.Account(2).IsEmpty())
-			},
-		},
-		{
-			// block 3 performs a trade between alice and bob
-			txs:      asTxs(ask, bid),
-			accepted: true,
-			assertions: func(t *testing.T, app *orderbook.StateMachine) {
-				alice := app.Account(0)
-				require.Equal(t, alice.Commodities[0].Quantity, 75) // 75 AUD
-				require.Equal(t, alice.Commodities[1].Quantity, 5)  // 5 NZD
-				bob := app.Account(1)
-				require.Equal(t, bob.Commodities[0].Quantity, 95) // 95 NZD
-				require.Equal(t, bob.Commodities[0].Quantity, 5)  // 5 AUD
-			},
-		},
-	}
-
-	for idx, tc := range testCases {
-		for _, tx := range tc.txs {
-			resp := app.CheckTx(types.RequestCheckTx{Tx: tx})
-			require.EqualValues(t, orderbook.StatusOK, resp.Code)
-		}
-		txs := app.PrepareProposal(types.RequestPrepareProposal{MaxTxBytes: maxBytes, Txs: tc.txs}).Txs
-		require.Equal(t, txs, tc.txs)
-		if idx == 2 {
-			fmt.Print(tc.txs)
-			fmt.Println()
-			fmt.Print(txs)
-		}
-
-		result := app.ProcessProposal(types.RequestProcessProposal{Txs: txs})
-		if tc.accepted {
-			require.Equal(t, types.ResponseProcessProposal_ACCEPT, result.Status)
-		} else {
-			require.Equal(t, types.ResponseProcessProposal_REJECT, result.Status)
-			continue
-		}
-
-		app.BeginBlock(types.RequestBeginBlock{})
-		for _, tx := range txs {
-			app.DeliverTx(types.RequestDeliverTx{Tx: tx})
-		}
-		app.EndBlock(types.RequestEndBlock{})
-		app.Commit()
-
-		if tc.assertions != nil {
-			tc.assertions(t, app)
-		}
-	}
-}
-
-func asTxs(msgs ...*orderbook.Msg) [][]byte {
-	output := make([][]byte, len(msgs))
-	for i, msg := range msgs {
-		bz, err := proto.Marshal(msg)
-		if err != nil {
-			panic(err)
-		}
-		output[i] = bz
-	}
-	return output
-}
-
-func newRegisterPair(d1, d2 string) *orderbook.Msg {
-	return &orderbook.Msg{Sum: &orderbook.Msg_MsgRegisterPair{MsgRegisterPair: &orderbook.MsgRegisterPair{
-		Pair: &orderbook.Pair{BuyersDenomination: d1, SellersDenomination: d2},
-	}}}
-}
-
-func newRegisterAccount(pubkey []byte, commodities []*orderbook.Commodity) *orderbook.Msg {
-	return &orderbook.Msg{Sum: &orderbook.Msg_MsgCreateAccount{MsgCreateAccount: &orderbook.MsgCreateAccount{
-		PublicKey:   pubkey,
-		Commodities: commodities,
-	}}}
-
-}
--- a/abci/example/orderbook/buf.gen.yaml
+++ b/abci/example/orderbook/buf.gen.yaml
@@ -1,9 +0,0 @@
-version: v1
-plugins:
-  - name: gogofaster
-    out: .
-    opt:
-      - Mgoogle/protobuf/timestamp.proto=github.com/cosmos/gogoproto/types
-      - Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration
-      - plugins=grpc
-      - paths=source_relative
--- a/abci/example/orderbook/cmd/orderbook.go
+++ b/abci/example/orderbook/cmd/orderbook.go
@@ -1,243 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/spf13/cobra"
-	"github.com/spf13/viper"
-
-	"github.com/tendermint/tendermint/abci/example/orderbook"
-	cfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/libs/log"
-	tmos "github.com/tendermint/tendermint/libs/os"
-	tmrand "github.com/tendermint/tendermint/libs/rand"
-	"github.com/tendermint/tendermint/node"
-	"github.com/tendermint/tendermint/p2p"
-	"github.com/tendermint/tendermint/privval"
-	"github.com/tendermint/tendermint/proxy"
-	"github.com/tendermint/tendermint/types"
-	tmtime "github.com/tendermint/tendermint/types/time"
-)
-
-func main() {
-	NewCLI().Run()
-}
-
-type CLI struct {
-	root *cobra.Command
-	config *cfg.Config
-}
-
-func NewCLI() *CLI {
-	cli := &CLI{}
-	cli.root = &cobra.Command{
-		Use:   "orderbook",
-		Short: "orderbook abci++ example",
-	}
-	cli.root.AddCommand(&cobra.Command{
-		Use:   "init",
-		Short: "initialize the file system for an orderbook node",
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			root, err := os.Getwd()
-			if err != nil {
-				return err
-			}
-			
-			viper.AddConfigPath(filepath.Join(root, "config"))
-			viper.SetConfigName("config")
-			
-			config := cfg.DefaultConfig()
-
-			if err := viper.ReadInConfig(); err != nil {
-				if _, ok := err.(viper.ConfigFileNotFoundError); ok {
-					// Config file not found; use default
-					// This often happens when initializing a config for the first time
-				} else {
-					return err
-				}
-			} else {
-				if err := viper.Unmarshal(config); err != nil {
-					return err
-				}
-			}
-
-			config.SetRoot(root)
-			cli.config = config
-			return nil
-		},
-		RunE: func(cmd *cobra.Command, args []string) error {
-			privValKeyFile := cli.config.PrivValidatorKeyFile()
-			privValStateFile := cli.config.PrivValidatorStateFile()
-			var pv *privval.FilePV
-			if tmos.FileExists(privValKeyFile) {
-				pv = privval.LoadFilePV(privValKeyFile, privValStateFile)
-				fmt.Print("found private validator", "keyFile", privValKeyFile,
-					"stateFile", privValStateFile)
-			} else {
-				pv = privval.GenFilePV(privValKeyFile, privValStateFile)
-				pv.Save()
-				fmt.Print("Generated private validator", "keyFile", privValKeyFile,
-					"stateFile", privValStateFile)
-			}
-
-			nodeKeyFile := cli.config.NodeKeyFile()
-			if tmos.FileExists(nodeKeyFile) {
-				fmt.Print("Found node key", "path", nodeKeyFile)
-			} else {
-				if _, err := p2p.LoadOrGenNodeKey(nodeKeyFile); err != nil {
-					return err
-				}
-				fmt.Print("Generated node key", "path", nodeKeyFile)
-			}
-
-			// genesis file
-			genFile := cli.config.GenesisFile()
-			if tmos.FileExists(genFile) {
-				fmt.Print("Found genesis file", "path", genFile)
-			} else {
-				genDoc := types.GenesisDoc{
-					ChainID:         fmt.Sprintf("orderbook-chain-%v", tmrand.Int()),
-					GenesisTime:     tmtime.Now(),
-					ConsensusParams: types.DefaultConsensusParams(),
-				}
-				pubKey, err := pv.GetPubKey()
-				if err != nil {
-					return fmt.Errorf("can't get pubkey: %w", err)
-				}
-				genDoc.Validators = []types.GenesisValidator{{
-					Address: pubKey.Address(),
-					PubKey:  pubKey,
-					Power:   10,
-				}}
-
-				if err := genDoc.SaveAs(genFile); err != nil {
-					return err
-				}
-				fmt.Print("Generated genesis file", "path", genFile)
-			}
-
-			return nil
-		},
-	})
-	cli.root.AddCommand(&cobra.Command{
-		Use:   "run",
-		Short: "runs an orderbook node",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			dbProvider := node.DefaultDBProvider
-			appDB, err := dbProvider(&node.DBContext{"orderbook", cli.config})
-			if err != nil {
-				return err
-			}
-			app, err := orderbook.New(appDB)
-			if err != nil {
-				return err
-			}
-
-			nodeKey, err := p2p.LoadOrGenNodeKey(cli.config.NodeKeyFile())
-			if err != nil {
-				return fmt.Errorf("failed to load or gen node key %s: %w", cli.config.NodeKeyFile(), err)
-			}
-
-			logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout))
-			n, err := node.NewNode(
-				cli.config,
-				privval.LoadOrGenFilePV(cli.config.PrivValidatorKeyFile(), cli.config.PrivValidatorStateFile()),
-				nodeKey,
-				proxy.NewLocalClientCreator(app),
-				node.DefaultGenesisDocProviderFunc(cli.config),
-				dbProvider,
-				node.DefaultMetricsProvider(cli.config.Instrumentation),
-				logger,
-			)
-			if err != nil {
-				return err
-			}
-
-			if err := n.Start(); err != nil {
-				return err
-			}
-
-			tmos.TrapSignal(logger, func() {
-				if err := n.Stop(); err != nil {
-					logger.Error("unable to stop the node", "error", err)
-				}
-			})
-
-			return nil
-		},
-	})
-	cli.root.AddCommand(&cobra.Command{
-		Use:     "create-account [commodities...]",
-		Short:   "creates a new account message and submits it to the chain",
-		Example: "create-account 500BTC 10000USD",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return nil
-		},
-	})
-	cli.root.AddCommand(&cobra.Command{
-		Use:     "create-pair buyers-denomination sellers-denomination",
-		Short:   "creates a new pair message and submits it to the chain",
-		Example: "create-pair BTC USD",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return nil
-		},
-	})
-	cli.root.AddCommand(&cobra.Command{
-		Use:     "bid buying-commodity price",
-		Short:   "creates a bid message and submits it to the chain",
-		Example: "bid 10BTC 15000BTC/USD",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return nil
-		},
-	})
-	cli.root.AddCommand(&cobra.Command{
-		Use:     "ask selling-commodity price",
-		Short:   "creates an ask message and submits it to the chain",
-		Example: "ask 5BTC 12000BTC/USD",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return nil
-		},
-	})
-	querySubcommand := &cobra.Command{
-		Use:   "query",
-		Short: "query the bal",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return nil
-		},
-	}
-	querySubcommand.AddCommand(&cobra.Command{
-		Use:   "account pubkey|id",
-		Short: "query the balance of an account",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return nil
-		},
-	})
-	querySubcommand.AddCommand(&cobra.Command{
-		Use:   "pairs",
-		Short: "list all the trading pairs",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return nil
-		},
-	})
-	querySubcommand.AddCommand(&cobra.Command{
-		Use:     "orders pair",
-		Short:   "list all current orders for a given pair",
-		Example: "orders BTC/USD",
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return nil
-		},
-	})
-	cli.root.AddCommand(querySubcommand)
-
-	return cli
-}
-
-// Run runs the CLI.
-func (cli *CLI) Run() {
-	if err := cli.root.Execute(); err != nil {
-		fmt.Print(err)
-		os.Exit(1)
-	}
-}
--- a/abci/example/orderbook/doc.go
+++ b/abci/example/orderbook/doc.go
@@ -1,19 +0,0 @@
-//go:generate go install github.com/bufbuild/buf/cmd/buf
-//go:generate buf generate
-
-// The orderbook presents a more advanced example of a Tendermint application than the simple kvstore
-//
-// An orderbook is a tool used in financial markets for enabling trading of various commodities. Without
-// delving into too much detail, an orderbook is made of two types of transactions: Bids and Asks. An Ask
-// is an offer by a seller for n amount of a commodity at an AskPrice and a bid is an offer from a buyer
-// for m amount of a commodity at a BidPrice. When the bid price exceeds the ask price, and the buyer quantity
-// is less than or equal to the sellers quantity, the order is matched. In actual terms, we neglect the
-// underlying denomination (i.e. USD) and effectively both participants are simultaneously a buyer and seller.
-//
-// This example falls far short of being a decentralized orderbook, but demonstrates how one can build an
-// app-side mempool, how one can use PrepareProposal and ProcessProposal to craft complex transactions,
-// how we can use signatures and validate transactions against state. How applications can manage concurrency,
-// and demonstrate the lifecycle of transactions from RPC -> CheckTx -> Mempool -> PrepareProposal -> ProcessProposal
-// -> DeliverTx -> Commit -> Querying
-
-package orderbook
--- a/abci/example/orderbook/market.go
+++ b/abci/example/orderbook/market.go
@@ -1,254 +0,0 @@
-package orderbook
-
-import (
-	"container/heap"
-	sync "sync"
-)
-
-type Market struct {
-	// immutable
-	pair *Pair // i.e. EUR/USD (a market is bidirectional)
-
-	mtx        sync.RWMutex
-	askOrders  *AskOrders // i.e. buying EUR for USD
-	lowestAsk  float64
-	bidOrders  *BidOrders // i.e. selling EUR for USD or  buying USD for EUR
-	highestBid float64
-}
-
-func NewMarket(p *Pair) *Market {
-	askOrders := make(AskOrders, 0)
-	bidOrders := make(BidOrders, 0)
-	return &Market{pair: p, askOrders: &askOrders, bidOrders: &bidOrders}
-}
-
-func (m *Market) AddBid(b *OrderBid) {
-	m.mtx.Lock()
-	defer m.mtx.Unlock()
-	heap.Push(m.bidOrders, b)
-	if b.MaxPrice > m.highestBid {
-		m.highestBid = b.MaxPrice
-	}
-}
-
-func (m *Market) AddAsk(a *OrderAsk) {
-	m.mtx.Lock()
-	defer m.mtx.Unlock()
-	heap.Push(m.askOrders, a)
-	if a.AskPrice < m.lowestAsk || m.lowestAsk == 0 {
-		m.lowestAsk = a.AskPrice
-	}
-}
-
-// Match takes the set of bids and asks and matches them together.
-// A bid matches an ask when the MaxPrice is greater than the AskPrice
-// and the MaxQuantity is greater than the quantity.
-func (m *Market) Match() *TradeSet {
-	m.mtx.Lock()
-	defer m.mtx.Unlock()
-	// if one side doesn't have any orders than there is nothing to match
-	// and we return early
-	if m.askOrders.Len() == 0 || m.bidOrders.Len() == 0 {
-		return nil
-	}
-
-	if m.highestBid < m.lowestAsk {
-		// no orders match, we return early.
-		return nil
-	}
-
-	t := &TradeSet{Pair: m.pair}
-	bids := make([]*OrderBid, 0)
-	asks := make([]*OrderAsk, 0)
-
-	// get all the bids that are greater than the lowest ask. In order from heighest bid to lowest bid
-	for m.bidOrders.Len() > 0 {
-		bid := heap.Pop(m.bidOrders).(*OrderBid)
-		if bid.MaxPrice < m.lowestAsk {
-			// we've reached the limit, push the bid back and break the loop
-			heap.Push(m.bidOrders, bid)
-			break
-		} else {
-			bids = append(bids, bid)
-		}
-	}
-
-	// get all the asks that are lower than the highest bid in the bids set. Ordered from lowest to highest ask
-	for m.askOrders.Len() > 0 {
-		ask := heap.Pop(m.askOrders).(*OrderAsk)
-		if ask.AskPrice > bids[0].MaxPrice {
-			// the ask price is greater than the highest bid; push the ask back and break theh loop
-			heap.Push(m.askOrders, ask)
-			break
-		} else {
-			asks = append(asks, ask)
-		}
-	}
-
-	// this is to keep track of the index of the bids that have been matched
-	reserved := make(map[int]struct{})
-
-	// start from the highest ask and the highest bid and for each ask loop downwards through the slice of
-	// bids until one is matched
-OUTER_LOOP:
-	for i := len(asks) - 1; i >= 0; i-- {
-		ask := asks[i]
-
-		// start with the highest bid and increment down since we're more likely to find a match
-		for j := len(bids) - 1; j >= 0; j-- {
-			if _, ok := reserved[j]; ok {
-				// skip over the bids that have already been reserved
-				continue
-			}
-
-			bid := bids[j]
-			if bid.MaxPrice >= ask.AskPrice {
-				if bid.MaxQuantity >= ask.Quantity {
-					// yay! we have a match
-					t.AddFilledOrder(ask, bid)
-
-					// reserve the bid so we don't rematch it with another ask
-					reserved[j] = struct{}{}
-					continue OUTER_LOOP
-				}
-			} else {
-				// once we've dropped below the ask price there are no more possible bids and so we break
-				break
-			}
-		}
-
-		// as we go from highest to lowest, asks that aren't matched become the new lowest ask price
-		m.lowestAsk = ask.AskPrice
-
-		// no match found, add the ask order back into the heap
-		heap.Push(m.askOrders, ask)
-	}
-
-	// if all available asks were matched then
-	// we never have the opportunity to update the lowest ask.
-	// Now we reset it to 0
-	if m.askOrders.Len() == 0 {
-		m.lowestAsk = 0
-	}
-
-	// add back the unmatched bids to the heap so they can be matched again in a later round.
-	// We also neeed to recalculate the new highest bid. First we tackle an edge case whereby all
-	// selected bids were matched. In this case we grab the next highest and set that as the new
-	// highest bid
-	m.highestBid = 0
-	if len(reserved) == len(bids) && m.bidOrders.Len() > 0 {
-		newHighestBid := heap.Pop(m.bidOrders).(*OrderBid)
-		m.highestBid = newHighestBid.MaxPrice
-		heap.Push(m.bidOrders, newHighestBid)
-	}
-	for j := 0; j < len(bids); j++ {
-		if _, ok := reserved[j]; !ok {
-			if bids[j].MaxPrice > m.highestBid {
-				m.highestBid = bids[j].MaxPrice
-			}
-			heap.Push(m.bidOrders, bids[j])
-		}
-	}
-
-	if len(t.MatchedOrders) == 0 {
-		return nil
-	}
-	return t
-}
-
-func (m Market) LowestAsk() float64 {
-	m.mtx.RLock()
-	defer m.mtx.RUnlock()
-	return m.lowestAsk
-}
-
-func (m Market) HighestBid() float64 {
-	m.mtx.RLock()
-	defer m.mtx.RUnlock()
-	return m.highestBid
-}
-
-func (m Market) GetBids() []OrderBid {
-	m.mtx.RLock()
-	defer m.mtx.RUnlock()
-	orders := make([]OrderBid, m.bidOrders.Len())
-	for idx, order := range *m.bidOrders {
-		orders[idx] = *order
-	}
-	return orders
-}
-
-func (m Market) GetAsks() []OrderAsk {
-	m.mtx.RLock()
-	defer m.mtx.RUnlock()
-	orders := make([]OrderAsk, m.askOrders.Len())
-	for idx, order := range *m.askOrders {
-		orders[idx] = *order
-	}
-	return orders
-}
-
-// Heap ordered by lowest price
-type AskOrders []*OrderAsk
-
-var _ heap.Interface = (*AskOrders)(nil)
-
-func (a AskOrders) Len() int { return len(a) }
-
-func (a AskOrders) Less(i, j int) bool {
-	return a[i].AskPrice < a[j].AskPrice
-}
-
-func (a AskOrders) Swap(i, j int) {
-	a[i], a[j] = a[j], a[i]
-}
-
-func (a *AskOrders) Push(x any) {
-	item := x.(*OrderAsk)
-	*a = append(*a, item)
-}
-
-func (a *AskOrders) Pop() any {
-	old := *a
-	n := len(old)
-	item := old[n-1]
-	old[n-1] = nil
-	*a = old[0 : n-1]
-	return item
-}
-
-// Heap ordered by highest price
-type BidOrders []*OrderBid
-
-var _ heap.Interface = (*BidOrders)(nil)
-
-func (b BidOrders) Len() int { return len(b) }
-
-func (b BidOrders) Less(i, j int) bool {
-	return b[i].MaxPrice > b[j].MaxPrice
-}
-
-func (b BidOrders) Swap(i, j int) {
-	b[i], b[j] = b[j], b[i]
-}
-
-func (b *BidOrders) Push(x any) {
-	item := x.(*OrderBid)
-	*b = append(*b, item)
-}
-
-func (b *BidOrders) Pop() any {
-	old := *b
-	n := len(old)
-	item := old[n-1]
-	old[n-1] = nil
-	*b = old[0 : n-1]
-	return item
-}
-
-func (t *TradeSet) AddFilledOrder(ask *OrderAsk, bid *OrderBid) {
-	t.MatchedOrders = append(t.MatchedOrders, &MatchedOrder{
-		OrderAsk: ask,
-		OrderBid: bid,
-	})
-}
--- a/abci/example/orderbook/market_test.go
+++ b/abci/example/orderbook/market_test.go
@@ -1,179 +0,0 @@
-package orderbook_test
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"github.com/tendermint/tendermint/abci/example/orderbook"
-)
-
-var testPair = &orderbook.Pair{BuyersDenomination: "ATOM", SellersDenomination: "USD"}
-
-func testBid(price, quantity float64) *orderbook.OrderBid {
-	return &orderbook.OrderBid{
-		MaxPrice:    price,
-		MaxQuantity: quantity,
-	}
-}
-
-func testAsk(price, quantity float64) *orderbook.OrderAsk {
-	return &orderbook.OrderAsk{
-		AskPrice: price,
-		Quantity: quantity,
-	}
-}
-
-func TestTrackLowestAndHighestPrices(t *testing.T) {
-	market := orderbook.NewMarket(testPair)
-	require.Zero(t, market.LowestAsk())
-	require.Zero(t, market.HighestBid())
-
-	market.AddBid(testBid(100, 10))
-	require.EqualValues(t, 100, market.HighestBid())
-
-	market.AddAsk(testAsk(50, 10))
-	require.EqualValues(t, 50, market.LowestAsk())
-
-	market.AddAsk(testAsk(30, 10))
-	require.EqualValues(t, 30, market.LowestAsk())
-
-	market.AddAsk(testAsk(40, 10))
-	require.EqualValues(t, 30, market.LowestAsk())
-}
-
-func TestSimpleOrderMatching(t *testing.T) {
-	testcases := []struct {
-		bid   *orderbook.OrderBid
-		ask   *orderbook.OrderAsk
-		match bool
-	}{
-		{
-			bid:   testBid(50, 10),
-			ask:   testAsk(50, 10),
-			match: true,
-		},
-		{
-			bid:   testBid(60, 10),
-			ask:   testAsk(50, 10),
-			match: true,
-		},
-		{
-			bid:   testBid(50, 10),
-			ask:   testAsk(60, 10),
-			match: false,
-		},
-		{
-			bid:   testBid(50, 5),
-			ask:   testAsk(40, 10),
-			match: false,
-		},
-		{
-			bid:   testBid(50, 15),
-			ask:   testAsk(40, 10),
-			match: true,
-		},
-	}
-
-	for idx, tc := range testcases {
-		market := orderbook.NewMarket(testPair)
-		market.AddAsk(tc.ask)
-		market.AddBid(tc.bid)
-		resp := market.Match()
-		if tc.match {
-			require.Len(t, resp.MatchedOrders, 1, idx)
-		} else {
-			require.Nil(t, resp)
-		}
-	}
-}
-
-func TestMultiOrderMatching(t *testing.T) {
-	testcases := []struct {
-		bids               []*orderbook.OrderBid
-		asks               []*orderbook.OrderAsk
-		expected           []*orderbook.MatchedOrder
-		expectedLowestAsk  float64
-		expectedHighestBid float64
-	}{
-		{
-			bids: []*orderbook.OrderBid{
-				testBid(50, 20),
-				testBid(40, 10),
-				testBid(30, 15),
-			},
-			asks: []*orderbook.OrderAsk{
-				testAsk(30, 15),
-				testAsk(30, 5),
-			},
-			expected: []*orderbook.MatchedOrder{
-				{
-					OrderAsk: testAsk(30, 5),
-					OrderBid: testBid(30, 15),
-				},
-				{
-					OrderAsk: testAsk(30, 15),
-					OrderBid: testBid(50, 20),
-				},
-			},
-			expectedLowestAsk:  0,
-			expectedHighestBid: 40,
-		},
-		{
-			bids: []*orderbook.OrderBid{
-				testBid(60, 20),
-				testBid(80, 5),
-			},
-			asks: []*orderbook.OrderAsk{
-				testAsk(60, 15),
-				testAsk(70, 10),
-				testAsk(50, 20),
-			},
-			expected: []*orderbook.MatchedOrder{
-				{
-					OrderAsk: testAsk(60, 15),
-					OrderBid: testBid(60, 20),
-				},
-			},
-			expectedLowestAsk:  50,
-			expectedHighestBid: 80,
-		},
-		{
-			bids: []*orderbook.OrderBid{
-				testBid(60, 20),
-				testBid(80, 5),
-			},
-			asks:               []*orderbook.OrderAsk{},
-			expected:           []*orderbook.MatchedOrder{},
-			expectedLowestAsk:  0,
-			expectedHighestBid: 80,
-		},
-		{
-			bids: []*orderbook.OrderBid{},
-			asks: []*orderbook.OrderAsk{
-				testAsk(70, 10),
-				testAsk(50, 20),
-			},
-			expected:           []*orderbook.MatchedOrder{},
-			expectedLowestAsk:  50,
-			expectedHighestBid: 0,
-		},
-	}
-
-	for idx, tc := range testcases {
-		market := orderbook.NewMarket(testPair)
-		for _, ask := range tc.asks {
-			market.AddAsk(ask)
-		}
-		for _, bid := range tc.bids {
-			market.AddBid(bid)
-		}
-		resp := market.Match()
-		if len(tc.expected) == 0 {
-			require.Nil(t, resp, idx)
-		} else {
-			require.Equal(t, tc.expected, resp.MatchedOrders, idx)
-		}
-		require.EqualValues(t, tc.expectedLowestAsk, market.LowestAsk(), idx)
-		require.EqualValues(t, tc.expectedHighestBid, market.HighestBid(), idx)
-	}
-}
--- a/abci/example/orderbook/msgs.pb.go
+++ b/abci/example/orderbook/msgs.pb.go
--- a/abci/example/orderbook/msgs.proto
+++ b/abci/example/orderbook/msgs.proto
@@ -1,40 +0,0 @@
-€syntax = "proto3";
-
-package orderbook;
-option go_package = "github.com/tendermint/tendermint/abci/example/orderbook";
-
-import "wire.proto";
-
-message MsgBid {
-    Pair pair  = 1;
-    OrderBid bid_order = 2;
-}
-
-message MsgAsk {
-    Pair pair  = 1;
-    OrderAsk ask_order = 2;
-}
-
-message MsgCreateAccount {
-    bytes public_key = 1;
-    repeated Commodity commodities = 2;
-}
-
-message MsgRegisterPair {
-    Pair pair = 1;
-}
-
-message MsgTradeSet {
-    TradeSet trade_set = 1;
-}
-
-message Msg {
-    //a Msg has to be one of the below
-    oneof sum {
-        MsgBid msg_bid = 1;
-        MsgAsk msg_ask = 2;
-        MsgRegisterPair msg_register_pair = 3;
-        MsgCreateAccount msg_create_account = 4;
-        MsgTradeSet msg_trade_set = 5;
-    }
-}
--- a/abci/example/orderbook/orderbook
+++ b/abci/example/orderbook/orderbook
--- a/abci/example/orderbook/query.go
+++ b/abci/example/orderbook/query.go
@@ -1,31 +0,0 @@
-package orderbook
-
-// Query the state of an account (returns a concrete copy)
-func (sm *StateMachine) Account(id uint64) Account {
-	if int(id) >= len(sm.accounts) {
-		return Account{}
-	}
-	return *sm.accounts[id]
-}
-
-// Query all the pairs that the orderbook has (returns a concrete copy)
-func (sm *StateMachine) Pairs() []Pair {
-	pairs := make([]Pair, len(sm.pairs))
-	idx := 0
-	for _, pair := range sm.pairs {
-		pairs[idx] = *pair
-		idx++
-	}
-	return pairs
-}
-
-// Query the current orders for a pair (returns concrete copies)
-func (sm *StateMachine) Orders(pair *Pair) ([]OrderBid, []OrderAsk) {
-	market, ok := sm.markets[pair.String()]
-	if !ok {
-		return nil, nil
-	}
-	return market.GetBids(), market.GetAsks()
-}
-
-func (sm *StateMachine) Height() int64 { return sm.lastHeight }
--- a/abci/example/orderbook/types.go
+++ b/abci/example/orderbook/types.go
@@ -1,299 +0,0 @@
-package orderbook
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"math"
-
-	"github.com/tendermint/tendermint/crypto"
-	"github.com/tendermint/tendermint/crypto/ed25519"
-)
-
-func NewMsgBid(pair *Pair, maxPrice, maxQuantity float64, ownerId uint64) *MsgBid {
-	return &MsgBid{
-		Pair: pair,
-		BidOrder: &OrderBid{
-			MaxPrice:    maxPrice,
-			MaxQuantity: maxQuantity,
-			OwnerId:     ownerId,
-		},
-	}
-}
-
-func (msg *MsgBid) Sign(pk crypto.PrivKey) error {
-	sig, err := pk.Sign(msg.BidOrder.DeterministicSignatureBytes(msg.Pair))
-	if err != nil {
-		return err
-	}
-	msg.BidOrder.Signature = sig
-	return nil
-}
-
-func (msg *MsgBid) ValidateBasic() error {
-	if err := msg.BidOrder.ValidateBasic(); err != nil {
-		return err
-	}
-
-	if err := msg.Pair.ValidateBasic(); err != nil {
-		return err
-	}
-
-	if len(msg.BidOrder.Signature) != ed25519.SignatureSize {
-		return errors.New("invalid signature size")
-	}
-
-	return nil
-}
-
-func NewMsgAsk(pair *Pair, askPrice, quantity float64, ownerId uint64) *MsgAsk {
-	return &MsgAsk{
-		Pair: pair,
-		AskOrder: &OrderAsk{
-			AskPrice: askPrice,
-			Quantity: quantity,
-			OwnerId:  ownerId,
-		},
-	}
-}
-
-func (msg *MsgAsk) Sign(pk crypto.PrivKey) error {
-	sig, err := pk.Sign(msg.AskOrder.DeterministicSignatureBytes(msg.Pair))
-	if err != nil {
-		return err
-	}
-	msg.AskOrder.Signature = sig
-	return nil
-}
-
-func (msg *MsgAsk) ValidateBasic() error {
-	if err := msg.AskOrder.ValidateBasic(); err != nil {
-		return err
-	}
-
-	if err := msg.Pair.ValidateBasic(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func NewMsgCreateAccount(commodities ...*Commodity) (*MsgCreateAccount, crypto.PrivKey) {
-	pk := ed25519.GenPrivKey()
-	return &MsgCreateAccount{
-		PublicKey:   pk.PubKey().Bytes(),
-		Commodities: commodities,
-	}, pk
-}
-
-func (msg *MsgCreateAccount) ValidateBasic() error {
-	if len(msg.PublicKey) != ed25519.PubKeySize {
-		return errors.New("invalid pub key size")
-	}
-
-	uniqueMap := make(map[string]struct{}, len(msg.Commodities))
-	for _, c := range msg.Commodities {
-		if err := c.ValidateBasic(); err != nil {
-			return err
-		}
-
-		if _, ok := uniqueMap[c.Denom]; ok {
-			return fmt.Errorf("commodity %s declared twice", c.Denom)
-		}
-		uniqueMap[c.Denom] = struct{}{}
-	}
-
-	return nil
-}
-
-func NewMsgRegisterPair(pair *Pair) *MsgRegisterPair {
-	return &MsgRegisterPair{Pair: pair}
-}
-
-func (msg *MsgRegisterPair) ValidateBasic() error {
-	return msg.Pair.ValidateBasic()
-}
-
-func NewCommodity(denom string, quantity float64) *Commodity {
-	return &Commodity{
-		Denom:    denom,
-		Quantity: quantity,
-	}
-}
-
-func (c *Commodity) ValidateBasic() error {
-	if c.Quantity <= 0 {
-		return errors.New("quantity must be greater than zero")
-	}
-
-	return nil
-}
-
-func (p *Pair) ValidateBasic() error {
-	if p.BuyersDenomination == "" || p.SellersDenomination == "" {
-		return errors.New("inbound and outbound commodities must be present")
-	}
-
-	if p.BuyersDenomination == p.SellersDenomination {
-		return errors.New("commodities must not be the same")
-	}
-
-	return nil
-}
-
-func (o *OrderBid) ValidateBasic() error {
-	if o.MaxQuantity == 0 {
-		return errors.New("max quantity must be non zero")
-	}
-
-	if o.MaxPrice <= 0 {
-		return errors.New("min price must be greater than 0")
-	}
-
-	if len(o.Signature) != ed25519.SignatureSize {
-		return errors.New("invalid signature size")
-	}
-
-	return nil
-}
-
-func (o *OrderBid) ValidateSignature(pk crypto.PubKey, pair *Pair) bool {
-	return pk.VerifySignature(o.DeterministicSignatureBytes(pair), o.Signature)
-}
-
-func (o *OrderBid) DeterministicSignatureBytes(pair *Pair) []byte {
-	buf := bytes.NewBuffer(nil)
-	buf.WriteString(pair.SellersDenomination)
-	buf.WriteString(pair.BuyersDenomination)
-	bz := buf.Bytes()
-	bz = binary.BigEndian.AppendUint64(bz, math.Float64bits(o.MaxQuantity))
-	bz = binary.BigEndian.AppendUint64(bz, math.Float64bits(o.MaxPrice))
-	return bz
-}
-
-func (m *MatchedOrder) ValidateBasic() error {
-	if err := m.OrderAsk.ValidateBasic(); err != nil {
-		return err
-	}
-
-	if err := m.OrderBid.ValidateBasic(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (t *TradeSet) ValidateBasic() error {
-	for _, matchedOrder := range t.MatchedOrders {
-		if err := matchedOrder.ValidateBasic(); err != nil {
-			return err
-		}
-		// checking if there is an account
-		if matchedOrder.OrderAsk.OwnerId == 0 {
-			return errors.New("must have an owner id more than zero")
-		}
-	}
-	// validate the pairs are valid
-	if err := t.Pair.ValidateBasic(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (o *OrderAsk) ValidateBasic() error {
-	if o.Quantity == 0 {
-		return errors.New("quantity outbound must be non zero")
-	}
-
-	if o.AskPrice <= 0 {
-		return errors.New("min price must be greater than 0")
-	}
-
-	if len(o.Signature) != ed25519.SignatureSize {
-		return errors.New("invalid signature size")
-	}
-
-	return nil
-}
-
-func (o *OrderAsk) ValidateSignature(pk crypto.PubKey, pair *Pair) bool {
-	return pk.VerifySignature(o.DeterministicSignatureBytes(pair), o.Signature)
-}
-
-func (o *OrderAsk) DeterministicSignatureBytes(pair *Pair) []byte {
-	buf := bytes.NewBuffer(nil)
-	buf.WriteString(pair.BuyersDenomination)
-	buf.WriteString(pair.SellersDenomination)
-	bz := buf.Bytes()
-	bz = binary.BigEndian.AppendUint64(bz, math.Float64bits(o.Quantity))
-	bz = binary.BigEndian.AppendUint64(bz, math.Float64bits(o.AskPrice))
-	return bz
-}
-
-func (a Account) IsEmpty() bool {
-	return len(a.PublicKey) == 0
-}
-
-func (a *Account) FindCommidity(denom string) *Commodity {
-	for _, c := range a.Commodities {
-		if c.Denom == denom {
-			return c
-		}
-	}
-
-	return nil
-
-}
-
-func (a *Account) AddCommodity(c *Commodity) {
-	curr := a.FindCommidity(c.Denom)
-	if curr == nil {
-		a.Commodities = append(a.Commodities, c)
-	} else {
-		curr.Quantity += c.Quantity
-	}
-}
-
-func (a *Account) SubtractCommodity(c *Commodity) {
-	curr := a.FindCommidity(c.Denom)
-	if curr == nil {
-		panic("trying to remove a commodity the account does not have")
-	}
-	curr.Quantity -= c.Quantity
-}
-
-func (msg *Msg) ValidateBasic() error {
-	switch m := msg.Sum.(type) {
-	case *Msg_MsgRegisterPair:
-		if err := m.MsgRegisterPair.ValidateBasic(); err != nil {
-			return err
-		}
-
-	case *Msg_MsgCreateAccount:
-		if err := m.MsgCreateAccount.ValidateBasic(); err != nil {
-			return err
-		}
-
-	case *Msg_MsgBid:
-		if err := m.MsgBid.ValidateBasic(); err != nil {
-			return err
-		}
-
-	case *Msg_MsgAsk:
-		if err := m.MsgAsk.ValidateBasic(); err != nil {
-			return err
-		}
-
-	case *Msg_MsgTradeSet:
-		if err := m.MsgTradeSet.TradeSet.ValidateBasic(); err != nil {
-			return err
-		}
-
-	default:
-		return errors.New("unknown tx")
-	}
-
-	return nil
-}
--- a/abci/example/orderbook/wire.pb.go
+++ b/abci/example/orderbook/wire.pb.go
--- a/abci/example/orderbook/wire.proto
+++ b/abci/example/orderbook/wire.proto
@@ -1,52 +0,0 @@
-syntax = "proto3";
-
-package orderbook;
-option go_package = "github.com/tendermint/tendermint/abci/example/orderbook";
-
-
-message OrderAsk {
-    double quantity = 1;
-    double ask_price = 2;
-	uint64 owner_id = 3;
-    bytes signature = 4; 
-}
-
-message OrderBid {
-    double max_quantity = 1;
-    double max_price = 2;
-	uint64 owner_id = 3;
-    bytes signature = 4;
-}
-
-message Pair {
-    // the denomination that the buyer receives i.e. EUR
-    string buyers_denomination = 1;
-    // the denomination that the seller receives i.e. USD
-    string sellers_denomination = 2;
-}
-
-message Commodity {
-    string denom = 1;
-    double quantity = 2;    
-}
-
-// Accounts is the atomic piece of information that is persisted to disk.
-message Account {
-    uint64 index = 1;
-	bytes public_key = 2;
-    // the set of commodities that the account has
-    repeated Commodity commodities = 3;
-}
-
-// TradeSet is the transaction that eventually is committed in a block
-// It is derived from a group of MsgBid and MsgAsk's 
-message TradeSet {
-    Pair pair = 1; // i.e. EUR/USD
-    // the set of matched trades for that peer 
-    repeated MatchedOrder matched_orders = 2;
-}
-
-message MatchedOrder {
-    OrderAsk order_ask = 1;
-    OrderBid order_bid = 2;
-}
--- a/abci/server/server.go
+++ b/abci/server/server.go
@@ -2,8 +2,9 @@
 Package server is used to start a new ABCI server.

 It contains two server implementation:
-  - gRPC server
-  - socket server
+ * gRPC server
+ * socket server
+
 */
 package server

--- a/abci/server/socket_server.go
+++ b/abci/server/socket_server.go
@@ -200,6 +200,9 @@ func (s *SocketServer) handleRequest(req *types.Request, responses chan<- *types
 	case *types.Request_Info:
 		res := s.app.Info(*r.Info)
 		responses <- types.ToResponseInfo(res)
+	case *types.Request_SetOption:
+		res := s.app.SetOption(*r.SetOption)
+		responses <- types.ToResponseSetOption(res)
 	case *types.Request_DeliverTx:
 		res := s.app.DeliverTx(*r.DeliverTx)
 		responses <- types.ToResponseDeliverTx(res)
@@ -227,12 +230,6 @@ func (s *SocketServer) handleRequest(req *types.Request, responses chan<- *types
 	case *types.Request_OfferSnapshot:
 		res := s.app.OfferSnapshot(*r.OfferSnapshot)
 		responses <- types.ToResponseOfferSnapshot(res)
-	case *types.Request_PrepareProposal:
-		res := s.app.PrepareProposal(*r.PrepareProposal)
-		responses <- types.ToResponsePrepareProposal(res)
-	case *types.Request_ProcessProposal:
-		res := s.app.ProcessProposal(*r.ProcessProposal)
-		responses <- types.ToResponseProcessProposal(res)
 	case *types.Request_LoadSnapshotChunk:
 		res := s.app.LoadSnapshotChunk(*r.LoadSnapshotChunk)
 		responses <- types.ToResponseLoadSnapshotChunk(res)
--- a/abci/tests/server/client.go
+++ b/abci/tests/server/client.go
@@ -29,6 +29,17 @@ func InitChain(client abcicli.Client) error {
 	return nil
 }

+func SetOption(client abcicli.Client, key, value string) error {
+	_, err := client.SetOptionSync(types.RequestSetOption{Key: key, Value: value})
+	if err != nil {
+		fmt.Println("Failed test: SetOption")
+		fmt.Printf("error while setting %v=%v: \nerror: %v\n", key, value, err)
+		return err
+	}
+	fmt.Println("Passed test: SetOption")
+	return nil
+}
+
 func Commit(client abcicli.Client, hashExp []byte) error {
 	res, err := client.CommitSync()
 	data := res.Data
@@ -65,32 +76,6 @@ func DeliverTx(client abcicli.Client, txBytes []byte, codeExp uint32, dataExp []
 	return nil
 }

-func PrepareProposal(client abcicli.Client, txBytes [][]byte, txExpected [][]byte, dataExp []byte) error {
-	res, _ := client.PrepareProposalSync(types.RequestPrepareProposal{Txs: txBytes})
-	for i, tx := range res.Txs {
-		if !bytes.Equal(tx, txExpected[i]) {
-			fmt.Println("Failed test: PrepareProposal")
-			fmt.Printf("PrepareProposal transaction was unexpected. Got %x expected %x.",
-				tx, txExpected[i])
-			return errors.New("PrepareProposal error")
-		}
-	}
-	fmt.Println("Passed test: PrepareProposal")
-	return nil
-}
-
-func ProcessProposal(client abcicli.Client, txBytes [][]byte, statusExp types.ResponseProcessProposal_ProposalStatus) error {
-	res, _ := client.ProcessProposalSync(types.RequestProcessProposal{Txs: txBytes})
-	if res.Status != statusExp {
-		fmt.Println("Failed test: ProcessProposal")
-		fmt.Printf("ProcessProposal response status was unexpected. Got %v expected %v.",
-			res.Status, statusExp)
-		return errors.New("ProcessProposal error")
-	}
-	fmt.Println("Passed test: ProcessProposal")
-	return nil
-}
-
 func CheckTx(client abcicli.Client, txBytes []byte, codeExp uint32, dataExp []byte) error {
 	res, _ := client.CheckTxSync(types.RequestCheckTx{Tx: txBytes})
 	code, data, log := res.Code, res.Data, res.Log
--- a/abci/tests/test_cli/ex1.abci
+++ b/abci/tests/test_cli/ex1.abci
@@ -1,7 +1,5 @@
 echo hello
 info
-prepare_proposal "abc"
-process_proposal "abc"
 commit
 deliver_tx "abc"
 info
@@ -10,9 +8,3 @@ query "abc"
 deliver_tx "def=xyz"
 commit
 query "def"
-prepare_proposal "preparedef"
-process_proposal "replacedef"
-process_proposal "preparedef"
-prepare_proposal
-process_proposal
-commit
--- a/abci/tests/test_cli/ex1.abci.out
+++ b/abci/tests/test_cli/ex1.abci.out
@@ -8,14 +8,6 @@
 -> data: {"size":0}
 -> data.hex: 0x7B2273697A65223A307D

-> prepare_proposal "abc"
-> code: OK
-> log: Succeeded. Tx: abc
-
-> process_proposal "abc"
-> code: OK
-> status: ACCEPT
-
 > commit 
 -> code: OK
 -> data.hex: 0x0000000000000000
@@ -57,25 +49,3 @@
 -> value: xyz
 -> value.hex: 78797A

-> prepare_proposal "preparedef"
-> code: OK
-> log: Succeeded. Tx: replacedef
-
-> process_proposal "replacedef"
-> code: OK
-> status: ACCEPT
-
-> process_proposal "preparedef"
-> code: OK
-> status: REJECT
-
-> prepare_proposal 
-
-> process_proposal 
-> code: OK
-> status: ACCEPT
-
-> commit 
-> code: OK
-> data.hex: 0x0400000000000000
-
--- a/abci/tests/test_cli/ex2.abci
+++ b/abci/tests/test_cli/ex2.abci
@@ -1,3 +1,4 @@
+set_option serial on
 check_tx 0x00
 check_tx 0xff
 deliver_tx 0x00
--- a/abci/tests/test_cli/ex2.abci.out
+++ b/abci/tests/test_cli/ex2.abci.out
@@ -1,3 +1,7 @@
+> set_option serial on
+-> code: OK
+-> log: OK (SetOption doesn't return anything.)
+
 > check_tx 0x00
 -> code: OK

@@ -8,16 +12,18 @@
 -> code: OK

 > check_tx 0x00
-> code: OK
+-> code: 2
+-> log: Invalid nonce. Expected >= 1, got 0

 > deliver_tx 0x01
 -> code: OK

 > deliver_tx 0x04
-> code: OK
+-> code: 2
+-> log: Invalid nonce. Expected 2, got 4

 > info 
 -> code: OK
-> data: {"size":3}
-> data.hex: 0x7B2273697A65223A337D
+-> data: {"hashes":0,"txs":2}
+-> data.hex: 0x7B22686173686573223A302C22747873223A327D

--- a/abci/tests/test_cli/test.sh
+++ b/abci/tests/test_cli/test.sh
@@ -30,8 +30,6 @@ function testExample() {
 		cat "${INPUT}.out.new"
 		echo "Expected:"
 		cat "${INPUT}.out"
-		echo "Diff:"
-		diff "${INPUT}.out" "${INPUT}.out.new"
 		exit 1
 	fi

@@ -39,7 +37,6 @@ function testExample() {
 }

 testExample 1 tests/test_cli/ex1.abci abci-cli kvstore
-testExample 2 tests/test_cli/ex2.abci abci-cli kvstore

 echo ""
 echo "PASS"
--- a/abci/types/application.go
+++ b/abci/types/application.go
@@ -4,24 +4,21 @@ import (
 	context "golang.org/x/net/context"
 )

-//go:generate ../../scripts/mockery_generate.sh Application
-
 // Application is an interface that enables any finite, deterministic state machine
 // to be driven by a blockchain-based replication engine via the ABCI.
 // All methods take a RequestXxx argument and return a ResponseXxx argument,
 // except CheckTx/DeliverTx, which take `tx []byte`, and `Commit`, which takes nothing.
 type Application interface {
 	// Info/Query Connection
-	Info(RequestInfo) ResponseInfo    // Return application info
-	Query(RequestQuery) ResponseQuery // Query for state
+	Info(RequestInfo) ResponseInfo                // Return application info
+	SetOption(RequestSetOption) ResponseSetOption // Set application option
+	Query(RequestQuery) ResponseQuery             // Query for state

 	// Mempool Connection
 	CheckTx(RequestCheckTx) ResponseCheckTx // Validate a tx for the mempool

 	// Consensus Connection
-	InitChain(RequestInitChain) ResponseInitChain // Initialize blockchain w validators/other info from TendermintCore
-	PrepareProposal(RequestPrepareProposal) ResponsePrepareProposal
-	ProcessProposal(RequestProcessProposal) ResponseProcessProposal
+	InitChain(RequestInitChain) ResponseInitChain    // Initialize blockchain w validators/other info from TendermintCore
 	BeginBlock(RequestBeginBlock) ResponseBeginBlock // Signals the beginning of a block
 	DeliverTx(RequestDeliverTx) ResponseDeliverTx    // Deliver a tx for full processing
 	EndBlock(RequestEndBlock) ResponseEndBlock       // Signals the end of a block, returns changes to the validator set
@@ -50,6 +47,10 @@ func (BaseApplication) Info(req RequestInfo) ResponseInfo {
 	return ResponseInfo{}
 }

+func (BaseApplication) SetOption(req RequestSetOption) ResponseSetOption {
+	return ResponseSetOption{}
+}
+
 func (BaseApplication) DeliverTx(req RequestDeliverTx) ResponseDeliverTx {
 	return ResponseDeliverTx{Code: CodeTypeOK}
 }
@@ -94,24 +95,6 @@ func (BaseApplication) ApplySnapshotChunk(req RequestApplySnapshotChunk) Respons
 	return ResponseApplySnapshotChunk{}
 }

-func (BaseApplication) PrepareProposal(req RequestPrepareProposal) ResponsePrepareProposal {
-	txs := make([][]byte, 0, len(req.Txs))
-	var totalBytes int64
-	for _, tx := range req.Txs {
-		totalBytes += int64(len(tx))
-		if totalBytes > req.MaxTxBytes {
-			break
-		}
-		txs = append(txs, tx)
-	}
-	return ResponsePrepareProposal{Txs: txs}
-}
-
-func (BaseApplication) ProcessProposal(req RequestProcessProposal) ResponseProcessProposal {
-	return ResponseProcessProposal{
-		Status: ResponseProcessProposal_ACCEPT}
-}
-
 //-------------------------------------------------------

 // GRPCApplication is a GRPC wrapper for Application
@@ -136,6 +119,11 @@ func (app *GRPCApplication) Info(ctx context.Context, req *RequestInfo) (*Respon
 	return &res, nil
 }

+func (app *GRPCApplication) SetOption(ctx context.Context, req *RequestSetOption) (*ResponseSetOption, error) {
+	res := app.app.SetOption(*req)
+	return &res, nil
+}
+
 func (app *GRPCApplication) DeliverTx(ctx context.Context, req *RequestDeliverTx) (*ResponseDeliverTx, error) {
 	res := app.app.DeliverTx(*req)
 	return &res, nil
@@ -194,15 +182,3 @@ func (app *GRPCApplication) ApplySnapshotChunk(
 	res := app.app.ApplySnapshotChunk(*req)
 	return &res, nil
 }
-
-func (app *GRPCApplication) PrepareProposal(
-	ctx context.Context, req *RequestPrepareProposal) (*ResponsePrepareProposal, error) {
-	res := app.app.PrepareProposal(*req)
-	return &res, nil
-}
-
-func (app *GRPCApplication) ProcessProposal(
-	ctx context.Context, req *RequestProcessProposal) (*ResponseProcessProposal, error) {
-	res := app.app.ProcessProposal(*req)
-	return &res, nil
-}
--- a/abci/types/messages.go
+++ b/abci/types/messages.go
@@ -1,10 +1,11 @@
 package types

 import (
+	"bufio"
+	"encoding/binary"
 	"io"

-	"github.com/cosmos/gogoproto/proto"
-	"github.com/tendermint/tendermint/libs/protoio"
+	"github.com/gogo/protobuf/proto"
 )

 const (
@@ -13,19 +14,57 @@ const (

 // WriteMessage writes a varint length-delimited protobuf message.
 func WriteMessage(msg proto.Message, w io.Writer) error {
-	protoWriter := protoio.NewDelimitedWriter(w)
-	_, err := protoWriter.WriteMsg(msg)
+	bz, err := proto.Marshal(msg)
 	if err != nil {
 		return err
 	}
-
-	return nil
+	return encodeByteSlice(w, bz)
 }

 // ReadMessage reads a varint length-delimited protobuf message.
 func ReadMessage(r io.Reader, msg proto.Message) error {
-	_, err := protoio.NewDelimitedReader(r, maxMsgSize).ReadMsg(msg)
-	return err
+	return readProtoMsg(r, msg, maxMsgSize)
+}
+
+func readProtoMsg(r io.Reader, msg proto.Message, maxSize int) error {
+	// binary.ReadVarint takes an io.ByteReader, eg. a bufio.Reader
+	reader, ok := r.(*bufio.Reader)
+	if !ok {
+		reader = bufio.NewReader(r)
+	}
+	length64, err := binary.ReadVarint(reader)
+	if err != nil {
+		return err
+	}
+	length := int(length64)
+	if length < 0 || length > maxSize {
+		return io.ErrShortBuffer
+	}
+	buf := make([]byte, length)
+	if _, err := io.ReadFull(reader, buf); err != nil {
+		return err
+	}
+	return proto.Unmarshal(buf, msg)
+}
+
+//-----------------------------------------------------------------------
+// NOTE: we copied wire.EncodeByteSlice from go-wire rather than keep
+// go-wire as a dep
+
+func encodeByteSlice(w io.Writer, bz []byte) (err error) {
+	err = encodeVarint(w, int64(len(bz)))
+	if err != nil {
+		return
+	}
+	_, err = w.Write(bz)
+	return
+}
+
+func encodeVarint(w io.Writer, i int64) (err error) {
+	var buf [10]byte
+	n := binary.PutVarint(buf[:], i)
+	_, err = w.Write(buf[0:n])
+	return
 }

 //----------------------------------------
@@ -48,6 +87,12 @@ func ToRequestInfo(req RequestInfo) *Request {
 	}
 }

+func ToRequestSetOption(req RequestSetOption) *Request {
+	return &Request{
+		Value: &Request_SetOption{&req},
+	}
+}
+
 func ToRequestDeliverTx(req RequestDeliverTx) *Request {
 	return &Request{
 		Value: &Request_DeliverTx{&req},
@@ -114,18 +159,6 @@ func ToRequestApplySnapshotChunk(req RequestApplySnapshotChunk) *Request {
 	}
 }

-func ToRequestPrepareProposal(req RequestPrepareProposal) *Request {
-	return &Request{
-		Value: &Request_PrepareProposal{&req},
-	}
-}
-
-func ToRequestProcessProposal(req RequestProcessProposal) *Request {
-	return &Request{
-		Value: &Request_ProcessProposal{&req},
-	}
-}
-
 //----------------------------------------

 func ToResponseException(errStr string) *Response {
@@ -152,6 +185,12 @@ func ToResponseInfo(res ResponseInfo) *Response {
 	}
 }

+func ToResponseSetOption(res ResponseSetOption) *Response {
+	return &Response{
+		Value: &Response_SetOption{&res},
+	}
+}
+
 func ToResponseDeliverTx(res ResponseDeliverTx) *Response {
 	return &Response{
 		Value: &Response_DeliverTx{&res},
@@ -217,15 +256,3 @@ func ToResponseApplySnapshotChunk(res ResponseApplySnapshotChunk) *Response {
 		Value: &Response_ApplySnapshotChunk{&res},
 	}
 }
-
-func ToResponsePrepareProposal(res ResponsePrepareProposal) *Response {
-	return &Response{
-		Value: &Response_PrepareProposal{&res},
-	}
-}
-
-func ToResponseProcessProposal(res ResponseProcessProposal) *Response {
-	return &Response{
-		Value: &Response_ProcessProposal{&res},
-	}
-}
--- a/abci/types/messages_test.go
+++ b/abci/types/messages_test.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 	"testing"

-	"github.com/cosmos/gogoproto/proto"
+	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"

 	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
@@ -25,7 +25,7 @@ func TestMarshalJSON(t *testing.T) {
 			{
 				Type: "testEvent",
 				Attributes: []EventAttribute{
-					{Key: "pho", Value: "bo"},
+					{Key: []byte("pho"), Value: []byte("bo")},
 				},
 			},
 		},
@@ -92,7 +92,7 @@ func TestWriteReadMessage2(t *testing.T) {
 				{
 					Type: "testEvent",
 					Attributes: []EventAttribute{
-						{Key: "abc", Value: "def"},
+						{Key: []byte("abc"), Value: []byte("def")},
 					},
 				},
 			},
--- a/abci/types/mocks/application.go
+++ b/abci/types/mocks/application.go
@@ -1,224 +0,0 @@
-// Code generated by mockery. DO NOT EDIT.
-
-package mocks
-
-import (
-	mock "github.com/stretchr/testify/mock"
-	types "github.com/tendermint/tendermint/abci/types"
-)
-
-// Application is an autogenerated mock type for the Application type
-type Application struct {
-	mock.Mock
-}
-
-// ApplySnapshotChunk provides a mock function with given fields: _a0
-func (_m *Application) ApplySnapshotChunk(_a0 types.RequestApplySnapshotChunk) types.ResponseApplySnapshotChunk {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseApplySnapshotChunk
-	if rf, ok := ret.Get(0).(func(types.RequestApplySnapshotChunk) types.ResponseApplySnapshotChunk); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseApplySnapshotChunk)
-	}
-
-	return r0
-}
-
-// BeginBlock provides a mock function with given fields: _a0
-func (_m *Application) BeginBlock(_a0 types.RequestBeginBlock) types.ResponseBeginBlock {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseBeginBlock
-	if rf, ok := ret.Get(0).(func(types.RequestBeginBlock) types.ResponseBeginBlock); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseBeginBlock)
-	}
-
-	return r0
-}
-
-// CheckTx provides a mock function with given fields: _a0
-func (_m *Application) CheckTx(_a0 types.RequestCheckTx) types.ResponseCheckTx {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseCheckTx
-	if rf, ok := ret.Get(0).(func(types.RequestCheckTx) types.ResponseCheckTx); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseCheckTx)
-	}
-
-	return r0
-}
-
-// Commit provides a mock function with given fields:
-func (_m *Application) Commit() types.ResponseCommit {
-	ret := _m.Called()
-
-	var r0 types.ResponseCommit
-	if rf, ok := ret.Get(0).(func() types.ResponseCommit); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(types.ResponseCommit)
-	}
-
-	return r0
-}
-
-// DeliverTx provides a mock function with given fields: _a0
-func (_m *Application) DeliverTx(_a0 types.RequestDeliverTx) types.ResponseDeliverTx {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseDeliverTx
-	if rf, ok := ret.Get(0).(func(types.RequestDeliverTx) types.ResponseDeliverTx); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseDeliverTx)
-	}
-
-	return r0
-}
-
-// EndBlock provides a mock function with given fields: _a0
-func (_m *Application) EndBlock(_a0 types.RequestEndBlock) types.ResponseEndBlock {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseEndBlock
-	if rf, ok := ret.Get(0).(func(types.RequestEndBlock) types.ResponseEndBlock); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseEndBlock)
-	}
-
-	return r0
-}
-
-// Info provides a mock function with given fields: _a0
-func (_m *Application) Info(_a0 types.RequestInfo) types.ResponseInfo {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseInfo
-	if rf, ok := ret.Get(0).(func(types.RequestInfo) types.ResponseInfo); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseInfo)
-	}
-
-	return r0
-}
-
-// InitChain provides a mock function with given fields: _a0
-func (_m *Application) InitChain(_a0 types.RequestInitChain) types.ResponseInitChain {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseInitChain
-	if rf, ok := ret.Get(0).(func(types.RequestInitChain) types.ResponseInitChain); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseInitChain)
-	}
-
-	return r0
-}
-
-// ListSnapshots provides a mock function with given fields: _a0
-func (_m *Application) ListSnapshots(_a0 types.RequestListSnapshots) types.ResponseListSnapshots {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseListSnapshots
-	if rf, ok := ret.Get(0).(func(types.RequestListSnapshots) types.ResponseListSnapshots); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseListSnapshots)
-	}
-
-	return r0
-}
-
-// LoadSnapshotChunk provides a mock function with given fields: _a0
-func (_m *Application) LoadSnapshotChunk(_a0 types.RequestLoadSnapshotChunk) types.ResponseLoadSnapshotChunk {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseLoadSnapshotChunk
-	if rf, ok := ret.Get(0).(func(types.RequestLoadSnapshotChunk) types.ResponseLoadSnapshotChunk); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseLoadSnapshotChunk)
-	}
-
-	return r0
-}
-
-// OfferSnapshot provides a mock function with given fields: _a0
-func (_m *Application) OfferSnapshot(_a0 types.RequestOfferSnapshot) types.ResponseOfferSnapshot {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseOfferSnapshot
-	if rf, ok := ret.Get(0).(func(types.RequestOfferSnapshot) types.ResponseOfferSnapshot); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseOfferSnapshot)
-	}
-
-	return r0
-}
-
-// PrepareProposal provides a mock function with given fields: _a0
-func (_m *Application) PrepareProposal(_a0 types.RequestPrepareProposal) types.ResponsePrepareProposal {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponsePrepareProposal
-	if rf, ok := ret.Get(0).(func(types.RequestPrepareProposal) types.ResponsePrepareProposal); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponsePrepareProposal)
-	}
-
-	return r0
-}
-
-// ProcessProposal provides a mock function with given fields: _a0
-func (_m *Application) ProcessProposal(_a0 types.RequestProcessProposal) types.ResponseProcessProposal {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseProcessProposal
-	if rf, ok := ret.Get(0).(func(types.RequestProcessProposal) types.ResponseProcessProposal); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseProcessProposal)
-	}
-
-	return r0
-}
-
-// Query provides a mock function with given fields: _a0
-func (_m *Application) Query(_a0 types.RequestQuery) types.ResponseQuery {
-	ret := _m.Called(_a0)
-
-	var r0 types.ResponseQuery
-	if rf, ok := ret.Get(0).(func(types.RequestQuery) types.ResponseQuery); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Get(0).(types.ResponseQuery)
-	}
-
-	return r0
-}
-
-type mockConstructorTestingTNewApplication interface {
-	mock.TestingT
-	Cleanup(func())
-}
-
-// NewApplication creates a new instance of Application. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
-func NewApplication(t mockConstructorTestingTNewApplication) *Application {
-	mock := &Application{}
-	mock.Mock.Test(t)
-
-	t.Cleanup(func() { mock.AssertExpectations(t) })
-
-	return mock
-}
--- a/abci/types/mocks/base.go
+++ b/abci/types/mocks/base.go
@@ -1,187 +0,0 @@
-package mocks
-
-import (
-	types "github.com/tendermint/tendermint/abci/types"
-)
-
-// BaseMock provides a wrapper around the generated Application mock and a BaseApplication.
-// BaseMock first tries to use the mock's implementation of the method.
-// If no functionality was provided for the mock by the user, BaseMock dispatches
-// to the BaseApplication and uses its functionality.
-// BaseMock allows users to provide mocked functionality for only the methods that matter
-// for their test while avoiding a panic if the code calls Application methods that are
-// not relevant to the test.
-type BaseMock struct {
-	base *types.BaseApplication
-	*Application
-}
-
-func NewBaseMock() BaseMock {
-	return BaseMock{
-		base:        types.NewBaseApplication(),
-		Application: new(Application),
-	}
-}
-
-// Info/Query Connection
-// Return application info
-func (m BaseMock) Info(input types.RequestInfo) types.ResponseInfo {
-	var ret types.ResponseInfo
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.Info(input)
-		}
-	}()
-	ret = m.Application.Info(input)
-	return ret
-}
-
-func (m BaseMock) Query(input types.RequestQuery) types.ResponseQuery {
-	var ret types.ResponseQuery
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.Query(input)
-		}
-	}()
-	ret = m.Application.Query(input)
-	return ret
-}
-
-// Mempool Connection
-// Validate a tx for the mempool
-func (m BaseMock) CheckTx(input types.RequestCheckTx) types.ResponseCheckTx {
-	var ret types.ResponseCheckTx
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.CheckTx(input)
-		}
-	}()
-	ret = m.Application.CheckTx(input)
-	return ret
-}
-
-// Consensus Connection
-// Initialize blockchain w validators/other info from TendermintCore
-func (m BaseMock) InitChain(input types.RequestInitChain) types.ResponseInitChain {
-	var ret types.ResponseInitChain
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.InitChain(input)
-		}
-	}()
-	ret = m.Application.InitChain(input)
-	return ret
-}
-
-func (m BaseMock) PrepareProposal(input types.RequestPrepareProposal) types.ResponsePrepareProposal {
-	var ret types.ResponsePrepareProposal
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.PrepareProposal(input)
-		}
-	}()
-	ret = m.Application.PrepareProposal(input)
-	return ret
-}
-
-func (m BaseMock) ProcessProposal(input types.RequestProcessProposal) types.ResponseProcessProposal {
-	var ret types.ResponseProcessProposal
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.ProcessProposal(input)
-		}
-	}()
-	ret = m.Application.ProcessProposal(input)
-	return ret
-}
-
-// Commit the state and return the application Merkle root hash
-func (m BaseMock) Commit() types.ResponseCommit {
-	var ret types.ResponseCommit
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.Commit()
-		}
-	}()
-	ret = m.Application.Commit()
-	return ret
-}
-
-// State Sync Connection
-// List available snapshots
-func (m BaseMock) ListSnapshots(input types.RequestListSnapshots) types.ResponseListSnapshots {
-	var ret types.ResponseListSnapshots
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.ListSnapshots(input)
-		}
-	}()
-	ret = m.Application.ListSnapshots(input)
-	return ret
-}
-
-func (m BaseMock) OfferSnapshot(input types.RequestOfferSnapshot) types.ResponseOfferSnapshot {
-	var ret types.ResponseOfferSnapshot
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.OfferSnapshot(input)
-		}
-	}()
-	ret = m.Application.OfferSnapshot(input)
-	return ret
-}
-
-func (m BaseMock) LoadSnapshotChunk(input types.RequestLoadSnapshotChunk) types.ResponseLoadSnapshotChunk {
-	var ret types.ResponseLoadSnapshotChunk
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.LoadSnapshotChunk(input)
-		}
-	}()
-	ret = m.Application.LoadSnapshotChunk(input)
-	return ret
-}
-
-func (m BaseMock) ApplySnapshotChunk(input types.RequestApplySnapshotChunk) types.ResponseApplySnapshotChunk {
-	var ret types.ResponseApplySnapshotChunk
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.ApplySnapshotChunk(input)
-		}
-	}()
-	ret = m.Application.ApplySnapshotChunk(input)
-	return ret
-}
-
-func (m BaseMock) BeginBlock(input types.RequestBeginBlock) types.ResponseBeginBlock {
-	var ret types.ResponseBeginBlock
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.BeginBlock(input)
-		}
-	}()
-	ret = m.Application.BeginBlock(input)
-	return ret
-}
-
-func (m BaseMock) DeliverTx(input types.RequestDeliverTx) types.ResponseDeliverTx {
-	var ret types.ResponseDeliverTx
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.DeliverTx(input)
-		}
-	}()
-	ret = m.Application.DeliverTx(input)
-	return ret
-}
-
-func (m BaseMock) EndBlock(input types.RequestEndBlock) types.ResponseEndBlock {
-	var ret types.ResponseEndBlock
-	defer func() {
-		if r := recover(); r != nil {
-			ret = m.base.EndBlock(input)
-		}
-	}()
-	ret = m.Application.EndBlock(input)
-	return ret
-}
--- a/abci/types/result.go
+++ b/abci/types/result.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"

-	"github.com/cosmos/gogoproto/jsonpb"
+	"github.com/gogo/protobuf/jsonpb"
 )

 const (
@@ -41,16 +41,6 @@ func (r ResponseQuery) IsErr() bool {
 	return r.Code != CodeTypeOK
 }

-// IsAccepted returns true if Code is ACCEPT
-func (r ResponseProcessProposal) IsAccepted() bool {
-	return r.Status == ResponseProcessProposal_ACCEPT
-}
-
-// IsStatusUnknown returns true if Code is UNKNOWN
-func (r ResponseProcessProposal) IsStatusUnknown() bool {
-	return r.Status == ResponseProcessProposal_UNKNOWN
-}
-
 //---------------------------------------------------------------------------
 // override JSON marshaling so we emit defaults (ie. disable omitempty)

@@ -62,6 +52,16 @@ var (
 	jsonpbUnmarshaller = jsonpb.Unmarshaler{}
 )

+func (r *ResponseSetOption) MarshalJSON() ([]byte, error) {
+	s, err := jsonpbMarshaller.MarshalToString(r)
+	return []byte(s), err
+}
+
+func (r *ResponseSetOption) UnmarshalJSON(b []byte) error {
+	reader := bytes.NewBuffer(b)
+	return jsonpbUnmarshaller.Unmarshal(reader, r)
+}
+
 func (r *ResponseCheckTx) MarshalJSON() ([]byte, error) {
 	s, err := jsonpbMarshaller.MarshalToString(r)
 	return []byte(s), err
@@ -126,5 +126,6 @@ var _ jsonRoundTripper = (*ResponseCommit)(nil)
 var _ jsonRoundTripper = (*ResponseQuery)(nil)
 var _ jsonRoundTripper = (*ResponseDeliverTx)(nil)
 var _ jsonRoundTripper = (*ResponseCheckTx)(nil)
+var _ jsonRoundTripper = (*ResponseSetOption)(nil)

 var _ jsonRoundTripper = (*EventAttribute)(nil)
--- a/abci/types/types.pb.go
+++ b/abci/types/types.pb.go
--- a/abci/version/version.go
+++ b/abci/version/version.go
@@ -6,4 +6,4 @@ import (

 // TODO: eliminate this after some version refactor

-const Version = version.ABCISemVer
+const Version = version.ABCIVersion
--- a/blockchain/msgs.go
+++ b/blockchain/msgs.go
@@ -1,12 +1,12 @@
-package blocksync
+package blockchain

 import (
 	"errors"
 	"fmt"

-	"github.com/cosmos/gogoproto/proto"
+	"github.com/gogo/protobuf/proto"

-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
+	bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain"
 	"github.com/tendermint/tendermint/types"
 )

--- a/blockchain/msgs_test.go
+++ b/blockchain/msgs_test.go
@@ -1,16 +1,15 @@
-package blocksync_test
+package blockchain

 import (
 	"encoding/hex"
 	"math"
 	"testing"

-	"github.com/cosmos/gogoproto/proto"
+	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

-	"github.com/tendermint/tendermint/blocksync"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
+	bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain"
 	"github.com/tendermint/tendermint/types"
 )

@@ -29,7 +28,7 @@ func TestBcBlockRequestMessageValidateBasic(t *testing.T) {
 		tc := tc
 		t.Run(tc.testName, func(t *testing.T) {
 			request := bcproto.BlockRequest{Height: tc.requestHeight}
-			assert.Equal(t, tc.expectErr, blocksync.ValidateMsg(&request) != nil, "Validate Basic had an unexpected result")
+			assert.Equal(t, tc.expectErr, ValidateMsg(&request) != nil, "Validate Basic had an unexpected result")
 		})
 	}
 }
@@ -49,14 +48,14 @@ func TestBcNoBlockResponseMessageValidateBasic(t *testing.T) {
 		tc := tc
 		t.Run(tc.testName, func(t *testing.T) {
 			nonResponse := bcproto.NoBlockResponse{Height: tc.nonResponseHeight}
-			assert.Equal(t, tc.expectErr, blocksync.ValidateMsg(&nonResponse) != nil, "Validate Basic had an unexpected result")
+			assert.Equal(t, tc.expectErr, ValidateMsg(&nonResponse) != nil, "Validate Basic had an unexpected result")
 		})
 	}
 }

 func TestBcStatusRequestMessageValidateBasic(t *testing.T) {
 	request := bcproto.StatusRequest{}
-	assert.NoError(t, blocksync.ValidateMsg(&request))
+	assert.NoError(t, ValidateMsg(&request))
 }

 func TestBcStatusResponseMessageValidateBasic(t *testing.T) {
@@ -74,12 +73,12 @@ func TestBcStatusResponseMessageValidateBasic(t *testing.T) {
 		tc := tc
 		t.Run(tc.testName, func(t *testing.T) {
 			response := bcproto.StatusResponse{Height: tc.responseHeight}
-			assert.Equal(t, tc.expectErr, blocksync.ValidateMsg(&response) != nil, "Validate Basic had an unexpected result")
+			assert.Equal(t, tc.expectErr, ValidateMsg(&response) != nil, "Validate Basic had an unexpected result")
 		})
 	}
 }

-//nolint:lll // ignore line length in tests
+// nolint:lll // ignore line length in tests
 func TestBlockchainMessageVectors(t *testing.T) {
 	block := types.MakeBlock(int64(3), []types.Tx{types.Tx("Hello World")}, nil, nil)
 	block.Version.Block = 11 // overwrite updated protocol version
--- a/blockchain/pool.go
+++ b/blockchain/pool.go
@@ -1,4 +1,4 @@
-package blocksync
+package blockchain

 import (
 	"errors"
@@ -58,7 +58,7 @@ var peerTimeout = 15 * time.Second // not const so we can override with tests
 	are not at peer limits, we can probably switch to consensus reactor
 */

-// BlockPool keeps track of the block sync peers, block requests and block responses.
+// BlockPool keeps track of the fast sync peers, block requests and block responses.
 type BlockPool struct {
 	service.BaseService
 	startTime time.Time
@@ -410,7 +410,6 @@ func (pool *BlockPool) sendError(err error, peerID p2p.ID) {
 }

 // for debugging purposes
-//
 //nolint:unused
 func (pool *BlockPool) debug() string {
 	pool.mtx.Lock()
--- a/blockchain/pool_test.go
+++ b/blockchain/pool_test.go
@@ -1,4 +1,4 @@
-package blocksync
+package blockchain

 import (
 	"fmt"
--- a/blockchain/reactor.go
+++ b/blockchain/reactor.go
@@ -1,4 +1,4 @@
-package blocksync
+package blockchain

 import (
 	"fmt"
@@ -7,15 +7,15 @@ import (

 	"github.com/tendermint/tendermint/libs/log"
 	"github.com/tendermint/tendermint/p2p"
-	bcproto "github.com/tendermint/tendermint/proto/tendermint/blocksync"
+	bcproto "github.com/tendermint/tendermint/proto/tendermint/blockchain"
 	sm "github.com/tendermint/tendermint/state"
 	"github.com/tendermint/tendermint/store"
 	"github.com/tendermint/tendermint/types"
 )

 const (
-	// BlocksyncChannel is a channel for blocks and status updates (`BlockStore` height)
-	BlocksyncChannel = byte(0x40)
+	// BlockchainChannel is a channel for blocks and status updates (`BlockStore` height)
+	BlockchainChannel = byte(0x40)

 	trySyncIntervalMS = 10

@@ -30,7 +30,7 @@ const (
 )

 type consensusReactor interface {
-	// for when we switch from blockchain reactor and block sync to
+	// for when we switch from blockchain reactor and fast sync to
 	// the consensus machine
 	SwitchToConsensus(state sm.State, skipWAL bool)
 }
@@ -54,7 +54,7 @@ type Reactor struct {
 	blockExec *sm.BlockExecutor
 	store     *store.BlockStore
 	pool      *BlockPool
-	blockSync bool
+	fastSync  bool

 	requestsCh <-chan BlockRequest
 	errorsCh   <-chan peerError
@@ -62,7 +62,7 @@ type Reactor struct {

 // NewReactor returns new reactor instance.
 func NewReactor(state sm.State, blockExec *sm.BlockExecutor, store *store.BlockStore,
-	blockSync bool) *Reactor {
+	fastSync bool) *Reactor {

 	if state.LastBlockHeight != store.Height() {
 		panic(fmt.Sprintf("state (%v) and store (%v) height mismatch", state.LastBlockHeight,
@@ -85,7 +85,7 @@ func NewReactor(state sm.State, blockExec *sm.BlockExecutor, store *store.BlockS
 		blockExec:    blockExec,
 		store:        store,
 		pool:         pool,
-		blockSync:    blockSync,
+		fastSync:     fastSync,
 		requestsCh:   requestsCh,
 		errorsCh:     errorsCh,
 	}
@@ -101,7 +101,7 @@ func (bcR *Reactor) SetLogger(l log.Logger) {

 // OnStart implements service.Service.
 func (bcR *Reactor) OnStart() error {
-	if bcR.blockSync {
+	if bcR.fastSync {
 		err := bcR.pool.Start()
 		if err != nil {
 			return err
@@ -111,9 +111,9 @@ func (bcR *Reactor) OnStart() error {
 	return nil
 }

-// SwitchToBlockSync is called by the state sync reactor when switching to block sync.
-func (bcR *Reactor) SwitchToBlockSync(state sm.State) error {
-	bcR.blockSync = true
+// SwitchToFastSync is called by the state sync reactor when switching to fast sync.
+func (bcR *Reactor) SwitchToFastSync(state sm.State) error {
+	bcR.fastSync = true
 	bcR.initialState = state

 	bcR.pool.height = state.LastBlockHeight + 1
@@ -127,7 +127,7 @@ func (bcR *Reactor) SwitchToBlockSync(state sm.State) error {

 // OnStop implements service.Service.
 func (bcR *Reactor) OnStop() {
-	if bcR.blockSync {
+	if bcR.fastSync {
 		if err := bcR.pool.Stop(); err != nil {
 			bcR.Logger.Error("Error stopping pool", "err", err)
 		}
@@ -138,7 +138,7 @@ func (bcR *Reactor) OnStop() {
 func (bcR *Reactor) GetChannels() []*p2p.ChannelDescriptor {
 	return []*p2p.ChannelDescriptor{
 		{
-			ID:                  BlocksyncChannel,
+			ID:                  BlockchainChannel,
 			Priority:            5,
 			SendQueueCapacity:   1000,
 			RecvBufferCapacity:  50 * 4096,
@@ -157,7 +157,7 @@ func (bcR *Reactor) AddPeer(peer p2p.Peer) {
 		return
 	}

-	peer.Send(BlocksyncChannel, msgBytes)
+	peer.Send(BlockchainChannel, msgBytes)
 	// it's OK if send fails. will try later in poolRoutine

 	// peer is added to the pool once we receive the first
@@ -188,7 +188,7 @@ func (bcR *Reactor) respondToPeer(msg *bcproto.BlockRequest,
 			return false
 		}

-		return src.TrySend(BlocksyncChannel, msgBytes)
+		return src.TrySend(BlockchainChannel, msgBytes)
 	}

 	bcR.Logger.Info("Peer asking for a block we don't have", "src", src, "height", msg.Height)
@@ -199,7 +199,7 @@ func (bcR *Reactor) respondToPeer(msg *bcproto.BlockRequest,
 		return false
 	}

-	return src.TrySend(BlocksyncChannel, msgBytes)
+	return src.TrySend(BlockchainChannel, msgBytes)
 }

 // Receive implements Reactor by handling 4 types of messages (look below).
@@ -239,7 +239,7 @@ func (bcR *Reactor) Receive(chID byte, src p2p.Peer, msgBytes []byte) {
 			bcR.Logger.Error("could not convert msg to protobut", "err", err)
 			return
 		}
-		src.TrySend(BlocksyncChannel, msgBytes)
+		src.TrySend(BlockchainChannel, msgBytes)
 	case *bcproto.StatusResponse:
 		// Got a peer status. Unverified.
 		bcR.pool.SetPeerRange(src.ID(), msg.Base, msg.Height)
@@ -291,7 +291,7 @@ func (bcR *Reactor) poolRoutine(stateSynced bool) {
 					continue
 				}

-				queued := peer.TrySend(BlocksyncChannel, msgBytes)
+				queued := peer.TrySend(BlockchainChannel, msgBytes)
 				if !queued {
 					bcR.Logger.Debug("Send queue is full, drop block request", "peer", peer.ID(), "height", request.Height)
 				}
@@ -303,7 +303,7 @@ func (bcR *Reactor) poolRoutine(stateSynced bool) {

 			case <-statusUpdateTicker.C:
 				// ask for status updates
-				go bcR.BroadcastStatusRequest() //nolint: errcheck
+				go bcR.BroadcastStatusRequest() // nolint: errcheck

 			}
 		}
@@ -359,20 +359,14 @@ FOR_LOOP:
 				didProcessCh <- struct{}{}
 			}

-			firstParts, err := first.MakePartSet(types.BlockPartSizeBytes)
-			if err != nil {
-				bcR.Logger.Error("failed to make ",
-					"height", first.Height,
-					"err", err.Error())
-				break FOR_LOOP
-			}
+			firstParts := first.MakePartSet(types.BlockPartSizeBytes)
 			firstPartSetHeader := firstParts.Header()
 			firstID := types.BlockID{Hash: first.Hash(), PartSetHeader: firstPartSetHeader}
 			// Finally, verify the first block using the second's commit
 			// NOTE: we can probably make this more efficient, but note that calling
 			// first.Hash() doesn't verify the tx contents, so MakePartSet() is
 			// currently necessary.
-			err = state.Validators.VerifyCommitLight(
+			err := state.Validators.VerifyCommitLight(
 				chainID, firstID, first.Height, second.LastCommit)

 			if err == nil {
@@ -406,7 +400,7 @@ FOR_LOOP:

 			// TODO: same thing for app - but we would need a way to
 			// get the hash without persisting the state
-			state, err = bcR.blockExec.ApplyBlock(state, firstID, first)
+			state, _, err = bcR.blockExec.ApplyBlock(state, firstID, first)
 			if err != nil {
 				// TODO This is bad, are we zombie?
 				panic(fmt.Sprintf("Failed to process committed block (%d:%X): %v", first.Height, first.Hash(), err))
@@ -415,7 +409,7 @@ FOR_LOOP:

 			if blocksSynced%100 == 0 {
 				lastRate = 0.9*lastRate + 0.1*(100/time.Since(lastHundred).Seconds())
-				bcR.Logger.Info("Block Sync Rate", "height", bcR.pool.height,
+				bcR.Logger.Info("Fast Sync Rate", "height", bcR.pool.height,
 					"max_peer_height", bcR.pool.MaxPeerHeight(), "blocks/s", lastRate)
 				lastHundred = time.Now()
 			}
@@ -436,7 +430,7 @@ func (bcR *Reactor) BroadcastStatusRequest() error {
 		return fmt.Errorf("could not convert msg to proto: %w", err)
 	}

-	bcR.Switch.Broadcast(BlocksyncChannel, bm)
+	bcR.Switch.Broadcast(BlockchainChannel, bm)

 	return nil
 }
--- a/blockchain/reactor_test.go
+++ b/blockchain/reactor_test.go
@@ -1,4 +1,4 @@
-package blocksync
+package blockchain

 import (
 	"fmt"
@@ -8,16 +8,14 @@ import (
 	"time"

 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

 	dbm "github.com/tendermint/tm-db"

 	abci "github.com/tendermint/tendermint/abci/types"
 	cfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/test"
 	"github.com/tendermint/tendermint/libs/log"
-	mpmocks "github.com/tendermint/tendermint/mempool/mocks"
+	"github.com/tendermint/tendermint/mempool/mock"
 	"github.com/tendermint/tendermint/p2p"
 	"github.com/tendermint/tendermint/proxy"
 	sm "github.com/tendermint/tendermint/state"
@@ -43,7 +41,7 @@ func randGenesisDoc(numValidators int, randPower bool, minPower int64) (*types.G

 	return &types.GenesisDoc{
 		GenesisTime: tmtime.Now(),
-		ChainID:     test.DefaultTestChainID,
+		ChainID:     config.ChainID(),
 		Validators:  validators,
 	}, privValidators
 }
@@ -54,7 +52,6 @@ type ReactorPair struct {
 }

 func newReactor(
-	t *testing.T,
 	logger log.Logger,
 	genDoc *types.GenesisDoc,
 	privVals []types.PrivValidator,
@@ -65,7 +62,7 @@ func newReactor(

 	app := &testApp{}
 	cc := proxy.NewLocalClientCreator(app)
-	proxyApp := proxy.NewAppConns(cc, proxy.NopMetrics())
+	proxyApp := proxy.NewAppConns(cc)
 	err := proxyApp.Start()
 	if err != nil {
 		panic(fmt.Errorf("error start app: %w", err))
@@ -73,9 +70,7 @@ func newReactor(

 	blockDB := dbm.NewMemDB()
 	stateDB := dbm.NewMemDB()
-	stateStore := sm.NewStore(stateDB, sm.StoreOptions{
-		DiscardABCIResponses: false,
-	})
+	stateStore := sm.NewStore(stateDB)
 	blockStore := store.NewBlockStore(blockDB)

 	state, err := stateStore.LoadFromDBOrGenesisDoc(genDoc)
@@ -83,28 +78,14 @@ func newReactor(
 		panic(fmt.Errorf("error constructing state from genesis file: %w", err))
 	}

-	mp := &mpmocks.Mempool{}
-	mp.On("Lock").Return()
-	mp.On("Unlock").Return()
-	mp.On("FlushAppConn", mock.Anything).Return(nil)
-	mp.On("Update",
-		mock.Anything,
-		mock.Anything,
-		mock.Anything,
-		mock.Anything,
-		mock.Anything,
-		mock.Anything).Return(nil)
-
 	// Make the Reactor itself.
 	// NOTE we have to create and commit the blocks first because
 	// pool.height is determined from the store.
 	fastSync := true
 	db := dbm.NewMemDB()
-	stateStore = sm.NewStore(db, sm.StoreOptions{
-		DiscardABCIResponses: false,
-	})
+	stateStore = sm.NewStore(db)
 	blockExec := sm.NewBlockExecutor(stateStore, log.TestingLogger(), proxyApp.Consensus(),
-		mp, sm.EmptyEvidencePool{}, blockStore)
+		mock.Mempool{}, sm.EmptyEvidencePool{})
 	if err = stateStore.Save(state); err != nil {
 		panic(err)
 	}
@@ -131,13 +112,12 @@ func newReactor(
 				lastBlockMeta.BlockID, []types.CommitSig{vote.CommitSig()})
 		}

-		thisBlock := state.MakeBlock(blockHeight, nil, lastCommit, nil, state.Validators.Proposer.Address)
+		thisBlock := makeBlock(blockHeight, state, lastCommit)

-		thisParts, err := thisBlock.MakePartSet(types.BlockPartSizeBytes)
-		require.NoError(t, err)
+		thisParts := thisBlock.MakePartSet(types.BlockPartSizeBytes)
 		blockID := types.BlockID{Hash: thisBlock.Hash(), PartSetHeader: thisParts.Header()}

-		state, err = blockExec.ApplyBlock(state, blockID, thisBlock)
+		state, _, err = blockExec.ApplyBlock(state, blockID, thisBlock)
 		if err != nil {
 			panic(fmt.Errorf("error apply block: %w", err))
 		}
@@ -152,7 +132,7 @@ func newReactor(
 }

 func TestNoBlockResponse(t *testing.T) {
-	config = test.ResetTestRoot("blockchain_reactor_test")
+	config = cfg.ResetTestRoot("blockchain_reactor_test")
 	defer os.RemoveAll(config.RootDir)
 	genDoc, privVals := randGenesisDoc(1, false, 30)

@@ -160,8 +140,8 @@ func TestNoBlockResponse(t *testing.T) {

 	reactorPairs := make([]ReactorPair, 2)

-	reactorPairs[0] = newReactor(t, log.TestingLogger(), genDoc, privVals, maxBlockHeight)
-	reactorPairs[1] = newReactor(t, log.TestingLogger(), genDoc, privVals, 0)
+	reactorPairs[0] = newReactor(log.TestingLogger(), genDoc, privVals, maxBlockHeight)
+	reactorPairs[1] = newReactor(log.TestingLogger(), genDoc, privVals, 0)

 	p2p.MakeConnectedSwitches(config.P2P, 2, func(i int, s *p2p.Switch) *p2p.Switch {
 		s.AddReactor("BLOCKCHAIN", reactorPairs[i].reactor)
@@ -214,7 +194,7 @@ func TestNoBlockResponse(t *testing.T) {
 // Alternatively we could actually dial a TCP conn but
 // that seems extreme.
 func TestBadBlockStopsPeer(t *testing.T) {
-	config = test.ResetTestRoot("blockchain_reactor_test")
+	config = cfg.ResetTestRoot("blockchain_reactor_test")
 	defer os.RemoveAll(config.RootDir)
 	genDoc, privVals := randGenesisDoc(1, false, 30)

@@ -222,7 +202,7 @@ func TestBadBlockStopsPeer(t *testing.T) {

 	// Other chain needs a different validator set
 	otherGenDoc, otherPrivVals := randGenesisDoc(1, false, 30)
-	otherChain := newReactor(t, log.TestingLogger(), otherGenDoc, otherPrivVals, maxBlockHeight)
+	otherChain := newReactor(log.TestingLogger(), otherGenDoc, otherPrivVals, maxBlockHeight)

 	defer func() {
 		err := otherChain.reactor.Stop()
@@ -233,10 +213,10 @@ func TestBadBlockStopsPeer(t *testing.T) {

 	reactorPairs := make([]ReactorPair, 4)

-	reactorPairs[0] = newReactor(t, log.TestingLogger(), genDoc, privVals, maxBlockHeight)
-	reactorPairs[1] = newReactor(t, log.TestingLogger(), genDoc, privVals, 0)
-	reactorPairs[2] = newReactor(t, log.TestingLogger(), genDoc, privVals, 0)
-	reactorPairs[3] = newReactor(t, log.TestingLogger(), genDoc, privVals, 0)
+	reactorPairs[0] = newReactor(log.TestingLogger(), genDoc, privVals, maxBlockHeight)
+	reactorPairs[1] = newReactor(log.TestingLogger(), genDoc, privVals, 0)
+	reactorPairs[2] = newReactor(log.TestingLogger(), genDoc, privVals, 0)
+	reactorPairs[3] = newReactor(log.TestingLogger(), genDoc, privVals, 0)

 	switches := p2p.MakeConnectedSwitches(config.P2P, 4, func(i int, s *p2p.Switch) *p2p.Switch {
 		s.AddReactor("BLOCKCHAIN", reactorPairs[i].reactor)
@@ -274,7 +254,7 @@ func TestBadBlockStopsPeer(t *testing.T) {
 	// race, but can't be easily avoided.
 	reactorPairs[3].reactor.store = otherChain.reactor.store

-	lastReactorPair := newReactor(t, log.TestingLogger(), genDoc, privVals, 0)
+	lastReactorPair := newReactor(log.TestingLogger(), genDoc, privVals, 0)
 	reactorPairs = append(reactorPairs, lastReactorPair)

 	switches = append(switches, p2p.MakeConnectedSwitches(config.P2P, 1, func(i int, s *p2p.Switch) *p2p.Switch {
@@ -298,6 +278,21 @@ func TestBadBlockStopsPeer(t *testing.T) {
 	assert.True(t, lastReactorPair.reactor.Switch.Peers().Size() < len(reactorPairs)-1)
 }

+//----------------------------------------------
+// utility funcs
+
+func makeTxs(height int64) (txs []types.Tx) {
+	for i := 0; i < 10; i++ {
+		txs = append(txs, types.Tx([]byte{byte(height), byte(i)}))
+	}
+	return txs
+}
+
+func makeBlock(height int64, state sm.State, lastCommit *types.Commit) *types.Block {
+	block, _ := state.MakeBlock(height, makeTxs(height), lastCommit, nil, state.Validators.GetProposer().Address)
+	return block
+}
+
 type testApp struct {
 	abci.BaseApplication
 }
--- a/buf.gen.yaml
+++ b/buf.gen.yaml
@@ -3,7 +3,7 @@ plugins:
  - name: gogofaster
    out: ./proto/
    opt:
-      - Mgoogle/protobuf/timestamp.proto=github.com/cosmos/gogoproto/types
+      - Mgoogle/protobuf/timestamp.proto=github.com/gogo/protobuf/types
      - Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration
      - plugins=grpc
      - paths=source_relative
--- a/buf.yaml
+++ b/buf.yaml
@@ -1,6 +1,7 @@
 build:
  roots:
    - proto
+    - third_party/proto
 lint:
  use:
    - BASIC
--- a/cmd/tendermint/commands/debug/dump.go
+++ b/cmd/tendermint/commands/debug/dump.go
@@ -3,6 +3,7 @@ package debug
 import (
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"time"
@@ -81,7 +82,7 @@ func dumpCmdHandler(_ *cobra.Command, args []string) error {
 func dumpDebugData(outDir string, conf *cfg.Config, rpc *rpchttp.HTTP) {
 	start := time.Now().UTC()

-	tmpDir, err := os.MkdirTemp(outDir, "tendermint_debug_tmp")
+	tmpDir, err := ioutil.TempDir(outDir, "tendermint_debug_tmp")
 	if err != nil {
 		logger.Error("failed to create temporary directory", "dir", tmpDir, "error", err)
 		return
--- a/cmd/tendermint/commands/debug/io.go
+++ b/cmd/tendermint/commands/debug/io.go
@@ -5,6 +5,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
+	"io/ioutil"
 	"os"
 	"path"
 	"path/filepath"
@@ -110,5 +111,5 @@ func writeStateJSONToFile(state interface{}, dir, filename string) error {
 		return fmt.Errorf("failed to encode state dump: %w", err)
 	}

-	return os.WriteFile(path.Join(dir, filename), stateJSON, os.ModePerm)
+	return ioutil.WriteFile(path.Join(dir, filename), stateJSON, os.ModePerm)
 }
--- a/cmd/tendermint/commands/debug/kill.go
+++ b/cmd/tendermint/commands/debug/kill.go
@@ -3,6 +3,7 @@ package debug
 import (
 	"errors"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"os/exec"
 	"path/filepath"
@@ -55,7 +56,7 @@ func killCmdHandler(cmd *cobra.Command, args []string) error {

 	// Create a temporary directory which will contain all the state dumps and
 	// relevant files and directories that will be compressed into a file.
-	tmpDir, err := os.MkdirTemp(os.TempDir(), "tendermint_debug_tmp")
+	tmpDir, err := ioutil.TempDir(os.TempDir(), "tendermint_debug_tmp")
 	if err != nil {
 		return fmt.Errorf("failed to create temporary directory: %w", err)
 	}
@@ -104,7 +105,7 @@ func killProc(pid uint64, dir string) error {
 	// pipe STDERR output from tailing the Tendermint process to a file
 	//
 	// NOTE: This will only work on UNIX systems.
-	cmd := exec.Command("tail", "-f", fmt.Sprintf("/proc/%d/fd/2", pid)) //nolint: gosec
+	cmd := exec.Command("tail", "-f", fmt.Sprintf("/proc/%d/fd/2", pid)) // nolint: gosec

 	outFile, err := os.Create(filepath.Join(dir, "stacktrace.out"))
 	if err != nil {
--- a/cmd/tendermint/commands/debug/util.go
+++ b/cmd/tendermint/commands/debug/util.go
@@ -3,7 +3,7 @@ package debug
 import (
 	"context"
 	"fmt"
-	"io"
+	"io/ioutil"
 	"net/http"
 	"os"
 	"path"
@@ -67,16 +67,16 @@ func copyConfig(home, dir string) error {
 func dumpProfile(dir, addr, profile string, debug int) error {
 	endpoint := fmt.Sprintf("%s/debug/pprof/%s?debug=%d", addr, profile, debug)

-	resp, err := http.Get(endpoint) //nolint: gosec
+	resp, err := http.Get(endpoint) // nolint: gosec
 	if err != nil {
 		return fmt.Errorf("failed to query for %s profile: %w", profile, err)
 	}
 	defer resp.Body.Close()

-	body, err := io.ReadAll(resp.Body)
+	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
 		return fmt.Errorf("failed to read %s profile response body: %w", profile, err)
 	}

-	return os.WriteFile(path.Join(dir, fmt.Sprintf("%s.out", profile)), body, os.ModePerm)
+	return ioutil.WriteFile(path.Join(dir, fmt.Sprintf("%s.out", profile)), body, os.ModePerm)
 }
--- a/cmd/tendermint/commands/reindex_event.go
+++ b/cmd/tendermint/commands/reindex_event.go
@@ -40,9 +40,6 @@ replace the backend. The default start-height is 0, meaning the tooling will sta
 reindex from the base block height(inclusive); and the default end-height is 0, meaning 
 the tooling will reindex until the latest block height(inclusive). User can omit
 either or both arguments.
-
-Note: This operation requires ABCI Responses. Do not set DiscardABCIResponses to true if you
-want to use this command.
 	`,
 	Example: `
 	tendermint reindex-event
@@ -57,18 +54,12 @@ want to use this command.
 			return
 		}

-		state, err := ss.Load()
-		if err != nil {
-			fmt.Println(reindexFailed, err)
-			return
-		}
-
 		if err := checkValidHeight(bs); err != nil {
 			fmt.Println(reindexFailed, err)
 			return
 		}

-		bi, ti, err := loadEventSinks(config, state.ChainID)
+		bi, ti, err := loadEventSinks(config)
 		if err != nil {
 			fmt.Println(reindexFailed, err)
 			return
@@ -100,7 +91,7 @@ func init() {
 	ReIndexEventCmd.Flags().Int64Var(&endHeight, "end-height", 0, "the block height would like to finish for re-index")
 }

-func loadEventSinks(cfg *tmcfg.Config, chainID string) (indexer.BlockIndexer, txindex.TxIndexer, error) {
+func loadEventSinks(cfg *tmcfg.Config) (indexer.BlockIndexer, txindex.TxIndexer, error) {
 	switch strings.ToLower(cfg.TxIndex.Indexer) {
 	case "null":
 		return nil, nil, errors.New("found null event sink, please check the tx-index section in the config.toml")
@@ -109,7 +100,7 @@ func loadEventSinks(cfg *tmcfg.Config, chainID string) (indexer.BlockIndexer, tx
 		if conn == "" {
 			return nil, nil, errors.New("the psql connection settings cannot be empty")
 		}
-		es, err := psql.NewEventSink(conn, chainID)
+		es, err := psql.NewEventSink(conn, cfg.ChainID())
 		if err != nil {
 			return nil, nil, err
 		}
--- a/cmd/tendermint/commands/reindex_event_test.go
+++ b/cmd/tendermint/commands/reindex_event_test.go
@@ -9,16 +9,14 @@ import (
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"

-	dbm "github.com/tendermint/tm-db"
-
 	abcitypes "github.com/tendermint/tendermint/abci/types"
 	tmcfg "github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/test"
 	prototmstate "github.com/tendermint/tendermint/proto/tendermint/state"
 	blockmocks "github.com/tendermint/tendermint/state/indexer/mocks"
 	"github.com/tendermint/tendermint/state/mocks"
 	txmocks "github.com/tendermint/tendermint/state/txindex/mocks"
 	"github.com/tendermint/tendermint/types"
+	dbm "github.com/tendermint/tm-db"
 )

 const (
@@ -99,7 +97,7 @@ func TestLoadEventSink(t *testing.T) {
 		cfg := tmcfg.TestConfig()
 		cfg.TxIndex.Indexer = tc.sinks
 		cfg.TxIndex.PsqlConn = tc.connURL
-		_, _, err := loadEventSinks(cfg, test.DefaultTestChainID)
+		_, _, err := loadEventSinks(cfg)
 		if tc.loadErr {
 			require.Error(t, err, idx)
 		} else {
--- a/cmd/tendermint/commands/rollback.go
+++ b/cmd/tendermint/commands/rollback.go
@@ -14,12 +14,6 @@ import (
 	"github.com/tendermint/tendermint/store"
 )

-var removeBlock bool = false
-
-func init() {
-	RollbackStateCmd.Flags().BoolVar(&removeBlock, "hard", false, "remove last block as well as state")
-}
-
 var RollbackStateCmd = &cobra.Command{
 	Use:   "rollback",
 	Short: "rollback tendermint state by one height",
@@ -27,23 +21,17 @@ var RollbackStateCmd = &cobra.Command{
 A state rollback is performed to recover from an incorrect application state transition,
 when Tendermint has persisted an incorrect app hash and is thus unable to make
 progress. Rollback overwrites a state at height n with the state at height n - 1.
-The application should also roll back to height n - 1. If the --hard flag is not used, 
-no blocks will be removed so upon restarting Tendermint the transactions in block n will be 
-re-executed against the application. Using --hard will also remove block n. This can
-be done multiple times.
+The application should also roll back to height n - 1. No blocks are removed, so upon
+restarting Tendermint the transactions in block n will be re-executed against the
+application.
 `,
 	RunE: func(cmd *cobra.Command, args []string) error {
-		height, hash, err := RollbackState(config, removeBlock)
+		height, hash, err := RollbackState(config)
 		if err != nil {
 			return fmt.Errorf("failed to rollback state: %w", err)
 		}

-		if removeBlock {
-			fmt.Printf("Rolled back both state and block to height %d and hash %X\n", height, hash)
-		} else {
-			fmt.Printf("Rolled back state to height %d and hash %X\n", height, hash)
-		}
-
+		fmt.Printf("Rolled back state to height %d and hash %v", height, hash)
 		return nil
 	},
 }
@@ -51,7 +39,7 @@ be done multiple times.
 // RollbackState takes the state at the current height n and overwrites it with the state
 // at height n - 1. Note state here refers to tendermint state not application state.
 // Returns the latest state height and app hash alongside an error if there was one.
-func RollbackState(config *cfg.Config, removeBlock bool) (int64, []byte, error) {
+func RollbackState(config *cfg.Config) (int64, []byte, error) {
 	// use the parsed config to load the block and state store
 	blockStore, stateStore, err := loadStateAndBlockStore(config)
 	if err != nil {
@@ -63,7 +51,7 @@ func RollbackState(config *cfg.Config, removeBlock bool) (int64, []byte, error)
 	}()

 	// rollback the last state
-	return state.Rollback(blockStore, stateStore, removeBlock)
+	return state.Rollback(blockStore, stateStore)
 }

 func loadStateAndBlockStore(config *cfg.Config) (*store.BlockStore, state.Store, error) {
@@ -89,9 +77,7 @@ func loadStateAndBlockStore(config *cfg.Config) (*store.BlockStore, state.Store,
 	if err != nil {
 		return nil, nil, err
 	}
-	stateStore := state.NewStore(stateDB, state.StoreOptions{
-		DiscardABCIResponses: config.Storage.DiscardABCIResponses,
-	})
+	stateStore := state.NewStore(stateDB)

 	return blockStore, stateStore, nil
 }
--- a/cmd/tendermint/commands/root.go
+++ b/cmd/tendermint/commands/root.go
@@ -53,11 +53,6 @@ func ParseConfig(cmd *cobra.Command) (*cfg.Config, error) {
 	if err := conf.ValidateBasic(); err != nil {
 		return nil, fmt.Errorf("error in config file: %v", err)
 	}
-	if warnings := conf.CheckDeprecated(); len(warnings) > 0 {
-		for _, warning := range warnings {
-			logger.Info("deprecated usage found in configuration file", "usage", warning)
-		}
-	}
 	return conf, nil
 }

--- a/cmd/tendermint/commands/root_test.go
+++ b/cmd/tendermint/commands/root_test.go
@@ -2,6 +2,7 @@ package commands

 import (
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -167,5 +168,5 @@ func WriteConfigVals(dir string, vals map[string]string) error {
 		data += fmt.Sprintf("%s = \"%s\"\n", k, v)
 	}
 	cfile := filepath.Join(dir, "config.toml")
-	return os.WriteFile(cfile, []byte(data), 0600)
+	return ioutil.WriteFile(cfile, []byte(data), 0600)
 }
--- a/cmd/tendermint/commands/run_node.go
+++ b/cmd/tendermint/commands/run_node.go
@@ -31,7 +31,7 @@ func AddNodeFlags(cmd *cobra.Command) {
 		"socket address to listen on for connections from external priv_validator process")

 	// node flags
-	cmd.Flags().Bool("block_sync", config.BlockSyncMode, "sync the block chain using the blocksync algorithm")
+	cmd.Flags().Bool("fast_sync", config.FastSyncMode, "fast blockchain syncing")
 	cmd.Flags().BytesHexVar(
 		&genesisHash,
 		"genesis_hash",
--- a/cmd/tendermint/commands/version.go
+++ b/cmd/tendermint/commands/version.go
@@ -1,7 +1,6 @@
 package commands

 import (
-	"encoding/json"
 	"fmt"

 	"github.com/spf13/cobra"
@@ -14,30 +13,6 @@ var VersionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Show version info",
 	Run: func(cmd *cobra.Command, args []string) {
-		tmVersion := version.TMCoreSemVer
-		if version.TMGitCommitHash != "" {
-			tmVersion += "+" + version.TMGitCommitHash
-		}
-
-		if verbose {
-			values, _ := json.MarshalIndent(struct {
-				Tendermint    string `json:"tendermint"`
-				ABCI          string `json:"abci"`
-				BlockProtocol uint64 `json:"block_protocol"`
-				P2PProtocol   uint64 `json:"p2p_protocol"`
-			}{
-				Tendermint:    tmVersion,
-				ABCI:          version.ABCISemVer,
-				BlockProtocol: version.BlockProtocol,
-				P2PProtocol:   version.P2PProtocol,
-			}, "", "  ")
-			fmt.Println(string(values))
-		} else {
-			fmt.Println(tmVersion)
-		}
+		fmt.Println(version.TMCoreSemVer)
 	},
 }
-
-func init() {
-	VersionCmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "Show protocol and library versions")
-}
--- a/config/config.go
+++ b/config/config.go
@@ -7,10 +7,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
-	"regexp"
 	"time"
-
-	"github.com/tendermint/tendermint/version"
 )

 const (
@@ -31,19 +28,6 @@ const (
 	// Default is v0.
 	MempoolV0 = "v0"
 	MempoolV1 = "v1"
-
-	DefaultTendermintDir = ".tendermint"
-	DefaultConfigDir     = "config"
-	DefaultDataDir       = "data"
-
-	DefaultConfigFileName  = "config.toml"
-	DefaultGenesisJSONName = "genesis.json"
-
-	DefaultPrivValKeyName   = "priv_validator_key.json"
-	DefaultPrivValStateName = "priv_validator_state.json"
-
-	DefaultNodeKeyName  = "node_key.json"
-	DefaultAddrBookName = "addrbook.json"
 )

 // NOTE: Most of the structs & relevant comments + the
@@ -53,19 +37,29 @@ const (
 // config/toml.go
 // NOTE: libs/cli must know to look in the config dir!
 var (
-	defaultConfigFilePath   = filepath.Join(DefaultConfigDir, DefaultConfigFileName)
-	defaultGenesisJSONPath  = filepath.Join(DefaultConfigDir, DefaultGenesisJSONName)
-	defaultPrivValKeyPath   = filepath.Join(DefaultConfigDir, DefaultPrivValKeyName)
-	defaultPrivValStatePath = filepath.Join(DefaultDataDir, DefaultPrivValStateName)
+	DefaultTendermintDir = ".tendermint"
+	defaultConfigDir     = "config"
+	defaultDataDir       = "data"

-	defaultNodeKeyPath  = filepath.Join(DefaultConfigDir, DefaultNodeKeyName)
-	defaultAddrBookPath = filepath.Join(DefaultConfigDir, DefaultAddrBookName)
+	defaultConfigFileName  = "config.toml"
+	defaultGenesisJSONName = "genesis.json"
+
+	defaultPrivValKeyName   = "priv_validator_key.json"
+	defaultPrivValStateName = "priv_validator_state.json"
+
+	defaultNodeKeyName  = "node_key.json"
+	defaultAddrBookName = "addrbook.json"
+
+	defaultConfigFilePath   = filepath.Join(defaultConfigDir, defaultConfigFileName)
+	defaultGenesisJSONPath  = filepath.Join(defaultConfigDir, defaultGenesisJSONName)
+	defaultPrivValKeyPath   = filepath.Join(defaultConfigDir, defaultPrivValKeyName)
+	defaultPrivValStatePath = filepath.Join(defaultDataDir, defaultPrivValStateName)
+
+	defaultNodeKeyPath  = filepath.Join(defaultConfigDir, defaultNodeKeyName)
+	defaultAddrBookPath = filepath.Join(defaultConfigDir, defaultAddrBookName)

 	minSubscriptionBufferSize     = 100
 	defaultSubscriptionBufferSize = 200
-
-	// taken from https://semver.org/
-	semverRegexp = regexp.MustCompile(`^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)\.(?P<patch>0|[1-9]\d*)(?:-(?P<prerelease>(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$`)
 )

 // Config defines the top level configuration for a Tendermint node
@@ -78,9 +72,8 @@ type Config struct {
 	P2P             *P2PConfig             `mapstructure:"p2p"`
 	Mempool         *MempoolConfig         `mapstructure:"mempool"`
 	StateSync       *StateSyncConfig       `mapstructure:"statesync"`
-	BlockSync       *BlockSyncConfig       `mapstructure:"blocksync"`
+	FastSync        *FastSyncConfig        `mapstructure:"fastsync"`
 	Consensus       *ConsensusConfig       `mapstructure:"consensus"`
-	Storage         *StorageConfig         `mapstructure:"storage"`
 	TxIndex         *TxIndexConfig         `mapstructure:"tx_index"`
 	Instrumentation *InstrumentationConfig `mapstructure:"instrumentation"`
 }
@@ -93,9 +86,8 @@ func DefaultConfig() *Config {
 		P2P:             DefaultP2PConfig(),
 		Mempool:         DefaultMempoolConfig(),
 		StateSync:       DefaultStateSyncConfig(),
-		BlockSync:       DefaultBlockSyncConfig(),
+		FastSync:        DefaultFastSyncConfig(),
 		Consensus:       DefaultConsensusConfig(),
-		Storage:         DefaultStorageConfig(),
 		TxIndex:         DefaultTxIndexConfig(),
 		Instrumentation: DefaultInstrumentationConfig(),
 	}
@@ -109,9 +101,8 @@ func TestConfig() *Config {
 		P2P:             TestP2PConfig(),
 		Mempool:         TestMempoolConfig(),
 		StateSync:       TestStateSyncConfig(),
-		BlockSync:       TestBlockSyncConfig(),
+		FastSync:        TestFastSyncConfig(),
 		Consensus:       TestConsensusConfig(),
-		Storage:         TestStorageConfig(),
 		TxIndex:         TestTxIndexConfig(),
 		Instrumentation: TestInstrumentationConfig(),
 	}
@@ -145,8 +136,8 @@ func (cfg *Config) ValidateBasic() error {
 	if err := cfg.StateSync.ValidateBasic(); err != nil {
 		return fmt.Errorf("error in [statesync] section: %w", err)
 	}
-	if err := cfg.BlockSync.ValidateBasic(); err != nil {
-		return fmt.Errorf("error in [blocksync] section: %w", err)
+	if err := cfg.FastSync.ValidateBasic(); err != nil {
+		return fmt.Errorf("error in [fastsync] section: %w", err)
 	}
 	if err := cfg.Consensus.ValidateBasic(); err != nil {
 		return fmt.Errorf("error in [consensus] section: %w", err)
@@ -157,21 +148,13 @@ func (cfg *Config) ValidateBasic() error {
 	return nil
 }

-// CheckDeprecated returns any deprecation warnings. These are printed to the operator on startup
-func (cfg *Config) CheckDeprecated() []string {
-	var warnings []string
-	return warnings
-}
-
 //-----------------------------------------------------------------------------
 // BaseConfig

 // BaseConfig defines the base configuration for a Tendermint node
 type BaseConfig struct { //nolint: maligned
-
-	// The version of the Tendermint binary that created
-	// or last modified the config file
-	Version string `mapstructure:"version"`
+	// chainID is unexposed and immutable but here for convenience
+	chainID string

 	// The root directory for all data.
 	// This should be set in viper so it can unmarshal into this struct
@@ -184,10 +167,10 @@ type BaseConfig struct { //nolint: maligned
 	// A custom human readable name for this node
 	Moniker string `mapstructure:"moniker"`

-	// If this node is many blocks behind the tip of the chain, Blocksync
+	// If this node is many blocks behind the tip of the chain, FastSync
 	// allows them to catchup quickly by downloading blocks in parallel
 	// and verifying their commits
-	BlockSyncMode bool `mapstructure:"block_sync"`
+	FastSyncMode bool `mapstructure:"fast_sync"`

 	// Database backend: goleveldb | cleveldb | boltdb | rocksdb
 	// * goleveldb (github.com/syndtr/goleveldb - most popular implementation)
@@ -246,7 +229,6 @@ type BaseConfig struct { //nolint: maligned
 // DefaultBaseConfig returns a default base configuration for a Tendermint node
 func DefaultBaseConfig() BaseConfig {
 	return BaseConfig{
-		Version:            version.TMCoreSemVer,
 		Genesis:            defaultGenesisJSONPath,
 		PrivValidatorKey:   defaultPrivValKeyPath,
 		PrivValidatorState: defaultPrivValStatePath,
@@ -256,22 +238,27 @@ func DefaultBaseConfig() BaseConfig {
 		ABCI:               "socket",
 		LogLevel:           DefaultLogLevel,
 		LogFormat:          LogFormatPlain,
-		BlockSyncMode:      true,
+		FastSyncMode:       true,
 		FilterPeers:        false,
 		DBBackend:          "goleveldb",
-		DBPath:             DefaultDataDir,
+		DBPath:             "data",
 	}
 }

 // TestBaseConfig returns a base configuration for testing a Tendermint node
 func TestBaseConfig() BaseConfig {
 	cfg := DefaultBaseConfig()
+	cfg.chainID = "tendermint_test"
 	cfg.ProxyApp = "kvstore"
-	cfg.BlockSyncMode = false
+	cfg.FastSyncMode = false
 	cfg.DBBackend = "memdb"
 	return cfg
 }

+func (cfg BaseConfig) ChainID() string {
+	return cfg.chainID
+}
+
 // GenesisFile returns the full path to the genesis.json file
 func (cfg BaseConfig) GenesisFile() string {
 	return rootify(cfg.Genesis, cfg.RootDir)
@@ -300,12 +287,6 @@ func (cfg BaseConfig) DBDir() string {
 // ValidateBasic performs basic validation (checking param bounds, etc.) and
 // returns an error if any check fails.
 func (cfg BaseConfig) ValidateBasic() error {
-	// version on old config files aren't set so we can't expect it
-	// always to exist
-	if cfg.Version != "" && !semverRegexp.MatchString(cfg.Version) {
-		return fmt.Errorf("invalid version string: %s", cfg.Version)
-	}
-
 	switch cfg.LogFormat {
 	case LogFormatPlain, LogFormatJSON:
 	default:
@@ -511,7 +492,7 @@ func (cfg RPCConfig) KeyFile() string {
 	if filepath.IsAbs(path) {
 		return path
 	}
-	return rootify(filepath.Join(DefaultConfigDir, path), cfg.RootDir)
+	return rootify(filepath.Join(defaultConfigDir, path), cfg.RootDir)
 }

 func (cfg RPCConfig) CertFile() string {
@@ -519,7 +500,7 @@ func (cfg RPCConfig) CertFile() string {
 	if filepath.IsAbs(path) {
 		return path
 	}
-	return rootify(filepath.Join(DefaultConfigDir, path), cfg.RootDir)
+	return rootify(filepath.Join(defaultConfigDir, path), cfg.RootDir)
 }

 func (cfg RPCConfig) IsTLSEnabled() bool {
@@ -836,7 +817,7 @@ func DefaultStateSyncConfig() *StateSyncConfig {
 	}
 }

-// TestStateSyncConfig returns a default configuration for the state sync service
+// TestFastSyncConfig returns a default configuration for the state sync service
 func TestStateSyncConfig() *StateSyncConfig {
 	return DefaultStateSyncConfig()
 }
@@ -892,34 +873,34 @@ func (cfg *StateSyncConfig) ValidateBasic() error {
 }

 //-----------------------------------------------------------------------------
-// BlockSyncConfig
+// FastSyncConfig

-// BlockSyncConfig (formerly known as FastSync) defines the configuration for the Tendermint block sync service
-type BlockSyncConfig struct {
+// FastSyncConfig defines the configuration for the Tendermint fast sync service
+type FastSyncConfig struct {
 	Version string `mapstructure:"version"`
 }

-// DefaultBlockSyncConfig returns a default configuration for the block sync service
-func DefaultBlockSyncConfig() *BlockSyncConfig {
-	return &BlockSyncConfig{
+// DefaultFastSyncConfig returns a default configuration for the fast sync service
+func DefaultFastSyncConfig() *FastSyncConfig {
+	return &FastSyncConfig{
 		Version: "v0",
 	}
 }

-// TestBlockSyncConfig returns a default configuration for the block sync.
-func TestBlockSyncConfig() *BlockSyncConfig {
-	return DefaultBlockSyncConfig()
+// TestFastSyncConfig returns a default configuration for the fast sync.
+func TestFastSyncConfig() *FastSyncConfig {
+	return DefaultFastSyncConfig()
 }

 // ValidateBasic performs basic validation.
-func (cfg *BlockSyncConfig) ValidateBasic() error {
+func (cfg *FastSyncConfig) ValidateBasic() error {
 	switch cfg.Version {
 	case "v0":
 		return nil
 	case "v1", "v2":
-		return fmt.Errorf("blocksync version %s has been deprecated. Please use v0 instead", cfg.Version)
+		return fmt.Errorf("fast sync version %s has been deprecated. Please use v0 instead", cfg.Version)
 	default:
-		return fmt.Errorf("unknown blocksync version %s", cfg.Version)
+		return fmt.Errorf("unknown fastsync version %s", cfg.Version)
 	}
 }

@@ -968,7 +949,7 @@ type ConsensusConfig struct {
 // DefaultConsensusConfig returns a default configuration for the consensus service
 func DefaultConsensusConfig() *ConsensusConfig {
 	return &ConsensusConfig{
-		WalPath:                     filepath.Join(DefaultDataDir, "cs.wal", "wal"),
+		WalPath:                     filepath.Join(defaultDataDir, "cs.wal", "wal"),
 		TimeoutPropose:              3000 * time.Millisecond,
 		TimeoutProposeDelta:         500 * time.Millisecond,
 		TimeoutPrevote:              1000 * time.Millisecond,
@@ -1088,41 +1069,11 @@ func (cfg *ConsensusConfig) ValidateBasic() error {
 }

 //-----------------------------------------------------------------------------
-// StorageConfig
-
-// StorageConfig allows more fine-grained control over certain storage-related
-// behavior.
-type StorageConfig struct {
-	// Set to false to ensure ABCI responses are persisted. ABCI responses are
-	// required for `/block_results` RPC queries, and to reindex events in the
-	// command-line tool.
-	DiscardABCIResponses bool `mapstructure:"discard_abci_responses"`
-}
-
-// DefaultStorageConfig returns the default configuration options relating to
-// Tendermint storage optimization.
-func DefaultStorageConfig() *StorageConfig {
-	return &StorageConfig{
-		DiscardABCIResponses: false,
-	}
-}
-
-// TestStorageConfig returns storage configuration that can be used for
-// testing.
-func TestStorageConfig() *StorageConfig {
-	return &StorageConfig{
-		DiscardABCIResponses: false,
-	}
-}
-
-// -----------------------------------------------------------------------------
 // TxIndexConfig
 // Remember that Event has the following structure:
 // type: [
-//
-//	key: value,
-//	...
-//
+//  key: value,
+//  ...
 // ]
 //
 // CompositeKeys are constructed by `type.key`
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -1,4 +1,4 @@
-package config_test
+package config

 import (
 	"reflect"
@@ -7,15 +7,13 @@ import (

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/tendermint/tendermint/config"
 )

 func TestDefaultConfig(t *testing.T) {
 	assert := assert.New(t)

 	// set up some defaults
-	cfg := config.DefaultConfig()
+	cfg := DefaultConfig()
 	assert.NotNil(cfg.P2P)
 	assert.NotNil(cfg.Mempool)
 	assert.NotNil(cfg.Consensus)
@@ -33,7 +31,7 @@ func TestDefaultConfig(t *testing.T) {
 }

 func TestConfigValidateBasic(t *testing.T) {
-	cfg := config.DefaultConfig()
+	cfg := DefaultConfig()
 	assert.NoError(t, cfg.ValidateBasic())

 	// tamper with timeout_propose
@@ -43,7 +41,7 @@ func TestConfigValidateBasic(t *testing.T) {

 func TestTLSConfiguration(t *testing.T) {
 	assert := assert.New(t)
-	cfg := config.DefaultConfig()
+	cfg := DefaultConfig()
 	cfg.SetRoot("/home/user")

 	cfg.RPC.TLSCertFile = "file.crt"
@@ -58,7 +56,7 @@ func TestTLSConfiguration(t *testing.T) {
 }

 func TestBaseConfigValidateBasic(t *testing.T) {
-	cfg := config.TestBaseConfig()
+	cfg := TestBaseConfig()
 	assert.NoError(t, cfg.ValidateBasic())

 	// tamper with log format
@@ -67,7 +65,7 @@ func TestBaseConfigValidateBasic(t *testing.T) {
 }

 func TestRPCConfigValidateBasic(t *testing.T) {
-	cfg := config.TestRPCConfig()
+	cfg := TestRPCConfig()
 	assert.NoError(t, cfg.ValidateBasic())

 	fieldsToTest := []string{
@@ -88,7 +86,7 @@ func TestRPCConfigValidateBasic(t *testing.T) {
 }

 func TestP2PConfigValidateBasic(t *testing.T) {
-	cfg := config.TestP2PConfig()
+	cfg := TestP2PConfig()
 	assert.NoError(t, cfg.ValidateBasic())

 	fieldsToTest := []string{
@@ -108,7 +106,7 @@ func TestP2PConfigValidateBasic(t *testing.T) {
 }

 func TestMempoolConfigValidateBasic(t *testing.T) {
-	cfg := config.TestMempoolConfig()
+	cfg := TestMempoolConfig()
 	assert.NoError(t, cfg.ValidateBasic())

 	fieldsToTest := []string{
@@ -126,12 +124,12 @@ func TestMempoolConfigValidateBasic(t *testing.T) {
 }

 func TestStateSyncConfigValidateBasic(t *testing.T) {
-	cfg := config.TestStateSyncConfig()
+	cfg := TestStateSyncConfig()
 	require.NoError(t, cfg.ValidateBasic())
 }

-func TestBlockSyncConfigValidateBasic(t *testing.T) {
-	cfg := config.TestBlockSyncConfig()
+func TestFastSyncConfigValidateBasic(t *testing.T) {
+	cfg := TestFastSyncConfig()
 	assert.NoError(t, cfg.ValidateBasic())

 	// tamper with version
@@ -143,35 +141,35 @@ func TestBlockSyncConfigValidateBasic(t *testing.T) {
 }

 func TestConsensusConfig_ValidateBasic(t *testing.T) {
-	//nolint: lll
+	// nolint: lll
 	testcases := map[string]struct {
-		modify    func(*config.ConsensusConfig)
+		modify    func(*ConsensusConfig)
 		expectErr bool
 	}{
-		"TimeoutPropose":                       {func(c *config.ConsensusConfig) { c.TimeoutPropose = time.Second }, false},
-		"TimeoutPropose negative":              {func(c *config.ConsensusConfig) { c.TimeoutPropose = -1 }, true},
-		"TimeoutProposeDelta":                  {func(c *config.ConsensusConfig) { c.TimeoutProposeDelta = time.Second }, false},
-		"TimeoutProposeDelta negative":         {func(c *config.ConsensusConfig) { c.TimeoutProposeDelta = -1 }, true},
-		"TimeoutPrevote":                       {func(c *config.ConsensusConfig) { c.TimeoutPrevote = time.Second }, false},
-		"TimeoutPrevote negative":              {func(c *config.ConsensusConfig) { c.TimeoutPrevote = -1 }, true},
-		"TimeoutPrevoteDelta":                  {func(c *config.ConsensusConfig) { c.TimeoutPrevoteDelta = time.Second }, false},
-		"TimeoutPrevoteDelta negative":         {func(c *config.ConsensusConfig) { c.TimeoutPrevoteDelta = -1 }, true},
-		"TimeoutPrecommit":                     {func(c *config.ConsensusConfig) { c.TimeoutPrecommit = time.Second }, false},
-		"TimeoutPrecommit negative":            {func(c *config.ConsensusConfig) { c.TimeoutPrecommit = -1 }, true},
-		"TimeoutPrecommitDelta":                {func(c *config.ConsensusConfig) { c.TimeoutPrecommitDelta = time.Second }, false},
-		"TimeoutPrecommitDelta negative":       {func(c *config.ConsensusConfig) { c.TimeoutPrecommitDelta = -1 }, true},
-		"TimeoutCommit":                        {func(c *config.ConsensusConfig) { c.TimeoutCommit = time.Second }, false},
-		"TimeoutCommit negative":               {func(c *config.ConsensusConfig) { c.TimeoutCommit = -1 }, true},
-		"PeerGossipSleepDuration":              {func(c *config.ConsensusConfig) { c.PeerGossipSleepDuration = time.Second }, false},
-		"PeerGossipSleepDuration negative":     {func(c *config.ConsensusConfig) { c.PeerGossipSleepDuration = -1 }, true},
-		"PeerQueryMaj23SleepDuration":          {func(c *config.ConsensusConfig) { c.PeerQueryMaj23SleepDuration = time.Second }, false},
-		"PeerQueryMaj23SleepDuration negative": {func(c *config.ConsensusConfig) { c.PeerQueryMaj23SleepDuration = -1 }, true},
-		"DoubleSignCheckHeight negative":       {func(c *config.ConsensusConfig) { c.DoubleSignCheckHeight = -1 }, true},
+		"TimeoutPropose":                       {func(c *ConsensusConfig) { c.TimeoutPropose = time.Second }, false},
+		"TimeoutPropose negative":              {func(c *ConsensusConfig) { c.TimeoutPropose = -1 }, true},
+		"TimeoutProposeDelta":                  {func(c *ConsensusConfig) { c.TimeoutProposeDelta = time.Second }, false},
+		"TimeoutProposeDelta negative":         {func(c *ConsensusConfig) { c.TimeoutProposeDelta = -1 }, true},
+		"TimeoutPrevote":                       {func(c *ConsensusConfig) { c.TimeoutPrevote = time.Second }, false},
+		"TimeoutPrevote negative":              {func(c *ConsensusConfig) { c.TimeoutPrevote = -1 }, true},
+		"TimeoutPrevoteDelta":                  {func(c *ConsensusConfig) { c.TimeoutPrevoteDelta = time.Second }, false},
+		"TimeoutPrevoteDelta negative":         {func(c *ConsensusConfig) { c.TimeoutPrevoteDelta = -1 }, true},
+		"TimeoutPrecommit":                     {func(c *ConsensusConfig) { c.TimeoutPrecommit = time.Second }, false},
+		"TimeoutPrecommit negative":            {func(c *ConsensusConfig) { c.TimeoutPrecommit = -1 }, true},
+		"TimeoutPrecommitDelta":                {func(c *ConsensusConfig) { c.TimeoutPrecommitDelta = time.Second }, false},
+		"TimeoutPrecommitDelta negative":       {func(c *ConsensusConfig) { c.TimeoutPrecommitDelta = -1 }, true},
+		"TimeoutCommit":                        {func(c *ConsensusConfig) { c.TimeoutCommit = time.Second }, false},
+		"TimeoutCommit negative":               {func(c *ConsensusConfig) { c.TimeoutCommit = -1 }, true},
+		"PeerGossipSleepDuration":              {func(c *ConsensusConfig) { c.PeerGossipSleepDuration = time.Second }, false},
+		"PeerGossipSleepDuration negative":     {func(c *ConsensusConfig) { c.PeerGossipSleepDuration = -1 }, true},
+		"PeerQueryMaj23SleepDuration":          {func(c *ConsensusConfig) { c.PeerQueryMaj23SleepDuration = time.Second }, false},
+		"PeerQueryMaj23SleepDuration negative": {func(c *ConsensusConfig) { c.PeerQueryMaj23SleepDuration = -1 }, true},
+		"DoubleSignCheckHeight negative":       {func(c *ConsensusConfig) { c.DoubleSignCheckHeight = -1 }, true},
 	}
 	for desc, tc := range testcases {
 		tc := tc // appease linter
 		t.Run(desc, func(t *testing.T) {
-			cfg := config.DefaultConsensusConfig()
+			cfg := DefaultConsensusConfig()
 			tc.modify(cfg)

 			err := cfg.ValidateBasic()
@@ -185,7 +183,7 @@ func TestConsensusConfig_ValidateBasic(t *testing.T) {
 }

 func TestInstrumentationConfigValidateBasic(t *testing.T) {
-	cfg := config.TestInstrumentationConfig()
+	cfg := TestInstrumentationConfig()
 	assert.NoError(t, cfg.ValidateBasic())

 	// tamper with maximum open connections
--- a/config/toml.go
+++ b/config/toml.go
@@ -2,6 +2,8 @@ package config

 import (
 	"bytes"
+	"fmt"
+	"io/ioutil"
 	"path/filepath"
 	"strings"
 	"text/template"
@@ -32,10 +34,10 @@ func EnsureRoot(rootDir string) {
 	if err := tmos.EnsureDir(rootDir, DefaultDirPerm); err != nil {
 		panic(err.Error())
 	}
-	if err := tmos.EnsureDir(filepath.Join(rootDir, DefaultConfigDir), DefaultDirPerm); err != nil {
+	if err := tmos.EnsureDir(filepath.Join(rootDir, defaultConfigDir), DefaultDirPerm); err != nil {
 		panic(err.Error())
 	}
-	if err := tmos.EnsureDir(filepath.Join(rootDir, DefaultDataDir), DefaultDirPerm); err != nil {
+	if err := tmos.EnsureDir(filepath.Join(rootDir, defaultDataDir), DefaultDirPerm); err != nil {
 		panic(err.Error())
 	}

@@ -74,10 +76,6 @@ const defaultConfigTemplate = `# This is a TOML config file.
 # "$HOME/.tendermint" by default, but could be changed via $TMHOME env variable
 # or --home cmd flag.

-# The version of the Tendermint binary that created or
-# last modified the config file. Do not modify this.
-version = "{{ .BaseConfig.Version }}"
-
 #######################################################################
 ###                   Main Base Config Options                      ###
 #######################################################################
@@ -89,10 +87,10 @@ proxy_app = "{{ .BaseConfig.ProxyApp }}"
 # A custom human readable name for this node
 moniker = "{{ .BaseConfig.Moniker }}"

-# If this node is many blocks behind the tip of the chain, BlockSync
+# If this node is many blocks behind the tip of the chain, FastSync
 # allows them to catchup quickly by downloading blocks in parallel
 # and verifying their commits
-block_sync = {{ .BaseConfig.BlockSyncMode }}
+fast_sync = {{ .BaseConfig.FastSyncMode }}

 # Database backend: goleveldb | cleveldb | boltdb | rocksdb | badgerdb
 # * goleveldb (github.com/syndtr/goleveldb - most popular implementation)
@@ -431,17 +429,17 @@ chunk_request_timeout = "{{ .StateSync.ChunkRequestTimeout }}"
 chunk_fetchers = "{{ .StateSync.ChunkFetchers }}"

 #######################################################
-###       Block Sync Configuration Options          ###
+###       Fast Sync Configuration Connections       ###
 #######################################################
-[blocksync]
+[fastsync]

-# Block Sync version to use:
+# Fast Sync version to use:
 # 
-# In v0.37, v1 and v2 of the block sync protocols were deprecated.
+# In v0.37, v1 and v2 of the fast sync protocol were deprecated.
 # Please use v0 instead.
 #
-#   1) "v0" - the default block sync implementation
-version = "{{ .BlockSync.Version }}"
+#   1) "v0" - the default fast sync implementation
+version = "{{ .FastSync.Version }}"

 #######################################################
 ###         Consensus Configuration Options         ###
@@ -484,17 +482,6 @@ create_empty_blocks_interval = "{{ .Consensus.CreateEmptyBlocksInterval }}"
 peer_gossip_sleep_duration = "{{ .Consensus.PeerGossipSleepDuration }}"
 peer_query_maj23_sleep_duration = "{{ .Consensus.PeerQueryMaj23SleepDuration }}"

-#######################################################
-###         Storage Configuration Options           ###
-#######################################################
-[storage]
-
-# Set to true to discard ABCI responses from the state store, which can save a
-# considerable amount of disk space. Set to false to ensure ABCI responses are
-# persisted. ABCI responses are required for /block_results RPC queries, and to
-# reindex events in the command-line tool.
-discard_abci_responses = {{ .Storage.DiscardABCIResponses}}
-
 #######################################################
 ###   Transaction Indexer Configuration Options     ###
 #######################################################
@@ -539,3 +526,101 @@ max_open_connections = {{ .Instrumentation.MaxOpenConnections }}
 # Instrumentation namespace
 namespace = "{{ .Instrumentation.Namespace }}"
 `
+
+/****** these are for test settings ***********/
+
+func ResetTestRoot(testName string) *Config {
+	return ResetTestRootWithChainID(testName, "")
+}
+
+func ResetTestRootWithChainID(testName string, chainID string) *Config {
+	// create a unique, concurrency-safe test directory under os.TempDir()
+	rootDir, err := ioutil.TempDir("", fmt.Sprintf("%s-%s_", chainID, testName))
+	if err != nil {
+		panic(err)
+	}
+	// ensure config and data subdirs are created
+	if err := tmos.EnsureDir(filepath.Join(rootDir, defaultConfigDir), DefaultDirPerm); err != nil {
+		panic(err)
+	}
+	if err := tmos.EnsureDir(filepath.Join(rootDir, defaultDataDir), DefaultDirPerm); err != nil {
+		panic(err)
+	}
+
+	baseConfig := DefaultBaseConfig()
+	configFilePath := filepath.Join(rootDir, defaultConfigFilePath)
+	genesisFilePath := filepath.Join(rootDir, baseConfig.Genesis)
+	privKeyFilePath := filepath.Join(rootDir, baseConfig.PrivValidatorKey)
+	privStateFilePath := filepath.Join(rootDir, baseConfig.PrivValidatorState)
+
+	// Write default config file if missing.
+	if !tmos.FileExists(configFilePath) {
+		writeDefaultConfigFile(configFilePath)
+	}
+	if !tmos.FileExists(genesisFilePath) {
+		if chainID == "" {
+			chainID = "tendermint_test"
+		}
+		testGenesis := fmt.Sprintf(testGenesisFmt, chainID)
+		tmos.MustWriteFile(genesisFilePath, []byte(testGenesis), 0644)
+	}
+	// we always overwrite the priv val
+	tmos.MustWriteFile(privKeyFilePath, []byte(testPrivValidatorKey), 0644)
+	tmos.MustWriteFile(privStateFilePath, []byte(testPrivValidatorState), 0644)
+
+	config := TestConfig().SetRoot(rootDir)
+	return config
+}
+
+var testGenesisFmt = `{
+  "genesis_time": "2018-10-10T08:20:13.695936996Z",
+  "chain_id": "%s",
+  "initial_height": "1",
+	"consensus_params": {
+		"block": {
+			"max_bytes": "22020096",
+			"max_gas": "-1",
+			"time_iota_ms": "10"
+		},
+		"evidence": {
+			"max_age_num_blocks": "100000",
+			"max_age_duration": "172800000000000",
+			"max_bytes": "1048576"
+		},
+		"validator": {
+			"pub_key_types": [
+				"ed25519"
+			]
+		},
+		"version": {}
+	},
+  "validators": [
+    {
+      "pub_key": {
+        "type": "tendermint/PubKeyEd25519",
+        "value":"AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="
+      },
+      "power": "10",
+      "name": ""
+    }
+  ],
+  "app_hash": ""
+}`
+
+var testPrivValidatorKey = `{
+  "address": "A3258DCBF45DCA0DF052981870F2D1441A36D145",
+  "pub_key": {
+    "type": "tendermint/PubKeyEd25519",
+    "value": "AT/+aaL1eB0477Mud9JMm8Sh8BIvOYlPGC9KkIUmFaE="
+  },
+  "priv_key": {
+    "type": "tendermint/PrivKeyEd25519",
+    "value": "EVkqJO/jIXp3rkASXfh9YnyToYXRXhBr6g9cQVxPFnQBP/5povV4HTjvsy530kybxKHwEi85iU8YL0qQhSYVoQ=="
+  }
+}`
+
+var testPrivValidatorState = `{
+  "height": "0",
+  "round": 0,
+  "step": 0
+}`
--- a/config/toml_test.go
+++ b/config/toml_test.go
@@ -1,22 +1,21 @@
-package config_test
+package config

 import (
+	"io/ioutil"
 	"os"
 	"path/filepath"
+	"strings"
 	"testing"

 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-
-	"github.com/tendermint/tendermint/config"
-	"github.com/tendermint/tendermint/internal/test"
 )

 func ensureFiles(t *testing.T, rootDir string, files ...string) {
 	for _, f := range files {
-		p := filepath.Join(rootDir, f)
+		p := rootify(rootDir, f)
 		_, err := os.Stat(p)
-		assert.NoError(t, err, p)
+		assert.Nil(t, err, p)
 	}
 }

@@ -24,18 +23,20 @@ func TestEnsureRoot(t *testing.T) {
 	require := require.New(t)

 	// setup temp dir for test
-	tmpDir, err := os.MkdirTemp("", "config-test")
+	tmpDir, err := ioutil.TempDir("", "config-test")
 	require.Nil(err)
 	defer os.RemoveAll(tmpDir)

 	// create root dir
-	config.EnsureRoot(tmpDir)
+	EnsureRoot(tmpDir)

 	// make sure config is set properly
-	data, err := os.ReadFile(filepath.Join(tmpDir, config.DefaultConfigDir, config.DefaultConfigFileName))
+	data, err := ioutil.ReadFile(filepath.Join(tmpDir, defaultConfigFilePath))
 	require.Nil(err)

-	assertValidConfig(t, string(data))
+	if !checkConfig(string(data)) {
+		t.Fatalf("config file missing some information")
+	}

 	ensureFiles(t, tmpDir, "data")
 }
@@ -43,30 +44,35 @@ func TestEnsureRoot(t *testing.T) {
 func TestEnsureTestRoot(t *testing.T) {
 	require := require.New(t)

+	testName := "ensureTestRoot"
+
 	// create root dir
-	cfg := test.ResetTestRoot("ensureTestRoot")
+	cfg := ResetTestRoot(testName)
 	defer os.RemoveAll(cfg.RootDir)
 	rootDir := cfg.RootDir

 	// make sure config is set properly
-	data, err := os.ReadFile(filepath.Join(rootDir, config.DefaultConfigDir, config.DefaultConfigFileName))
+	data, err := ioutil.ReadFile(filepath.Join(rootDir, defaultConfigFilePath))
 	require.Nil(err)

-	assertValidConfig(t, string(data))
+	if !checkConfig(string(data)) {
+		t.Fatalf("config file missing some information")
+	}

 	// TODO: make sure the cfg returned and testconfig are the same!
-	baseConfig := config.DefaultBaseConfig()
-	ensureFiles(t, rootDir, config.DefaultDataDir, baseConfig.Genesis, baseConfig.PrivValidatorKey, baseConfig.PrivValidatorState)
+	baseConfig := DefaultBaseConfig()
+	ensureFiles(t, rootDir, defaultDataDir, baseConfig.Genesis, baseConfig.PrivValidatorKey, baseConfig.PrivValidatorState)
 }

-func assertValidConfig(t *testing.T, configFile string) {
-	t.Helper()
+func checkConfig(configFile string) bool {
+	var valid bool
+
 	// list of words we expect in the config
 	var elems = []string{
 		"moniker",
 		"seeds",
 		"proxy_app",
-		"block_sync",
+		"fast_sync",
 		"create_empty_blocks",
 		"peer",
 		"timeout",
@@ -79,6 +85,11 @@ func assertValidConfig(t *testing.T, configFile string) {
 		"genesis",
 	}
 	for _, e := range elems {
-		assert.Contains(t, configFile, e)
+		if !strings.Contains(configFile, e) {
+			valid = false
+		} else {
+			valid = true
+		}
 	}
+	return valid
 }
--- a/consensus/README.md
+++ b/consensus/README.md
@@ -1,3 +1,3 @@
 # Consensus 

-See the [consensus spec](https://github.com/tendermint/tendermint/tree/main/spec/consensus) for more information.
+See the [consensus spec](https://github.com/tendermint/spec/tree/master/spec/consensus) and the [reactor consensus spec](https://github.com/tendermint/spec/tree/master/spec/reactors/consensus) for more information.
--- a/consensus/byzantine_test.go
+++ b/consensus/byzantine_test.go
@@ -50,9 +50,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 	for i := 0; i < nValidators; i++ {
 		logger := consensusLogger().With("test", "byzantine", "validator", i)
 		stateDB := dbm.NewMemDB() // each state needs its own db
-		stateStore := sm.NewStore(stateDB, sm.StoreOptions{
-			DiscardABCIResponses: false,
-		})
+		stateStore := sm.NewStore(stateDB)
 		state, _ := stateStore.LoadFromDBOrGenesisDoc(genDoc)
 		thisConfig := ResetConfig(fmt.Sprintf("%s_%d", testName, i))
 		defer os.RemoveAll(thisConfig.RootDir)
@@ -100,7 +98,7 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 		evpool.SetLogger(logger.With("module", "evidence"))

 		// Make State
-		blockExec := sm.NewBlockExecutor(stateStore, log.TestingLogger(), proxyAppConnCon, mempool, evpool, blockStore)
+		blockExec := sm.NewBlockExecutor(stateStore, log.TestingLogger(), proxyAppConnCon, mempool, evpool)
 		cs := NewState(thisConfig.Consensus, state, blockExec, blockStore, mempool, evpool)
 		cs.SetLogger(cs.Logger)
 		// set private validator
@@ -213,11 +211,9 @@ func TestByzantinePrevoteEquivocation(t *testing.T) {
 		}
 		proposerAddr := lazyProposer.privValidatorPubKey.Address()

-		block, err := lazyProposer.blockExec.CreateProposalBlock(
-			lazyProposer.Height, lazyProposer.state, commit, proposerAddr, nil)
-		require.NoError(t, err)
-		blockParts, err := block.MakePartSet(types.BlockPartSizeBytes)
-		require.NoError(t, err)
+		block, blockParts := lazyProposer.blockExec.CreateProposalBlock(
+			lazyProposer.Height, lazyProposer.state, commit, proposerAddr,
+		)

 		// Flush the WAL. Otherwise, we may not recompute the same proposal to sign,
 		// and the privValidator will refuse to sign anything.
@@ -465,10 +461,7 @@ func byzantineDecideProposalFunc(t *testing.T, height int64, round int32, cs *St
 	// Avoid sending on internalMsgQueue and running consensus state.

 	// Create a new proposal block from state/txs from the mempool.
-	block1, err := cs.createProposalBlock()
-	require.NoError(t, err)
-	blockParts1, err := block1.MakePartSet(types.BlockPartSizeBytes)
-	require.NoError(t, err)
+	block1, blockParts1 := cs.createProposalBlock()
 	polRound, propBlockID := cs.ValidRound, types.BlockID{Hash: block1.Hash(), PartSetHeader: blockParts1.Header()}
 	proposal1 := types.NewProposal(height, round, polRound, propBlockID)
 	p1 := proposal1.ToProto()
@@ -482,10 +475,7 @@ func byzantineDecideProposalFunc(t *testing.T, height int64, round int32, cs *St
 	deliverTxsRange(cs, 0, 1)

 	// Create a new proposal block from state/txs from the mempool.
-	block2, err := cs.createProposalBlock()
-	require.NoError(t, err)
-	blockParts2, err := block2.MakePartSet(types.BlockPartSizeBytes)
-	require.NoError(t, err)
+	block2, blockParts2 := cs.createProposalBlock()
 	polRound, propBlockID = cs.ValidRound, types.BlockID{Hash: block2.Hash(), PartSetHeader: blockParts2.Header()}
 	proposal2 := types.NewProposal(height, round, polRound, propBlockID)
 	p2 := proposal2.ToProto()
--- a/consensus/common_test.go
+++ b/consensus/common_test.go
@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"path/filepath"
 	"sort"
@@ -12,7 +13,6 @@ import (
 	"time"

 	"github.com/go-kit/log/term"
-	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

 	"path"
@@ -24,7 +24,6 @@ import (
 	abci "github.com/tendermint/tendermint/abci/types"
 	cfg "github.com/tendermint/tendermint/config"
 	cstypes "github.com/tendermint/tendermint/consensus/types"
-	"github.com/tendermint/tendermint/internal/test"
 	tmbytes "github.com/tendermint/tendermint/libs/bytes"
 	"github.com/tendermint/tendermint/libs/log"
 	tmos "github.com/tendermint/tendermint/libs/os"
@@ -64,7 +63,7 @@ func ensureDir(dir string, mode os.FileMode) {
 }

 func ResetConfig(name string) *cfg.Config {
-	return test.ResetTestRoot(name)
+	return cfg.ResetTestRoot(name)
 }

 //-------------------------------------------------------------------------------
@@ -109,7 +108,7 @@ func (vs *validatorStub) signVote(
 		BlockID:          types.BlockID{Hash: hash, PartSetHeader: header},
 	}
 	v := vote.ToProto()
-	if err := vs.PrivValidator.SignVote(test.DefaultTestChainID, v); err != nil {
+	if err := vs.PrivValidator.SignVote(config.ChainID(), v); err != nil {
 		return nil, fmt.Errorf("sign vote failed: %w", err)
 	}

@@ -201,17 +200,13 @@ func startTestRound(cs *State, height int64, round int32) {

 // Create proposal block from cs1 but sign it with vs.
 func decideProposal(
-	t *testing.T,
 	cs1 *State,
 	vs *validatorStub,
 	height int64,
 	round int32,
 ) (proposal *types.Proposal, block *types.Block) {
 	cs1.mtx.Lock()
-	block, err := cs1.createProposalBlock()
-	require.NoError(t, err)
-	blockParts, err := block.MakePartSet(types.BlockPartSizeBytes)
-	require.NoError(t, err)
+	block, blockParts := cs1.createProposalBlock()
 	validRound := cs1.ValidRound
 	chainID := cs1.state.ChainID
 	cs1.mtx.Unlock()
@@ -370,7 +365,7 @@ func subscribeToVoter(cs *State, addr []byte) <-chan tmpubsub.Message {
 // consensus states

 func newState(state sm.State, pv types.PrivValidator, app abci.Application) *State {
-	config := test.ResetTestRoot("consensus_state_test")
+	config := cfg.ResetTestRoot("consensus_state_test")
 	return newStateWithConfig(config, state, pv, app)
 }

@@ -432,14 +427,12 @@ func newStateWithConfigAndBlockStore(

 	// Make State
 	stateDB := blockDB
-	stateStore := sm.NewStore(stateDB, sm.StoreOptions{
-		DiscardABCIResponses: false,
-	})
+	stateStore := sm.NewStore(stateDB)
 	if err := stateStore.Save(state); err != nil { // for save height 1's validators info
 		panic(err)
 	}

-	blockExec := sm.NewBlockExecutor(stateStore, log.TestingLogger(), proxyAppConnCon, mempool, evpool, blockStore)
+	blockExec := sm.NewBlockExecutor(stateStore, log.TestingLogger(), proxyAppConnCon, mempool, evpool)
 	cs := NewState(thisConfig.Consensus, state, blockExec, blockStore, mempool, evpool)
 	cs.SetLogger(log.TestingLogger().With("module", "consensus"))
 	cs.SetPrivValidator(pv)
@@ -464,16 +457,12 @@ func loadPrivValidator(config *cfg.Config) *privval.FilePV {
 }

 func randState(nValidators int) (*State, []*validatorStub) {
-	return randStateWithApp(nValidators, kvstore.NewApplication())
-}
-
-func randStateWithApp(nValidators int, app abci.Application) (*State, []*validatorStub) {
 	// Get State
 	state, privVals := randGenesisState(nValidators, false, 10)

 	vss := make([]*validatorStub, nValidators)

-	cs := newState(state, privVals[0], app)
+	cs := newState(state, privVals[0], kvstore.NewApplication())

 	for i := 0; i < nValidators; i++ {
 		vss[i] = newValidatorStub(privVals[i], int32(i))
@@ -688,33 +677,6 @@ func ensureVote(voteCh <-chan tmpubsub.Message, height int64, round int32,
 	}
 }

-func ensurePrevoteMatch(t *testing.T, voteCh <-chan tmpubsub.Message, height int64, round int32, hash []byte) {
-	t.Helper()
-	ensureVoteMatch(t, voteCh, height, round, hash, tmproto.PrevoteType)
-}
-
-func ensureVoteMatch(t *testing.T, voteCh <-chan tmpubsub.Message, height int64, round int32, hash []byte, voteType tmproto.SignedMsgType) {
-	t.Helper()
-	select {
-	case <-time.After(ensureTimeout):
-		t.Fatal("Timeout expired while waiting for NewVote event")
-	case msg := <-voteCh:
-		voteEvent, ok := msg.Data().(types.EventDataVote)
-		require.True(t, ok, "expected a EventDataVote, got %T. Wrong subscription channel?",
-			msg.Data())
-
-		vote := voteEvent.Vote
-		assert.Equal(t, height, vote.Height, "expected height %d, but got %d", height, vote.Height)
-		assert.Equal(t, round, vote.Round, "expected round %d, but got %d", round, vote.Round)
-		assert.Equal(t, voteType, vote.Type, "expected type %s, but got %s", voteType, vote.Type)
-		if hash == nil {
-			require.Nil(t, vote.BlockID.Hash, "Expected prevote to be for nil, got %X", vote.BlockID.Hash)
-		} else {
-			require.True(t, bytes.Equal(vote.BlockID.Hash, hash), "Expected prevote to be for %X, got %X", hash, vote.BlockID.Hash)
-		}
-	}
-}
-
 func ensurePrecommitTimeout(ch <-chan tmpubsub.Message) {
 	select {
 	case <-time.After(ensureTimeout):
@@ -755,9 +717,7 @@ func randConsensusNet(nValidators int, testName string, tickerFunc func() Timeou
 	configRootDirs := make([]string, 0, nValidators)
 	for i := 0; i < nValidators; i++ {
 		stateDB := dbm.NewMemDB() // each state needs its own db
-		stateStore := sm.NewStore(stateDB, sm.StoreOptions{
-			DiscardABCIResponses: false,
-		})
+		stateStore := sm.NewStore(stateDB)
 		state, _ := stateStore.LoadFromDBOrGenesisDoc(genDoc)
 		thisConfig := ResetConfig(fmt.Sprintf("%s_%d", testName, i))
 		configRootDirs = append(configRootDirs, thisConfig.RootDir)
@@ -795,9 +755,7 @@ func randConsensusNetWithPeers(
 	configRootDirs := make([]string, 0, nPeers)
 	for i := 0; i < nPeers; i++ {
 		stateDB := dbm.NewMemDB() // each state needs its own db
-		stateStore := sm.NewStore(stateDB, sm.StoreOptions{
-			DiscardABCIResponses: false,
-		})
+		stateStore := sm.NewStore(stateDB)
 		state, _ := stateStore.LoadFromDBOrGenesisDoc(genDoc)
 		thisConfig := ResetConfig(fmt.Sprintf("%s_%d", testName, i))
 		configRootDirs = append(configRootDirs, thisConfig.RootDir)
@@ -809,11 +767,11 @@ func randConsensusNetWithPeers(
 		if i < nValidators {
 			privVal = privVals[i]
 		} else {
-			tempKeyFile, err := os.CreateTemp("", "priv_validator_key_")
+			tempKeyFile, err := ioutil.TempFile("", "priv_validator_key_")
 			if err != nil {
 				panic(err)
 			}
-			tempStateFile, err := os.CreateTemp("", "priv_validator_state_")
+			tempStateFile, err := ioutil.TempFile("", "priv_validator_state_")
 			if err != nil {
 				panic(err)
 			}
@@ -869,7 +827,7 @@ func randGenesisDoc(numValidators int, randPower bool, minPower int64) (*types.G
 	return &types.GenesisDoc{
 		GenesisTime:   tmtime.Now(),
 		InitialHeight: 1,
-		ChainID:       test.DefaultTestChainID,
+		ChainID:       config.ChainID(),
 		Validators:    validators,
 	}, privValidators
 }
@@ -929,7 +887,7 @@ func (m *mockTicker) Chan() <-chan timeoutInfo {
 func (*mockTicker) SetLogger(log.Logger) {}

 func newPersistentKVStore() abci.Application {
-	dir, err := os.MkdirTemp("", "persistent-kvstore")
+	dir, err := ioutil.TempDir("", "persistent-kvstore")
 	if err != nil {
 		panic(err)
 	}
--- a/consensus/mempool_test.go
+++ b/consensus/mempool_test.go
@@ -113,7 +113,7 @@ func deliverTxsRange(cs *State, start, end int) {
 func TestMempoolTxConcurrentWithCommit(t *testing.T) {
 	state, privVals := randGenesisState(1, false, 10)
 	blockDB := dbm.NewMemDB()
-	stateStore := sm.NewStore(blockDB, sm.StoreOptions{DiscardABCIResponses: false})
+	stateStore := sm.NewStore(blockDB)
 	cs := newStateWithConfigAndBlockStore(config, state, privVals[0], NewCounterApplication(), blockDB)
 	err := stateStore.Save(state)
 	require.NoError(t, err)
@@ -138,7 +138,7 @@ func TestMempoolRmBadTx(t *testing.T) {
 	state, privVals := randGenesisState(1, false, 10)
 	app := NewCounterApplication()
 	blockDB := dbm.NewMemDB()
-	stateStore := sm.NewStore(blockDB, sm.StoreOptions{DiscardABCIResponses: false})
+	stateStore := sm.NewStore(blockDB)
 	cs := newStateWithConfigAndBlockStore(config, state, privVals[0], app, blockDB)
 	err := stateStore.Save(state)
 	require.NoError(t, err)
@@ -256,22 +256,3 @@ func (app *CounterApplication) Commit() abci.ResponseCommit {
 	binary.BigEndian.PutUint64(hash, uint64(app.txCount))
 	return abci.ResponseCommit{Data: hash}
 }
-
-func (app *CounterApplication) PrepareProposal(
-	req abci.RequestPrepareProposal) abci.ResponsePrepareProposal {
-	txs := make([][]byte, 0, len(req.Txs))
-	var totalBytes int64
-	for _, tx := range req.Txs {
-		totalBytes += int64(len(tx))
-		if totalBytes > req.MaxTxBytes {
-			break
-		}
-		txs = append(txs, tx)
-	}
-	return abci.ResponsePrepareProposal{Txs: txs}
-}
-
-func (app *CounterApplication) ProcessProposal(
-	req abci.RequestProcessProposal) abci.ResponseProcessProposal {
-	return abci.ResponseProcessProposal{Status: abci.ResponseProcessProposal_ACCEPT}
-}
--- a/consensus/metrics.gen.go
+++ b/consensus/metrics.gen.go
@@ -1,223 +0,0 @@
-// Code generated by metricsgen. DO NOT EDIT.
-
-package consensus
-
-import (
-	"github.com/go-kit/kit/metrics/discard"
-	prometheus "github.com/go-kit/kit/metrics/prometheus"
-	stdprometheus "github.com/prometheus/client_golang/prometheus"
-)
-
-func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
-	labels := []string{}
-	for i := 0; i < len(labelsAndValues); i += 2 {
-		labels = append(labels, labelsAndValues[i])
-	}
-	return &Metrics{
-		Height: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "height",
-			Help:      "Height of the chain.",
-		}, labels).With(labelsAndValues...),
-		ValidatorLastSignedHeight: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "validator_last_signed_height",
-			Help:      "Last height signed by this validator if the node is a validator.",
-		}, append(labels, "validator_address")).With(labelsAndValues...),
-		Rounds: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "rounds",
-			Help:      "Number of rounds.",
-		}, labels).With(labelsAndValues...),
-		RoundDurationSeconds: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "round_duration_seconds",
-			Help:      "Histogram of round duration.",
-
-			Buckets: stdprometheus.ExponentialBucketsRange(0.1, 100, 8),
-		}, labels).With(labelsAndValues...),
-		Validators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "validators",
-			Help:      "Number of validators.",
-		}, labels).With(labelsAndValues...),
-		ValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "validators_power",
-			Help:      "Total power of all validators.",
-		}, labels).With(labelsAndValues...),
-		ValidatorPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "validator_power",
-			Help:      "Power of a validator.",
-		}, append(labels, "validator_address")).With(labelsAndValues...),
-		ValidatorMissedBlocks: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "validator_missed_blocks",
-			Help:      "Amount of blocks missed per validator.",
-		}, append(labels, "validator_address")).With(labelsAndValues...),
-		MissingValidators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "missing_validators",
-			Help:      "Number of validators who did not sign.",
-		}, labels).With(labelsAndValues...),
-		MissingValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "missing_validators_power",
-			Help:      "Total power of the missing validators.",
-		}, labels).With(labelsAndValues...),
-		ByzantineValidators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "byzantine_validators",
-			Help:      "Number of validators who tried to double sign.",
-		}, labels).With(labelsAndValues...),
-		ByzantineValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "byzantine_validators_power",
-			Help:      "Total power of the byzantine validators.",
-		}, labels).With(labelsAndValues...),
-		BlockIntervalSeconds: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "block_interval_seconds",
-			Help:      "Time between this and the last block.",
-		}, labels).With(labelsAndValues...),
-		NumTxs: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "num_txs",
-			Help:      "Number of transactions.",
-		}, labels).With(labelsAndValues...),
-		BlockSizeBytes: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "block_size_bytes",
-			Help:      "Size of the block.",
-		}, labels).With(labelsAndValues...),
-		TotalTxs: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "total_txs",
-			Help:      "Total number of transactions.",
-		}, labels).With(labelsAndValues...),
-		CommittedHeight: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "latest_block_height",
-			Help:      "The latest block height.",
-		}, labels).With(labelsAndValues...),
-		BlockSyncing: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "block_syncing",
-			Help:      "Whether or not a node is block syncing. 1 if yes, 0 if no.",
-		}, labels).With(labelsAndValues...),
-		StateSyncing: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "state_syncing",
-			Help:      "Whether or not a node is state syncing. 1 if yes, 0 if no.",
-		}, labels).With(labelsAndValues...),
-		BlockParts: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "block_parts",
-			Help:      "Number of block parts transmitted by each peer.",
-		}, append(labels, "peer_id")).With(labelsAndValues...),
-		StepDurationSeconds: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "step_duration_seconds",
-			Help:      "Histogram of durations for each step in the consensus protocol.",
-
-			Buckets: stdprometheus.ExponentialBucketsRange(0.1, 100, 8),
-		}, append(labels, "step")).With(labelsAndValues...),
-		BlockGossipPartsReceived: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "block_gossip_parts_received",
-			Help:      "Number of block parts received by the node, separated by whether the part was relevant to the block the node is trying to gather or not.",
-		}, append(labels, "matches_current")).With(labelsAndValues...),
-		QuorumPrevoteDelay: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "quorum_prevote_delay",
-			Help:      "Interval in seconds between the proposal timestamp and the timestamp of the earliest prevote that achieved a quorum.",
-		}, append(labels, "proposer_address")).With(labelsAndValues...),
-		FullPrevoteDelay: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "full_prevote_delay",
-			Help:      "Interval in seconds between the proposal timestamp and the timestamp of the latest prevote in a round where all validators voted.",
-		}, append(labels, "proposer_address")).With(labelsAndValues...),
-		ProposalReceiveCount: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "proposal_receive_count",
-			Help:      "ProposalReceiveCount is the total number of proposals received by this node since process start. The metric is annotated by the status of the proposal from the application, either 'accepted' or 'rejected'.",
-		}, append(labels, "status")).With(labelsAndValues...),
-		ProposalCreateCount: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "proposal_create_count",
-			Help:      "ProposalCreationCount is the total number of proposals created by this node since process start.",
-		}, labels).With(labelsAndValues...),
-		RoundVotingPowerPercent: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "round_voting_power_percent",
-			Help:      "RoundVotingPowerPercent is the percentage of the total voting power received with a round. The value begins at 0 for each round and approaches 1.0 as additional voting power is observed. The metric is labeled by vote type.",
-		}, append(labels, "vote_type")).With(labelsAndValues...),
-		LateVotes: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
-			Namespace: namespace,
-			Subsystem: MetricsSubsystem,
-			Name:      "late_votes",
-			Help:      "LateVotes stores the number of votes that were received by this node that correspond to earlier heights and rounds than this node is currently in.",
-		}, append(labels, "vote_type")).With(labelsAndValues...),
-	}
-}
-
-func NopMetrics() *Metrics {
-	return &Metrics{
-		Height:                    discard.NewGauge(),
-		ValidatorLastSignedHeight: discard.NewGauge(),
-		Rounds:                    discard.NewGauge(),
-		RoundDurationSeconds:      discard.NewHistogram(),
-		Validators:                discard.NewGauge(),
-		ValidatorsPower:           discard.NewGauge(),
-		ValidatorPower:            discard.NewGauge(),
-		ValidatorMissedBlocks:     discard.NewGauge(),
-		MissingValidators:         discard.NewGauge(),
-		MissingValidatorsPower:    discard.NewGauge(),
-		ByzantineValidators:       discard.NewGauge(),
-		ByzantineValidatorsPower:  discard.NewGauge(),
-		BlockIntervalSeconds:      discard.NewHistogram(),
-		NumTxs:                    discard.NewGauge(),
-		BlockSizeBytes:            discard.NewGauge(),
-		TotalTxs:                  discard.NewGauge(),
-		CommittedHeight:           discard.NewGauge(),
-		BlockSyncing:              discard.NewGauge(),
-		StateSyncing:              discard.NewGauge(),
-		BlockParts:                discard.NewCounter(),
-		StepDurationSeconds:       discard.NewHistogram(),
-		BlockGossipPartsReceived:  discard.NewCounter(),
-		QuorumPrevoteDelay:        discard.NewGauge(),
-		FullPrevoteDelay:          discard.NewGauge(),
-		ProposalReceiveCount:      discard.NewCounter(),
-		ProposalCreateCount:       discard.NewCounter(),
-		RoundVotingPowerPercent:   discard.NewGauge(),
-		LateVotes:                 discard.NewCounter(),
-	}
-}
--- a/consensus/metrics.go
+++ b/consensus/metrics.go
@@ -5,10 +5,12 @@ import (
 	"time"

 	"github.com/go-kit/kit/metrics"
-
+	"github.com/go-kit/kit/metrics/discard"
 	cstypes "github.com/tendermint/tendermint/consensus/types"
-	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	"github.com/tendermint/tendermint/types"
+
+	prometheus "github.com/go-kit/kit/metrics/prometheus"
+	stdprometheus "github.com/prometheus/client_golang/prometheus"
 )

 const (
@@ -17,30 +19,28 @@ const (
 	MetricsSubsystem = "consensus"
 )

-//go:generate go run ../scripts/metricsgen -struct=Metrics
-
 // Metrics contains metrics exposed by this package.
 type Metrics struct {
 	// Height of the chain.
 	Height metrics.Gauge

-	// Last height signed by this validator if the node is a validator.
-	ValidatorLastSignedHeight metrics.Gauge `metrics_labels:"validator_address"`
+	// ValidatorLastSignedHeight of a validator.
+	ValidatorLastSignedHeight metrics.Gauge

 	// Number of rounds.
 	Rounds metrics.Gauge

 	// Histogram of round duration.
-	RoundDurationSeconds metrics.Histogram `metrics_buckettype:"exprange" metrics_bucketsizes:"0.1, 100, 8"`
+	RoundDuration metrics.Histogram

 	// Number of validators.
 	Validators metrics.Gauge
 	// Total power of all validators.
 	ValidatorsPower metrics.Gauge
 	// Power of a validator.
-	ValidatorPower metrics.Gauge `metrics_labels:"validator_address"`
-	// Amount of blocks missed per validator.
-	ValidatorMissedBlocks metrics.Gauge `metrics_labels:"validator_address"`
+	ValidatorPower metrics.Gauge
+	// Amount of blocks missed by a validator.
+	ValidatorMissedBlocks metrics.Gauge
 	// Number of validators who did not sign.
 	MissingValidators metrics.Gauge
 	// Total power of the missing validators.
@@ -60,22 +60,22 @@ type Metrics struct {
 	// Total number of transactions.
 	TotalTxs metrics.Gauge
 	// The latest block height.
-	CommittedHeight metrics.Gauge `metrics_name:"latest_block_height"`
-	// Whether or not a node is block syncing. 1 if yes, 0 if no.
-	BlockSyncing metrics.Gauge
+	CommittedHeight metrics.Gauge
+	// Whether or not a node is fast syncing. 1 if yes, 0 if no.
+	FastSyncing metrics.Gauge
 	// Whether or not a node is state syncing. 1 if yes, 0 if no.
 	StateSyncing metrics.Gauge

-	// Number of block parts transmitted by each peer.
-	BlockParts metrics.Counter `metrics_labels:"peer_id"`
+	// Number of blockparts transmitted by peer.
+	BlockParts metrics.Counter

-	// Histogram of durations for each step in the consensus protocol.
-	StepDurationSeconds metrics.Histogram `metrics_labels:"step" metrics_buckettype:"exprange" metrics_bucketsizes:"0.1, 100, 8"`
-	stepStart           time.Time
+	// Histogram of step duration.
+	StepDuration metrics.Histogram
+	stepStart    time.Time

 	// Number of block parts received by the node, separated by whether the part
 	// was relevant to the block the node is trying to gather or not.
-	BlockGossipPartsReceived metrics.Counter `metrics_labels:"matches_current"`
+	BlockGossipPartsReceived metrics.Counter

 	// QuroumPrevoteMessageDelay is the interval in seconds between the proposal
 	// timestamp and the timestamp of the earliest prevote that achieved a quorum
@@ -86,34 +86,208 @@ type Metrics struct {
 	// be above 2/3 of the total voting power of the network defines the endpoint
 	// the endpoint of the interval. Subtract the proposal timestamp from this endpoint
 	// to obtain the quorum delay.
-	//metrics:Interval in seconds between the proposal timestamp and the timestamp of the earliest prevote that achieved a quorum.
-	QuorumPrevoteDelay metrics.Gauge `metrics_labels:"proposer_address"`
+	QuorumPrevoteMessageDelay metrics.Gauge

-	// FullPrevoteDelay is the interval in seconds between the proposal
+	// FullPrevoteMessageDelay is the interval in seconds between the proposal
 	// timestamp and the timestamp of the latest prevote in a round where 100%
 	// of the voting power on the network issued prevotes.
-	//metrics:Interval in seconds between the proposal timestamp and the timestamp of the latest prevote in a round where all validators voted.
-	FullPrevoteDelay metrics.Gauge `metrics_labels:"proposer_address"`
+	FullPrevoteMessageDelay metrics.Gauge
+}

-	// ProposalReceiveCount is the total number of proposals received by this node
-	// since process start.
-	// The metric is annotated by the status of the proposal from the application,
-	// either 'accepted' or 'rejected'.
-	ProposalReceiveCount metrics.Counter `metrics_labels:"status"`
+// PrometheusMetrics returns Metrics build using Prometheus client library.
+// Optionally, labels can be provided along with their values ("foo",
+// "fooValue").
+func PrometheusMetrics(namespace string, labelsAndValues ...string) *Metrics {
+	labels := []string{}
+	for i := 0; i < len(labelsAndValues); i += 2 {
+		labels = append(labels, labelsAndValues[i])
+	}
+	return &Metrics{
+		Height: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "height",
+			Help:      "Height of the chain.",
+		}, labels).With(labelsAndValues...),
+		Rounds: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "rounds",
+			Help:      "Number of rounds.",
+		}, labels).With(labelsAndValues...),
+		RoundDuration: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "round_duration_seconds",
+			Help:      "Time spent in a round.",
+			Buckets:   stdprometheus.ExponentialBucketsRange(0.1, 100, 8),
+		}, labels).With(labelsAndValues...),
+		Validators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "validators",
+			Help:      "Number of validators.",
+		}, labels).With(labelsAndValues...),
+		ValidatorLastSignedHeight: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "validator_last_signed_height",
+			Help:      "Last signed height for a validator",
+		}, append(labels, "validator_address")).With(labelsAndValues...),
+		ValidatorMissedBlocks: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "validator_missed_blocks",
+			Help:      "Total missed blocks for a validator",
+		}, append(labels, "validator_address")).With(labelsAndValues...),
+		ValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "validators_power",
+			Help:      "Total power of all validators.",
+		}, labels).With(labelsAndValues...),
+		ValidatorPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "validator_power",
+			Help:      "Power of a validator",
+		}, append(labels, "validator_address")).With(labelsAndValues...),
+		MissingValidators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "missing_validators",
+			Help:      "Number of validators who did not sign.",
+		}, labels).With(labelsAndValues...),
+		MissingValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "missing_validators_power",
+			Help:      "Total power of the missing validators.",
+		}, labels).With(labelsAndValues...),
+		ByzantineValidators: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "byzantine_validators",
+			Help:      "Number of validators who tried to double sign.",
+		}, labels).With(labelsAndValues...),
+		ByzantineValidatorsPower: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "byzantine_validators_power",
+			Help:      "Total power of the byzantine validators.",
+		}, labels).With(labelsAndValues...),
+		BlockIntervalSeconds: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "block_interval_seconds",
+			Help:      "Time between this and the last block.",
+		}, labels).With(labelsAndValues...),
+		NumTxs: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "num_txs",
+			Help:      "Number of transactions.",
+		}, labels).With(labelsAndValues...),
+		BlockSizeBytes: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "block_size_bytes",
+			Help:      "Size of the block.",
+		}, labels).With(labelsAndValues...),
+		TotalTxs: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "total_txs",
+			Help:      "Total number of transactions.",
+		}, labels).With(labelsAndValues...),
+		CommittedHeight: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "latest_block_height",
+			Help:      "The latest block height.",
+		}, labels).With(labelsAndValues...),
+		FastSyncing: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "fast_syncing",
+			Help:      "Whether or not a node is fast syncing. 1 if yes, 0 if no.",
+		}, labels).With(labelsAndValues...),
+		StateSyncing: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "state_syncing",
+			Help:      "Whether or not a node is state syncing. 1 if yes, 0 if no.",
+		}, labels).With(labelsAndValues...),
+		BlockParts: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "block_parts",
+			Help:      "Number of blockparts transmitted by peer.",
+		}, append(labels, "peer_id")).With(labelsAndValues...),
+		BlockGossipPartsReceived: prometheus.NewCounterFrom(stdprometheus.CounterOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "block_gossip_parts_received",
+			Help: "Number of block parts received by the node, labeled by whether the " +
+				"part was relevant to the block the node was currently gathering or not.",
+		}, append(labels, "matches_current")).With(labelsAndValues...),
+		StepDuration: prometheus.NewHistogramFrom(stdprometheus.HistogramOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "step_duration_seconds",
+			Help:      "Time spent per step.",
+			Buckets:   stdprometheus.ExponentialBucketsRange(0.1, 100, 8),
+		}, append(labels, "step")).With(labelsAndValues...),
+		QuorumPrevoteMessageDelay: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "quorum_prevote_message_delay",
+			Help: "Difference in seconds between the proposal timestamp and the timestamp " +
+				"of the latest prevote that achieved a quorum in the prevote step.",
+		}, labels).With(labelsAndValues...),
+		FullPrevoteMessageDelay: prometheus.NewGaugeFrom(stdprometheus.GaugeOpts{
+			Namespace: namespace,
+			Subsystem: MetricsSubsystem,
+			Name:      "full_prevote_message_delay",
+			Help: "Difference in seconds between the proposal timestamp and the timestamp " +
+				"of the latest prevote that achieved 100% of the voting power in the prevote step.",
+		}, labels).With(labelsAndValues...),
+	}
+}

-	// ProposalCreationCount is the total number of proposals created by this node
-	// since process start.
-	ProposalCreateCount metrics.Counter
+// NopMetrics returns no-op Metrics.
+func NopMetrics() *Metrics {
+	return &Metrics{
+		Height: discard.NewGauge(),

-	// RoundVotingPowerPercent is the percentage of the total voting power received
-	// with a round. The value begins at 0 for each round and approaches 1.0 as
-	// additional voting power is observed. The metric is labeled by vote type.
-	RoundVotingPowerPercent metrics.Gauge `metrics_labels:"vote_type"`
+		ValidatorLastSignedHeight: discard.NewGauge(),

-	// LateVotes stores the number of votes that were received by this node that
-	// correspond to earlier heights and rounds than this node is currently
-	// in.
-	LateVotes metrics.Counter `metrics_labels:"vote_type"`
+		Rounds:        discard.NewGauge(),
+		RoundDuration: discard.NewHistogram(),
+		StepDuration:  discard.NewHistogram(),
+
+		Validators:               discard.NewGauge(),
+		ValidatorsPower:          discard.NewGauge(),
+		ValidatorPower:           discard.NewGauge(),
+		ValidatorMissedBlocks:    discard.NewGauge(),
+		MissingValidators:        discard.NewGauge(),
+		MissingValidatorsPower:   discard.NewGauge(),
+		ByzantineValidators:      discard.NewGauge(),
+		ByzantineValidatorsPower: discard.NewGauge(),
+
+		BlockIntervalSeconds: discard.NewHistogram(),
+
+		NumTxs:                    discard.NewGauge(),
+		BlockSizeBytes:            discard.NewGauge(),
+		TotalTxs:                  discard.NewGauge(),
+		CommittedHeight:           discard.NewGauge(),
+		FastSyncing:               discard.NewGauge(),
+		StateSyncing:              discard.NewGauge(),
+		BlockParts:                discard.NewCounter(),
+		BlockGossipPartsReceived:  discard.NewCounter(),
+		QuorumPrevoteMessageDelay: discard.NewGauge(),
+		FullPrevoteMessageDelay:   discard.NewGauge(),
+	}
 }

 // RecordConsMetrics uses for recording the block related metrics during fast-sync.
@@ -124,36 +298,17 @@ func (m *Metrics) RecordConsMetrics(block *types.Block) {
 	m.CommittedHeight.Set(float64(block.Height))
 }

-func (m *Metrics) MarkProposalProcessed(accepted bool) {
-	status := "accepted"
-	if !accepted {
-		status = "rejected"
-	}
-	m.ProposalReceiveCount.With("status", status).Add(1)
-}
-
-func (m *Metrics) MarkVoteReceived(vt tmproto.SignedMsgType, power, totalPower int64) {
-	p := float64(power) / float64(totalPower)
-	n := strings.ToLower(strings.TrimPrefix(vt.String(), "SIGNED_MSG_TYPE_"))
-	m.RoundVotingPowerPercent.With("vote_type", n).Add(p)
-}
-
 func (m *Metrics) MarkRound(r int32, st time.Time) {
 	m.Rounds.Set(float64(r))
 	roundTime := time.Since(st).Seconds()
-	m.RoundDurationSeconds.Observe(roundTime)
-}
-
-func (m *Metrics) MarkLateVote(vt tmproto.SignedMsgType) {
-	n := strings.ToLower(strings.TrimPrefix(vt.String(), "SIGNED_MSG_TYPE_"))
-	m.LateVotes.With("vote_type", n).Add(1)
+	m.RoundDuration.Observe(roundTime)
 }

 func (m *Metrics) MarkStep(s cstypes.RoundStepType) {
 	if !m.stepStart.IsZero() {
 		stepTime := time.Since(m.stepStart).Seconds()
 		stepName := strings.TrimPrefix(s.String(), "RoundStep")
-		m.StepDurationSeconds.With("step", stepName).Observe(stepTime)
+		m.StepDuration.With("step", stepName).Observe(stepTime)
 	}
 	m.stepStart = time.Now()
 }
--- a/consensus/msgs.go
+++ b/consensus/msgs.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"

-	"github.com/cosmos/gogoproto/proto"
+	"github.com/gogo/protobuf/proto"

 	cstypes "github.com/tendermint/tendermint/consensus/types"
 	"github.com/tendermint/tendermint/libs/bits"
--- a/consensus/msgs_test.go
+++ b/consensus/msgs_test.go
@@ -6,7 +6,7 @@ import (
 	"testing"
 	"time"

-	"github.com/cosmos/gogoproto/proto"
+	"github.com/gogo/protobuf/proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"

@@ -314,7 +314,7 @@ func TestWALMsgProto(t *testing.T) {
 	}
 }

-//nolint:lll //ignore line length for tests
+// nolint:lll //ignore line length for tests
 func TestConsMsgsVectors(t *testing.T) {
 	date := time.Date(2018, 8, 30, 12, 0, 0, 0, time.UTC)
 	psh := types.PartSetHeader{
--- a/consensus/reactor.go
+++ b/consensus/reactor.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"

-	"github.com/cosmos/gogoproto/proto"
+	"github.com/gogo/protobuf/proto"

 	cstypes "github.com/tendermint/tendermint/consensus/types"
 	"github.com/tendermint/tendermint/libs/bits"
@@ -72,7 +72,7 @@ func NewReactor(consensusState *State, waitSync bool, options ...ReactorOption)
 }

 // OnStart implements BaseService by subscribing to events, which later will be
-// broadcasted to other peers and starting state if we're not in block sync.
+// broadcasted to other peers and starting state if we're not in fast sync.
 func (conR *Reactor) OnStart() error {
 	conR.Logger.Info("Reactor ", "waitSync", conR.WaitSync())

@@ -104,8 +104,8 @@ func (conR *Reactor) OnStop() {
 	}
 }

-// SwitchToConsensus switches from block_sync mode to consensus mode.
-// It resets the state, turns off block_sync, and starts the consensus state-machine
+// SwitchToConsensus switches from fast_sync mode to consensus mode.
+// It resets the state, turns off fast_sync, and starts the consensus state-machine
 func (conR *Reactor) SwitchToConsensus(state sm.State, skipWAL bool) {
 	conR.Logger.Info("SwitchToConsensus")

@@ -121,7 +121,7 @@ func (conR *Reactor) SwitchToConsensus(state sm.State, skipWAL bool) {
 	conR.mtx.Lock()
 	conR.waitSync = false
 	conR.mtx.Unlock()
-	conR.Metrics.BlockSyncing.Set(0)
+	conR.Metrics.FastSyncing.Set(0)
 	conR.Metrics.StateSyncing.Set(0)

 	if skipWAL {
@@ -198,7 +198,7 @@ func (conR *Reactor) AddPeer(peer p2p.Peer) {
 	go conR.queryMaj23Routine(peer, peerState)

 	// Send our state to peer.
-	// If we're block_syncing, broadcast a RoundStepMessage later upon SwitchToConsensus().
+	// If we're fast_syncing, broadcast a RoundStepMessage later upon SwitchToConsensus().
 	if !conR.WaitSync() {
 		conR.sendNewRoundStepMessage(peer)
 	}
@@ -218,7 +218,7 @@ func (conR *Reactor) RemovePeer(peer p2p.Peer, reason interface{}) {
 }

 // Receive implements Reactor
-// NOTE: We process these messages even when we're block_syncing.
+// NOTE: We process these messages even when we're fast_syncing.
 // Messages affect either a peer state or the consensus state.
 // Peer state updates can happen in parallel, but processing of
 // proposals, block parts, and votes are ordered by the receiveRoutine
@@ -386,7 +386,7 @@ func (conR *Reactor) SetEventBus(b *types.EventBus) {
 	conR.conS.SetEventBus(b)
 }

-// WaitSync returns whether the consensus reactor is waiting for state/block sync.
+// WaitSync returns whether the consensus reactor is waiting for state/fast sync.
 func (conR *Reactor) WaitSync() bool {
 	conR.mtx.RLock()
 	defer conR.mtx.RUnlock()
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
William Banfield	a8cba4d1ab	remove ambiguous metric	2022-08-04 15:11:16 -04:00
William Banfield	0a32ac5b54	add unit	2022-08-04 15:08:28 -04:00
William Banfield	c59ad64156	add metrics documentation	2022-08-04 13:00:06 -04:00
William Banfield	b1aab48445	consensus: additional timing metrics (#7849 ) This change introduces an additional set of metrics aimed at helping operators understand the timing for consensus. This change adds the following metrics: ``` tendermint_consensus_round_duration_bucket{chain_id="test-chain-IrF74Y",le="0.1"} 29 tendermint_consensus_round_duration_bucket{chain_id="test-chain-IrF74Y",le="0.2682695795279726"} 29 tendermint_consensus_round_duration_bucket{chain_id="test-chain-IrF74Y",le="0.7196856730011522"} 29 tendermint_consensus_round_duration_bucket{chain_id="test-chain-IrF74Y",le="1.9306977288832508"} 29 tendermint_consensus_round_duration_bucket{chain_id="test-chain-IrF74Y",le="5.1794746792312125"} 29 tendermint_consensus_round_duration_bucket{chain_id="test-chain-IrF74Y",le="13.894954943731381"} 29 tendermint_consensus_round_duration_bucket{chain_id="test-chain-IrF74Y",le="37.27593720314942"} 29 tendermint_consensus_round_duration_bucket{chain_id="test-chain-IrF74Y",le="100.00000000000006"} 29 tendermint_consensus_round_duration_bucket{chain_id="test-chain-IrF74Y",le="+Inf"} 29 tendermint_consensus_round_duration_sum{chain_id="test-chain-IrF74Y"} 0.028651869999999996 tendermint_consensus_round_duration_count{chain_id="test-chain-IrF74Y"} 29 ``` ``` tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Commit",le="0.1"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Commit",le="0.2682695795279726"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Commit",le="0.7196856730011522"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Commit",le="1.9306977288832508"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Commit",le="5.1794746792312125"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Commit",le="13.894954943731381"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Commit",le="37.27593720314942"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Commit",le="100.00000000000006"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Commit",le="+Inf"} 29 tendermint_consensus_step_duration_sum{chain_id="test-chain-IrF74Y",step="Commit"} 0.26650875 tendermint_consensus_step_duration_count{chain_id="test-chain-IrF74Y",step="Commit"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewHeight",le="0.1"} 0 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewHeight",le="0.2682695795279726"} 0 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewHeight",le="0.7196856730011522"} 0 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewHeight",le="1.9306977288832508"} 28 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewHeight",le="5.1794746792312125"} 28 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewHeight",le="13.894954943731381"} 28 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewHeight",le="37.27593720314942"} 28 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewHeight",le="100.00000000000006"} 28 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewHeight",le="+Inf"} 28 tendermint_consensus_step_duration_sum{chain_id="test-chain-IrF74Y",step="NewHeight"} 27.773921702 tendermint_consensus_step_duration_count{chain_id="test-chain-IrF74Y",step="NewHeight"} 28 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewRound",le="0.1"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewRound",le="0.2682695795279726"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewRound",le="0.7196856730011522"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewRound",le="1.9306977288832508"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewRound",le="5.1794746792312125"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewRound",le="13.894954943731381"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewRound",le="37.27593720314942"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewRound",le="100.00000000000006"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="NewRound",le="+Inf"} 29 tendermint_consensus_step_duration_sum{chain_id="test-chain-IrF74Y",step="NewRound"} 0.168961052 tendermint_consensus_step_duration_count{chain_id="test-chain-IrF74Y",step="NewRound"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Precommit",le="0.1"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Precommit",le="0.2682695795279726"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Precommit",le="0.7196856730011522"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Precommit",le="1.9306977288832508"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Precommit",le="5.1794746792312125"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Precommit",le="13.894954943731381"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Precommit",le="37.27593720314942"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Precommit",le="100.00000000000006"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Precommit",le="+Inf"} 29 tendermint_consensus_step_duration_sum{chain_id="test-chain-IrF74Y",step="Precommit"} 0.06414115999999999 tendermint_consensus_step_duration_count{chain_id="test-chain-IrF74Y",step="Precommit"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Prevote",le="0.1"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Prevote",le="0.2682695795279726"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Prevote",le="0.7196856730011522"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Prevote",le="1.9306977288832508"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Prevote",le="5.1794746792312125"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Prevote",le="13.894954943731381"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Prevote",le="37.27593720314942"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Prevote",le="100.00000000000006"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Prevote",le="+Inf"} 29 tendermint_consensus_step_duration_sum{chain_id="test-chain-IrF74Y",step="Prevote"} 0.177714525 tendermint_consensus_step_duration_count{chain_id="test-chain-IrF74Y",step="Prevote"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Propose",le="0.1"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Propose",le="0.2682695795279726"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Propose",le="0.7196856730011522"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Propose",le="1.9306977288832508"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Propose",le="5.1794746792312125"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Propose",le="13.894954943731381"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Propose",le="37.27593720314942"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Propose",le="100.00000000000006"} 29 tendermint_consensus_step_duration_bucket{chain_id="test-chain-IrF74Y",step="Propose",le="+Inf"} 29 tendermint_consensus_step_duration_sum{chain_id="test-chain-IrF74Y",step="Propose"} 0.221851927 tendermint_consensus_step_duration_count{chain_id="test-chain-IrF74Y",step="Propose"} 29 ``` ``` tendermint_consensus_block_gossip_receive_time_bucket{chain_id="test-chain-IrF74Y",le="0.1"} 29 tendermint_consensus_block_gossip_receive_time_bucket{chain_id="test-chain-IrF74Y",le="0.2682695795279726"} 29 tendermint_consensus_block_gossip_receive_time_bucket{chain_id="test-chain-IrF74Y",le="0.7196856730011522"} 29 tendermint_consensus_block_gossip_receive_time_bucket{chain_id="test-chain-IrF74Y",le="1.9306977288832508"} 29 tendermint_consensus_block_gossip_receive_time_bucket{chain_id="test-chain-IrF74Y",le="5.1794746792312125"} 29 tendermint_consensus_block_gossip_receive_time_bucket{chain_id="test-chain-IrF74Y",le="13.894954943731381"} 29 tendermint_consensus_block_gossip_receive_time_bucket{chain_id="test-chain-IrF74Y",le="37.27593720314942"} 29 tendermint_consensus_block_gossip_receive_time_bucket{chain_id="test-chain-IrF74Y",le="100.00000000000006"} 29 tendermint_consensus_block_gossip_receive_time_bucket{chain_id="test-chain-IrF74Y",le="+Inf"} 29 tendermint_consensus_block_gossip_receive_time_sum{chain_id="test-chain-IrF74Y"} 0.06380 ``` ``` tendermint_consensus_block_gossip_parts_received{chain_id="test-chain-IrF74Y",matches_current="true"} 29 ```	2022-08-04 12:44:12 -04:00