From cfee9c82e92ee3a525d6d13706ce25f2d646f78c Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 26 May 2022 14:19:18 -0300 Subject: [PATCH 01/10] feat: migrate x/capability to app wiring --- .../capability/module/v1/module.pulsar.go | 505 ++++++++++++++++++ baseapp/baseapp.go | 3 + .../cosmos/capability/module/v1/module.proto | 12 + simapp/app.go | 14 +- simapp/app.yaml | 3 + x/capability/module.go | 30 +- 6 files changed, 558 insertions(+), 9 deletions(-) create mode 100644 api/cosmos/capability/module/v1/module.pulsar.go create mode 100644 proto/cosmos/capability/module/v1/module.proto diff --git a/api/cosmos/capability/module/v1/module.pulsar.go b/api/cosmos/capability/module/v1/module.pulsar.go new file mode 100644 index 00000000000..2bb59926f4e --- /dev/null +++ b/api/cosmos/capability/module/v1/module.pulsar.go @@ -0,0 +1,505 @@ +// Code generated by protoc-gen-go-pulsar. DO NOT EDIT. +package modulev1 + +import ( + _ "cosmossdk.io/api/cosmos/app/v1alpha1" + fmt "fmt" + runtime "github.com/cosmos/cosmos-proto/runtime" + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoiface "google.golang.org/protobuf/runtime/protoiface" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + io "io" + reflect "reflect" + sync "sync" +) + +var ( + md_Module protoreflect.MessageDescriptor +) + +func init() { + file_cosmos_capability_module_v1_module_proto_init() + md_Module = File_cosmos_capability_module_v1_module_proto.Messages().ByName("Module") +} + +var _ protoreflect.Message = (*fastReflection_Module)(nil) + +type fastReflection_Module Module + +func (x *Module) ProtoReflect() protoreflect.Message { + return (*fastReflection_Module)(x) +} + +func (x *Module) slowProtoReflect() protoreflect.Message { + mi := &file_cosmos_capability_module_v1_module_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +var _fastReflection_Module_messageType fastReflection_Module_messageType +var _ protoreflect.MessageType = fastReflection_Module_messageType{} + +type fastReflection_Module_messageType struct{} + +func (x fastReflection_Module_messageType) Zero() protoreflect.Message { + return (*fastReflection_Module)(nil) +} +func (x fastReflection_Module_messageType) New() protoreflect.Message { + return new(fastReflection_Module) +} +func (x fastReflection_Module_messageType) Descriptor() protoreflect.MessageDescriptor { + return md_Module +} + +// Descriptor returns message descriptor, which contains only the protobuf +// type information for the message. +func (x *fastReflection_Module) Descriptor() protoreflect.MessageDescriptor { + return md_Module +} + +// Type returns the message type, which encapsulates both Go and protobuf +// type information. If the Go type information is not needed, +// it is recommended that the message descriptor be used instead. +func (x *fastReflection_Module) Type() protoreflect.MessageType { + return _fastReflection_Module_messageType +} + +// New returns a newly allocated and mutable empty message. +func (x *fastReflection_Module) New() protoreflect.Message { + return new(fastReflection_Module) +} + +// Interface unwraps the message reflection interface and +// returns the underlying ProtoMessage interface. +func (x *fastReflection_Module) Interface() protoreflect.ProtoMessage { + return (*Module)(x) +} + +// Range iterates over every populated field in an undefined order, +// calling f for each field descriptor and value encountered. +// Range returns immediately if f returns false. +// While iterating, mutating operations may only be performed +// on the current field descriptor. +func (x *fastReflection_Module) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { +} + +// Has reports whether a field is populated. +// +// Some fields have the property of nullability where it is possible to +// distinguish between the default value of a field and whether the field +// was explicitly populated with the default value. Singular message fields, +// member fields of a oneof, and proto2 scalar fields are nullable. Such +// fields are populated only if explicitly set. +// +// In other cases (aside from the nullable cases above), +// a proto3 scalar field is populated if it contains a non-zero value, and +// a repeated field is populated if it is non-empty. +func (x *fastReflection_Module) Has(fd protoreflect.FieldDescriptor) bool { + switch fd.FullName() { + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) + } + panic(fmt.Errorf("message cosmos.capability.module.v1.Module does not contain field %s", fd.FullName())) + } +} + +// Clear clears the field such that a subsequent Has call reports false. +// +// Clearing an extension field clears both the extension type and value +// associated with the given field number. +// +// Clear is a mutating operation and unsafe for concurrent use. +func (x *fastReflection_Module) Clear(fd protoreflect.FieldDescriptor) { + switch fd.FullName() { + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) + } + panic(fmt.Errorf("message cosmos.capability.module.v1.Module does not contain field %s", fd.FullName())) + } +} + +// Get retrieves the value for a field. +// +// For unpopulated scalars, it returns the default value, where +// the default value of a bytes scalar is guaranteed to be a copy. +// For unpopulated composite types, it returns an empty, read-only view +// of the value; to obtain a mutable reference, use Mutable. +func (x *fastReflection_Module) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { + switch descriptor.FullName() { + default: + if descriptor.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) + } + panic(fmt.Errorf("message cosmos.capability.module.v1.Module does not contain field %s", descriptor.FullName())) + } +} + +// Set stores the value for a field. +// +// For a field belonging to a oneof, it implicitly clears any other field +// that may be currently set within the same oneof. +// For extension fields, it implicitly stores the provided ExtensionType. +// When setting a composite type, it is unspecified whether the stored value +// aliases the source's memory in any way. If the composite value is an +// empty, read-only value, then it panics. +// +// Set is a mutating operation and unsafe for concurrent use. +func (x *fastReflection_Module) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { + switch fd.FullName() { + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) + } + panic(fmt.Errorf("message cosmos.capability.module.v1.Module does not contain field %s", fd.FullName())) + } +} + +// Mutable returns a mutable reference to a composite type. +// +// If the field is unpopulated, it may allocate a composite value. +// For a field belonging to a oneof, it implicitly clears any other field +// that may be currently set within the same oneof. +// For extension fields, it implicitly stores the provided ExtensionType +// if not already stored. +// It panics if the field does not contain a composite type. +// +// Mutable is a mutating operation and unsafe for concurrent use. +func (x *fastReflection_Module) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { + switch fd.FullName() { + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) + } + panic(fmt.Errorf("message cosmos.capability.module.v1.Module does not contain field %s", fd.FullName())) + } +} + +// NewField returns a new value that is assignable to the field +// for the given descriptor. For scalars, this returns the default value. +// For lists, maps, and messages, this returns a new, empty, mutable value. +func (x *fastReflection_Module) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { + switch fd.FullName() { + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) + } + panic(fmt.Errorf("message cosmos.capability.module.v1.Module does not contain field %s", fd.FullName())) + } +} + +// WhichOneof reports which field within the oneof is populated, +// returning nil if none are populated. +// It panics if the oneof descriptor does not belong to this message. +func (x *fastReflection_Module) WhichOneof(d protoreflect.OneofDescriptor) protoreflect.FieldDescriptor { + switch d.FullName() { + default: + panic(fmt.Errorf("%s is not a oneof field in cosmos.capability.module.v1.Module", d.FullName())) + } + panic("unreachable") +} + +// GetUnknown retrieves the entire list of unknown fields. +// The caller may only mutate the contents of the RawFields +// if the mutated bytes are stored back into the message with SetUnknown. +func (x *fastReflection_Module) GetUnknown() protoreflect.RawFields { + return x.unknownFields +} + +// SetUnknown stores an entire list of unknown fields. +// The raw fields must be syntactically valid according to the wire format. +// An implementation may panic if this is not the case. +// Once stored, the caller must not mutate the content of the RawFields. +// An empty RawFields may be passed to clear the fields. +// +// SetUnknown is a mutating operation and unsafe for concurrent use. +func (x *fastReflection_Module) SetUnknown(fields protoreflect.RawFields) { + x.unknownFields = fields +} + +// IsValid reports whether the message is valid. +// +// An invalid message is an empty, read-only value. +// +// An invalid message often corresponds to a nil pointer of the concrete +// message type, but the details are implementation dependent. +// Validity is not part of the protobuf data model, and may not +// be preserved in marshaling or other operations. +func (x *fastReflection_Module) IsValid() bool { + return x != nil +} + +// ProtoMethods returns optional fastReflectionFeature-path implementations of various operations. +// This method may return nil. +// +// The returned methods type is identical to +// "google.golang.org/protobuf/runtime/protoiface".Methods. +// Consult the protoiface package documentation for details. +func (x *fastReflection_Module) ProtoMethods() *protoiface.Methods { + size := func(input protoiface.SizeInput) protoiface.SizeOutput { + x := input.Message.Interface().(*Module) + if x == nil { + return protoiface.SizeOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Size: 0, + } + } + options := runtime.SizeInputToOptions(input) + _ = options + var n int + var l int + _ = l + if x.unknownFields != nil { + n += len(x.unknownFields) + } + return protoiface.SizeOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Size: n, + } + } + + marshal := func(input protoiface.MarshalInput) (protoiface.MarshalOutput, error) { + x := input.Message.Interface().(*Module) + if x == nil { + return protoiface.MarshalOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Buf: input.Buf, + }, nil + } + options := runtime.MarshalInputToOptions(input) + _ = options + size := options.Size(x) + dAtA := make([]byte, size) + i := len(dAtA) + _ = i + var l int + _ = l + if x.unknownFields != nil { + i -= len(x.unknownFields) + copy(dAtA[i:], x.unknownFields) + } + if input.Buf != nil { + input.Buf = append(input.Buf, dAtA...) + } else { + input.Buf = dAtA + } + return protoiface.MarshalOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Buf: input.Buf, + }, nil + } + unmarshal := func(input protoiface.UnmarshalInput) (protoiface.UnmarshalOutput, error) { + x := input.Message.Interface().(*Module) + if x == nil { + return protoiface.UnmarshalOutput{ + NoUnkeyedLiterals: input.NoUnkeyedLiterals, + Flags: input.Flags, + }, nil + } + options := runtime.UnmarshalInputToOptions(input) + _ = options + dAtA := input.Buf + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: Module: wiretype end group for non-group") + } + if fieldNum <= 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: Module: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := runtime.Skip(dAtA[iNdEx:]) + if err != nil { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if (iNdEx + skippy) > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + if !options.DiscardUnknown { + x.unknownFields = append(x.unknownFields, dAtA[iNdEx:iNdEx+skippy]...) + } + iNdEx += skippy + } + } + + if iNdEx > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, nil + } + return &protoiface.Methods{ + NoUnkeyedLiterals: struct{}{}, + Flags: protoiface.SupportMarshalDeterministic | protoiface.SupportUnmarshalDiscardUnknown, + Size: size, + Marshal: marshal, + Unmarshal: unmarshal, + Merge: nil, + CheckInitialized: nil, + } +} + +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.27.0 +// protoc (unknown) +// source: cosmos/capability/module/v1/module.proto + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +// Module is the config object of the capability module. +type Module struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *Module) Reset() { + *x = Module{} + if protoimpl.UnsafeEnabled { + mi := &file_cosmos_capability_module_v1_module_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Module) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Module) ProtoMessage() {} + +// Deprecated: Use Module.ProtoReflect.Descriptor instead. +func (*Module) Descriptor() ([]byte, []int) { + return file_cosmos_capability_module_v1_module_proto_rawDescGZIP(), []int{0} +} + +var File_cosmos_capability_module_v1_module_proto protoreflect.FileDescriptor + +var file_cosmos_capability_module_v1_module_proto_rawDesc = []byte{ + 0x0a, 0x28, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, + 0x69, 0x74, 0x79, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x6f, + 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1b, 0x63, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x2e, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x6d, 0x6f, + 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x20, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, + 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x6d, 0x6f, 0x64, + 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3b, 0x0a, 0x06, 0x4d, 0x6f, 0x64, + 0x75, 0x6c, 0x65, 0x3a, 0x31, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x2b, 0x0a, 0x29, 0x67, 0x69, 0x74, + 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, + 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x78, 0x2f, 0x63, 0x61, 0x70, 0x61, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x42, 0xf4, 0x01, 0x0a, 0x1f, 0x63, 0x6f, 0x6d, 0x2e, 0x63, + 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, + 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4d, 0x6f, 0x64, 0x75, + 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x63, 0x6f, 0x73, 0x6d, 0x6f, + 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x2f, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2f, 0x6d, 0x6f, + 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, + 0xa2, 0x02, 0x03, 0x43, 0x43, 0x4d, 0xaa, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, + 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, + 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x43, 0x61, + 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, + 0x56, 0x31, 0xe2, 0x02, 0x27, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x43, 0x61, 0x70, 0x61, + 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, + 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1e, 0x43, + 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, + 0x79, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_cosmos_capability_module_v1_module_proto_rawDescOnce sync.Once + file_cosmos_capability_module_v1_module_proto_rawDescData = file_cosmos_capability_module_v1_module_proto_rawDesc +) + +func file_cosmos_capability_module_v1_module_proto_rawDescGZIP() []byte { + file_cosmos_capability_module_v1_module_proto_rawDescOnce.Do(func() { + file_cosmos_capability_module_v1_module_proto_rawDescData = protoimpl.X.CompressGZIP(file_cosmos_capability_module_v1_module_proto_rawDescData) + }) + return file_cosmos_capability_module_v1_module_proto_rawDescData +} + +var file_cosmos_capability_module_v1_module_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_cosmos_capability_module_v1_module_proto_goTypes = []interface{}{ + (*Module)(nil), // 0: cosmos.capability.module.v1.Module +} +var file_cosmos_capability_module_v1_module_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_cosmos_capability_module_v1_module_proto_init() } +func file_cosmos_capability_module_v1_module_proto_init() { + if File_cosmos_capability_module_v1_module_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_cosmos_capability_module_v1_module_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Module); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_cosmos_capability_module_v1_module_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_cosmos_capability_module_v1_module_proto_goTypes, + DependencyIndexes: file_cosmos_capability_module_v1_module_proto_depIdxs, + MessageInfos: file_cosmos_capability_module_v1_module_proto_msgTypes, + }.Build() + File_cosmos_capability_module_v1_module_proto = out.File + file_cosmos_capability_module_v1_module_proto_rawDesc = nil + file_cosmos_capability_module_v1_module_proto_goTypes = nil + file_cosmos_capability_module_v1_module_proto_depIdxs = nil +} diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index 636fd60e61b..b221305a30e 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -216,6 +216,9 @@ func (app *BaseApp) MountStores(keys ...storetypes.StoreKey) { case *storetypes.TransientStoreKey: app.MountStore(key, storetypes.StoreTypeTransient) + case *storetypes.MemoryStoreKey: + app.MountStore(key, storetypes.StoreTypeMemory) + default: panic(fmt.Sprintf("Unrecognized store key type :%T", key)) } diff --git a/proto/cosmos/capability/module/v1/module.proto b/proto/cosmos/capability/module/v1/module.proto new file mode 100644 index 00000000000..d6a50b32b12 --- /dev/null +++ b/proto/cosmos/capability/module/v1/module.proto @@ -0,0 +1,12 @@ +syntax = "proto3"; + +package cosmos.capability.module.v1; + +import "cosmos/app/v1alpha1/module.proto"; + +// Module is the config object of the capability module. +message Module { + option (cosmos.app.v1alpha1.module) = { + go_import: "github.com/cosmos/cosmos-sdk/x/capability" + }; +} \ No newline at end of file diff --git a/simapp/app.go b/simapp/app.go index 2a9b6bc3da5..d287ecdc3a3 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -214,12 +214,14 @@ func NewSimApp( ) *SimApp { var appBuilder *runtime.AppBuilder var paramsKeeper paramskeeper.Keeper + var capabilityKeeper *capabilitykeeper.Keeper var appCodec codec.Codec var legacyAmino *codec.LegacyAmino var interfaceRegistry codectypes.InterfaceRegistry err := container.Build(appConfig, &appBuilder, ¶msKeeper, + &capabilityKeeper, &appCodec, &legacyAmino, &interfaceRegistry, @@ -234,8 +236,8 @@ func NewSimApp( authtypes.StoreKey, banktypes.StoreKey, stakingtypes.StoreKey, minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey, govtypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, - evidencetypes.StoreKey, capabilitytypes.StoreKey, - authzkeeper.StoreKey, nftkeeper.StoreKey, group.StoreKey, + evidencetypes.StoreKey, authzkeeper.StoreKey, nftkeeper.StoreKey, + group.StoreKey, ) // NOTE: The testingkey is just mounted for testing purposes. Actual applications should // not include this key. @@ -260,7 +262,7 @@ func NewSimApp( app.ParamsKeeper = paramsKeeper initParamsKeeper(paramsKeeper) - app.CapabilityKeeper = capabilitykeeper.NewKeeper(appCodec, keys[capabilitytypes.StoreKey], memKeys[capabilitytypes.MemStoreKey]) + app.CapabilityKeeper = capabilityKeeper // Applications that wish to enforce statically created ScopedKeepers should call `Seal` after creating // their scoped modules in `NewApp` with `ScopeToModule` app.CapabilityKeeper.Seal() @@ -325,7 +327,7 @@ func NewSimApp( app.GovKeeper = *govKeeper.SetHooks( govtypes.NewMultiGovHooks( - // register the governance hooks + // register the governance hooks ), ) // set the governance module account as the authority for conducting upgrades @@ -359,7 +361,6 @@ func NewSimApp( auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts), vesting.NewAppModule(app.AccountKeeper, app.BankKeeper), bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants), feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), @@ -409,7 +410,6 @@ func NewSimApp( app.sm = module.NewSimulationManager( auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts), bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - capability.NewAppModule(appCodec, *app.CapabilityKeeper), feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil), @@ -426,7 +426,7 @@ func NewSimApp( // initialize stores app.MountKVStores(keys) - app.MountMemoryStores(memKeys) + // app.MountMemoryStores(memKeys) // initialize BaseApp app.SetTxDecoder(encodingConfig.TxConfig.TxDecoder()) diff --git a/simapp/app.yaml b/simapp/app.yaml index b4f037daa78..5c196fa9cd1 100644 --- a/simapp/app.yaml +++ b/simapp/app.yaml @@ -25,3 +25,6 @@ modules: - name: params config: "@type": cosmos.params.module.v1.Module + - name: capability + config: + "@type": cosmos.capability.module.v1.Module \ No newline at end of file diff --git a/x/capability/module.go b/x/capability/module.go index e2ac1709795..2c61d540304 100644 --- a/x/capability/module.go +++ b/x/capability/module.go @@ -6,14 +6,18 @@ import ( "math/rand" "time" - "github.com/grpc-ecosystem/grpc-gateway/runtime" + "cosmossdk.io/core/appmodule" + gwruntime "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" + modulev1 "cosmossdk.io/api/cosmos/capability/module/v1" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" + "github.com/cosmos/cosmos-sdk/runtime" + store "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -68,7 +72,7 @@ func (AppModuleBasic) ValidateGenesis(cdc codec.JSONCodec, config client.TxEncod } // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the capability module. -func (a AppModuleBasic) RegisterGRPCGatewayRoutes(_ client.Context, _ *runtime.ServeMux) { +func (a AppModuleBasic) RegisterGRPCGatewayRoutes(_ client.Context, _ *gwruntime.ServeMux) { } // GetTxCmd returns the capability module's root tx command. @@ -154,6 +158,28 @@ func (am AppModule) EndBlock(_ sdk.Context, _ abci.RequestEndBlock) []abci.Valid return []abci.ValidatorUpdate{} } +func init() { + appmodule.Register(&modulev1.Module{}, + appmodule.Provide( + provideModuleBasic, + provideModule, + )) +} + +func provideModuleBasic() runtime.AppModuleBasicWrapper { + return runtime.WrapAppModuleBasic(AppModuleBasic{}) +} + +func provideModule( + kvStoreKey *store.KVStoreKey, + memStoreKey *store.MemoryStoreKey, + cdc codec.Codec, +) (*keeper.Keeper, runtime.AppModuleWrapper) { + k := keeper.NewKeeper(cdc, kvStoreKey, memStoreKey) + m := NewAppModule(cdc, *k) + return k, runtime.WrapAppModule(m) +} + // GenerateGenesisState creates a randomized GenState of the capability module. func (AppModule) GenerateGenesisState(simState *module.SimulationState) { simulation.RandomizedGenState(simState) From 96cfc00eadb79271e2281796fda673659d6fe211 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 26 May 2022 16:38:47 -0300 Subject: [PATCH 02/10] added some fixes from Matt's PR + changed MemStoreKey --- runtime/app.go | 13 +++++++++++++ simapp/app.go | 29 +++++++++++++++++++++++++---- x/capability/types/keys.go | 2 +- 3 files changed, 39 insertions(+), 5 deletions(-) diff --git a/runtime/app.go b/runtime/app.go index 14f767b7589..bcebb5844d6 100644 --- a/runtime/app.go +++ b/runtime/app.go @@ -6,6 +6,7 @@ import ( "github.com/gogo/protobuf/grpc" abci "github.com/tendermint/tendermint/abci/types" + "golang.org/x/exp/slices" runtimev1alpha1 "cosmossdk.io/api/cosmos/app/runtime/v1alpha1" @@ -156,3 +157,15 @@ func (a *App) RegisterTendermintService(clientCtx client.Context) { } var _ servertypes.Application = &App{} + +// UnsafeFindStoreKey FindStoreKey fetches a registered StoreKey from the App in linear time. +// +// NOTE: This should only be used in testing. +func (a *App) UnsafeFindStoreKey(storeKey string) storetypes.StoreKey { + i := slices.IndexFunc(a.storeKeys, func(s storetypes.StoreKey) bool { return s.Name() == storeKey }) + if i == -1 { + return nil + } + + return a.storeKeys[i] +} diff --git a/simapp/app.go b/simapp/app.go index d287ecdc3a3..c9fab20d943 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -241,7 +241,7 @@ func NewSimApp( ) // NOTE: The testingkey is just mounted for testing purposes. Actual applications should // not include this key. - memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, "testingkey") + memKeys := sdk.NewMemoryStoreKeys("testingkey") // configure state listening capabilities using AppOptions // we are doing nothing with the returned streamingServices and waitGroup in this case @@ -426,7 +426,7 @@ func NewSimApp( // initialize stores app.MountKVStores(keys) - // app.MountMemoryStores(memKeys) + app.MountMemoryStores(memKeys) // initialize BaseApp app.SetTxDecoder(encodingConfig.TxConfig.TxDecoder()) @@ -544,7 +544,17 @@ func (app *SimApp) InterfaceRegistry() codectypes.InterfaceRegistry { // // NOTE: This is solely to be used for testing purposes. func (app *SimApp) GetKey(storeKey string) *storetypes.KVStoreKey { - return app.keys[storeKey] + kvsk := app.keys[storeKey] + if kvsk != nil { + return kvsk + } + + sk := app.UnsafeFindStoreKey(storeKey) + kvStoreKey, ok := sk.(*storetypes.KVStoreKey) + if !ok { + return nil + } + return kvStoreKey } // GetTKey returns the TransientStoreKey for the provided store key. @@ -558,7 +568,18 @@ func (app *SimApp) GetTKey(storeKey string) *storetypes.TransientStoreKey { // // NOTE: This is solely used for testing purposes. func (app *SimApp) GetMemKey(storeKey string) *storetypes.MemoryStoreKey { - return app.memKeys[storeKey] + kvsk := app.memKeys[storeKey] + if kvsk != nil { + return kvsk + } + + sk := app.UnsafeFindStoreKey(storeKey) + kvStoreKey, ok := sk.(*storetypes.MemoryStoreKey) + if !ok { + return nil + } + + return kvStoreKey } // GetSubspace returns a param subspace for a given module name. diff --git a/x/capability/types/keys.go b/x/capability/types/keys.go index eccfba00a55..fe6ae41aacf 100644 --- a/x/capability/types/keys.go +++ b/x/capability/types/keys.go @@ -14,7 +14,7 @@ const ( StoreKey = ModuleName // MemStoreKey defines the in-memory store key - MemStoreKey = "mem_capability" + MemStoreKey = "memory:capability" ) var ( From 7b560b1515fb53298adf7278e93081a7c55bd8f9 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 26 May 2022 17:33:17 -0300 Subject: [PATCH 03/10] fix name --- simapp/app.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/simapp/app.go b/simapp/app.go index 0ef8190af0a..82055e58765 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -569,18 +569,18 @@ func (app *SimApp) GetTKey(storeKey string) *storetypes.TransientStoreKey { // // NOTE: This is solely used for testing purposes. func (app *SimApp) GetMemKey(storeKey string) *storetypes.MemoryStoreKey { - kvsk := app.memKeys[storeKey] - if kvsk != nil { - return kvsk + msk := app.memKeys[storeKey] + if msk != nil { + return msk } sk := app.UnsafeFindStoreKey(storeKey) - kvStoreKey, ok := sk.(*storetypes.MemoryStoreKey) + memStoreKey, ok := sk.(*storetypes.MemoryStoreKey) if !ok { return nil } - return kvStoreKey + return memStoreKey } // GetSubspace returns a param subspace for a given module name. From 5002e6a98ea6fb35ca799de36d9a71b37c62fb1a Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 26 May 2022 17:40:41 -0300 Subject: [PATCH 04/10] fix name --- runtime/app.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/runtime/app.go b/runtime/app.go index a6b4d9c66b2..bcebb5844d6 100644 --- a/runtime/app.go +++ b/runtime/app.go @@ -156,18 +156,6 @@ func (a *App) RegisterTendermintService(clientCtx client.Context) { ) } -// UnsafeFindStoreKey FindStoreKey fetches a registered StoreKey from the App in linear time. -// -// NOTE: This should only be used in testing. -func (a *App) UnsafeFindStoreKey(storeKey string) storetypes.StoreKey { - i := slices.IndexFunc(a.storeKeys, func(s storetypes.StoreKey) bool { return s.Name() == storeKey }) - if i == -1 { - return nil - } - - return a.storeKeys[i] -} - var _ servertypes.Application = &App{} // UnsafeFindStoreKey FindStoreKey fetches a registered StoreKey from the App in linear time. From 5d81575a2103163d1edb11735cb19b1b3cc6a540 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 26 May 2022 18:01:31 -0300 Subject: [PATCH 05/10] small change --- runtime/app.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/app.go b/runtime/app.go index bcebb5844d6..8b66ff2af7f 100644 --- a/runtime/app.go +++ b/runtime/app.go @@ -156,8 +156,6 @@ func (a *App) RegisterTendermintService(clientCtx client.Context) { ) } -var _ servertypes.Application = &App{} - // UnsafeFindStoreKey FindStoreKey fetches a registered StoreKey from the App in linear time. // // NOTE: This should only be used in testing. @@ -169,3 +167,5 @@ func (a *App) UnsafeFindStoreKey(storeKey string) storetypes.StoreKey { return a.storeKeys[i] } + +var _ servertypes.Application = &App{} From ad191eaa4030cee77574f94f843993597b25a46c Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Fri, 27 May 2022 11:49:01 -0300 Subject: [PATCH 06/10] rollback MemStoreKey change --- x/capability/capability_test.go | 4 +++- x/capability/genesis_test.go | 4 +++- x/capability/keeper/keeper_test.go | 4 +++- x/capability/types/keys.go | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/x/capability/capability_test.go b/x/capability/capability_test.go index 6dccd6e7194..016a9b4a580 100644 --- a/x/capability/capability_test.go +++ b/x/capability/capability_test.go @@ -33,7 +33,9 @@ func (suite *CapabilityTestSuite) SetupTest() { cdc := app.AppCodec() // create new keeper so we can define custom scoping before init and seal - keeper := keeper.NewKeeper(cdc, app.GetKey(types.StoreKey), app.GetMemKey(types.MemStoreKey)) + // memStoreKey is the new format used by the depinject module + memStoreKey := "memory:capability" + keeper := keeper.NewKeeper(cdc, app.GetKey(types.StoreKey), app.GetMemKey(memStoreKey)) suite.app = app suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1}) diff --git a/x/capability/genesis_test.go b/x/capability/genesis_test.go index 34a09960e75..8a8e28ac01d 100644 --- a/x/capability/genesis_test.go +++ b/x/capability/genesis_test.go @@ -37,7 +37,9 @@ func (suite *CapabilityTestSuite) TestGenesis() { encCdc := simapp.MakeTestEncodingConfig() newApp := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, encCdc, simapp.EmptyAppOptions{}) - newKeeper := keeper.NewKeeper(suite.cdc, newApp.GetKey(types.StoreKey), newApp.GetMemKey(types.MemStoreKey)) + // memStoreKey is the new format used by the depinject module + memStoreKey := "memory:capability" + newKeeper := keeper.NewKeeper(suite.cdc, newApp.GetKey(types.StoreKey), newApp.GetMemKey(memStoreKey)) newSk1 := newKeeper.ScopeToModule(banktypes.ModuleName) newSk2 := newKeeper.ScopeToModule(stakingtypes.ModuleName) deliverCtx, _ := newApp.BaseApp.NewUncachedContext(false, tmproto.Header{}).WithBlockGasMeter(sdk.NewInfiniteGasMeter()).CacheContext() diff --git a/x/capability/keeper/keeper_test.go b/x/capability/keeper/keeper_test.go index 9757461db71..d05a9e9f1aa 100644 --- a/x/capability/keeper/keeper_test.go +++ b/x/capability/keeper/keeper_test.go @@ -29,7 +29,9 @@ func (suite *KeeperTestSuite) SetupTest() { cdc := app.AppCodec() // create new keeper so we can define custom scoping before init and seal - keeper := keeper.NewKeeper(cdc, app.GetKey(types.StoreKey), app.GetMemKey(types.MemStoreKey)) + // memStoreKey is the new format used by the depinject module + memStoreKey := "memory:capability" + keeper := keeper.NewKeeper(cdc, app.GetKey(types.StoreKey), app.GetMemKey(memStoreKey)) suite.app = app suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1}) diff --git a/x/capability/types/keys.go b/x/capability/types/keys.go index fe6ae41aacf..eccfba00a55 100644 --- a/x/capability/types/keys.go +++ b/x/capability/types/keys.go @@ -14,7 +14,7 @@ const ( StoreKey = ModuleName // MemStoreKey defines the in-memory store key - MemStoreKey = "memory:capability" + MemStoreKey = "mem_capability" ) var ( From 87a461d2e8185e40d57e1f6fd0bf175c9728ebc5 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Fri, 27 May 2022 12:25:48 -0300 Subject: [PATCH 07/10] Revert "rollback MemStoreKey change" This reverts commit ad191eaa4030cee77574f94f843993597b25a46c. --- x/capability/capability_test.go | 4 +--- x/capability/genesis_test.go | 4 +--- x/capability/keeper/keeper_test.go | 4 +--- x/capability/types/keys.go | 2 +- 4 files changed, 4 insertions(+), 10 deletions(-) diff --git a/x/capability/capability_test.go b/x/capability/capability_test.go index 016a9b4a580..6dccd6e7194 100644 --- a/x/capability/capability_test.go +++ b/x/capability/capability_test.go @@ -33,9 +33,7 @@ func (suite *CapabilityTestSuite) SetupTest() { cdc := app.AppCodec() // create new keeper so we can define custom scoping before init and seal - // memStoreKey is the new format used by the depinject module - memStoreKey := "memory:capability" - keeper := keeper.NewKeeper(cdc, app.GetKey(types.StoreKey), app.GetMemKey(memStoreKey)) + keeper := keeper.NewKeeper(cdc, app.GetKey(types.StoreKey), app.GetMemKey(types.MemStoreKey)) suite.app = app suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1}) diff --git a/x/capability/genesis_test.go b/x/capability/genesis_test.go index 8a8e28ac01d..34a09960e75 100644 --- a/x/capability/genesis_test.go +++ b/x/capability/genesis_test.go @@ -37,9 +37,7 @@ func (suite *CapabilityTestSuite) TestGenesis() { encCdc := simapp.MakeTestEncodingConfig() newApp := simapp.NewSimApp(log.NewNopLogger(), db, nil, true, map[int64]bool{}, simapp.DefaultNodeHome, 5, encCdc, simapp.EmptyAppOptions{}) - // memStoreKey is the new format used by the depinject module - memStoreKey := "memory:capability" - newKeeper := keeper.NewKeeper(suite.cdc, newApp.GetKey(types.StoreKey), newApp.GetMemKey(memStoreKey)) + newKeeper := keeper.NewKeeper(suite.cdc, newApp.GetKey(types.StoreKey), newApp.GetMemKey(types.MemStoreKey)) newSk1 := newKeeper.ScopeToModule(banktypes.ModuleName) newSk2 := newKeeper.ScopeToModule(stakingtypes.ModuleName) deliverCtx, _ := newApp.BaseApp.NewUncachedContext(false, tmproto.Header{}).WithBlockGasMeter(sdk.NewInfiniteGasMeter()).CacheContext() diff --git a/x/capability/keeper/keeper_test.go b/x/capability/keeper/keeper_test.go index d05a9e9f1aa..9757461db71 100644 --- a/x/capability/keeper/keeper_test.go +++ b/x/capability/keeper/keeper_test.go @@ -29,9 +29,7 @@ func (suite *KeeperTestSuite) SetupTest() { cdc := app.AppCodec() // create new keeper so we can define custom scoping before init and seal - // memStoreKey is the new format used by the depinject module - memStoreKey := "memory:capability" - keeper := keeper.NewKeeper(cdc, app.GetKey(types.StoreKey), app.GetMemKey(memStoreKey)) + keeper := keeper.NewKeeper(cdc, app.GetKey(types.StoreKey), app.GetMemKey(types.MemStoreKey)) suite.app = app suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1}) diff --git a/x/capability/types/keys.go b/x/capability/types/keys.go index eccfba00a55..fe6ae41aacf 100644 --- a/x/capability/types/keys.go +++ b/x/capability/types/keys.go @@ -14,7 +14,7 @@ const ( StoreKey = ModuleName // MemStoreKey defines the in-memory store key - MemStoreKey = "mem_capability" + MemStoreKey = "memory:capability" ) var ( From 27146e64a7d9c1e09ff27e3276aaa3d03cec726c Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Wed, 1 Jun 2022 14:06:06 -0300 Subject: [PATCH 08/10] add suggestions by @aaronc --- .../capability/module/v1/module.pulsar.go | 111 ++++++++++++---- .../cosmos/capability/module/v1/module.proto | 4 + simapp/app.go | 121 ++++++++---------- simapp/app.yaml | 4 +- x/capability/capability_test.go | 4 +- x/capability/keeper/keeper.go | 5 + x/capability/module.go | 12 +- 7 files changed, 164 insertions(+), 97 deletions(-) diff --git a/api/cosmos/capability/module/v1/module.pulsar.go b/api/cosmos/capability/module/v1/module.pulsar.go index 2bb59926f4e..800b6589a87 100644 --- a/api/cosmos/capability/module/v1/module.pulsar.go +++ b/api/cosmos/capability/module/v1/module.pulsar.go @@ -14,12 +14,14 @@ import ( ) var ( - md_Module protoreflect.MessageDescriptor + md_Module protoreflect.MessageDescriptor + fd_Module_seal_keeper protoreflect.FieldDescriptor ) func init() { file_cosmos_capability_module_v1_module_proto_init() md_Module = File_cosmos_capability_module_v1_module_proto.Messages().ByName("Module") + fd_Module_seal_keeper = md_Module.Fields().ByName("seal_keeper") } var _ protoreflect.Message = (*fastReflection_Module)(nil) @@ -87,6 +89,12 @@ func (x *fastReflection_Module) Interface() protoreflect.ProtoMessage { // While iterating, mutating operations may only be performed // on the current field descriptor. func (x *fastReflection_Module) Range(f func(protoreflect.FieldDescriptor, protoreflect.Value) bool) { + if x.SealKeeper != false { + value := protoreflect.ValueOfBool(x.SealKeeper) + if !f(fd_Module_seal_keeper, value) { + return + } + } } // Has reports whether a field is populated. @@ -102,6 +110,8 @@ func (x *fastReflection_Module) Range(f func(protoreflect.FieldDescriptor, proto // a repeated field is populated if it is non-empty. func (x *fastReflection_Module) Has(fd protoreflect.FieldDescriptor) bool { switch fd.FullName() { + case "cosmos.capability.module.v1.Module.seal_keeper": + return x.SealKeeper != false default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) @@ -118,6 +128,8 @@ func (x *fastReflection_Module) Has(fd protoreflect.FieldDescriptor) bool { // Clear is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Module) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { + case "cosmos.capability.module.v1.Module.seal_keeper": + x.SealKeeper = false default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) @@ -134,6 +146,9 @@ func (x *fastReflection_Module) Clear(fd protoreflect.FieldDescriptor) { // of the value; to obtain a mutable reference, use Mutable. func (x *fastReflection_Module) Get(descriptor protoreflect.FieldDescriptor) protoreflect.Value { switch descriptor.FullName() { + case "cosmos.capability.module.v1.Module.seal_keeper": + value := x.SealKeeper + return protoreflect.ValueOfBool(value) default: if descriptor.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) @@ -154,6 +169,8 @@ func (x *fastReflection_Module) Get(descriptor protoreflect.FieldDescriptor) pro // Set is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Module) Set(fd protoreflect.FieldDescriptor, value protoreflect.Value) { switch fd.FullName() { + case "cosmos.capability.module.v1.Module.seal_keeper": + x.SealKeeper = value.Bool() default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) @@ -174,6 +191,8 @@ func (x *fastReflection_Module) Set(fd protoreflect.FieldDescriptor, value proto // Mutable is a mutating operation and unsafe for concurrent use. func (x *fastReflection_Module) Mutable(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { + case "cosmos.capability.module.v1.Module.seal_keeper": + panic(fmt.Errorf("field seal_keeper of message cosmos.capability.module.v1.Module is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) @@ -187,6 +206,8 @@ func (x *fastReflection_Module) Mutable(fd protoreflect.FieldDescriptor) protore // For lists, maps, and messages, this returns a new, empty, mutable value. func (x *fastReflection_Module) NewField(fd protoreflect.FieldDescriptor) protoreflect.Value { switch fd.FullName() { + case "cosmos.capability.module.v1.Module.seal_keeper": + return protoreflect.ValueOfBool(false) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: cosmos.capability.module.v1.Module")) @@ -256,6 +277,9 @@ func (x *fastReflection_Module) ProtoMethods() *protoiface.Methods { var n int var l int _ = l + if x.SealKeeper { + n += 2 + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -285,6 +309,16 @@ func (x *fastReflection_Module) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if x.SealKeeper { + i-- + if x.SealKeeper { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i-- + dAtA[i] = 0x8 + } if input.Buf != nil { input.Buf = append(input.Buf, dAtA...) } else { @@ -334,6 +368,26 @@ func (x *fastReflection_Module) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: Module: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { + case 1: + if wireType != 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field SealKeeper", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrIntOverflow + } + if iNdEx >= l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + x.SealKeeper = bool(v != 0) default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -387,6 +441,10 @@ type Module struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields + + // seal_keeper defines if keeper.Seal() will run on BeginBlock() to prevent further modules from creating a scoped + // keeper. For more details check x/capability/keeper.go. + SealKeeper bool `protobuf:"varint,1,opt,name=seal_keeper,json=sealKeeper,proto3" json:"seal_keeper,omitempty"` } func (x *Module) Reset() { @@ -409,6 +467,13 @@ func (*Module) Descriptor() ([]byte, []int) { return file_cosmos_capability_module_v1_module_proto_rawDescGZIP(), []int{0} } +func (x *Module) GetSealKeeper() bool { + if x != nil { + return x.SealKeeper + } + return false +} + var File_cosmos_capability_module_v1_module_proto protoreflect.FileDescriptor var file_cosmos_capability_module_v1_module_proto_rawDesc = []byte{ @@ -418,27 +483,29 @@ var file_cosmos_capability_module_v1_module_proto_rawDesc = []byte{ 0x6f, 0x73, 0x2e, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x1a, 0x20, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x61, 0x70, 0x70, 0x2f, 0x76, 0x31, 0x61, 0x6c, 0x70, 0x68, 0x61, 0x31, 0x2f, 0x6d, 0x6f, 0x64, - 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3b, 0x0a, 0x06, 0x4d, 0x6f, 0x64, - 0x75, 0x6c, 0x65, 0x3a, 0x31, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x2b, 0x0a, 0x29, 0x67, 0x69, 0x74, - 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x63, - 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x78, 0x2f, 0x63, 0x61, 0x70, 0x61, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x42, 0xf4, 0x01, 0x0a, 0x1f, 0x63, 0x6f, 0x6d, 0x2e, 0x63, - 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, - 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4d, 0x6f, 0x64, 0x75, - 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x63, 0x6f, 0x73, 0x6d, 0x6f, - 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x2f, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2f, 0x6d, 0x6f, - 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, - 0xa2, 0x02, 0x03, 0x43, 0x43, 0x4d, 0xaa, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, - 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, - 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x43, 0x61, - 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, - 0x56, 0x31, 0xe2, 0x02, 0x27, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x43, 0x61, 0x70, 0x61, - 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, 0x31, - 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1e, 0x43, - 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, - 0x79, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x5c, 0x0a, 0x06, 0x4d, 0x6f, 0x64, + 0x75, 0x6c, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x61, 0x6c, 0x5f, 0x6b, 0x65, 0x65, 0x70, + 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x73, 0x65, 0x61, 0x6c, 0x4b, 0x65, + 0x65, 0x70, 0x65, 0x72, 0x3a, 0x31, 0xba, 0xc0, 0x96, 0xda, 0x01, 0x2b, 0x0a, 0x29, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2f, + 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2d, 0x73, 0x64, 0x6b, 0x2f, 0x78, 0x2f, 0x63, 0x61, 0x70, + 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x42, 0xf4, 0x01, 0x0a, 0x1f, 0x63, 0x6f, 0x6d, 0x2e, + 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, + 0x79, 0x2e, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x4d, 0x6f, 0x64, + 0x75, 0x6c, 0x65, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x35, 0x63, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2f, 0x63, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2f, 0x6d, + 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, + 0x31, 0xa2, 0x02, 0x03, 0x43, 0x43, 0x4d, 0xaa, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, + 0x2e, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x2e, 0x4d, 0x6f, 0x64, 0x75, + 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x1b, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x43, + 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, + 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x27, 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5c, 0x43, 0x61, 0x70, + 0x61, 0x62, 0x69, 0x6c, 0x69, 0x74, 0x79, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, 0x56, + 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1e, + 0x43, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x3a, 0x3a, 0x43, 0x61, 0x70, 0x61, 0x62, 0x69, 0x6c, 0x69, + 0x74, 0x79, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/proto/cosmos/capability/module/v1/module.proto b/proto/cosmos/capability/module/v1/module.proto index d6a50b32b12..eabaadc1c22 100644 --- a/proto/cosmos/capability/module/v1/module.proto +++ b/proto/cosmos/capability/module/v1/module.proto @@ -9,4 +9,8 @@ message Module { option (cosmos.app.v1alpha1.module) = { go_import: "github.com/cosmos/cosmos-sdk/x/capability" }; + + // seal_keeper defines if keeper.Seal() will run on BeginBlock() to prevent further modules from creating a scoped + // keeper. For more details check x/capability/keeper.go. + bool seal_keeper = 1; } \ No newline at end of file diff --git a/simapp/app.go b/simapp/app.go index 5d8c1c480ab..0ebbb7b4a13 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -208,29 +208,28 @@ func NewSimApp( homePath string, invCheckPeriod uint, encodingConfig simappparams.EncodingConfig, appOpts servertypes.AppOptions, baseAppOptions ...func(*baseapp.BaseApp), ) *SimApp { + app := &SimApp{ + invCheckPeriod: invCheckPeriod, + } + var appBuilder *runtime.AppBuilder - var paramsKeeper paramskeeper.Keeper - var capabilityKeeper *capabilitykeeper.Keeper - var accountKeeper authkeeper.AccountKeeper - var appCodec codec.Codec - var legacyAmino *codec.LegacyAmino - var interfaceRegistry codectypes.InterfaceRegistry + err := depinject.Inject(appConfig, &appBuilder, - ¶msKeeper, - &capabilityKeeper, - &appCodec, - &legacyAmino, - &interfaceRegistry, - &accountKeeper, + &app.ParamsKeeper, + &app.CapabilityKeeper, + &app.appCodec, + &app.legacyAmino, + &app.interfaceRegistry, + &app.AccountKeeper, ) if err != nil { panic(err) } - runtimeApp := appBuilder.Build(logger, db, traceStore, baseAppOptions...) + app.App = appBuilder.Build(logger, db, traceStore, baseAppOptions...) - keys := sdk.NewKVStoreKeys( + app.keys = sdk.NewKVStoreKeys( banktypes.StoreKey, stakingtypes.StoreKey, minttypes.StoreKey, distrtypes.StoreKey, slashingtypes.StoreKey, govtypes.StoreKey, upgradetypes.StoreKey, feegrant.StoreKey, @@ -239,57 +238,39 @@ func NewSimApp( ) // NOTE: The testingkey is just mounted for testing purposes. Actual applications should // not include this key. - memKeys := sdk.NewMemoryStoreKeys("testingkey") + app.memKeys = sdk.NewMemoryStoreKeys("testingkey") // configure state listening capabilities using AppOptions // we are doing nothing with the returned streamingServices and waitGroup in this case - if _, _, err := streaming.LoadStreamingServices(runtimeApp.BaseApp, appOpts, appCodec, keys); err != nil { + if _, _, err := streaming.LoadStreamingServices(app.App.BaseApp, appOpts, app.appCodec, app.keys); err != nil { tmos.Exit(err.Error()) } - app := &SimApp{ - App: runtimeApp, - legacyAmino: legacyAmino, - appCodec: appCodec, - interfaceRegistry: interfaceRegistry, - invCheckPeriod: invCheckPeriod, - keys: keys, - memKeys: memKeys, - } - - app.ParamsKeeper = paramsKeeper - initParamsKeeper(paramsKeeper) - - app.CapabilityKeeper = capabilityKeeper - app.AccountKeeper = accountKeeper - - // Applications that wish to enforce statically created ScopedKeepers should call `Seal` after creating - // their scoped modules in `NewApp` with `ScopeToModule` - app.CapabilityKeeper.Seal() + initParamsKeeper(app.ParamsKeeper) // add keepers app.BankKeeper = bankkeeper.NewBaseKeeper( - appCodec, keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(), + app.appCodec, app.keys[banktypes.StoreKey], app.AccountKeeper, app.GetSubspace(banktypes.ModuleName), app.ModuleAccountAddrs(), ) stakingKeeper := stakingkeeper.NewKeeper( - appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName), + app.appCodec, app.keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName), ) app.MintKeeper = mintkeeper.NewKeeper( - appCodec, keys[minttypes.StoreKey], app.GetSubspace(minttypes.ModuleName), &stakingKeeper, + app.appCodec, app.keys[minttypes.StoreKey], app.GetSubspace(minttypes.ModuleName), &stakingKeeper, app.AccountKeeper, app.BankKeeper, authtypes.FeeCollectorName, ) app.DistrKeeper = distrkeeper.NewKeeper( - appCodec, keys[distrtypes.StoreKey], app.GetSubspace(distrtypes.ModuleName), app.AccountKeeper, app.BankKeeper, + app.appCodec, app.keys[distrtypes.StoreKey], app.GetSubspace(distrtypes.ModuleName), app.AccountKeeper, app.BankKeeper, &stakingKeeper, authtypes.FeeCollectorName, ) app.SlashingKeeper = slashingkeeper.NewKeeper( - appCodec, keys[slashingtypes.StoreKey], &stakingKeeper, app.GetSubspace(slashingtypes.ModuleName), + app.appCodec, app.keys[slashingtypes.StoreKey], &stakingKeeper, app.GetSubspace(slashingtypes.ModuleName), ) app.CrisisKeeper = crisiskeeper.NewKeeper( app.GetSubspace(crisistypes.ModuleName), invCheckPeriod, app.BankKeeper, authtypes.FeeCollectorName, ) - app.FeeGrantKeeper = feegrantkeeper.NewKeeper(appCodec, keys[feegrant.StoreKey], app.AccountKeeper) + app.FeeGrantKeeper = feegrantkeeper.NewKeeper(app.appCodec, app.keys[feegrant.StoreKey], app.AccountKeeper) // register the staking hooks // NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks @@ -297,14 +278,14 @@ func NewSimApp( stakingtypes.NewMultiStakingHooks(app.DistrKeeper.Hooks(), app.SlashingKeeper.Hooks()), ) - app.AuthzKeeper = authzkeeper.NewKeeper(keys[authzkeeper.StoreKey], appCodec, app.MsgServiceRouter(), app.AccountKeeper) + app.AuthzKeeper = authzkeeper.NewKeeper(app.keys[authzkeeper.StoreKey], app.appCodec, app.MsgServiceRouter(), app.AccountKeeper) groupConfig := group.DefaultConfig() /* Example of setting group params: groupConfig.MaxMetadataLen = 1000 */ - app.GroupKeeper = groupkeeper.NewKeeper(keys[group.StoreKey], appCodec, app.MsgServiceRouter(), app.AccountKeeper, groupConfig) + app.GroupKeeper = groupkeeper.NewKeeper(app.keys[group.StoreKey], app.appCodec, app.MsgServiceRouter(), app.AccountKeeper, groupConfig) // register the proposal types govRouter := govv1beta1.NewRouter() @@ -318,7 +299,7 @@ func NewSimApp( govConfig.MaxMetadataLen = 10000 */ govKeeper := govkeeper.NewKeeper( - appCodec, keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper, + app.appCodec, app.keys[govtypes.StoreKey], app.GetSubspace(govtypes.ModuleName), app.AccountKeeper, app.BankKeeper, &stakingKeeper, govRouter, app.MsgServiceRouter(), govConfig, ) @@ -328,13 +309,13 @@ func NewSimApp( ), ) // set the governance module account as the authority for conducting upgrades - app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, keys[upgradetypes.StoreKey], appCodec, homePath, app.BaseApp, authtypes.NewModuleAddress(govtypes.ModuleName).String()) + app.UpgradeKeeper = upgradekeeper.NewKeeper(skipUpgradeHeights, app.keys[upgradetypes.StoreKey], app.appCodec, homePath, app.BaseApp, authtypes.NewModuleAddress(govtypes.ModuleName).String()) - app.NFTKeeper = nftkeeper.NewKeeper(keys[nftkeeper.StoreKey], appCodec, app.AccountKeeper, app.BankKeeper) + app.NFTKeeper = nftkeeper.NewKeeper(app.keys[nftkeeper.StoreKey], app.appCodec, app.AccountKeeper, app.BankKeeper) // create evidence keeper with router evidenceKeeper := evidencekeeper.NewKeeper( - appCodec, keys[evidencetypes.StoreKey], &app.StakingKeeper, app.SlashingKeeper, + app.appCodec, app.keys[evidencetypes.StoreKey], &app.StakingKeeper, app.SlashingKeeper, ) // If evidence needs to be handled for the app, set routes in router here and seal app.EvidenceKeeper = *evidenceKeeper @@ -353,19 +334,19 @@ func NewSimApp( encodingConfig.TxConfig, ), vesting.NewAppModule(app.AccountKeeper, app.BankKeeper), - bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), + bank.NewAppModule(app.appCodec, app.BankKeeper, app.AccountKeeper), crisis.NewAppModule(&app.CrisisKeeper, skipGenesisInvariants), - feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), - mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + feegrantmodule.NewAppModule(app.appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), + gov.NewAppModule(app.appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), + mint.NewAppModule(app.appCodec, app.MintKeeper, app.AccountKeeper, nil), + slashing.NewAppModule(app.appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), + distr.NewAppModule(app.appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), + staking.NewAppModule(app.appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), upgrade.NewAppModule(app.UpgradeKeeper), evidence.NewAppModule(app.EvidenceKeeper), - authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), - groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), - nftmodule.NewAppModule(appCodec, app.NFTKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), + authzmodule.NewAppModule(app.appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), + groupmodule.NewAppModule(app.appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), + nftmodule.NewAppModule(app.appCodec, app.NFTKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), ) if err != nil { panic(err) @@ -403,26 +384,26 @@ func NewSimApp( // NOTE: this is not required apps that don't use the simulator for fuzz testing // transactions app.sm = module.NewSimulationManager( - auth.NewAppModule(appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts), - bank.NewAppModule(appCodec, app.BankKeeper, app.AccountKeeper), - feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), - gov.NewAppModule(appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), - mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper, nil), - staking.NewAppModule(appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), - distr.NewAppModule(appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), - slashing.NewAppModule(appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), + auth.NewAppModule(app.appCodec, app.AccountKeeper, authsims.RandomGenesisAccounts), + bank.NewAppModule(app.appCodec, app.BankKeeper, app.AccountKeeper), + feegrantmodule.NewAppModule(app.appCodec, app.AccountKeeper, app.BankKeeper, app.FeeGrantKeeper, app.interfaceRegistry), + gov.NewAppModule(app.appCodec, app.GovKeeper, app.AccountKeeper, app.BankKeeper), + mint.NewAppModule(app.appCodec, app.MintKeeper, app.AccountKeeper, nil), + staking.NewAppModule(app.appCodec, app.StakingKeeper, app.AccountKeeper, app.BankKeeper), + distr.NewAppModule(app.appCodec, app.DistrKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), + slashing.NewAppModule(app.appCodec, app.SlashingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper), params.NewAppModule(app.ParamsKeeper), evidence.NewAppModule(app.EvidenceKeeper), - authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), - groupmodule.NewAppModule(appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), - nftmodule.NewAppModule(appCodec, app.NFTKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), + authzmodule.NewAppModule(app.appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), + groupmodule.NewAppModule(app.appCodec, app.GroupKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), + nftmodule.NewAppModule(app.appCodec, app.NFTKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry), ) app.sm.RegisterStoreDecoders() // initialize stores - app.MountKVStores(keys) - app.MountMemoryStores(memKeys) + app.MountKVStores(app.keys) + app.MountMemoryStores(app.memKeys) // initialize BaseApp app.SetTxDecoder(encodingConfig.TxConfig.TxDecoder()) diff --git a/simapp/app.yaml b/simapp/app.yaml index d3d70745aa7..22816f4b67e 100644 --- a/simapp/app.yaml +++ b/simapp/app.yaml @@ -46,6 +46,8 @@ modules: - name: params config: "@type": cosmos.params.module.v1.Module + - name: capability config: - "@type": cosmos.capability.module.v1.Module \ No newline at end of file + "@type": cosmos.capability.module.v1.Module + seal_keeper: true \ No newline at end of file diff --git a/x/capability/capability_test.go b/x/capability/capability_test.go index 6dccd6e7194..24b94cf7d69 100644 --- a/x/capability/capability_test.go +++ b/x/capability/capability_test.go @@ -39,7 +39,7 @@ func (suite *CapabilityTestSuite) SetupTest() { suite.ctx = app.BaseApp.NewContext(checkTx, tmproto.Header{Height: 1}) suite.keeper = keeper suite.cdc = cdc - suite.module = capability.NewAppModule(cdc, *keeper) + suite.module = capability.NewAppModule(cdc, *keeper, true) } // The following test case mocks a specific bug discovered in https://github.com/cosmos/cosmos-sdk/issues/9800 @@ -63,7 +63,7 @@ func (suite *CapabilityTestSuite) TestInitializeMemStore() { // Mock app beginblock and ensure that no gas has been consumed and memstore is initialized ctx = suite.app.BaseApp.NewContext(false, tmproto.Header{}).WithBlockGasMeter(sdk.NewGasMeter(50)) prevGas := ctx.BlockGasMeter().GasConsumed() - restartedModule := capability.NewAppModule(suite.cdc, *newKeeper) + restartedModule := capability.NewAppModule(suite.cdc, *newKeeper, true) restartedModule.BeginBlock(ctx, abci.RequestBeginBlock{}) suite.Require().True(newKeeper.IsInitialized(ctx), "memstore initialized flag not set") gasUsed := ctx.BlockGasMeter().GasConsumed() diff --git a/x/capability/keeper/keeper.go b/x/capability/keeper/keeper.go index 708456ed3c6..71debf0d00c 100644 --- a/x/capability/keeper/keeper.go +++ b/x/capability/keeper/keeper.go @@ -100,6 +100,11 @@ func (k *Keeper) Seal() { k.sealed = true } +// UnsafeSeal does the same as Seal() without doing any checks. +func (k *Keeper) UnsafeSeal() { + k.sealed = true +} + // InitMemStore will assure that the module store is a memory store (it will panic if it's not) // and willl initialize it. The function is safe to be called multiple times. // InitMemStore must be called every time the app starts before the keeper is used (so diff --git a/x/capability/module.go b/x/capability/module.go index 2c61d540304..38b34c0a3c3 100644 --- a/x/capability/module.go +++ b/x/capability/module.go @@ -90,12 +90,15 @@ type AppModule struct { AppModuleBasic keeper keeper.Keeper + + sealKeeper bool } -func NewAppModule(cdc codec.Codec, keeper keeper.Keeper) AppModule { +func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, sealKeeper bool) AppModule { return AppModule{ AppModuleBasic: NewAppModuleBasic(cdc), keeper: keeper, + sealKeeper: sealKeeper, } } @@ -150,6 +153,10 @@ func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) { defer telemetry.ModuleMeasureSince(types.ModuleName, time.Now(), telemetry.MetricKeyBeginBlocker) am.keeper.InitMemStore(ctx) + + if am.sealKeeper { + am.keeper.UnsafeSeal() + } } // EndBlock executes all ABCI EndBlock logic respective to the capability module. It @@ -174,9 +181,10 @@ func provideModule( kvStoreKey *store.KVStoreKey, memStoreKey *store.MemoryStoreKey, cdc codec.Codec, + config *modulev1.Module, ) (*keeper.Keeper, runtime.AppModuleWrapper) { k := keeper.NewKeeper(cdc, kvStoreKey, memStoreKey) - m := NewAppModule(cdc, *k) + m := NewAppModule(cdc, *k, config.SealKeeper) return k, runtime.WrapAppModule(m) } From 7ac22c13ce88f416500369e7c3ab21ae95de9fe7 Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Wed, 1 Jun 2022 16:14:24 -0300 Subject: [PATCH 09/10] add IsSealed() --- x/capability/keeper/keeper.go | 6 +++--- x/capability/module.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/x/capability/keeper/keeper.go b/x/capability/keeper/keeper.go index 71debf0d00c..fe791d53ffc 100644 --- a/x/capability/keeper/keeper.go +++ b/x/capability/keeper/keeper.go @@ -100,9 +100,9 @@ func (k *Keeper) Seal() { k.sealed = true } -// UnsafeSeal does the same as Seal() without doing any checks. -func (k *Keeper) UnsafeSeal() { - k.sealed = true +// IsSealed returns if the keeper is sealed. +func (k *Keeper) IsSealed() bool { + return k.sealed } // InitMemStore will assure that the module store is a memory store (it will panic if it's not) diff --git a/x/capability/module.go b/x/capability/module.go index 38b34c0a3c3..c8012522d3c 100644 --- a/x/capability/module.go +++ b/x/capability/module.go @@ -154,8 +154,8 @@ func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) { am.keeper.InitMemStore(ctx) - if am.sealKeeper { - am.keeper.UnsafeSeal() + if am.sealKeeper && !am.keeper.IsSealed() { + am.keeper.Seal() } } From 30c207c7e9b54c943e9e51f9d2198a0be1b6d24c Mon Sep 17 00:00:00 2001 From: Facundo Medica Date: Thu, 2 Jun 2022 10:09:41 -0300 Subject: [PATCH 10/10] fix --- simapp/app.go | 1 + 1 file changed, 1 insertion(+) diff --git a/simapp/app.go b/simapp/app.go index 4acabed0316..c40ddac2027 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -222,6 +222,7 @@ func NewSimApp( &app.legacyAmino, &app.interfaceRegistry, &app.AccountKeeper, + &app.BankKeeper, ) if err != nil { panic(err)