From cfe3c5185e940139059d441095a6efa64250c454 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 28 Jul 2023 17:40:41 +0200 Subject: [PATCH 1/2] Changes --- app/app.go | 10 ++++++++++ go.mod | 4 ++-- go.sum | 5 ++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/app.go b/app/app.go index 057f4f55c..bca85b954 100644 --- a/app/app.go +++ b/app/app.go @@ -2,6 +2,7 @@ package app import ( "fmt" + "github.com/cosmos/cosmos-sdk/x/verification" "io" "net/http" "os" @@ -42,6 +43,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/bank" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + verificationtypes "github.com/cosmos/cosmos-sdk/x/verification/types" + "github.com/cosmos/cosmos-sdk/x/capability" capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper" capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types" @@ -175,6 +178,7 @@ var ( transfer.AppModuleBasic{}, vesting.AppModuleBasic{}, wasm.AppModuleBasic{}, + verification.AppModuleBasic{}, ) // module account permissions @@ -188,6 +192,7 @@ var ( govtypes.ModuleName: {authtypes.Burner}, ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, wasm.ModuleName: {authtypes.Burner}, + verificationtypes.ModuleName: nil, } ) @@ -477,6 +482,7 @@ func New( params.NewAppModule(app.ParamsKeeper), transferModule, wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + verification.NewAppModule(appCodec), ) // During begin block slashing happens after distribution.BeginBlocker so that @@ -504,6 +510,7 @@ func New( ibctransfertypes.ModuleName, icatypes.ModuleName, wasm.ModuleName, + verificationtypes.ModuleName, ) app.mm.SetOrderEndBlockers( @@ -527,6 +534,7 @@ func New( ibctransfertypes.ModuleName, icatypes.ModuleName, wasm.ModuleName, + verificationtypes.ModuleName, ) // NOTE: The genutils module must occur after staking so that pools are @@ -555,6 +563,7 @@ func New( ibctransfertypes.ModuleName, icatypes.ModuleName, wasm.ModuleName, + verificationtypes.ModuleName, ) app.mm.RegisterInvariants(&app.CrisisKeeper) @@ -791,6 +800,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(ibchost.ModuleName) paramsKeeper.Subspace(icahosttypes.SubModuleName) paramsKeeper.Subspace(wasm.ModuleName) + paramsKeeper.Subspace(verificationtypes.ModuleName) return paramsKeeper } diff --git a/go.mod b/go.mod index fe49c293b..5f0d5d864 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/cosmos/gorocksdb v1.2.0 // indirect github.com/cosmos/iavl v0.19.3 // indirect github.com/cosmos/ledger-cosmos-go v0.11.1 // indirect - github.com/cosmos/ledger-go v0.9.2 // indirect + github.com/cosmos/ledger-go v0.9.3 // indirect github.com/creachadair/taskgroup v0.3.2 // indirect github.com/danieljoos/wincred v1.0.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect @@ -133,7 +133,7 @@ replace google.golang.org/grpc => google.golang.org/grpc v1.33.2 replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 -replace github.com/cosmos/cosmos-sdk => github.com/fetchai/cosmos-sdk v0.18.4 +replace github.com/cosmos/cosmos-sdk => ../cosmos-sdk replace github.com/confio/ics23/go => github.com/cosmos/cosmos-sdk/ics23/go v0.8.0 diff --git a/go.sum b/go.sum index dd32bfc4e..e2c72fbf6 100644 --- a/go.sum +++ b/go.sum @@ -175,8 +175,9 @@ github.com/cosmos/ibc-go/v3 v3.1.0/go.mod h1:DbOlOa4yKumaHGKApKkJN90L88PCjSD9ZBd github.com/cosmos/interchain-accounts v0.1.0 h1:QmuwNsf1Hxl3P5GSGt7Z+JeuHPiZw4Z34R/038P5T6s= github.com/cosmos/ledger-cosmos-go v0.11.1 h1:9JIYsGnXP613pb2vPjFeMMjBI5lEDsEaF6oYorTy6J4= github.com/cosmos/ledger-cosmos-go v0.11.1/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY= -github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI= github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= +github.com/cosmos/ledger-go v0.9.3 h1:WGyZK4ikuLIkbxJm3lEr1tdQYDdTdveTwoVla7hqfhQ= +github.com/cosmos/ledger-go v0.9.3/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -230,8 +231,6 @@ github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5Kwzbycv github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ= github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U= -github.com/fetchai/cosmos-sdk v0.18.4 h1:P+pkN3IlDGBpjBXDGMe+gYuNYYkXF85YgWe0wFVFZk4= -github.com/fetchai/cosmos-sdk v0.18.4/go.mod h1:Z5M4TX7PsHNHlF/1XanI2DIpORQ+Q/st7oaeufEjnvU= github.com/fjl/memsize v0.0.0-20180418122429-ca190fb6ffbc/go.mod h1:VvhXpOYNQvB+uIk2RvXzuaQtkQJzzIx6lSBe1xv7hi0= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/franela/goblin v0.0.0-20200105215937-c9ffbefa60db/go.mod h1:7dvUGVsVBjqR7JHJk0brhHOZYGmfBYOrK0ZhYMEtBr4= From b6401e12d2ad0baad9909f028ef67cae2647a6dd Mon Sep 17 00:00:00 2001 From: Jiri Date: Tue, 1 Aug 2023 15:06:15 +0200 Subject: [PATCH 2/2] Changes --- app/app.go | 3 --- app/encoding.go | 5 +++++ cmd/fetchd/cmd/root.go | 5 +++++ 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/app.go b/app/app.go index bca85b954..f8888d6ca 100644 --- a/app/app.go +++ b/app/app.go @@ -2,7 +2,6 @@ package app import ( "fmt" - "github.com/cosmos/cosmos-sdk/x/verification" "io" "net/http" "os" @@ -178,7 +177,6 @@ var ( transfer.AppModuleBasic{}, vesting.AppModuleBasic{}, wasm.AppModuleBasic{}, - verification.AppModuleBasic{}, ) // module account permissions @@ -482,7 +480,6 @@ func New( params.NewAppModule(app.ParamsKeeper), transferModule, wasm.NewAppModule(appCodec, &app.WasmKeeper, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), - verification.NewAppModule(appCodec), ) // During begin block slashing happens after distribution.BeginBlocker so that diff --git a/app/encoding.go b/app/encoding.go index e7379031f..a4152a495 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -2,6 +2,7 @@ package app import ( "github.com/cosmos/cosmos-sdk/std" + verificationtypes "github.com/cosmos/cosmos-sdk/x/verification/types" "github.com/fetchai/fetchd/app/params" ) @@ -12,5 +13,9 @@ func MakeEncodingConfig() params.EncodingConfig { std.RegisterInterfaces(encodingConfig.InterfaceRegistry) ModuleBasics.RegisterLegacyAminoCodec(encodingConfig.Amino) ModuleBasics.RegisterInterfaces(encodingConfig.InterfaceRegistry) + + // Register custom verification type + verificationtypes.RegisterInterfaces(encodingConfig.InterfaceRegistry) + return encodingConfig } diff --git a/cmd/fetchd/cmd/root.go b/cmd/fetchd/cmd/root.go index 9c3975983..899fbb315 100644 --- a/cmd/fetchd/cmd/root.go +++ b/cmd/fetchd/cmd/root.go @@ -28,6 +28,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" + verificationcmd "github.com/cosmos/cosmos-sdk/x/verification/client/cli" "github.com/prometheus/client_golang/prometheus" "github.com/spf13/cast" "github.com/spf13/cobra" @@ -199,6 +200,10 @@ func txCommand() *cobra.Command { ) app.ModuleBasics.AddTxCommands(cmd) + + // Verification command + cmd.AddCommand(verificationcmd.NewTxCmd()) + cmd.PersistentFlags().String(flags.FlagChainID, "", "The network chain ID") return cmd