From c4538ea7dc1047e52730496567245b74c81465e3 Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Fri, 19 Apr 2024 16:02:15 +0300 Subject: [PATCH 1/4] feat(depinject): add support for 08-wasm --- .../wasm/module/v1/module.pulsar.go | 584 ++++++++++++++++++ modules/light-clients/08-wasm/depinject.go | 72 +++ modules/light-clients/08-wasm/go.mod | 4 +- modules/light-clients/08-wasm/module.go | 19 +- .../08-wasm/testing/simapp/app.go | 2 +- .../lightclients/wasm/module/v1/module.proto | 15 + 6 files changed, 682 insertions(+), 14 deletions(-) create mode 100644 api/ibc/lightclients/wasm/module/v1/module.pulsar.go create mode 100644 modules/light-clients/08-wasm/depinject.go create mode 100644 proto/ibc/lightclients/wasm/module/v1/module.proto diff --git a/api/ibc/lightclients/wasm/module/v1/module.pulsar.go b/api/ibc/lightclients/wasm/module/v1/module.pulsar.go new file mode 100644 index 00000000000..9825829e6ca --- /dev/null +++ b/api/ibc/lightclients/wasm/module/v1/module.pulsar.go @@ -0,0 +1,584 @@ +// 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 + fd_Module_authority protoreflect.FieldDescriptor +) + +func init() { + file_ibc_lightclients_wasm_module_v1_module_proto_init() + md_Module = File_ibc_lightclients_wasm_module_v1_module_proto.Messages().ByName("Module") + fd_Module_authority = md_Module.Fields().ByName("authority") +} + +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_ibc_lightclients_wasm_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) { + if x.Authority != "" { + value := protoreflect.ValueOfString(x.Authority) + if !f(fd_Module_authority, value) { + return + } + } +} + +// 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() { + case "ibc.lightclients.wasm.module.v1.Module.authority": + return x.Authority != "" + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: ibc.lightclients.wasm.module.v1.Module")) + } + panic(fmt.Errorf("message ibc.lightclients.wasm.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() { + case "ibc.lightclients.wasm.module.v1.Module.authority": + x.Authority = "" + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: ibc.lightclients.wasm.module.v1.Module")) + } + panic(fmt.Errorf("message ibc.lightclients.wasm.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() { + case "ibc.lightclients.wasm.module.v1.Module.authority": + value := x.Authority + return protoreflect.ValueOfString(value) + default: + if descriptor.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: ibc.lightclients.wasm.module.v1.Module")) + } + panic(fmt.Errorf("message ibc.lightclients.wasm.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() { + case "ibc.lightclients.wasm.module.v1.Module.authority": + x.Authority = value.Interface().(string) + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: ibc.lightclients.wasm.module.v1.Module")) + } + panic(fmt.Errorf("message ibc.lightclients.wasm.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() { + case "ibc.lightclients.wasm.module.v1.Module.authority": + panic(fmt.Errorf("field authority of message ibc.lightclients.wasm.module.v1.Module is not mutable")) + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: ibc.lightclients.wasm.module.v1.Module")) + } + panic(fmt.Errorf("message ibc.lightclients.wasm.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() { + case "ibc.lightclients.wasm.module.v1.Module.authority": + return protoreflect.ValueOfString("") + default: + if fd.IsExtension() { + panic(fmt.Errorf("proto3 declared messages do not support extensions: ibc.lightclients.wasm.module.v1.Module")) + } + panic(fmt.Errorf("message ibc.lightclients.wasm.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 ibc.lightclients.wasm.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 + l = len(x.Authority) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(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 len(x.Authority) > 0 { + i -= len(x.Authority) + copy(dAtA[i:], x.Authority) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.Authority))) + i-- + dAtA[i] = 0xa + } + 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 { + case 1: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field Authority", wireType) + } + var stringLen 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++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, runtime.ErrInvalidLength + } + if postIndex > l { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, io.ErrUnexpectedEOF + } + x.Authority = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + 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: ibc/lightclients/wasm/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 08-wasm module. +type Module struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + // authority defines the custom module authority. If not set, defaults to the governance module. + Authority string `protobuf:"bytes,1,opt,name=authority,proto3" json:"authority,omitempty"` +} + +func (x *Module) Reset() { + *x = Module{} + if protoimpl.UnsafeEnabled { + mi := &file_ibc_lightclients_wasm_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_ibc_lightclients_wasm_module_v1_module_proto_rawDescGZIP(), []int{0} +} + +func (x *Module) GetAuthority() string { + if x != nil { + return x.Authority + } + return "" +} + +var File_ibc_lightclients_wasm_module_v1_module_proto protoreflect.FileDescriptor + +var file_ibc_lightclients_wasm_module_v1_module_proto_rawDesc = []byte{ + 0x0a, 0x2c, 0x69, 0x62, 0x63, 0x2f, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x63, 0x6c, 0x69, 0x65, 0x6e, + 0x74, 0x73, 0x2f, 0x77, 0x61, 0x73, 0x6d, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, + 0x31, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x1f, + 0x69, 0x62, 0x63, 0x2e, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, + 0x2e, 0x77, 0x61, 0x73, 0x6d, 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, 0x66, 0x0a, 0x06, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x61, + 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x3a, 0x3e, 0xba, 0xc0, 0x96, 0xda, 0x01, + 0x38, 0x0a, 0x36, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, + 0x73, 0x6d, 0x6f, 0x73, 0x2f, 0x69, 0x62, 0x63, 0x2d, 0x67, 0x6f, 0x2f, 0x6d, 0x6f, 0x64, 0x75, + 0x6c, 0x65, 0x73, 0x2f, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x2d, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, + 0x73, 0x2f, 0x30, 0x38, 0x2d, 0x77, 0x61, 0x73, 0x6d, 0x42, 0x9a, 0x02, 0x0a, 0x23, 0x63, 0x6f, + 0x6d, 0x2e, 0x69, 0x62, 0x63, 0x2e, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x63, 0x6c, 0x69, 0x65, 0x6e, + 0x74, 0x73, 0x2e, 0x77, 0x61, 0x73, 0x6d, 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, 0x45, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2f, 0x69, 0x62, 0x63, 0x2d, 0x67, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x69, + 0x62, 0x63, 0x2f, 0x6c, 0x69, 0x67, 0x68, 0x74, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x73, 0x2f, + 0x77, 0x61, 0x73, 0x6d, 0x2f, 0x6d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, 0x6d, + 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x04, 0x49, 0x4c, 0x57, 0x4d, 0xaa, 0x02, + 0x1f, 0x49, 0x62, 0x63, 0x2e, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, + 0x73, 0x2e, 0x57, 0x61, 0x73, 0x6d, 0x2e, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x2e, 0x56, 0x31, + 0xca, 0x02, 0x1f, 0x49, 0x62, 0x63, 0x5c, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x63, 0x6c, 0x69, 0x65, + 0x6e, 0x74, 0x73, 0x5c, 0x57, 0x61, 0x73, 0x6d, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, 0x65, 0x5c, + 0x56, 0x31, 0xe2, 0x02, 0x2b, 0x49, 0x62, 0x63, 0x5c, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x63, 0x6c, + 0x69, 0x65, 0x6e, 0x74, 0x73, 0x5c, 0x57, 0x61, 0x73, 0x6d, 0x5c, 0x4d, 0x6f, 0x64, 0x75, 0x6c, + 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0xea, 0x02, 0x23, 0x49, 0x62, 0x63, 0x3a, 0x3a, 0x4c, 0x69, 0x67, 0x68, 0x74, 0x63, 0x6c, 0x69, + 0x65, 0x6e, 0x74, 0x73, 0x3a, 0x3a, 0x57, 0x61, 0x73, 0x6d, 0x3a, 0x3a, 0x4d, 0x6f, 0x64, 0x75, + 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_ibc_lightclients_wasm_module_v1_module_proto_rawDescOnce sync.Once + file_ibc_lightclients_wasm_module_v1_module_proto_rawDescData = file_ibc_lightclients_wasm_module_v1_module_proto_rawDesc +) + +func file_ibc_lightclients_wasm_module_v1_module_proto_rawDescGZIP() []byte { + file_ibc_lightclients_wasm_module_v1_module_proto_rawDescOnce.Do(func() { + file_ibc_lightclients_wasm_module_v1_module_proto_rawDescData = protoimpl.X.CompressGZIP(file_ibc_lightclients_wasm_module_v1_module_proto_rawDescData) + }) + return file_ibc_lightclients_wasm_module_v1_module_proto_rawDescData +} + +var file_ibc_lightclients_wasm_module_v1_module_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_ibc_lightclients_wasm_module_v1_module_proto_goTypes = []interface{}{ + (*Module)(nil), // 0: ibc.lightclients.wasm.module.v1.Module +} +var file_ibc_lightclients_wasm_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_ibc_lightclients_wasm_module_v1_module_proto_init() } +func file_ibc_lightclients_wasm_module_v1_module_proto_init() { + if File_ibc_lightclients_wasm_module_v1_module_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_ibc_lightclients_wasm_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_ibc_lightclients_wasm_module_v1_module_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_ibc_lightclients_wasm_module_v1_module_proto_goTypes, + DependencyIndexes: file_ibc_lightclients_wasm_module_v1_module_proto_depIdxs, + MessageInfos: file_ibc_lightclients_wasm_module_v1_module_proto_msgTypes, + }.Build() + File_ibc_lightclients_wasm_module_v1_module_proto = out.File + file_ibc_lightclients_wasm_module_v1_module_proto_rawDesc = nil + file_ibc_lightclients_wasm_module_v1_module_proto_goTypes = nil + file_ibc_lightclients_wasm_module_v1_module_proto_depIdxs = nil +} diff --git a/modules/light-clients/08-wasm/depinject.go b/modules/light-clients/08-wasm/depinject.go new file mode 100644 index 00000000000..0f14ba8c897 --- /dev/null +++ b/modules/light-clients/08-wasm/depinject.go @@ -0,0 +1,72 @@ +package wasm + +import ( + "cosmossdk.io/core/appmodule" + "cosmossdk.io/core/store" + "cosmossdk.io/depinject" + + "github.com/cosmos/cosmos-sdk/codec" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + + modulev1 "github.com/cosmos/ibc-go/api/ibc/lightclients/wasm/module/v1" + "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/internal/ibcwasm" + wasmkeeper "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/keeper" + wasmtypes "github.com/cosmos/ibc-go/modules/light-clients/08-wasm/types" +) + +var _ depinject.OnePerModuleType = AppModule{} + +// IsOnePerModuleType implements the depinject.OnePerModuleType interface. +func (AppModule) IsOnePerModuleType() {} + +func init() { + appmodule.Register( + &modulev1.Module{}, + appmodule.Provide(ProvideModule), + ) +} + +// ModuleInputs defines the 08-wasm module inputs for depinject. +type ModuleInputs struct { + depinject.In + + Config *modulev1.Module + Cdc codec.Codec + StoreService store.KVStoreService + ClientKeeper wasmtypes.ClientKeeper + Vm ibcwasm.WasmEngine + QueryRouter ibcwasm.QueryRouter + Opts []wasmkeeper.Option +} + +// ModuleOutputs defines the 08-wasm module outputs for depinject. +type ModuleOutputs struct { + depinject.Out + + LightClientModule *LightClientModule + Module appmodule.AppModule +} + +// ProvideModule returns the 08-wasm module outputs for dependency injection +func ProvideModule(in ModuleInputs) ModuleOutputs { + // default to governance authority if not provided + authority := authtypes.NewModuleAddress(govtypes.ModuleName) + if in.Config.Authority != "" { + authority = authtypes.NewModuleAddressOrBech32Address(in.Config.Authority) + } + + keeper := wasmkeeper.NewKeeperWithVM( + in.Cdc, + in.StoreService, + in.ClientKeeper, + authority.String(), + in.Vm, + in.QueryRouter, + in.Opts..., + ) + + lightClientModule := NewLightClientModule(keeper) + m := NewAppModule(lightClientModule) + return ModuleOutputs{LightClientModule: &lightClientModule, Module: m} +} diff --git a/modules/light-clients/08-wasm/go.mod b/modules/light-clients/08-wasm/go.mod index 80989581abb..aacd45b637b 100644 --- a/modules/light-clients/08-wasm/go.mod +++ b/modules/light-clients/08-wasm/go.mod @@ -13,6 +13,7 @@ require ( cosmossdk.io/client/v2 v2.0.0-beta.1 cosmossdk.io/collections v0.4.0 cosmossdk.io/core v0.11.0 + cosmossdk.io/depinject v1.0.0-alpha.4 cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.3.1 cosmossdk.io/math v1.3.0 @@ -28,6 +29,7 @@ require ( github.com/cosmos/cosmos-db v1.0.2 github.com/cosmos/cosmos-sdk v0.50.5 github.com/cosmos/gogoproto v1.4.12 + github.com/cosmos/ibc-go/api v0.0.0-00010101000000-000000000000 github.com/cosmos/ibc-go/modules/capability v1.0.0 github.com/cosmos/ibc-go/v8 v8.0.0 github.com/golang/protobuf v1.5.4 @@ -46,7 +48,6 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.6 // indirect cloud.google.com/go/storage v1.36.0 // indirect - cosmossdk.io/depinject v1.0.0-alpha.4 // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect @@ -74,7 +75,6 @@ require ( github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v1.0.1 // indirect - github.com/cosmos/ibc-go/api v0.0.0-00010101000000-000000000000 // indirect github.com/cosmos/ics23/go v0.10.0 // indirect github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect github.com/creachadair/atomicfile v0.3.1 // indirect diff --git a/modules/light-clients/08-wasm/module.go b/modules/light-clients/08-wasm/module.go index b70a6067651..f4965b7e339 100644 --- a/modules/light-clients/08-wasm/module.go +++ b/modules/light-clients/08-wasm/module.go @@ -34,9 +34,6 @@ var ( _ appmodule.AppModule = (*AppModule)(nil) ) -// IsOnePerModuleType implements the depinject.OnePerModuleType interface. -func (AppModule) IsOnePerModuleType() {} - // IsAppModule implements the appmodule.AppModule interface. func (AppModule) IsAppModule() {} @@ -97,22 +94,22 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { // AppModule represents the AppModule for this module type AppModule struct { AppModuleBasic - keeper keeper.Keeper + lightClientModule LightClientModule } // NewAppModule creates a new 08-wasm module -func NewAppModule(k keeper.Keeper) AppModule { +func NewAppModule(l LightClientModule) AppModule { return AppModule{ - keeper: k, + lightClientModule: l, } } // RegisterServices registers module services. func (am AppModule) RegisterServices(cfg module.Configurator) { - types.RegisterMsgServer(cfg.MsgServer(), am.keeper) - types.RegisterQueryServer(cfg.QueryServer(), am.keeper) + types.RegisterMsgServer(cfg.MsgServer(), am.lightClientModule.keeper) + types.RegisterQueryServer(cfg.QueryServer(), am.lightClientModule.keeper) - wasmMigrator := keeper.NewMigrator(am.keeper) + wasmMigrator := keeper.NewMigrator(am.lightClientModule.keeper) if err := cfg.RegisterMigration(types.ModuleName, 1, wasmMigrator.MigrateChecksums); err != nil { panic(fmt.Errorf("failed to migrate 08-wasm module from version 1 to 2 (checksums migration to collections): %v", err)) } @@ -132,13 +129,13 @@ func (am AppModule) InitGenesis(ctx sdk.Context, cdc codec.JSONCodec, bz json.Ra if err != nil { panic(fmt.Errorf("failed to unmarshal %s genesis state: %s", am.Name(), err)) } - err = am.keeper.InitGenesis(ctx, gs) + err = am.lightClientModule.keeper.InitGenesis(ctx, gs) if err != nil { panic(err) } } func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.RawMessage { - gs := am.keeper.ExportGenesis(ctx) + gs := am.lightClientModule.keeper.ExportGenesis(ctx) return cdc.MustMarshalJSON(&gs) } diff --git a/modules/light-clients/08-wasm/testing/simapp/app.go b/modules/light-clients/08-wasm/testing/simapp/app.go index 9b95dc649bd..5a47de6f110 100644 --- a/modules/light-clients/08-wasm/testing/simapp/app.go +++ b/modules/light-clients/08-wasm/testing/simapp/app.go @@ -662,7 +662,7 @@ func NewSimApp( mockModule, // IBC light clients - wasm.NewAppModule(app.WasmClientKeeper), // TODO(damian): see if we want to pass the lightclient module here, keeper is used in AppModule.RegisterServices etc + wasm.NewAppModule(wasmLightClientModule), // TODO(damian): see if we want to pass the lightclient module here, keeper is used in AppModule.RegisterServices etc ibctm.NewAppModule(tmLightClientModule), solomachine.NewAppModule(smLightClientModule), ) diff --git a/proto/ibc/lightclients/wasm/module/v1/module.proto b/proto/ibc/lightclients/wasm/module/v1/module.proto new file mode 100644 index 00000000000..7d614d24f7d --- /dev/null +++ b/proto/ibc/lightclients/wasm/module/v1/module.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; + +package ibc.lightclients.wasm.module.v1; + +import "cosmos/app/v1alpha1/module.proto"; + +// Module is the config object of the 08-wasm module. +message Module { + option (cosmos.app.v1alpha1.module) = { + go_import: "github.com/cosmos/ibc-go/modules/light-clients/08-wasm" + }; + + // authority defines the custom module authority. If not set, defaults to the governance module. + string authority = 1; +} \ No newline at end of file From 50eb53f118cbc141babc6f34ab8c183c95d435d3 Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Tue, 23 Apr 2024 14:50:18 +0300 Subject: [PATCH 2/4] pass in optional arguments and construct keeper as needed. --- modules/light-clients/08-wasm/depinject.go | 29 +++++++++++++--------- 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/modules/light-clients/08-wasm/depinject.go b/modules/light-clients/08-wasm/depinject.go index 0f14ba8c897..23f4eaf9717 100644 --- a/modules/light-clients/08-wasm/depinject.go +++ b/modules/light-clients/08-wasm/depinject.go @@ -35,9 +35,12 @@ type ModuleInputs struct { Cdc codec.Codec StoreService store.KVStoreService ClientKeeper wasmtypes.ClientKeeper - Vm ibcwasm.WasmEngine - QueryRouter ibcwasm.QueryRouter - Opts []wasmkeeper.Option + + QueryRouter ibcwasm.QueryRouter + Opts []wasmkeeper.Option + + VM ibcwasm.WasmEngine `optional:"true"` + VMConfig wasmtypes.WasmConfig `optional:"true"` } // ModuleOutputs defines the 08-wasm module outputs for depinject. @@ -56,15 +59,17 @@ func ProvideModule(in ModuleInputs) ModuleOutputs { authority = authtypes.NewModuleAddressOrBech32Address(in.Config.Authority) } - keeper := wasmkeeper.NewKeeperWithVM( - in.Cdc, - in.StoreService, - in.ClientKeeper, - authority.String(), - in.Vm, - in.QueryRouter, - in.Opts..., - ) + var keeper wasmkeeper.Keeper + if in.VM != nil { + keeper = wasmkeeper.NewKeeperWithVM( + in.Cdc, in.StoreService, in.ClientKeeper, authority.String(), in.VM, in.QueryRouter, in.Opts..., + ) + } else { + // TODO(jim): Check that config is non-nil and panic? + keeper = wasmkeeper.NewKeeperWithConfig( + in.Cdc, in.StoreService, in.ClientKeeper, authority.String(), in.VMConfig, in.QueryRouter, in.Opts..., + ) + } lightClientModule := NewLightClientModule(keeper) m := NewAppModule(lightClientModule) From 60135141085bbd477a022ad2fc93b8ead0b698b5 Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Tue, 23 Apr 2024 14:52:25 +0300 Subject: [PATCH 3/4] remove pending TODOs --- modules/light-clients/08-wasm/depinject.go | 3 +-- modules/light-clients/08-wasm/testing/simapp/app.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/light-clients/08-wasm/depinject.go b/modules/light-clients/08-wasm/depinject.go index 23f4eaf9717..3706ce45401 100644 --- a/modules/light-clients/08-wasm/depinject.go +++ b/modules/light-clients/08-wasm/depinject.go @@ -4,7 +4,6 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/core/store" "cosmossdk.io/depinject" - "github.com/cosmos/cosmos-sdk/codec" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" @@ -65,7 +64,7 @@ func ProvideModule(in ModuleInputs) ModuleOutputs { in.Cdc, in.StoreService, in.ClientKeeper, authority.String(), in.VM, in.QueryRouter, in.Opts..., ) } else { - // TODO(jim): Check that config is non-nil and panic? + // TODO(jim): If missing, its default value is used. This could very well be surprising and cause misconfiguration keeper = wasmkeeper.NewKeeperWithConfig( in.Cdc, in.StoreService, in.ClientKeeper, authority.String(), in.VMConfig, in.QueryRouter, in.Opts..., ) diff --git a/modules/light-clients/08-wasm/testing/simapp/app.go b/modules/light-clients/08-wasm/testing/simapp/app.go index 5a47de6f110..1efb693c8b8 100644 --- a/modules/light-clients/08-wasm/testing/simapp/app.go +++ b/modules/light-clients/08-wasm/testing/simapp/app.go @@ -662,7 +662,7 @@ func NewSimApp( mockModule, // IBC light clients - wasm.NewAppModule(wasmLightClientModule), // TODO(damian): see if we want to pass the lightclient module here, keeper is used in AppModule.RegisterServices etc + wasm.NewAppModule(wasmLightClientModule), ibctm.NewAppModule(tmLightClientModule), solomachine.NewAppModule(smLightClientModule), ) From d82918d385279cafa47d09a646f095cbc8ee0ff3 Mon Sep 17 00:00:00 2001 From: DimitrisJim Date: Tue, 23 Apr 2024 15:16:53 +0300 Subject: [PATCH 4/4] lint: as always --- modules/light-clients/08-wasm/depinject.go | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/light-clients/08-wasm/depinject.go b/modules/light-clients/08-wasm/depinject.go index 3706ce45401..33ec769dec1 100644 --- a/modules/light-clients/08-wasm/depinject.go +++ b/modules/light-clients/08-wasm/depinject.go @@ -4,6 +4,7 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/core/store" "cosmossdk.io/depinject" + "github.com/cosmos/cosmos-sdk/codec" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"