diff --git a/proto/umee/metoken/v1/metoken.proto b/proto/umee/metoken/v1/metoken.proto index 76ed2d29fa..5339b16be6 100644 --- a/proto/umee/metoken/v1/metoken.proto +++ b/proto/umee/metoken/v1/metoken.proto @@ -148,15 +148,15 @@ message AssetPrice { (gogoproto.nullable) = false ]; - // SwapFee charged to the user on a swap, expressed in fraction. - // Valid values: 0-1. - string swap_fee = 6 [ + // RedeemRate used for exchange calculations meToken -> asset. + string redeem_rate = 6 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; - // RedeemRate used for exchange calculations meToken -> asset. - string redeem_rate = 7 [ + // SwapFee charged to the user on a swap, expressed in fraction. + // Valid values: 0-1. + string swap_fee = 7 [ (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec", (gogoproto.nullable) = false ]; diff --git a/swagger/swagger.yaml b/swagger/swagger.yaml index 7c0674d549..2bd7c1f4c9 100644 --- a/swagger/swagger.yaml +++ b/swagger/swagger.yaml @@ -4133,6 +4133,11 @@ paths: description: >- SwapRate used for exchange calculations asset -> meToken. + redeem_rate: + type: string + description: >- + RedeemRate used for exchange calculations meToken + -> asset. swap_fee: type: string description: >- @@ -4140,11 +4145,6 @@ paths: in fraction. Valid values: 0-1. - redeem_rate: - type: string - description: >- - RedeemRate used for exchange calculations meToken - -> asset. redeem_fee: type: string description: >- @@ -4253,6 +4253,11 @@ paths: description: >- SwapRate used for exchange calculations asset -> meToken. + redeem_rate: + type: string + description: >- + RedeemRate used for exchange calculations meToken + -> asset. swap_fee: type: string description: >- @@ -4260,11 +4265,6 @@ paths: in fraction. Valid values: 0-1. - redeem_rate: - type: string - description: >- - RedeemRate used for exchange calculations meToken - -> asset. redeem_fee: type: string description: >- @@ -7733,14 +7733,14 @@ definitions: swap_rate: type: string description: SwapRate used for exchange calculations asset -> meToken. + redeem_rate: + type: string + description: RedeemRate used for exchange calculations meToken -> asset. swap_fee: type: string description: |- SwapFee charged to the user on a swap, expressed in fraction. Valid values: 0-1. - redeem_rate: - type: string - description: RedeemRate used for exchange calculations meToken -> asset. redeem_fee: type: string description: |- @@ -7980,14 +7980,14 @@ definitions: swap_rate: type: string description: SwapRate used for exchange calculations asset -> meToken. + redeem_rate: + type: string + description: RedeemRate used for exchange calculations meToken -> asset. swap_fee: type: string description: |- SwapFee charged to the user on a swap, expressed in fraction. Valid values: 0-1. - redeem_rate: - type: string - description: RedeemRate used for exchange calculations meToken -> asset. redeem_fee: type: string description: >- @@ -8103,6 +8103,11 @@ definitions: swap_rate: type: string description: SwapRate used for exchange calculations asset -> meToken. + redeem_rate: + type: string + description: >- + RedeemRate used for exchange calculations meToken -> + asset. swap_fee: type: string description: >- @@ -8110,11 +8115,6 @@ definitions: fraction. Valid values: 0-1. - redeem_rate: - type: string - description: >- - RedeemRate used for exchange calculations meToken -> - asset. redeem_fee: type: string description: >- @@ -8172,6 +8172,11 @@ definitions: swap_rate: type: string description: SwapRate used for exchange calculations asset -> meToken. + redeem_rate: + type: string + description: >- + RedeemRate used for exchange calculations meToken -> + asset. swap_fee: type: string description: >- @@ -8179,11 +8184,6 @@ definitions: fraction. Valid values: 0-1. - redeem_rate: - type: string - description: >- - RedeemRate used for exchange calculations meToken -> - asset. redeem_fee: type: string description: >- diff --git a/x/metoken/metoken.pb.go b/x/metoken/metoken.pb.go index 806ec39078..1cccf000eb 100644 --- a/x/metoken/metoken.pb.go +++ b/x/metoken/metoken.pb.go @@ -350,11 +350,11 @@ type AssetPrice struct { Exponent uint32 `protobuf:"varint,4,opt,name=exponent,proto3" json:"exponent,omitempty"` // SwapRate used for exchange calculations asset -> meToken. SwapRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,5,opt,name=swap_rate,json=swapRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"swap_rate"` + // RedeemRate used for exchange calculations meToken -> asset. + RedeemRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=redeem_rate,json=redeemRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"redeem_rate"` // SwapFee charged to the user on a swap, expressed in fraction. // Valid values: 0-1. - SwapFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,6,opt,name=swap_fee,json=swapFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"swap_fee"` - // RedeemRate used for exchange calculations meToken -> asset. - RedeemRate github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,7,opt,name=redeem_rate,json=redeemRate,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"redeem_rate"` + SwapFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,7,opt,name=swap_fee,json=swapFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"swap_fee"` // RedeemFee charged to the user on a redemption, expressed in fraction. // Valid values: 0-1. RedeemFee github_com_cosmos_cosmos_sdk_types.Dec `protobuf:"bytes,8,opt,name=redeem_fee,json=redeemFee,proto3,customtype=github.com/cosmos/cosmos-sdk/types.Dec" json:"redeem_fee"` @@ -426,49 +426,49 @@ func init() { func init() { proto.RegisterFile("umee/metoken/v1/metoken.proto", fileDescriptor_dda977db8ad52437) } var fileDescriptor_dda977db8ad52437 = []byte{ - // 666 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4f, 0x4f, 0xdb, 0x4a, - 0x10, 0xc0, 0x63, 0x9c, 0x04, 0x32, 0xe1, 0xcf, 0xc3, 0x0a, 0x52, 0xc4, 0x13, 0x21, 0x8f, 0xc3, - 0x53, 0x9e, 0xf4, 0xb0, 0x05, 0x48, 0x95, 0x5a, 0xf5, 0x42, 0x1a, 0xa5, 0x42, 0x15, 0x2a, 0x75, - 0x0f, 0x95, 0xda, 0x83, 0xb5, 0x71, 0x86, 0x60, 0x25, 0xeb, 0x75, 0xbd, 0x9b, 0x60, 0xbe, 0x45, - 0x3f, 0x42, 0x3f, 0x4d, 0xc5, 0x91, 0x63, 0xd5, 0x03, 0x6a, 0xe1, 0xd2, 0x53, 0xd5, 0x73, 0x4f, - 0xd5, 0xae, 0xd7, 0x69, 0x00, 0xd1, 0x83, 0xd5, 0x53, 0x76, 0x77, 0x66, 0x7e, 0x3b, 0xbf, 0x78, - 0x2c, 0xc3, 0xc6, 0x98, 0x22, 0x3a, 0x14, 0x05, 0x1b, 0x62, 0xe8, 0x4c, 0x76, 0xb2, 0xa5, 0x1d, - 0xc5, 0x4c, 0x30, 0x6b, 0x45, 0x86, 0xed, 0xec, 0x6c, 0xb2, 0xb3, 0x5e, 0x1b, 0xb0, 0x01, 0x53, - 0x31, 0x47, 0xae, 0xd2, 0xb4, 0xad, 0x18, 0xca, 0x47, 0x24, 0x26, 0x94, 0x5b, 0x7b, 0xb0, 0x16, - 0x63, 0x8f, 0x8c, 0x48, 0xe8, 0x07, 0xe1, 0xc0, 0x3b, 0x8e, 0xf1, 0xed, 0x18, 0x43, 0xff, 0xac, - 0x6e, 0x34, 0x8d, 0x96, 0xe9, 0xd6, 0x66, 0x82, 0xdd, 0x2c, 0x66, 0x6d, 0x83, 0xe5, 0x8f, 0x48, - 0x40, 0x6f, 0x56, 0xcc, 0xa9, 0x8a, 0xd5, 0x2c, 0x32, 0x4d, 0x7f, 0x54, 0xfc, 0xfa, 0x7e, 0xd3, - 0xd8, 0xfa, 0x61, 0x40, 0xe9, 0x20, 0xec, 0x63, 0x62, 0xd5, 0xa0, 0xd4, 0xc7, 0x90, 0x51, 0x75, - 0x47, 0xc5, 0x4d, 0x37, 0xd6, 0x63, 0x00, 0x4a, 0x12, 0x8f, 0x8f, 0xa3, 0x68, 0x94, 0xc2, 0x2a, - 0xed, 0x8d, 0xf3, 0xcb, 0xcd, 0xc2, 0xa7, 0xcb, 0xcd, 0x35, 0x9f, 0x71, 0xca, 0x38, 0xef, 0x0f, - 0xed, 0x80, 0x39, 0x94, 0x88, 0x13, 0xfb, 0x20, 0x14, 0x6e, 0x85, 0x92, 0xe4, 0xa5, 0xca, 0xb7, - 0xd6, 0x61, 0x01, 0x93, 0x88, 0x85, 0x18, 0x8a, 0xba, 0xd9, 0x34, 0x5a, 0x4b, 0xee, 0x74, 0x6f, - 0xfd, 0x0f, 0xe6, 0x31, 0x62, 0xbd, 0xd8, 0x34, 0x5a, 0xd5, 0xdd, 0x9a, 0x7d, 0xeb, 0x2f, 0xb2, - 0xbb, 0x88, 0xed, 0xa2, 0xbc, 0xc8, 0x95, 0x69, 0xd6, 0x21, 0xac, 0x10, 0xdf, 0xc7, 0x48, 0x60, - 0xdf, 0x23, 0x9c, 0xa3, 0xe0, 0xf5, 0x52, 0xd3, 0x6c, 0x55, 0x77, 0x1b, 0x77, 0x2a, 0xf7, 0x75, - 0xde, 0xbe, 0x4c, 0xd3, 0x8c, 0x65, 0x32, 0x7b, 0xc8, 0xb5, 0xfc, 0x77, 0x03, 0xcc, 0x2e, 0xa2, - 0xf5, 0x14, 0xe6, 0x69, 0x10, 0x7a, 0xb2, 0x1d, 0x25, 0xdf, 0xb6, 0xb5, 0xe1, 0xbf, 0x83, 0x40, - 0x9c, 0x8c, 0x7b, 0xb6, 0xcf, 0xa8, 0x93, 0xca, 0xea, 0x9f, 0x6d, 0xde, 0x1f, 0x3a, 0xe2, 0x2c, - 0x42, 0x6e, 0x77, 0xd0, 0x77, 0xcb, 0x34, 0x08, 0x25, 0xe8, 0x05, 0x2c, 0xa6, 0x0f, 0x06, 0xfb, - 0x8a, 0x36, 0x97, 0x8b, 0x56, 0xcd, 0x18, 0x59, 0x6f, 0x24, 0x51, 0x34, 0x33, 0x67, 0x6f, 0x24, - 0xe9, 0x22, 0x6a, 0xe5, 0x2f, 0x06, 0x2c, 0xdd, 0xf8, 0x83, 0xee, 0x79, 0xee, 0xaf, 0x60, 0x25, - 0x46, 0x8e, 0xf1, 0x04, 0xbd, 0x88, 0xc5, 0x22, 0x60, 0x61, 0x4e, 0x99, 0x65, 0x8d, 0x39, 0x4a, - 0x29, 0xd6, 0x1b, 0x58, 0x15, 0x24, 0x1e, 0xa0, 0xf0, 0xc8, 0x68, 0xc4, 0x7c, 0xa2, 0xd0, 0xf9, - 0xcc, 0xfe, 0x4a, 0x41, 0xfb, 0x53, 0x8e, 0x76, 0xfc, 0x60, 0x40, 0x55, 0xcd, 0xf4, 0x51, 0x1c, - 0xf8, 0xc8, 0xef, 0x31, 0xec, 0x40, 0x29, 0x92, 0xf1, 0x9c, 0x5e, 0x69, 0xf1, 0x6f, 0x27, 0xfc, - 0x21, 0x94, 0xf5, 0xa8, 0x16, 0xd5, 0xa8, 0xfe, 0x7d, 0x77, 0x54, 0x65, 0x58, 0x75, 0xa9, 0xe7, - 0x54, 0x17, 0x68, 0x91, 0x6f, 0x26, 0xc0, 0xaf, 0x14, 0x6b, 0x03, 0xa0, 0x47, 0x38, 0x7a, 0xb3, - 0x32, 0x15, 0x79, 0xd2, 0x51, 0x42, 0xff, 0xc0, 0x22, 0x3f, 0xa3, 0x3d, 0x36, 0xd2, 0x09, 0xca, - 0xcb, 0xad, 0xa6, 0x67, 0x9d, 0x9b, 0xce, 0xe6, 0x9f, 0x72, 0x2e, 0xde, 0x72, 0x7e, 0x06, 0x15, - 0x7e, 0x4a, 0x22, 0x2f, 0x26, 0x02, 0xeb, 0xa5, 0x5c, 0xb7, 0x2c, 0x48, 0x80, 0x4b, 0x04, 0x5a, - 0x07, 0xa0, 0xd6, 0x6a, 0xf8, 0xcb, 0xb9, 0x58, 0xf3, 0xb2, 0x5e, 0xbe, 0x46, 0xcf, 0xa1, 0x1a, - 0x63, 0x1f, 0x91, 0xa6, 0x9d, 0xcd, 0xe7, 0xa2, 0x41, 0x8a, 0x50, 0xbd, 0x1d, 0x82, 0xde, 0xa9, - 0xee, 0x16, 0x72, 0xf1, 0x2a, 0x29, 0x61, 0xfa, 0x76, 0xb6, 0x9f, 0x9c, 0x5f, 0x35, 0x8c, 0x8b, - 0xab, 0x86, 0xf1, 0xf9, 0xaa, 0x61, 0xbc, 0xbb, 0x6e, 0x14, 0x2e, 0xae, 0x1b, 0x85, 0x8f, 0xd7, - 0x8d, 0xc2, 0xeb, 0xff, 0x66, 0x90, 0x72, 0x8a, 0xb6, 0x43, 0x14, 0xa7, 0x2c, 0x1e, 0xaa, 0x8d, - 0x33, 0x79, 0xe0, 0x24, 0xd9, 0x37, 0xa7, 0x57, 0x56, 0x5f, 0x93, 0xbd, 0x9f, 0x01, 0x00, 0x00, - 0xff, 0xff, 0x14, 0x9b, 0x81, 0x90, 0x95, 0x06, 0x00, 0x00, + // 663 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x95, 0x4f, 0x6f, 0xd3, 0x4a, + 0x10, 0xc0, 0xe3, 0x3a, 0x49, 0x9b, 0x49, 0xff, 0xbc, 0x5a, 0xa9, 0x14, 0xf5, 0xa9, 0x6e, 0x5e, + 0x0f, 0x4f, 0x41, 0xa2, 0xb6, 0xda, 0x4a, 0x48, 0x20, 0x2e, 0x0d, 0x51, 0x50, 0x85, 0x10, 0xc5, + 0x1c, 0x90, 0xe0, 0x60, 0x6d, 0xec, 0x69, 0x6a, 0x25, 0xeb, 0x35, 0xde, 0x4d, 0xea, 0x7e, 0x0b, + 0x3e, 0x02, 0x9f, 0x06, 0xf5, 0xd8, 0x23, 0xe2, 0x50, 0x41, 0x7b, 0xe1, 0x84, 0x38, 0x73, 0x42, + 0x5e, 0xaf, 0x43, 0xda, 0xaa, 0x1c, 0x2c, 0x4e, 0xf1, 0xee, 0xcc, 0xfc, 0x76, 0x7e, 0xf6, 0x38, + 0x86, 0x8d, 0x31, 0x45, 0xb4, 0x29, 0x0a, 0x36, 0xc4, 0xd0, 0x9e, 0xec, 0xe4, 0x97, 0x56, 0x14, + 0x33, 0xc1, 0x8c, 0x95, 0x34, 0x6c, 0xe5, 0x7b, 0x93, 0x9d, 0xf5, 0xc6, 0x80, 0x0d, 0x98, 0x8c, + 0xd9, 0xe9, 0x55, 0x96, 0xb6, 0x15, 0x43, 0xf5, 0x90, 0xc4, 0x84, 0x72, 0x63, 0x0f, 0xd6, 0x62, + 0xec, 0x93, 0x11, 0x09, 0xbd, 0x20, 0x1c, 0xb8, 0x47, 0x31, 0xbe, 0x1b, 0x63, 0xe8, 0x9d, 0x36, + 0xb5, 0x96, 0xd6, 0xd6, 0x9d, 0xc6, 0x4c, 0xb0, 0x97, 0xc7, 0x8c, 0x6d, 0x30, 0xbc, 0x11, 0x09, + 0xe8, 0xf5, 0x8a, 0x39, 0x59, 0xb1, 0x9a, 0x47, 0xa6, 0xe9, 0x8f, 0xca, 0xdf, 0x3e, 0x6c, 0x6a, + 0x5b, 0x3f, 0x35, 0xa8, 0x1c, 0x84, 0x3e, 0x26, 0x46, 0x03, 0x2a, 0x3e, 0x86, 0x8c, 0xca, 0x33, + 0x6a, 0x4e, 0xb6, 0x30, 0x1e, 0x03, 0x50, 0x92, 0xb8, 0x7c, 0x1c, 0x45, 0xa3, 0x0c, 0x56, 0xeb, + 0x6c, 0x9c, 0x5d, 0x6c, 0x96, 0x3e, 0x5f, 0x6c, 0xae, 0x79, 0x8c, 0x53, 0xc6, 0xb9, 0x3f, 0xb4, + 0x02, 0x66, 0x53, 0x22, 0x8e, 0xad, 0x83, 0x50, 0x38, 0x35, 0x4a, 0x92, 0x57, 0x32, 0xdf, 0x58, + 0x87, 0x05, 0x4c, 0x22, 0x16, 0x62, 0x28, 0x9a, 0x7a, 0x4b, 0x6b, 0x2f, 0x39, 0xd3, 0xb5, 0x71, + 0x1f, 0xf4, 0x23, 0xc4, 0x66, 0xb9, 0xa5, 0xb5, 0xeb, 0xbb, 0x0d, 0xeb, 0xc6, 0x2d, 0xb2, 0x7a, + 0x88, 0x9d, 0x72, 0x7a, 0x90, 0x93, 0xa6, 0x19, 0xcf, 0x61, 0x85, 0x78, 0x1e, 0x46, 0x02, 0x7d, + 0x97, 0x70, 0x8e, 0x82, 0x37, 0x2b, 0x2d, 0xbd, 0x5d, 0xdf, 0x35, 0x6f, 0x55, 0xee, 0xab, 0xbc, + 0xfd, 0x34, 0x4d, 0x31, 0x96, 0xc9, 0xec, 0x26, 0x57, 0xf2, 0x3f, 0x34, 0xd0, 0x7b, 0x88, 0xc6, + 0x53, 0x98, 0xa7, 0x41, 0xe8, 0xa6, 0xed, 0x48, 0xf9, 0x8e, 0xa5, 0x0c, 0xff, 0x1f, 0x04, 0xe2, + 0x78, 0xdc, 0xb7, 0x3c, 0x46, 0xed, 0x4c, 0x56, 0xfd, 0x6c, 0x73, 0x7f, 0x68, 0x8b, 0xd3, 0x08, + 0xb9, 0xd5, 0x45, 0xcf, 0xa9, 0xd2, 0x20, 0x4c, 0x41, 0x2f, 0x61, 0x31, 0x7b, 0x30, 0xe8, 0x4b, + 0xda, 0x5c, 0x21, 0x5a, 0x3d, 0x67, 0xe4, 0xbd, 0x91, 0x44, 0xd2, 0xf4, 0x82, 0xbd, 0x91, 0xa4, + 0x87, 0xa8, 0x94, 0xbf, 0x6a, 0xb0, 0x74, 0xed, 0x06, 0xdd, 0xf1, 0xdc, 0x5f, 0xc3, 0x4a, 0x8c, + 0x1c, 0xe3, 0x09, 0xba, 0x11, 0x8b, 0x45, 0xc0, 0xc2, 0x82, 0x32, 0xcb, 0x0a, 0x73, 0x98, 0x51, + 0x8c, 0xb7, 0xb0, 0x2a, 0x48, 0x3c, 0x40, 0xe1, 0x92, 0xd1, 0x88, 0x79, 0x44, 0xa2, 0x8b, 0x99, + 0xfd, 0x93, 0x81, 0xf6, 0xa7, 0x1c, 0xe5, 0xf8, 0x51, 0x83, 0xba, 0x9c, 0xe9, 0xc3, 0x38, 0xf0, + 0x90, 0xdf, 0x61, 0xd8, 0x85, 0x4a, 0x94, 0xc6, 0x0b, 0x7a, 0x65, 0xc5, 0x7f, 0x9c, 0xf0, 0x87, + 0x50, 0x55, 0xa3, 0x5a, 0x96, 0xa3, 0xfa, 0xef, 0xed, 0x51, 0x4d, 0xc3, 0xb2, 0x4b, 0x35, 0xa7, + 0xaa, 0x40, 0x89, 0x7c, 0xd7, 0x01, 0x7e, 0xa7, 0x18, 0x1b, 0x00, 0x7d, 0xc2, 0xd1, 0x9d, 0x95, + 0xa9, 0xa5, 0x3b, 0x5d, 0x29, 0xf4, 0x1f, 0x2c, 0xf2, 0x53, 0xda, 0x67, 0x23, 0x95, 0x20, 0xbd, + 0x9c, 0x7a, 0xb6, 0xd7, 0xbd, 0xee, 0xac, 0xff, 0x2d, 0xe7, 0xf2, 0x0d, 0xe7, 0x67, 0x50, 0xe3, + 0x27, 0x24, 0x72, 0x63, 0x22, 0xb0, 0x59, 0x29, 0x74, 0xca, 0x42, 0x0a, 0x70, 0x88, 0x40, 0xe3, + 0x05, 0xd4, 0x63, 0xf4, 0x11, 0x69, 0x86, 0xab, 0x16, 0xc2, 0x41, 0x86, 0x90, 0xc0, 0x03, 0x90, + 0x70, 0xf9, 0x36, 0xcd, 0x17, 0xa2, 0xcd, 0xa7, 0xf5, 0x3d, 0xf9, 0x87, 0xa4, 0xc0, 0x12, 0xb6, + 0x50, 0x08, 0x56, 0xcb, 0x08, 0xd3, 0xb7, 0xb3, 0xf3, 0xe4, 0xec, 0xd2, 0xd4, 0xce, 0x2f, 0x4d, + 0xed, 0xcb, 0xa5, 0xa9, 0xbd, 0xbf, 0x32, 0x4b, 0xe7, 0x57, 0x66, 0xe9, 0xd3, 0x95, 0x59, 0x7a, + 0x73, 0x6f, 0x06, 0x99, 0x4e, 0xd1, 0x76, 0x88, 0xe2, 0x84, 0xc5, 0x43, 0xb9, 0xb0, 0x27, 0x0f, + 0xec, 0x24, 0xff, 0xe6, 0xf4, 0xab, 0xf2, 0x6b, 0xb2, 0xf7, 0x2b, 0x00, 0x00, 0xff, 0xff, 0x85, + 0xaa, 0x30, 0x53, 0x95, 0x06, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { @@ -671,10 +671,10 @@ func (this *AssetPrice) Equal(that interface{}) bool { if !this.SwapRate.Equal(that1.SwapRate) { return false } - if !this.SwapFee.Equal(that1.SwapFee) { + if !this.RedeemRate.Equal(that1.RedeemRate) { return false } - if !this.RedeemRate.Equal(that1.RedeemRate) { + if !this.SwapFee.Equal(that1.SwapFee) { return false } if !this.RedeemFee.Equal(that1.RedeemFee) { @@ -977,9 +977,9 @@ func (m *AssetPrice) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x42 { - size := m.RedeemRate.Size() + size := m.SwapFee.Size() i -= size - if _, err := m.RedeemRate.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.SwapFee.MarshalTo(dAtA[i:]); err != nil { return 0, err } i = encodeVarintMetoken(dAtA, i, uint64(size)) @@ -987,9 +987,9 @@ func (m *AssetPrice) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0x3a { - size := m.SwapFee.Size() + size := m.RedeemRate.Size() i -= size - if _, err := m.SwapFee.MarshalTo(dAtA[i:]); err != nil { + if _, err := m.RedeemRate.MarshalTo(dAtA[i:]); err != nil { return 0, err } i = encodeVarintMetoken(dAtA, i, uint64(size)) @@ -1167,10 +1167,10 @@ func (m *AssetPrice) Size() (n int) { } l = m.SwapRate.Size() n += 1 + l + sovMetoken(uint64(l)) - l = m.SwapFee.Size() - n += 1 + l + sovMetoken(uint64(l)) l = m.RedeemRate.Size() n += 1 + l + sovMetoken(uint64(l)) + l = m.SwapFee.Size() + n += 1 + l + sovMetoken(uint64(l)) l = m.RedeemFee.Size() n += 1 + l + sovMetoken(uint64(l)) return n @@ -2125,7 +2125,7 @@ func (m *AssetPrice) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 6: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field SwapFee", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field RedeemRate", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2153,13 +2153,13 @@ func (m *AssetPrice) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.SwapFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.RedeemRate.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex case 7: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field RedeemRate", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field SwapFee", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -2187,7 +2187,7 @@ func (m *AssetPrice) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.RedeemRate.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.SwapFee.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex