From 42cd7d1b00b8c4f689ba3d7c88b99ea867e00aa4 Mon Sep 17 00:00:00 2001 From: Sean King Date: Thu, 22 Jul 2021 19:16:10 +0200 Subject: [PATCH] refactor: updating IdentifiedPacketFee --- docs/ibc/proto-docs.md | 5 +- modules/apps/29-fee/types/fee.pb.go | 254 +++++++++++++++--- modules/apps/29-fee/types/genesis.pb.go | 40 ++- .../applications/middleware/fee/v1/fee.proto | 7 +- .../middleware/fee/v1/genesis.proto | 1 + 5 files changed, 246 insertions(+), 61 deletions(-) diff --git a/docs/ibc/proto-docs.md b/docs/ibc/proto-docs.md index 8cddb6e94f9..4ab514dd7e1 100644 --- a/docs/ibc/proto-docs.md +++ b/docs/ibc/proto-docs.md @@ -642,7 +642,10 @@ Fee associated with a packet_id | Field | Type | Label | Description | | ----- | ---- | ----- | ----------- | | `packet_id` | [ibc.core.channel.v1.PacketId](#ibc.core.channel.v1.PacketId) | | | -| `fee` | [Fee](#ibc.applications.middleware.fee.v1.Fee) | | | +| `receive_fee` | [Fee](#ibc.applications.middleware.fee.v1.Fee) | | | +| `ack_fee` | [Fee](#ibc.applications.middleware.fee.v1.Fee) | | | +| `timeout_fee` | [Fee](#ibc.applications.middleware.fee.v1.Fee) | | | +| `relayers` | [string](#string) | repeated | | diff --git a/modules/apps/29-fee/types/fee.pb.go b/modules/apps/29-fee/types/fee.pb.go index 36f386fbcd4..437ad490373 100644 --- a/modules/apps/29-fee/types/fee.pb.go +++ b/modules/apps/29-fee/types/fee.pb.go @@ -75,8 +75,11 @@ func (m *Fee) GetAmount() github_com_cosmos_cosmos_sdk_types.Coins { // Fee associated with a packet_id type IdentifiedPacketFee struct { - PacketId *types1.PacketId `protobuf:"bytes,1,opt,name=packet_id,json=packetId,proto3" json:"packet_id,omitempty" yaml:"packet_id"` - Fee *Fee `protobuf:"bytes,2,opt,name=fee,proto3" json:"fee,omitempty"` + PacketId *types1.PacketId `protobuf:"bytes,1,opt,name=packet_id,json=packetId,proto3" json:"packet_id,omitempty" yaml:"packet_id"` + ReceiveFee *Fee `protobuf:"bytes,2,opt,name=receive_fee,json=receiveFee,proto3" json:"receive_fee,omitempty" yaml:"receive_fee"` + AckFee *Fee `protobuf:"bytes,3,opt,name=ack_fee,json=ackFee,proto3" json:"ack_fee,omitempty" yaml:"ack_fee"` + TimeoutFee *Fee `protobuf:"bytes,4,opt,name=timeout_fee,json=timeoutFee,proto3" json:"timeout_fee,omitempty" yaml:"timeout_fee"` + Relayers []string `protobuf:"bytes,5,rep,name=relayers,proto3" json:"relayers,omitempty"` } func (m *IdentifiedPacketFee) Reset() { *m = IdentifiedPacketFee{} } @@ -119,9 +122,30 @@ func (m *IdentifiedPacketFee) GetPacketId() *types1.PacketId { return nil } -func (m *IdentifiedPacketFee) GetFee() *Fee { +func (m *IdentifiedPacketFee) GetReceiveFee() *Fee { if m != nil { - return m.Fee + return m.ReceiveFee + } + return nil +} + +func (m *IdentifiedPacketFee) GetAckFee() *Fee { + if m != nil { + return m.AckFee + } + return nil +} + +func (m *IdentifiedPacketFee) GetTimeoutFee() *Fee { + if m != nil { + return m.TimeoutFee + } + return nil +} + +func (m *IdentifiedPacketFee) GetRelayers() []string { + if m != nil { + return m.Relayers } return nil } @@ -136,31 +160,36 @@ func init() { } var fileDescriptor_9a4c0273395d2c1a = []byte{ - // 372 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x51, 0xbd, 0x6e, 0xea, 0x30, - 0x14, 0x4e, 0x2e, 0x12, 0xba, 0x37, 0x2c, 0x57, 0x5c, 0x06, 0x2e, 0x52, 0x03, 0xcd, 0x52, 0x86, - 0x62, 0x37, 0xe9, 0x44, 0x47, 0x2a, 0x21, 0x21, 0x75, 0x40, 0x8c, 0x5d, 0x2a, 0xc7, 0x3e, 0x04, - 0x97, 0x24, 0x27, 0xc2, 0x86, 0x8a, 0xb7, 0xe8, 0x33, 0x74, 0xec, 0x93, 0x30, 0x32, 0x76, 0xa2, - 0x15, 0xbc, 0x41, 0x9f, 0xa0, 0x72, 0x92, 0xfe, 0x48, 0x1d, 0x3a, 0x9d, 0x63, 0xfb, 0xfb, 0xce, - 0xf7, 0xf9, 0x3b, 0xce, 0xa9, 0x0c, 0x39, 0x65, 0x59, 0x16, 0x4b, 0xce, 0xb4, 0xc4, 0x54, 0xd1, - 0x44, 0x0a, 0x11, 0xc3, 0x1d, 0x5b, 0x00, 0x9d, 0x02, 0xd0, 0x95, 0x6f, 0x0a, 0xc9, 0x16, 0xa8, - 0xb1, 0xee, 0xc9, 0x90, 0x93, 0xaf, 0x68, 0xf2, 0x89, 0x26, 0x06, 0xb6, 0xf2, 0x5b, 0x2e, 0x47, - 0x95, 0xa0, 0xa2, 0x21, 0x53, 0x86, 0x1d, 0x82, 0x66, 0x3e, 0xe5, 0x28, 0xd3, 0x62, 0x46, 0xab, - 0x11, 0x61, 0x84, 0x79, 0x4b, 0x4d, 0x57, 0xde, 0x1e, 0x1b, 0x1f, 0x1c, 0x17, 0x40, 0xf9, 0x8c, - 0xa5, 0x29, 0xc4, 0x46, 0xb8, 0x6c, 0x0b, 0x88, 0x77, 0xeb, 0x54, 0x86, 0x00, 0x75, 0xee, 0x54, - 0x59, 0x82, 0xcb, 0x54, 0x37, 0xed, 0x4e, 0xa5, 0x5b, 0x0b, 0xfe, 0x93, 0x42, 0x90, 0x18, 0x41, - 0x52, 0x0a, 0x92, 0x4b, 0x94, 0xe9, 0xe0, 0x6c, 0xb3, 0x6b, 0x5b, 0x8f, 0xcf, 0xed, 0x6e, 0x24, - 0xf5, 0x6c, 0x19, 0x12, 0x8e, 0x09, 0x2d, 0xdd, 0x15, 0xa5, 0xa7, 0xc4, 0x9c, 0xea, 0x75, 0x06, - 0x2a, 0x27, 0xa8, 0x49, 0x39, 0xda, 0x7b, 0xb0, 0x9d, 0x7f, 0x23, 0x01, 0xa9, 0x96, 0x53, 0x09, - 0x62, 0xcc, 0xf8, 0x1c, 0xb4, 0x11, 0x1f, 0x3b, 0x7f, 0xb2, 0xfc, 0x70, 0x23, 0x45, 0xd3, 0xee, - 0xd8, 0xdd, 0x5a, 0x70, 0x44, 0x4c, 0x28, 0xc6, 0x3a, 0x79, 0xf7, 0xbb, 0xf2, 0x49, 0x41, 0x19, - 0x89, 0x41, 0xe3, 0x75, 0xd7, 0xfe, 0xbb, 0x66, 0x49, 0x7c, 0xe1, 0x7d, 0x30, 0xbd, 0xc9, 0xef, - 0xac, 0x7c, 0xaf, 0xf7, 0x9d, 0xca, 0x14, 0xa0, 0xf9, 0x2b, 0x9f, 0x75, 0x42, 0x7e, 0x0e, 0x98, - 0x0c, 0x01, 0x26, 0x86, 0x33, 0xb8, 0xda, 0xec, 0x5d, 0x7b, 0xbb, 0x77, 0xed, 0x97, 0xbd, 0x6b, - 0xdf, 0x1f, 0x5c, 0x6b, 0x7b, 0x70, 0xad, 0xa7, 0x83, 0x6b, 0x5d, 0x07, 0xdf, 0x3f, 0x2c, 0x43, - 0xde, 0x8b, 0x90, 0x26, 0x28, 0x96, 0x31, 0x28, 0xb3, 0x72, 0x45, 0x83, 0x7e, 0xcf, 0xac, 0x38, - 0x0f, 0x20, 0xac, 0xe6, 0x29, 0x9f, 0xbf, 0x05, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xbd, 0x34, 0xb3, - 0x12, 0x02, 0x00, 0x00, + // 456 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x92, 0x41, 0x8e, 0xd3, 0x30, + 0x14, 0x86, 0x1b, 0x02, 0x65, 0xc6, 0x95, 0x10, 0x0a, 0x23, 0x54, 0x2a, 0x91, 0x14, 0x6f, 0xe8, + 0x82, 0xda, 0xb4, 0xac, 0x60, 0x59, 0xa4, 0x91, 0x46, 0x62, 0x31, 0x8a, 0x58, 0xb1, 0x99, 0x71, + 0xec, 0xd7, 0x8e, 0x69, 0x12, 0x47, 0xb1, 0x5b, 0xd4, 0x5b, 0x70, 0x01, 0x2e, 0xc0, 0x49, 0x66, + 0x39, 0x4b, 0x56, 0x01, 0xb5, 0x37, 0xe8, 0x09, 0x90, 0x1d, 0x33, 0x54, 0x62, 0x81, 0x60, 0xe5, + 0xf7, 0x92, 0xf7, 0x7f, 0xff, 0x2f, 0xfb, 0xa1, 0x17, 0x32, 0xe3, 0x94, 0x55, 0x55, 0x2e, 0x39, + 0x33, 0x52, 0x95, 0x9a, 0x16, 0x52, 0x88, 0x1c, 0x3e, 0xb1, 0x1a, 0xe8, 0x1c, 0x80, 0xae, 0x27, + 0xf6, 0x20, 0x55, 0xad, 0x8c, 0x8a, 0xb0, 0xcc, 0x38, 0x39, 0x9c, 0x26, 0xbf, 0xa7, 0x89, 0x1d, + 0x5b, 0x4f, 0x06, 0x31, 0x57, 0xba, 0x50, 0x9a, 0x66, 0x4c, 0x5b, 0x75, 0x06, 0x86, 0x4d, 0x28, + 0x57, 0xb2, 0x6c, 0x19, 0x83, 0x93, 0x85, 0x5a, 0x28, 0x57, 0x52, 0x5b, 0xf9, 0xaf, 0xcf, 0x6c, + 0x0e, 0xae, 0x6a, 0xa0, 0xfc, 0x8a, 0x95, 0x25, 0xe4, 0xd6, 0xd8, 0x97, 0xed, 0x08, 0xfe, 0x88, + 0xc2, 0x53, 0x80, 0x88, 0xa3, 0x2e, 0x2b, 0xd4, 0xaa, 0x34, 0xfd, 0x60, 0x18, 0x8e, 0x7a, 0xd3, + 0x27, 0xa4, 0x35, 0x24, 0xd6, 0x90, 0x78, 0x43, 0xf2, 0x56, 0xc9, 0x72, 0xf6, 0xf2, 0xba, 0x49, + 0x3a, 0x5f, 0xbf, 0x27, 0xa3, 0x85, 0x34, 0x57, 0xab, 0x8c, 0x70, 0x55, 0x50, 0x9f, 0xae, 0x3d, + 0xc6, 0x5a, 0x2c, 0xa9, 0xd9, 0x54, 0xa0, 0x9d, 0x40, 0xa7, 0x1e, 0x8d, 0xbf, 0x84, 0xe8, 0xd1, + 0x99, 0x80, 0xd2, 0xc8, 0xb9, 0x04, 0x71, 0xce, 0xf8, 0x12, 0x8c, 0x35, 0x3f, 0x47, 0xc7, 0x95, + 0x6b, 0x2e, 0xa4, 0xe8, 0x07, 0xc3, 0x60, 0xd4, 0x9b, 0x3e, 0x25, 0xf6, 0x52, 0x6c, 0x74, 0xf2, + 0x2b, 0xef, 0x7a, 0x42, 0x5a, 0xc9, 0x99, 0x98, 0x9d, 0xec, 0x9b, 0xe4, 0xe1, 0x86, 0x15, 0xf9, + 0x1b, 0x7c, 0xab, 0xc4, 0xe9, 0x51, 0xe5, 0xff, 0x47, 0x97, 0xa8, 0x57, 0x03, 0x07, 0xb9, 0x86, + 0x8b, 0x39, 0x40, 0xff, 0x8e, 0x63, 0x3e, 0x27, 0x7f, 0xbf, 0x68, 0x72, 0x0a, 0x30, 0x7b, 0xbc, + 0x6f, 0x92, 0xa8, 0xa5, 0x1f, 0x50, 0x70, 0x8a, 0x7c, 0x67, 0x33, 0xbf, 0x47, 0xf7, 0x19, 0x5f, + 0x3a, 0x7a, 0xf8, 0x6f, 0xf4, 0x68, 0xdf, 0x24, 0x0f, 0x5a, 0xba, 0x27, 0xe0, 0xb4, 0xcb, 0xf8, + 0xd2, 0x52, 0x2f, 0x51, 0xcf, 0xc8, 0x02, 0xd4, 0xca, 0x38, 0xf2, 0xdd, 0xff, 0xce, 0x7d, 0x40, + 0xc1, 0x29, 0xf2, 0x9d, 0x75, 0x18, 0xa0, 0xa3, 0x1a, 0x72, 0xb6, 0x81, 0x5a, 0xf7, 0xef, 0x0d, + 0xc3, 0xd1, 0x71, 0x7a, 0xdb, 0xcf, 0xde, 0x5d, 0x6f, 0xe3, 0xe0, 0x66, 0x1b, 0x07, 0x3f, 0xb6, + 0x71, 0xf0, 0x79, 0x17, 0x77, 0x6e, 0x76, 0x71, 0xe7, 0xdb, 0x2e, 0xee, 0x7c, 0x98, 0xfe, 0xf9, + 0xd6, 0x32, 0xe3, 0xe3, 0x85, 0xa2, 0x85, 0x12, 0xab, 0x1c, 0xb4, 0xdd, 0x76, 0x4d, 0xa7, 0xaf, + 0xc7, 0x76, 0xbb, 0xdd, 0xdb, 0x67, 0x5d, 0xb7, 0x60, 0xaf, 0x7e, 0x06, 0x00, 0x00, 0xff, 0xff, + 0x0c, 0xf6, 0x8d, 0xd8, 0x0d, 0x03, 0x00, 0x00, } func (m *Fee) Marshal() (dAtA []byte, err error) { @@ -220,9 +249,42 @@ func (m *IdentifiedPacketFee) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.Fee != nil { + if len(m.Relayers) > 0 { + for iNdEx := len(m.Relayers) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.Relayers[iNdEx]) + copy(dAtA[i:], m.Relayers[iNdEx]) + i = encodeVarintFee(dAtA, i, uint64(len(m.Relayers[iNdEx]))) + i-- + dAtA[i] = 0x2a + } + } + if m.TimeoutFee != nil { + { + size, err := m.TimeoutFee.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintFee(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x22 + } + if m.AckFee != nil { + { + size, err := m.AckFee.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintFee(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1a + } + if m.ReceiveFee != nil { { - size, err := m.Fee.MarshalToSizedBuffer(dAtA[:i]) + size, err := m.ReceiveFee.MarshalToSizedBuffer(dAtA[:i]) if err != nil { return 0, err } @@ -283,10 +345,24 @@ func (m *IdentifiedPacketFee) Size() (n int) { l = m.PacketId.Size() n += 1 + l + sovFee(uint64(l)) } - if m.Fee != nil { - l = m.Fee.Size() + if m.ReceiveFee != nil { + l = m.ReceiveFee.Size() + n += 1 + l + sovFee(uint64(l)) + } + if m.AckFee != nil { + l = m.AckFee.Size() n += 1 + l + sovFee(uint64(l)) } + if m.TimeoutFee != nil { + l = m.TimeoutFee.Size() + n += 1 + l + sovFee(uint64(l)) + } + if len(m.Relayers) > 0 { + for _, s := range m.Relayers { + l = len(s) + n += 1 + l + sovFee(uint64(l)) + } + } return n } @@ -447,7 +523,79 @@ func (m *IdentifiedPacketFee) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Fee", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ReceiveFee", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFee + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthFee + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthFee + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.ReceiveFee == nil { + m.ReceiveFee = &Fee{} + } + if err := m.ReceiveFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field AckFee", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFee + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthFee + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthFee + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.AckFee == nil { + m.AckFee = &Fee{} + } + if err := m.AckFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field TimeoutFee", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -474,13 +622,45 @@ func (m *IdentifiedPacketFee) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.Fee == nil { - m.Fee = &Fee{} + if m.TimeoutFee == nil { + m.TimeoutFee = &Fee{} } - if err := m.Fee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.TimeoutFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Relayers", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFee + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthFee + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFee + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Relayers = append(m.Relayers, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipFee(dAtA[iNdEx:]) diff --git a/modules/apps/29-fee/types/genesis.pb.go b/modules/apps/29-fee/types/genesis.pb.go index a13365d1fdb..1b4dca09ab5 100644 --- a/modules/apps/29-fee/types/genesis.pb.go +++ b/modules/apps/29-fee/types/genesis.pb.go @@ -5,7 +5,6 @@ package types import ( fmt "fmt" - _ "github.com/cosmos/ibc-go/modules/core/04-channel/types" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/gogo/protobuf/proto" io "io" @@ -79,26 +78,25 @@ func init() { } var fileDescriptor_6a4f6c8d78b5dfbf = []byte{ - // 290 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x90, 0xb1, 0x4e, 0xf3, 0x30, - 0x1c, 0xc4, 0x1b, 0x7d, 0xd2, 0x37, 0xa4, 0x9d, 0x0a, 0x12, 0xa8, 0x83, 0x81, 0x4c, 0x0c, 0xd4, - 0xa6, 0x61, 0x40, 0x30, 0x76, 0x28, 0x42, 0x62, 0x40, 0xb0, 0xb1, 0x20, 0xc7, 0xb9, 0xa4, 0x16, - 0x49, 0x1c, 0xe5, 0xef, 0x16, 0x75, 0xe6, 0x05, 0x78, 0x2c, 0xc6, 0x8e, 0x4c, 0x08, 0x25, 0x6f, - 0xc0, 0x13, 0x20, 0x27, 0x95, 0xe8, 0x06, 0xdb, 0x59, 0xfe, 0xdd, 0xf9, 0xce, 0xfe, 0xa9, 0x8e, - 0x94, 0x90, 0x65, 0x99, 0x69, 0x25, 0xad, 0x36, 0x05, 0x89, 0x5c, 0xc7, 0x71, 0x86, 0x67, 0x59, - 0x41, 0x24, 0x80, 0x58, 0x4e, 0x44, 0x8a, 0x02, 0xa4, 0x89, 0x97, 0x95, 0xb1, 0x66, 0x18, 0xe8, - 0x48, 0xf1, 0x6d, 0x07, 0xff, 0x71, 0xf0, 0x04, 0xe0, 0xcb, 0xc9, 0x68, 0x37, 0x35, 0xa9, 0x69, - 0x71, 0xe1, 0x54, 0xe7, 0x1c, 0x9d, 0xfc, 0xe1, 0x2d, 0x17, 0xd0, 0xd1, 0x47, 0x8e, 0x56, 0xa6, - 0x82, 0x50, 0x73, 0x59, 0x14, 0xc8, 0xdc, 0xf5, 0x46, 0x76, 0x48, 0xf0, 0xe2, 0xf9, 0x83, 0xab, - 0xae, 0xdc, 0xbd, 0x95, 0x16, 0x43, 0xf2, 0x07, 0xa5, 0x54, 0x4f, 0xb0, 0xf4, 0x98, 0x00, 0xb4, - 0xef, 0x1d, 0xfe, 0x3b, 0xee, 0x87, 0xe7, 0xfc, 0xf7, 0xca, 0xfc, 0x3a, 0x46, 0x61, 0x75, 0xa2, - 0x11, 0xdf, 0xb6, 0x09, 0x33, 0x60, 0xba, 0xf7, 0xf5, 0x71, 0xb0, 0xb3, 0x92, 0x79, 0x76, 0x19, - 0x6c, 0xc7, 0x06, 0x77, 0xfd, 0xcd, 0x71, 0x06, 0xd0, 0xf4, 0xe6, 0xad, 0x66, 0xde, 0xba, 0x66, - 0xde, 0x67, 0xcd, 0xbc, 0xd7, 0x86, 0xf5, 0xd6, 0x0d, 0xeb, 0xbd, 0x37, 0xac, 0xf7, 0x10, 0xa6, - 0xda, 0xce, 0x17, 0x11, 0x57, 0x26, 0x17, 0xca, 0x50, 0x6e, 0x48, 0xe8, 0x48, 0x8d, 0x53, 0x23, - 0x72, 0x13, 0x2f, 0x32, 0x90, 0xfb, 0x0d, 0x12, 0xe1, 0xc5, 0xd8, 0xad, 0xb7, 0xab, 0x12, 0x14, - 0xfd, 0x6f, 0xa7, 0x9d, 0x7d, 0x07, 0x00, 0x00, 0xff, 0xff, 0x27, 0xbb, 0x9c, 0x19, 0x99, 0x01, - 0x00, 0x00, + // 273 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x8f, 0x31, 0x4b, 0xc3, 0x40, + 0x18, 0x86, 0x13, 0x04, 0x87, 0xb4, 0x53, 0x15, 0x94, 0x0e, 0xa7, 0x64, 0x72, 0xb0, 0x77, 0x36, + 0x0e, 0xa2, 0x63, 0x87, 0x8a, 0xe0, 0x20, 0xba, 0xb9, 0xc8, 0xe5, 0xf2, 0x26, 0x1e, 0x26, 0xf9, + 0x42, 0xbf, 0x6b, 0xa5, 0xb3, 0x7f, 0xc0, 0x9f, 0xe5, 0xd8, 0xd1, 0x49, 0x24, 0xf9, 0x07, 0xfe, + 0x02, 0x49, 0x2a, 0xd8, 0x4d, 0xb7, 0x3b, 0x78, 0xdf, 0xe7, 0xfd, 0x9e, 0xe0, 0xc4, 0xc6, 0x46, + 0xe9, 0xaa, 0xca, 0xad, 0xd1, 0xce, 0x52, 0xc9, 0xaa, 0xb0, 0x49, 0x92, 0xe3, 0x59, 0xcf, 0xa0, + 0x52, 0x40, 0x2d, 0xc6, 0x2a, 0x43, 0x09, 0xb6, 0x2c, 0xab, 0x19, 0x39, 0x1a, 0x84, 0x36, 0x36, + 0x72, 0xb3, 0x21, 0x7f, 0x1b, 0x32, 0x05, 0xe4, 0x62, 0x3c, 0xdc, 0xcd, 0x28, 0xa3, 0x2e, 0xae, + 0xda, 0xd7, 0xba, 0x39, 0x3c, 0xfe, 0xc7, 0x56, 0x0b, 0xe8, 0xd2, 0xe1, 0x8b, 0x1f, 0xf4, 0x2f, + 0xd7, 0xcb, 0x77, 0x4e, 0x3b, 0x0c, 0x38, 0xe8, 0x57, 0xda, 0x3c, 0xc1, 0xf1, 0x43, 0x0a, 0xf0, + 0xbe, 0x7f, 0xb8, 0x75, 0xd4, 0x8b, 0xce, 0xe4, 0xdf, 0xf7, 0xc8, 0xab, 0x04, 0xa5, 0xb3, 0xa9, + 0x45, 0x72, 0xd3, 0x11, 0xa6, 0xc0, 0x64, 0xef, 0xeb, 0xe3, 0x60, 0x67, 0xa9, 0x8b, 0xfc, 0x22, + 0xdc, 0xc4, 0x86, 0xb7, 0xbd, 0x9f, 0xef, 0x14, 0xe0, 0xc9, 0xf5, 0x5b, 0x2d, 0xfc, 0x55, 0x2d, + 0xfc, 0xcf, 0x5a, 0xf8, 0xaf, 0x8d, 0xf0, 0x56, 0x8d, 0xf0, 0xde, 0x1b, 0xe1, 0xdd, 0x47, 0x99, + 0x75, 0x8f, 0xf3, 0x58, 0x1a, 0x2a, 0x94, 0x21, 0x2e, 0x88, 0x95, 0x8d, 0xcd, 0x28, 0x23, 0x55, + 0x50, 0x32, 0xcf, 0xc1, 0xad, 0x2a, 0xab, 0xe8, 0x7c, 0xd4, 0xaa, 0xb9, 0x65, 0x05, 0x8e, 0xb7, + 0x3b, 0xb5, 0xd3, 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa8, 0x8f, 0xe8, 0x3b, 0x76, 0x01, 0x00, + 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/proto/ibc/applications/middleware/fee/v1/fee.proto b/proto/ibc/applications/middleware/fee/v1/fee.proto index 0d284c09d06..d8261baf4e5 100644 --- a/proto/ibc/applications/middleware/fee/v1/fee.proto +++ b/proto/ibc/applications/middleware/fee/v1/fee.proto @@ -16,6 +16,9 @@ message Fee { // Fee associated with a packet_id message IdentifiedPacketFee { - ibc.core.channel.v1.PacketId packet_id = 1 [(gogoproto.moretags) = "yaml:\"packet_id\""]; - Fee fee = 2; + ibc.core.channel.v1.PacketId packet_id = 1 [(gogoproto.moretags) = "yaml:\"packet_id\""]; + Fee receive_fee = 2 [(gogoproto.moretags) = "yaml:\"receive_fee\""]; + Fee ack_fee = 3 [(gogoproto.moretags) = "yaml:\"ack_fee\""]; + Fee timeout_fee = 4 [(gogoproto.moretags) = "yaml:\"timeout_fee\""]; + repeated string relayers = 5; } diff --git a/proto/ibc/applications/middleware/fee/v1/genesis.proto b/proto/ibc/applications/middleware/fee/v1/genesis.proto index 1143a0f367f..3cc4ae6f07b 100644 --- a/proto/ibc/applications/middleware/fee/v1/genesis.proto +++ b/proto/ibc/applications/middleware/fee/v1/genesis.proto @@ -1,5 +1,6 @@ syntax = "proto3"; +package ibc.applications.middleware.fee.v1; import "gogoproto/gogo.proto"; import "ibc/applications/middleware/fee/v1/fee.proto"; option go_package = "github.com/cosmos/ibc-go/modules/apps/29-fee/types";