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

refactor: rename commands to match consensus engine name (#14956)

Browse Source
This commit is contained in:
Julien Robert 2023-02-08 21:09:28 +01:00 committed by GitHub
parent 0c35d7a8f9
commit c17c3caab8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
82 changed files with 384 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UPGRADING.md
View File

@ -7,11 +7,19 @@ This guide provides instructions for upgrading to specific versions of Cosmos SD
### Consensus Engine
The Cosmos SDK has migrated to CometBFT as its default consensus engine.
This is a breaking changes that needs chains to re-generate their protos.
Some functions has been renamed to reflect the naming change, following an exhaustive list:
CometBFT is an implementation of the Tendermint consensus algorithm, and the successor of Tendermint Core.
Due to the import changes, this is a breaking change that needs chains to re-generate their protos.
Some functions have been renamed to reflect the naming change, following an exhaustive list:
* `client.TendermintRPC` -> `client.CometRPC`
* `clitestutil.MockTendermintRPC` -> `clitestutil.MockCometRPC`
* `clitestutilgenutil.CreateDefaultTendermintConfig` -> `clitestutilgenutil.CreateDefaultCometConfig`
* Package `client/grpc/tmservice` -> `client/grpc/cmtservice`
Additionally, the commands and flags mentionning `tendermint` have been renamed to `comet`.
However, these commands and flags is still supported for backward compatibility.
For backward compatibility, the `**/tendermint/**` gRPC services are still supported.
### Configuration

2
api/cosmos/bank/v1beta1/query.pulsar.go
View File

@ -11387,7 +11387,7 @@ type QueryAllBalancesRequest struct {
Pagination *v1beta11.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"`
// resolve_denom is the flag to resolve the denom into a human-readable form from the metadata.
//
// Since: cosmos-sdk 0.47
// Since: cosmos-sdk 0.48
ResolveDenom bool `protobuf:"varint,3,opt,name=resolve_denom,json=resolveDenom,proto3" json:"resolve_denom,omitempty"`
}

13
client/broadcast.go
View File

@ -35,7 +35,12 @@ func (ctx Context) BroadcastTx(txBytes []byte) (res *sdk.TxResponse, err error)
return res, err
}
// CheckTendermintError checks if the error returned from BroadcastTx is a
// Deprecated: Use CheckCometError instead.
func CheckTendermintError(err error, tx cmttypes.Tx) *sdk.TxResponse {
return CheckCometError(err, tx)
}
// CheckCometError checks if the error returned from BroadcastTx is a
// CometBFT error that is returned before the tx is submitted due to
// precondition checks that failed. If an CometBFT error is detected, this
// function returns the correct code back in TxResponse.
@ -43,7 +48,7 @@ func (ctx Context) BroadcastTx(txBytes []byte) (res *sdk.TxResponse, err error)
// TODO: Avoid brittle string matching in favor of error matching. This requires
// a change to CometBFT's RPCError type to allow retrieval or matching against
// a concrete error type.
func CheckTendermintError(err error, tx cmttypes.Tx) *sdk.TxResponse {
func CheckCometError(err error, tx cmttypes.Tx) *sdk.TxResponse {
if err == nil {
return nil
}
@ -87,7 +92,7 @@ func (ctx Context) BroadcastTxSync(txBytes []byte) (*sdk.TxResponse, error) {
}
res, err := node.BroadcastTxSync(context.Background(), txBytes)
if errRes := CheckTendermintError(err, txBytes); errRes != nil {
if errRes := CheckCometError(err, txBytes); errRes != nil {
return errRes, nil
}
@ -103,7 +108,7 @@ func (ctx Context) BroadcastTxAsync(txBytes []byte) (*sdk.TxResponse, error) {
}
res, err := node.BroadcastTxAsync(context.Background(), txBytes)
if errRes := CheckTendermintError(err, txBytes); errRes != nil {
if errRes := CheckCometError(err, txBytes); errRes != nil {
return errRes, nil
}

2
client/flags/flags.go
View File

@ -119,7 +119,7 @@ func AddTxFlagsToCmd(cmd *cobra.Command) {
f.String(FlagNote, "", "Note to add a description to the transaction (previously --memo)")
f.String(FlagFees, "", "Fees to pay along with transaction; eg: 10uatom")
f.String(FlagGasPrices, "", "Gas prices in decimal format to determine the transaction fee (e.g. 0.1uatom)")
f.String(FlagNode, "tcp://localhost:26657", "<host>:<port> to cometbft rpc interface for this chain")
f.String(FlagNode, "tcp://localhost:26657", "<host>:<port> to CometBFT rpc interface for this chain")
f.Bool(FlagUseLedger, false, "Use a connected Ledger device")
f.Float64(FlagGasAdjustment, DefaultGasAdjustment, "adjustment factor to be multiplied against the estimate returned by the tx simulation; if the gas limit is set manually this flag is ignored ")
f.StringP(FlagBroadcastMode, "b", BroadcastSync, "Transaction broadcasting mode (sync|async)")

2
client/grpc/tmservice/block.go → client/grpc/cmtservice/block.go
View File

@ -1,4 +1,4 @@
package tmservice
package cmtservice
import (
"context"

172
client/grpc/tmservice/query.pb.go → client/grpc/cmtservice/query.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: cosmos/base/tendermint/v1beta1/query.proto
package tmservice
package cmtservice
import (
context "context"
@ -1194,95 +1194,95 @@ func init() {
}
var fileDescriptor_40c93fb3ef485c5d = []byte{
// 1398 bytes of a gzipped FileDescriptorProto
// 1399 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0x4d, 0x6f, 0x1b, 0xc5,
0x1b, 0xcf, 0xda, 0x69, 0x6c, 0x3f, 0xee, 0xff, 0x4f, 0x32, 0x0d, 0xad, 0x63, 0xa5, 0x6e, 0x59,
0x89, 0x36, 0x7d, 0xc9, 0x2e, 0x76, 0x5f, 0x0f, 0xa5, 0xa8, 0x6e, 0x4a, 0x1a, 0x5a, 0x4a, 0xd8,
0x20, 0x0e, 0x08, 0x69, 0xb5, 0xf6, 0x4e, 0x36, 0xab, 0xd8, 0x3b, 0xd3, 0x9d, 0xb1, 0xc1, 0x42,
0x1b, 0xcf, 0xda, 0x69, 0x6c, 0x3f, 0xee, 0xff, 0x4f, 0x32, 0x0d, 0xad, 0x63, 0xa5, 0x6e, 0xb1,
0x44, 0x9b, 0xbe, 0x64, 0x17, 0xbb, 0xaf, 0x87, 0x52, 0x54, 0x37, 0x25, 0x0d, 0xa5, 0x25, 0x6c,
0x10, 0x07, 0x84, 0xb4, 0x5a, 0xef, 0x4e, 0x36, 0xab, 0xd8, 0x3b, 0xd3, 0x9d, 0xb1, 0xc1, 0x42,
0x48, 0x88, 0x0f, 0x80, 0x90, 0xf8, 0x0a, 0x3d, 0x94, 0x13, 0x1c, 0x10, 0xc7, 0x0a, 0xc4, 0xa5,
0xc7, 0xaa, 0x48, 0xa8, 0xe2, 0x80, 0x50, 0x8b, 0xc4, 0xd7, 0x40, 0xf3, 0xb2, 0xf6, 0x6e, 0x9b,
0xd4, 0x4e, 0x6e, 0xbd, 0x24, 0xb3, 0xcf, 0xeb, 0xef, 0xf7, 0x3c, 0x33, 0xcf, 0x8c, 0xe1, 0x74,
0x9b, 0xb0, 0x2e, 0x61, 0x76, 0xcb, 0x63, 0xd8, 0xe6, 0x38, 0xf2, 0x71, 0xdc, 0x0d, 0x23, 0x6e,
0xf7, 0xeb, 0x2d, 0xcc, 0xbd, 0xba, 0x7d, 0xb7, 0x87, 0xe3, 0x81, 0x45, 0x63, 0xc2, 0x09, 0xaa,
0x29, 0x5b, 0x4b, 0xd8, 0x5a, 0x23, 0x5b, 0x4b, 0xdb, 0x56, 0xe7, 0x03, 0x12, 0x10, 0x69, 0x6a,
0x8b, 0x95, 0xf2, 0xaa, 0x2e, 0x04, 0x84, 0x04, 0x1d, 0x6c, 0xcb, 0xaf, 0x56, 0x6f, 0xd3, 0xf6,
0x22, 0x1d, 0xb0, 0xba, 0xa8, 0x55, 0x1e, 0x0d, 0x6d, 0x2f, 0x8a, 0x08, 0xf7, 0x78, 0x48, 0x22,
0xa6, 0xb5, 0xd5, 0x14, 0x1c, 0xda, 0xa0, 0x36, 0x1f, 0x50, 0x9c, 0xe8, 0x16, 0x53, 0x3a, 0x29,
0xcf, 0x68, 0x33, 0xa4, 0x24, 0x83, 0x21, 0x1f, 0xea, 0x05, 0x61, 0x24, 0xd3, 0xec, 0x64, 0xbb,
0x43, 0x01, 0xd2, 0x71, 0x17, 0x94, 0xad, 0xab, 0x38, 0xea, 0x6a, 0xec, 0x06, 0xa8, 0xd5, 0x21,
0xed, 0x6d, 0xad, 0x9d, 0xf3, 0xba, 0x61, 0x44, 0x6c, 0xf9, 0x57, 0x89, 0xcc, 0xaf, 0x0c, 0xa8,
0xad, 0x62, 0xfe, 0xb1, 0xd7, 0x09, 0x7d, 0x8f, 0x93, 0x78, 0x03, 0xf3, 0xe6, 0xe0, 0x26, 0x0e,
0x83, 0x2d, 0xee, 0xe0, 0xbb, 0x3d, 0xcc, 0x38, 0x3a, 0x0c, 0x33, 0x5b, 0x52, 0x50, 0x31, 0x8e,
0x1b, 0x4b, 0x79, 0x47, 0x7f, 0xa1, 0x77, 0x01, 0x46, 0x34, 0x2a, 0xb9, 0xe3, 0xc6, 0x52, 0xb9,
0x71, 0xc2, 0x4a, 0x37, 0x47, 0x75, 0x4d, 0x53, 0xb0, 0xd6, 0xbd, 0x00, 0xeb, 0x98, 0x4e, 0xca,
0xd3, 0x7c, 0x62, 0xc0, 0xb1, 0x5d, 0x21, 0x30, 0x4a, 0x22, 0x86, 0xd1, 0x1b, 0x70, 0x50, 0x12,
0x71, 0x33, 0x48, 0xca, 0x52, 0xa6, 0x4c, 0xd1, 0x1a, 0x40, 0x3f, 0x09, 0xc1, 0x2a, 0xb9, 0xe3,
0xf9, 0xa5, 0x72, 0xe3, 0x94, 0xf5, 0xf2, 0xbd, 0x62, 0x0d, 0x93, 0x3a, 0x29, 0x67, 0xb4, 0x9a,
0xd4, 0x4e, 0x6e, 0xbd, 0x24, 0xb3, 0xcf, 0xeb, 0xef, 0xf7, 0x3c, 0x33, 0xcf, 0x8c, 0xe1, 0xb4,
0x47, 0x58, 0x97, 0x30, 0xab, 0xed, 0x32, 0x6c, 0x71, 0x1c, 0xf9, 0x38, 0xee, 0x86, 0x11, 0xb7,
0xfa, 0x8d, 0x36, 0xe6, 0x6e, 0xc3, 0xba, 0xdb, 0xc3, 0xf1, 0xc0, 0xa4, 0x31, 0xe1, 0x04, 0xd5,
0x94, 0xad, 0x29, 0x6c, 0xcd, 0x91, 0xad, 0xa9, 0x6d, 0xab, 0xf3, 0x01, 0x09, 0x88, 0x34, 0xb5,
0xc4, 0x4a, 0x79, 0x55, 0x17, 0x02, 0x42, 0x82, 0x0e, 0xb6, 0xe4, 0x57, 0xbb, 0xb7, 0x69, 0xb9,
0x91, 0x0e, 0x58, 0x5d, 0xd4, 0x2a, 0x97, 0x86, 0x96, 0x1b, 0x45, 0x84, 0xbb, 0x3c, 0x24, 0x11,
0xd3, 0xda, 0x6a, 0x0a, 0x0e, 0x6d, 0x52, 0x8b, 0x0f, 0x28, 0x4e, 0x74, 0x8b, 0x29, 0x9d, 0x94,
0x67, 0xb4, 0x19, 0x52, 0x92, 0xc1, 0x90, 0x0f, 0x75, 0x83, 0x30, 0x92, 0x69, 0x76, 0xb2, 0xdd,
0xa1, 0x00, 0xe9, 0xb8, 0x0b, 0xca, 0xd6, 0x51, 0x1c, 0x75, 0x35, 0x76, 0x03, 0xd4, 0xee, 0x10,
0x6f, 0x5b, 0x6b, 0xe7, 0xdc, 0x6e, 0x18, 0x11, 0x4b, 0xfe, 0x55, 0xa2, 0xfa, 0x57, 0x06, 0xd4,
0x56, 0x31, 0xff, 0xd8, 0xed, 0x84, 0xbe, 0xcb, 0x49, 0xbc, 0x81, 0x79, 0x6b, 0x70, 0x13, 0x87,
0xc1, 0x16, 0xb7, 0xf1, 0xdd, 0x1e, 0x66, 0x1c, 0x1d, 0x86, 0x99, 0x2d, 0x29, 0xa8, 0x18, 0xc7,
0x8d, 0xa5, 0xbc, 0xad, 0xbf, 0xd0, 0xbb, 0x00, 0x23, 0x1a, 0x95, 0xdc, 0x71, 0x63, 0xa9, 0xdc,
0x3c, 0x61, 0xa6, 0x9b, 0xa3, 0xba, 0xa6, 0x29, 0x98, 0xeb, 0x6e, 0x80, 0x75, 0x4c, 0x3b, 0xe5,
0x59, 0x7f, 0x62, 0xc0, 0xb1, 0x5d, 0x21, 0x30, 0x4a, 0x22, 0x86, 0xd1, 0x1b, 0x70, 0x50, 0x12,
0x71, 0x32, 0x48, 0xca, 0x52, 0xa6, 0x4c, 0xd1, 0x1a, 0x40, 0x3f, 0x09, 0xc1, 0x2a, 0xb9, 0xe3,
0xf9, 0xa5, 0x72, 0xf3, 0x94, 0xf9, 0xf2, 0xbd, 0x62, 0x0e, 0x93, 0xda, 0x29, 0x67, 0xb4, 0x9a,
0x61, 0x96, 0x97, 0xcc, 0x4e, 0x8e, 0x65, 0xa6, 0xa0, 0x66, 0xa8, 0x6d, 0xc2, 0xe2, 0x2a, 0xe6,
0xb7, 0x3d, 0x8e, 0x59, 0x86, 0x5f, 0x52, 0xda, 0x6c, 0x09, 0x8d, 0x7d, 0x97, 0xf0, 0x0f, 0x03,
0x8e, 0xee, 0x92, 0xe8, 0xd5, 0x2e, 0xe0, 0x03, 0x03, 0x4a, 0xc3, 0x14, 0xa8, 0x01, 0x05, 0xcf,
0xf7, 0x63, 0xcc, 0x98, 0xc4, 0x5f, 0x6a, 0x56, 0x1e, 0xff, 0xb4, 0x3c, 0xaf, 0xc3, 0x5e, 0x53,
0x9a, 0x0d, 0x1e, 0x87, 0x51, 0xe0, 0x24, 0x86, 0x68, 0x19, 0x0a, 0xb4, 0xd7, 0x72, 0xb7, 0xf1,
0x40, 0x6f, 0xd1, 0x79, 0x4b, 0x1d, 0x77, 0x2b, 0x99, 0x04, 0xd6, 0xb5, 0x68, 0xe0, 0xcc, 0xd0,
0x5e, 0xeb, 0x16, 0x1e, 0x88, 0x3a, 0xf5, 0x09, 0x0f, 0xa3, 0xc0, 0xa5, 0xe4, 0x33, 0x1c, 0x4b,
0xec, 0x79, 0xa7, 0xac, 0x64, 0xeb, 0x42, 0x84, 0xce, 0xc0, 0x1c, 0x8d, 0x09, 0x25, 0x0c, 0xc7,
0x2e, 0x8d, 0x43, 0x12, 0x87, 0x7c, 0x50, 0x99, 0x96, 0x76, 0xb3, 0x89, 0x62, 0x5d, 0xcb, 0xcd,
0x3a, 0x1c, 0x59, 0xc5, 0xbc, 0x29, 0xca, 0x3c, 0xe1, 0xb9, 0x32, 0x7f, 0x33, 0xa0, 0xf2, 0xa2,
0x8f, 0xee, 0xe3, 0x79, 0x28, 0xaa, 0x3e, 0x86, 0xbe, 0xde, 0x2f, 0x0b, 0xe9, 0xb6, 0xa8, 0x31,
0x21, 0x5d, 0xd7, 0x56, 0x9c, 0x82, 0x34, 0x5d, 0xf3, 0xd1, 0x32, 0x1c, 0x90, 0x4b, 0x5d, 0x82,
0x23, 0xbb, 0xb8, 0x38, 0xca, 0x0a, 0x35, 0xa1, 0xc4, 0xfc, 0x6d, 0x57, 0xb9, 0xa8, 0xee, 0xbd,
0x39, 0x6e, 0x23, 0xa8, 0x00, 0x45, 0xe6, 0x6f, 0xcb, 0x95, 0x79, 0x04, 0x5e, 0x1f, 0xee, 0x48,
0xa5, 0x53, 0xb4, 0xcd, 0x5f, 0x0d, 0x38, 0xfc, 0xbc, 0xe6, 0x55, 0x23, 0x77, 0x08, 0xe6, 0x56,
0x31, 0xdf, 0x18, 0x44, 0x6d, 0xb1, 0xd7, 0x34, 0x31, 0x0b, 0x50, 0x5a, 0xa8, 0x39, 0x55, 0xa0,
0xc0, 0x94, 0x48, 0x52, 0x2a, 0x3a, 0xc9, 0xa7, 0x39, 0x2f, 0xed, 0xef, 0x10, 0x1f, 0xaf, 0x45,
0x9b, 0x24, 0x89, 0xf2, 0x8b, 0x01, 0x87, 0x32, 0x62, 0x1d, 0xe7, 0x16, 0xcc, 0xf9, 0x78, 0xd3,
0xeb, 0x75, 0xb8, 0x1b, 0x11, 0x1f, 0xbb, 0x61, 0xb4, 0x49, 0x74, 0x91, 0x8e, 0xa5, 0x21, 0xd3,
0x06, 0xb5, 0x56, 0x94, 0xe1, 0x30, 0xc6, 0x6b, 0x7e, 0x56, 0x80, 0x3e, 0x85, 0x43, 0x1e, 0xa5,
0x9d, 0xb0, 0x2d, 0x4f, 0x99, 0xdb, 0xc7, 0x31, 0x1b, 0xcd, 0xf0, 0x33, 0x63, 0xcf, 0xbc, 0x32,
0x97, 0xa1, 0x51, 0x2a, 0x8e, 0x96, 0x9b, 0xf7, 0x73, 0x50, 0x4e, 0xd9, 0x20, 0x04, 0xd3, 0x91,
0xd7, 0xc5, 0xea, 0xcc, 0x3a, 0x72, 0x8d, 0x16, 0xa0, 0xe8, 0x51, 0xea, 0x4a, 0x79, 0x4e, 0xca,
0x0b, 0x1e, 0xa5, 0x77, 0x84, 0xaa, 0x02, 0x85, 0x04, 0x50, 0x5e, 0x69, 0xf4, 0x27, 0x3a, 0x0a,
0x10, 0x84, 0xdc, 0x6d, 0x93, 0x6e, 0x37, 0xe4, 0xf2, 0xc8, 0x95, 0x9c, 0x52, 0x10, 0xf2, 0xeb,
0x52, 0x20, 0xd4, 0xad, 0x5e, 0xd8, 0xf1, 0x5d, 0xee, 0x05, 0xac, 0x72, 0x40, 0xa9, 0xa5, 0xe4,
0x23, 0x2f, 0x60, 0xd2, 0x9b, 0x0c, 0xb9, 0xce, 0x68, 0x6f, 0xa2, 0x91, 0xa2, 0x1b, 0x89, 0xb7,
0x8f, 0x29, 0xab, 0x14, 0xe4, 0xf8, 0x3b, 0x31, 0xae, 0x14, 0xef, 0x13, 0xbf, 0xd7, 0xc1, 0x3a,
0xcb, 0x0a, 0xa6, 0x0c, 0x9d, 0x05, 0xa4, 0xaf, 0x67, 0xb1, 0xcb, 0x92, 0x6c, 0x45, 0x99, 0x6d,
0x56, 0x69, 0x36, 0xfc, 0xed, 0xa4, 0x54, 0x37, 0x61, 0x46, 0x85, 0x10, 0x45, 0xa2, 0x1e, 0xdf,
0x4a, 0x8a, 0x24, 0xd6, 0xe9, 0x4a, 0xe4, 0xb2, 0x95, 0x98, 0x85, 0x3c, 0xeb, 0x75, 0x75, 0x7d,
0xc4, 0xd2, 0xdc, 0x82, 0xd9, 0x6b, 0xcd, 0xeb, 0x6b, 0x1f, 0x8a, 0xb9, 0x9a, 0x4c, 0x18, 0x04,
0xd3, 0xbe, 0xc7, 0x3d, 0x19, 0xf3, 0xa0, 0x23, 0xd7, 0xc3, 0x3c, 0xb9, 0x54, 0x9e, 0xd1, 0x24,
0xca, 0x67, 0x6e, 0xf8, 0x79, 0x38, 0x40, 0x63, 0xd2, 0xc7, 0xb2, 0xd4, 0x45, 0x47, 0x7d, 0x98,
0xdf, 0xe4, 0x60, 0x2e, 0x95, 0x4a, 0xef, 0x4f, 0x04, 0xd3, 0x6d, 0xe2, 0xab, 0x26, 0xff, 0xcf,
0x91, 0x6b, 0x81, 0xb2, 0x43, 0x82, 0x04, 0x65, 0x87, 0x04, 0xc2, 0x4a, 0x6e, 0x5c, 0xd5, 0x3b,
0xb9, 0x16, 0x59, 0xc2, 0xc8, 0xc7, 0x9f, 0xcb, 0x8e, 0xe5, 0x1d, 0xf5, 0x21, 0x7c, 0xc5, 0xcc,
0x9e, 0x91, 0xd0, 0xc5, 0x52, 0xd8, 0xf5, 0xbd, 0x4e, 0x0f, 0x57, 0x0a, 0x52, 0xa6, 0x3e, 0xd0,
0x0d, 0x28, 0xd1, 0x98, 0x90, 0x4d, 0x97, 0x50, 0x26, 0xcb, 0x5c, 0x6e, 0x2c, 0x8d, 0xeb, 0xda,
0xba, 0x70, 0xf8, 0x80, 0x32, 0xa7, 0x48, 0xf5, 0x2a, 0x55, 0x82, 0x52, 0xa6, 0x04, 0x8b, 0x50,
0x12, 0x54, 0x18, 0xf5, 0xda, 0xb8, 0x02, 0x6a, 0xcf, 0x0c, 0x05, 0xef, 0x4d, 0x17, 0x73, 0xb3,
0x79, 0xf3, 0x3a, 0x14, 0x74, 0x44, 0xc1, 0x4f, 0x8c, 0x9c, 0xa4, 0x8b, 0x62, 0x9d, 0x30, 0xc9,
0x8d, 0x98, 0x24, 0x7d, 0xc9, 0x8f, 0xfa, 0x62, 0xae, 0x43, 0x31, 0x81, 0x85, 0x56, 0x20, 0x2f,
0xd8, 0x18, 0x72, 0x0f, 0x9e, 0x9c, 0x90, 0x4d, 0xb3, 0xf4, 0xf0, 0xaf, 0x63, 0x53, 0xf7, 0xff,
0xfd, 0xf1, 0xb4, 0xe1, 0x08, 0xf7, 0xc6, 0x0f, 0x00, 0x85, 0x0d, 0x1c, 0xf7, 0xc3, 0x36, 0x46,
0xdf, 0x1b, 0x50, 0x4e, 0x4d, 0x15, 0xd4, 0x18, 0x17, 0xf4, 0xc5, 0xc9, 0x54, 0x3d, 0xb7, 0x27,
0x1f, 0xb5, 0x2d, 0xcc, 0xfa, 0xd7, 0xbf, 0xff, 0xf3, 0x5d, 0xee, 0x0c, 0x3a, 0x65, 0x8f, 0x79,
0xe0, 0x0e, 0x87, 0x1a, 0xba, 0x67, 0x00, 0x8c, 0x06, 0x29, 0xaa, 0x4f, 0x90, 0x36, 0x3b, 0x89,
0xab, 0x8d, 0xbd, 0xb8, 0x68, 0xa0, 0xb6, 0x04, 0x7a, 0x0a, 0x9d, 0x1c, 0x07, 0x54, 0x8f, 0x6f,
0xf4, 0xb3, 0x01, 0xff, 0xcf, 0xde, 0x63, 0xe8, 0xc2, 0x04, 0x79, 0x5f, 0xbc, 0x11, 0xab, 0x17,
0xf7, 0xea, 0xa6, 0x21, 0x5f, 0x90, 0x90, 0x6d, 0xb4, 0x3c, 0x0e, 0xb2, 0xbc, 0xeb, 0x98, 0xdd,
0x91, 0x31, 0xd0, 0x03, 0x03, 0x66, 0x9f, 0x7f, 0x5f, 0xa0, 0x4b, 0x13, 0x60, 0xd8, 0xe9, 0x15,
0x53, 0xbd, 0xbc, 0x77, 0x47, 0x0d, 0xff, 0x92, 0x84, 0x5f, 0x47, 0xf6, 0x84, 0xf0, 0xbf, 0x50,
0x47, 0xf2, 0x4b, 0xf4, 0xd8, 0x48, 0xbd, 0x2d, 0xd2, 0xaf, 0x5d, 0x74, 0x65, 0xe2, 0x4a, 0xee,
0xf0, 0x1a, 0xaf, 0xbe, 0xbd, 0x4f, 0x6f, 0xcd, 0xe7, 0x8a, 0xe4, 0x73, 0x11, 0x9d, 0x1f, 0xc7,
0x67, 0xf4, 0x50, 0xc6, 0x7c, 0xd8, 0x95, 0x3f, 0x0d, 0xf9, 0x52, 0xdc, 0xe9, 0x57, 0x10, 0xba,
0x3a, 0x01, 0xb0, 0x97, 0xfc, 0x82, 0xab, 0xbe, 0xb3, 0x6f, 0x7f, 0x4d, 0xed, 0xaa, 0xa4, 0x76,
0x19, 0x5d, 0xdc, 0x1b, 0xb5, 0x61, 0xc7, 0xee, 0x19, 0x50, 0x1a, 0x5e, 0x19, 0xe8, 0xad, 0x71,
0x70, 0x9e, 0xbf, 0xc8, 0xaa, 0xf5, 0x3d, 0x78, 0x68, 0xc8, 0x0d, 0x09, 0xf9, 0x2c, 0x3a, 0x3d,
0x0e, 0xb2, 0xd7, 0x6a, 0x87, 0xae, 0xfc, 0x39, 0xd2, 0xbc, 0xfd, 0xf0, 0x69, 0xcd, 0x78, 0xf4,
0xb4, 0x66, 0xfc, 0xfd, 0xb4, 0x66, 0x7c, 0xfb, 0xac, 0x36, 0xf5, 0xe8, 0x59, 0x6d, 0xea, 0xc9,
0xb3, 0xda, 0xd4, 0x27, 0x8d, 0x20, 0xe4, 0x5b, 0xbd, 0x96, 0xd5, 0x26, 0xdd, 0x24, 0x9e, 0xfa,
0xb7, 0xcc, 0xfc, 0x6d, 0xbb, 0xdd, 0x09, 0x71, 0xc4, 0xed, 0x20, 0xa6, 0x6d, 0x9b, 0x77, 0x99,
0x9a, 0xb9, 0xad, 0x19, 0xf9, 0x03, 0xe3, 0xdc, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbb, 0xfd,
0xd4, 0xde, 0xdc, 0x10, 0x00, 0x00,
0xef, 0xbb, 0x1c, 0xb3, 0x0c, 0xbf, 0xa4, 0xb4, 0xd9, 0x12, 0x1a, 0xfb, 0x2e, 0xe1, 0x1f, 0x06,
0x1c, 0xdd, 0x25, 0xd1, 0xab, 0x5d, 0xc0, 0x07, 0x06, 0x94, 0x86, 0x29, 0x50, 0x13, 0x0a, 0xae,
0xef, 0xc7, 0x98, 0x31, 0x89, 0xbf, 0xd4, 0xaa, 0x3c, 0xfe, 0x69, 0x79, 0x5e, 0x87, 0xbd, 0xa6,
0x34, 0x1b, 0x3c, 0x0e, 0xa3, 0xc0, 0x4e, 0x0c, 0xd1, 0x32, 0x14, 0x68, 0xaf, 0xed, 0x6c, 0xe3,
0x81, 0xde, 0xa2, 0xf3, 0xa6, 0x3a, 0xee, 0x66, 0x32, 0x09, 0xcc, 0x6b, 0xd1, 0xc0, 0x9e, 0xa1,
0xbd, 0xf6, 0x2d, 0x3c, 0x10, 0x75, 0xea, 0x13, 0x1e, 0x46, 0x81, 0x43, 0xc9, 0x67, 0x38, 0x96,
0xd8, 0xf3, 0x76, 0x59, 0xc9, 0xd6, 0x85, 0x08, 0x9d, 0x81, 0x39, 0x1a, 0x13, 0x4a, 0x18, 0x8e,
0x1d, 0x1a, 0x87, 0x24, 0x0e, 0xf9, 0xa0, 0x32, 0x2d, 0xed, 0x66, 0x13, 0xc5, 0xba, 0x96, 0xd7,
0x1b, 0x70, 0x64, 0x15, 0xf3, 0x96, 0x28, 0xf3, 0x84, 0xe7, 0xaa, 0xfe, 0x9b, 0x01, 0x95, 0x17,
0x7d, 0x74, 0x1f, 0xcf, 0x43, 0x51, 0xf5, 0x31, 0xf4, 0xf5, 0x7e, 0x59, 0x48, 0xb7, 0x45, 0x8d,
0x09, 0xe9, 0xba, 0xb6, 0x62, 0x17, 0xa4, 0xe9, 0x9a, 0x8f, 0x96, 0xe1, 0x80, 0x5c, 0xea, 0x12,
0x1c, 0xd9, 0xc5, 0xc5, 0x56, 0x56, 0xa8, 0x05, 0x25, 0xe6, 0x6f, 0x3b, 0xca, 0x45, 0x75, 0xef,
0xcd, 0x71, 0x1b, 0x41, 0x05, 0x28, 0x32, 0x7f, 0x5b, 0xae, 0xea, 0x47, 0xe0, 0xf5, 0xe1, 0x8e,
0x54, 0x3a, 0x45, 0xbb, 0xfe, 0xab, 0x01, 0x87, 0x9f, 0xd7, 0xbc, 0x6a, 0xe4, 0x0e, 0xc1, 0xdc,
0x2a, 0xe6, 0x1b, 0x83, 0xc8, 0x13, 0x7b, 0x4d, 0x13, 0x33, 0x01, 0xa5, 0x85, 0x9a, 0x53, 0x05,
0x0a, 0x4c, 0x89, 0x24, 0xa5, 0xa2, 0x9d, 0x7c, 0xd6, 0xe7, 0xa5, 0xfd, 0x1d, 0xe2, 0xe3, 0xb5,
0x68, 0x93, 0x24, 0x51, 0x7e, 0x31, 0xe0, 0x50, 0x46, 0xac, 0xe3, 0xdc, 0x82, 0x39, 0x1f, 0x6f,
0xba, 0xbd, 0x0e, 0x77, 0x22, 0xe2, 0x63, 0x27, 0x8c, 0x36, 0x89, 0x2e, 0xd2, 0xb1, 0x34, 0x64,
0xda, 0xa4, 0xe6, 0x8a, 0x32, 0x1c, 0xc6, 0x78, 0xcd, 0xcf, 0x0a, 0xd0, 0xa7, 0x70, 0xc8, 0xa5,
0xb4, 0x13, 0x7a, 0xf2, 0x94, 0x39, 0x7d, 0x1c, 0xb3, 0xd1, 0x0c, 0x3f, 0x33, 0xf6, 0xcc, 0x2b,
0x73, 0x19, 0x1a, 0xa5, 0xe2, 0x68, 0x79, 0xfd, 0x7e, 0x0e, 0xca, 0x29, 0x1b, 0x84, 0x60, 0x3a,
0x72, 0xbb, 0x58, 0x9d, 0x59, 0x5b, 0xae, 0xd1, 0x02, 0x14, 0x5d, 0x4a, 0x1d, 0x29, 0xcf, 0x49,
0x79, 0xc1, 0xa5, 0xf4, 0x8e, 0x50, 0x55, 0xa0, 0x90, 0x00, 0xca, 0x2b, 0x8d, 0xfe, 0x44, 0x47,
0x01, 0x82, 0x90, 0x3b, 0x1e, 0xe9, 0x76, 0x43, 0x2e, 0x8f, 0x5c, 0xc9, 0x2e, 0x05, 0x21, 0xbf,
0x2e, 0x05, 0x42, 0xdd, 0xee, 0x85, 0x1d, 0xdf, 0xe1, 0x6e, 0xc0, 0x2a, 0x07, 0x94, 0x5a, 0x4a,
0x3e, 0x72, 0x03, 0x26, 0xbd, 0xc9, 0x90, 0xeb, 0x8c, 0xf6, 0x26, 0x1a, 0x29, 0xba, 0x91, 0x78,
0xfb, 0x98, 0xb2, 0x4a, 0x41, 0x8e, 0xbf, 0x13, 0xe3, 0x4a, 0x71, 0x9b, 0xf8, 0xbd, 0x0e, 0xd6,
0x59, 0x56, 0x30, 0x65, 0xe8, 0x2c, 0x20, 0x7d, 0x3d, 0x8b, 0x5d, 0x96, 0x64, 0x2b, 0xca, 0x6c,
0xb3, 0x4a, 0xb3, 0xe1, 0x6f, 0x27, 0xa5, 0xba, 0x09, 0x33, 0x2a, 0x84, 0x28, 0x12, 0x75, 0xf9,
0x56, 0x52, 0x24, 0xb1, 0x4e, 0x57, 0x22, 0x97, 0xad, 0xc4, 0x2c, 0xe4, 0x59, 0xaf, 0xab, 0xeb,
0x23, 0x96, 0xf5, 0x2d, 0x98, 0xbd, 0xd6, 0xba, 0xbe, 0xf6, 0xa1, 0x98, 0xab, 0xc9, 0x84, 0x41,
0x30, 0xed, 0xbb, 0xdc, 0x95, 0x31, 0x0f, 0xda, 0x72, 0x3d, 0xcc, 0x93, 0x4b, 0xe5, 0x19, 0x4d,
0xa2, 0x7c, 0xe6, 0x86, 0x9f, 0x87, 0x03, 0x34, 0x26, 0x7d, 0x2c, 0x4b, 0x5d, 0xb4, 0xd5, 0x47,
0xfd, 0x9b, 0x1c, 0xcc, 0xa5, 0x52, 0xe9, 0xfd, 0x89, 0x60, 0xda, 0x23, 0xbe, 0x6a, 0xf2, 0xff,
0x6c, 0xb9, 0x16, 0x28, 0x3b, 0x24, 0x48, 0x50, 0x76, 0x48, 0x20, 0xac, 0xe4, 0xc6, 0x55, 0xbd,
0x93, 0x6b, 0x91, 0x25, 0x8c, 0x7c, 0xfc, 0xb9, 0xec, 0x58, 0xde, 0x56, 0x1f, 0xc2, 0x57, 0xcc,
0xec, 0x19, 0x09, 0x5d, 0x2c, 0x85, 0x5d, 0xdf, 0xed, 0xf4, 0x70, 0xa5, 0x20, 0x65, 0xea, 0x03,
0xdd, 0x80, 0x12, 0x8d, 0x09, 0xd9, 0x74, 0x08, 0x65, 0xb2, 0xcc, 0xe5, 0xe6, 0xd2, 0xb8, 0xae,
0xad, 0x0b, 0x87, 0x0f, 0x28, 0xb3, 0x8b, 0x54, 0xaf, 0x52, 0x25, 0x28, 0x65, 0x4a, 0xb0, 0x08,
0x25, 0x41, 0x85, 0x51, 0xd7, 0xc3, 0x15, 0x50, 0x7b, 0x66, 0x28, 0x78, 0x6f, 0xba, 0x98, 0x9b,
0xcd, 0xd7, 0xaf, 0x43, 0x41, 0x47, 0x14, 0xfc, 0xc4, 0xc8, 0x49, 0xba, 0x28, 0xd6, 0x09, 0x93,
0xdc, 0x88, 0x49, 0xd2, 0x97, 0xfc, 0xa8, 0x2f, 0xf5, 0x75, 0x28, 0x26, 0xb0, 0xd0, 0x0a, 0xe4,
0x05, 0x1b, 0x43, 0xee, 0xc1, 0x93, 0x13, 0xb2, 0x69, 0x95, 0x1e, 0xfe, 0x75, 0x6c, 0xea, 0xfe,
0xbf, 0x3f, 0x9e, 0x36, 0x6c, 0xe1, 0xde, 0xfc, 0x01, 0xa0, 0xb0, 0x81, 0xe3, 0x7e, 0xe8, 0x61,
0xf4, 0xbd, 0x01, 0xe5, 0xd4, 0x54, 0x41, 0xcd, 0x71, 0x41, 0x5f, 0x9c, 0x4c, 0xd5, 0x73, 0x7b,
0xf2, 0x51, 0xdb, 0xa2, 0xde, 0xf8, 0xfa, 0xf7, 0x7f, 0xbe, 0xcb, 0x9d, 0x41, 0xa7, 0xac, 0x31,
0x0f, 0xdc, 0xe1, 0x50, 0x43, 0xf7, 0x0c, 0x80, 0xd1, 0x20, 0x45, 0x8d, 0x09, 0xd2, 0x66, 0x27,
0x71, 0xb5, 0xb9, 0x17, 0x17, 0x0d, 0xd4, 0x92, 0x40, 0x4f, 0xa1, 0x93, 0xe3, 0x80, 0xea, 0xf1,
0x8d, 0x7e, 0x36, 0xe0, 0xff, 0xd9, 0x7b, 0x0c, 0x5d, 0x98, 0x20, 0xef, 0x8b, 0x37, 0x62, 0xf5,
0xe2, 0x5e, 0xdd, 0x34, 0xe4, 0x0b, 0x12, 0xb2, 0x85, 0x96, 0xc7, 0x41, 0x96, 0x77, 0x1d, 0xb3,
0x3a, 0x32, 0x06, 0x7a, 0x60, 0xc0, 0xec, 0xf3, 0xef, 0x0b, 0x74, 0x69, 0x02, 0x0c, 0x3b, 0xbd,
0x62, 0xaa, 0x97, 0xf7, 0xee, 0xa8, 0xe1, 0x5f, 0x92, 0xf0, 0x1b, 0xc8, 0x9a, 0x10, 0xfe, 0x17,
0xea, 0x48, 0x7e, 0x89, 0x1e, 0x1b, 0xa9, 0xb7, 0x45, 0xfa, 0xb5, 0x8b, 0xae, 0x4c, 0x5c, 0xc9,
0x1d, 0x5e, 0xe3, 0xd5, 0xb7, 0xf7, 0xe9, 0xad, 0xf9, 0x5c, 0x91, 0x7c, 0x2e, 0xa2, 0xf3, 0xe3,
0xf8, 0x8c, 0x1e, 0xca, 0x98, 0x0f, 0xbb, 0xf2, 0xa7, 0x21, 0x5f, 0x8a, 0x3b, 0xfd, 0x0a, 0x42,
0x57, 0x27, 0x00, 0xf6, 0x92, 0x5f, 0x70, 0xd5, 0x77, 0xf6, 0xed, 0xaf, 0xa9, 0x5d, 0x95, 0xd4,
0x2e, 0xa3, 0x8b, 0x7b, 0xa3, 0x36, 0xec, 0xd8, 0x3d, 0x03, 0x4a, 0xc3, 0x2b, 0x03, 0xbd, 0x35,
0x0e, 0xce, 0xf3, 0x17, 0x59, 0xb5, 0xb1, 0x07, 0x0f, 0x0d, 0xb9, 0x29, 0x21, 0x9f, 0x45, 0xa7,
0xc7, 0x41, 0x76, 0xdb, 0x5e, 0xe8, 0xc8, 0x9f, 0x23, 0xad, 0xdb, 0x0f, 0x9f, 0xd6, 0x8c, 0x47,
0x4f, 0x6b, 0xc6, 0xdf, 0x4f, 0x6b, 0xc6, 0xb7, 0xcf, 0x6a, 0x53, 0x8f, 0x9e, 0xd5, 0xa6, 0x9e,
0x3c, 0xab, 0x4d, 0x7d, 0x72, 0x2e, 0x08, 0xf9, 0x56, 0xaf, 0x6d, 0x7a, 0xa4, 0x9b, 0xc4, 0x53,
0xff, 0x96, 0x99, 0xbf, 0x6d, 0x79, 0x9d, 0x10, 0x47, 0xdc, 0x0a, 0x62, 0xea, 0x59, 0x5e, 0x97,
0x33, 0x35, 0x74, 0xdb, 0x33, 0xf2, 0x17, 0xc6, 0xb9, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xb1,
0x95, 0x6a, 0x8c, 0xdd, 0x10, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.

4
client/grpc/tmservice/query.pb.gw.go → client/grpc/cmtservice/query.pb.gw.go
View File

@ -2,11 +2,11 @@
// source: cosmos/base/tendermint/v1beta1/query.proto
/*
Package tmservice is a reverse proxy.
Package cmtservice is a reverse proxy.
It translates gRPC into RESTful JSON APIs.
*/
package tmservice
package cmtservice
import (
"context"

8
client/grpc/tmservice/service.go → client/grpc/cmtservice/service.go
View File

@ -1,4 +1,4 @@
package tmservice
package cmtservice
import (
"context"
@ -33,7 +33,7 @@ type (
}
)
// NewQueryServer creates a new tendermint query server.
// NewQueryServer creates a new CometBFT query server.
func NewQueryServer(
clientCtx client.Context,
interfaceRegistry codectypes.InterfaceRegistry,
@ -245,7 +245,7 @@ func (s queryServer) ABCIQuery(ctx context.Context, req *ABCIQueryRequest) (*ABC
return FromABCIResponseQuery(res), nil
}
// RegisterTendermintService registers the tendermint queries on the gRPC router.
// RegisterTendermintService registers the CometBFT queries on the gRPC router.
func RegisterTendermintService(
clientCtx client.Context,
server gogogrpc.Server,
@ -255,7 +255,7 @@ func RegisterTendermintService(
RegisterServiceServer(server, NewQueryServer(clientCtx, iRegistry, queryFn))
}
// RegisterGRPCGatewayRoutes mounts the tendermint service's GRPC-gateway routes on the
// RegisterGRPCGatewayRoutes mounts the CometBFT service's GRPC-gateway routes on the
// given Mux.
func RegisterGRPCGatewayRoutes(clientConn gogogrpc.ClientConn, mux *runtime.ServeMux) {
_ = RegisterServiceHandlerClient(context.Background(), mux, NewServiceClient(clientConn))

2
client/grpc/tmservice/status.go → client/grpc/cmtservice/status.go
View File

@ -1,4 +1,4 @@
package tmservice
package cmtservice
import (
"context"

2
client/grpc/tmservice/types.go → client/grpc/cmtservice/types.go
View File

@ -1,4 +1,4 @@
package tmservice
package cmtservice
import (
abci "github.com/cometbft/cometbft/abci/types"

82
client/grpc/tmservice/types.pb.go → client/grpc/cmtservice/types.pb.go
View File

@ -1,7 +1,7 @@
// Code generated by protoc-gen-gogo. DO NOT EDIT.
// source: cosmos/base/tendermint/v1beta1/types.proto
package tmservice
package cmtservice
import (
fmt "fmt"
@ -267,48 +267,48 @@ func init() {
}
var fileDescriptor_bb9931519c08e0d6 = []byte{
// 645 bytes of a gzipped FileDescriptorProto
// 647 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x94, 0xcd, 0x6e, 0xd3, 0x4e,
0x14, 0xc5, 0xe3, 0x36, 0xcd, 0xc7, 0xa4, 0xe9, 0xc7, 0xa8, 0xaa, 0xdc, 0xfc, 0xff, 0x38, 0x55,
0x11, 0xa5, 0x54, 0xc2, 0xa6, 0x45, 0x2c, 0x58, 0xb0, 0x20, 0x6d, 0xa5, 0x46, 0xea, 0xca, 0x42,
0x2c, 0xd8, 0x44, 0x13, 0x7b, 0xb0, 0x47, 0xb5, 0x3d, 0x96, 0x67, 0x12, 0xc1, 0x33, 0xb0, 0xe9,
0x63, 0xb0, 0xe4, 0x31, 0xba, 0xec, 0x92, 0x55, 0x41, 0xe9, 0x82, 0x27, 0x60, 0x8f, 0xe6, 0xce,
0xb8, 0x75, 0x88, 0xc4, 0x26, 0xb1, 0xcf, 0xfd, 0xdd, 0x93, 0xb9, 0xe7, 0x8e, 0x82, 0x0e, 0x03,
0x2e, 0x52, 0x2e, 0xbc, 0x31, 0x11, 0xd4, 0x93, 0x34, 0x0b, 0x69, 0x91, 0xb2, 0x4c, 0x7a, 0xd3,
0xa3, 0x31, 0x95, 0xe4, 0xc8, 0x93, 0x9f, 0x73, 0x2a, 0xdc, 0xbc, 0xe0, 0x92, 0x63, 0x47, 0xb3,
0xae, 0x62, 0xdd, 0x07, 0xd6, 0x35, 0x6c, 0x6f, 0x2b, 0xe2, 0x11, 0x07, 0xd4, 0x53, 0x4f, 0xba,
0xab, 0xf7, 0x7f, 0xc5, 0x15, 0xdc, 0xaa, 0x9e, 0xbd, 0xfe, 0x42, 0x95, 0x4e, 0x59, 0x48, 0xb3,
0x80, 0x1a, 0xc0, 0xa9, 0x1e, 0x8a, 0x16, 0x82, 0xf1, 0x6c, 0xde, 0x20, 0xe2, 0x3c, 0x4a, 0xa8,
0x07, 0x6f, 0xe3, 0xc9, 0x47, 0x4f, 0xb2, 0x94, 0x0a, 0x49, 0xd2, 0xdc, 0x00, 0x9b, 0x24, 0x65,
0x19, 0xf7, 0xe0, 0x53, 0x4b, 0x7b, 0x5f, 0x96, 0xd0, 0xca, 0x20, 0xe1, 0xc1, 0x25, 0x1e, 0xa2,
0x46, 0x4c, 0x49, 0x48, 0x0b, 0xdb, 0xda, 0xb5, 0x0e, 0x3a, 0xc7, 0xfb, 0xee, 0xbf, 0x67, 0x74,
0xcf, 0x81, 0x1e, 0xb4, 0xaf, 0x6f, 0xfb, 0xb5, 0xaf, 0xbf, 0xbe, 0x1d, 0x5a, 0xbe, 0x31, 0xc0,
0xaf, 0x50, 0x3d, 0x24, 0x92, 0xd8, 0x4b, 0x60, 0xb4, 0x5d, 0x6d, 0xd6, 0xe7, 0x3d, 0x25, 0x92,
0x54, 0x1b, 0x01, 0xc7, 0x67, 0xa8, 0x55, 0x4e, 0x6c, 0x2f, 0x43, 0xab, 0xb3, 0xd8, 0x7a, 0x66,
0x88, 0x0b, 0x26, 0x64, 0xd5, 0xe2, 0xbe, 0x15, 0xbf, 0x46, 0x9d, 0x84, 0x08, 0x39, 0x0a, 0x78,
0x9a, 0x32, 0x69, 0xd7, 0xc1, 0xc9, 0x5e, 0x74, 0x3a, 0x81, 0xba, 0x8f, 0x14, 0xac, 0x9f, 0xf7,
0x7e, 0xd7, 0x51, 0x43, 0x8f, 0x85, 0x07, 0xa8, 0x69, 0x32, 0x36, 0x79, 0x3c, 0x9a, 0xcb, 0x40,
0x97, 0xdc, 0x13, 0x9e, 0x09, 0x9a, 0x89, 0x89, 0xa8, 0x1e, 0xa5, 0x6c, 0xc4, 0xfb, 0xa8, 0x15,
0xc4, 0x84, 0x65, 0x23, 0x16, 0x42, 0x16, 0xed, 0x41, 0x67, 0x76, 0xdb, 0x6f, 0x9e, 0x28, 0x6d,
0x78, 0xea, 0x37, 0xa1, 0x38, 0x0c, 0xf1, 0xb6, 0x8a, 0x9e, 0x45, 0xb1, 0x84, 0xb1, 0x97, 0x7d,
0xf3, 0x86, 0xdf, 0xa0, 0xba, 0x5a, 0xa1, 0x19, 0xa1, 0xe7, 0xea, 0xfd, 0xba, 0xe5, 0x7e, 0xdd,
0x77, 0xe5, 0x7e, 0x07, 0x5d, 0xf5, 0xeb, 0x57, 0x3f, 0xfa, 0x96, 0xc9, 0x53, 0xb5, 0xe1, 0x73,
0xd4, 0x85, 0x20, 0xc6, 0x6a, 0xbf, 0xea, 0x0c, 0x2b, 0xe0, 0xb3, 0xb3, 0x18, 0x05, 0xdc, 0x80,
0xe1, 0x69, 0x75, 0x08, 0xc8, 0x50, 0xeb, 0x21, 0x3e, 0x40, 0x1b, 0x95, 0x48, 0x47, 0x31, 0x11,
0xb1, 0xdd, 0xd8, 0xb5, 0x0e, 0x56, 0xfd, 0xb5, 0x87, 0xf4, 0xce, 0x89, 0x88, 0xf1, 0x7f, 0xa8,
0xad, 0x76, 0xa9, 0x91, 0x26, 0x20, 0x2d, 0x25, 0x40, 0xf1, 0x29, 0x5a, 0x9f, 0x92, 0x84, 0x85,
0x44, 0xf2, 0x42, 0x68, 0xa4, 0xa5, 0x5d, 0x1e, 0x64, 0x00, 0x5f, 0xa0, 0xad, 0x8c, 0x7e, 0x92,
0xa3, 0xbf, 0xe9, 0x36, 0xd0, 0x58, 0xd5, 0xde, 0xcf, 0x77, 0x3c, 0x41, 0x6b, 0x41, 0xb9, 0x0b,
0xcd, 0x22, 0x60, 0xbb, 0xf7, 0x2a, 0x60, 0x3b, 0xa8, 0x45, 0xf2, 0x5c, 0x03, 0x1d, 0x00, 0x9a,
0x24, 0xcf, 0xa1, 0x74, 0x88, 0x36, 0x61, 0xc6, 0x82, 0x8a, 0x49, 0x22, 0x8d, 0xc9, 0x2a, 0x30,
0xeb, 0xaa, 0xe0, 0x6b, 0x1d, 0xd8, 0xc7, 0xa8, 0x5b, 0x5e, 0x37, 0xcd, 0x75, 0x81, 0x5b, 0x2d,
0x45, 0x80, 0x9e, 0xa1, 0x8d, 0xbc, 0xe0, 0x39, 0x17, 0xb4, 0x18, 0x91, 0x30, 0x2c, 0xa8, 0x10,
0xf6, 0x9a, 0xba, 0x05, 0xfe, 0x7a, 0xa9, 0xbf, 0xd5, 0xf2, 0xe0, 0xe2, 0x7a, 0xe6, 0x58, 0x37,
0x33, 0xc7, 0xfa, 0x39, 0x73, 0xac, 0xab, 0x3b, 0xa7, 0x76, 0x73, 0xe7, 0xd4, 0xbe, 0xdf, 0x39,
0xb5, 0x0f, 0xc7, 0x11, 0x93, 0xf1, 0x64, 0xec, 0x06, 0x3c, 0xf5, 0xcc, 0xff, 0x93, 0xfe, 0x7a,
0x2e, 0xc2, 0x4b, 0x2f, 0x48, 0x18, 0xcd, 0xa4, 0x17, 0x15, 0x79, 0xe0, 0xc9, 0x54, 0xd0, 0x62,
0xca, 0x02, 0x3a, 0x6e, 0xc0, 0x05, 0x79, 0xf9, 0x27, 0x00, 0x00, 0xff, 0xff, 0x9b, 0x84, 0x6d,
0xe8, 0xd1, 0x04, 0x00, 0x00,
0x11, 0xa5, 0x54, 0xc2, 0xa6, 0x54, 0x2c, 0x58, 0xb0, 0x20, 0x6d, 0xa5, 0x46, 0x82, 0x8d, 0x85,
0x58, 0xb0, 0x89, 0x26, 0xf6, 0x60, 0x8f, 0x6a, 0x7b, 0x2c, 0xcf, 0x24, 0x82, 0x67, 0x60, 0xd3,
0xc7, 0x60, 0xc9, 0x63, 0x74, 0xd9, 0x25, 0xab, 0x82, 0xd2, 0x05, 0x4f, 0xc0, 0x1e, 0xcd, 0x9d,
0x71, 0xeb, 0x10, 0x89, 0x4d, 0x62, 0x9f, 0xfb, 0xbb, 0x27, 0x73, 0xcf, 0x1d, 0x05, 0x1d, 0x06,
0x5c, 0xa4, 0x5c, 0x78, 0x63, 0x22, 0xa8, 0x27, 0x69, 0x16, 0xd2, 0x22, 0x65, 0x99, 0xf4, 0xa6,
0x47, 0x63, 0x2a, 0xc9, 0x91, 0x27, 0x3f, 0xe7, 0x54, 0xb8, 0x79, 0xc1, 0x25, 0xc7, 0x8e, 0x66,
0x5d, 0xc5, 0xba, 0xf7, 0xac, 0x6b, 0xd8, 0xde, 0x56, 0xc4, 0x23, 0x0e, 0xa8, 0xa7, 0x9e, 0x74,
0x57, 0xef, 0xff, 0x8a, 0x2b, 0xb8, 0x55, 0x3d, 0x7b, 0xfd, 0x85, 0x2a, 0x9d, 0xb2, 0x90, 0x66,
0x01, 0x35, 0x80, 0x53, 0x3d, 0x14, 0x2d, 0x04, 0xe3, 0xd9, 0xbc, 0x41, 0xc4, 0x79, 0x94, 0x50,
0x0f, 0xde, 0xc6, 0x93, 0x8f, 0x9e, 0x64, 0x29, 0x15, 0x92, 0xa4, 0xb9, 0x01, 0x36, 0x49, 0xca,
0x32, 0xee, 0xc1, 0xa7, 0x96, 0xf6, 0xbe, 0x2c, 0xa1, 0x95, 0x41, 0xc2, 0x83, 0x0b, 0x3c, 0x44,
0x8d, 0x98, 0x92, 0x90, 0x16, 0xb6, 0xb5, 0x6b, 0x1d, 0x74, 0x9e, 0xef, 0xbb, 0xff, 0x9e, 0xd1,
0x3d, 0x07, 0x7a, 0xd0, 0xbe, 0xba, 0xe9, 0xd7, 0xbe, 0xfe, 0xfa, 0x76, 0x68, 0xf9, 0xc6, 0x00,
0xbf, 0x40, 0xf5, 0x90, 0x48, 0x62, 0x2f, 0x81, 0xd1, 0x76, 0xb5, 0x59, 0x9f, 0xf7, 0x94, 0x48,
0x52, 0x6d, 0x04, 0x1c, 0x9f, 0xa1, 0x56, 0x39, 0xb1, 0xbd, 0x0c, 0xad, 0xce, 0x62, 0xeb, 0x99,
0x21, 0xde, 0x30, 0x21, 0xab, 0x16, 0x77, 0xad, 0xf8, 0x25, 0xea, 0x24, 0x44, 0xc8, 0x51, 0xc0,
0xd3, 0x94, 0x49, 0xbb, 0x0e, 0x4e, 0xf6, 0xa2, 0xd3, 0x09, 0xd4, 0x7d, 0xa4, 0x60, 0xfd, 0xbc,
0xf7, 0xbb, 0x8e, 0x1a, 0x7a, 0x2c, 0x3c, 0x40, 0x4d, 0x93, 0xb1, 0xc9, 0xe3, 0xc1, 0x5c, 0x06,
0xba, 0xe4, 0x9e, 0xf0, 0x4c, 0xd0, 0x4c, 0x4c, 0x44, 0xf5, 0x28, 0x65, 0x23, 0xde, 0x47, 0xad,
0x20, 0x26, 0x2c, 0x1b, 0xb1, 0x10, 0xb2, 0x68, 0x0f, 0x3a, 0xb3, 0x9b, 0x7e, 0xf3, 0x44, 0x69,
0xc3, 0x53, 0xbf, 0x09, 0xc5, 0x61, 0x88, 0xb7, 0x55, 0xf4, 0x2c, 0x8a, 0x25, 0x8c, 0xbd, 0xec,
0x9b, 0x37, 0xfc, 0x0a, 0xd5, 0xd5, 0x0a, 0xcd, 0x08, 0x3d, 0x57, 0xef, 0xd7, 0x2d, 0xf7, 0xeb,
0xbe, 0x2b, 0xf7, 0x3b, 0xe8, 0xaa, 0x5f, 0xbf, 0xfc, 0xd1, 0xb7, 0x4c, 0x9e, 0xaa, 0x0d, 0x9f,
0xa3, 0x2e, 0x04, 0x31, 0x56, 0xfb, 0x55, 0x67, 0x58, 0x01, 0x9f, 0x9d, 0xc5, 0x28, 0xe0, 0x06,
0x0c, 0x4f, 0xab, 0x43, 0x40, 0x86, 0x5a, 0x0f, 0xf1, 0x01, 0xda, 0xa8, 0x44, 0x3a, 0x8a, 0x89,
0x88, 0xed, 0xc6, 0xae, 0x75, 0xb0, 0xea, 0xaf, 0xdd, 0xa7, 0x77, 0x4e, 0x44, 0x8c, 0xff, 0x43,
0x6d, 0xb5, 0x4b, 0x8d, 0x34, 0x01, 0x69, 0x29, 0x01, 0x8a, 0x8f, 0xd1, 0xfa, 0x94, 0x24, 0x2c,
0x24, 0x92, 0x17, 0x42, 0x23, 0x2d, 0xed, 0x72, 0x2f, 0x03, 0xf8, 0x0c, 0x6d, 0x65, 0xf4, 0x93,
0x1c, 0xfd, 0x4d, 0xb7, 0x81, 0xc6, 0xaa, 0xf6, 0x7e, 0xbe, 0xe3, 0x11, 0x5a, 0x0b, 0xca, 0x5d,
0x68, 0x16, 0x01, 0xdb, 0xbd, 0x53, 0x01, 0xdb, 0x41, 0x2d, 0x92, 0xe7, 0x1a, 0xe8, 0x00, 0xd0,
0x24, 0x79, 0x0e, 0xa5, 0x43, 0xb4, 0x09, 0x33, 0x16, 0x54, 0x4c, 0x12, 0x69, 0x4c, 0x56, 0x81,
0x59, 0x57, 0x05, 0x5f, 0xeb, 0xc0, 0x3e, 0x44, 0xdd, 0xf2, 0xba, 0x69, 0xae, 0x0b, 0xdc, 0x6a,
0x29, 0x02, 0xf4, 0x04, 0x6d, 0xe4, 0x05, 0xcf, 0xb9, 0xa0, 0xc5, 0x88, 0x84, 0x61, 0x41, 0x85,
0xb0, 0xd7, 0xd4, 0x2d, 0xf0, 0xd7, 0x4b, 0xfd, 0xb5, 0x96, 0x07, 0x6f, 0xaf, 0x66, 0x8e, 0x75,
0x3d, 0x73, 0xac, 0x9f, 0x33, 0xc7, 0xba, 0xbc, 0x75, 0x6a, 0xd7, 0xb7, 0x4e, 0xed, 0xfb, 0xad,
0x53, 0xfb, 0x70, 0x1c, 0x31, 0x19, 0x4f, 0xc6, 0x6e, 0xc0, 0x53, 0xcf, 0xfc, 0x3f, 0xe9, 0xaf,
0xa7, 0x22, 0xbc, 0xf0, 0x82, 0x84, 0xd1, 0x4c, 0x7a, 0x51, 0x91, 0x07, 0x5e, 0x90, 0x4a, 0x41,
0x8b, 0x29, 0x0b, 0xe8, 0xb8, 0x01, 0x37, 0xe4, 0xf8, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00,
0x0c, 0x32, 0xb7, 0xd2, 0x04, 0x00, 0x00,
}
func (m *Block) Marshal() (dAtA []byte, err error) {

12
client/grpc/tmservice/util.go → client/grpc/cmtservice/util.go
View File

@ -1,12 +1,12 @@
package tmservice
package cmtservice
import (
tmprototypes "github.com/cometbft/cometbft/proto/tendermint/types"
cmtprototypes "github.com/cometbft/cometbft/proto/tendermint/types"
sdk "github.com/cosmos/cosmos-sdk/types"
)
// convertHeader converts tendermint header to sdk header
func convertHeader(h tmprototypes.Header) Header {
// convertHeader converts CometBFT header to sdk header
func convertHeader(h cmtprototypes.Header) Header {
return Header{
Version: h.Version,
ChainID: h.ChainID,
@ -25,8 +25,8 @@ func convertHeader(h tmprototypes.Header) Header {
}
}
// convertBlock converts tendermint block to sdk block
func convertBlock(tmblock *tmprototypes.Block) *Block {
// convertBlock converts CometBFT block to sdk block
func convertBlock(tmblock *cmtprototypes.Block) *Block {
b := new(Block)
b.Header = convertHeader(tmblock.Header)

2
client/grpc_query.go
View File

@ -33,7 +33,7 @@ var fallBackCodec = codec.NewProtoCodec(failingInterfaceRegistry{})
// Invoke implements the grpc ClientConn.Invoke method
func (ctx Context) Invoke(grpcCtx gocontext.Context, method string, req, reply interface{}, opts ...grpc.CallOption) (err error) {
// Two things can happen here:
// 1. either we're broadcasting a Tx, in which call we call Tendermint's broadcast endpoint directly,
// 1. either we're broadcasting a Tx, in which call we call CometBFT's broadcast endpoint directly,
// 2-1. or we are querying for state, in which case we call grpc if grpc client set.
// 2-2. or we are querying for state, in which case we call ABCI's Query if grpc client not set.

2
client/keys/root.go
View File

@ -14,7 +14,7 @@ func Commands(defaultNodeHome string) *cobra.Command {
Use: "keys",
Short: "Manage your application's keys",
Long: `Keyring management commands. These keys may be in any format supported by the
Tendermint crypto library and can be used by light-clients, full nodes, or any other application
CometBFT crypto library and can be used by light-clients, full nodes, or any other application
that needs to sign with a private key.
The keyring supports the following backends:

6
client/rpc/status.go
View File

@ -15,7 +15,7 @@ import (
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
)
// ValidatorInfo is info about the node's validator, same as Tendermint,
// ValidatorInfo is info about the node's validator, same as CometBFT,
// except that we use our own PubKey.
type validatorInfo struct {
Address bytes.HexBytes
@ -23,7 +23,7 @@ type validatorInfo struct {
VotingPower int64
}
// ResultStatus is node's info, same as Tendermint, except that we use our own
// ResultStatus is node's info, same as CometBFT, except that we use our own
// PubKey.
type resultStatus struct {
NodeInfo p2p.DefaultNodeInfo
@ -50,7 +50,7 @@ func StatusCommand() *cobra.Command {
var pk cryptotypes.PubKey
// `status` has TM pubkeys, we need to convert them to our pubkeys.
if status.ValidatorInfo.PubKey != nil {
pk, err = cryptocodec.FromTmPubKeyInterface(status.ValidatorInfo.PubKey)
pk, err = cryptocodec.FromCmtPubKeyInterface(status.ValidatorInfo.PubKey)
if err != nil {
return err
}

9
client/rpc/validators.go
View File

@ -22,9 +22,10 @@ import (
// ValidatorCommand returns the validator set for a given height
func ValidatorCommand() *cobra.Command {
cmd := &cobra.Command{
Use: "tendermint-validator-set [height]",
Short: "Get the full tendermint validator set at given height",
Args: cobra.MaximumNArgs(1),
Use: "comet-validator-set [height]",
Aliases: []string{"cometbft-validator-set", "tendermint-validator-set"},
Short: "Get the full CometBFT validator set at given height",
Args: cobra.MaximumNArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
clientCtx, err := client.GetClientQueryContext(cmd)
if err != nil {
@ -101,7 +102,7 @@ func (rvo ResultValidatorsOutput) String() string {
}
func validatorOutput(validator *cmttypes.Validator) (ValidatorOutput, error) {
pk, err := cryptocodec.FromTmPubKeyInterface(validator.PubKey)
pk, err := cryptocodec.FromCmtPubKeyInterface(validator.PubKey)
if err != nil {
return ValidatorOutput{}, err
}

2
client/tx/tx.go
View File

@ -120,7 +120,7 @@ func BroadcastTx(clientCtx client.Context, txf Factory, msgs ...sdk.Msg) error {
return err
}
// broadcast to a Tendermint node
// broadcast to a CometBFT node
res, err := clientCtx.BroadcastTx(txBytes)
if err != nil {
return err

2
client/utils.go
View File

@ -73,7 +73,7 @@ func ReadPageRequest(flagSet *pflag.FlagSet) (*query.PageRequest, error) {
}, nil
}
// NewClientFromNode sets up Client implementation that communicates with a Tendermint node over
// NewClientFromNode sets up Client implementation that communicates with a CometBFT node over
// JSON RPC and WebSockets
func NewClientFromNode(nodeURI string) (*rpchttp.HTTP, error) {
return rpchttp.New(nodeURI, "/websocket")

2
codec/amino.go
View File

@ -27,7 +27,7 @@ func NewLegacyAmino() *LegacyAmino {
return &LegacyAmino{amino.NewCodec()}
}
// RegisterEvidences registers Tendermint evidence types with the provided Amino
// RegisterEvidences registers CometBFT evidence types with the provided Amino
// codec.
func RegisterEvidences(cdc *LegacyAmino) {
cdc.Amino.RegisterInterface((*cmttypes.Evidence)(nil), nil)

2
codec/legacy/codec.go
View File

@ -8,7 +8,7 @@ import (
)
// Cdc defines a global generic sealed Amino codec to be used throughout sdk. It
// has all Tendermint crypto and evidence types registered.
// has all CometBFT crypto and evidence types registered.
//
// TODO: Deprecated - remove this global.
var Cdc = codec.NewLegacyAmino()

47
crypto/codec/cmt.go
View File

@ -1,6 +1,7 @@
package codec
import (
"cosmossdk.io/errors"
cmtcrypto "github.com/cometbft/cometbft/crypto"
"github.com/cometbft/cometbft/crypto/encoding"
cmtprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto"
@ -11,8 +12,8 @@ import (
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
)
// FromTmProtoPublicKey converts a TM's cmtprotocrypto.PublicKey into our own PubKey.
func FromTmProtoPublicKey(protoPk cmtprotocrypto.PublicKey) (cryptotypes.PubKey, error) {
// FromCmtProtoPublicKey converts a CMT's cmtprotocrypto.PublicKey into our own PubKey.
func FromCmtProtoPublicKey(protoPk cmtprotocrypto.PublicKey) (cryptotypes.PubKey, error) {
switch protoPk := protoPk.Sum.(type) {
case *cmtprotocrypto.PublicKey_Ed25519:
return &ed25519.PubKey{
@ -23,12 +24,12 @@ func FromTmProtoPublicKey(protoPk cmtprotocrypto.PublicKey) (cryptotypes.PubKey,
Key: protoPk.Secp256K1,
}, nil
default:
return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "cannot convert %v from Tendermint public key", protoPk)
return nil, errors.Wrapf(sdkerrors.ErrInvalidType, "cannot convert %v from Tendermint public key", protoPk)
}
}
// ToTmProtoPublicKey converts our own PubKey to TM's cmtprotocrypto.PublicKey.
func ToTmProtoPublicKey(pk cryptotypes.PubKey) (cmtprotocrypto.PublicKey, error) {
// ToCmtProtoPublicKey converts our own PubKey to Cmt's cmtprotocrypto.PublicKey.
func ToCmtProtoPublicKey(pk cryptotypes.PubKey) (cmtprotocrypto.PublicKey, error) {
switch pk := pk.(type) {
case *ed25519.PubKey:
return cmtprotocrypto.PublicKey{
@ -43,26 +44,48 @@ func ToTmProtoPublicKey(pk cryptotypes.PubKey) (cmtprotocrypto.PublicKey, error)
},
}, nil
default:
return cmtprotocrypto.PublicKey{}, sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "cannot convert %v to Tendermint public key", pk)
return cmtprotocrypto.PublicKey{}, errors.Wrapf(sdkerrors.ErrInvalidType, "cannot convert %v to Tendermint public key", pk)
}
}
// FromTmPubKeyInterface converts TM's cmtcrypto.PubKey to our own PubKey.
func FromTmPubKeyInterface(tmPk cmtcrypto.PubKey) (cryptotypes.PubKey, error) {
// FromCmtPubKeyInterface converts CMT's cmtcrypto.PubKey to our own PubKey.
func FromCmtPubKeyInterface(tmPk cmtcrypto.PubKey) (cryptotypes.PubKey, error) {
tmProtoPk, err := encoding.PubKeyToProto(tmPk)
if err != nil {
return nil, err
}
return FromTmProtoPublicKey(tmProtoPk)
return FromCmtProtoPublicKey(tmProtoPk)
}
// ToTmPubKeyInterface converts our own PubKey to TM's cmtcrypto.PubKey.
func ToTmPubKeyInterface(pk cryptotypes.PubKey) (cmtcrypto.PubKey, error) {
tmProtoPk, err := ToTmProtoPublicKey(pk)
// ToCmtPubKeyInterface converts our own PubKey to CMT's cmtcrypto.PubKey.
func ToCmtPubKeyInterface(pk cryptotypes.PubKey) (cmtcrypto.PubKey, error) {
tmProtoPk, err := ToCmtProtoPublicKey(pk)
if err != nil {
return nil, err
}
return encoding.PubKeyFromProto(tmProtoPk)
}
// ----------------------
// Deprecated: use FromCmtProtoPublicKey instead.
func FromTmProtoPublicKey(protoPk cmtprotocrypto.PublicKey) (cryptotypes.PubKey, error) {
return FromCmtProtoPublicKey(protoPk)
}
// Deprecated: use ToCmtProtoPublicKey instead.
func ToTmProtoPublicKey(pk cryptotypes.PubKey) (cmtprotocrypto.PublicKey, error) {
return ToCmtProtoPublicKey(pk)
}
// Deprecated: use FromCmtPubKeyInterface instead.
func FromTmPubKeyInterface(tmPk cmtcrypto.PubKey) (cryptotypes.PubKey, error) {
return FromCmtPubKeyInterface(tmPk)
}
// Deprecated: use ToCmtPubKeyInterface instead.
func ToTmPubKeyInterface(pk cryptotypes.PubKey) (cmtcrypto.PubKey, error) {
return ToCmtPubKeyInterface(pk)
}

2
crypto/keys/ed25519/ed25519_test.go
View File

@ -189,7 +189,7 @@ func TestMarshalAmino_BackwardsCompatibility(t *testing.T) {
// Create Tendermint keys.
tmPrivKey := tmed25519.GenPrivKey()
tmPubKey := tmPrivKey.PubKey()
// Create our own keys, with the same private key as Tendermint's.
// Create our own keys, with the same private key as CometBFT's.
privKey := &ed25519.PrivKey{Key: []byte(tmPrivKey)}
pubKey := privKey.PubKey().(*ed25519.PubKey)

2
docs/architecture/adr-032-typed-events.md
View File

@ -109,7 +109,7 @@ func ParseTypedEvent(event abci.Event) (proto.Message, error) {
Here, the `EmitTypedEvent` is a method on `EventManager` which takes typed event as input and apply json serialization on it. Then it maps the JSON key/value pairs to `event.Attributes` and emits it in form of `sdk.Event`. `Event.Type` will be the type URL of the proto message.
When we subscribe to emitted events on the cometbft websocket, they are emitted in the form of an `abci.Event`. `ParseTypedEvent` parses the event back to it's original proto message.
When we subscribe to emitted events on the CometBFT websocket, they are emitted in the form of an `abci.Event`. `ParseTypedEvent` parses the event back to it's original proto message.
**Step-2**: Add proto definitions for typed events for msgs in each module:

2
proto/cosmos/base/tendermint/v1beta1/query.proto
View File

@ -12,7 +12,7 @@ import "cosmos_proto/cosmos.proto";
import "tendermint/types/block.proto";
import "amino/amino.proto";
option go_package = "github.com/cosmos/cosmos-sdk/client/grpc/tmservice";
option go_package = "github.com/cosmos/cosmos-sdk/client/grpc/cmtservice";
// Service defines the gRPC querier service for tendermint queries.
service Service {

2
proto/cosmos/base/tendermint/v1beta1/types.proto
View File

@ -8,7 +8,7 @@ import "tendermint/version/types.proto";
import "google/protobuf/timestamp.proto";
import "amino/amino.proto";
option go_package = "github.com/cosmos/cosmos-sdk/client/grpc/tmservice";
option go_package = "github.com/cosmos/cosmos-sdk/client/grpc/cmtservice";
// Block is tendermint type Block, with the Header proposer address
// field converted to bech32 string.

8
runtime/app.go
View File

@ -14,8 +14,8 @@ import (
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/server/api"
@ -141,8 +141,8 @@ func (a *App) RegisterAPIRoutes(apiSvr *api.Server, _ config.APIConfig) {
// Register new tx routes from grpc-gateway.
authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
// Register new tendermint queries routes from grpc-gateway.
tmservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
// Register new CometBFT queries routes from grpc-gateway.
cmtservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
// Register node gRPC service for grpc-gateway.
nodeservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
@ -158,7 +158,7 @@ func (a *App) RegisterTxService(clientCtx client.Context) {
// RegisterTendermintService implements the Application.RegisterTendermintService method.
func (a *App) RegisterTendermintService(clientCtx client.Context) {
tmservice.RegisterTendermintService(
cmtservice.RegisterTendermintService(
clientCtx,
a.GRPCQueryRouter(),
a.interfaceRegistry,

4
server/api/server.go
View File

@ -86,9 +86,9 @@ func New(clientCtx client.Context, logger log.Logger, grpcSrv *grpc.Server) *Ser
}
}
// Start starts the API server. Internally, the API server leverages Tendermint's
// Start starts the API server. Internally, the API server leverages CometBFT's
// JSON RPC server. Configuration options are provided via config.APIConfig
// and are delegated to the Tendermint JSON RPC server. The process is
// and are delegated to the CometBFT JSON RPC server. The process is
// non-blocking, so an external signal handler must be used.
func (s *Server) Start(cfg config.Config) error {
s.mtx.Lock()

6
server/api/server_test.go
View File

@ -18,7 +18,7 @@ import (
"github.com/stretchr/testify/suite"
"google.golang.org/grpc/codes"
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
"github.com/cosmos/cosmos-sdk/codec"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/testutil/network"
@ -73,13 +73,13 @@ func (s *GRPCWebTestSuite) Test_Latest_Validators() {
headers, trailers, responses, err := s.makeGrpcRequest(
"/cosmos.base.tendermint.v1beta1.Service/GetLatestValidatorSet",
headerWithFlag(),
serializeProtoMessages([]proto.Message{&tmservice.GetLatestValidatorSetRequest{}}), false)
serializeProtoMessages([]proto.Message{&cmtservice.GetLatestValidatorSetRequest{}}), false)
s.Require().NoError(err)
s.Require().Equal(1, len(responses))
s.assertTrailerGrpcCode(trailers, codes.OK, "")
s.assertContentTypeSet(headers, contentType)
var valsSet tmservice.GetLatestValidatorSetResponse
var valsSet cmtservice.GetLatestValidatorSetResponse
err = s.protoCdc.Unmarshal(responses[0], &valsSet)
s.Require().NoError(err)
pubKey, ok := valsSet.Validators[0].PubKey.GetCachedValue().(cryptotypes.PubKey)

16
server/cmt_cmds.go
View File

@ -5,7 +5,7 @@ import (
"github.com/cometbft/cometbft/p2p"
pvm "github.com/cometbft/cometbft/privval"
tversion "github.com/cometbft/cometbft/version"
cmtversion "github.com/cometbft/cometbft/version"
"github.com/spf13/cobra"
"sigs.k8s.io/yaml"
@ -49,7 +49,7 @@ func ShowValidatorCmd() *cobra.Command {
return err
}
sdkPK, err := cryptocodec.FromTmPubKeyInterface(pk)
sdkPK, err := cryptocodec.FromCmtPubKeyInterface(pk)
if err != nil {
return err
}
@ -96,21 +96,21 @@ func VersionCmd() *cobra.Command {
Long: "Print protocols' and libraries' version numbers against which this app has been compiled.",
RunE: func(cmd *cobra.Command, args []string) error {
bs, err := yaml.Marshal(&struct {
Tendermint string
CometBFT string
ABCI string
BlockProtocol uint64
P2PProtocol uint64
}{
Tendermint: tversion.TMCoreSemVer,
ABCI: tversion.ABCIVersion,
BlockProtocol: tversion.BlockProtocol,
P2PProtocol: tversion.P2PProtocol,
CometBFT: cmtversion.TMCoreSemVer,
ABCI: cmtversion.ABCIVersion,
BlockProtocol: cmtversion.BlockProtocol,
P2PProtocol: cmtversion.P2PProtocol,
})
if err != nil {
return err
}
fmt.Println(string(bs))
cmd.Print(string(bs))
return nil
},
}

2
server/rollback.go
View File

@ -36,7 +36,7 @@ application.
// rollback CometBFT state
height, hash, err := cmtcmd.RollbackState(ctx.Config, removeBlock)
if err != nil {
return fmt.Errorf("failed to rollback cometbft state: %w", err)
return fmt.Errorf("failed to rollback CometBFT state: %w", err)
}
// rollback the multistore

18
server/start.go
View File

@ -15,6 +15,7 @@ import (
"github.com/cometbft/cometbft/proxy"
"github.com/cometbft/cometbft/rpc/client/local"
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"
@ -33,7 +34,7 @@ import (
const (
// CometBFT full-node start flags
flagWithTendermint = "with-tendermint"
flagWithComet = "with-comet"
flagAddress = "address"
flagTransport = "transport"
flagTraceStore = "trace-store"
@ -131,8 +132,8 @@ is performed. Note, when enabled, gRPC will also be automatically enabled.
return err
}
withTM, _ := cmd.Flags().GetBool(flagWithTendermint)
if !withTM {
withCMT, _ := cmd.Flags().GetBool(flagWithComet)
if !withCMT {
serverCtx.Logger.Info("starting ABCI without CometBFT")
return startStandAlone(serverCtx, appCreator)
}
@ -150,7 +151,7 @@ is performed. Note, when enabled, gRPC will also be automatically enabled.
}
cmd.Flags().String(flags.FlagHome, defaultNodeHome, "The application home directory")
cmd.Flags().Bool(flagWithTendermint, true, "Run abci app embedded in-process with CometBFT")
cmd.Flags().Bool(flagWithComet, true, "Run abci app embedded in-process with CometBFT")
cmd.Flags().String(flagAddress, "tcp://0.0.0.0:26658", "Listen address")
cmd.Flags().String(flagTransport, "socket", "Transport protocol: socket, grpc")
cmd.Flags().String(flagTraceStore, "", "Enable KVStore tracing to an output file")
@ -189,6 +190,15 @@ is performed. Note, when enabled, gRPC will also be automatically enabled.
cmd.Flags().Int(FlagMempoolMaxTxs, mempool.DefaultMaxTx, "Sets MaxTx value for the app-side mempool")
// support old flags name for backwards compatibility
cmd.Flags().SetNormalizeFunc(func(f *pflag.FlagSet, name string) pflag.NormalizedName {
if name == "with-tendermint" {
name = flagWithComet
}
return pflag.NormalizedName(name)
})
// add support for all CometBFT-specific command line options
tcmd.AddNodeFlags(cmd)
return cmd

2
server/util.go
View File

@ -282,7 +282,7 @@ func interceptConfigs(rootViper *viper.Viper, customAppTemplate string, customCo
func AddCommands(rootCmd *cobra.Command, defaultNodeHome string, appCreator types.AppCreator, appExport types.AppExporter, addStartFlags types.ModuleInitFlags) {
cometCmd := &cobra.Command{
Use: "comet",
Aliases: []string{"cmt", "cometbft", "tendermint"},
Aliases: []string{"cometbft", "tendermint"},
Short: "CometBFT subcommands",
}

4
server/util_test.go
View File

@ -68,9 +68,9 @@ func TestInterceptConfigsPreRunHandlerCreatesConfigFilesWhenMissing(t *testing.T
t.Fatal("config.toml created as empty file")
}
// Test that tendermint config is initialized
// Test that CometBFT config is initialized
if serverCtx.Config == nil {
t.Fatal("tendermint config not created")
t.Fatal("CometBFT config not created")
}
// Test that app.toml is created

6
simapp/README.md
View File

@ -16,7 +16,7 @@ in this testnet.
`simd` binary inside a new `build` directory. The following instructions are run from inside
the `build` directory.
2. If you've run `simd` before, you may need to reset your database before starting a new
testnet. You can reset your database with the following command: `$ ./simd tendermint unsafe-reset-all`.
testnet. You can reset your database with the following command: `$ ./simd comet unsafe-reset-all`.
3. `$ ./simd init [moniker] --chain-id [chain-id]`. This will initialize a new working directory
at the default location `~/.simapp`. You need to provide a "moniker" and a "chain id". These
two names can be anything, but you will need to use the same "chain id" in the following steps.
@ -42,11 +42,11 @@ in this testnet.
persistent_peers = "[validator_address]@[ip_address]:[port],[validator_address]@[ip_address]:[port]"
```
You can find `validator_address` by running `$ ./simd tendermint show-node-id`. The output will
You can find `validator_address` by running `$ ./simd comet show-node-id`. The output will
be the hex-encoded `validator_address`. The default `port` is 26656.
10. Now you can start your nodes: `$ ./simd start`.
Now you have a small testnet that you can use to try out changes to the Cosmos SDK or Tendermint!
Now you have a small testnet that you can use to try out changes to the Cosmos SDK or CometBFT!
NOTE: Sometimes creating the network through the `collect-gentxs` will fail, and validators will start
in a funny state (and then panic). If this happens, you can try to create and start the network first

8
simapp/app.go
View File

@ -37,8 +37,8 @@ import (
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/cosmos/cosmos-sdk/codec/types"
"github.com/cosmos/cosmos-sdk/runtime"
@ -672,8 +672,8 @@ func (app *SimApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.APICon
// Register new tx routes from grpc-gateway.
authtx.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
// Register new tendermint queries routes from grpc-gateway.
tmservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
// Register new CometBFT queries routes from grpc-gateway.
cmtservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
// Register node gRPC service for grpc-gateway.
nodeservice.RegisterGRPCGatewayRoutes(clientCtx, apiSvr.GRPCGatewayRouter)
@ -694,7 +694,7 @@ func (app *SimApp) RegisterTxService(clientCtx client.Context) {
// RegisterTendermintService implements the Application.RegisterTendermintService method.
func (app *SimApp) RegisterTendermintService(clientCtx client.Context) {
tmservice.RegisterTendermintService(
cmtservice.RegisterTendermintService(
clientCtx,
app.BaseApp.GRPCQueryRouter(),
app.interfaceRegistry,

2
simapp/export.go
View File

@ -22,7 +22,7 @@ func (app *SimApp) ExportAppStateAndValidators(forZeroHeight bool, jailAllowedAd
ctx := app.NewContext(true, cmtproto.Header{Height: app.LastBlockHeight()})
// We export at last height + 1, because that's the height at which
// Tendermint will start InitChain.
// CometBFT will start InitChain.
height := app.LastBlockHeight() + 1
if forZeroHeight {
height = 0

6
simapp/simd/cmd/root.go
View File

@ -97,7 +97,7 @@ func NewRootCmd() *cobra.Command {
}
customAppTemplate, customAppConfig := initAppConfig()
customCMTConfig := initTendermintConfig()
customCMTConfig := initCometBFTConfig()
return server.InterceptConfigsPreRunHandler(cmd, customAppTemplate, customAppConfig, customCMTConfig)
},
@ -112,9 +112,9 @@ func NewRootCmd() *cobra.Command {
return rootCmd
}
// initTendermintConfig helps to override default Tendermint Config values.
// initCometBFTConfig helps to override default CometBFT Config values.
// return cmtcfg.DefaultConfig if no custom configuration is required for the application.
func initTendermintConfig() *cmtcfg.Config {
func initCometBFTConfig() *cmtcfg.Config {
cfg := cmtcfg.DefaultConfig()
// these values put a higher strain on node memory

2
simapp/simd/cmd/testnet_test.go
View File

@ -25,7 +25,7 @@ func Test_TestnetCmd(t *testing.T) {
home := t.TempDir()
encodingConfig := moduletestutil.MakeTestEncodingConfig(staking.AppModuleBasic{}, auth.AppModuleBasic{})
logger := log.NewNopLogger()
cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
cfg, err := genutiltest.CreateDefaultCometConfig(home)
require.NoError(t, err)
err = genutiltest.ExecInitCmd(simapp.ModuleBasics, home, encodingConfig.Codec)

2
simapp/state.go
View File

@ -206,7 +206,7 @@ func AppStateFromGenesisFileFn(r io.Reader, cdc codec.JSONCodec, genesisFile str
}
var genesis cmttypes.GenesisDoc
// NOTE: CometNFT uses a custom JSON decoder for GenesisDoc
// NOTE: CometBFT uses a custom JSON decoder for GenesisDoc
err = cmtjson.Unmarshal(bytes, &genesis)
if err != nil {
panic(err)

2
simapp/upgrades.go
View File

@ -24,7 +24,7 @@ func (app SimApp) RegisterUpgradeHandlers() {
app.UpgradeKeeper.SetUpgradeHandler(
UpgradeName,
func(ctx sdk.Context, _ upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
// Migrate Tendermint consensus parameters from x/params module to a
// Migrate CometBFT consensus parameters from x/params module to a
// dedicated x/consensus module.
baseapp.MigrateParams(ctx, baseAppLegacySS, &app.ConsensusParamsKeeper)

64
tests/e2e/client/grpc/tmservice/service_test.go → tests/e2e/client/grpc/cmtservice/service_test.go
View File

@ -1,7 +1,7 @@
//go:build e2e
// +build e2e
package tmservice_test
package cmtservice_test
import (
"context"
@ -11,7 +11,7 @@ import (
"cosmossdk.io/simapp"
"github.com/stretchr/testify/suite"
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/cosmos/cosmos-sdk/testutil"
@ -28,7 +28,7 @@ type E2ETestSuite struct {
cfg network.Config
network *network.Network
queryClient tmservice.ServiceClient
queryClient cmtservice.ServiceClient
}
func TestE2ETestSuite(t *testing.T) {
@ -48,7 +48,7 @@ func (s *E2ETestSuite) SetupSuite() {
s.Require().NoError(s.network.WaitForNextBlock())
s.queryClient = tmservice.NewServiceClient(s.network.Validators[0].ClientCtx)
s.queryClient = cmtservice.NewServiceClient(s.network.Validators[0].ClientCtx)
}
func (s *E2ETestSuite) TearDownSuite() {
@ -59,13 +59,13 @@ func (s *E2ETestSuite) TearDownSuite() {
func (s *E2ETestSuite) TestQueryNodeInfo() {
val := s.network.Validators[0]
res, err := s.queryClient.GetNodeInfo(context.Background(), &tmservice.GetNodeInfoRequest{})
res, err := s.queryClient.GetNodeInfo(context.Background(), &cmtservice.GetNodeInfoRequest{})
s.Require().NoError(err)
s.Require().Equal(res.ApplicationVersion.AppName, version.NewInfo().AppName)
restRes, err := testutil.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/node_info", val.APIAddress))
s.Require().NoError(err)
var getInfoRes tmservice.GetNodeInfoResponse
var getInfoRes cmtservice.GetNodeInfoResponse
s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(restRes, &getInfoRes))
s.Require().Equal(getInfoRes.ApplicationVersion.AppName, version.NewInfo().AppName)
}
@ -73,24 +73,24 @@ func (s *E2ETestSuite) TestQueryNodeInfo() {
func (s *E2ETestSuite) TestQuerySyncing() {
val := s.network.Validators[0]
_, err := s.queryClient.GetSyncing(context.Background(), &tmservice.GetSyncingRequest{})
_, err := s.queryClient.GetSyncing(context.Background(), &cmtservice.GetSyncingRequest{})
s.Require().NoError(err)
restRes, err := testutil.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/syncing", val.APIAddress))
s.Require().NoError(err)
var syncingRes tmservice.GetSyncingResponse
var syncingRes cmtservice.GetSyncingResponse
s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(restRes, &syncingRes))
}
func (s *E2ETestSuite) TestQueryLatestBlock() {
val := s.network.Validators[0]
_, err := s.queryClient.GetLatestBlock(context.Background(), &tmservice.GetLatestBlockRequest{})
_, err := s.queryClient.GetLatestBlock(context.Background(), &cmtservice.GetLatestBlockRequest{})
s.Require().NoError(err)
restRes, err := testutil.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/blocks/latest", val.APIAddress))
s.Require().NoError(err)
var blockInfoRes tmservice.GetLatestBlockResponse
var blockInfoRes cmtservice.GetLatestBlockResponse
s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(restRes, &blockInfoRes))
s.Require().Equal(types.ValAddress(blockInfoRes.Block.Header.ProposerAddress).String(), blockInfoRes.SdkBlock.Header.ProposerAddress)
s.Require().Contains(blockInfoRes.SdkBlock.Header.ProposerAddress, "cosmosvaloper")
@ -98,12 +98,12 @@ func (s *E2ETestSuite) TestQueryLatestBlock() {
func (s *E2ETestSuite) TestQueryBlockByHeight() {
val := s.network.Validators[0]
_, err := s.queryClient.GetBlockByHeight(context.Background(), &tmservice.GetBlockByHeightRequest{Height: 1})
_, err := s.queryClient.GetBlockByHeight(context.Background(), &cmtservice.GetBlockByHeightRequest{Height: 1})
s.Require().NoError(err)
restRes, err := testutil.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/blocks/%d", val.APIAddress, 1))
s.Require().NoError(err)
var blockInfoRes tmservice.GetBlockByHeightResponse
var blockInfoRes cmtservice.GetBlockByHeightResponse
s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(restRes, &blockInfoRes))
s.Require().Contains(blockInfoRes.SdkBlock.Header.ProposerAddress, "cosmosvaloper")
}
@ -112,7 +112,7 @@ func (s *E2ETestSuite) TestQueryLatestValidatorSet() {
val := s.network.Validators[0]
// nil pagination
res, err := s.queryClient.GetLatestValidatorSet(context.Background(), &tmservice.GetLatestValidatorSetRequest{
res, err := s.queryClient.GetLatestValidatorSet(context.Background(), &cmtservice.GetLatestValidatorSetRequest{
Pagination: nil,
})
s.Require().NoError(err)
@ -122,7 +122,7 @@ func (s *E2ETestSuite) TestQueryLatestValidatorSet() {
s.Require().Equal(content, val.PubKey)
// with pagination
_, err = s.queryClient.GetLatestValidatorSet(context.Background(), &tmservice.GetLatestValidatorSetRequest{Pagination: &qtypes.PageRequest{
_, err = s.queryClient.GetLatestValidatorSet(context.Background(), &cmtservice.GetLatestValidatorSetRequest{Pagination: &qtypes.PageRequest{
Offset: 0,
Limit: 10,
}})
@ -135,7 +135,7 @@ func (s *E2ETestSuite) TestQueryLatestValidatorSet() {
// rest request with pagination
restRes, err := testutil.GetRequest(fmt.Sprintf("%s/cosmos/base/tendermint/v1beta1/validatorsets/latest?pagination.offset=%d&pagination.limit=%d", val.APIAddress, 0, 1))
s.Require().NoError(err)
var validatorSetRes tmservice.GetLatestValidatorSetResponse
var validatorSetRes cmtservice.GetLatestValidatorSetResponse
s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(restRes, &validatorSetRes))
s.Require().Equal(1, len(validatorSetRes.Validators))
anyPub, err := codectypes.NewAnyWithValue(val.PubKey)
@ -147,13 +147,13 @@ func (s *E2ETestSuite) TestLatestValidatorSet_GRPC() {
vals := s.network.Validators
testCases := []struct {
name string
req *tmservice.GetLatestValidatorSetRequest
req *cmtservice.GetLatestValidatorSetRequest
expErr bool
expErrMsg string
}{
{"nil request", nil, true, "cannot be nil"},
{"no pagination", &tmservice.GetLatestValidatorSetRequest{}, false, ""},
{"with pagination", &tmservice.GetLatestValidatorSetRequest{Pagination: &qtypes.PageRequest{Offset: 0, Limit: uint64(len(vals))}}, false, ""},
{"no pagination", &cmtservice.GetLatestValidatorSetRequest{}, false, ""},
{"with pagination", &cmtservice.GetLatestValidatorSetRequest{Pagination: &qtypes.PageRequest{Offset: 0, Limit: uint64(len(vals))}}, false, ""},
}
for _, tc := range testCases {
tc := tc
@ -194,7 +194,7 @@ func (s *E2ETestSuite) TestLatestValidatorSet_GRPCGateway() {
if tc.expErr {
s.Require().Contains(string(res), tc.expErrMsg)
} else {
var result tmservice.GetLatestValidatorSetResponse
var result cmtservice.GetLatestValidatorSetResponse
err = vals[0].ClientCtx.Codec.UnmarshalJSON(res, &result)
s.Require().NoError(err)
s.Require().Equal(uint64(len(vals)), result.Pagination.Total)
@ -210,14 +210,14 @@ func (s *E2ETestSuite) TestValidatorSetByHeight_GRPC() {
vals := s.network.Validators
testCases := []struct {
name string
req *tmservice.GetValidatorSetByHeightRequest
req *cmtservice.GetValidatorSetByHeightRequest
expErr bool
expErrMsg string
}{
{"nil request", nil, true, "request cannot be nil"},
{"empty request", &tmservice.GetValidatorSetByHeightRequest{}, true, "height must be greater than 0"},
{"no pagination", &tmservice.GetValidatorSetByHeightRequest{Height: 1}, false, ""},
{"with pagination", &tmservice.GetValidatorSetByHeightRequest{Height: 1, Pagination: &qtypes.PageRequest{Offset: 0, Limit: 1}}, false, ""},
{"empty request", &cmtservice.GetValidatorSetByHeightRequest{}, true, "height must be greater than 0"},
{"no pagination", &cmtservice.GetValidatorSetByHeightRequest{Height: 1}, false, ""},
{"with pagination", &cmtservice.GetValidatorSetByHeightRequest{Height: 1, Pagination: &qtypes.PageRequest{Offset: 0, Limit: 1}}, false, ""},
}
for _, tc := range testCases {
tc := tc
@ -256,7 +256,7 @@ func (s *E2ETestSuite) TestValidatorSetByHeight_GRPCGateway() {
if tc.expErr {
s.Require().Contains(string(res), tc.expErrMsg)
} else {
var result tmservice.GetValidatorSetByHeightResponse
var result cmtservice.GetValidatorSetByHeightResponse
err = vals[0].ClientCtx.Codec.UnmarshalJSON(res, &result)
s.Require().NoError(err)
s.Require().Equal(uint64(len(vals)), result.Pagination.Total)
@ -268,14 +268,14 @@ func (s *E2ETestSuite) TestValidatorSetByHeight_GRPCGateway() {
func (s *E2ETestSuite) TestABCIQuery() {
testCases := []struct {
name string
req *tmservice.ABCIQueryRequest
req *cmtservice.ABCIQueryRequest
expectErr bool
expectedCode uint32
validQuery bool
}{
{
name: "valid request with proof",
req: &tmservice.ABCIQueryRequest{
req: &cmtservice.ABCIQueryRequest{
Path: "/store/gov/key",
Data: []byte{0x03},
Prove: true,
@ -284,7 +284,7 @@ func (s *E2ETestSuite) TestABCIQuery() {
},
{
name: "valid request without proof",
req: &tmservice.ABCIQueryRequest{
req: &cmtservice.ABCIQueryRequest{
Path: "/store/gov/key",
Data: []byte{0x03},
Prove: false,
@ -293,7 +293,7 @@ func (s *E2ETestSuite) TestABCIQuery() {
},
{
name: "request with invalid path",
req: &tmservice.ABCIQueryRequest{
req: &cmtservice.ABCIQueryRequest{
Path: "/foo/bar",
Data: []byte{0x03},
},
@ -301,9 +301,9 @@ func (s *E2ETestSuite) TestABCIQuery() {
},
{
name: "request with invalid path recursive",
req: &tmservice.ABCIQueryRequest{
req: &cmtservice.ABCIQueryRequest{
Path: "/cosmos.base.tendermint.v1beta1.Service/ABCIQuery",
Data: s.cfg.Codec.MustMarshal(&tmservice.ABCIQueryRequest{
Data: s.cfg.Codec.MustMarshal(&cmtservice.ABCIQueryRequest{
Path: "/cosmos.base.tendermint.v1beta1.Service/ABCIQuery",
}),
},
@ -311,7 +311,7 @@ func (s *E2ETestSuite) TestABCIQuery() {
},
{
name: "request with invalid broadcast tx path",
req: &tmservice.ABCIQueryRequest{
req: &cmtservice.ABCIQueryRequest{
Path: "/cosmos.tx.v1beta1.Service/BroadcastTx",
Data: []byte{0x00},
},
@ -319,7 +319,7 @@ func (s *E2ETestSuite) TestABCIQuery() {
},
{
name: "request with invalid data",
req: &tmservice.ABCIQueryRequest{
req: &cmtservice.ABCIQueryRequest{
Path: "/store/gov/key",
Data: []byte{0x0044, 0x00},
},

2
tests/e2e/genutil/migrate.go
View File

@ -31,7 +31,7 @@ func (s *E2ETestSuite) TestMigrateGenesis() {
"migrate 0.37 to 0.42",
v037Exported,
"v0.42",
true, "Make sure that you have correctly migrated all Tendermint consensus params", func(_ string) {},
true, "Make sure that you have correctly migrated all CometBFT consensus params", func(_ string) {},
},
{
"migrate 0.42 to 0.43",

2
tests/e2e/genutil/validate_genesis.go
View File

@ -92,7 +92,7 @@ func (s *E2ETestSuite) TestValidateGenesis() {
genesisFile := testutil.WriteToNewTempFile(s.T(), tc.genesis)
_, err := clitestutil.ExecTestCLICmd(val0.ClientCtx, cli.ValidateGenesisCmd(nil), []string{genesisFile.Name()})
if tc.expErr {
s.Require().Contains(err.Error(), "Make sure that you have correctly migrated all Tendermint consensus params")
s.Require().Contains(err.Error(), "Make sure that you have correctly migrated all CometBFT consensus params")
} else {
s.Require().NoError(err)
}

10
tests/integration/staking/keeper/validator_test.go
View File

@ -694,7 +694,7 @@ func TestApplyAndReturnValidatorSetUpdatesNewValidator(t *testing.T) {
app.StakingKeeper.SetValidatorByPowerIndex(ctx, validators[i])
}
// verify initial Tendermint updates are correct
// verify initial CometBFT updates are correct
updates := applyValidatorSetUpdates(t, ctx, app.StakingKeeper, len(validators))
validators[0], _ = app.StakingKeeper.GetValidator(ctx, validators[0].GetOperator())
validators[1], _ = app.StakingKeeper.GetValidator(ctx, validators[1].GetOperator())
@ -739,7 +739,7 @@ func TestApplyAndReturnValidatorSetUpdatesNewValidator(t *testing.T) {
app.StakingKeeper.SetValidator(ctx, validator)
app.StakingKeeper.SetValidatorByPowerIndex(ctx, validator)
// verify initial Tendermint updates are correct
// verify initial CometBFT updates are correct
updates = applyValidatorSetUpdates(t, ctx, app.StakingKeeper, len(validators)+1)
validator, _ = app.StakingKeeper.GetValidator(ctx, validator.GetOperator())
validators[0], _ = app.StakingKeeper.GetValidator(ctx, validators[0].GetOperator())
@ -772,7 +772,7 @@ func TestApplyAndReturnValidatorSetUpdatesBondTransition(t *testing.T) {
app.StakingKeeper.SetValidatorByPowerIndex(ctx, validators[i])
}
// verify initial Tendermint updates are correct
// verify initial CometBFT updates are correct
updates := applyValidatorSetUpdates(t, ctx, app.StakingKeeper, 2)
validators[2], _ = app.StakingKeeper.GetValidator(ctx, validators[2].GetOperator())
validators[1], _ = app.StakingKeeper.GetValidator(ctx, validators[1].GetOperator())
@ -794,7 +794,7 @@ func TestApplyAndReturnValidatorSetUpdatesBondTransition(t *testing.T) {
app.StakingKeeper.SetValidator(ctx, validators[0])
app.StakingKeeper.SetValidatorByPowerIndex(ctx, validators[0])
// verify initial Tendermint updates are correct
// verify initial CometBFT updates are correct
applyValidatorSetUpdates(t, ctx, app.StakingKeeper, 0)
// create a series of events that will bond and unbond the validator with
@ -816,7 +816,7 @@ func TestApplyAndReturnValidatorSetUpdatesBondTransition(t *testing.T) {
app.StakingKeeper.SetValidator(ctx, validators[1])
app.StakingKeeper.SetValidatorByPowerIndex(ctx, validators[1])
// verify initial Tendermint updates are correct
// verify initial CometBFT updates are correct
updates = applyValidatorSetUpdates(t, ctx, app.StakingKeeper, 1)
assert.DeepEqual(t, validators[1].ABCIValidatorUpdate(app.StakingKeeper.PowerReduction(ctx)), updates[0])

2
testutil/mock/privval.go
View File

@ -24,7 +24,7 @@ func NewPV() PV {
// GetPubKey implements PrivValidator interface
func (pv PV) GetPubKey() (crypto.PubKey, error) {
return cryptocodec.ToTmPubKeyInterface(pv.PrivKey.PubKey())
return cryptocodec.ToCmtPubKeyInterface(pv.PrivKey.PubKey())
}
// SignVote implements PrivValidator interface

8
testutil/network/doc.go
View File

@ -1,5 +1,5 @@
/*
Package network implements and exposes a fully operational in-process Tendermint
Package network implements and exposes a fully operational in-process CometBFT
test network that consists of at least one or potentially many validators. This
test network can be used primarily for integration tests or unit test suites.
@ -10,11 +10,11 @@ number of validators as well as account funds and even custom genesis state.
When creating a test network, a series of Validator objects are returned. Each
Validator object has useful information such as their address and public key. A
Validator will also provide its RPC, P2P, and API addresses that can be useful
for integration testing. In addition, a Tendermint local RPC client is also provided
which can be handy for making direct RPC calls to Tendermint.
for integration testing. In addition, a CometBFT local RPC client is also provided
which can be handy for making direct RPC calls to CometBFT.
Note, due to limitations in concurrency and the design of the RPC layer in
Tendermint, only the first Validator object will have an RPC and API client
CometBFT, only the first Validator object will have an RPC and API client
exposed. Due to this exact same limitation, only a single test network can exist
at a time. A caller must be certain it calls Cleanup after it no longer needs
the network.

10
testutil/network/network.go
View File

@ -30,7 +30,7 @@ import (
"github.com/cosmos/cosmos-sdk/baseapp"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
"github.com/cosmos/cosmos-sdk/client/tx"
"github.com/cosmos/cosmos-sdk/codec"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
@ -631,14 +631,14 @@ func (n *Network) LatestHeight() (int64, error) {
var latestHeight int64
val := n.Validators[0]
queryClient := tmservice.NewServiceClient(val.ClientCtx)
queryClient := cmtservice.NewServiceClient(val.ClientCtx)
for {
select {
case <-timeout.C:
return latestHeight, errors.New("timeout exceeded waiting for block")
case <-ticker.C:
res, err := queryClient.GetLatestBlock(context.Background(), &tmservice.GetLatestBlockRequest{})
res, err := queryClient.GetLatestBlock(context.Background(), &cmtservice.GetLatestBlockRequest{})
if err == nil && res != nil {
return res.SdkBlock.Header.Height, nil
}
@ -668,7 +668,7 @@ func (n *Network) WaitForHeightWithTimeout(h int64, t time.Duration) (int64, err
var latestHeight int64
val := n.Validators[0]
queryClient := tmservice.NewServiceClient(val.ClientCtx)
queryClient := cmtservice.NewServiceClient(val.ClientCtx)
for {
select {
@ -676,7 +676,7 @@ func (n *Network) WaitForHeightWithTimeout(h int64, t time.Duration) (int64, err
return latestHeight, errors.New("timeout exceeded waiting for block")
case <-ticker.C:
res, err := queryClient.GetLatestBlock(context.Background(), &tmservice.GetLatestBlockRequest{})
res, err := queryClient.GetLatestBlock(context.Background(), &cmtservice.GetLatestBlockRequest{})
if err == nil && res != nil {
latestHeight = res.GetSdkBlock().Header.Height
if latestHeight >= h {

2
testutil/network/util.go
View File

@ -198,7 +198,7 @@ func writeFile(name string, dir string, contents []byte) error {
return nil
}
// Get a free address for a test tendermint server
// Get a free address for a test CometBFT server
// protocol is either tcp, http, etc
func FreeTCPAddr() (addr, port string, closeFn func() error, err error) {
l, err := net.Listen("tcp", "localhost:0")

4
testutil/sims/app_helpers.go
View File

@ -30,7 +30,7 @@ import (
const DefaultGenTxGas = 10000000
// DefaultConsensusParams defines the default Tendermint consensus params used in
// DefaultConsensusParams defines the default CometBFT consensus params used in
// SimApp testing.
var DefaultConsensusParams = &cmtproto.ConsensusParams{
Block: &cmtproto.BlockParams{
@ -199,7 +199,7 @@ func GenesisStateWithValSet(
bondAmt := sdk.DefaultPowerReduction
for _, val := range valSet.Validators {
pk, err := cryptocodec.FromTmPubKeyInterface(val.PubKey)
pk, err := cryptocodec.FromCmtPubKeyInterface(val.PubKey)
if err != nil {
return nil, fmt.Errorf("failed to convert pubkey: %w", err)
}

6
tools/rosetta/config.go
View File

@ -24,8 +24,8 @@ const (
DefaultAddr = ":8080"
// DefaultRetries is the default number of retries
DefaultRetries = 5
// DefaultTendermintEndpoint is the default value for the tendermint endpoint
DefaultTendermintEndpoint = "localhost:26657"
// DefaultCometEndpoint is the default value for the CometBFT endpoint
DefaultCometEndpoint = "localhost:26657"
// DefaultGRPCEndpoint is the default value for the gRPC endpoint
DefaultGRPCEndpoint = "localhost:9090"
// DefaultNetwork defines the default network name
@ -257,7 +257,7 @@ func ServerFromConfig(conf *Config) (crg.Server, error) {
func SetFlags(flags *pflag.FlagSet) {
flags.String(FlagBlockchain, DefaultBlockchain, "the blockchain type")
flags.String(FlagNetwork, DefaultNetwork, "the network name")
flags.String(FlagTendermintEndpoint, DefaultTendermintEndpoint, "the cometbft rpc endpoint, without tcp://")
flags.String(FlagTendermintEndpoint, DefaultCometEndpoint, "the CometBFT rpc endpoint, without tcp://")
flags.String(FlagGRPCEndpoint, DefaultGRPCEndpoint, "the app gRPC endpoint")
flags.String(FlagAddr, DefaultAddr, "the address rosetta will bind to")
flags.Int(FlagRetries, DefaultRetries, "the number of retries that will be done before quitting")

6
tools/rosetta/lib/errors/errors.go
View File

@ -74,15 +74,15 @@ func ToRosetta(err error) *types.Error {
if rosErr == nil || !ok {
tmErr, ok := err.(*cmttypes.RPCError)
if tmErr != nil && ok {
return fromTendermintToRosettaError(tmErr).rosErr
return fromCometToRosettaError(tmErr).rosErr
}
return ToRosetta(WrapError(ErrUnknown, ErrUnknown.Error()))
}
return rosErr.rosErr
}
// fromTendermintToRosettaError converts a tendermint jsonrpc error to rosetta error
func fromTendermintToRosettaError(err *cmttypes.RPCError) *Error {
// fromCometToRosettaError converts a CometBFT jsonrpc error to rosetta error
func fromCometToRosettaError(err *cmttypes.RPCError) *Error {
return &Error{rosErr: &types.Error{
Code: http.StatusInternalServerError,
Message: err.Message,

2
tools/rosetta/lib/internal/service/block.go
View File

@ -65,7 +65,7 @@ func (on OnlineNetwork) Block(ctx context.Context, request *types.BlockRequest)
}
// BlockTransaction gets the given transaction in the specified block, we do not need to check the block itself too
// due to the fact that tendermint achieves instant finality
// due to the fact that CometBFT achieves instant finality
func (on OnlineNetwork) BlockTransaction(ctx context.Context, request *types.BlockTransactionRequest) (*types.BlockTransactionResponse, *types.Error) {
tx, err := on.client.GetTx(ctx, request.TransactionIdentifier.Hash)
if err != nil {

2
tools/rosetta/lib/internal/service/online.go
View File

@ -37,7 +37,7 @@ func NewOnlineNetwork(network *types.NetworkIdentifier, client crgtypes.Client,
// OnlineNetwork groups together all the components required for the full rosetta implementation
type OnlineNetwork struct {
client crgtypes.Client // used to query cosmos app + tendermint
client crgtypes.Client // used to query Cosmos app + CometBFT
network *types.NetworkIdentifier // identifies the network, it's static
networkOptions *types.NetworkOptionsResponse // identifies the network options, it's static

2
tools/rosetta/types.go
View File

@ -13,7 +13,7 @@ const (
)
// In rosetta all state transitions must be represented as transactions
// since in tendermint begin block and end block are state transitions
// since in CometBFT begin block and end block are state transitions
// which are not represented as transactions we mock only the balance changes
// happening at those levels as transactions. (check BeginBlockTxHash for more info)
const (

2
types/events.go
View File

@ -194,7 +194,7 @@ func (a Attribute) String() string {
return fmt.Sprintf("%s: %s", a.Key, a.Value)
}
// ToKVPair converts an Attribute object into a Tendermint key/value pair.
// ToKVPair converts an Attribute object into a CometBFT key/value pair.
func (a Attribute) ToKVPair() abci.EventAttribute {
return abci.EventAttribute{Key: a.Key, Value: a.Value}
}

2
types/mempool/noop.go
View File

@ -12,7 +12,7 @@ var _ Mempool = (*NoOpMempool)(nil)
// ignored when BaseApp interacts with the mempool.
//
// Note: When this mempool is used, it assumed that an application will rely
// on Tendermint's transaction ordering defined in `RequestPrepareProposal`, which
// on CometBFT's transaction ordering defined in `RequestPrepareProposal`, which
// is FIFO-ordered by default.
type NoOpMempool struct{}

4
types/staking.go
View File

@ -11,8 +11,8 @@ import (
// validators are expected to sign blocks beginning at block 11+X.
//
// This value is constant as this should not change without a hard fork.
// For Tendermint this should be set to 1 block, for more details see:
// https://tendermint.com/docs/spec/abci/apps.html#endblock
// For CometBFT this should be set to 1 block, for more details see:
// https://github.com/cometbft/cometbft/blob/main/spec/abci/abci%2B%2B_basic_concepts.md#consensusblock-execution-methods
const ValidatorUpdateDelay int64 = 1
var (

2
x/auth/client/cli/tips.go
View File

@ -65,7 +65,7 @@ func GetAuxToFeeCommand() *cobra.Command {
return err
}
// broadcast to a Tendermint node
// broadcast to a CometBFT node
res, err := clientCtx.BroadcastTx(txBytes)
if err != nil {
return err

8
x/auth/tx/service.go
View File

@ -13,7 +13,7 @@ import (
"google.golang.org/grpc/status"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/grpc/tmservice"
"github.com/cosmos/cosmos-sdk/client/grpc/cmtservice"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
sdk "github.com/cosmos/cosmos-sdk/types"
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@ -59,7 +59,7 @@ func (s txServer) GetTxsEvent(ctx context.Context, req *txtypes.GetTxsEventReque
}
page := int(req.Page)
// Tendermint node.TxSearch that is used for querying txs defines pages starting from 1,
// CometBFT node.TxSearch that is used for querying txs defines pages starting from 1,
// so we default to 1 if not provided in the request.
if page == 0 {
page = 1
@ -192,7 +192,7 @@ func (s txServer) GetBlockWithTxs(ctx context.Context, req *txtypes.GetBlockWith
"or greater than the current height %d", req.Height, currentHeight)
}
blockID, block, err := tmservice.GetProtoBlock(ctx, s.clientCtx, &req.Height)
blockID, block, err := cmtservice.GetProtoBlock(ctx, s.clientCtx, &req.Height)
if err != nil {
return nil, err
}
@ -363,6 +363,6 @@ func parseOrderBy(orderBy txtypes.OrderBy) string {
case txtypes.OrderBy_ORDER_BY_DESC:
return "desc"
default:
return "" // Defaults to Tendermint's default, which is `asc` now.
return "" // Defaults to CometBFT's default, which is `asc` now.
}
}

2
x/bank/types/query.pb.go
View File

@ -129,7 +129,7 @@ type QueryAllBalancesRequest struct {
Pagination *query.PageRequest `protobuf:"bytes,2,opt,name=pagination,proto3" json:"pagination,omitempty"`
// resolve_denom is the flag to resolve the denom into a human-readable form from the metadata.
//
// Since: cosmos-sdk 0.47
// Since: cosmos-sdk 0.48
ResolveDenom bool `protobuf:"varint,3,opt,name=resolve_denom,json=resolveDenom,proto3" json:"resolve_denom,omitempty"`
}

4
x/consensus/module.go
View File

@ -119,9 +119,9 @@ func (am AppModule) InitGenesis(sdk.Context, codec.JSONCodec, json.RawMessage) [
return nil
}
// ExportGenesis is handled by tendermint export of genesis
// ExportGenesis is handled by CometBFT export of genesis
func (am AppModule) ExportGenesis(sdk.Context, codec.JSONCodec) json.RawMessage {
// nil is returned since ExportGenesis of consensus params is handled by tendermint and baseapp
// nil is returned since ExportGenesis of consensus params is handled by CometBFT and baseapp
return nil
}

2
x/evidence/abci.go
View File

@ -13,7 +13,7 @@ import (
)
// BeginBlocker iterates through and handles any newly discovered evidence of
// misbehavior submitted by Tendermint. Currently, only equivocation is handled.
// misbehavior submitted by CometBFT. Currently, only equivocation is handled.
func BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock, k keeper.Keeper) {
defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyBeginBlocker)

8
x/evidence/keeper/infraction.go
View File

@ -32,7 +32,7 @@ func (k Keeper) HandleEquivocationEvidence(ctx sdk.Context, evidence *types.Equi
//
// NOTE: We used to panic with:
// `panic(fmt.Sprintf("Validator consensus-address %v not found", consAddr))`,
// but this couples the expectations of the app to both Tendermint and
// but this couples the expectations of the app to both CometBFT and
// the simulator. Both are expected to provide the full range of
// allowable but none of the disallowed evidence types. Instead of
// getting this coordination right, it is easier to relax the
@ -67,7 +67,7 @@ func (k Keeper) HandleEquivocationEvidence(ctx sdk.Context, evidence *types.Equi
validator := k.stakingKeeper.ValidatorByConsAddr(ctx, consAddr)
if validator == nil || validator.IsUnbonded() {
// Defensive: Simulation doesn't take unbonding periods into account, and
// Tendermint might break this assumption at some point.
// CometBFT might break this assumption at some point.
return
}
@ -77,7 +77,7 @@ func (k Keeper) HandleEquivocationEvidence(ctx sdk.Context, evidence *types.Equi
//
// NOTE: We used to panic with:
// `panic(fmt.Sprintf("Validator consensus-address %v not found", consAddr))`,
// but this couples the expectations of the app to both Tendermint and
// but this couples the expectations of the app to both CometBFT and
// the simulator. Both are expected to provide the full range of
// allowable but none of the disallowed evidence types. Instead of
// getting this coordination right, it is easier to relax the
@ -117,7 +117,7 @@ func (k Keeper) HandleEquivocationEvidence(ctx sdk.Context, evidence *types.Equi
distributionHeight := infractionHeight - sdk.ValidatorUpdateDelay
// Slash validator. The `power` is the int64 power of the validator as provided
// to/by Tendermint. This value is validator.Tokens as sent to Tendermint via
// to/by CometBFT. This value is validator.Tokens as sent to CometBFT via
// ABCI, and now received as evidence. The fraction is passed in to separately
// to slash unbonding and rebonding delegations.
k.slashingKeeper.SlashWithInfractionReason(

2
x/evidence/types/evidence.go
View File

@ -73,7 +73,7 @@ func (e Equivocation) GetValidatorPower() int64 {
// GetTotalPower is a no-op for the Equivocation type.
func (e Equivocation) GetTotalPower() int64 { return 0 }
// FromABCIEvidence converts a Tendermint concrete Evidence type to
// FromABCIEvidence converts a CometBFT concrete Evidence type to
// SDK Evidence using Equivocation as the concrete type.
func FromABCIEvidence(e abci.Misbehavior) exported.Evidence {
bech32PrefixConsAddr := sdk.GetConfig().GetBech32ConsensusAddrPrefix()

2
x/genutil/client/cli/genaccount_test.go
View File

@ -66,7 +66,7 @@ func TestAddGenesisAccountCmd(t *testing.T) {
t.Run(tc.name, func(t *testing.T) {
home := t.TempDir()
logger := log.NewNopLogger()
cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
cfg, err := genutiltest.CreateDefaultCometConfig(home)
require.NoError(t, err)
appCodec := moduletestutil.MakeTestEncodingConfig(auth.AppModuleBasic{}).Codec

12
x/genutil/client/cli/init_test.go
View File

@ -60,7 +60,7 @@ func TestInitCmd(t *testing.T) {
t.Run(tt.name, func(t *testing.T) {
home := t.TempDir()
logger := log.NewNopLogger()
cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
cfg, err := genutiltest.CreateDefaultCometConfig(home)
require.NoError(t, err)
serverCtx := server.NewContext(viper.New(), cfg, logger)
@ -93,7 +93,7 @@ func TestInitCmd(t *testing.T) {
func TestInitRecover(t *testing.T) {
home := t.TempDir()
logger := log.NewNopLogger()
cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
cfg, err := genutiltest.CreateDefaultCometConfig(home)
require.NoError(t, err)
serverCtx := server.NewContext(viper.New(), cfg, logger)
@ -124,7 +124,7 @@ func TestInitRecover(t *testing.T) {
func TestInitDefaultBondDenom(t *testing.T) {
home := t.TempDir()
logger := log.NewNopLogger()
cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
cfg, err := genutiltest.CreateDefaultCometConfig(home)
require.NoError(t, err)
serverCtx := server.NewContext(viper.New(), cfg, logger)
@ -152,7 +152,7 @@ func TestInitDefaultBondDenom(t *testing.T) {
func TestEmptyState(t *testing.T) {
home := t.TempDir()
logger := log.NewNopLogger()
cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
cfg, err := genutiltest.CreateDefaultCometConfig(home)
require.NoError(t, err)
serverCtx := server.NewContext(viper.New(), cfg, logger)
@ -230,7 +230,7 @@ func TestStartStandAlone(t *testing.T) {
func TestInitNodeValidatorFiles(t *testing.T) {
home := t.TempDir()
cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
cfg, err := genutiltest.CreateDefaultCometConfig(home)
require.NoError(t, err)
nodeID, valPubKey, err := genutil.InitializeNodeValidatorFiles(cfg)
@ -243,7 +243,7 @@ func TestInitNodeValidatorFiles(t *testing.T) {
func TestInitConfig(t *testing.T) {
home := t.TempDir()
logger := log.NewNopLogger()
cfg, err := genutiltest.CreateDefaultTendermintConfig(home)
cfg, err := genutiltest.CreateDefaultCometConfig(home)
require.NoError(t, err)
serverCtx := server.NewContext(viper.New(), cfg, logger)

2
x/genutil/client/cli/migrate_test.go
View File

@ -29,7 +29,7 @@ func (s *CLITestSuite) TestMigrateGenesis() {
"migrate 0.37 to 0.42",
v037Exported,
"v0.42",
true, "Make sure that you have correctly migrated all Tendermint consensus params", func(_ string) {},
true, "Make sure that you have correctly migrated all CometBFT consensus params", func(_ string) {},
},
{
"migrate 0.42 to 0.43",

4
x/genutil/client/cli/validate_genesis.go
View File

@ -55,13 +55,13 @@ func ValidateGenesisCmd(mbm module.BasicManager) *cobra.Command {
}
// validateGenDoc reads a genesis file and validates that it is a correct
// Tendermint GenesisDoc. This function does not do any cosmos-related
// CometBFT GenesisDoc. This function does not do any cosmos-related
// validation.
func validateGenDoc(importGenesisFile string) (*cmttypes.GenesisDoc, error) {
genDoc, err := cmttypes.GenesisDocFromFile(importGenesisFile)
if err != nil {
return nil, fmt.Errorf("%s. Make sure that"+
" you have correctly migrated all Tendermint consensus params, please see the"+
" you have correctly migrated all CometBFT consensus params, please see the"+
" chain migration guide at %s for more info",
err.Error(), chainUpgradeGuide,
)

2
x/genutil/client/cli/validate_genesis_test.go
View File

@ -90,7 +90,7 @@ func (s *CLITestSuite) TestValidateGenesis() {
genesisFile := testutil.WriteToNewTempFile(s.T(), tc.genesis)
_, err := clitestutil.ExecTestCLICmd(s.clientCtx, cli.ValidateGenesisCmd(nil), []string{genesisFile.Name()})
if tc.expErr {
s.Require().Contains(err.Error(), "Make sure that you have correctly migrated all Tendermint consensus params")
s.Require().Contains(err.Error(), "Make sure that you have correctly migrated all CometBFT consensus params")
} else {
s.Require().NoError(err)
}

4
x/genutil/client/testutil/helpers.go
View File

@ -19,7 +19,7 @@ import (
func ExecInitCmd(testMbm module.BasicManager, home string, cdc codec.Codec) error {
logger := log.NewNopLogger()
cfg, err := CreateDefaultTendermintConfig(home)
cfg, err := CreateDefaultCometConfig(home)
if err != nil {
return err
}
@ -40,7 +40,7 @@ func ExecInitCmd(testMbm module.BasicManager, home string, cdc codec.Codec) erro
return cmd.ExecuteContext(ctx)
}
func CreateDefaultTendermintConfig(rootDir string) (*cmtcfg.Config, error) {
func CreateDefaultCometConfig(rootDir string) (*cmtcfg.Config, error) {
conf := cmtcfg.DefaultConfig()
conf.SetRoot(rootDir)
cmtcfg.EnsureRoot(rootDir)

2
x/genutil/doc.go
View File

@ -5,6 +5,6 @@ for usage within a blockchain application. Namely:
- commands for collection and creation of gentxs
- initchain processing of gentxs
- Genesis file validation
- Tendermint related initialization
- CometBFT related initialization
*/
package genutil

2
x/genutil/utils.go
View File

@ -90,7 +90,7 @@ func InitializeNodeValidatorFilesFromMnemonic(config *cfg.Config, mnemonic strin
return "", nil, err
}
valPubKey, err = cryptocodec.FromTmPubKeyInterface(tmValPubKey)
valPubKey, err = cryptocodec.FromCmtPubKeyInterface(tmValPubKey)
if err != nil {
return "", nil, err
}

2
x/gov/client/utils/query.go
View File

@ -437,7 +437,7 @@ func QueryProposalByID(proposalID uint64, clientCtx client.Context, queryRoute s
// combineEvents queries txs by events with all events from each event group,
// and combines all those events together.
//
// Tx are indexed in tendermint via their Msgs `Type()`, which can be:
// Tx are indexed in CometBFT via their Msgs `Type()`, which can be:
// - via legacy Msgs (amino or proto), their `Type()` is a custom string,
// - via ADR-031 proto msgs, their `Type()` is the protobuf FQ method name.
// In searching for events, we search for both `Type()`s, and we use the

4
x/slashing/simulation/operations_test.go
View File

@ -62,12 +62,12 @@ func (suite *SimTestSuite) SetupTest() {
// create validator (non random as using a seed)
createValidator := func() (*cmttypes.ValidatorSet, error) {
account := accounts[0]
tmPk, err := cryptocodec.ToTmPubKeyInterface(account.PubKey)
cmtPk, err := cryptocodec.ToCmtPubKeyInterface(account.PubKey)
if err != nil {
return nil, fmt.Errorf("failed to create pubkey: %w", err)
}
validator := cmttypes.NewValidator(tmPk, 1)
validator := cmttypes.NewValidator(cmtPk, 1)
return cmttypes.NewValidatorSet([]*cmttypes.Validator{validator}), nil
}

6
x/staking/genesis.go
View File

@ -19,15 +19,15 @@ func WriteValidators(ctx sdk.Context, keeper *keeper.Keeper) (vals []cmttypes.Ge
returnErr = err
return true
}
tmPk, err := cryptocodec.ToTmPubKeyInterface(pk)
cmtPk, err := cryptocodec.ToCmtPubKeyInterface(pk)
if err != nil {
returnErr = err
return true
}
vals = append(vals, cmttypes.GenesisValidator{
Address: sdk.ConsAddress(tmPk.Address()).Bytes(),
PubKey: tmPk,
Address: sdk.ConsAddress(cmtPk.Address()).Bytes(),
PubKey: cmtPk,
Power: validator.GetConsensusPower(keeper.PowerReduction(ctx)),
Name: validator.GetMoniker(),
})

2
x/staking/keeper/genesis.go
View File

@ -137,7 +137,7 @@ func (k Keeper) InitGenesis(ctx sdk.Context, data *types.GenesisState) (res []ab
panic(fmt.Sprintf("not bonded pool balance is different from not bonded coins: %s <-> %s", notBondedBalance, notBondedCoins))
}
// don't need to run Tendermint updates if we exported
// don't need to run CometBFT updates if we exported
if data.Exported {
for _, lv := range data.LastValidatorPowers {
valAddr, err := sdk.ValAddressFromBech32(lv.Address)

4
x/staking/keeper/validator_test.go
View File

@ -249,7 +249,7 @@ func (s *KeeperTestSuite) TestApplyAndReturnValidatorSetUpdatesPowerDecrease() {
require.Equal(int64(100), validators[1].GetConsensusPower(keeper.PowerReduction(ctx)))
// test multiple value change
// tendermintUpdate set: {c1, c3} -> {c1', c3'}
// tendermintUpdate set: {c1, c3} -> {c1', c3'}
delTokens1 := keeper.TokensFromConsensusPower(ctx, 20)
delTokens2 := keeper.TokensFromConsensusPower(ctx, 30)
validators[0], _ = validators[0].RemoveDelShares(sdk.NewDecFromInt(delTokens1))
@ -261,7 +261,7 @@ func (s *KeeperTestSuite) TestApplyAndReturnValidatorSetUpdatesPowerDecrease() {
require.Equal(int64(80), validators[0].GetConsensusPower(keeper.PowerReduction(ctx)))
require.Equal(int64(70), validators[1].GetConsensusPower(keeper.PowerReduction(ctx)))
// Tendermint updates should reflect power change
// CometBFT updates should reflect power change
updates := s.applyValidatorSetUpdates(ctx, keeper, 2)
require.Equal(validators[0].ABCIValidatorUpdate(keeper.PowerReduction(ctx)), updates[0])
require.Equal(validators[1].ABCIValidatorUpdate(keeper.PowerReduction(ctx)), updates[1])

4
x/staking/simulation/operations_test.go
View File

@ -68,9 +68,9 @@ func (s *SimTestSuite) SetupTest() {
// create validator set with single validator
account := accounts[0]
tmPk, err := cryptocodec.ToTmPubKeyInterface(account.PubKey)
cmtPk, err := cryptocodec.ToCmtPubKeyInterface(account.PubKey)
require.NoError(s.T(), err)
validator := cmttypes.NewValidator(tmPk, 1)
validator := cmttypes.NewValidator(cmtPk, 1)
startupCfg := simtestutil.DefaultStartUpConfig()
startupCfg.GenesisAccounts = accs

2
x/staking/testutil/cmt.go
View File

@ -16,7 +16,7 @@ func GetCmtConsPubKey(v types.Validator) (cmtcrypto.PubKey, error) {
return nil, err
}
return cryptocodec.ToTmPubKeyInterface(pk)
return cryptocodec.ToCmtPubKeyInterface(pk)
}
// ToCmtValidator casts an SDK validator to a CometBFT type Validator.

2
x/staking/types/historical_info.go
View File

@ -16,7 +16,7 @@ import (
// NewHistoricalInfo will create a historical information struct from header and valset
// it will first sort valset before inclusion into historical info
func NewHistoricalInfo(header cmtproto.Header, valSet Validators, powerReduction math.Int) HistoricalInfo {
// Must sort in the same way that tendermint does
// Must sort in the same way that CometBFT does
sort.SliceStable(valSet, func(i, j int) bool {
return ValidatorsByVotingPower(valSet).Less(i, j, powerReduction)
})

12
x/staking/types/validator.go
View File

@ -7,6 +7,7 @@ import (
"strings"
"time"
"cosmossdk.io/errors"
"cosmossdk.io/math"
abci "github.com/cometbft/cometbft/abci/types"
cmtprotocrypto "github.com/cometbft/cometbft/proto/tendermint/crypto"
@ -461,20 +462,25 @@ func (v Validator) GetOperator() sdk.ValAddress {
func (v Validator) ConsPubKey() (cryptotypes.PubKey, error) {
pk, ok := v.ConsensusPubkey.GetCachedValue().(cryptotypes.PubKey)
if !ok {
return nil, sdkerrors.Wrapf(sdkerrors.ErrInvalidType, "expecting cryptotypes.PubKey, got %T", pk)
return nil, errors.Wrapf(sdkerrors.ErrInvalidType, "expecting cryptotypes.PubKey, got %T", pk)
}
return pk, nil
}
// TmConsPublicKey casts Validator.ConsensusPubkey to cmtprotocrypto.PubKey.
// Deprecated: use CmtConsPublicKey instead
func (v Validator) TmConsPublicKey() (cmtprotocrypto.PublicKey, error) {
return v.CmtConsPublicKey()
}
// CmtConsPublicKey casts Validator.ConsensusPubkey to cmtprotocrypto.PubKey.
func (v Validator) CmtConsPublicKey() (cmtprotocrypto.PublicKey, error) {
pk, err := v.ConsPubKey()
if err != nil {
return cmtprotocrypto.PublicKey{}, err
}
tmPk, err := cryptocodec.ToTmProtoPublicKey(pk)
tmPk, err := cryptocodec.ToCmtProtoPublicKey(pk)
if err != nil {
return cmtprotocrypto.PublicKey{}, err
}

6
x/staking/types/validator_test.go
View File

@ -304,7 +304,7 @@ func TestValidatorsSortCometBFT(t *testing.T) {
require.Equal(t, expectedVals, actualVals, "sorting in SDK is not the same as sorting in CometBFT")
}
func TestValidatorToTm(t *testing.T) {
func TestValidatorToCmt(t *testing.T) {
vals := make(types.Validators, 10)
expected := make([]*cmttypes.Validator, 10)
@ -314,9 +314,9 @@ func TestValidatorToTm(t *testing.T) {
val.Status = types.Bonded
val.Tokens = sdk.NewInt(rand.Int63())
vals[i] = val
tmPk, err := cryptocodec.ToTmPubKeyInterface(pk)
cmtPk, err := cryptocodec.ToCmtPubKeyInterface(pk)
require.NoError(t, err)
expected[i] = cmttypes.NewValidator(tmPk, val.ConsensusPower(sdk.DefaultPowerReduction))
expected[i] = cmttypes.NewValidator(cmtPk, val.ConsensusPower(sdk.DefaultPowerReduction))
}
vs, err := testutil.ToCmtValidators(vals, sdk.DefaultPowerReduction)
require.NoError(t, err)