chore: tm 0.34 changes

Makefile

@@ -434,7 +434,7 @@ proto-check-breaking:
  @$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=main
 
 
-TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.0-rc6/proto/tendermint
+TM_URL = https://raw.githubusercontent.com/tendermint/tendermint/v0.34.19/proto/tendermint
 GOGO_PROTO_URL = https://raw.githubusercontent.com/regen-network/protobuf/cosmos
 COSMOS_PROTO_URL = https://raw.githubusercontent.com/regen-network/cosmos-proto/master
 CONFIO_URL = https://raw.githubusercontent.com/confio/ics23/v0.6.3

baseapp/abci.go

@@ -110,6 +110,12 @@ func (app *BaseApp) InitChain(req abci.RequestInitChain) (res abci.ResponseInitC
  }
 }
 
+// SetOption implements the ABCI interface.
+func (app *BaseApp) SetOption(req abci.RequestSetOption) (res abci.ResponseSetOption) {
+ // TODO: Implement!
+ return
+}
+
 // Info implements the ABCI interface.
 func (app *BaseApp) Info(req abci.RequestInfo) abci.ResponseInfo {
  lastCommitID := app.cms.LastCommitID()

baseapp/abci_test.go

@@ -6,7 +6,6 @@ import (
  "github.com/stretchr/testify/require"
  abci "github.com/tendermint/tendermint/abci/types"
  tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
- tmprototypes "github.com/tendermint/tendermint/proto/tendermint/types"
  dbm "github.com/tendermint/tm-db"
 
  pruningtypes "github.com/cosmos/cosmos-sdk/pruning/types"
@@ -111,8 +110,8 @@ func TestGetBlockRentionHeight(t *testing.T) {
 
  tc.bapp.SetParamStore(&paramStore{db: dbm.NewMemDB()})
  tc.bapp.InitChain(abci.RequestInitChain{
- ConsensusParams: &tmprototypes.ConsensusParams{
- Evidence: &tmprototypes.EvidenceParams{
+ ConsensusParams: &abci.ConsensusParams{
+ Evidence: &tmproto.EvidenceParams{
  MaxAgeNumBlocks: tc.maxAgeBlocks,
  },
  },

baseapp/baseapp.go

@@ -409,15 +409,15 @@ func (app *BaseApp) setDeliverState(header tmproto.Header) {
 
 // GetConsensusParams returns the current consensus parameters from the BaseApp's
 // ParamStore. If the BaseApp has no ParamStore defined, nil is returned.
-func (app *BaseApp) GetConsensusParams(ctx sdk.Context) *tmproto.ConsensusParams {
+func (app *BaseApp) GetConsensusParams(ctx sdk.Context) *abci.ConsensusParams {
  if app.paramStore == nil {
  return nil
  }
 
- cp := new(tmproto.ConsensusParams)
+ cp := new(abci.ConsensusParams)
 
  if app.paramStore.Has(ctx, ParamStoreKeyBlockParams) {
- var bp tmproto.BlockParams
+ var bp abci.BlockParams
 
  app.paramStore.Get(ctx, ParamStoreKeyBlockParams, &bp)
  cp.Block = &bp
@@ -448,7 +448,7 @@ func (app *BaseApp) AddRunTxRecoveryHandler(handlers ...RecoveryHandler) {
 }
 
 // StoreConsensusParams sets the consensus parameters to the baseapp's param store.
-func (app *BaseApp) StoreConsensusParams(ctx sdk.Context, cp *tmproto.ConsensusParams) {
+func (app *BaseApp) StoreConsensusParams(ctx sdk.Context, cp *abci.ConsensusParams) {
  if app.paramStore == nil {
  panic("cannot store consensus params with no params store set")
  }

baseapp/baseapp_test.go

@@ -6,6 +6,7 @@ import (
  "encoding/json"
  "fmt"
  "math/rand"
+ "os"
  "strings"
  "sync"
  "testing"
@@ -88,7 +89,7 @@ func (ps *paramStore) Get(_ sdk.Context, key []byte, ptr interface{}) {
 }
 
 func defaultLogger() log.Logger {
- return log.MustNewDefaultLogger("plain", "info", false).With("module", "sdk/app")
+ return log.NewTMLogger(log.NewSyncWriter(os.Stdout)).With("module", "sdk/app")
 }
 
 func newBaseApp(name string, options ...func(*BaseApp)) *BaseApp {
@@ -1392,8 +1393,8 @@ func TestMaxBlockGasLimits(t *testing.T) {
 
  app := setupBaseApp(t, anteOpt, routerOpt)
  app.InitChain(abci.RequestInitChain{
- ConsensusParams: &tmproto.ConsensusParams{
- Block: &tmproto.BlockParams{
+ ConsensusParams: &abci.ConsensusParams{
+ Block: &abci.BlockParams{
  MaxGas: 100,
  },
  },
@@ -1617,8 +1618,8 @@ func TestGasConsumptionBadTx(t *testing.T) {
 
  app := setupBaseApp(t, anteOpt, routerOpt)
  app.InitChain(abci.RequestInitChain{
- ConsensusParams: &tmproto.ConsensusParams{
- Block: &tmproto.BlockParams{
+ ConsensusParams: &abci.ConsensusParams{
+ Block: &abci.BlockParams{
  MaxGas: 9,
  },
  },
@@ -1777,16 +1778,16 @@ func TestGetMaximumBlockGas(t *testing.T) {
  app.InitChain(abci.RequestInitChain{})
  ctx := app.NewContext(true, tmproto.Header{})
 
- app.StoreConsensusParams(ctx, &tmproto.ConsensusParams{Block: &tmproto.BlockParams{MaxGas: 0}})
+ app.StoreConsensusParams(ctx, &abci.ConsensusParams{Block: &abci.BlockParams{MaxGas: 0}})
  require.Equal(t, uint64(0), app.getMaximumBlockGas(ctx))
 
- app.StoreConsensusParams(ctx, &tmproto.ConsensusParams{Block: &tmproto.BlockParams{MaxGas: -1}})
+ app.StoreConsensusParams(ctx, &abci.ConsensusParams{Block: &abci.BlockParams{MaxGas: -1}})
  require.Equal(t, uint64(0), app.getMaximumBlockGas(ctx))
 
- app.StoreConsensusParams(ctx, &tmproto.ConsensusParams{Block: &tmproto.BlockParams{MaxGas: 5000000}})
+ app.StoreConsensusParams(ctx, &abci.ConsensusParams{Block: &abci.BlockParams{MaxGas: 5000000}})
  require.Equal(t, uint64(5000000), app.getMaximumBlockGas(ctx))
 
- app.StoreConsensusParams(ctx, &tmproto.ConsensusParams{Block: &tmproto.BlockParams{MaxGas: -5000000}})
+ app.StoreConsensusParams(ctx, &abci.ConsensusParams{Block: &abci.BlockParams{MaxGas: -5000000}})
  require.Panics(t, func() { app.getMaximumBlockGas(ctx) })
 }
 
@@ -2185,8 +2186,8 @@ func TestBaseApp_EndBlock(t *testing.T) {
  name := t.Name()
  logger := defaultLogger()
 
- cp := &tmproto.ConsensusParams{
- Block: &tmproto.BlockParams{
+ cp := &abci.ConsensusParams{
+ Block: &abci.BlockParams{
  MaxGas: 5000000,
  },
  }

baseapp/grpcrouter_test.go

@@ -2,6 +2,7 @@ package baseapp_test
 
 import (
  "context"
+ "os"
  "sync"
  "testing"
 
@@ -55,7 +56,7 @@ func TestRegisterQueryServiceTwice(t *testing.T) {
  // Setup baseapp.
  db := dbm.NewMemDB()
  encCfg := simapp.MakeTestEncodingConfig()
- app := baseapp.NewBaseApp("test", log.MustNewDefaultLogger("plain", "info", false), db, encCfg.TxConfig.TxDecoder())
+ app := baseapp.NewBaseApp("test", log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, encCfg.TxConfig.TxDecoder())
  app.SetInterfaceRegistry(encCfg.InterfaceRegistry)
  testdata.RegisterInterfaces(encCfg.InterfaceRegistry)
 

baseapp/msg_service_router_test.go

@@ -1,6 +1,7 @@
 package baseapp_test
 
 import (
+ "os"
  "testing"
 
  "github.com/stretchr/testify/require"
@@ -22,7 +23,7 @@ func TestRegisterMsgService(t *testing.T) {
 
  // Create an encoding config that doesn't register testdata Msg services.
  encCfg := simapp.MakeTestEncodingConfig()
- app := baseapp.NewBaseApp("test", log.MustNewDefaultLogger("plain", "info", false), db, encCfg.TxConfig.TxDecoder())
+ app := baseapp.NewBaseApp("test", log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, encCfg.TxConfig.TxDecoder())
  app.SetInterfaceRegistry(encCfg.InterfaceRegistry)
  require.Panics(t, func() {
  testdata.RegisterMsgServer(
@@ -45,7 +46,7 @@ func TestRegisterMsgServiceTwice(t *testing.T) {
  // Setup baseapp.
  db := dbm.NewMemDB()
  encCfg := simapp.MakeTestEncodingConfig()
- app := baseapp.NewBaseApp("test", log.MustNewDefaultLogger("plain", "info", false), db, encCfg.TxConfig.TxDecoder())
+ app := baseapp.NewBaseApp("test", log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, encCfg.TxConfig.TxDecoder())
  app.SetInterfaceRegistry(encCfg.InterfaceRegistry)
  testdata.RegisterInterfaces(encCfg.InterfaceRegistry)
 
@@ -71,7 +72,7 @@ func TestMsgService(t *testing.T) {
  encCfg := simapp.MakeTestEncodingConfig()
  testdata.RegisterInterfaces(encCfg.InterfaceRegistry)
  db := dbm.NewMemDB()
- app := baseapp.NewBaseApp("test", log.MustNewDefaultLogger("plain", "info", false), db, encCfg.TxConfig.TxDecoder())
+ app := baseapp.NewBaseApp("test", log.NewTMLogger(log.NewSyncWriter(os.Stdout)), db, encCfg.TxConfig.TxDecoder())
  app.SetInterfaceRegistry(encCfg.InterfaceRegistry)
  testdata.RegisterMsgServer(
  app.MsgServiceRouter(),

baseapp/params.go

@@ -4,6 +4,7 @@ import (
  "errors"
  "fmt"
 
+ abci "github.com/tendermint/tendermint/abci/types"
  tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
  sdk "github.com/cosmos/cosmos-sdk/types"
@@ -30,7 +31,7 @@ type ParamStore interface {
 // ValidateBlockParams defines a stateless validation on BlockParams. This function
 // is called whenever the parameters are updated or stored.
 func ValidateBlockParams(i interface{}) error {
- v, ok := i.(tmproto.BlockParams)
+ v, ok := i.(abci.BlockParams)
  if !ok {
  return fmt.Errorf("invalid parameter type: %T", i)
  }

baseapp/params_test.go

@@ -4,6 +4,7 @@ import (
  "testing"
 
  "github.com/stretchr/testify/require"
+ abci "github.com/tendermint/tendermint/abci/types"
  tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
 
  "github.com/cosmos/cosmos-sdk/baseapp"
@@ -15,11 +16,11 @@ func TestValidateBlockParams(t *testing.T) {
  expectErr bool
  }{
  {nil, true},
- {&tmproto.BlockParams{}, true},
- {tmproto.BlockParams{}, true},
- {tmproto.BlockParams{MaxBytes: -1, MaxGas: -1}, true},
- {tmproto.BlockParams{MaxBytes: 2000000, MaxGas: -5}, true},
- {tmproto.BlockParams{MaxBytes: 2000000, MaxGas: 300000}, false},
+ {&abci.BlockParams{}, true},
+ {abci.BlockParams{}, true},
+ {abci.BlockParams{MaxBytes: -1, MaxGas: -1}, true},
+ {abci.BlockParams{MaxBytes: 2000000, MaxGas: -5}, true},
+ {abci.BlockParams{MaxBytes: 2000000, MaxGas: 300000}, false},
  }
 
  for _, tc := range testCases {

client/broadcast.go

@@ -5,6 +5,7 @@ import (
  "fmt"
  "strings"
 
+ "github.com/tendermint/tendermint/mempool"
  tmtypes "github.com/tendermint/tendermint/types"
  "google.golang.org/grpc/codes"
  "google.golang.org/grpc/status"
@@ -54,7 +55,7 @@ func CheckTendermintError(err error, tx tmtypes.Tx) *sdk.TxResponse {
  txHash := fmt.Sprintf("%X", tx.Hash())
 
  switch {
- case strings.Contains(errStr, strings.ToLower(tmtypes.ErrTxInCache.Error())):
+ case strings.Contains(errStr, strings.ToLower(mempool.ErrTxInCache.Error())):
  return &sdk.TxResponse{
  Code: sdkerrors.ErrTxInMempoolCache.ABCICode(),
  Codespace: sdkerrors.ErrTxInMempoolCache.Codespace(),

client/broadcast_test.go

@@ -7,8 +7,9 @@ import (
 
  "github.com/stretchr/testify/require"
  "github.com/tendermint/tendermint/crypto/tmhash"
+ "github.com/tendermint/tendermint/mempool"
  "github.com/tendermint/tendermint/rpc/client/mock"
- "github.com/tendermint/tendermint/rpc/coretypes"
+ coretypes "github.com/tendermint/tendermint/rpc/core/types"
  tmtypes "github.com/tendermint/tendermint/types"
 
  "github.com/cosmos/cosmos-sdk/client/flags"
@@ -42,9 +43,9 @@ func CreateContextWithErrorAndMode(err error, mode string) Context {
 // Test the correct code is returned when
 func TestBroadcastError(t *testing.T) {
  errors := map[error]uint32{
- tmtypes.ErrTxInCache: sdkerrors.ErrTxInMempoolCache.ABCICode(),
- tmtypes.ErrTxTooLarge{}: sdkerrors.ErrTxTooLarge.ABCICode(),
- tmtypes.ErrMempoolIsFull{}: sdkerrors.ErrMempoolIsFull.ABCICode(),
+ mempool.ErrTxInCache: sdkerrors.ErrTxInMempoolCache.ABCICode(),
+ mempool.ErrTxTooLarge{}: sdkerrors.ErrTxTooLarge.ABCICode(),
+ mempool.ErrMempoolIsFull{}: sdkerrors.ErrMempoolIsFull.ABCICode(),
  }
 
  modes := []string{

client/grpc/tmservice/block.go

@@ -5,7 +5,7 @@ import (
 
  "github.com/cosmos/cosmos-sdk/client"
  tmproto "github.com/tendermint/tendermint/proto/tendermint/types"
- "github.com/tendermint/tendermint/rpc/coretypes"
+ coretypes "github.com/tendermint/tendermint/rpc/core/types"
 )
 
 func getBlock(ctx context.Context, clientCtx client.Context, height *int64) (*coretypes.ResultBlock, error) {