Backport tendermint-v0.34.22 into main

.gitignore

@@ -25,6 +25,7 @@ docs/.vuepress/dist
 docs/package-lock.json   # To avoid security notifications. If the time comes to use VuePress, activate this.
 *.log
 docs/node_modules/
+docs/.vuepress/public/rpc
 index.html.md
 node/data
 
@@ -50,6 +51,14 @@ terraform.tfstate
 terraform.tfstate.backup
 terraform.tfstate.d
 profile\.out
+test/app/grpc_client
+test/loadtime/build
+test/e2e/build
+test/e2e/networks/*/
+test/logs
+test/maverick/maverick
+test/p2p/data/
+vendor
 test/fuzz/**/corpus
 test/fuzz/**/crashers
 test/fuzz/**/suppressions
@@ -60,3 +69,5 @@ test/fuzz/**/*.zip
 *.pdf
 *.gz
 *.dvi
+# Python virtual environments
+.venv

DOCKER/README.md

@@ -1,6 +1,6 @@
 # Docker
 
-Basically, see the [Tendermint v0.34.8 Docker](https://github.com/tendermint/tendermint/blob/v0.34.8/DOCKER/README.md).
+Basically, see the [Tendermint v0.34 Docker](https://github.com/tendermint/tendermint/blob/v0.34.x/DOCKER/README.md).
 
 ## Quick Start
 

abci/README.md

@@ -1,3 +1,3 @@
 # Application BlockChain Interface (ABCI)
 
-Basically, see the [Tendermint v0.34.8 ABCI spec](https://github.com/tendermint/tendermint/blob/v0.34.8/abci/README.md).
+Basically, see the [Tendermint v0.34 ABCI spec](https://github.com/tendermint/tendermint/blob/v0.34.x/abci/README.md).

abci/example/kvstore/README.md

@@ -1,3 +1,3 @@
 # KVStore
 
-Basically, see the [Tendermint v0.34.8 KVStore spec](https://github.com/tendermint/tendermint/blob/v0.34.8/abci/example/kvstore/README.md).
+Basically, see the [Tendermint v0.34 KVStore spec](https://github.com/tendermint/tendermint/blob/v0.34.x/abci/example/kvstore/README.md).

blockchain/v0/pool.go

@@ -32,6 +32,7 @@ const (
 	maxTotalRequesters        = 600
 	maxPendingRequests        = maxTotalRequesters
 	maxPendingRequestsPerPeer = 20
+	requestRetrySeconds       = 30
 
 	// Minimum recv rate to ensure we're receiving blocks from a peer fast
 	// enough. If a peer is not sending us data at at least that rate, we
@@ -602,7 +603,7 @@ OUTER_LOOP:
 			}
 			peer = bpr.pool.pickIncrAvailablePeer(bpr.height)
 			if peer == nil {
-				// log.Info("No peers available", "height", height)
+				bpr.Logger.Debug("No peers currently available; will retry shortly", "height", bpr.height)
 				time.Sleep(requestIntervalMS * time.Millisecond)
 				continue PICK_PEER_LOOP
 			}
@@ -612,6 +613,7 @@ OUTER_LOOP:
 		bpr.peerID = peer.id
 		bpr.mtx.Unlock()
 
+		to := time.NewTimer(requestRetrySeconds * time.Second)
 		// Send request and wait.
 		bpr.pool.sendRequest(bpr.height, peer.id)
 	WAIT_LOOP:
@@ -624,6 +626,11 @@ OUTER_LOOP:
 				return
 			case <-bpr.Quit():
 				return
+			case <-to.C:
+				bpr.Logger.Debug("Retrying block request after timeout", "height", bpr.height, "peer", bpr.peerID)
+				// Simulate a redo
+				bpr.reset()
+				continue OUTER_LOOP
 			case peerID := <-bpr.redoCh:
 				if peerID == bpr.peerID {
 					bpr.reset()

blockchain/v2/reactor_test.go

@@ -62,6 +62,9 @@ func (mp mockPeer) Get(string) interface{}  { return struct{}{} }
 
 func (mp mockPeer) String() string { return fmt.Sprintf("%v", mp.id) }
 
+func (mp mockPeer) SetRemovalFailed()      {}
+func (mp mockPeer) GetRemovalFailed() bool { return false }
+
 // nolint:unused // ignore
 type mockBlockStore struct {
 	blocks map[int64]*types.Block

cmd/ostracon/commands/version.go

@@ -1,6 +1,7 @@
 package commands
 
 import (
+	"encoding/json"
 	"fmt"
 
 	"github.com/spf13/cobra"
@@ -13,6 +14,25 @@ var VersionCmd = &cobra.Command{
 	Use:   "version",
 	Short: "Show version info",
 	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println(version.OCCoreSemVer)
+		if verbose {
+			values, _ := json.MarshalIndent(struct {
+				Ostracon      string `json:"ostracon"`
+				ABCI          string `json:"abci"`
+				BlockProtocol uint64 `json:"block_protocol"`
+				P2PProtocol   uint64 `json:"p2p_protocol"`
+			}{
+				Ostracon:      version.OCCoreSemVer,
+				ABCI:          version.ABCIVersion,
+				BlockProtocol: version.BlockProtocol,
+				P2PProtocol:   version.P2PProtocol,
+			}, "", "  ")
+			fmt.Println(string(values))
+		} else {
+			fmt.Println(version.OCCoreSemVer)
+		}
 	},
 }
+
+func init() {
+	VersionCmd.Flags().BoolVarP(&verbose, "verbose", "v", false, "Show protocol and library versions")
+}

config/toml.go

@@ -541,6 +541,7 @@ 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

consensus/README.md

@@ -1,3 +1,3 @@
 # Consensus
 
-Basically, see the [Tendermint v0.34.8 Consensus spec](https://github.com/tendermint/tendermint/blob/v0.34.8/consensus/README.md).
+Basically, see the [Tendermint v0.34 Consensus spec](https://github.com/tendermint/tendermint/blob/v0.34.x/consensus/README.md).

consensus/state.go

@@ -2313,10 +2313,11 @@ func (cs *State) voteTime() time.Time {
 	now := tmtime.Now()
 	minVoteTime := now
 	// TODO: We should remove next line in case we don't vote for v in case cs.ProposalBlock == nil,
-	// even if cs.LockedBlock != nil. See https://docs.tendermint.com/master/spec/.
+	// even if cs.LockedBlock != nil. See https://github.com/tendermint/tendermint/tree/v0.34.x/spec/.
 	timeIota := time.Duration(cs.state.ConsensusParams.Block.TimeIotaMs) * time.Millisecond
 	if cs.LockedBlock != nil {
-		// See the BFT time spec https://docs.tendermint.com/master/spec/consensus/bft-time.html
+		// See the BFT time spec
+		// https://github.com/tendermint/tendermint/blob/v0.34.x/spec/consensus/bft-time.md
 		minVoteTime = cs.LockedBlock.Time.Add(timeIota)
 	} else if cs.ProposalBlock != nil {
 		minVoteTime = cs.ProposalBlock.Time.Add(timeIota)

crypto/README.md

@@ -1,3 +1,3 @@
 # Crypto
 
-Basically, see the [Tendermint v0.34.8 Crypto spec](https://github.com/tendermint/tendermint/blob/v0.34.8/crypto/README.md).
+Basically, see the [Tendermint v0.34 Crypto spec](https://github.com/tendermint/tendermint/blob/v0.34.x/crypto/README.md).

crypto/merkle/README.md

@@ -1,3 +1,3 @@
 # Merkle Tree
 
-Basically, see the [Tendermint v0.34.8 Merkle Tree spec](https://github.com/tendermint/tendermint/blob/v0.34.8/crypto/merkle/README.md).
+Basically, see the [Tendermint v0.34 Merkle Tree spec](https://github.com/tendermint/tendermint/blob/v0.34.x/crypto/merkle/README.md).

docs/README.md

@@ -8,7 +8,7 @@ description: Ostracon is a blockchain application platform.
 Welcome to the Ostracon documentation!
 Therefore, sorry for under construction.
 
-Basically, you can find the information on [Tendermint v0.34.8 docs/README.md](https://github.com/tendermint/tendermint/blob/v0.34.8/docs/README.md)
+Basically, you can find the information on [Tendermint v0.34 docs/README.md](https://github.com/tendermint/tendermint/blob/v0.34.x/docs/README.md)
 
 In addition, we have prepared a simple document here.
 * [English](en)

evidence/doc.go

@@ -1,7 +1,7 @@
 /*
 Package evidence handles all evidence storage and gossiping from detection to block proposal.
 For the different types of evidence refer to the `evidence.go` file in the types package
-or https://github.com/tendermint/spec/blob/master/spec/consensus/light-client/accountability.md.
+or https://github.com/tendermint/tendermint/blob/v0.34.x/spec/consensus/light-client/accountability.md.
 
 # Gossiping
 

go.mod

@@ -9,7 +9,9 @@ require (
 	github.com/adlio/schema v1.3.4
 	github.com/btcsuite/btcd v0.22.1
 	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
+	github.com/bufbuild/buf v1.25.0
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
+	github.com/creachadair/taskgroup v0.3.2
 	github.com/fortytw2/leaktest v1.3.0
 	github.com/go-kit/kit v0.12.0
 	github.com/go-kit/log v0.2.1
@@ -21,41 +23,53 @@ require (
 	github.com/gtank/merlin v0.1.1
 	github.com/lib/pq v1.10.9
 	github.com/libp2p/go-buffer-pool v0.1.0
-	github.com/miekg/dns v1.1.55
 	github.com/minio/highwayhash v1.0.2
 	github.com/ory/dockertest v3.3.5+incompatible
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.16.0
-	github.com/rcrowley/go-metrics v0.0.0-20200313005456-10cdbea86bc0
+	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
 	github.com/rs/cors v1.9.0
 	github.com/sasha-s/go-deadlock v0.3.1
 	github.com/snikch/goodman v0.0.0-20171125024755-10e37e294daa
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/viper v1.16.0
 	github.com/stretchr/testify v1.8.4
+	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca
+)
+
+// ========================================
+// Added by Ostracon
+require (
+	github.com/Finschia/r2ishiguro_vrf v0.1.2
+	github.com/miekg/dns v1.1.55
+	github.com/oasisprotocol/curve25519-voi v0.0.0-20230110094441-db37f07504ce
+	github.com/rs/zerolog v1.29.1
 	github.com/tendermint/go-amino v0.16.0
-	github.com/tendermint/tendermint v0.34.21
+	github.com/tendermint/tendermint v0.34.22
+	gopkg.in/natefinch/lumberjack.v2 v2.2.1
+	gopkg.in/yaml.v3 v3.0.1
+)
+// ========================================
+
+require (
+	github.com/gofrs/uuid v4.4.0+incompatible
+	github.com/google/uuid v1.3.0
 	github.com/tendermint/tm-db v0.6.7
-	github.com/yahoo/coname v0.0.0-20170609175141-84592ddf8673 // indirect
 	golang.org/x/crypto v0.11.0
 	golang.org/x/net v0.12.0
-	gonum.org/v1/gonum v0.13.0
 	google.golang.org/grpc v1.56.2
-	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
-	github.com/Finschia/r2ishiguro_vrf v0.1.2
-	github.com/bufbuild/buf v1.25.0
-	github.com/creachadair/taskgroup v0.3.2
 	github.com/golangci/golangci-lint v1.53.3
-	github.com/klauspost/pgzip v1.2.6 // indirect
-	github.com/oasisprotocol/curve25519-voi v0.0.0-20230110094441-db37f07504ce
 	github.com/prometheus/common v0.42.0 // indirect
-	github.com/rs/zerolog v1.29.1
-	github.com/syndtr/goleveldb v1.0.1-0.20200815110645-5c35d600f0ca
 	github.com/vektra/mockery/v2 v2.32.0
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1
+)
+
+require (
+	github.com/informalsystems/tm-load-test v1.0.0
+	gonum.org/v1/gonum v0.13.0
+	google.golang.org/protobuf v1.31.0
 )
 
 require (
@@ -134,7 +148,6 @@ require (
 	github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gofrs/flock v0.8.1 // indirect
-	github.com/gofrs/uuid v4.4.0+incompatible // indirect
 	github.com/golang/snappy v0.0.3 // indirect
 	github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect
 	github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
@@ -173,6 +186,7 @@ require (
 	github.com/kisielk/gotool v1.0.0 // indirect
 	github.com/kkHAIKE/contextcheck v1.1.4 // indirect
 	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/klauspost/pgzip v1.2.5 // indirect
 	github.com/kulti/thelper v0.6.3 // indirect
 	github.com/kunwardeep/paralleltest v1.0.7 // indirect
 	github.com/kyoh86/exportloopref v0.1.11 // indirect
@@ -190,7 +204,7 @@ require (
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mbilski/exhaustivestruct v1.2.0 // indirect
 	github.com/mgechev/revive v1.3.2 // indirect
-	github.com/mimoo/StrobeGo v0.0.0-20181016162300-f8f6d4d2b643 // indirect
+	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moby/term v0.5.0 // indirect
@@ -223,6 +237,7 @@ require (
 	github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
 	github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
 	github.com/sashamelentyev/usestdlibvars v1.23.0 // indirect
+	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/securego/gosec/v2 v2.16.0 // indirect
 	github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
@@ -252,6 +267,7 @@ require (
 	github.com/vbatts/tar-split v0.11.3 // indirect
 	github.com/xen0n/gosmopolitan v1.2.1 // indirect
 	github.com/yagipy/maintidx v1.0.0 // indirect
+	github.com/yahoo/coname v0.0.0-20170609175141-84592ddf8673 // indirect
 	github.com/yeya24/promlinter v0.2.0 // indirect
 	github.com/ykadowak/zerologlint v0.1.2 // indirect
 	gitlab.com/bosi/decorder v0.2.3 // indirect
@@ -272,7 +288,6 @@ require (
 	golang.org/x/text v0.11.0 // indirect
 	golang.org/x/tools v0.11.0 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	honnef.co/go/tools v0.4.3 // indirect