feat!: Comet v0.38 Integration (#15519)
Co-authored-by: marbar3778 <marbar3778@yahoo.com> Co-authored-by: cool-developer <51834436+cool-develope@users.noreply.github.com> Co-authored-by: Aaron Craelius <aaron@regen.network> Co-authored-by: Matt Kocubinski <mkocubinski@gmail.com> Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
co-authored by
marbar3778
cool-developer
Aaron Craelius
Matt Kocubinski
Julien Robert
parent
166be3766b
commit
6cee22df52
+8
-6
@@ -18,6 +18,7 @@ import (
|
||||
nodeservice "github.com/cosmos/cosmos-sdk/client/grpc/node"
|
||||
"github.com/cosmos/cosmos-sdk/codec"
|
||||
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
|
||||
"github.com/cosmos/cosmos-sdk/server"
|
||||
"github.com/cosmos/cosmos-sdk/server/api"
|
||||
"github.com/cosmos/cosmos-sdk/server/config"
|
||||
servertypes "github.com/cosmos/cosmos-sdk/server/types"
|
||||
@@ -127,13 +128,13 @@ func (a *App) Load(loadLatest bool) error {
|
||||
}
|
||||
|
||||
// BeginBlocker application updates every begin block
|
||||
func (a *App) BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) (abci.ResponseBeginBlock, error) {
|
||||
return a.ModuleManager.BeginBlock(ctx, req)
|
||||
func (a *App) BeginBlocker(ctx sdk.Context) (sdk.BeginBlock, error) {
|
||||
return a.ModuleManager.BeginBlock(ctx)
|
||||
}
|
||||
|
||||
// EndBlocker application updates every end block
|
||||
func (a *App) EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) (abci.ResponseEndBlock, error) {
|
||||
return a.ModuleManager.EndBlock(ctx, req)
|
||||
func (a *App) EndBlocker(ctx sdk.Context) (sdk.EndBlock, error) {
|
||||
return a.ModuleManager.EndBlock(ctx)
|
||||
}
|
||||
|
||||
// Precommiter application updates every commit
|
||||
@@ -147,7 +148,7 @@ func (a *App) PrepareCheckStater(ctx sdk.Context) {
|
||||
}
|
||||
|
||||
// InitChainer initializes the chain.
|
||||
func (a *App) InitChainer(ctx sdk.Context, req abci.RequestInitChain) (abci.ResponseInitChain, error) {
|
||||
func (a *App) InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*abci.ResponseInitChain, error) {
|
||||
var genesisState map[string]json.RawMessage
|
||||
if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil {
|
||||
panic(err)
|
||||
@@ -179,11 +180,12 @@ func (a *App) RegisterTxService(clientCtx client.Context) {
|
||||
|
||||
// RegisterTendermintService implements the Application.RegisterTendermintService method.
|
||||
func (a *App) RegisterTendermintService(clientCtx client.Context) {
|
||||
cmtApp := server.NewCometABCIWrapper(a)
|
||||
cmtservice.RegisterTendermintService(
|
||||
clientCtx,
|
||||
a.GRPCQueryRouter(),
|
||||
a.interfaceRegistry,
|
||||
a.Query,
|
||||
cmtApp.Query,
|
||||
)
|
||||
}
|
||||
|
||||
|
||||
+7
-9
@@ -6,18 +6,19 @@ import (
|
||||
|
||||
runtimev1alpha1 "cosmossdk.io/api/cosmos/app/runtime/v1alpha1"
|
||||
appv1alpha1 "cosmossdk.io/api/cosmos/app/v1alpha1"
|
||||
"cosmossdk.io/depinject"
|
||||
"cosmossdk.io/log"
|
||||
"github.com/cosmos/gogoproto/proto"
|
||||
"google.golang.org/protobuf/reflect/protodesc"
|
||||
"google.golang.org/protobuf/reflect/protoregistry"
|
||||
|
||||
"cosmossdk.io/core/appmodule"
|
||||
"cosmossdk.io/core/comet"
|
||||
"cosmossdk.io/core/event"
|
||||
"cosmossdk.io/core/genesis"
|
||||
"cosmossdk.io/core/header"
|
||||
"cosmossdk.io/core/store"
|
||||
"cosmossdk.io/depinject"
|
||||
"cosmossdk.io/log"
|
||||
storetypes "cosmossdk.io/store/types"
|
||||
"github.com/cosmos/gogoproto/proto"
|
||||
"google.golang.org/protobuf/reflect/protodesc"
|
||||
"google.golang.org/protobuf/reflect/protoregistry"
|
||||
|
||||
"github.com/cosmos/cosmos-sdk/baseapp"
|
||||
"github.com/cosmos/cosmos-sdk/codec"
|
||||
@@ -86,10 +87,7 @@ func ProvideApp() (
|
||||
protoregistry.MessageTypeResolver,
|
||||
error,
|
||||
) {
|
||||
protoFiles, err := proto.MergedRegistry()
|
||||
if err != nil {
|
||||
return nil, nil, nil, nil, nil, nil, nil, nil, nil, err
|
||||
}
|
||||
protoFiles := proto.HybridResolver
|
||||
protoTypes := protoregistry.GlobalTypes
|
||||
|
||||
// At startup, check that all proto annotations are correct.
|
||||
|
||||
+3
-3
@@ -22,13 +22,13 @@ type AppI interface {
|
||||
LegacyAmino() *codec.LegacyAmino
|
||||
|
||||
// Application updates every begin block.
|
||||
BeginBlocker(ctx sdk.Context, req abci.RequestBeginBlock) (abci.ResponseBeginBlock, error)
|
||||
BeginBlocker(ctx sdk.Context) (sdk.BeginBlock, error)
|
||||
|
||||
// Application updates every end block.
|
||||
EndBlocker(ctx sdk.Context, req abci.RequestEndBlock) (abci.ResponseEndBlock, error)
|
||||
EndBlocker(ctx sdk.Context) (sdk.EndBlock, error)
|
||||
|
||||
// Application update at chain (i.e app) initialization.
|
||||
InitChainer(ctx sdk.Context, req abci.RequestInitChain) (abci.ResponseInitChain, error)
|
||||
InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*abci.ResponseInitChain, error)
|
||||
|
||||
// Loads the app at a given height.
|
||||
LoadHeight(height int64) error
|
||||
|
||||
Reference in New Issue
Block a user