LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

chore: bump TM to v0.35.0 release candidate (#10210)

Browse Source 
Integrate Tendermint v0.35.0, including changes to build and test
plumbing necessary to make everything build. This change does not
update any SDK APIs to make use of new features.

Co-authored-by: marbar3778 <marbar3778@yahoo.com>
Co-authored-by: tycho garen <garen@tychoish.com>
Co-authored-by: M. J. Fromberger <michael.j.fromberger@gmail.com>
Co-authored-by: Amaury <1293565+amaurym@users.noreply.github.com>
Co-authored-by: Callum Waters <cmwaters19@gmail.com>
This commit is contained in:
Aleksandr Bezobchuk
2021-11-16 11:24:38 -08:00
committed by GitHub
co-authored by marbar3778 tycho garen M. J. Fromberger Amaury Callum Waters
parent 3f368577ed
commit af8ad3d20d
83 changed files with 1465 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/broadcast.go
+1 -2
View File
@@ -5,7 +5,6 @@ import (
"fmt"
"strings"
"github.com/tendermint/tendermint/mempool"
tmtypes "github.com/tendermint/tendermint/types"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
@@ -55,7 +54,7 @@ func CheckTendermintError(err error, tx tmtypes.Tx) *sdk.TxResponse {
txHash := fmt.Sprintf("%X", tx.Hash())
switch {
case strings.Contains(errStr, strings.ToLower(mempool.ErrTxInCache.Error())):
case strings.Contains(errStr, strings.ToLower(tmtypes.ErrTxInCache.Error())):
return &sdk.TxResponse{
Code: sdkerrors.ErrTxInMempoolCache.ABCICode(),
Codespace: sdkerrors.ErrTxInMempoolCache.Codespace(),
client/broadcast_test.go
+7 -8
View File
@@ -7,9 +7,8 @@ import (
"github.com/stretchr/testify/require"
"github.com/tendermint/tendermint/crypto/tmhash"
"github.com/tendermint/tendermint/mempool"
"github.com/tendermint/tendermint/rpc/client/mock"
ctypes "github.com/tendermint/tendermint/rpc/core/types"
"github.com/tendermint/tendermint/rpc/coretypes"
tmtypes "github.com/tendermint/tendermint/types"
"github.com/cosmos/cosmos-sdk/client/flags"
@@ -21,15 +20,15 @@ type MockClient struct {
err error
}
func (c MockClient) BroadcastTxCommit(ctx context.Context, tx tmtypes.Tx) (*ctypes.ResultBroadcastTxCommit, error) {
func (c MockClient) BroadcastTxCommit(ctx context.Context, tx tmtypes.Tx) (*coretypes.ResultBroadcastTxCommit, error) {
return nil, c.err
}
func (c MockClient) BroadcastTxAsync(ctx context.Context, tx tmtypes.Tx) (*ctypes.ResultBroadcastTx, error) {
func (c MockClient) BroadcastTxAsync(ctx context.Context, tx tmtypes.Tx) (*coretypes.ResultBroadcastTx, error) {
return nil, c.err
}
func (c MockClient) BroadcastTxSync(ctx context.Context, tx tmtypes.Tx) (*ctypes.ResultBroadcastTx, error) {
func (c MockClient) BroadcastTxSync(ctx context.Context, tx tmtypes.Tx) (*coretypes.ResultBroadcastTx, error) {
return nil, c.err
}
@@ -43,9 +42,9 @@ func CreateContextWithErrorAndMode(err error, mode string) Context {
// Test the correct code is returned when
func TestBroadcastError(t *testing.T) {
errors := map[error]uint32{
mempool.ErrTxInCache: sdkerrors.ErrTxInMempoolCache.ABCICode(),
mempool.ErrTxTooLarge{}: sdkerrors.ErrTxTooLarge.ABCICode(),
mempool.ErrMempoolIsFull{}: sdkerrors.ErrMempoolIsFull.ABCICode(),
tmtypes.ErrTxInCache: sdkerrors.ErrTxInMempoolCache.ABCICode(),
tmtypes.ErrTxTooLarge{}: sdkerrors.ErrTxTooLarge.ABCICode(),
tmtypes.ErrMempoolIsFull{}: sdkerrors.ErrMempoolIsFull.ABCICode(),
}
modes := []string{
client/grpc/tmservice/block.go
+2 -3
View File
@@ -3,12 +3,11 @@ package tmservice
import (
"context"
ctypes "github.com/tendermint/tendermint/rpc/core/types"
"github.com/cosmos/cosmos-sdk/client"
"github.com/tendermint/tendermint/rpc/coretypes"
)
func getBlock(ctx context.Context, clientCtx client.Context, height *int64) (*ctypes.ResultBlock, error) {
func getBlock(ctx context.Context, clientCtx client.Context, height *int64) (*coretypes.ResultBlock, error) {
// get the node
node, err := clientCtx.GetNode()
if err != nil {
client/grpc/tmservice/query.pb.go
+82 -83
View File
@@ -636,8 +636,8 @@ var xxx_messageInfo_GetNodeInfoRequest proto.InternalMessageInfo
// GetNodeInfoResponse is the response type for the Query/GetNodeInfo RPC method.
type GetNodeInfoResponse struct {
DefaultNodeInfo *p2p.DefaultNodeInfo `protobuf:"bytes,1,opt,name=default_node_info,json=defaultNodeInfo,proto3" json:"default_node_info,omitempty"`
ApplicationVersion *VersionInfo `protobuf:"bytes,2,opt,name=application_version,json=applicationVersion,proto3" json:"application_version,omitempty"`
NodeInfo *p2p.NodeInfo `protobuf:"bytes,1,opt,name=node_info,json=nodeInfo,proto3" json:"node_info,omitempty"`
ApplicationVersion *VersionInfo `protobuf:"bytes,2,opt,name=application_version,json=applicationVersion,proto3" json:"application_version,omitempty"`
}
func (m *GetNodeInfoResponse) Reset() { *m = GetNodeInfoResponse{} }
@@ -673,9 +673,9 @@ func (m *GetNodeInfoResponse) XXX_DiscardUnknown() {
var xxx_messageInfo_GetNodeInfoResponse proto.InternalMessageInfo
func (m *GetNodeInfoResponse) GetDefaultNodeInfo() *p2p.DefaultNodeInfo {
func (m *GetNodeInfoResponse) GetNodeInfo() *p2p.NodeInfo {
if m != nil {
return m.DefaultNodeInfo
return m.NodeInfo
}
return nil
}
@@ -876,77 +876,76 @@ func init() {
}
var fileDescriptor_40c93fb3ef485c5d = []byte{
// 1106 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4d, 0x6f, 0x1b, 0x45,
0x18, 0xee, 0xda, 0x6d, 0x9c, 0xbc, 0x46, 0x90, 0x4c, 0x42, 0xe3, 0xac, 0x52, 0x37, 0xf8, 0xd0,
0x26, 0x84, 0xec, 0xca, 0x6e, 0x9b, 0xf6, 0x50, 0x8a, 0x1a, 0x02, 0x69, 0xd4, 0x52, 0x45, 0x1b,
0xc4, 0x01, 0x21, 0xad, 0xc6, 0xde, 0xc9, 0x66, 0x14, 0x7b, 0x67, 0xba, 0x33, 0x1b, 0x64, 0xa1,
0x0a, 0xc4, 0x89, 0x23, 0x12, 0x7f, 0x81, 0x03, 0xdc, 0x11, 0xc7, 0x8a, 0x23, 0xc7, 0xaa, 0x48,
0xa8, 0xe2, 0x84, 0x12, 0x7e, 0x08, 0xda, 0x99, 0x59, 0x67, 0xb7, 0x49, 0x6a, 0x27, 0x07, 0x24,
0x4e, 0xbb, 0xf3, 0x7e, 0xcd, 0xf3, 0x3c, 0xf3, 0xce, 0x07, 0xbc, 0xdb, 0x61, 0xa2, 0xc7, 0x84,
0xdb, 0xc6, 0x82, 0xb8, 0x92, 0x44, 0x01, 0x89, 0x7b, 0x34, 0x92, 0xee, 0x7e, 0xb3, 0x4d, 0x24,
0x6e, 0xba, 0x4f, 0x12, 0x12, 0xf7, 0x1d, 0x1e, 0x33, 0xc9, 0x50, 0x5d, 0xc7, 0x3a, 0x69, 0xac,
0x73, 0x14, 0xeb, 0x98, 0x58, 0x7b, 0x26, 0x64, 0x21, 0x53, 0xa1, 0x6e, 0xfa, 0xa7, 0xb3, 0xec,
0xb9, 0x90, 0xb1, 0xb0, 0x4b, 0x5c, 0x35, 0x6a, 0x27, 0x3b, 0x2e, 0x8e, 0x4c, 0x41, 0x7b, 0xde,
0xb8, 0x30, 0xa7, 0x2e, 0x8e, 0x22, 0x26, 0xb1, 0xa4, 0x2c, 0x12, 0xc6, 0x6b, 0xe7, 0xe0, 0xf0,
0x16, 0x77, 0x65, 0x9f, 0x93, 0xcc, 0x37, 0x9f, 0xf3, 0x29, 0xbb, 0xdb, 0xee, 0xb2, 0xce, 0xde,
0xa9, 0xde, 0x7c, 0x6e, 0x81, 0xb2, 0xe2, 0x37, 0x60, 0xcb, 0x71, 0x48, 0x23, 0x05, 0x22, 0x03,
0xaf, 0x63, 0x7d, 0xcd, 0xca, 0xf0, 0x57, 0x83, 0xc6, 0x37, 0x16, 0xd4, 0x37, 0x88, 0xfc, 0x0c,
0x77, 0x69, 0x80, 0x25, 0x8b, 0xb7, 0x89, 0x5c, 0xeb, 0x3f, 0x20, 0x34, 0xdc, 0x95, 0x1e, 0x79,
0x92, 0x10, 0x21, 0xd1, 0x65, 0x18, 0xdb, 0x55, 0x86, 0x9a, 0xb5, 0x60, 0x2d, 0x96, 0x3d, 0x33,
0x42, 0x1f, 0x03, 0x1c, 0xcd, 0x54, 0x2b, 0x2d, 0x58, 0x8b, 0xd5, 0xd6, 0x35, 0x27, 0xaf, 0xae,
0x96, 0xdd, 0xc0, 0x72, 0xb6, 0x70, 0x48, 0x4c, 0x4d, 0x2f, 0x97, 0xd9, 0x78, 0x69, 0xc1, 0xd5,
0x53, 0x21, 0x08, 0xce, 0x22, 0x41, 0xd0, 0x3b, 0xf0, 0x86, 0x92, 0xc6, 0x2f, 0x20, 0xa9, 0x2a,
0x9b, 0x0e, 0x45, 0x9b, 0x00, 0xfb, 0x59, 0x09, 0x51, 0x2b, 0x2d, 0x94, 0x17, 0xab, 0xad, 0x25,
0xe7, 0xf5, 0x8b, 0xed, 0x0c, 0x26, 0xf5, 0x72, 0xc9, 0x68, 0xa3, 0xc0, 0xac, 0xac, 0x98, 0x5d,
0x1f, 0xca, 0x4c, 0x43, 0x2d, 0x50, 0xdb, 0x81, 0xf9, 0x0d, 0x22, 0x1f, 0x61, 0x49, 0x44, 0x81,
0x5f, 0x26, 0x6d, 0x51, 0x42, 0xeb, 0xdc, 0x12, 0xfe, 0x69, 0xc1, 0x95, 0x53, 0x26, 0xfa, 0x7f,
0x0b, 0xf8, 0xcc, 0x82, 0x89, 0xc1, 0x14, 0xa8, 0x05, 0x15, 0x1c, 0x04, 0x31, 0x11, 0x42, 0xe1,
0x9f, 0x58, 0xab, 0xbd, 0xf8, 0x65, 0x65, 0xc6, 0x94, 0xbd, 0xaf, 0x3d, 0xdb, 0x32, 0xa6, 0x51,
0xe8, 0x65, 0x81, 0x68, 0x05, 0x2a, 0x3c, 0x69, 0xfb, 0x7b, 0xa4, 0x6f, 0x5a, 0x74, 0xc6, 0xd1,
0xfb, 0xd5, 0xc9, 0xb6, 0xb2, 0x73, 0x3f, 0xea, 0x7b, 0x63, 0x3c, 0x69, 0x3f, 0x24, 0xfd, 0x54,
0xa7, 0x7d, 0x26, 0x69, 0x14, 0xfa, 0x9c, 0x7d, 0x49, 0x62, 0x85, 0xbd, 0xec, 0x55, 0xb5, 0x6d,
0x2b, 0x35, 0xa1, 0x65, 0x98, 0xe2, 0x31, 0xe3, 0x4c, 0x90, 0xd8, 0xe7, 0x31, 0x65, 0x31, 0x95,
0xfd, 0xda, 0x45, 0x15, 0x37, 0x99, 0x39, 0xb6, 0x8c, 0xbd, 0xd1, 0x84, 0xd9, 0x0d, 0x22, 0xd7,
0x52, 0x99, 0x47, 0xdc, 0x57, 0x8d, 0xaf, 0xa1, 0x76, 0x3c, 0xc5, 0x2c, 0xe3, 0x4d, 0x18, 0xd7,
0xcb, 0x48, 0x03, 0xd3, 0x2e, 0x73, 0xf9, 0x55, 0xd1, 0x07, 0x84, 0x4a, 0xdd, 0x5c, 0xf7, 0x2a,
0x2a, 0x74, 0x33, 0x40, 0x2b, 0x70, 0x49, 0xfd, 0x1a, 0x05, 0x66, 0x4f, 0x49, 0xf1, 0x74, 0x54,
0x63, 0x16, 0xde, 0x1e, 0x34, 0x93, 0x76, 0x68, 0xc4, 0x8d, 0xa7, 0x70, 0xf9, 0x55, 0xc7, 0x7f,
0x89, 0x6b, 0x1a, 0xa6, 0x36, 0x88, 0xdc, 0xee, 0x47, 0x9d, 0x74, 0x85, 0x0d, 0x26, 0x07, 0x50,
0xde, 0x68, 0xf0, 0xd4, 0xa0, 0x22, 0xb4, 0x49, 0xc1, 0x19, 0xf7, 0xb2, 0x61, 0x63, 0x46, 0xc5,
0x3f, 0x66, 0x01, 0xd9, 0x8c, 0x76, 0x58, 0x56, 0xe5, 0x37, 0x0b, 0xa6, 0x0b, 0x66, 0x53, 0xe7,
0x21, 0x4c, 0x05, 0x64, 0x07, 0x27, 0x5d, 0xe9, 0x47, 0x2c, 0x20, 0x3e, 0x8d, 0x76, 0x98, 0x21,
0x78, 0x35, 0x8f, 0x96, 0xb7, 0xb8, 0xb3, 0xae, 0x03, 0x07, 0x35, 0xde, 0x0a, 0x8a, 0x06, 0xf4,
0x05, 0x4c, 0x63, 0xce, 0xbb, 0xb4, 0xa3, 0x7a, 0xdb, 0xdf, 0x27, 0xb1, 0x38, 0x3a, 0x39, 0x97,
0x87, 0xee, 0x34, 0x1d, 0xae, 0x4a, 0xa3, 0x5c, 0x1d, 0x63, 0x6f, 0xfc, 0x54, 0x82, 0x6a, 0x2e,
0x06, 0x21, 0xb8, 0x18, 0xe1, 0x1e, 0xd1, 0x3b, 0xc5, 0x53, 0xff, 0x68, 0x0e, 0xc6, 0x31, 0xe7,
0xbe, 0xb2, 0x97, 0x94, 0xbd, 0x82, 0x39, 0x7f, 0x9c, 0xba, 0x6a, 0x50, 0xc9, 0x00, 0x95, 0xb5,
0xc7, 0x0c, 0xd1, 0x15, 0x80, 0x90, 0x4a, 0xbf, 0xc3, 0x7a, 0x3d, 0x2a, 0x55, 0xa3, 0x4f, 0x78,
0x13, 0x21, 0x95, 0x1f, 0x2a, 0x43, 0xea, 0x6e, 0x27, 0xb4, 0x1b, 0xf8, 0x12, 0x87, 0xa2, 0x76,
0x49, 0xbb, 0x95, 0xe5, 0x53, 0x1c, 0x0a, 0x95, 0xcd, 0x06, 0x5c, 0xc7, 0x4c, 0x36, 0x33, 0x48,
0xd1, 0x47, 0x59, 0x76, 0x40, 0xb8, 0xa8, 0x55, 0xd4, 0xa1, 0x73, 0x6d, 0x98, 0x14, 0x9f, 0xb0,
0x20, 0xe9, 0x12, 0x33, 0xcb, 0x3a, 0xe1, 0x02, 0xbd, 0x07, 0xc8, 0xdc, 0x71, 0x22, 0xd8, 0x1b,
0xcc, 0x36, 0xae, 0x66, 0x9b, 0xd4, 0x9e, 0xed, 0x60, 0x2f, 0x93, 0xea, 0x01, 0x8c, 0xe9, 0x12,
0xa9, 0x48, 0x1c, 0xcb, 0xdd, 0x4c, 0xa4, 0xf4, 0x3f, 0xaf, 0x44, 0xa9, 0xa8, 0xc4, 0x24, 0x94,
0x45, 0xd2, 0x33, 0xfa, 0xa4, 0xbf, 0xad, 0xef, 0x26, 0xa0, 0xb2, 0x4d, 0xe2, 0x7d, 0xda, 0x21,
0xe8, 0x67, 0x0b, 0xaa, 0xb9, 0x1e, 0x42, 0xad, 0x61, 0x34, 0x8e, 0xf7, 0xa1, 0x7d, 0xe3, 0x4c,
0x39, 0xba, 0x49, 0x1b, 0xcd, 0x6f, 0xff, 0xf8, 0xe7, 0x87, 0xd2, 0x32, 0x5a, 0x72, 0x87, 0x3c,
0x83, 0x06, 0x2d, 0x8c, 0x7e, 0xb4, 0x00, 0x8e, 0xb6, 0x0d, 0x6a, 0x8e, 0x30, 0x6d, 0x71, 0xdf,
0xd9, 0xad, 0xb3, 0xa4, 0x18, 0xa0, 0xae, 0x02, 0xba, 0x84, 0xae, 0x0f, 0x03, 0x6a, 0x36, 0x2b,
0xfa, 0xd5, 0x82, 0x37, 0x8b, 0x27, 0x0e, 0xba, 0x35, 0xc2, 0xbc, 0xc7, 0x8f, 0x2e, 0x7b, 0xf5,
0xac, 0x69, 0x06, 0xf2, 0x2d, 0x05, 0xd9, 0x45, 0x2b, 0xc3, 0x20, 0xab, 0x23, 0x4a, 0xb8, 0x5d,
0x55, 0x03, 0x3d, 0xb3, 0x60, 0xf2, 0xd5, 0x43, 0x1c, 0xdd, 0x1e, 0x01, 0xc3, 0x49, 0x37, 0x85,
0x7d, 0xe7, 0xec, 0x89, 0x06, 0xfe, 0x6d, 0x05, 0xbf, 0x89, 0xdc, 0x11, 0xe1, 0x7f, 0xa5, 0xef,
0xa0, 0xa7, 0xe8, 0x85, 0x95, 0xbb, 0x04, 0xf2, 0x2f, 0x0a, 0x74, 0x77, 0x64, 0x25, 0x4f, 0x78,
0xf1, 0xd8, 0xef, 0x9f, 0x33, 0xdb, 0xf0, 0xb9, 0xab, 0xf8, 0xac, 0xa2, 0x9b, 0xc3, 0xf8, 0x1c,
0x3d, 0x46, 0x88, 0x1c, 0xac, 0xca, 0x5f, 0x96, 0xba, 0x8d, 0x4f, 0x7a, 0x69, 0xa2, 0x7b, 0x23,
0x00, 0x7b, 0xcd, 0x2b, 0xd9, 0xfe, 0xe0, 0xdc, 0xf9, 0x86, 0xda, 0x3d, 0x45, 0xed, 0x0e, 0x5a,
0x3d, 0x1b, 0xb5, 0x6c, 0xc5, 0xd6, 0x1e, 0xfd, 0x7e, 0x50, 0xb7, 0x9e, 0x1f, 0xd4, 0xad, 0xbf,
0x0f, 0xea, 0xd6, 0xf7, 0x87, 0xf5, 0x0b, 0xcf, 0x0f, 0xeb, 0x17, 0x5e, 0x1e, 0xd6, 0x2f, 0x7c,
0xde, 0x0a, 0xa9, 0xdc, 0x4d, 0xda, 0x4e, 0x87, 0xf5, 0xb2, 0xda, 0xfa, 0xb3, 0x22, 0x82, 0x3d,
0xb7, 0xd3, 0xa5, 0x24, 0x92, 0x6e, 0x18, 0xf3, 0x8e, 0x2b, 0x7b, 0x42, 0x1f, 0x66, 0xed, 0x31,
0xf5, 0x3a, 0xba, 0xf1, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x4b, 0xcb, 0x77, 0x6d, 0x5a, 0x0d,
0x00, 0x00,
// 1096 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x56, 0x4f, 0x6f, 0x1b, 0xc5,
0x1b, 0xce, 0xda, 0x6d, 0x1c, 0xbf, 0xfe, 0xe9, 0xa7, 0x74, 0x12, 0x9a, 0xcd, 0x2a, 0x35, 0xc1,
0x87, 0x36, 0x21, 0x64, 0x57, 0x76, 0x9b, 0xb4, 0x87, 0x52, 0xd4, 0x50, 0x48, 0x23, 0x4a, 0x15,
0x6d, 0x10, 0x07, 0x84, 0xb4, 0x5a, 0x7b, 0x27, 0x9b, 0x91, 0xed, 0x9d, 0xe9, 0xce, 0xd8, 0xc8,
0x42, 0x15, 0x88, 0x13, 0x47, 0x24, 0xbe, 0x02, 0x07, 0xe0, 0x8c, 0x38, 0xf6, 0xcc, 0xb1, 0x2a,
0x12, 0xaa, 0x38, 0xa1, 0x84, 0x0f, 0x82, 0x76, 0x66, 0xd6, 0xde, 0x6d, 0x92, 0xda, 0xce, 0x01,
0x89, 0xd3, 0xce, 0xbc, 0xff, 0xe6, 0x79, 0x9e, 0x99, 0x79, 0x77, 0xe0, 0xed, 0x16, 0xe5, 0x5d,
0xca, 0x9d, 0xa6, 0xcf, 0xb1, 0x23, 0x70, 0x14, 0xe0, 0xb8, 0x4b, 0x22, 0xe1, 0xf4, 0xeb, 0x4d,
0x2c, 0xfc, 0xba, 0xf3, 0xa4, 0x87, 0xe3, 0x81, 0xcd, 0x62, 0x2a, 0x28, 0xaa, 0xaa, 0x58, 0x3b,
0x89, 0xb5, 0x47, 0xb1, 0xb6, 0x8e, 0xb5, 0x16, 0x43, 0x1a, 0x52, 0x19, 0xea, 0x24, 0x23, 0x95,
0x65, 0x2d, 0x87, 0x94, 0x86, 0x1d, 0xec, 0xc8, 0x59, 0xb3, 0x77, 0xe8, 0xf8, 0x91, 0x2e, 0x68,
0xad, 0x68, 0x97, 0xcf, 0x88, 0xe3, 0x47, 0x11, 0x15, 0xbe, 0x20, 0x34, 0xe2, 0xda, 0x6b, 0x65,
0xe0, 0xb0, 0x06, 0x73, 0xc4, 0x80, 0xe1, 0xd4, 0xb7, 0x92, 0xf1, 0x49, 0xbb, 0xd3, 0xec, 0xd0,
0x56, 0xfb, 0x5c, 0x6f, 0x36, 0x37, 0x47, 0x59, 0xf2, 0x1b, 0xb2, 0x65, 0x7e, 0x48, 0x22, 0x09,
0x22, 0x05, 0xaf, 0x62, 0x3d, 0xc5, 0x4a, 0xf3, 0x97, 0x93, 0xda, 0xd7, 0x06, 0x54, 0x77, 0xb1,
0xf8, 0xd4, 0xef, 0x90, 0xc0, 0x17, 0x34, 0x3e, 0xc0, 0x62, 0x67, 0xf0, 0x10, 0x93, 0xf0, 0x48,
0xb8, 0xf8, 0x49, 0x0f, 0x73, 0x81, 0xae, 0xc2, 0xec, 0x91, 0x34, 0x98, 0xc6, 0xaa, 0xb1, 0x56,
0x74, 0xf5, 0x0c, 0x7d, 0x08, 0x30, 0x5a, 0xc9, 0x2c, 0xac, 0x1a, 0x6b, 0x95, 0xc6, 0x75, 0x3b,
0xab, 0xae, 0x92, 0x5d, 0xc3, 0xb2, 0xf7, 0xfd, 0x10, 0xeb, 0x9a, 0x6e, 0x26, 0xb3, 0xf6, 0xd2,
0x80, 0x37, 0xcf, 0x85, 0xc0, 0x19, 0x8d, 0x38, 0x46, 0x6f, 0xc1, 0xff, 0xa4, 0x34, 0x5e, 0x0e,
0x49, 0x45, 0xda, 0x54, 0x28, 0xda, 0x03, 0xe8, 0xa7, 0x25, 0xb8, 0x59, 0x58, 0x2d, 0xae, 0x55,
0x1a, 0xeb, 0xf6, 0xeb, 0x37, 0xdb, 0x1e, 0x2e, 0xea, 0x66, 0x92, 0xd1, 0x6e, 0x8e, 0x59, 0x51,
0x32, 0xbb, 0x31, 0x96, 0x99, 0x82, 0x9a, 0xa3, 0x76, 0x08, 0x2b, 0xbb, 0x58, 0x3c, 0xf2, 0x05,
0xe6, 0x39, 0x7e, 0xa9, 0xb4, 0x79, 0x09, 0x8d, 0x0b, 0x4b, 0xf8, 0x87, 0x01, 0xd7, 0xce, 0x59,
0xe8, 0xbf, 0x2d, 0xe0, 0x33, 0x03, 0xca, 0xc3, 0x25, 0x50, 0x03, 0x4a, 0x7e, 0x10, 0xc4, 0x98,
0x73, 0x89, 0xbf, 0xbc, 0x63, 0xbe, 0xf8, 0x65, 0x73, 0x51, 0x97, 0xbd, 0xaf, 0x3c, 0x07, 0x22,
0x26, 0x51, 0xe8, 0xa6, 0x81, 0x68, 0x13, 0x4a, 0xac, 0xd7, 0xf4, 0xda, 0x78, 0xa0, 0x8f, 0xe8,
0xa2, 0xad, 0xee, 0xab, 0x9d, 0x5e, 0x65, 0xfb, 0x7e, 0x34, 0x70, 0x67, 0x59, 0xaf, 0xf9, 0x11,
0x1e, 0x24, 0x3a, 0xf5, 0xa9, 0x20, 0x51, 0xe8, 0x31, 0xfa, 0x05, 0x8e, 0x25, 0xf6, 0xa2, 0x5b,
0x51, 0xb6, 0xfd, 0xc4, 0x84, 0x36, 0xe0, 0x0a, 0x8b, 0x29, 0xa3, 0x1c, 0xc7, 0x1e, 0x8b, 0x09,
0x8d, 0x89, 0x18, 0x98, 0x97, 0x64, 0xdc, 0x7c, 0xea, 0xd8, 0xd7, 0xf6, 0x5a, 0x1d, 0x96, 0x76,
0xb1, 0xd8, 0x49, 0x64, 0x9e, 0xf0, 0x5e, 0xd5, 0xbe, 0x02, 0xf3, 0x74, 0x8a, 0xde, 0xc6, 0x5b,
0x30, 0xa7, 0xb6, 0x91, 0x04, 0xfa, 0xb8, 0x2c, 0x67, 0x77, 0x45, 0x35, 0x08, 0x99, 0xba, 0xf7,
0xc0, 0x2d, 0xc9, 0xd0, 0xbd, 0x00, 0x6d, 0xc2, 0x65, 0x39, 0xd4, 0x0a, 0x2c, 0x9d, 0x93, 0xe2,
0xaa, 0xa8, 0xda, 0x12, 0xbc, 0x31, 0x3c, 0x4c, 0xca, 0xa1, 0x10, 0xd7, 0x9e, 0xc2, 0xd5, 0x57,
0x1d, 0xff, 0x26, 0xae, 0x05, 0xb8, 0xb2, 0x8b, 0xc5, 0xc1, 0x20, 0x6a, 0x25, 0x3b, 0xac, 0x31,
0xd9, 0x80, 0xb2, 0x46, 0x8d, 0xc7, 0x84, 0x12, 0x57, 0x26, 0x09, 0x67, 0xce, 0x4d, 0xa7, 0xb5,
0x45, 0x19, 0xff, 0x98, 0x06, 0x78, 0x2f, 0x3a, 0xa4, 0x69, 0x95, 0x9f, 0x0d, 0x58, 0xc8, 0x99,
0x75, 0x9d, 0x2d, 0x28, 0x47, 0x34, 0xc0, 0x1e, 0x89, 0x0e, 0xa9, 0x26, 0x66, 0x66, 0x51, 0xb2,
0x06, 0xb3, 0x87, 0x49, 0x73, 0x91, 0x1e, 0xa1, 0xcf, 0x61, 0xc1, 0x67, 0xac, 0x43, 0x5a, 0xf2,
0x14, 0x7b, 0x7d, 0x1c, 0xf3, 0x51, 0x8f, 0xdc, 0x18, 0x7b, 0xa7, 0x54, 0xb8, 0xac, 0x89, 0x32,
0x75, 0xb4, 0xbd, 0xf6, 0x63, 0x01, 0x2a, 0x99, 0x18, 0x84, 0xe0, 0x52, 0xe4, 0x77, 0xb1, 0xba,
0x13, 0xae, 0x1c, 0xa3, 0x65, 0x98, 0xf3, 0x19, 0xf3, 0xa4, 0xbd, 0x20, 0xed, 0x25, 0x9f, 0xb1,
0xc7, 0x89, 0xcb, 0x84, 0x52, 0x0a, 0xa8, 0xa8, 0x3c, 0x7a, 0x8a, 0xae, 0x01, 0x84, 0x44, 0x78,
0x2d, 0xda, 0xed, 0x12, 0x21, 0x8f, 0x74, 0xd9, 0x2d, 0x87, 0x44, 0xbc, 0x2f, 0x0d, 0x89, 0xbb,
0xd9, 0x23, 0x9d, 0xc0, 0x13, 0x7e, 0xc8, 0xcd, 0xcb, 0xca, 0x2d, 0x2d, 0x9f, 0xf8, 0x21, 0x97,
0xd9, 0x74, 0xc8, 0x75, 0x56, 0x67, 0x53, 0x8d, 0x14, 0x7d, 0x90, 0x66, 0x07, 0x98, 0x71, 0xb3,
0x24, 0xdb, 0xcb, 0xf5, 0x71, 0x52, 0x7c, 0x4c, 0x83, 0x5e, 0x07, 0xeb, 0x55, 0x1e, 0x60, 0xc6,
0xd1, 0x3b, 0x80, 0xf4, 0xdf, 0x8c, 0x07, 0xed, 0xe1, 0x6a, 0x73, 0x72, 0xb5, 0x79, 0xe5, 0x39,
0x08, 0xda, 0xa9, 0x54, 0x0f, 0x61, 0x56, 0x95, 0x48, 0x44, 0x62, 0xbe, 0x38, 0x4a, 0x45, 0x4a,
0xc6, 0x59, 0x25, 0x0a, 0x79, 0x25, 0xe6, 0xa1, 0xc8, 0x7b, 0x5d, 0xad, 0x4f, 0x32, 0x6c, 0x7c,
0x5b, 0x86, 0xd2, 0x01, 0x8e, 0xfb, 0xa4, 0x85, 0xd1, 0x4f, 0x06, 0x54, 0x32, 0xa7, 0x05, 0x35,
0xc6, 0xd1, 0x38, 0x7d, 0xe2, 0xac, 0x9b, 0x53, 0xe5, 0xa8, 0xe3, 0x58, 0xab, 0x7f, 0xf3, 0xfb,
0xdf, 0xdf, 0x17, 0x36, 0xd0, 0xba, 0x33, 0xe6, 0xc1, 0x33, 0x3c, 0xb4, 0xe8, 0x07, 0x03, 0x60,
0x74, 0x41, 0x50, 0x7d, 0x82, 0x65, 0xf3, 0x37, 0xcc, 0x6a, 0x4c, 0x93, 0xa2, 0x81, 0x3a, 0x12,
0xe8, 0x3a, 0xba, 0x31, 0x0e, 0xa8, 0xbe, 0x96, 0xe8, 0x57, 0x03, 0xfe, 0x9f, 0xef, 0x2d, 0x68,
0x6b, 0x82, 0x75, 0x4f, 0x37, 0x29, 0x6b, 0x7b, 0xda, 0x34, 0x0d, 0x79, 0x4b, 0x42, 0x76, 0xd0,
0xe6, 0x38, 0xc8, 0xb2, 0x19, 0x71, 0xa7, 0x23, 0x6b, 0xa0, 0x67, 0x06, 0xcc, 0xbf, 0xda, 0xae,
0xd1, 0xed, 0x09, 0x30, 0x9c, 0xf5, 0x4f, 0xb0, 0xee, 0x4c, 0x9f, 0xa8, 0xe1, 0xdf, 0x96, 0xf0,
0xeb, 0xc8, 0x99, 0x10, 0xfe, 0x97, 0xea, 0x6f, 0xf3, 0x14, 0xbd, 0x30, 0x32, 0xed, 0x3e, 0xfb,
0x76, 0x40, 0x77, 0x27, 0x56, 0xf2, 0x8c, 0xb7, 0x8d, 0xf5, 0xee, 0x05, 0xb3, 0x35, 0x9f, 0xbb,
0x92, 0xcf, 0x36, 0xba, 0x35, 0x8e, 0xcf, 0xe8, 0xd9, 0x81, 0xc5, 0x70, 0x57, 0xfe, 0x34, 0xe4,
0x7f, 0xf7, 0xac, 0x37, 0x25, 0xba, 0x37, 0x01, 0xb0, 0xd7, 0xbc, 0x87, 0xad, 0xf7, 0x2e, 0x9c,
0xaf, 0xa9, 0xdd, 0x93, 0xd4, 0xee, 0xa0, 0xed, 0xe9, 0xa8, 0xa5, 0x3b, 0xb6, 0xf3, 0xe8, 0xb7,
0xe3, 0xaa, 0xf1, 0xfc, 0xb8, 0x6a, 0xfc, 0x75, 0x5c, 0x35, 0xbe, 0x3b, 0xa9, 0xce, 0x3c, 0x3f,
0xa9, 0xce, 0xbc, 0x3c, 0xa9, 0xce, 0x7c, 0xd6, 0x08, 0x89, 0x38, 0xea, 0x35, 0xed, 0x16, 0xed,
0xa6, 0xb5, 0xd5, 0x67, 0x93, 0x07, 0x6d, 0xa7, 0xd5, 0x21, 0x38, 0x12, 0x4e, 0x18, 0xb3, 0x96,
0x23, 0xba, 0x5c, 0x35, 0xb3, 0xe6, 0xac, 0x7c, 0x07, 0xdd, 0xfc, 0x27, 0x00, 0x00, 0xff, 0xff,
0x1c, 0x72, 0x7c, 0x16, 0x44, 0x0d, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@@ -1712,9 +1711,9 @@ func (m *GetNodeInfoResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
i--
dAtA[i] = 0x12
}
if m.DefaultNodeInfo != nil {
if m.NodeInfo != nil {
{
size, err := m.DefaultNodeInfo.MarshalToSizedBuffer(dAtA[:i])
size, err := m.NodeInfo.MarshalToSizedBuffer(dAtA[:i])
if err != nil {
return 0, err
}
@@ -2055,8 +2054,8 @@ func (m *GetNodeInfoResponse) Size() (n int) {
}
var l int
_ = l
if m.DefaultNodeInfo != nil {
l = m.DefaultNodeInfo.Size()
if m.NodeInfo != nil {
l = m.NodeInfo.Size()
n += 1 + l + sovQuery(uint64(l))
}
if m.ApplicationVersion != nil {
@@ -3325,7 +3324,7 @@ func (m *GetNodeInfoResponse) Unmarshal(dAtA []byte) error {
switch fieldNum {
case 1:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field DefaultNodeInfo", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field NodeInfo", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
@@ -3352,10 +3351,10 @@ func (m *GetNodeInfoResponse) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if m.DefaultNodeInfo == nil {
m.DefaultNodeInfo = &p2p.DefaultNodeInfo{}
if m.NodeInfo == nil {
m.NodeInfo = &p2p.NodeInfo{}
}
if err := m.DefaultNodeInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
if err := m.NodeInfo.Unmarshal(dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
client/grpc/tmservice/service.go
+1 -1
View File
@@ -182,7 +182,7 @@ func (s queryServer) GetNodeInfo(ctx context.Context, req *GetNodeInfoRequest) (
}
resp := GetNodeInfoResponse{
DefaultNodeInfo: protoNodeInfo,
NodeInfo: protoNodeInfo,
ApplicationVersion: &VersionInfo{
AppName: nodeInfo.AppName,
Name: nodeInfo.Name,
client/grpc/tmservice/service_test.go
+2 -2
View File
@@ -204,7 +204,7 @@ func (s IntegrationTestSuite) TestValidatorSetByHeight_GRPC() {
expErrMsg string
}{
{"nil request", nil, true, "request cannot be nil"},
{"empty request", &tmservice.GetValidatorSetByHeightRequest{}, true, "height must be greater than 0"},
{"empty request", &tmservice.GetValidatorSetByHeightRequest{}, true, "height must be greater than zero"},
{"no pagination", &tmservice.GetValidatorSetByHeightRequest{Height: 1}, false, ""},
{"with pagination", &tmservice.GetValidatorSetByHeightRequest{Height: 1, Pagination: &qtypes.PageRequest{Offset: 0, Limit: 1}}, false, ""},
}
@@ -232,7 +232,7 @@ func (s IntegrationTestSuite) TestValidatorSetByHeight_GRPCGateway() {
expErr bool
expErrMsg string
}{
{"invalid height", fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/%d", vals[0].APIAddress, -1), true, "height must be greater than 0"},
{"invalid height", fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/%d", vals[0].APIAddress, -1), true, "height must be greater than zero"},
{"no pagination", fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/%d", vals[0].APIAddress, 1), false, ""},
{"pagination invalid fields", fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/%d?pagination.offset=-1&pagination.limit=-2", vals[0].APIAddress, 1), true, "strconv.ParseUint"},
{"with pagination", fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/%d?pagination.offset=0&pagination.limit=2", vals[0].APIAddress, 1), false, ""},
client/grpc/tmservice/status.go
+3 -3
View File
@@ -3,15 +3,15 @@ package tmservice
import (
"context"
ctypes "github.com/tendermint/tendermint/rpc/core/types"
"github.com/tendermint/tendermint/rpc/coretypes"
"github.com/cosmos/cosmos-sdk/client"
)
func getNodeStatus(ctx context.Context, clientCtx client.Context) (*ctypes.ResultStatus, error) {
func getNodeStatus(ctx context.Context, clientCtx client.Context) (*coretypes.ResultStatus, error) {
node, err := clientCtx.GetNode()
if err != nil {
return &ctypes.ResultStatus{}, err
return &coretypes.ResultStatus{}, err
}
return node.Status(ctx)
}
client/rpc/status.go
+6 -6
View File
@@ -6,8 +6,8 @@ import (
"github.com/spf13/cobra"
"github.com/tendermint/tendermint/libs/bytes"
"github.com/tendermint/tendermint/p2p"
ctypes "github.com/tendermint/tendermint/rpc/core/types"
"github.com/tendermint/tendermint/rpc/coretypes"
tmtypes "github.com/tendermint/tendermint/types"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
@@ -26,8 +26,8 @@ type validatorInfo struct {
// ResultStatus is node's info, same as Tendermint, except that we use our own
// PubKey.
type resultStatus struct {
NodeInfo p2p.DefaultNodeInfo
SyncInfo ctypes.SyncInfo
NodeInfo tmtypes.NodeInfo
SyncInfo coretypes.SyncInfo
ValidatorInfo validatorInfo
}
@@ -77,10 +77,10 @@ func StatusCommand() *cobra.Command {
return cmd
}
func getNodeStatus(clientCtx client.Context) (*ctypes.ResultStatus, error) {
func getNodeStatus(clientCtx client.Context) (*coretypes.ResultStatus, error) {
node, err := clientCtx.GetNode()
if err != nil {
return &ctypes.ResultStatus{}, err
return &coretypes.ResultStatus{}, err
}
return node.Status(context.Background())
client/utils.go
+1 -3
View File
@@ -73,8 +73,6 @@ func ReadPageRequest(flagSet *pflag.FlagSet) (*query.PageRequest, error) {
// NewClientFromNode sets up Client implementation that communicates with a Tendermint node over
// JSON RPC and WebSockets
// TODO: We might not need to manually append `/websocket`:
// https://github.com/cosmos/cosmos-sdk/issues/8986
func NewClientFromNode(nodeURI string) (*rpchttp.HTTP, error) {
return rpchttp.New(nodeURI, "/websocket")
return rpchttp.New(nodeURI)
}