diff --git a/api/cerc/types/v1/lockup.pulsar.go b/api/cerc/types/v1/lockup.pulsar.go index c972fcc5..a12cd2cc 100644 --- a/api/cerc/types/v1/lockup.pulsar.go +++ b/api/cerc/types/v1/lockup.pulsar.go @@ -5,6 +5,7 @@ import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" runtime "github.com/cosmos/cosmos-proto/runtime" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" types "github.com/cosmos/cosmos-sdk/x/auth/types" _ "github.com/cosmos/gogoproto/gogoproto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" @@ -576,23 +577,27 @@ var File_cerc_types_v1_lockup_proto protoreflect.FileDescriptor var file_cerc_types_v1_lockup_proto_rawDesc = []byte{ 0x0a, 0x1a, 0x63, 0x65, 0x72, 0x63, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x76, 0x31, 0x2f, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x63, 0x65, - 0x72, 0x63, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x1a, 0x19, 0x63, 0x6f, 0x73, - 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, - 0x75, 0x74, 0x68, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x61, 0x75, 0x74, 0x68, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa7, 0x01, 0x0a, - 0x0d, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x4b, - 0x0a, 0x0c, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x61, 0x75, - 0x74, 0x68, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, - 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x04, 0xd0, 0xde, 0x1f, 0x01, 0x52, 0x0b, - 0x62, 0x61, 0x73, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, 0x0a, 0x0c, 0x64, - 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x3a, - 0x25, 0x88, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f, 0x00, 0xca, 0xb4, 0x2d, 0x19, 0x63, 0x65, 0x72, - 0x63, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, - 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x42, 0xad, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x63, + 0x72, 0x63, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x1a, 0x11, 0x61, 0x6d, 0x69, + 0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, + 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, + 0x73, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x61, + 0x75, 0x74, 0x68, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, + 0xd4, 0x01, 0x0a, 0x0d, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x12, 0x4b, 0x0a, 0x0c, 0x62, 0x61, 0x73, 0x65, 0x5f, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, + 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, + 0x2e, 0x61, 0x75, 0x74, 0x68, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4d, 0x6f, + 0x64, 0x75, 0x6c, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x04, 0xd0, 0xde, 0x1f, + 0x01, 0x52, 0x0b, 0x62, 0x61, 0x73, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x22, + 0x0a, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, + 0x6f, 0x6e, 0x3a, 0x52, 0x88, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f, 0x00, 0xca, 0xb4, 0x2d, 0x19, + 0x63, 0x65, 0x72, 0x63, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x4c, 0x6f, 0x63, 0x6b, 0x75, + 0x70, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x49, 0x8a, 0xe7, 0xb0, 0x2a, 0x15, 0x6c, 0x61, + 0x63, 0x6f, 0x6e, 0x69, 0x63, 0x2f, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x41, 0x63, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x92, 0xe7, 0xb0, 0x2a, 0x0e, 0x6c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x5f, 0x61, + 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0xad, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x65, 0x72, 0x63, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4c, 0x6f, 0x63, 0x6b, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x67, 0x69, 0x74, 0x2e, 0x76, 0x64, 0x62, 0x2e, 0x74, 0x6f, 0x2f, 0x63, 0x65, 0x72, 0x63, 0x2d, 0x69, 0x6f, 0x2f, diff --git a/app/app.go b/app/app.go index 8669716c..bd8f2014 100644 --- a/app/app.go +++ b/app/app.go @@ -18,6 +18,7 @@ import ( bondkeeper "git.vdb.to/cerc-io/laconicd/x/bond/keeper" onboardingkeeper "git.vdb.to/cerc-io/laconicd/x/onboarding/keeper" registrykeeper "git.vdb.to/cerc-io/laconicd/x/registry/keeper" + types "git.vdb.to/cerc-io/laconicd/x/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -27,9 +28,11 @@ import ( "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth/ante" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" consensuskeeper "github.com/cosmos/cosmos-sdk/x/consensus/keeper" crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper" @@ -174,6 +177,10 @@ func NewLaconicApp( return nil, err } + // Register custom interfaces + RegisterCustomInterfaces(app.interfaceRegistry) + RegisterCustomLegacyAminoCodec(app.legacyAmino) + app.App = appBuilder.Build(db, traceStore, baseAppOptions...) // register streaming services @@ -241,6 +248,29 @@ func (app *LaconicApp) RegisterAPIRoutes(apiSvr *api.Server, apiConfig config.AP } } +func RegisterCustomInterfaces(interfaceRegistry codectypes.InterfaceRegistry) { + // Custom ZenithAccount type needs to be registered to be able to use it as a genesis account + interfaceRegistry.RegisterImplementations((*authtypes.GenesisAccount)(nil), &types.LockupAccount{}) + + // ZenithAccount extends auth Account + interfaceRegistry.RegisterInterface( + "cosmos.auth.v1beta1.AccountI", + (*sdk.AccountI)(nil), + &types.LockupAccount{}, + ) + + interfaceRegistry.RegisterInterface( + "cerc.types.v1.LockupAccountI", + (*types.LockupAccountI)(nil), + &types.LockupAccount{}, + ) +} + +func RegisterCustomLegacyAminoCodec(registrar *codec.LegacyAmino) { + registrar.RegisterInterface((*types.LockupAccountI)(nil), nil) + registrar.RegisterConcrete(&types.LockupAccount{}, "laconic/LockupAccount", nil) +} + // setCustomAnteHandler overwrites default ante handlers with custom ante handlers // Reference: https://github.com/cosmos/cosmos-sdk/blob/v0.50.10/x/auth/tx/config/config.go#L149 func (app *LaconicApp) setCustomAnteHandler() { diff --git a/cmd/laconicd/cmd/root.go b/cmd/laconicd/cmd/root.go index 957973e1..f8b3a6bc 100644 --- a/cmd/laconicd/cmd/root.go +++ b/cmd/laconicd/cmd/root.go @@ -25,11 +25,12 @@ import ( "github.com/cosmos/cosmos-sdk/types/tx/signing" "github.com/cosmos/cosmos-sdk/x/auth/tx" txmodule "github.com/cosmos/cosmos-sdk/x/auth/tx/config" - "github.com/cosmos/cosmos-sdk/x/auth/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "git.vdb.to/cerc-io/laconicd/app" "git.vdb.to/cerc-io/laconicd/app/params" "git.vdb.to/cerc-io/laconicd/gql" + "git.vdb.to/cerc-io/laconicd/x/types" ) const EnvPrefix = "LACONIC" @@ -135,7 +136,7 @@ func ProvideClientContext( WithTxConfig(txConfig). WithLegacyAmino(legacyAmino). WithInput(os.Stdin). - WithAccountRetriever(types.AccountRetriever{}). + WithAccountRetriever(authtypes.AccountRetriever{}). WithHomeDir(app.DefaultNodeHome). WithViper(EnvPrefix) // env variable prefix @@ -148,6 +149,10 @@ func ProvideClientContext( clientCtx.HomeDir = "" clientCtx.KeyringDir = "" + // Custom ZenithAccount type needs to be registered to be able to use it for adding azimuthId in auth accounts + interfaceRegistry.RegisterImplementations((*types.LockupAccountI)(nil), &types.LockupAccount{}) + interfaceRegistry.RegisterImplementations((*authtypes.GenesisAccount)(nil), &types.LockupAccount{}) + return clientCtx } diff --git a/proto/cerc/types/v1/lockup.proto b/proto/cerc/types/v1/lockup.proto index d4e5d11a..74f7df81 100644 --- a/proto/cerc/types/v1/lockup.proto +++ b/proto/cerc/types/v1/lockup.proto @@ -1,6 +1,7 @@ syntax = "proto3"; package cerc.types.v1; +import "amino/amino.proto"; import "cosmos_proto/cosmos.proto"; import "cosmos/auth/v1beta1/auth.proto"; import "gogoproto/gogo.proto"; @@ -9,6 +10,8 @@ option go_package = "git.vdb.to/cerc-io/laconicd/x/types"; // LockupAccount extends the Cosmos SDK ModuleAccount with a distribution field. message LockupAccount { + option (amino.name) = "laconic/LockupAccount"; + option (amino.message_encoding) = "lockup_account"; option (gogoproto.goproto_getters) = false; option (gogoproto.equal) = false; diff --git a/x/types/lockup.pb.go b/x/types/lockup.pb.go index ea8bf078..3df8597d 100644 --- a/x/types/lockup.pb.go +++ b/x/types/lockup.pb.go @@ -6,6 +6,7 @@ package types import ( fmt "fmt" _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" types "github.com/cosmos/cosmos-sdk/x/auth/types" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" @@ -71,25 +72,27 @@ func init() { func init() { proto.RegisterFile("cerc/types/v1/lockup.proto", fileDescriptor_8fa58dc19f6348bf) } var fileDescriptor_8fa58dc19f6348bf = []byte{ - // 281 bytes of a gzipped FileDescriptorProto + // 312 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4a, 0x4e, 0x2d, 0x4a, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2f, 0x33, 0xd4, 0xcf, 0xc9, 0x4f, 0xce, 0x2e, 0x2d, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x05, 0xc9, 0xe9, 0x81, 0xe5, 0xf4, 0xca, 0x0c, - 0xa5, 0x24, 0x93, 0xf3, 0x8b, 0x73, 0xf3, 0x8b, 0xe3, 0xc1, 0x92, 0xfa, 0x10, 0x0e, 0x44, 0xa5, - 0x94, 0x1c, 0x84, 0xa7, 0x9f, 0x58, 0x5a, 0x92, 0xa1, 0x5f, 0x66, 0x98, 0x94, 0x5a, 0x92, 0x68, - 0x08, 0xe6, 0x40, 0xe5, 0x45, 0xd2, 0xf3, 0xd3, 0xf3, 0x21, 0xfa, 0x40, 0x2c, 0x88, 0xa8, 0xd2, - 0x72, 0x46, 0x2e, 0x5e, 0x1f, 0xb0, 0x85, 0x8e, 0xc9, 0xc9, 0xf9, 0xa5, 0x79, 0x25, 0x42, 0xde, - 0x5c, 0x3c, 0x49, 0x89, 0xc5, 0xa9, 0xf1, 0x89, 0x10, 0xbe, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0xb7, - 0x91, 0x92, 0x1e, 0xd4, 0x32, 0xb0, 0x89, 0x50, 0xe3, 0xf5, 0x7c, 0xf3, 0x53, 0x4a, 0x73, 0x52, - 0xa1, 0x3a, 0x9d, 0x58, 0x2e, 0xdc, 0x93, 0x67, 0x0c, 0xe2, 0x06, 0xe9, 0x86, 0x19, 0xa6, 0xc4, - 0xc5, 0x93, 0x92, 0x59, 0x5c, 0x52, 0x94, 0x99, 0x54, 0x5a, 0x92, 0x99, 0x9f, 0x27, 0xc1, 0xa4, - 0xc0, 0xa8, 0xc1, 0x19, 0x84, 0x22, 0x66, 0xa5, 0xda, 0xb1, 0x40, 0x9e, 0xe1, 0xc5, 0x02, 0x79, - 0x86, 0x53, 0x5b, 0x74, 0x25, 0x91, 0xbc, 0x8b, 0xe2, 0x2c, 0x4f, 0x27, 0xdb, 0x13, 0x8f, 0xe4, - 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, - 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x52, 0x4e, 0xcf, 0x2c, 0xd1, 0x2b, 0x4b, 0x49, 0xd2, - 0x03, 0x05, 0x49, 0x6a, 0x51, 0xb2, 0x6e, 0x66, 0xbe, 0x7e, 0x4e, 0x62, 0x72, 0x7e, 0x5e, 0x66, - 0x72, 0x8a, 0x7e, 0x05, 0x24, 0x60, 0x93, 0xd8, 0xc0, 0xfe, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff, - 0xff, 0xef, 0x5d, 0x16, 0x13, 0x6d, 0x01, 0x00, 0x00, + 0xa5, 0x04, 0x13, 0x73, 0x33, 0xf3, 0xf2, 0xf5, 0xc1, 0x24, 0x44, 0x85, 0x94, 0x64, 0x72, 0x7e, + 0x71, 0x6e, 0x7e, 0x71, 0x3c, 0x98, 0xa7, 0x0f, 0xe1, 0x40, 0xa5, 0xe4, 0x20, 0x3c, 0xfd, 0xc4, + 0xd2, 0x92, 0x0c, 0xfd, 0x32, 0xc3, 0xa4, 0xd4, 0x92, 0x44, 0x43, 0x30, 0x07, 0x2a, 0x2f, 0x92, + 0x9e, 0x9f, 0x9e, 0x0f, 0xd1, 0x07, 0x62, 0x41, 0x44, 0x95, 0xae, 0x30, 0x72, 0xf1, 0xfa, 0x80, + 0xdd, 0xe0, 0x98, 0x9c, 0x9c, 0x5f, 0x9a, 0x57, 0x22, 0xe4, 0xcd, 0xc5, 0x93, 0x94, 0x58, 0x9c, + 0x1a, 0x9f, 0x08, 0xe1, 0x4b, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, 0x29, 0xe9, 0x41, 0x2d, 0x03, + 0x9b, 0x08, 0x35, 0x5e, 0xcf, 0x37, 0x3f, 0xa5, 0x34, 0x27, 0x15, 0xaa, 0xd3, 0x89, 0xe5, 0xc2, + 0x3d, 0x79, 0xc6, 0x20, 0x6e, 0x90, 0x6e, 0x98, 0x61, 0x4a, 0x5c, 0x3c, 0x29, 0x99, 0xc5, 0x25, + 0x45, 0x99, 0x49, 0xa5, 0x25, 0x99, 0xf9, 0x79, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x9c, 0x41, 0x28, + 0x62, 0x56, 0x41, 0x1d, 0x0b, 0xe4, 0x19, 0x5e, 0x2c, 0x90, 0x67, 0x38, 0xb5, 0x45, 0x57, 0x12, + 0x29, 0x04, 0x50, 0x9c, 0xe5, 0xd9, 0xf5, 0x7c, 0x83, 0x96, 0x68, 0x4e, 0x62, 0x72, 0x7e, 0x5e, + 0x66, 0xb2, 0x3e, 0x8a, 0xd4, 0xa4, 0xe7, 0x1b, 0xb4, 0xf8, 0x20, 0xe1, 0x08, 0x73, 0xb4, 0x93, + 0xed, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, + 0x1c, 0xc3, 0x85, 0xc7, 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0x29, 0xa7, 0x67, 0x96, 0xe8, + 0x95, 0xa5, 0x24, 0xe9, 0x81, 0xc2, 0x2f, 0xb5, 0x28, 0x59, 0x37, 0x33, 0x5f, 0x1f, 0x6a, 0x6c, + 0x8a, 0x7e, 0x05, 0x24, 0x62, 0x92, 0xd8, 0xc0, 0x81, 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, + 0x40, 0x9e, 0xfe, 0xbd, 0xad, 0x01, 0x00, 0x00, } func (m *LockupAccount) Marshal() (dAtA []byte, err error) {