tendermint: update to rc3 (#6892)

* modify light imports

* change abci.header to tmproto.header

* use rc

* rc

* fix import

* Merge PR #6893: fix key imports

* fix rc2

* tendermint: update 3 (#6899)

* tendermint: update 4 (#6919)

Co-authored-by: Alexander Bezobchuk <alexanderbez@users.noreply.github.com>

* tendermint: update 5 (#6923)

Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>

* bump to latest master

* tendermint: update (#6972)

Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>
Co-authored-by: Cory Levinson <cjlevinson@gmail.com>

* Update x/ibc/07-tendermint/types/test_utils.go

Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>

* address comment

* go mod

* bring back things

* fix test

* update tm proto files

Co-authored-by: Alexander Bezobchuk <alexanderbez@users.noreply.github.com>
Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
Co-authored-by: Aleksandr Bezobchuk <aleks.bezobchuk@gmail.com>
Co-authored-by: Cory Levinson <cjlevinson@gmail.com>
Co-authored-by: Federico Kunze <federico.kunze94@gmail.com>

server/export.go

@@ -9,6 +9,7 @@ import (
 	"os"
 
 	"github.com/spf13/cobra"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 	tmtypes "github.com/tendermint/tendermint/types"
 
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -75,17 +76,19 @@ func ExportCmd(appExporter types.AppExporter, defaultNodeHome string) *cobra.Com
 
 			doc.AppState = appState
 			doc.Validators = validators
-			doc.ConsensusParams = &tmtypes.ConsensusParams{
-				Block: tmtypes.BlockParams{
+			doc.ConsensusParams = &tmproto.ConsensusParams{
+				Block: tmproto.BlockParams{
 					MaxBytes:   cp.Block.MaxBytes,
 					MaxGas:     cp.Block.MaxGas,
 					TimeIotaMs: doc.ConsensusParams.Block.TimeIotaMs,
 				},
-				Evidence: tmtypes.EvidenceParams{
-					MaxAgeNumBlocks: cp.Evidence.MaxAgeNumBlocks,
-					MaxAgeDuration:  cp.Evidence.MaxAgeDuration,
+				Evidence: tmproto.EvidenceParams{
+					MaxAgeNumBlocks:  cp.Evidence.MaxAgeNumBlocks,
+					MaxAgeDuration:   cp.Evidence.MaxAgeDuration,
+					MaxNum:           cp.Evidence.MaxNum,
+					ProofTrialPeriod: cp.Evidence.ProofTrialPeriod,
 				},
-				Validator: tmtypes.ValidatorParams{
+				Validator: tmproto.ValidatorParams{
 					PubKeyTypes: cp.Validator.PubKeyTypes,
 				},
 			}

server/mock/app_test.go

@@ -3,11 +3,10 @@ package mock
 import (
 	"testing"
 
-	"github.com/tendermint/tendermint/types"
-
 	"github.com/stretchr/testify/require"
-
 	abci "github.com/tendermint/tendermint/abci/types"
+	tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
+	"github.com/tendermint/tendermint/types"
 )
 
 // TestInitApp makes sure we can initialize this thing without an error
@@ -57,7 +56,7 @@ func TestDeliverTx(t *testing.T) {
 	tx := NewTx(key, value)
 	txBytes := tx.GetSignBytes()
 
-	header := abci.Header{
+	header := tmproto.Header{
 		AppHash: []byte("apphash"),
 		Height:  1,
 	}

server/tm_cmds.go

@@ -116,8 +116,8 @@ against which this app has been compiled.
 			}{
 				Tendermint:    tversion.Version,
 				ABCI:          tversion.ABCIVersion,
-				BlockProtocol: tversion.BlockProtocol.Uint64(),
-				P2PProtocol:   tversion.P2PProtocol.Uint64(),
+				BlockProtocol: tversion.BlockProtocol,
+				P2PProtocol:   tversion.P2PProtocol,
 			})
 			if err != nil {
 				return err

server/util.go

@@ -129,7 +129,6 @@ func interceptConfigs(ctx *Context, rootViper *viper.Viper) (*tmcfg.Config, erro
 		conf.ProfListenAddress = "localhost:6060"
 		conf.P2P.RecvRate = 5120000
 		conf.P2P.SendRate = 5120000
-		conf.TxIndex.IndexAllKeys = true
 		conf.Consensus.TimeoutCommit = 5 * time.Second
 		tmcfg.WriteConfigFile(configFile, conf)
 	} else {