diff --git a/api/canto/coinswap/v1/coinswap.pulsar.go b/api/canto/coinswap/v1/coinswap.pulsar.go index 58000e484..e6d7ba584 100644 --- a/api/canto/coinswap/v1/coinswap.pulsar.go +++ b/api/canto/coinswap/v1/coinswap.pulsar.go @@ -2,6 +2,7 @@ package coinswapv1 import ( + _ "cosmossdk.io/api/amino" v1beta1 "cosmossdk.io/api/cosmos/base/v1beta1" fmt "fmt" _ "github.com/cosmos/cosmos-proto" @@ -2705,70 +2706,76 @@ var file_canto_coinswap_v1_coinswap_proto_rawDesc = []byte{ 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x56, 0x0a, 0x05, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, - 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x33, 0x0a, 0x04, 0x63, 0x6f, 0x69, - 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, - 0x69, 0x6e, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x22, 0x57, - 0x0a, 0x06, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, - 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, - 0x73, 0x73, 0x12, 0x33, 0x0a, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, - 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x04, 0xc8, 0xde, 0x1f, - 0x00, 0x52, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x22, 0xb0, 0x01, 0x0a, 0x04, 0x50, 0x6f, 0x6f, 0x6c, - 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, - 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x5f, 0x64, 0x65, 0x6e, - 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, - 0x72, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x2d, 0x0a, 0x12, 0x63, 0x6f, 0x75, 0x6e, 0x74, - 0x65, 0x72, 0x70, 0x61, 0x72, 0x74, 0x79, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x11, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x61, 0x72, 0x74, - 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x73, 0x63, 0x72, 0x6f, 0x77, - 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, - 0x65, 0x73, 0x63, 0x72, 0x6f, 0x77, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1b, 0x0a, - 0x09, 0x6c, 0x70, 0x74, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x6c, 0x70, 0x74, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x22, 0xc2, 0x03, 0x0a, 0x06, 0x50, - 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x43, 0x0a, 0x03, 0x66, 0x65, 0x65, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x09, 0x42, 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, - 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, - 0x73, 0x2e, 0x44, 0x65, 0x63, 0x52, 0x03, 0x66, 0x65, 0x65, 0x12, 0x4b, 0x0a, 0x11, 0x70, 0x6f, - 0x6f, 0x6c, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x66, 0x65, 0x65, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, - 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, - 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x0f, 0x70, 0x6f, 0x6f, 0x6c, 0x43, 0x72, 0x65, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x46, 0x65, 0x65, 0x12, 0x4c, 0x0a, 0x08, 0x74, 0x61, 0x78, 0x5f, 0x72, - 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xda, - 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, - 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, - 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0x52, 0x07, 0x74, 0x61, - 0x78, 0x52, 0x61, 0x74, 0x65, 0x12, 0x59, 0x0a, 0x1a, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x74, 0x61, - 0x6e, 0x64, 0x61, 0x72, 0x64, 0x5f, 0x63, 0x6f, 0x69, 0x6e, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x70, - 0x6f, 0x6f, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x1d, 0xc8, 0xde, 0x1f, 0x00, 0xda, - 0xde, 0x1f, 0x15, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, - 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x49, 0x6e, 0x74, 0x52, 0x16, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x61, - 0x6e, 0x64, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x65, 0x72, 0x50, 0x6f, 0x6f, 0x6c, - 0x12, 0x73, 0x0a, 0x0f, 0x6d, 0x61, 0x78, 0x5f, 0x73, 0x77, 0x61, 0x70, 0x5f, 0x61, 0x6d, 0x6f, - 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, - 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x30, 0xc8, 0xde, 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 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, 0x74, 0x79, 0x70, 0x65, 0x73, - 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x53, 0x77, 0x61, 0x70, 0x41, - 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x3a, 0x08, 0x98, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f, 0x01, 0x42, - 0xbf, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, - 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x42, 0x0d, 0x43, 0x6f, 0x69, 0x6e, 0x73, - 0x77, 0x61, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2d, 0x63, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, - 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2f, 0x76, 0x31, 0x3b, 0x63, - 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x43, 0x58, 0xaa, - 0x02, 0x11, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, - 0x2e, 0x56, 0x31, 0xca, 0x02, 0x11, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x6f, 0x69, 0x6e, - 0x73, 0x77, 0x61, 0x70, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1d, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, - 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, - 0x3a, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x3a, 0x3a, 0x56, 0x31, 0xc8, 0xe1, 0x1e, - 0x00, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x6d, + 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x56, 0x0a, 0x05, 0x49, 0x6e, 0x70, + 0x75, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x33, 0x0a, 0x04, + 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, + 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x04, 0x63, 0x6f, 0x69, + 0x6e, 0x22, 0x57, 0x0a, 0x06, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, + 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x64, + 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x33, 0x0a, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, + 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x04, + 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x04, 0x63, 0x6f, 0x69, 0x6e, 0x22, 0xb0, 0x01, 0x0a, 0x04, 0x50, + 0x6f, 0x6f, 0x6c, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x02, 0x69, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x5f, + 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x73, 0x74, 0x61, + 0x6e, 0x64, 0x61, 0x72, 0x64, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x2d, 0x0a, 0x12, 0x63, 0x6f, + 0x75, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x61, 0x72, 0x74, 0x79, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x70, + 0x61, 0x72, 0x74, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x25, 0x0a, 0x0e, 0x65, 0x73, 0x63, + 0x72, 0x6f, 0x77, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0d, 0x65, 0x73, 0x63, 0x72, 0x6f, 0x77, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, + 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x70, 0x74, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x08, 0x6c, 0x70, 0x74, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x22, 0x89, 0x04, + 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x48, 0x0a, 0x03, 0x66, 0x65, 0x65, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x36, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, + 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, + 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, + 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x03, 0x66, + 0x65, 0x65, 0x12, 0x50, 0x0a, 0x11, 0x70, 0x6f, 0x6f, 0x6c, 0x5f, 0x63, 0x72, 0x65, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5f, 0x66, 0x65, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, + 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, 0x76, 0x31, 0x62, 0x65, + 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, + 0xb0, 0x2a, 0x01, 0x52, 0x0f, 0x70, 0x6f, 0x6f, 0x6c, 0x43, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x46, 0x65, 0x65, 0x12, 0x51, 0x0a, 0x08, 0x74, 0x61, 0x78, 0x5f, 0x72, 0x61, 0x74, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x36, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, + 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, + 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, + 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x07, + 0x74, 0x61, 0x78, 0x52, 0x61, 0x74, 0x65, 0x12, 0x5e, 0x0a, 0x1a, 0x6d, 0x61, 0x78, 0x5f, 0x73, + 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x5f, 0x63, 0x6f, 0x69, 0x6e, 0x5f, 0x70, 0x65, 0x72, + 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x22, 0xc8, 0xde, 0x1f, + 0x00, 0xda, 0xde, 0x1f, 0x15, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, + 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x49, 0x6e, 0x74, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, + 0x16, 0x6d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, 0x64, 0x43, 0x6f, 0x69, 0x6e, + 0x50, 0x65, 0x72, 0x50, 0x6f, 0x6f, 0x6c, 0x12, 0x89, 0x01, 0x0a, 0x0f, 0x6d, 0x61, 0x78, 0x5f, + 0x73, 0x77, 0x61, 0x70, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, + 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x62, 0x61, 0x73, 0x65, 0x2e, + 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x42, 0x46, 0xc8, 0xde, + 0x1f, 0x00, 0xaa, 0xdf, 0x1f, 0x28, 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, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x9a, 0xe7, + 0xb0, 0x2a, 0x0c, 0x6c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x5f, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0xa8, + 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x0d, 0x6d, 0x61, 0x78, 0x53, 0x77, 0x61, 0x70, 0x41, 0x6d, 0x6f, + 0x75, 0x6e, 0x74, 0x3a, 0x24, 0x98, 0xa0, 0x1f, 0x00, 0xe8, 0xa0, 0x1f, 0x01, 0x8a, 0xe7, 0xb0, + 0x2a, 0x17, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x78, 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, + 0x61, 0x70, 0x2f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0xbf, 0x01, 0x0a, 0x15, 0x63, 0x6f, + 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, + 0x2e, 0x76, 0x31, 0x42, 0x0d, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x50, 0x72, 0x6f, + 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2d, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, + 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x69, + 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, + 0x70, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x43, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x61, 0x6e, 0x74, + 0x6f, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x11, + 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x5c, 0x56, + 0x31, 0xe2, 0x02, 0x1d, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, + 0x61, 0x70, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0xea, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x43, 0x6f, 0x69, 0x6e, 0x73, + 0x77, 0x61, 0x70, 0x3a, 0x3a, 0x56, 0x31, 0xc8, 0xe1, 0x1e, 0x00, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/api/canto/coinswap/v1/tx.pulsar.go b/api/canto/coinswap/v1/tx.pulsar.go index 609baf42c..f20cde077 100644 --- a/api/canto/coinswap/v1/tx.pulsar.go +++ b/api/canto/coinswap/v1/tx.pulsar.go @@ -4607,7 +4607,7 @@ var file_canto_coinswap_v1_tx_proto_rawDesc = []byte{ 0x21, 0x82, 0xe7, 0xb0, 0x2a, 0x05, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x8a, 0xe7, 0xb0, 0x2a, 0x12, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x22, 0x15, 0x0a, 0x13, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x43, 0x6f, 0x69, - 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xb1, 0x01, 0x0a, 0x0f, 0x4d, 0x73, + 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0xbc, 0x01, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, @@ -4616,48 +4616,49 @@ var file_canto_coinswap_v1_tx_proto_rawDesc = []byte{ 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x73, 0x3a, 0x28, 0x82, 0xe7, 0xb0, 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, - 0x69, 0x74, 0x79, 0x8a, 0xe7, 0xb0, 0x2a, 0x15, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x4d, 0x73, - 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x19, 0x0a, - 0x17, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x8a, 0x03, 0x0a, 0x03, 0x4d, 0x73, 0x67, - 0x12, 0x5e, 0x0a, 0x0c, 0x41, 0x64, 0x64, 0x4c, 0x69, 0x71, 0x75, 0x69, 0x64, 0x69, 0x74, 0x79, - 0x12, 0x22, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, - 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x41, 0x64, 0x64, 0x4c, 0x69, 0x71, 0x75, 0x69, - 0x64, 0x69, 0x74, 0x79, 0x1a, 0x2a, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, - 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x41, 0x64, 0x64, 0x4c, - 0x69, 0x71, 0x75, 0x69, 0x64, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x12, 0x67, 0x0a, 0x0f, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4c, 0x69, 0x71, 0x75, 0x69, 0x64, - 0x69, 0x74, 0x79, 0x12, 0x25, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, - 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x6d, 0x6f, 0x76, - 0x65, 0x4c, 0x69, 0x71, 0x75, 0x69, 0x64, 0x69, 0x74, 0x79, 0x1a, 0x2d, 0x2e, 0x63, 0x61, 0x6e, - 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, - 0x73, 0x67, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4c, 0x69, 0x71, 0x75, 0x69, 0x64, 0x69, 0x74, - 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x08, 0x53, 0x77, 0x61, - 0x70, 0x43, 0x6f, 0x69, 0x6e, 0x12, 0x1f, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, - 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, - 0x70, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x1a, 0x26, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, - 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, - 0x61, 0x70, 0x43, 0x6f, 0x69, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5e, - 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x22, + 0x61, 0x6d, 0x73, 0x3a, 0x33, 0x82, 0xe7, 0xb0, 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, + 0x69, 0x74, 0x79, 0x8a, 0xe7, 0xb0, 0x2a, 0x20, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x78, 0x2f, + 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x73, 0x67, 0x55, + 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x32, 0x8a, 0x03, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x5e, 0x0a, 0x0c, 0x41, + 0x64, 0x64, 0x4c, 0x69, 0x71, 0x75, 0x69, 0x64, 0x69, 0x74, 0x79, 0x12, 0x22, 0x2e, 0x63, 0x61, + 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, + 0x4d, 0x73, 0x67, 0x41, 0x64, 0x64, 0x4c, 0x69, 0x71, 0x75, 0x69, 0x64, 0x69, 0x74, 0x79, 0x1a, + 0x2a, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, + 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x41, 0x64, 0x64, 0x4c, 0x69, 0x71, 0x75, 0x69, 0x64, + 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x67, 0x0a, 0x0f, 0x52, + 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4c, 0x69, 0x71, 0x75, 0x69, 0x64, 0x69, 0x74, 0x79, 0x12, 0x25, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, - 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, - 0x6d, 0x73, 0x1a, 0x2a, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, - 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, - 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x05, - 0x80, 0xe7, 0xb0, 0x2a, 0x01, 0x42, 0xb9, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, - 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x42, - 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2d, 0x63, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, - 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2f, 0x76, 0x31, 0x3b, 0x63, - 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x43, 0x58, 0xaa, - 0x02, 0x11, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, - 0x2e, 0x56, 0x31, 0xca, 0x02, 0x11, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x6f, 0x69, 0x6e, - 0x73, 0x77, 0x61, 0x70, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1d, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, - 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, - 0x3a, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x3a, 0x3a, 0x56, 0x31, 0xc8, 0xe1, 0x1e, - 0x00, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x6d, 0x6f, 0x76, 0x65, 0x4c, 0x69, 0x71, 0x75, + 0x69, 0x64, 0x69, 0x74, 0x79, 0x1a, 0x2d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, + 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x52, 0x65, 0x6d, + 0x6f, 0x76, 0x65, 0x4c, 0x69, 0x71, 0x75, 0x69, 0x64, 0x69, 0x74, 0x79, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x53, 0x0a, 0x08, 0x53, 0x77, 0x61, 0x70, 0x43, 0x6f, 0x69, 0x6e, + 0x12, 0x1f, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, + 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x4f, 0x72, 0x64, 0x65, + 0x72, 0x1a, 0x26, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, + 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x53, 0x77, 0x61, 0x70, 0x43, 0x6f, 0x69, + 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x5e, 0x0a, 0x0c, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x22, 0x2e, 0x63, 0x61, 0x6e, 0x74, + 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, + 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x1a, 0x2a, 0x2e, + 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, + 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, 0x01, + 0x42, 0xb9, 0x01, 0x0a, 0x15, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, + 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2d, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, + 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x63, 0x6f, + 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x77, + 0x61, 0x70, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x43, 0x58, 0xaa, 0x02, 0x11, 0x43, 0x61, 0x6e, + 0x74, 0x6f, 0x2e, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x2e, 0x56, 0x31, 0xca, 0x02, + 0x11, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x6f, 0x69, 0x6e, 0x73, 0x77, 0x61, 0x70, 0x5c, + 0x56, 0x31, 0xe2, 0x02, 0x1d, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x6f, 0x69, 0x6e, 0x73, + 0x77, 0x61, 0x70, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0xea, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x43, 0x6f, 0x69, 0x6e, + 0x73, 0x77, 0x61, 0x70, 0x3a, 0x3a, 0x56, 0x31, 0xc8, 0xe1, 0x1e, 0x00, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/canto/csr/v1/params.pulsar.go b/api/canto/csr/v1/params.pulsar.go index 878d24c1d..205d11603 100644 --- a/api/canto/csr/v1/params.pulsar.go +++ b/api/canto/csr/v1/params.pulsar.go @@ -2,6 +2,7 @@ package csrv1 import ( + _ "cosmossdk.io/api/amino" fmt "fmt" _ "github.com/cosmos/cosmos-proto" runtime "github.com/cosmos/cosmos-proto/runtime" @@ -556,25 +557,28 @@ var file_canto_csr_v1_params_proto_rawDesc = []byte{ 0x74, 0x6f, 0x2e, 0x63, 0x73, 0x72, 0x2e, 0x76, 0x31, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, - 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x79, 0x0a, 0x06, 0x50, 0x61, - 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x63, - 0x73, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, - 0x43, 0x73, 0x72, 0x12, 0x50, 0x0a, 0x0a, 0x63, 0x73, 0x72, 0x5f, 0x73, 0x68, 0x61, 0x72, 0x65, - 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, - 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, - 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, - 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0x52, 0x09, 0x63, 0x73, 0x72, 0x53, - 0x68, 0x61, 0x72, 0x65, 0x73, 0x42, 0x96, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, - 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x73, 0x72, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x50, 0x61, 0x72, 0x61, - 0x6d, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x23, 0x63, 0x6f, 0x73, 0x6d, 0x6f, - 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, - 0x6f, 0x2f, 0x63, 0x73, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x73, 0x72, 0x76, 0x31, 0xa2, 0x02, - 0x03, 0x43, 0x43, 0x58, 0xaa, 0x02, 0x0c, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x43, 0x73, 0x72, - 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0c, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x73, 0x72, 0x5c, - 0x56, 0x31, 0xe2, 0x02, 0x18, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x73, 0x72, 0x5c, 0x56, - 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, - 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x43, 0x73, 0x72, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x61, 0x6d, 0x69, 0x6e, + 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x97, 0x01, + 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x65, 0x6e, 0x61, 0x62, + 0x6c, 0x65, 0x5f, 0x63, 0x73, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x65, 0x6e, + 0x61, 0x62, 0x6c, 0x65, 0x43, 0x73, 0x72, 0x12, 0x55, 0x0a, 0x0a, 0x63, 0x73, 0x72, 0x5f, 0x73, + 0x68, 0x61, 0x72, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x36, 0xc8, 0xde, 0x1f, + 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, + 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, + 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0xa8, 0xe7, + 0xb0, 0x2a, 0x01, 0x52, 0x09, 0x63, 0x73, 0x72, 0x53, 0x68, 0x61, 0x72, 0x65, 0x73, 0x3a, 0x17, + 0x8a, 0xe7, 0xb0, 0x2a, 0x12, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x78, 0x2f, 0x63, 0x73, 0x72, + 0x2f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x96, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, + 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x73, 0x72, 0x2e, 0x76, 0x31, 0x42, 0x0b, 0x50, 0x61, + 0x72, 0x61, 0x6d, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x23, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, + 0x6e, 0x74, 0x6f, 0x2f, 0x63, 0x73, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x73, 0x72, 0x76, 0x31, + 0xa2, 0x02, 0x03, 0x43, 0x43, 0x58, 0xaa, 0x02, 0x0c, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x43, + 0x73, 0x72, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0c, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x73, + 0x72, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x18, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x73, 0x72, + 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, + 0x02, 0x0e, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x43, 0x73, 0x72, 0x3a, 0x3a, 0x56, 0x31, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/canto/csr/v1/tx.pulsar.go b/api/canto/csr/v1/tx.pulsar.go index 237839890..06cd2d944 100644 --- a/api/canto/csr/v1/tx.pulsar.go +++ b/api/canto/csr/v1/tx.pulsar.go @@ -974,7 +974,7 @@ var file_canto_csr_v1_tx_proto_rawDesc = []byte{ 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x63, 0x73, 0x72, 0x2f, 0x76, 0x31, - 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xac, 0x01, + 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xb2, 0x01, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, @@ -983,27 +983,27 @@ var file_canto_csr_v1_tx_proto_rawDesc = []byte{ 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x73, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, - 0x6d, 0x73, 0x3a, 0x28, 0x82, 0xe7, 0xb0, 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, - 0x74, 0x79, 0x8a, 0xe7, 0xb0, 0x2a, 0x15, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x4d, 0x73, 0x67, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x19, 0x0a, 0x17, - 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x62, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x54, - 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1d, - 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x73, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, - 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x1a, 0x25, 0x2e, - 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x73, 0x72, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, 0x01, 0x42, 0x92, 0x01, 0x0a, 0x10, - 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x73, 0x72, 0x2e, 0x76, 0x31, - 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x23, 0x63, 0x6f, 0x73, - 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, - 0x6e, 0x74, 0x6f, 0x2f, 0x63, 0x73, 0x72, 0x2f, 0x76, 0x31, 0x3b, 0x63, 0x73, 0x72, 0x76, 0x31, - 0xa2, 0x02, 0x03, 0x43, 0x43, 0x58, 0xaa, 0x02, 0x0c, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x43, - 0x73, 0x72, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0c, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x73, - 0x72, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x18, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x73, 0x72, - 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, - 0x02, 0x0e, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x43, 0x73, 0x72, 0x3a, 0x3a, 0x56, 0x31, - 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6d, 0x73, 0x3a, 0x2e, 0x82, 0xe7, 0xb0, 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, + 0x74, 0x79, 0x8a, 0xe7, 0xb0, 0x2a, 0x1b, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x78, 0x2f, 0x63, + 0x73, 0x72, 0x2f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, + 0x6d, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, + 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x62, 0x0a, + 0x03, 0x4d, 0x73, 0x67, 0x12, 0x54, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, + 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x73, 0x72, + 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, + 0x61, 0x6d, 0x73, 0x1a, 0x25, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x63, 0x73, 0x72, 0x2e, + 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, + 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, + 0x01, 0x42, 0x92, 0x01, 0x0a, 0x10, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, + 0x63, 0x73, 0x72, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, + 0x01, 0x5a, 0x23, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, + 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x63, 0x73, 0x72, 0x2f, 0x76, 0x31, + 0x3b, 0x63, 0x73, 0x72, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x43, 0x58, 0xaa, 0x02, 0x0c, 0x43, + 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x43, 0x73, 0x72, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x0c, 0x43, 0x61, + 0x6e, 0x74, 0x6f, 0x5c, 0x43, 0x73, 0x72, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x18, 0x43, 0x61, 0x6e, + 0x74, 0x6f, 0x5c, 0x43, 0x73, 0x72, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x43, + 0x73, 0x72, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/canto/govshuttle/v1/genesis.pulsar.go b/api/canto/govshuttle/v1/genesis.pulsar.go index 80ed05d08..d67a924c1 100644 --- a/api/canto/govshuttle/v1/genesis.pulsar.go +++ b/api/canto/govshuttle/v1/genesis.pulsar.go @@ -14,14 +14,16 @@ import ( ) var ( - md_GenesisState protoreflect.MessageDescriptor - fd_GenesisState_params protoreflect.FieldDescriptor + md_GenesisState protoreflect.MessageDescriptor + fd_GenesisState_params protoreflect.FieldDescriptor + fd_GenesisState_port_contract_addr protoreflect.FieldDescriptor ) func init() { file_canto_govshuttle_v1_genesis_proto_init() md_GenesisState = File_canto_govshuttle_v1_genesis_proto.Messages().ByName("GenesisState") fd_GenesisState_params = md_GenesisState.Fields().ByName("params") + fd_GenesisState_port_contract_addr = md_GenesisState.Fields().ByName("port_contract_addr") } var _ protoreflect.Message = (*fastReflection_GenesisState)(nil) @@ -95,6 +97,12 @@ func (x *fastReflection_GenesisState) Range(f func(protoreflect.FieldDescriptor, return } } + if x.PortContractAddr != "" { + value := protoreflect.ValueOfString(x.PortContractAddr) + if !f(fd_GenesisState_port_contract_addr, value) { + return + } + } } // Has reports whether a field is populated. @@ -112,6 +120,8 @@ func (x *fastReflection_GenesisState) Has(fd protoreflect.FieldDescriptor) bool switch fd.FullName() { case "canto.govshuttle.v1.GenesisState.params": return x.Params != nil + case "canto.govshuttle.v1.GenesisState.port_contract_addr": + return x.PortContractAddr != "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: canto.govshuttle.v1.GenesisState")) @@ -130,6 +140,8 @@ func (x *fastReflection_GenesisState) Clear(fd protoreflect.FieldDescriptor) { switch fd.FullName() { case "canto.govshuttle.v1.GenesisState.params": x.Params = nil + case "canto.govshuttle.v1.GenesisState.port_contract_addr": + x.PortContractAddr = "" default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: canto.govshuttle.v1.GenesisState")) @@ -149,6 +161,9 @@ func (x *fastReflection_GenesisState) Get(descriptor protoreflect.FieldDescripto case "canto.govshuttle.v1.GenesisState.params": value := x.Params return protoreflect.ValueOfMessage(value.ProtoReflect()) + case "canto.govshuttle.v1.GenesisState.port_contract_addr": + value := x.PortContractAddr + return protoreflect.ValueOfString(value) default: if descriptor.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: canto.govshuttle.v1.GenesisState")) @@ -171,6 +186,8 @@ func (x *fastReflection_GenesisState) Set(fd protoreflect.FieldDescriptor, value switch fd.FullName() { case "canto.govshuttle.v1.GenesisState.params": x.Params = value.Message().Interface().(*Params) + case "canto.govshuttle.v1.GenesisState.port_contract_addr": + x.PortContractAddr = value.Interface().(string) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: canto.govshuttle.v1.GenesisState")) @@ -196,6 +213,8 @@ func (x *fastReflection_GenesisState) Mutable(fd protoreflect.FieldDescriptor) p x.Params = new(Params) } return protoreflect.ValueOfMessage(x.Params.ProtoReflect()) + case "canto.govshuttle.v1.GenesisState.port_contract_addr": + panic(fmt.Errorf("field port_contract_addr of message canto.govshuttle.v1.GenesisState is not mutable")) default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: canto.govshuttle.v1.GenesisState")) @@ -212,6 +231,8 @@ func (x *fastReflection_GenesisState) NewField(fd protoreflect.FieldDescriptor) case "canto.govshuttle.v1.GenesisState.params": m := new(Params) return protoreflect.ValueOfMessage(m.ProtoReflect()) + case "canto.govshuttle.v1.GenesisState.port_contract_addr": + return protoreflect.ValueOfString("") default: if fd.IsExtension() { panic(fmt.Errorf("proto3 declared messages do not support extensions: canto.govshuttle.v1.GenesisState")) @@ -285,6 +306,10 @@ func (x *fastReflection_GenesisState) ProtoMethods() *protoiface.Methods { l = options.Size(x.Params) n += 1 + l + runtime.Sov(uint64(l)) } + l = len(x.PortContractAddr) + if l > 0 { + n += 1 + l + runtime.Sov(uint64(l)) + } if x.unknownFields != nil { n += len(x.unknownFields) } @@ -314,6 +339,13 @@ func (x *fastReflection_GenesisState) ProtoMethods() *protoiface.Methods { i -= len(x.unknownFields) copy(dAtA[i:], x.unknownFields) } + if len(x.PortContractAddr) > 0 { + i -= len(x.PortContractAddr) + copy(dAtA[i:], x.PortContractAddr) + i = runtime.EncodeVarint(dAtA, i, uint64(len(x.PortContractAddr))) + i-- + dAtA[i] = 0x12 + } if x.Params != nil { encoded, err := options.Marshal(x.Params) if err != nil { @@ -413,6 +445,38 @@ func (x *fastReflection_GenesisState) ProtoMethods() *protoiface.Methods { return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, err } iNdEx = postIndex + case 2: + if wireType != 2 { + return protoiface.UnmarshalOutput{NoUnkeyedLiterals: input.NoUnkeyedLiterals, Flags: input.Flags}, fmt.Errorf("proto: wrong wireType = %d for field PortContractAddr", 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.PortContractAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := runtime.Skip(dAtA[iNdEx:]) @@ -467,7 +531,8 @@ type GenesisState struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Params *Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"` // this line is used by starport scaffolding # genesis/proto/state + Params *Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params,omitempty"` + PortContractAddr string `protobuf:"bytes,2,opt,name=port_contract_addr,json=portContractAddr,proto3" json:"port_contract_addr,omitempty"` // this line is used by starport scaffolding # genesis/proto/state } func (x *GenesisState) Reset() { @@ -497,6 +562,13 @@ func (x *GenesisState) GetParams() *Params { return nil } +func (x *GenesisState) GetPortContractAddr() string { + if x != nil { + return x.PortContractAddr + } + return "" +} + var File_canto_govshuttle_v1_genesis_proto protoreflect.FileDescriptor var file_canto_govshuttle_v1_genesis_proto_rawDesc = []byte{ @@ -507,25 +579,27 @@ var file_canto_govshuttle_v1_genesis_proto_rawDesc = []byte{ 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x24, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x49, 0x0a, 0x0c, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x53, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x77, 0x0a, 0x0c, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x39, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x67, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, - 0x73, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, - 0xc8, 0x01, 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x67, 0x6f, - 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x47, 0x65, 0x6e, - 0x65, 0x73, 0x69, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x63, 0x6f, 0x73, - 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, - 0x6e, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x76, - 0x31, 0x3b, 0x67, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, - 0x03, 0x43, 0x47, 0x58, 0xaa, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x47, 0x6f, 0x76, - 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x13, 0x43, 0x61, 0x6e, - 0x74, 0x6f, 0x5c, 0x47, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x5c, 0x56, 0x31, - 0xe2, 0x02, 0x1f, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x47, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, - 0x74, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, - 0x74, 0x61, 0xea, 0x02, 0x15, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x47, 0x6f, 0x76, 0x73, - 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x73, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, + 0x2c, 0x0a, 0x12, 0x70, 0x6f, 0x72, 0x74, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, + 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x70, 0x6f, 0x72, + 0x74, 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x61, 0x63, 0x74, 0x41, 0x64, 0x64, 0x72, 0x42, 0xc8, 0x01, + 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x67, 0x6f, 0x76, 0x73, + 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x47, 0x65, 0x6e, 0x65, 0x73, + 0x69, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x63, 0x6f, 0x73, 0x6d, 0x6f, + 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, + 0x6f, 0x2f, 0x67, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x2f, 0x76, 0x31, 0x3b, + 0x67, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, + 0x47, 0x58, 0xaa, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x47, 0x6f, 0x76, 0x73, 0x68, + 0x75, 0x74, 0x74, 0x6c, 0x65, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, + 0x5c, 0x47, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, 0x65, 0x5c, 0x56, 0x31, 0xe2, 0x02, + 0x1f, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x47, 0x6f, 0x76, 0x73, 0x68, 0x75, 0x74, 0x74, 0x6c, + 0x65, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0xea, 0x02, 0x15, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x47, 0x6f, 0x76, 0x73, 0x68, 0x75, + 0x74, 0x74, 0x6c, 0x65, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/canto/govshuttle/v1/govshuttle.pulsar.go b/api/canto/govshuttle/v1/govshuttle.pulsar.go index 5c92fb478..d1b8f200b 100644 --- a/api/canto/govshuttle/v1/govshuttle.pulsar.go +++ b/api/canto/govshuttle/v1/govshuttle.pulsar.go @@ -3074,6 +3074,8 @@ func (*Params) Descriptor() ([]byte, []int) { // Define this object so that the govshuttle.pb.go file is generate, implements // govtypes.Content +// Deprecated: This legacy proposal is deprecated in favor of Msg-based gov +// proposals, see MsgLendingMarketProposal. type LendingMarketProposal struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -3127,6 +3129,8 @@ func (x *LendingMarketProposal) GetMetadata() *LendingMarketMetadata { } // treasury proposal type, +// Deprecated: This legacy proposal is deprecated in favor of Msg-based gov +// proposals, see MsgTreasuryProposal. type TreasuryProposal struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache diff --git a/api/canto/inflation/v1/genesis.pulsar.go b/api/canto/inflation/v1/genesis.pulsar.go index 61e24dab0..0d66e109b 100644 --- a/api/canto/inflation/v1/genesis.pulsar.go +++ b/api/canto/inflation/v1/genesis.pulsar.go @@ -2,6 +2,7 @@ package inflationv1 import ( + _ "cosmossdk.io/api/amino" fmt "fmt" runtime "github.com/cosmos/cosmos-proto/runtime" _ "github.com/cosmos/gogoproto/gogoproto" @@ -1445,55 +1446,59 @@ var file_canto_inflation_v1_genesis_proto_rawDesc = []byte{ 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x12, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x22, 0x63, 0x61, - 0x6e, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, - 0x2f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0xde, 0x01, 0x0a, 0x0c, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x53, 0x74, 0x61, 0x74, - 0x65, 0x12, 0x38, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x04, 0xc8, - 0xde, 0x1f, 0x00, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x70, - 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x70, 0x65, 0x72, - 0x69, 0x6f, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x5f, 0x69, 0x64, 0x65, - 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x65, - 0x70, 0x6f, 0x63, 0x68, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x12, 0x2a, - 0x0a, 0x11, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, 0x70, 0x65, 0x72, - 0x69, 0x6f, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x65, 0x70, 0x6f, 0x63, 0x68, - 0x73, 0x50, 0x65, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x73, 0x6b, - 0x69, 0x70, 0x70, 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x73, 0x18, 0x05, 0x20, 0x01, - 0x28, 0x04, 0x52, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x70, 0x65, 0x64, 0x45, 0x70, 0x6f, 0x63, 0x68, - 0x73, 0x22, 0xa5, 0x02, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x1d, 0x0a, 0x0a, - 0x6d, 0x69, 0x6e, 0x74, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x09, 0x6d, 0x69, 0x6e, 0x74, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x69, 0x0a, 0x17, 0x65, - 0x78, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x63, 0x61, 0x6c, 0x63, 0x75, - 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x2a, 0x2e, 0x63, - 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, - 0x31, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x43, 0x61, 0x6c, - 0x63, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x16, - 0x65, 0x78, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x43, 0x61, 0x6c, 0x63, 0x75, - 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x66, 0x0a, 0x16, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, - 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x66, 0x6c, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, - 0x6e, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x15, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x29, - 0x0a, 0x10, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, - 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0xc1, 0x01, 0x0a, 0x16, 0x63, 0x6f, - 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, - 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x66, - 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x49, 0x58, 0xaa, 0x02, 0x12, 0x43, 0x61, - 0x6e, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x31, - 0xca, 0x02, 0x12, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x49, 0x6e, - 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, - 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, - 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x61, 0x6d, + 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, + 0x22, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2f, 0x76, 0x31, 0x2f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x22, 0xde, 0x01, 0x0a, 0x0c, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x53, + 0x74, 0x61, 0x74, 0x65, 0x12, 0x38, 0x0a, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, + 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, + 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x16, + 0x0a, 0x06, 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, + 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x29, 0x0a, 0x10, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x5f, + 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, + 0x52, 0x0f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x49, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x66, 0x69, 0x65, + 0x72, 0x12, 0x2a, 0x0a, 0x11, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x73, 0x5f, 0x70, 0x65, 0x72, 0x5f, + 0x70, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0f, 0x65, 0x70, + 0x6f, 0x63, 0x68, 0x73, 0x50, 0x65, 0x72, 0x50, 0x65, 0x72, 0x69, 0x6f, 0x64, 0x12, 0x25, 0x0a, + 0x0e, 0x73, 0x6b, 0x69, 0x70, 0x70, 0x65, 0x64, 0x5f, 0x65, 0x70, 0x6f, 0x63, 0x68, 0x73, 0x18, + 0x05, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0d, 0x73, 0x6b, 0x69, 0x70, 0x70, 0x65, 0x64, 0x45, 0x70, + 0x6f, 0x63, 0x68, 0x73, 0x22, 0xce, 0x02, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, + 0x1d, 0x0a, 0x0a, 0x6d, 0x69, 0x6e, 0x74, 0x5f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x6d, 0x69, 0x6e, 0x74, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x6e, + 0x0a, 0x17, 0x65, 0x78, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x5f, 0x63, 0x61, + 0x6c, 0x63, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, + 0x2a, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, + 0x43, 0x61, 0x6c, 0x63, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0xc8, 0xde, 0x1f, + 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x16, 0x65, 0x78, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, + 0x69, 0x61, 0x6c, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x6b, + 0x0a, 0x16, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x69, 0x73, 0x74, + 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, + 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x2e, 0x76, 0x31, 0x2e, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, + 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, + 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x15, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, + 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x29, 0x0a, 0x10, 0x65, + 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0f, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x49, 0x6e, 0x66, + 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x1d, 0x8a, 0xe7, 0xb0, 0x2a, 0x18, 0x63, 0x61, 0x6e, + 0x74, 0x6f, 0x2f, 0x78, 0x2f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x50, + 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0xc1, 0x01, 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, + 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, + 0x42, 0x0c, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, + 0x5a, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, + 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, + 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x76, + 0x31, 0xa2, 0x02, 0x03, 0x43, 0x49, 0x58, 0xaa, 0x02, 0x12, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, + 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x43, + 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, + 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x49, 0x6e, 0x66, 0x6c, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/api/canto/inflation/v1/inflation.pulsar.go b/api/canto/inflation/v1/inflation.pulsar.go index 5a90fdd6e..a223684da 100644 --- a/api/canto/inflation/v1/inflation.pulsar.go +++ b/api/canto/inflation/v1/inflation.pulsar.go @@ -2,6 +2,7 @@ package inflationv1 import ( + _ "cosmossdk.io/api/amino" fmt "fmt" _ "github.com/cosmos/cosmos-proto" runtime "github.com/cosmos/cosmos-proto/runtime" @@ -1336,58 +1337,61 @@ var file_canto_inflation_v1_inflation_proto_rawDesc = []byte{ 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, - 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcd, 0x01, 0x0a, 0x15, 0x49, 0x6e, - 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, - 0x69, 0x6f, 0x6e, 0x12, 0x5a, 0x0a, 0x0f, 0x73, 0x74, 0x61, 0x6b, 0x69, 0x6e, 0x67, 0x5f, 0x72, - 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x31, 0xc8, 0xde, - 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, - 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, - 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0x52, - 0x0e, 0x73, 0x74, 0x61, 0x6b, 0x69, 0x6e, 0x67, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, - 0x58, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x75, 0x6e, 0x69, 0x74, 0x79, 0x5f, 0x70, 0x6f, 0x6f, - 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, - 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, - 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, - 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x6d, - 0x75, 0x6e, 0x69, 0x74, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x22, 0x8b, 0x03, 0x0a, 0x16, 0x45, 0x78, - 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x6c, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x3f, 0x0a, 0x01, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, + 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x61, 0x6d, 0x69, 0x6e, 0x6f, + 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd7, 0x01, 0x0a, + 0x15, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x44, 0x69, 0x73, 0x74, 0x72, 0x69, + 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x5f, 0x0a, 0x0f, 0x73, 0x74, 0x61, 0x6b, 0x69, 0x6e, + 0x67, 0x5f, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x36, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, - 0x65, 0x63, 0x52, 0x01, 0x61, 0x12, 0x3f, 0x0a, 0x01, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, - 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, - 0x44, 0x65, 0x63, 0x52, 0x01, 0x72, 0x12, 0x3f, 0x0a, 0x01, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, - 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, - 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x2e, 0x44, 0x65, 0x63, 0x52, 0x01, 0x63, 0x12, 0x58, 0x0a, 0x0e, 0x62, 0x6f, 0x6e, 0x64, 0x69, - 0x6e, 0x67, 0x5f, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, - 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, + 0x65, 0x63, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x0e, 0x73, 0x74, 0x61, 0x6b, 0x69, 0x6e, 0x67, + 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, 0x5d, 0x0a, 0x0e, 0x63, 0x6f, 0x6d, 0x6d, 0x75, + 0x6e, 0x69, 0x74, 0x79, 0x5f, 0x70, 0x6f, 0x6f, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x36, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, - 0x65, 0x63, 0x52, 0x0d, 0x62, 0x6f, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x54, 0x61, 0x72, 0x67, 0x65, - 0x74, 0x12, 0x54, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x63, - 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x31, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, - 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, - 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, - 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x56, - 0x61, 0x72, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x42, 0xc3, 0x01, 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x2e, - 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x76, 0x31, 0x42, 0x0e, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, - 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, - 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x66, - 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x49, 0x58, 0xaa, 0x02, 0x12, 0x43, 0x61, - 0x6e, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x31, - 0xca, 0x02, 0x12, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x49, 0x6e, - 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, - 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, - 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x63, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x0d, 0x63, 0x6f, 0x6d, 0x6d, 0x75, 0x6e, 0x69, + 0x74, 0x79, 0x50, 0x6f, 0x6f, 0x6c, 0x22, 0xa4, 0x03, 0x0a, 0x16, 0x45, 0x78, 0x70, 0x6f, 0x6e, + 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x43, 0x61, 0x6c, 0x63, 0x75, 0x6c, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x12, 0x44, 0x0a, 0x01, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x36, 0xc8, 0xde, + 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, + 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, + 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0xa8, + 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x01, 0x61, 0x12, 0x44, 0x0a, 0x01, 0x72, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x09, 0x42, 0x36, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, + 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, + 0x73, 0x2e, 0x44, 0x65, 0x63, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x01, 0x72, 0x12, 0x44, 0x0a, + 0x01, 0x63, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x36, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, + 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, + 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, + 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, + 0x52, 0x01, 0x63, 0x12, 0x5d, 0x0a, 0x0e, 0x62, 0x6f, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x5f, 0x74, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x36, 0xc8, 0xde, 0x1f, + 0x00, 0xda, 0xde, 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, + 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, + 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0xa8, 0xe7, + 0xb0, 0x2a, 0x01, 0x52, 0x0d, 0x62, 0x6f, 0x6e, 0x64, 0x69, 0x6e, 0x67, 0x54, 0x61, 0x72, 0x67, + 0x65, 0x74, 0x12, 0x59, 0x0a, 0x0c, 0x6d, 0x61, 0x78, 0x5f, 0x76, 0x61, 0x72, 0x69, 0x61, 0x6e, + 0x63, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x36, 0xc8, 0xde, 0x1f, 0x00, 0xda, 0xde, + 0x1f, 0x1b, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x6d, + 0x61, 0x74, 0x68, 0x2e, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x44, 0x65, 0x63, 0xd2, 0xb4, 0x2d, + 0x0a, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x44, 0x65, 0x63, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, + 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x63, 0x65, 0x42, 0xc3, 0x01, + 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x0e, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2f, 0x63, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, + 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, + 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x49, + 0x58, 0xaa, 0x02, 0x12, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x12, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x49, + 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x61, + 0x6e, 0x74, 0x6f, 0x5c, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, + 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, + 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, + 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/canto/inflation/v1/tx.pulsar.go b/api/canto/inflation/v1/tx.pulsar.go index fef2a0776..22fa40150 100644 --- a/api/canto/inflation/v1/tx.pulsar.go +++ b/api/canto/inflation/v1/tx.pulsar.go @@ -976,7 +976,7 @@ var file_canto_inflation_v1_tx_proto_rawDesc = []byte{ 0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x20, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x22, 0xb2, 0x01, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, + 0x22, 0xbe, 0x01, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, 0x72, 0x69, 0x6e, @@ -984,31 +984,32 @@ var file_canto_inflation_v1_tx_proto_rawDesc = []byte{ 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, - 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x3a, 0x28, 0x82, 0xe7, 0xb0, - 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x8a, 0xe7, 0xb0, 0x2a, 0x15, - 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, - 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x32, 0x6e, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x60, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x23, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, - 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x1a, 0x2b, 0x2e, 0x63, - 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, - 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, 0x01, - 0x42, 0xbc, 0x01, 0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, - 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, - 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, - 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x69, - 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6e, 0x66, 0x6c, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x49, 0x58, 0xaa, 0x02, 0x12, - 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, - 0x56, 0x31, 0xca, 0x02, 0x12, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x49, 0x6e, 0x66, 0x6c, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, - 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, - 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x61, 0x6e, 0x74, 0x6f, - 0x3a, 0x3a, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x3a, 0x34, 0x82, 0xe7, 0xb0, + 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x8a, 0xe7, 0xb0, 0x2a, 0x21, + 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x78, 0x2f, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, + 0x73, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, + 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x6e, 0x0a, 0x03, + 0x4d, 0x73, 0x67, 0x12, 0x60, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, + 0x61, 0x6d, 0x73, 0x12, 0x23, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x1a, 0x2b, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, + 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, + 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x05, 0x80, 0xe7, 0xb0, 0x2a, 0x01, 0x42, 0xbc, 0x01, 0x0a, + 0x16, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x69, 0x6e, 0x66, 0x6c, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x50, 0x01, 0x5a, 0x2f, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x69, 0x6e, 0x66, 0x6c, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x76, 0x31, 0x3b, 0x69, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x49, 0x58, 0xaa, 0x02, 0x12, 0x43, 0x61, 0x6e, 0x74, + 0x6f, 0x2e, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x56, 0x31, 0xca, 0x02, + 0x12, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x49, 0x6e, 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1e, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x49, 0x6e, 0x66, 0x6c, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x14, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x49, 0x6e, + 0x66, 0x6c, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/api/canto/onboarding/v1/genesis.pulsar.go b/api/canto/onboarding/v1/genesis.pulsar.go index f8ad2da5b..98cfa15cd 100644 --- a/api/canto/onboarding/v1/genesis.pulsar.go +++ b/api/canto/onboarding/v1/genesis.pulsar.go @@ -2,6 +2,7 @@ package onboardingv1 import ( + _ "cosmossdk.io/api/amino" fmt "fmt" _ "github.com/cosmos/cosmos-proto" runtime "github.com/cosmos/cosmos-proto/runtime" @@ -1159,37 +1160,41 @@ var file_canto_onboarding_v1_genesis_proto_rawDesc = []byte{ 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x1a, 0x14, 0x67, 0x6f, 0x67, 0x6f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x6f, 0x67, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x19, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x63, 0x6f, 0x73, - 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x49, 0x0a, 0x0c, 0x47, 0x65, 0x6e, - 0x65, 0x73, 0x69, 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x39, 0x0a, 0x06, 0x70, 0x61, 0x72, - 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, 0x61, 0x6e, 0x74, - 0x6f, 0x2e, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, - 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, 0x06, 0x70, 0x61, - 0x72, 0x61, 0x6d, 0x73, 0x22, 0xc5, 0x01, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, - 0x2b, 0x0a, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, - 0x64, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x65, 0x6e, 0x61, 0x62, - 0x6c, 0x65, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x12, 0x5b, 0x0a, 0x13, - 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73, 0x77, 0x61, 0x70, 0x5f, 0x74, 0x68, 0x72, 0x65, 0x73, 0x68, - 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x2b, 0xc8, 0xde, 0x1f, 0x00, 0xda, - 0xde, 0x1f, 0x15, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, - 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x49, 0x6e, 0x74, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, 0x6f, 0x73, 0x6d, - 0x6f, 0x73, 0x2e, 0x49, 0x6e, 0x74, 0x52, 0x11, 0x61, 0x75, 0x74, 0x6f, 0x53, 0x77, 0x61, 0x70, - 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x31, 0x0a, 0x14, 0x77, 0x68, 0x69, - 0x74, 0x65, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, - 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x13, 0x77, 0x68, 0x69, 0x74, 0x65, 0x6c, 0x69, - 0x73, 0x74, 0x65, 0x64, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x42, 0xc8, 0x01, 0x0a, - 0x17, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x6f, 0x6e, 0x62, 0x6f, 0x61, - 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, - 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, - 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, 0x74, 0x6f, - 0x2f, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x3b, 0x6f, - 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x76, 0x31, 0xa2, 0x02, 0x03, 0x43, 0x4f, - 0x58, 0xaa, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, - 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, - 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5c, 0x56, 0x31, 0xe2, 0x02, 0x1f, - 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, - 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, - 0x02, 0x15, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, - 0x69, 0x6e, 0x67, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6d, 0x6f, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x11, 0x61, 0x6d, 0x69, 0x6e, 0x6f, + 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x49, 0x0a, 0x0c, + 0x47, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x39, 0x0a, 0x06, + 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x63, + 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, + 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x04, 0xc8, 0xde, 0x1f, 0x00, 0x52, + 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0xe5, 0x01, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, + 0x6d, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x6f, 0x6e, 0x62, + 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x65, + 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x12, + 0x5b, 0x0a, 0x13, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x73, 0x77, 0x61, 0x70, 0x5f, 0x74, 0x68, 0x72, + 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x2b, 0xc8, 0xde, + 0x1f, 0x00, 0xda, 0xde, 0x1f, 0x15, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, + 0x69, 0x6f, 0x2f, 0x6d, 0x61, 0x74, 0x68, 0x2e, 0x49, 0x6e, 0x74, 0xd2, 0xb4, 0x2d, 0x0a, 0x63, + 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x49, 0x6e, 0x74, 0x52, 0x11, 0x61, 0x75, 0x74, 0x6f, 0x53, + 0x77, 0x61, 0x70, 0x54, 0x68, 0x72, 0x65, 0x73, 0x68, 0x6f, 0x6c, 0x64, 0x12, 0x31, 0x0a, 0x14, + 0x77, 0x68, 0x69, 0x74, 0x65, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x63, 0x68, 0x61, 0x6e, + 0x6e, 0x65, 0x6c, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x13, 0x77, 0x68, 0x69, 0x74, + 0x65, 0x6c, 0x69, 0x73, 0x74, 0x65, 0x64, 0x43, 0x68, 0x61, 0x6e, 0x6e, 0x65, 0x6c, 0x73, 0x3a, + 0x1e, 0x8a, 0xe7, 0xb0, 0x2a, 0x19, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x78, 0x2f, 0x6f, 0x6e, + 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, + 0xc8, 0x01, 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x6f, 0x6e, + 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x42, 0x0c, 0x47, 0x65, 0x6e, + 0x65, 0x73, 0x69, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x63, 0x6f, 0x73, + 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, + 0x6e, 0x74, 0x6f, 0x2f, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x76, + 0x31, 0x3b, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x76, 0x31, 0xa2, 0x02, + 0x03, 0x43, 0x4f, 0x58, 0xaa, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x4f, 0x6e, 0x62, + 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x13, 0x43, 0x61, 0x6e, + 0x74, 0x6f, 0x5c, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5c, 0x56, 0x31, + 0xe2, 0x02, 0x1f, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, + 0x69, 0x6e, 0x67, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0xea, 0x02, 0x15, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x4f, 0x6e, 0x62, 0x6f, + 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/api/canto/onboarding/v1/tx.pulsar.go b/api/canto/onboarding/v1/tx.pulsar.go index ca5e73311..37fb472d5 100644 --- a/api/canto/onboarding/v1/tx.pulsar.go +++ b/api/canto/onboarding/v1/tx.pulsar.go @@ -976,7 +976,7 @@ var file_canto_onboarding_v1_tx_proto_rawDesc = []byte{ 0x6d, 0x69, 0x6e, 0x6f, 0x2f, 0x61, 0x6d, 0x69, 0x6e, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x65, 0x6e, 0x65, 0x73, 0x69, 0x73, 0x2e, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x22, 0xb3, 0x01, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, + 0x6f, 0x74, 0x6f, 0x22, 0xc0, 0x01, 0x0a, 0x0f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x36, 0x0a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0xd2, 0xb4, 0x2d, 0x14, 0x63, 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x2e, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x53, 0x74, @@ -985,31 +985,32 @@ var file_canto_onboarding_v1_tx_proto_rawDesc = []byte{ 0x1b, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x42, 0x09, 0xc8, 0xde, 0x1f, 0x00, 0xa8, 0xe7, 0xb0, 0x2a, 0x01, 0x52, 0x06, 0x70, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x3a, - 0x28, 0x82, 0xe7, 0xb0, 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x8a, - 0xe7, 0xb0, 0x2a, 0x15, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, - 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x73, 0x67, - 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x32, 0x70, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x62, 0x0a, 0x0c, 0x55, - 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x24, 0x2e, 0x63, 0x61, - 0x6e, 0x74, 0x6f, 0x2e, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x76, - 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, - 0x73, 0x1a, 0x2c, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, - 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, - 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, - 0x05, 0x80, 0xe7, 0xb0, 0x2a, 0x01, 0x42, 0xc3, 0x01, 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x2e, 0x63, - 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, - 0x76, 0x31, 0x42, 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x63, - 0x6f, 0x73, 0x6d, 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, - 0x2f, 0x76, 0x31, 0x3b, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x76, 0x31, - 0xa2, 0x02, 0x03, 0x43, 0x4f, 0x58, 0xaa, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x4f, - 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x13, 0x43, - 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5c, - 0x56, 0x31, 0xe2, 0x02, 0x1f, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x4f, 0x6e, 0x62, 0x6f, 0x61, - 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x15, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x4f, 0x6e, - 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x35, 0x82, 0xe7, 0xb0, 0x2a, 0x09, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x69, 0x74, 0x79, 0x8a, + 0xe7, 0xb0, 0x2a, 0x22, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2f, 0x78, 0x2f, 0x6f, 0x6e, 0x62, 0x6f, + 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x22, 0x19, 0x0a, 0x17, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x32, 0x70, 0x0a, 0x03, 0x4d, 0x73, 0x67, 0x12, 0x62, 0x0a, 0x0c, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x24, 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, + 0x2e, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4d, + 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x1a, 0x2c, + 0x2e, 0x63, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, + 0x67, 0x2e, 0x76, 0x31, 0x2e, 0x4d, 0x73, 0x67, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x50, 0x61, + 0x72, 0x61, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x1a, 0x05, 0x80, 0xe7, + 0xb0, 0x2a, 0x01, 0x42, 0xc3, 0x01, 0x0a, 0x17, 0x63, 0x6f, 0x6d, 0x2e, 0x63, 0x61, 0x6e, 0x74, + 0x6f, 0x2e, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x76, 0x31, 0x42, + 0x07, 0x54, 0x78, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x31, 0x63, 0x6f, 0x73, 0x6d, + 0x6f, 0x73, 0x73, 0x64, 0x6b, 0x2e, 0x69, 0x6f, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x61, 0x6e, + 0x74, 0x6f, 0x2f, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2f, 0x76, 0x31, + 0x3b, 0x6f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x76, 0x31, 0xa2, 0x02, 0x03, + 0x43, 0x4f, 0x58, 0xaa, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x2e, 0x4f, 0x6e, 0x62, 0x6f, + 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x2e, 0x56, 0x31, 0xca, 0x02, 0x13, 0x43, 0x61, 0x6e, 0x74, + 0x6f, 0x5c, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, 0x6e, 0x67, 0x5c, 0x56, 0x31, 0xe2, + 0x02, 0x1f, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x5c, 0x4f, 0x6e, 0x62, 0x6f, 0x61, 0x72, 0x64, 0x69, + 0x6e, 0x67, 0x5c, 0x56, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, + 0x61, 0xea, 0x02, 0x15, 0x43, 0x61, 0x6e, 0x74, 0x6f, 0x3a, 0x3a, 0x4f, 0x6e, 0x62, 0x6f, 0x61, + 0x72, 0x64, 0x69, 0x6e, 0x67, 0x3a, 0x3a, 0x56, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/app/amino_test.go b/app/amino_test.go new file mode 100644 index 000000000..7369d11b7 --- /dev/null +++ b/app/amino_test.go @@ -0,0 +1,211 @@ +package app + +import ( + "context" + "fmt" + "testing" + + "github.com/stretchr/testify/require" + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/reflect/protoregistry" + "pgregory.net/rapid" + + "github.com/cosmos/cosmos-proto/rapidproto" + + authapi "cosmossdk.io/api/cosmos/auth/v1beta1" + v1beta1 "cosmossdk.io/api/cosmos/base/v1beta1" + msgv1 "cosmossdk.io/api/cosmos/msg/v1" + txv1beta1 "cosmossdk.io/api/cosmos/tx/v1beta1" + "cosmossdk.io/x/tx/signing/aminojson" + signing_testutil "cosmossdk.io/x/tx/signing/testutil" + "github.com/cosmos/cosmos-sdk/testutil/testdata" + "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/bech32" + "github.com/cosmos/cosmos-sdk/types/module/testutil" + signingtypes "github.com/cosmos/cosmos-sdk/types/tx/signing" + "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" + "github.com/cosmos/cosmos-sdk/x/auth/signing" + "github.com/cosmos/cosmos-sdk/x/auth/tx" + + coinswapapi "github.com/Canto-Network/Canto/v7/api/canto/coinswap/v1" + csrapi "github.com/Canto-Network/Canto/v7/api/canto/csr/v1" + govshuttleapi "github.com/Canto-Network/Canto/v7/api/canto/govshuttle/v1" + inflationapi "github.com/Canto-Network/Canto/v7/api/canto/inflation/v1" + onboardingapi "github.com/Canto-Network/Canto/v7/api/canto/onboarding/v1" + "github.com/Canto-Network/Canto/v7/x/coinswap" + coinswaptypes "github.com/Canto-Network/Canto/v7/x/coinswap/types" + "github.com/Canto-Network/Canto/v7/x/csr" + csrtypes "github.com/Canto-Network/Canto/v7/x/csr/types" + "github.com/Canto-Network/Canto/v7/x/epochs" + "github.com/Canto-Network/Canto/v7/x/erc20" + "github.com/Canto-Network/Canto/v7/x/govshuttle" + govshuttletypes "github.com/Canto-Network/Canto/v7/x/govshuttle/types" + "github.com/Canto-Network/Canto/v7/x/inflation" + inflationtypes "github.com/Canto-Network/Canto/v7/x/inflation/types" + "github.com/Canto-Network/Canto/v7/x/onboarding" + onboardingtypes "github.com/Canto-Network/Canto/v7/x/onboarding/types" +) + +// TestAminoJSON_Equivalence tests that x/tx/Encoder encoding is equivalent to the legacy Encoder encoding. +// A custom generator is used to generate random messages that are then encoded using both encoders. The custom +// generator only supports proto.Message (which implement the protoreflect API) so in order to test legacy gogo types +// we end up with a workflow as follows: +// +// 1. Generate a random protobuf proto.Message using the custom generator +// 2. Marshal the proto.Message to protobuf binary bytes +// 3. Unmarshal the protobuf bytes to a gogoproto.Message +// 4. Marshal the gogoproto.Message to amino JSON bytes +// 5. Marshal the proto.Message to amino JSON bytes +// 6. Compare the amino JSON bytes from steps 4 and 5 +// +// In order for step 3 to work certain restrictions on the data generated in step 1 must be enforced and are described +// by the mutation of genOpts passed to the generator. +func TestAminoJSON_Equivalence(t *testing.T) { + encCfg := testutil.MakeTestEncodingConfig( + coinswap.AppModuleBasic{}, + csr.AppModuleBasic{}, + epochs.AppModuleBasic{}, + erc20.AppModuleBasic{}, + govshuttle.AppModuleBasic{}, + inflation.AppModuleBasic{}, + onboarding.AppModuleBasic{}) + legacytx.RegressionTestingAminoCodec = encCfg.Amino + aj := aminojson.NewEncoder(aminojson.EncoderOptions{DoNotSortFields: true}) + + GenOpts := rapidproto.GeneratorOptions{ + Resolver: protoregistry.GlobalTypes, + FieldMaps: []rapidproto.FieldMapper{GeneratorFieldMapper}, + } + + testedMsgs := []GeneratedType{ + // coinswap + GenType(&coinswaptypes.MsgAddLiquidity{}, &coinswapapi.MsgAddLiquidity{}, GenOpts.WithDisallowNil()), + GenType(&coinswaptypes.MsgRemoveLiquidity{}, &coinswapapi.MsgRemoveLiquidity{}, GenOpts.WithDisallowNil()), + GenType(&coinswaptypes.MsgSwapOrder{}, &coinswapapi.MsgSwapOrder{}, GenOpts.WithDisallowNil()), + GenType(&coinswaptypes.MsgUpdateParams{}, &coinswapapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + GenType(&coinswaptypes.Params{}, &coinswapapi.Params{}, GenOpts.WithDisallowNil()), + + // csr + GenType(&csrtypes.MsgUpdateParams{}, &csrapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + GenType(&csrtypes.Params{}, &csrapi.Params{}, GenOpts.WithDisallowNil()), + + // inflation + GenType(&inflationtypes.MsgUpdateParams{}, &inflationapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + GenType(&inflationtypes.Params{}, &inflationapi.Params{}, GenOpts.WithDisallowNil()), + + // onboarding + GenType(&onboardingtypes.MsgUpdateParams{}, &onboardingapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + GenType(&onboardingtypes.Params{}, &onboardingapi.Params{}, GenOpts.WithDisallowNil()), + + // govshuttle + GenType(&govshuttletypes.LendingMarketProposal{}, &govshuttleapi.LendingMarketProposal{}, GenOpts.WithDisallowNil()), + GenType(&govshuttletypes.TreasuryProposal{}, &govshuttleapi.TreasuryProposal{}, GenOpts.WithDisallowNil()), + } + + for _, tt := range testedMsgs { + desc := tt.Pulsar.ProtoReflect().Descriptor() + name := string(desc.FullName()) + t.Run(name, func(t *testing.T) { + gen := rapidproto.MessageGenerator(tt.Pulsar, tt.Opts) + fmt.Printf("testing %s\n", tt.Pulsar.ProtoReflect().Descriptor().FullName()) + rapid.Check(t, func(t *rapid.T) { + // uncomment to debug; catch a panic and inspect application state + // defer func() { + // if r := recover(); r != nil { + // //fmt.Printf("Panic: %+v\n", r) + // t.FailNow() + // } + // }() + + msg := gen.Draw(t, "msg") + postFixPulsarMessage(msg) + + gogo := tt.Gogo + sanity := tt.Pulsar + + protoBz, err := proto.Marshal(msg) + require.NoError(t, err) + + err = proto.Unmarshal(protoBz, sanity) + require.NoError(t, err) + + err = encCfg.Codec.Unmarshal(protoBz, gogo) + require.NoError(t, err) + + legacyAminoJSON, err := encCfg.Amino.MarshalJSON(gogo) + require.NoError(t, err) + aminoJSON, err := aj.Marshal(msg) + require.NoError(t, err) + require.Equal(t, string(legacyAminoJSON), string(aminoJSON)) + + // test amino json signer handler equivalence + if !proto.HasExtension(desc.Options(), msgv1.E_Signer) { + // not signable + return + } + + handlerOptions := signing_testutil.HandlerArgumentOptions{ + ChainID: "test-chain", + Memo: "sometestmemo", + Msg: tt.Pulsar, + AccNum: 1, + AccSeq: 2, + SignerAddress: "signerAddress", + Fee: &txv1beta1.Fee{ + Amount: []*v1beta1.Coin{{Denom: "uatom", Amount: "1000"}}, + }, + } + + signerData, txData, err := signing_testutil.MakeHandlerArguments(handlerOptions) + require.NoError(t, err) + + handler := aminojson.NewSignModeHandler(aminojson.SignModeHandlerOptions{}) + signBz, err := handler.GetSignBytes(context.Background(), signerData, txData) + require.NoError(t, err) + + legacyHandler := tx.NewSignModeLegacyAminoJSONHandler() + txBuilder := encCfg.TxConfig.NewTxBuilder() + require.NoError(t, txBuilder.SetMsgs([]types.Msg{tt.Gogo}...)) + txBuilder.SetMemo(handlerOptions.Memo) + txBuilder.SetFeeAmount(types.Coins{types.NewInt64Coin("uatom", 1000)}) + theTx := txBuilder.GetTx() + + legacySigningData := signing.SignerData{ + ChainID: handlerOptions.ChainID, + Address: handlerOptions.SignerAddress, + AccountNumber: handlerOptions.AccNum, + Sequence: handlerOptions.AccSeq, + } + legacySignBz, err := legacyHandler.GetSignBytes(signingtypes.SignMode_SIGN_MODE_LEGACY_AMINO_JSON, + legacySigningData, theTx) + require.NoError(t, err) + require.Equal(t, string(legacySignBz), string(signBz)) + }) + }) + } +} + +func postFixPulsarMessage(msg proto.Message) { + if m, ok := msg.(*authapi.ModuleAccount); ok { + if m.BaseAccount == nil { + m.BaseAccount = &authapi.BaseAccount{} + } + _, _, bz := testdata.KeyTestPubAddr() + // always set address to a valid bech32 address + text, _ := bech32.ConvertAndEncode("cosmos", bz) + m.BaseAccount.Address = text + + // see negative test + if len(m.Permissions) == 0 { + m.Permissions = nil + } + } + + if m, ok := msg.(*coinswapapi.MsgUpdateParams); ok { + m.Params.MaxStandardCoinPerPool = "10" + } + + if m, ok := msg.(*coinswapapi.Params); ok { + m.MaxStandardCoinPerPool = "10" + } +} diff --git a/app/app.go b/app/app.go index 5b3373408..ba8f558ec 100644 --- a/app/app.go +++ b/app/app.go @@ -34,7 +34,6 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/log" sdkmath "cosmossdk.io/math" - "cosmossdk.io/simapp" simappparams "cosmossdk.io/simapp/params" storetypes "cosmossdk.io/store/types" "cosmossdk.io/x/evidence" @@ -335,12 +334,7 @@ func NewCanto( eip712.SetEncodingConfig(encodingConfig) - // create and set dummy vote extension handler - voteExtOp := func(bApp *baseapp.BaseApp) { - voteExtHandler := simapp.NewVoteExtensionHandler() - voteExtHandler.SetHandlers(bApp) - } - baseAppOptions = append(baseAppOptions, voteExtOp, baseapp.SetOptimisticExecution()) + baseAppOptions = append(baseAppOptions, baseapp.SetOptimisticExecution()) // NOTE we use custom transaction decoder that supports the sdk.Tx interface instead of sdk.StdTx // Setup Mempool and Proposal Handlers @@ -427,7 +421,7 @@ func NewCanto( ethermint.ProtoAccount, maccPerms, authcodec.NewBech32Codec(sdk.GetConfig().GetBech32AccountAddrPrefix()), - sdk.Bech32MainPrefix, + sdk.GetConfig().GetBech32AccountAddrPrefix(), authtypes.NewModuleAddress(govtypes.ModuleName).String(), ) app.BankKeeper = bankkeeper.NewBaseKeeper( @@ -767,7 +761,7 @@ func NewCanto( erc20.NewAppModule(app.Erc20Keeper, app.AccountKeeper, app.AccountKeeper.AddressCodec()), epochs.NewAppModule(appCodec, app.EpochsKeeper), onboarding.NewAppModule(*app.OnboardingKeeper), - govshuttle.NewAppModule(app.GovshuttleKeeper, app.AccountKeeper), + govshuttle.NewAppModule(app.GovshuttleKeeper, app.AccountKeeper, app.AccountKeeper.AddressCodec()), csr.NewAppModule(app.CSRKeeper, app.AccountKeeper), coinswap.NewAppModule(appCodec, app.CoinswapKeeper, app.AccountKeeper, app.BankKeeper), ) @@ -1066,7 +1060,7 @@ func (app *Canto) Configurator() module.Configurator { // InitChainer updates at chain initialization func (app *Canto) InitChainer(ctx sdk.Context, req *abci.RequestInitChain) (*abci.ResponseInitChain, error) { - var genesisState simapp.GenesisState + var genesisState GenesisState if err := json.Unmarshal(req.AppStateBytes, &genesisState); err != nil { panic(err) } diff --git a/app/export.go b/app/export.go index b8408023b..6d016f3d2 100644 --- a/app/export.go +++ b/app/export.go @@ -7,7 +7,6 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "cosmossdk.io/log" - "cosmossdk.io/simapp" storetypes "cosmossdk.io/store/types" dbm "github.com/cosmos/cosmos-db" servertypes "github.com/cosmos/cosmos-sdk/server/types" @@ -19,7 +18,7 @@ import ( ) // NewDefaultGenesisState generates the default state for the application. -func NewDefaultGenesisState() simapp.GenesisState { +func NewDefaultGenesisState() GenesisState { tempApp := NewCanto( log.NewNopLogger(), dbm.NewMemDB(), diff --git a/app/rapidgen.go b/app/rapidgen.go new file mode 100644 index 000000000..39d4518c5 --- /dev/null +++ b/app/rapidgen.go @@ -0,0 +1,288 @@ +package app + +import ( + "fmt" + + cosmos_proto "github.com/cosmos/cosmos-proto" + "github.com/cosmos/cosmos-proto/rapidproto" + gogoproto "github.com/cosmos/gogoproto/proto" + "google.golang.org/protobuf/proto" + "google.golang.org/protobuf/reflect/protoreflect" + "google.golang.org/protobuf/reflect/protoregistry" + "pgregory.net/rapid" + + authapi "cosmossdk.io/api/cosmos/auth/v1beta1" + authzapi "cosmossdk.io/api/cosmos/authz/v1beta1" + bankapi "cosmossdk.io/api/cosmos/bank/v1beta1" + consensusapi "cosmossdk.io/api/cosmos/consensus/v1" + "cosmossdk.io/api/cosmos/crypto/ed25519" + multisigapi "cosmossdk.io/api/cosmos/crypto/multisig" + "cosmossdk.io/api/cosmos/crypto/secp256k1" + distapi "cosmossdk.io/api/cosmos/distribution/v1beta1" + evidenceapi "cosmossdk.io/api/cosmos/evidence/v1beta1" + feegrantapi "cosmossdk.io/api/cosmos/feegrant/v1beta1" + gov_v1_api "cosmossdk.io/api/cosmos/gov/v1" + gov_v1beta1_api "cosmossdk.io/api/cosmos/gov/v1beta1" + groupapi "cosmossdk.io/api/cosmos/group/v1" + mintapi "cosmossdk.io/api/cosmos/mint/v1beta1" + paramsapi "cosmossdk.io/api/cosmos/params/v1beta1" + slashingapi "cosmossdk.io/api/cosmos/slashing/v1beta1" + stakingapi "cosmossdk.io/api/cosmos/staking/v1beta1" + upgradeapi "cosmossdk.io/api/cosmos/upgrade/v1beta1" + vestingapi "cosmossdk.io/api/cosmos/vesting/v1beta1" + evidencetypes "cosmossdk.io/x/evidence/types" + feegranttypes "cosmossdk.io/x/feegrant" + upgradetypes "cosmossdk.io/x/upgrade/types" + + "github.com/cosmos/cosmos-sdk/crypto/keys/multisig" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" + authztypes "github.com/cosmos/cosmos-sdk/x/authz" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + consensustypes "github.com/cosmos/cosmos-sdk/x/consensus/types" + disttypes "github.com/cosmos/cosmos-sdk/x/distribution/types" + gov_v1_types "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + gov_v1beta1_types "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" + grouptypes "github.com/cosmos/cosmos-sdk/x/group" + minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" + "github.com/cosmos/cosmos-sdk/x/params/types/proposal" + slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" +) + +type GeneratedType struct { + Pulsar proto.Message + Gogo gogoproto.Message + Opts rapidproto.GeneratorOptions +} + +func GenType(gogo gogoproto.Message, pulsar proto.Message, opts rapidproto.GeneratorOptions) GeneratedType { + return GeneratedType{ + Pulsar: pulsar, + Gogo: gogo, + Opts: opts, + } +} + +func WithDecisionPolicy(opts rapidproto.GeneratorOptions) rapidproto.GeneratorOptions { + return opts. + WithAnyTypes( + &groupapi.ThresholdDecisionPolicy{}, + &groupapi.PercentageDecisionPolicy{}). + WithDisallowNil(). + WithInterfaceHint("cosmos.group.v1.DecisionPolicy", &groupapi.ThresholdDecisionPolicy{}). + WithInterfaceHint("cosmos.group.v1.DecisionPolicy", &groupapi.PercentageDecisionPolicy{}) +} + +func GeneratorFieldMapper(t *rapid.T, field protoreflect.FieldDescriptor, name string) (protoreflect.Value, bool) { + opts := field.Options() + if proto.HasExtension(opts, cosmos_proto.E_Scalar) { + scalar := proto.GetExtension(opts, cosmos_proto.E_Scalar).(string) + switch scalar { + case "cosmos.Int": + i32 := rapid.Int32().Draw(t, name) + return protoreflect.ValueOfString(fmt.Sprintf("%d", i32)), true + case "cosmos.Dec": + if field.Kind() == protoreflect.BytesKind { + return protoreflect.ValueOfBytes([]byte{}), true + } + + return protoreflect.ValueOfString(""), true + } + } + + return protoreflect.Value{}, false +} + +var ( + GenOpts = rapidproto.GeneratorOptions{ + Resolver: protoregistry.GlobalTypes, + FieldMaps: []rapidproto.FieldMapper{GeneratorFieldMapper}, + } + SignableTypes = []GeneratedType{ + // auth + GenType(&authtypes.MsgUpdateParams{}, &authapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + + // authz + GenType(&authztypes.MsgGrant{}, &authzapi.MsgGrant{}, + GenOpts.WithAnyTypes(&authzapi.GenericAuthorization{}). + WithInterfaceHint("cosmos.authz.v1beta1.Authorization", &authzapi.GenericAuthorization{}). + WithDisallowNil(), + ), + GenType(&authztypes.MsgExec{}, &authzapi.MsgExec{}, + GenOpts.WithAnyTypes(&authzapi.MsgGrant{}, &authzapi.GenericAuthorization{}). + WithDisallowNil(). + WithInterfaceHint("cosmos.authz.v1beta1.Authorization", &authzapi.GenericAuthorization{}). + WithInterfaceHint("cosmos.base.v1beta1.Msg", &authzapi.MsgGrant{}), + ), + + // bank + GenType(&banktypes.MsgSend{}, &bankapi.MsgSend{}, GenOpts.WithDisallowNil()), + GenType(&banktypes.MsgMultiSend{}, &bankapi.MsgMultiSend{}, GenOpts.WithDisallowNil()), + GenType(&banktypes.MsgUpdateParams{}, &bankapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + GenType(&banktypes.MsgSetSendEnabled{}, &bankapi.MsgSetSendEnabled{}, GenOpts), + + // consensus + GenType(&consensustypes.MsgUpdateParams{}, &consensusapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + + // distribution + GenType(&disttypes.MsgWithdrawDelegatorReward{}, &distapi.MsgWithdrawDelegatorReward{}, GenOpts), + GenType(&disttypes.MsgWithdrawValidatorCommission{}, &distapi.MsgWithdrawValidatorCommission{}, GenOpts), + GenType(&disttypes.MsgSetWithdrawAddress{}, &distapi.MsgSetWithdrawAddress{}, GenOpts), + GenType(&disttypes.MsgFundCommunityPool{}, &distapi.MsgFundCommunityPool{}, GenOpts), // nolint:staticcheck // testing legacy code path + GenType(&disttypes.MsgUpdateParams{}, &distapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + GenType(&disttypes.MsgCommunityPoolSpend{}, &distapi.MsgCommunityPoolSpend{}, GenOpts), // nolint:staticcheck // testing legacy code path + GenType(&disttypes.MsgDepositValidatorRewardsPool{}, &distapi.MsgDepositValidatorRewardsPool{}, GenOpts), + + // evidence + GenType(&evidencetypes.MsgSubmitEvidence{}, &evidenceapi.MsgSubmitEvidence{}, + GenOpts.WithAnyTypes(&evidenceapi.Equivocation{}). + WithDisallowNil(). + WithInterfaceHint("cosmos.evidence.v1beta1.Evidence", &evidenceapi.Equivocation{})), + + // feegrant + GenType(&feegranttypes.MsgGrantAllowance{}, &feegrantapi.MsgGrantAllowance{}, + GenOpts.WithDisallowNil(). + WithAnyTypes( + &feegrantapi.BasicAllowance{}, + &feegrantapi.PeriodicAllowance{}). + WithInterfaceHint("cosmos.feegrant.v1beta1.FeeAllowanceI", &feegrantapi.BasicAllowance{}). + WithInterfaceHint("cosmos.feegrant.v1beta1.FeeAllowanceI", &feegrantapi.PeriodicAllowance{}), + ), + GenType(&feegranttypes.MsgRevokeAllowance{}, &feegrantapi.MsgRevokeAllowance{}, GenOpts), + + // gov v1beta1 + GenType(&gov_v1beta1_types.MsgSubmitProposal{}, &gov_v1beta1_api.MsgSubmitProposal{}, + GenOpts.WithAnyTypes(&gov_v1beta1_api.TextProposal{}). + WithDisallowNil(). + WithInterfaceHint("cosmos.gov.v1beta1.Content", &gov_v1beta1_api.TextProposal{}), + ), + GenType(&gov_v1beta1_types.MsgDeposit{}, &gov_v1beta1_api.MsgDeposit{}, GenOpts), + GenType(&gov_v1beta1_types.MsgVote{}, &gov_v1beta1_api.MsgVote{}, GenOpts), + GenType(&gov_v1beta1_types.MsgVoteWeighted{}, &gov_v1beta1_api.MsgVoteWeighted{}, GenOpts), + + // gov v1 + GenType(&gov_v1_types.MsgSubmitProposal{}, &gov_v1_api.MsgSubmitProposal{}, + GenOpts.WithAnyTypes(&gov_v1_api.MsgVote{}, &gov_v1_api.MsgVoteWeighted{}, &gov_v1_api.MsgDeposit{}, + &gov_v1_api.MsgExecLegacyContent{}, &gov_v1_api.MsgUpdateParams{}). + WithInterfaceHint("cosmos.gov.v1beta1.Content", &gov_v1beta1_api.TextProposal{}). + WithDisallowNil(), + ), + GenType(&gov_v1_types.MsgDeposit{}, &gov_v1_api.MsgDeposit{}, GenOpts), + GenType(&gov_v1_types.MsgVote{}, &gov_v1_api.MsgVote{}, GenOpts), + GenType(&gov_v1_types.MsgVoteWeighted{}, &gov_v1_api.MsgVoteWeighted{}, GenOpts), + GenType(&gov_v1_types.MsgExecLegacyContent{}, &gov_v1_api.MsgExecLegacyContent{}, + GenOpts.WithAnyTypes(&gov_v1beta1_api.TextProposal{}). + WithDisallowNil(). + WithInterfaceHint("cosmos.gov.v1beta1.Content", &gov_v1beta1_api.TextProposal{})), + GenType(&gov_v1_types.MsgUpdateParams{}, &gov_v1_api.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + + // group + GenType(&grouptypes.MsgCreateGroup{}, &groupapi.MsgCreateGroup{}, GenOpts), + GenType(&grouptypes.MsgUpdateGroupMembers{}, &groupapi.MsgUpdateGroupMembers{}, GenOpts), + GenType(&grouptypes.MsgUpdateGroupAdmin{}, &groupapi.MsgUpdateGroupAdmin{}, GenOpts), + GenType(&grouptypes.MsgUpdateGroupMetadata{}, &groupapi.MsgUpdateGroupMetadata{}, GenOpts), + GenType(&grouptypes.MsgCreateGroupWithPolicy{}, &groupapi.MsgCreateGroupWithPolicy{}, + WithDecisionPolicy(GenOpts)), + GenType(&grouptypes.MsgCreateGroupPolicy{}, &groupapi.MsgCreateGroupPolicy{}, + WithDecisionPolicy(GenOpts)), + GenType(&grouptypes.MsgUpdateGroupPolicyAdmin{}, &groupapi.MsgUpdateGroupPolicyAdmin{}, GenOpts), + GenType(&grouptypes.MsgUpdateGroupPolicyDecisionPolicy{}, &groupapi.MsgUpdateGroupPolicyDecisionPolicy{}, + WithDecisionPolicy(GenOpts)), + GenType(&grouptypes.MsgUpdateGroupPolicyMetadata{}, &groupapi.MsgUpdateGroupPolicyMetadata{}, GenOpts), + GenType(&grouptypes.MsgSubmitProposal{}, &groupapi.MsgSubmitProposal{}, + GenOpts.WithDisallowNil(). + WithAnyTypes(&groupapi.MsgCreateGroup{}, &groupapi.MsgUpdateGroupMembers{}). + WithInterfaceHint("cosmos.base.v1beta1.Msg", &groupapi.MsgCreateGroup{}). + WithInterfaceHint("cosmos.base.v1beta1.Msg", &groupapi.MsgUpdateGroupMembers{}), + ), + GenType(&grouptypes.MsgVote{}, &groupapi.MsgVote{}, GenOpts), + GenType(&grouptypes.MsgExec{}, &groupapi.MsgExec{}, GenOpts), + GenType(&grouptypes.MsgLeaveGroup{}, &groupapi.MsgLeaveGroup{}, GenOpts), + + // mint + GenType(&minttypes.MsgUpdateParams{}, &mintapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + + // slashing + GenType(&slashingtypes.MsgUnjail{}, &slashingapi.MsgUnjail{}, GenOpts), + GenType(&slashingtypes.MsgUpdateParams{}, &slashingapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + + // staking + GenType(&stakingtypes.MsgCreateValidator{}, &stakingapi.MsgCreateValidator{}, + GenOpts.WithDisallowNil(). + WithAnyTypes(&ed25519.PubKey{}). + WithInterfaceHint("cosmos.crypto.PubKey", &ed25519.PubKey{}), + ), + GenType(&stakingtypes.MsgEditValidator{}, &stakingapi.MsgEditValidator{}, GenOpts.WithDisallowNil()), + GenType(&stakingtypes.MsgDelegate{}, &stakingapi.MsgDelegate{}, GenOpts.WithDisallowNil()), + GenType(&stakingtypes.MsgUndelegate{}, &stakingapi.MsgUndelegate{}, GenOpts.WithDisallowNil()), + GenType(&stakingtypes.MsgBeginRedelegate{}, &stakingapi.MsgBeginRedelegate{}, GenOpts.WithDisallowNil()), + GenType(&stakingtypes.MsgUpdateParams{}, &stakingapi.MsgUpdateParams{}, GenOpts.WithDisallowNil()), + + // upgrade + GenType(&upgradetypes.MsgSoftwareUpgrade{}, &upgradeapi.MsgSoftwareUpgrade{}, GenOpts.WithDisallowNil()), + GenType(&upgradetypes.MsgCancelUpgrade{}, &upgradeapi.MsgCancelUpgrade{}, GenOpts), + + // vesting + GenType(&vestingtypes.MsgCreateVestingAccount{}, &vestingapi.MsgCreateVestingAccount{}, GenOpts), + GenType(&vestingtypes.MsgCreatePermanentLockedAccount{}, &vestingapi.MsgCreatePermanentLockedAccount{}, GenOpts), + GenType(&vestingtypes.MsgCreatePeriodicVestingAccount{}, &vestingapi.MsgCreatePeriodicVestingAccount{}, GenOpts), + } + NonsignableTypes = []GeneratedType{ + GenType(&authtypes.Params{}, &authapi.Params{}, GenOpts), + GenType(&authtypes.BaseAccount{}, &authapi.BaseAccount{}, GenOpts.WithAnyTypes(&ed25519.PubKey{})), + GenType(&authtypes.ModuleAccount{}, &authapi.ModuleAccount{}, GenOpts.WithAnyTypes(&ed25519.PubKey{})), + GenType(&authtypes.ModuleCredential{}, &authapi.ModuleCredential{}, GenOpts), + + GenType(&authztypes.GenericAuthorization{}, &authzapi.GenericAuthorization{}, GenOpts), + GenType(&authztypes.Grant{}, &authzapi.Grant{}, + GenOpts.WithAnyTypes(&authzapi.GenericAuthorization{}). + WithDisallowNil(). + WithInterfaceHint("cosmos.authz.v1beta1.Authorization", &authzapi.GenericAuthorization{}), + ), + + GenType(&banktypes.SendAuthorization{}, &bankapi.SendAuthorization{}, GenOpts), + GenType(&banktypes.Params{}, &bankapi.Params{}, GenOpts), + + // crypto + GenType(&multisig.LegacyAminoPubKey{}, &multisigapi.LegacyAminoPubKey{}, + GenOpts.WithAnyTypes(&ed25519.PubKey{}, &secp256k1.PubKey{})), + + GenType(&disttypes.Params{}, &distapi.Params{}, GenOpts), + + GenType(&evidencetypes.Equivocation{}, &evidenceapi.Equivocation{}, GenOpts.WithDisallowNil()), + + GenType(&feegranttypes.BasicAllowance{}, &feegrantapi.BasicAllowance{}, GenOpts.WithDisallowNil()), + GenType(&feegranttypes.PeriodicAllowance{}, &feegrantapi.PeriodicAllowance{}, GenOpts.WithDisallowNil()), + GenType(&feegranttypes.AllowedMsgAllowance{}, &feegrantapi.AllowedMsgAllowance{}, + GenOpts.WithDisallowNil(). + WithAnyTypes( + &feegrantapi.BasicAllowance{}, + &feegrantapi.PeriodicAllowance{}). + WithInterfaceHint("cosmos.feegrant.v1beta1.FeeAllowanceI", &feegrantapi.BasicAllowance{}). + WithInterfaceHint("cosmos.feegrant.v1beta1.FeeAllowanceI", &feegrantapi.PeriodicAllowance{}), + ), + + GenType(&gov_v1beta1_types.TextProposal{}, &gov_v1beta1_api.TextProposal{}, GenOpts), + + GenType(&minttypes.Params{}, &mintapi.Params{}, GenOpts), + + // params + GenType(&proposal.ParameterChangeProposal{}, ¶msapi.ParameterChangeProposal{}, GenOpts), + + GenType(&slashingtypes.Params{}, &slashingapi.Params{}, GenOpts.WithDisallowNil()), + + GenType(&stakingtypes.StakeAuthorization{}, &stakingapi.StakeAuthorization{}, GenOpts), + + GenType(&upgradetypes.CancelSoftwareUpgradeProposal{}, &upgradeapi.CancelSoftwareUpgradeProposal{}, GenOpts), // nolint:staticcheck // testing legacy code path + GenType(&upgradetypes.SoftwareUpgradeProposal{}, &upgradeapi.SoftwareUpgradeProposal{}, GenOpts.WithDisallowNil()), // nolint:staticcheck // testing legacy code path + GenType(&upgradetypes.Plan{}, &upgradeapi.Plan{}, GenOpts.WithDisallowNil()), + + GenType(&vestingtypes.BaseVestingAccount{}, &vestingapi.BaseVestingAccount{}, GenOpts.WithDisallowNil()), + GenType(&vestingtypes.ContinuousVestingAccount{}, &vestingapi.ContinuousVestingAccount{}, GenOpts.WithDisallowNil()), + GenType(&vestingtypes.DelayedVestingAccount{}, &vestingapi.DelayedVestingAccount{}, GenOpts.WithDisallowNil()), + GenType(&vestingtypes.PermanentLockedAccount{}, &vestingapi.PermanentLockedAccount{}, GenOpts.WithDisallowNil()), + GenType(&vestingtypes.PeriodicVestingAccount{}, &vestingapi.PeriodicVestingAccount{}, GenOpts.WithDisallowNil()), + } + DefaultGeneratedTypes = append(SignableTypes, NonsignableTypes...) +) diff --git a/cmd/cantod/root.go b/cmd/cantod/root.go index 01c53767f..50a81e572 100644 --- a/cmd/cantod/root.go +++ b/cmd/cantod/root.go @@ -162,7 +162,7 @@ func NewRootCmd() (*cobra.Command, params.EncodingConfig) { ) autoCliOpts := tempApp.AutoCliOpts() - initClientCtx, _ = config.ReadFromClientConfig(initClientCtx) + initClientCtx, _ = config.ReadDefaultValuesFromDefaultClientConfig(initClientCtx) autoCliOpts.Keyring, _ = keyring.NewAutoCLIKeyring(initClientCtx.Keyring) autoCliOpts.ClientCtx = initClientCtx diff --git a/go.mod b/go.mod index 7f72319c8..9431e2e3c 100644 --- a/go.mod +++ b/go.mod @@ -9,7 +9,9 @@ require ( cosmossdk.io/client/v2 v2.0.0-beta.1 cosmossdk.io/collections v0.4.0 cosmossdk.io/core v0.12.0 + cosmossdk.io/errors v1.0.1 cosmossdk.io/log v1.3.1 + cosmossdk.io/math v1.3.0 cosmossdk.io/simapp v0.0.0-20231103111158-e83a20081ced cosmossdk.io/store v1.1.0 cosmossdk.io/tools/confix v0.1.0 @@ -39,12 +41,17 @@ require ( github.com/rakyll/statik v0.1.7 github.com/spf13/cast v1.6.0 github.com/spf13/cobra v1.8.0 + github.com/spf13/pflag v1.0.5 + github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.9.0 go.opencensus.io v0.24.0 + golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 + golang.org/x/sync v0.7.0 google.golang.org/genproto/googleapis/api v0.0.0-20240227224415-6ceb2ff114de google.golang.org/grpc v1.63.2 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v2 v2.4.0 + pgregory.net/rapid v1.1.0 ) require ( @@ -141,13 +148,10 @@ require ( google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect gotest.tools/v3 v3.5.1 // indirect - pgregory.net/rapid v1.1.0 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) require ( - cosmossdk.io/errors v1.0.1 - cosmossdk.io/math v1.3.0 filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/keyring v1.2.2 // indirect github.com/DataDog/zstd v1.5.5 // indirect @@ -229,8 +233,6 @@ require ( github.com/sasha-s/go-deadlock v0.3.1 // indirect github.com/shirou/gopsutil v3.21.4-0.20210419000835-c7a38de76ee5+incompatible // indirect github.com/spf13/afero v1.11.0 // indirect - github.com/spf13/pflag v1.0.5 - github.com/spf13/viper v1.18.2 github.com/status-im/keycard-go v0.2.0 // indirect github.com/subosito/gotenv v1.6.0 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d // indirect @@ -239,9 +241,7 @@ require ( github.com/zondax/hid v0.9.2 // indirect go.etcd.io/bbolt v1.3.8 // indirect golang.org/x/crypto v0.22.0 // indirect - golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 golang.org/x/net v0.24.0 // indirect - golang.org/x/sync v0.7.0 golang.org/x/sys v0.19.0 // indirect golang.org/x/term v0.19.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/init.sh b/init.sh index fd9793517..6a3d44cd2 100755 --- a/init.sh +++ b/init.sh @@ -30,7 +30,10 @@ cantod init $MONIKER --chain-id $CHAINID # Change parameter token denominations to acanto cat $HOME/.cantod/config/genesis.json | jq '.app_state["staking"]["params"]["bond_denom"]="acanto"' > $HOME/.cantod/config/tmp_genesis.json && mv $HOME/.cantod/config/tmp_genesis.json $HOME/.cantod/config/genesis.json cat $HOME/.cantod/config/genesis.json | jq '.app_state["crisis"]["constant_fee"]["denom"]="acanto"' > $HOME/.cantod/config/tmp_genesis.json && mv $HOME/.cantod/config/tmp_genesis.json $HOME/.cantod/config/genesis.json -cat $HOME/.cantod/config/genesis.json | jq '.app_state["gov"]["deposit_params"]["min_deposit"][0]["denom"]="acanto"' > $HOME/.cantod/config/tmp_genesis.json && mv $HOME/.cantod/config/tmp_genesis.json $HOME/.cantod/config/genesis.json +cat $HOME/.cantod/config/genesis.json | jq '.app_state["coinswap"]["params"]["pool_creation_fee"]["denom"]="acanto"' > $HOME/.cantod/config/tmp_genesis.json && mv $HOME/.cantod/config/tmp_genesis.json $HOME/.cantod/config/genesis.json +cat $HOME/.cantod/config/genesis.json | jq '.app_state["coinswap"]["standard_denom"]="acanto"' > $HOME/.cantod/config/tmp_genesis.json && mv $HOME/.cantod/config/tmp_genesis.json $HOME/.cantod/config/genesis.json +cat $HOME/.cantod/config/genesis.json | jq '.app_state["gov"]["params"]["min_deposit"][0]["denom"]="acanto"' > $HOME/.cantod/config/tmp_genesis.json && mv $HOME/.cantod/config/tmp_genesis.json $HOME/.cantod/config/genesis.json +cat $HOME/.cantod/config/genesis.json | jq '.app_state["gov"]["params"]["expedited_min_deposit"][0]["denom"]="acanto"' > $HOME/.cantod/config/tmp_genesis.json && mv $HOME/.cantod/config/tmp_genesis.json $HOME/.cantod/config/genesis.json cat $HOME/.cantod/config/genesis.json | jq '.app_state["evm"]["params"]["evm_denom"]="acanto"' > $HOME/.cantod/config/tmp_genesis.json && mv $HOME/.cantod/config/tmp_genesis.json $HOME/.cantod/config/genesis.json cat $HOME/.cantod/config/genesis.json | jq '.app_state["inflation"]["params"]["mint_denom"]="acanto"' > $HOME/.cantod/config/tmp_genesis.json && mv $HOME/.cantod/config/tmp_genesis.json $HOME/.cantod/config/genesis.json diff --git a/proto/canto/coinswap/v1/coinswap.proto b/proto/canto/coinswap/v1/coinswap.proto index 6a6459bce..d623552aa 100644 --- a/proto/canto/coinswap/v1/coinswap.proto +++ b/proto/canto/coinswap/v1/coinswap.proto @@ -4,6 +4,7 @@ package canto.coinswap.v1; import "cosmos/base/v1beta1/coin.proto"; import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; option go_package = "github.com/Canto-Network/Canto/v7/x/coinswap/types"; option (gogoproto.goproto_getters_all) = false; @@ -36,29 +37,35 @@ message Pool { message Params { option (gogoproto.equal) = true; option (gogoproto.goproto_stringer) = false; + option (amino.name) = "canto/x/coinswap/Params"; string fee = 1 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; cosmos.base.v1beta1.Coin pool_creation_fee = 2 - [ (gogoproto.nullable) = false ]; + [ (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; string tax_rate = 3 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; string max_standard_coin_per_pool = 4 [ (gogoproto.customtype) = "cosmossdk.io/math.Int", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; repeated cosmos.base.v1beta1.Coin max_swap_amount = 6 [ (gogoproto.castrepeated) = "github.com/cosmos/cosmos-sdk/types.Coins", + (amino.encoding) = "legacy_coins", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; } diff --git a/proto/canto/coinswap/v1/tx.proto b/proto/canto/coinswap/v1/tx.proto index 924a55ea8..74708ae7a 100644 --- a/proto/canto/coinswap/v1/tx.proto +++ b/proto/canto/coinswap/v1/tx.proto @@ -113,7 +113,7 @@ message MsgUpdateParams { // authority is the address that controls the module (defaults to x/gov unless // overwritten). string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; - option (amino.name) = "canto/MsgUpdateParams"; + option (amino.name) = "canto/x/coinswap/MsgUpdateParams"; // params defines the x/coinswap parameters to update. // diff --git a/proto/canto/csr/v1/params.proto b/proto/canto/csr/v1/params.proto index 203feeb2f..82bd68378 100644 --- a/proto/canto/csr/v1/params.proto +++ b/proto/canto/csr/v1/params.proto @@ -3,11 +3,14 @@ package canto.csr.v1; import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; option go_package = "github.com/Canto-Network/Canto/v7/x/csr/types"; // Params holds parameters for the csr module message Params { + option (amino.name) = "canto/x/csr/Params"; + // boolean to enable the csr module bool enable_csr = 1; // decimal to determine the transaction fee split between network operators @@ -15,6 +18,7 @@ message Params { string csr_shares = 2 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; } diff --git a/proto/canto/csr/v1/tx.proto b/proto/canto/csr/v1/tx.proto index 8e728cf86..d16488a3e 100644 --- a/proto/canto/csr/v1/tx.proto +++ b/proto/canto/csr/v1/tx.proto @@ -23,7 +23,7 @@ message MsgUpdateParams { // authority is the address that controls the module (defaults to x/gov unless // overwritten). string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; - option (amino.name) = "canto/MsgUpdateParams"; + option (amino.name) = "canto/x/csr/MsgUpdateParams"; // params defines the x/csr parameters to update. // diff --git a/proto/canto/govshuttle/v1/genesis.proto b/proto/canto/govshuttle/v1/genesis.proto index 5bc4b9a87..6413d5ca2 100644 --- a/proto/canto/govshuttle/v1/genesis.proto +++ b/proto/canto/govshuttle/v1/genesis.proto @@ -10,5 +10,6 @@ option go_package = "github.com/Canto-Network/Canto/v7/x/govshuttle/types"; // GenesisState defines the govshuttle module's genesis state. message GenesisState { Params params = 1 [ (gogoproto.nullable) = false ]; + string port_contract_addr = 2; // this line is used by starport scaffolding # genesis/proto/state } diff --git a/proto/canto/govshuttle/v1/govshuttle.proto b/proto/canto/govshuttle/v1/govshuttle.proto index 98eb34ddd..0c1ac4353 100644 --- a/proto/canto/govshuttle/v1/govshuttle.proto +++ b/proto/canto/govshuttle/v1/govshuttle.proto @@ -11,6 +11,8 @@ message Params { option (gogoproto.goproto_stringer) = false; } // Define this object so that the govshuttle.pb.go file is generate, implements // govtypes.Content +// Deprecated: This legacy proposal is deprecated in favor of Msg-based gov +// proposals, see MsgLendingMarketProposal. message LendingMarketProposal { option (gogoproto.equal) = false; option (cosmos_proto.implements_interface) = @@ -25,6 +27,8 @@ message LendingMarketProposal { } // treasury proposal type, +// Deprecated: This legacy proposal is deprecated in favor of Msg-based gov +// proposals, see MsgTreasuryProposal. message TreasuryProposal { option (gogoproto.equal) = false; option (cosmos_proto.implements_interface) = diff --git a/proto/canto/inflation/v1/genesis.proto b/proto/canto/inflation/v1/genesis.proto index a1d9bab28..23c877743 100644 --- a/proto/canto/inflation/v1/genesis.proto +++ b/proto/canto/inflation/v1/genesis.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package canto.inflation.v1; import "gogoproto/gogo.proto"; +import "amino/amino.proto"; import "canto/inflation/v1/inflation.proto"; @@ -23,14 +24,16 @@ message GenesisState { // Params holds parameters for the inflation module. message Params { + option (amino.name) = "canto/x/inflation/Params"; + // type of coin to mint string mint_denom = 1; // variables to calculate exponential inflation ExponentialCalculation exponential_calculation = 2 - [ (gogoproto.nullable) = false ]; + [ (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; // inflation distribution of the minted denom InflationDistribution inflation_distribution = 3 - [ (gogoproto.nullable) = false ]; + [ (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; // parameter to enable inflation and halt increasing the skipped_epochs bool enable_inflation = 4; } diff --git a/proto/canto/inflation/v1/inflation.proto b/proto/canto/inflation/v1/inflation.proto index 5b69db25f..7d4932982 100644 --- a/proto/canto/inflation/v1/inflation.proto +++ b/proto/canto/inflation/v1/inflation.proto @@ -3,6 +3,7 @@ package canto.inflation.v1; import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; option go_package = "github.com/Canto-Network/Canto/v7/x/inflation/types"; @@ -19,6 +20,7 @@ message InflationDistribution { string staking_rewards = 1 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; // // usage_incentives defines the proportion of the minted minted_denom that @@ -33,6 +35,7 @@ message InflationDistribution { string community_pool = 3 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; } @@ -47,30 +50,35 @@ message ExponentialCalculation { string a = 1 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; // reduction factor string r = 2 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; // long term inflation string c = 3 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; // bonding target string bonding_target = 4 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; // max variance string max_variance = 5 [ (cosmos_proto.scalar) = "cosmos.Dec", (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec", + (amino.dont_omitempty) = true, (gogoproto.nullable) = false ]; } diff --git a/proto/canto/inflation/v1/tx.proto b/proto/canto/inflation/v1/tx.proto index 12a3dd69d..b241ce29f 100644 --- a/proto/canto/inflation/v1/tx.proto +++ b/proto/canto/inflation/v1/tx.proto @@ -23,7 +23,7 @@ message MsgUpdateParams { // authority is the address that controls the module (defaults to x/gov unless // overwritten). string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; - option (amino.name) = "canto/MsgUpdateParams"; + option (amino.name) = "canto/x/inflation/MsgUpdateParams"; // params defines the x/inflation parameters to update. // diff --git a/proto/canto/onboarding/v1/genesis.proto b/proto/canto/onboarding/v1/genesis.proto index 0d76b11ae..e91aedf01 100644 --- a/proto/canto/onboarding/v1/genesis.proto +++ b/proto/canto/onboarding/v1/genesis.proto @@ -3,6 +3,7 @@ package canto.onboarding.v1; import "gogoproto/gogo.proto"; import "cosmos_proto/cosmos.proto"; +import "amino/amino.proto"; option go_package = "github.com/Canto-Network/Canto/v7/x/onboarding/types"; @@ -14,6 +15,8 @@ message GenesisState { // Params holds parameters for the onboarding module message Params { + option (amino.name) = "canto/x/onboarding/Params"; + // enable onboarding IBC middleware bool enable_onboarding = 1; diff --git a/proto/canto/onboarding/v1/tx.proto b/proto/canto/onboarding/v1/tx.proto index 5e05f1b7e..50a471b62 100644 --- a/proto/canto/onboarding/v1/tx.proto +++ b/proto/canto/onboarding/v1/tx.proto @@ -23,7 +23,7 @@ message MsgUpdateParams { // authority is the address that controls the module (defaults to x/gov unless // overwritten). string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ]; - option (amino.name) = "canto/MsgUpdateParams"; + option (amino.name) = "canto/x/onboarding/MsgUpdateParams"; // params defines the x/onboarding parameters to update. // diff --git a/x/coinswap/keeper/grpc_query_test.go b/x/coinswap/keeper/grpc_query_test.go index 022971122..615f97a93 100644 --- a/x/coinswap/keeper/grpc_query_test.go +++ b/x/coinswap/keeper/grpc_query_test.go @@ -7,7 +7,7 @@ import ( ) func (s *TestSuite) TestGRPCParams() { - resp, err := s.queryClient.Params(sdk.WrapSDKContext(s.ctx), &types.QueryParamsRequest{}) + resp, err := s.queryClient.Params(s.ctx, &types.QueryParamsRequest{}) s.Require().NoError(err) s.Require().Equal(s.keeper.GetParams(s.ctx), resp.Params) } @@ -17,7 +17,7 @@ func (s *TestSuite) TestGRPCPool() { poolId := types.GetPoolId(denomBTC) pool, _ := s.app.CoinswapKeeper.GetPool(s.ctx, poolId) - resp, err := s.queryClient.LiquidityPool(sdk.WrapSDKContext(s.ctx), &types.QueryLiquidityPoolRequest{LptDenom: pool.LptDenom}) + resp, err := s.queryClient.LiquidityPool(s.ctx, &types.QueryLiquidityPoolRequest{LptDenom: pool.LptDenom}) s.Require().NoError(err) s.Require().Equal(pool.Id, resp.Pool.Id) s.Require().Equal(pool.EscrowAddress, resp.Pool.EscrowAddress) @@ -36,12 +36,12 @@ func (s *TestSuite) TestGRPCPool() { func (s *TestSuite) TestGRPCPools() { _, _ = createReservePool(s, denomBTC) - resp, err := s.queryClient.LiquidityPools(sdk.WrapSDKContext(s.ctx), &types.QueryLiquidityPoolsRequest{}) + resp, err := s.queryClient.LiquidityPools(s.ctx, &types.QueryLiquidityPoolsRequest{}) s.Require().NoError(err) s.Require().Len(resp.Pools, 1) _, _ = createReservePool(s, denomETH) - resp, err = s.queryClient.LiquidityPools(sdk.WrapSDKContext(s.ctx), &types.QueryLiquidityPoolsRequest{}) + resp, err = s.queryClient.LiquidityPools(s.ctx, &types.QueryLiquidityPoolsRequest{}) s.Require().NoError(err) s.Require().Len(resp.Pools, 2) } diff --git a/x/coinswap/keeper/keeper_test.go b/x/coinswap/keeper/keeper_test.go index 495e5d6ae..06a6c45f4 100644 --- a/x/coinswap/keeper/keeper_test.go +++ b/x/coinswap/keeper/keeper_test.go @@ -93,6 +93,7 @@ func (suite *TestSuite) SetupTest() { suite.keeper = suite.app.CoinswapKeeper suite.queryClient = queryClient + suite.msgServer = keeper.NewMsgServerImpl(suite.keeper) sdk.SetCoinDenomRegex(func() string { return `[a-zA-Z][a-zA-Z0-9/\-]{2,127}` diff --git a/x/coinswap/keeper/msg_server.go b/x/coinswap/keeper/msg_server.go index 8844501af..cc5e885cb 100644 --- a/x/coinswap/keeper/msg_server.go +++ b/x/coinswap/keeper/msg_server.go @@ -56,14 +56,6 @@ func (m msgServer) AddLiquidity(goCtx context.Context, msg *types.MsgAddLiquidit return nil, err } - ctx.EventManager().EmitEvent( - sdk.NewEvent( - sdk.EventTypeMessage, - sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), - sdk.NewAttribute(sdk.AttributeKeySender, msg.Sender), - ), - ) - return &types.MsgAddLiquidityResponse{ MintToken: &mintToken, }, nil @@ -100,14 +92,6 @@ func (m msgServer) RemoveLiquidity(goCtx context.Context, msg *types.MsgRemoveLi return nil, err } - ctx.EventManager().EmitEvent( - sdk.NewEvent( - sdk.EventTypeMessage, - sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), - sdk.NewAttribute(sdk.AttributeKeySender, msg.Sender), - ), - ) - var coins = make([]*sdk.Coin, 0, withdrawCoins.Len()) for _, coin := range withdrawCoins { coins = append(coins, &coin) @@ -149,13 +133,6 @@ func (m msgServer) SwapCoin(goCtx context.Context, msg *types.MsgSwapOrder) (*ty return nil, err } - ctx.EventManager().EmitEvent( - sdk.NewEvent( - sdk.EventTypeMessage, - sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory), - sdk.NewAttribute(sdk.AttributeKeySender, msg.Input.Address), - ), - ) return &types.MsgSwapCoinResponse{}, nil } diff --git a/x/coinswap/keeper/msg_server_test.go b/x/coinswap/keeper/msg_server_test.go index f23aba363..a3bbddda1 100644 --- a/x/coinswap/keeper/msg_server_test.go +++ b/x/coinswap/keeper/msg_server_test.go @@ -4,6 +4,8 @@ import ( "math" sdkmath "cosmossdk.io/math" + "github.com/Canto-Network/Canto/v7/testutil" + "github.com/Canto-Network/Canto/v7/x/coinswap/types" "github.com/cometbft/cometbft/crypto/tmhash" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" @@ -11,15 +13,42 @@ import ( govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/evmos/ethermint/crypto/ethsecp256k1" - - "github.com/Canto-Network/Canto/v7/testutil" - "github.com/Canto-Network/Canto/v7/x/coinswap/types" ) var ( sender = sdk.AccAddress(tmhash.SumTruncated([]byte("sender"))).String() ) +func (suite *TestSuite) TestEventEmit() { + params := types.Params{ + Fee: sdkmath.LegacyNewDec(0), + PoolCreationFee: sdk.Coin{sdk.DefaultBondDenom, sdkmath.ZeroInt()}, + TaxRate: sdkmath.LegacyNewDec(0), + MaxStandardCoinPerPool: sdkmath.NewInt(10_000_000_000), + MaxSwapAmount: sdk.NewCoins( + sdk.NewInt64Coin("btc", 10_000_000), + ), + } + suite.app.CoinswapKeeper.SetParams(suite.ctx, params) + + msg := types.MsgAddLiquidity{ + MaxToken: sdk.NewCoin("btc", sdkmath.NewInt(1000)), + ExactStandardAmt: sdkmath.NewInt(100), + MinLiquidity: sdkmath.NewInt(100), + Deadline: 2611213344, + Sender: addrSender1.String(), + } + _, err := suite.msgServer.AddLiquidity(suite.ctx, &msg) + suite.NoError(err) + + events := suite.ctx.EventManager().Events() + found, index := findEventTypeIndex(events, sdk.EventTypeMessage) + suite.Require().True(found) + suite.Require().Equal("sender", events[index].Attributes[0].Key) + suite.Require().Equal(addrSender1.String(), events[index].Attributes[0].Value) + +} + func (suite *TestSuite) TestMsgSwapOrder_ValidateBasic() { msg := types.MsgSwapOrder{} suite.Require().Equal("/canto.coinswap.v1.MsgSwapOrder", sdk.MsgTypeURL(&msg)) @@ -362,3 +391,12 @@ func buildCoin(denom string, amt int64) sdk.Coin { Amount: sdkmath.NewInt(amt), } } + +func findEventTypeIndex(events sdk.Events, eventType string) (bool, int) { + for index, event := range events { + if event.Type == eventType { + return true, index + } + } + return false, -1 +} diff --git a/x/coinswap/simulation/operations.go b/x/coinswap/simulation/operations.go index 2b2f7fbf0..6ad47484d 100644 --- a/x/coinswap/simulation/operations.go +++ b/x/coinswap/simulation/operations.go @@ -8,13 +8,13 @@ import ( errorsmod "cosmossdk.io/errors" sdkmath "cosmossdk.io/math" - simappparams "cosmossdk.io/simapp/params" "github.com/Canto-Network/Canto/v7/x/coinswap/keeper" "github.com/Canto-Network/Canto/v7/x/coinswap/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" ) @@ -174,7 +174,7 @@ func SimulateMsgAddLiquidity(k keeper.Keeper, ak types.AccountKeeper, bk types.B } } - txGen := simappparams.MakeTestEncodingConfig().TxConfig + txGen := moduletestutil.MakeTestEncodingConfig().TxConfig tx, err := simtestutil.GenSignedMockTx( r, @@ -329,7 +329,7 @@ func SimulateMsgSwapOrder(k keeper.Keeper, ak types.AccountKeeper, bk types.Bank } } - txGen := simappparams.MakeTestEncodingConfig().TxConfig + txGen := moduletestutil.MakeTestEncodingConfig().TxConfig tx, err := simtestutil.GenSignedMockTx( r, txGen, @@ -437,7 +437,7 @@ func SimulateMsgRemoveLiquidity(k keeper.Keeper, ak types.AccountKeeper, bk type } } - txGen := simappparams.MakeTestEncodingConfig().TxConfig + txGen := moduletestutil.MakeTestEncodingConfig().TxConfig tx, err := simtestutil.GenSignedMockTx( r, diff --git a/x/coinswap/types/codec.go b/x/coinswap/types/codec.go index 5170b1934..6c66f16c5 100644 --- a/x/coinswap/types/codec.go +++ b/x/coinswap/types/codec.go @@ -21,11 +21,11 @@ func init() { // RegisterLegacyAminoCodec registers concrete types on the codec. func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { - cdc.RegisterConcrete(&MsgSwapOrder{}, "coinswap/coinswap/MsgSwapOrder", nil) - cdc.RegisterConcrete(&MsgAddLiquidity{}, "coinswap/coinswap/MsgAddLiquidity", nil) - cdc.RegisterConcrete(&MsgRemoveLiquidity{}, "coinswap/coinswap/MsgRemoveLiquidity", nil) - cdc.RegisterConcrete(&MsgUpdateParams{}, "coinswap/coinswap/MsgUpdateParams", nil) - cdc.RegisterConcrete(&Params{}, "coinswap/coinswap/Params", nil) + cdc.RegisterConcrete(&MsgSwapOrder{}, "canto/MsgSwapOrder", nil) + cdc.RegisterConcrete(&MsgAddLiquidity{}, "canto/MsgAddLiquidity", nil) + cdc.RegisterConcrete(&MsgRemoveLiquidity{}, "canto/MsgRemoveLiquidity", nil) + cdc.RegisterConcrete(&MsgUpdateParams{}, "canto/x/coinswap/MsgUpdateParams", nil) + cdc.RegisterConcrete(&Params{}, "canto/x/coinswap/Params", nil) } diff --git a/x/coinswap/types/coinswap.pb.go b/x/coinswap/types/coinswap.pb.go index 8d7add4b8..31d8ed874 100644 --- a/x/coinswap/types/coinswap.pb.go +++ b/x/coinswap/types/coinswap.pb.go @@ -9,6 +9,7 @@ import ( _ "github.com/cosmos/cosmos-proto" github_com_cosmos_cosmos_sdk_types "github.com/cosmos/cosmos-sdk/types" types "github.com/cosmos/cosmos-sdk/types" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" @@ -201,43 +202,46 @@ func init() { func init() { proto.RegisterFile("canto/coinswap/v1/coinswap.proto", fileDescriptor_b57883b6d1fc5094) } var fileDescriptor_b57883b6d1fc5094 = []byte{ - // 566 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0xcb, 0x6b, 0x13, 0x41, - 0x18, 0xdf, 0x4d, 0xd2, 0x34, 0x19, 0x69, 0x4a, 0x16, 0x95, 0x34, 0xc5, 0x4d, 0x08, 0x14, 0x72, - 0xc9, 0xae, 0x69, 0x0f, 0x82, 0xb7, 0x26, 0x41, 0x28, 0x16, 0x0d, 0x2b, 0x28, 0x7a, 0x59, 0xbe, - 0xec, 0x8e, 0xe9, 0x92, 0xec, 0xce, 0x32, 0x33, 0x79, 0xfd, 0x17, 0x1e, 0x3d, 0xf6, 0xec, 0xc9, - 0x83, 0x7f, 0x81, 0xa7, 0x1c, 0x8b, 0x27, 0xf1, 0x50, 0x35, 0xb9, 0xf8, 0x67, 0xc8, 0x3c, 0x12, - 0x0b, 0x82, 0x88, 0xe0, 0x69, 0x67, 0xbe, 0xf9, 0x3d, 0xbe, 0xc7, 0x7e, 0xa8, 0x1e, 0x40, 0xc2, - 0x89, 0x1b, 0x90, 0x28, 0x61, 0x33, 0x48, 0xdd, 0x69, 0x7b, 0x7b, 0x76, 0x52, 0x4a, 0x38, 0xb1, - 0xca, 0x12, 0xe1, 0x6c, 0xa3, 0xd3, 0x76, 0xd5, 0x0e, 0x08, 0x8b, 0x09, 0x73, 0x07, 0xc0, 0xb0, - 0x3b, 0x6d, 0x0f, 0x30, 0x07, 0x45, 0x53, 0x94, 0xea, 0xed, 0x21, 0x19, 0x12, 0x79, 0x74, 0xc5, - 0x49, 0x47, 0x0f, 0x14, 0xcb, 0x57, 0x0f, 0xea, 0xa2, 0x9e, 0x1a, 0xcf, 0xd1, 0xce, 0x59, 0x92, - 0x4e, 0xb8, 0x55, 0x41, 0xbb, 0x10, 0x86, 0x14, 0x33, 0x56, 0x31, 0xeb, 0x66, 0xb3, 0xe8, 0x6d, - 0xae, 0xd6, 0x09, 0xca, 0x09, 0x87, 0x4a, 0xa6, 0x6e, 0x36, 0x6f, 0x1d, 0x1f, 0x38, 0x9a, 0x2f, - 0x52, 0x70, 0x74, 0x0a, 0x4e, 0x97, 0x44, 0x49, 0x27, 0xb7, 0xbc, 0xae, 0x19, 0x9e, 0x04, 0x37, - 0x5e, 0xa0, 0xfc, 0xd3, 0x09, 0xff, 0x0f, 0xc2, 0xef, 0x4d, 0x94, 0xeb, 0x13, 0x32, 0xb6, 0x4a, - 0x28, 0x13, 0x85, 0x5a, 0x32, 0x13, 0x85, 0xd6, 0x11, 0x2a, 0x31, 0x0e, 0x49, 0x08, 0x34, 0xf4, - 0x43, 0x9c, 0x90, 0x58, 0xea, 0x16, 0xbd, 0xbd, 0x4d, 0xb4, 0x27, 0x82, 0x56, 0x0b, 0x59, 0x01, - 0x99, 0x24, 0x1c, 0xd3, 0x14, 0x28, 0x5f, 0x68, 0x68, 0x56, 0x42, 0xcb, 0x37, 0x5f, 0x14, 0xfc, - 0x08, 0x95, 0x30, 0x0b, 0x28, 0x99, 0xf9, 0x9b, 0x22, 0x72, 0x4a, 0x55, 0x45, 0x4f, 0x75, 0x29, - 0x87, 0xa8, 0x38, 0x4e, 0xb9, 0x16, 0xdb, 0x91, 0x88, 0xc2, 0x38, 0xe5, 0x52, 0xa3, 0xf1, 0x31, - 0x8b, 0xf2, 0x7d, 0xa0, 0x10, 0x33, 0xab, 0x8b, 0xb2, 0xaf, 0x31, 0x56, 0x59, 0x77, 0xda, 0xa2, - 0xac, 0x2f, 0xd7, 0xb5, 0x43, 0x55, 0x38, 0x0b, 0x47, 0x4e, 0x44, 0xdc, 0x18, 0xf8, 0x85, 0x73, - 0x8e, 0x87, 0x10, 0x2c, 0x7a, 0x38, 0xf8, 0xf4, 0xa1, 0x85, 0x74, 0x5f, 0x7a, 0x38, 0xf0, 0x04, - 0xdb, 0x7a, 0x8c, 0xca, 0x29, 0x21, 0x63, 0x3f, 0xa0, 0x18, 0x78, 0x44, 0x12, 0x5f, 0x48, 0xfe, - 0x65, 0x13, 0xf7, 0x05, 0xb3, 0xab, 0x89, 0x8f, 0x30, 0xb6, 0xce, 0x51, 0x81, 0xc3, 0xdc, 0xa7, - 0xc0, 0xb1, 0xea, 0xc2, 0xbf, 0xa4, 0xb5, 0xcb, 0x61, 0xee, 0x01, 0xc7, 0xd6, 0x4b, 0x54, 0x8d, - 0x61, 0xee, 0x6f, 0x07, 0x21, 0x46, 0xe6, 0xa7, 0x98, 0xfa, 0xc2, 0x56, 0xb5, 0xae, 0x73, 0x4f, - 0xeb, 0xdf, 0xf9, 0x5d, 0xff, 0x2c, 0xe1, 0xde, 0xdd, 0x18, 0xe6, 0xcf, 0x34, 0x5f, 0x24, 0xde, - 0xc7, 0x54, 0xce, 0x9b, 0xa1, 0x7d, 0x29, 0x3d, 0x83, 0xd4, 0x87, 0x58, 0x0c, 0xaa, 0x92, 0xaf, - 0x67, 0xff, 0x5c, 0xf3, 0x7d, 0x61, 0xf5, 0xee, 0x6b, 0xad, 0x39, 0x8c, 0xf8, 0xc5, 0x64, 0xe0, - 0x04, 0x24, 0xd6, 0xbf, 0xbf, 0xfe, 0xb4, 0x58, 0x38, 0x72, 0xf9, 0x22, 0xc5, 0x4c, 0x12, 0x98, - 0xb7, 0x27, 0xdc, 0x67, 0x90, 0x9e, 0x4a, 0x87, 0x87, 0x85, 0xb7, 0x97, 0x35, 0xe3, 0xc7, 0x65, - 0xcd, 0xec, 0xf4, 0x97, 0xdf, 0x6d, 0x63, 0xb9, 0xb2, 0xcd, 0xab, 0x95, 0x6d, 0x7e, 0x5b, 0xd9, - 0xe6, 0x9b, 0xb5, 0x6d, 0x5c, 0xad, 0x6d, 0xe3, 0xf3, 0xda, 0x36, 0x5e, 0x1d, 0xdf, 0x30, 0xe8, - 0x8a, 0xad, 0x6d, 0x3d, 0xc1, 0x7c, 0x46, 0xe8, 0x48, 0xdd, 0xdc, 0xe9, 0x03, 0x77, 0xfe, 0x6b, - 0xd5, 0xa5, 0xe1, 0x20, 0x2f, 0x37, 0xf0, 0xe4, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x84, 0x45, - 0xa6, 0x6f, 0x09, 0x04, 0x00, 0x00, + // 613 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x53, 0xcd, 0x6b, 0x13, 0x41, + 0x14, 0xdf, 0x6d, 0xd3, 0xb4, 0x19, 0x6d, 0x4b, 0x16, 0x3f, 0xd2, 0x16, 0x36, 0x21, 0x58, 0x28, + 0x85, 0xec, 0xd2, 0x16, 0x14, 0xbc, 0x35, 0x09, 0xc5, 0x82, 0x68, 0x8c, 0xa0, 0xe0, 0xc1, 0xe5, + 0x65, 0x77, 0x4c, 0x97, 0x64, 0x77, 0x96, 0x99, 0xc9, 0xd7, 0x9f, 0x50, 0x4f, 0x1e, 0xc5, 0x53, + 0x8f, 0xe2, 0x29, 0x07, 0xff, 0x88, 0x1c, 0x8b, 0x27, 0xf1, 0x50, 0x35, 0x39, 0xc4, 0x3f, 0x43, + 0xe6, 0x23, 0x31, 0x20, 0x28, 0x08, 0x5e, 0x76, 0x67, 0xde, 0xbc, 0xf7, 0xfb, 0x78, 0x33, 0x0f, + 0x15, 0x7c, 0x88, 0x39, 0x71, 0x7d, 0x12, 0xc6, 0xac, 0x07, 0x89, 0xdb, 0x3d, 0x98, 0xaf, 0x9d, + 0x84, 0x12, 0x4e, 0xac, 0xac, 0xcc, 0x70, 0xe6, 0xd1, 0xee, 0xc1, 0xb6, 0xed, 0x13, 0x16, 0x11, + 0xe6, 0x36, 0x80, 0x61, 0xb7, 0x7b, 0xd0, 0xc0, 0x1c, 0x54, 0x99, 0x2a, 0xd9, 0xbe, 0xd1, 0x24, + 0x4d, 0x22, 0x97, 0xae, 0x58, 0xe9, 0xe8, 0x96, 0xaa, 0xf2, 0xd4, 0x81, 0xda, 0xe8, 0xa3, 0x2c, + 0x44, 0x61, 0x4c, 0x5c, 0xf9, 0x55, 0xa1, 0xe2, 0x33, 0xb4, 0x72, 0x1a, 0x27, 0x1d, 0x6e, 0xe5, + 0xd0, 0x2a, 0x04, 0x01, 0xc5, 0x8c, 0xe5, 0xcc, 0x82, 0xb9, 0x97, 0xa9, 0xcf, 0xb6, 0xd6, 0x11, + 0x4a, 0x09, 0xd2, 0xdc, 0x52, 0xc1, 0xdc, 0xbb, 0x76, 0xb8, 0xe5, 0x68, 0x48, 0xa1, 0xca, 0xd1, + 0xaa, 0x9c, 0x0a, 0x09, 0xe3, 0x72, 0x6a, 0x74, 0x95, 0x37, 0xea, 0x32, 0xb9, 0xf8, 0x1c, 0xa5, + 0x1f, 0x77, 0xf8, 0x7f, 0x00, 0x1e, 0x9a, 0x28, 0x55, 0x23, 0xa4, 0x6d, 0x6d, 0xa0, 0xa5, 0x30, + 0xd0, 0x90, 0x4b, 0x61, 0x60, 0xed, 0xa2, 0x0d, 0xc6, 0x21, 0x0e, 0x80, 0x06, 0x5e, 0x80, 0x63, + 0x12, 0x49, 0xdc, 0x4c, 0x7d, 0x7d, 0x16, 0xad, 0x8a, 0xa0, 0x55, 0x42, 0x96, 0x4f, 0x3a, 0x31, + 0xc7, 0x34, 0x01, 0xca, 0x07, 0x3a, 0x75, 0x59, 0xa6, 0x66, 0x17, 0x4f, 0x54, 0xfa, 0x2e, 0xda, + 0xc0, 0xcc, 0xa7, 0xa4, 0xe7, 0xcd, 0x4c, 0xa4, 0x14, 0xaa, 0x8a, 0x1e, 0x6b, 0x2b, 0x3b, 0x28, + 0xd3, 0x4e, 0xb8, 0x06, 0x5b, 0x91, 0x19, 0x6b, 0xed, 0x84, 0x4b, 0x8c, 0xe2, 0x79, 0x0a, 0xa5, + 0x6b, 0x40, 0x21, 0x62, 0xd6, 0x03, 0xb4, 0xfc, 0x0a, 0x63, 0xa5, 0xba, 0x7c, 0x57, 0xd8, 0xfa, + 0x72, 0x95, 0xdf, 0x51, 0xc6, 0x59, 0xd0, 0x72, 0x42, 0xe2, 0x46, 0xc0, 0xcf, 0x9c, 0x87, 0xb8, + 0x09, 0xfe, 0xa0, 0x8a, 0xfd, 0x4f, 0x1f, 0x4b, 0x48, 0xf7, 0xa5, 0x8a, 0xfd, 0xf7, 0xd3, 0xe1, + 0xbe, 0x59, 0x17, 0x10, 0x56, 0x0d, 0x65, 0x13, 0x42, 0xda, 0x9e, 0x4f, 0x31, 0xf0, 0x90, 0xc4, + 0x9e, 0xc0, 0xfd, 0x6b, 0x27, 0x33, 0x82, 0x52, 0xa1, 0x6c, 0x8a, 0xf2, 0x8a, 0xae, 0x3e, 0xc1, + 0xd8, 0x7a, 0x82, 0xd6, 0x38, 0xf4, 0x3d, 0x0a, 0x1c, 0xab, 0x7e, 0xfc, 0xb3, 0xc0, 0x55, 0x0e, + 0xfd, 0x3a, 0x70, 0x6c, 0xbd, 0x44, 0xdb, 0x11, 0xf4, 0xbd, 0xf9, 0xbd, 0x88, 0x1b, 0xf4, 0x12, + 0x4c, 0x3d, 0xc1, 0xad, 0x3a, 0x59, 0x2e, 0x6a, 0x92, 0x9b, 0xbf, 0x93, 0x9c, 0xc6, 0x5c, 0x01, + 0xde, 0x8a, 0xa0, 0xff, 0x54, 0x83, 0x08, 0x1f, 0x35, 0x4c, 0xe5, 0x1b, 0x38, 0x37, 0xd1, 0xa6, + 0x24, 0xe8, 0x41, 0xe2, 0x41, 0x24, 0x6e, 0x2f, 0x97, 0x2e, 0x2c, 0xff, 0xb9, 0x07, 0x27, 0x82, + 0xf0, 0xc3, 0xd7, 0xfc, 0x5e, 0x33, 0xe4, 0x67, 0x9d, 0x86, 0xe3, 0x93, 0x48, 0x8f, 0x89, 0xfe, + 0x95, 0x58, 0xd0, 0x72, 0xf9, 0x20, 0xc1, 0x4c, 0x16, 0xb0, 0x77, 0xd3, 0xe1, 0xfe, 0xf5, 0xb6, + 0x34, 0x2c, 0x1d, 0x30, 0x25, 0x6a, 0x5d, 0x88, 0xea, 0x41, 0x72, 0x2c, 0x79, 0xef, 0xdf, 0x79, + 0x7b, 0x91, 0x37, 0x7e, 0x5c, 0xe4, 0xcd, 0xd7, 0xd3, 0xe1, 0xfe, 0x6d, 0x35, 0xef, 0xfd, 0x5f, + 0x13, 0xaf, 0x1e, 0x40, 0xb9, 0x36, 0xfa, 0x6e, 0x1b, 0xa3, 0xb1, 0x6d, 0x5e, 0x8e, 0x6d, 0xf3, + 0xdb, 0xd8, 0x36, 0xdf, 0x4c, 0x6c, 0xe3, 0x72, 0x62, 0x1b, 0x9f, 0x27, 0xb6, 0xf1, 0xe2, 0x70, + 0x41, 0x52, 0x45, 0x20, 0x94, 0x1e, 0x61, 0xde, 0x23, 0xb4, 0xa5, 0x76, 0x6e, 0xf7, 0xde, 0x22, + 0xa4, 0x94, 0xd8, 0x48, 0xcb, 0x41, 0x3e, 0xfa, 0x19, 0x00, 0x00, 0xff, 0xff, 0x02, 0x65, 0x25, + 0xb1, 0x63, 0x04, 0x00, 0x00, } func (this *Params) Equal(that interface{}) bool { diff --git a/x/coinswap/types/tx.pb.go b/x/coinswap/types/tx.pb.go index 581f5404a..db682292e 100644 --- a/x/coinswap/types/tx.pb.go +++ b/x/coinswap/types/tx.pb.go @@ -369,64 +369,64 @@ func init() { func init() { proto.RegisterFile("canto/coinswap/v1/tx.proto", fileDescriptor_003205f46878c077) } var fileDescriptor_003205f46878c077 = []byte{ - // 900 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0xcf, 0x4f, 0xe3, 0x46, - 0x18, 0x8d, 0x37, 0x0b, 0x4a, 0xa6, 0xec, 0x2e, 0x78, 0xa1, 0x18, 0x1f, 0x92, 0xac, 0xa5, 0xad, - 0x10, 0x12, 0xb6, 0xa0, 0x55, 0xb7, 0x45, 0x95, 0x5a, 0x82, 0x54, 0x15, 0xa9, 0x74, 0x91, 0xd3, - 0x5e, 0xaa, 0x6a, 0xa3, 0x49, 0x3c, 0x72, 0x46, 0x30, 0x33, 0xae, 0x67, 0xf2, 0xeb, 0x56, 0xf5, - 0xb8, 0xa7, 0xfe, 0x09, 0x3d, 0xf6, 0x56, 0x2a, 0xed, 0x1f, 0xc1, 0x71, 0xb5, 0xa7, 0xaa, 0x87, - 0xa8, 0x85, 0x03, 0x77, 0x2e, 0xbd, 0x56, 0xe3, 0x99, 0x38, 0x8e, 0x03, 0x04, 0xf5, 0x82, 0x3c, - 0xf3, 0xbd, 0xef, 0xc7, 0xbc, 0xf7, 0xf8, 0x00, 0xd8, 0x6d, 0x48, 0x05, 0xf3, 0xda, 0x0c, 0x53, - 0xde, 0x87, 0x91, 0xd7, 0xdb, 0xf1, 0xc4, 0xc0, 0x8d, 0x62, 0x26, 0x98, 0xb9, 0x92, 0xc4, 0xdc, - 0x71, 0xcc, 0xed, 0xed, 0xd8, 0xb5, 0x59, 0x78, 0x1a, 0x4e, 0x92, 0xec, 0x4a, 0x9b, 0x71, 0xc2, - 0xb8, 0xd7, 0x82, 0x1c, 0x79, 0xbd, 0x9d, 0x16, 0x12, 0x50, 0x61, 0x74, 0x7c, 0x35, 0x64, 0x21, - 0x4b, 0x3e, 0x3d, 0xf9, 0xa5, 0x6f, 0x37, 0x54, 0x56, 0x53, 0x05, 0xd4, 0x41, 0x87, 0xd6, 0x75, - 0x41, 0xc2, 0x43, 0xd9, 0x8e, 0xf0, 0x50, 0x07, 0x56, 0x20, 0xc1, 0x94, 0x79, 0xc9, 0x4f, 0x75, - 0xe5, 0xfc, 0x5a, 0x04, 0x4f, 0x8e, 0x78, 0xb8, 0x1f, 0x04, 0x5f, 0xe3, 0x1f, 0xbb, 0x38, 0xc0, - 0x62, 0x68, 0x1e, 0x83, 0x32, 0x81, 0x83, 0xa6, 0x60, 0x27, 0x88, 0x5a, 0x46, 0xcd, 0xd8, 0x7c, - 0x6f, 0x77, 0xc3, 0xd5, 0x1d, 0xe4, 0x90, 0xae, 0x1e, 0xd2, 0x3d, 0x60, 0x98, 0xd6, 0xad, 0xf3, - 0x51, 0xb5, 0x70, 0x3d, 0xaa, 0x2e, 0x0f, 0x21, 0x39, 0xdd, 0x73, 0xd2, 0x4c, 0xc7, 0x2f, 0x11, - 0x38, 0xf8, 0x56, 0x7e, 0x9a, 0x3d, 0x60, 0xa2, 0x01, 0x6c, 0x8b, 0x26, 0x17, 0x90, 0x06, 0x30, - 0x0e, 0x9a, 0x90, 0x08, 0xeb, 0x41, 0xcd, 0xd8, 0x2c, 0xd7, 0xbf, 0x92, 0xf9, 0x7f, 0x8d, 0xaa, - 0x6b, 0xaa, 0x03, 0x0f, 0x4e, 0x5c, 0xcc, 0x3c, 0x02, 0x45, 0xc7, 0x3d, 0xa4, 0xe2, 0x7a, 0x54, - 0xdd, 0x50, 0x85, 0x67, 0x0b, 0x38, 0xef, 0xde, 0x6c, 0x03, 0x3d, 0xd7, 0x21, 0x15, 0xfe, 0x72, - 0x02, 0x69, 0x68, 0xc4, 0x3e, 0x11, 0x66, 0x07, 0x3c, 0x22, 0x98, 0x36, 0x4f, 0xc7, 0x4f, 0xb3, - 0x8a, 0x49, 0xcb, 0x83, 0x79, 0x2d, 0x57, 0xf5, 0x5b, 0xb2, 0xb9, 0xf9, 0x6e, 0x4b, 0x04, 0xd3, - 0x09, 0x67, 0x36, 0x28, 0x05, 0x08, 0x06, 0xa7, 0x98, 0x22, 0xeb, 0x61, 0xcd, 0xd8, 0x2c, 0xfa, - 0xe9, 0xd9, 0x7c, 0x1f, 0x2c, 0x72, 0x44, 0x03, 0x14, 0x5b, 0x0b, 0xb2, 0xbd, 0xaf, 0x4f, 0x7b, - 0xcf, 0x7f, 0xbe, 0x3a, 0xdb, 0xd2, 0x87, 0xd7, 0x57, 0x67, 0x5b, 0x6b, 0xca, 0x2a, 0x39, 0x39, - 0x9c, 0x06, 0x58, 0xcf, 0x5d, 0xf9, 0x88, 0x47, 0x8c, 0x72, 0x64, 0x7e, 0x02, 0x00, 0xc1, 0x54, - 0xdc, 0x53, 0x2a, 0xbf, 0x2c, 0xc1, 0x89, 0x22, 0xce, 0xef, 0x45, 0x60, 0x1e, 0xf1, 0xd0, 0x47, - 0x84, 0xf5, 0xd0, 0xe4, 0x19, 0x27, 0xc0, 0xec, 0x63, 0xd1, 0x09, 0x62, 0xd8, 0xcf, 0xb0, 0x36, - 0xd7, 0x03, 0xcf, 0xb4, 0x07, 0xb4, 0x54, 0xb3, 0x25, 0x1c, 0x7f, 0x65, 0x7c, 0x39, 0x69, 0xf6, - 0x03, 0x90, 0x03, 0xe9, 0xe1, 0x95, 0x19, 0x3e, 0x9f, 0xa7, 0xcc, 0xf2, 0x44, 0x19, 0xe5, 0xb2, - 0x9c, 0x2a, 0x25, 0x82, 0xa9, 0xf2, 0x5c, 0x04, 0x96, 0x25, 0x6a, 0xca, 0x71, 0x4a, 0xfe, 0x2f, - 0xe7, 0x35, 0x59, 0x9f, 0x34, 0xb9, 0xcb, 0x6f, 0x8f, 0x09, 0xa6, 0x59, 0xb7, 0xfd, 0x1f, 0x0f, - 0x6c, 0xe6, 0x3c, 0x60, 0xa5, 0x1e, 0xc8, 0x49, 0xe3, 0xbc, 0x02, 0xf6, 0xec, 0x6d, 0xea, 0x84, - 0x2f, 0xc0, 0xe3, 0x94, 0xf5, 0x64, 0xbf, 0x58, 0x46, 0xad, 0x78, 0xb7, 0x1b, 0x1e, 0x8d, 0x13, - 0xe4, 0x89, 0x3b, 0xff, 0x1a, 0x60, 0xe9, 0x88, 0x87, 0x8d, 0x3e, 0x8c, 0x5e, 0xc6, 0x01, 0x8a, - 0xcd, 0x8f, 0xc0, 0x02, 0xa6, 0x51, 0x57, 0x68, 0xf9, 0x2d, 0x77, 0x66, 0xb9, 0xb9, 0x87, 0x32, - 0x5e, 0x7f, 0x28, 0xf9, 0xf4, 0x15, 0xd8, 0x7c, 0x01, 0x16, 0x59, 0x57, 0xc8, 0xb4, 0x07, 0x63, - 0xd7, 0xcc, 0xa4, 0xbd, 0x4c, 0x00, 0x3a, 0x4f, 0xc3, 0xa7, 0xd8, 0x2b, 0xe6, 0xd8, 0xfb, 0x14, - 0x2c, 0x61, 0xde, 0x6c, 0x75, 0x87, 0x4d, 0x26, 0x47, 0x4b, 0xd8, 0x2d, 0xd5, 0xd7, 0xaf, 0x47, - 0xd5, 0xa7, 0x4a, 0xaa, 0x6c, 0xd4, 0xf1, 0x01, 0xe6, 0xf5, 0xee, 0x30, 0x79, 0xc5, 0xde, 0x33, - 0x49, 0xb0, 0x9a, 0x4d, 0xf2, 0x6b, 0xa6, 0xfc, 0xa6, 0x0f, 0x75, 0xd6, 0xc0, 0x53, 0x7d, 0x4e, - 0x78, 0xd1, 0x94, 0x3a, 0x7f, 0x18, 0xc9, 0x6a, 0xfc, 0x2e, 0x0a, 0xa0, 0x40, 0xc7, 0x30, 0x86, - 0x84, 0x9b, 0x1f, 0x83, 0x32, 0xec, 0x8a, 0x0e, 0x8b, 0xc7, 0xbf, 0x16, 0xe5, 0xba, 0xf5, 0xee, - 0xcd, 0xf6, 0xaa, 0x26, 0x79, 0x3f, 0x08, 0x62, 0xc4, 0x79, 0x43, 0xc4, 0x98, 0x86, 0xfe, 0x04, - 0x6a, 0x7e, 0x06, 0x16, 0xa3, 0xa4, 0xc2, 0x1d, 0xac, 0xa8, 0x16, 0xf5, 0xb2, 0x64, 0xe5, 0xb7, - 0xab, 0xb3, 0x2d, 0xc3, 0xd7, 0x39, 0xca, 0x24, 0x93, 0x6a, 0xd3, 0xbb, 0x22, 0x3b, 0x9f, 0xb3, - 0x91, 0xec, 0x8a, 0xec, 0xd5, 0xf8, 0x39, 0xbb, 0xaf, 0x8b, 0xa0, 0x78, 0xc4, 0x43, 0xf3, 0x15, - 0x58, 0x9a, 0xda, 0xf6, 0xce, 0x0d, 0xa3, 0xe4, 0xf6, 0x8d, 0xbd, 0x35, 0x1f, 0x93, 0x3a, 0x31, - 0x04, 0x4f, 0xf2, 0x5b, 0xe5, 0xf9, 0xcd, 0xe9, 0x39, 0x98, 0xbd, 0x7d, 0x2f, 0x58, 0xda, 0xa8, - 0x01, 0x4a, 0x63, 0xcd, 0xcc, 0xea, 0xcd, 0xa9, 0xa9, 0xc6, 0xf6, 0x07, 0xb7, 0x03, 0xb2, 0xa2, - 0x4b, 0x76, 0xa6, 0x04, 0xbf, 0x85, 0x9d, 0x2c, 0xe6, 0x36, 0x76, 0x6e, 0x52, 0xc1, 0x5e, 0xf8, - 0x49, 0x2a, 0x5b, 0x3f, 0x3e, 0xff, 0xa7, 0x52, 0x38, 0xbf, 0xa8, 0x18, 0x6f, 0x2f, 0x2a, 0xc6, - 0xdf, 0x17, 0x15, 0xe3, 0x97, 0xcb, 0x4a, 0xe1, 0xed, 0x65, 0xa5, 0xf0, 0xe7, 0x65, 0xa5, 0xf0, - 0xfd, 0x6e, 0x88, 0x45, 0xa7, 0xdb, 0x72, 0xdb, 0x8c, 0x78, 0x07, 0xb2, 0xf4, 0xf6, 0x37, 0x48, - 0xf4, 0x59, 0x7c, 0xa2, 0x4e, 0x5e, 0xef, 0x85, 0x37, 0x98, 0xfc, 0x47, 0x21, 0x86, 0x11, 0xe2, - 0xad, 0xc5, 0xe4, 0xef, 0xf9, 0x87, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0x76, 0xfa, 0x2e, 0x4e, - 0x9f, 0x08, 0x00, 0x00, + // 907 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x55, 0xbf, 0x6f, 0xdb, 0x46, + 0x14, 0x16, 0xa3, 0xd8, 0x90, 0xae, 0x4e, 0x62, 0x33, 0x76, 0x4d, 0x73, 0x90, 0x14, 0x02, 0x29, + 0x0c, 0x03, 0x26, 0x61, 0xa7, 0x68, 0x5a, 0xa3, 0x40, 0x6b, 0x19, 0x28, 0x6a, 0xa0, 0x6e, 0x0c, + 0xaa, 0x5d, 0x8a, 0x22, 0xc2, 0x49, 0x3c, 0x50, 0x07, 0xfb, 0xee, 0x58, 0xde, 0xe9, 0xd7, 0x56, + 0x74, 0xcc, 0xd4, 0x3f, 0xa1, 0x63, 0xb7, 0x7a, 0xc8, 0xd8, 0x3f, 0xc0, 0x63, 0x90, 0xa9, 0xe8, + 0x20, 0xb4, 0xf6, 0xe0, 0xdd, 0x4b, 0xd7, 0xe2, 0x78, 0x27, 0x8a, 0xa6, 0x64, 0x2b, 0xc8, 0x22, + 0xf0, 0xee, 0x7d, 0xef, 0xde, 0x7b, 0xdf, 0xf7, 0xe9, 0x0e, 0xd8, 0x6d, 0x48, 0x05, 0xf3, 0xda, + 0x0c, 0x53, 0xde, 0x87, 0x91, 0xd7, 0xdb, 0xf1, 0xc4, 0xc0, 0x8d, 0x62, 0x26, 0x98, 0xb9, 0x92, + 0xc4, 0xdc, 0x71, 0xcc, 0xed, 0xed, 0xd8, 0xb5, 0x69, 0x78, 0x1a, 0x4e, 0x92, 0xec, 0x4a, 0x9b, + 0x71, 0xc2, 0xb8, 0xd7, 0x82, 0x1c, 0x79, 0xbd, 0x9d, 0x16, 0x12, 0x50, 0x61, 0x74, 0x7c, 0x35, + 0x64, 0x21, 0x4b, 0x3e, 0x3d, 0xf9, 0xa5, 0x77, 0x37, 0x54, 0x56, 0x53, 0x05, 0xd4, 0x42, 0x87, + 0xd6, 0xf5, 0x81, 0x84, 0x87, 0xb2, 0x1c, 0xe1, 0xa1, 0x0e, 0xac, 0x40, 0x82, 0x29, 0xf3, 0x92, + 0x5f, 0xb5, 0xe5, 0xfc, 0x56, 0x04, 0x8f, 0x8e, 0x78, 0xb8, 0x1f, 0x04, 0xdf, 0xe0, 0x9f, 0xba, + 0x38, 0xc0, 0x62, 0x68, 0x1e, 0x83, 0x32, 0x81, 0x83, 0xa6, 0x60, 0x27, 0x88, 0x5a, 0x46, 0xcd, + 0xd8, 0xfc, 0x60, 0x77, 0xc3, 0xd5, 0x15, 0x64, 0x93, 0xae, 0x6e, 0xd2, 0x3d, 0x60, 0x98, 0xd6, + 0xad, 0xf3, 0x51, 0xb5, 0x70, 0x3d, 0xaa, 0x2e, 0x0f, 0x21, 0x39, 0xdd, 0x73, 0xd2, 0x4c, 0xc7, + 0x2f, 0x11, 0x38, 0xf8, 0x4e, 0x7e, 0x9a, 0x3d, 0x60, 0xa2, 0x01, 0x6c, 0x8b, 0x26, 0x17, 0x90, + 0x06, 0x30, 0x0e, 0x9a, 0x90, 0x08, 0xeb, 0x5e, 0xcd, 0xd8, 0x2c, 0xd7, 0xbf, 0x96, 0xf9, 0x7f, + 0x8f, 0xaa, 0x6b, 0xaa, 0x02, 0x0f, 0x4e, 0x5c, 0xcc, 0x3c, 0x02, 0x45, 0xc7, 0x3d, 0xa4, 0xe2, + 0x7a, 0x54, 0xdd, 0x50, 0x07, 0x4f, 0x1f, 0xe0, 0xbc, 0x7d, 0xbd, 0x0d, 0x74, 0x5f, 0x87, 0x54, + 0xf8, 0xcb, 0x09, 0xa4, 0xa1, 0x11, 0xfb, 0x44, 0x98, 0x1d, 0xf0, 0x80, 0x60, 0xda, 0x3c, 0x1d, + 0x8f, 0x66, 0x15, 0x93, 0x92, 0x07, 0xf3, 0x4a, 0xae, 0xea, 0x59, 0xb2, 0xb9, 0xf9, 0x6a, 0x4b, + 0x04, 0xd3, 0x09, 0x67, 0x36, 0x28, 0x05, 0x08, 0x06, 0xa7, 0x98, 0x22, 0xeb, 0x7e, 0xcd, 0xd8, + 0x2c, 0xfa, 0xe9, 0xda, 0xfc, 0x10, 0x2c, 0x72, 0x44, 0x03, 0x14, 0x5b, 0x0b, 0xb2, 0xbc, 0xaf, + 0x57, 0x7b, 0x4f, 0x7f, 0xb9, 0x3a, 0xdb, 0xd2, 0x8b, 0x57, 0x57, 0x67, 0x5b, 0x6b, 0xca, 0x2a, + 0x39, 0x39, 0x9c, 0x06, 0x58, 0xcf, 0x6d, 0xf9, 0x88, 0x47, 0x8c, 0x72, 0x64, 0x7e, 0x0a, 0x00, + 0xc1, 0x54, 0xbc, 0xa3, 0x54, 0x7e, 0x59, 0x82, 0x13, 0x45, 0x9c, 0x3f, 0x8a, 0xc0, 0x3c, 0xe2, + 0xa1, 0x8f, 0x08, 0xeb, 0xa1, 0xc9, 0x18, 0x27, 0xc0, 0xec, 0x63, 0xd1, 0x09, 0x62, 0xd8, 0xcf, + 0xb0, 0x36, 0xd7, 0x03, 0x4f, 0xb4, 0x07, 0xb4, 0x54, 0xd3, 0x47, 0x38, 0xfe, 0xca, 0x78, 0x73, + 0x52, 0xec, 0x47, 0x20, 0x1b, 0xd2, 0xcd, 0x2b, 0x33, 0x7c, 0x31, 0x4f, 0x99, 0xe5, 0x89, 0x32, + 0xca, 0x65, 0x39, 0x55, 0x4a, 0x04, 0x53, 0xe5, 0xb9, 0x08, 0x2c, 0x4b, 0xd4, 0x0d, 0xc7, 0x29, + 0xf9, 0xbf, 0x9a, 0x57, 0x64, 0x7d, 0x52, 0xe4, 0x2e, 0xbf, 0x3d, 0x24, 0x98, 0x66, 0xdd, 0xf6, + 0x3e, 0x1e, 0xd8, 0xcc, 0x79, 0xc0, 0x4a, 0x3d, 0x90, 0x93, 0xc6, 0x79, 0x09, 0xec, 0xe9, 0xdd, + 0xd4, 0x09, 0x5f, 0x82, 0x87, 0x29, 0xeb, 0xc9, 0xfd, 0x62, 0x19, 0xb5, 0xe2, 0xdd, 0x6e, 0x78, + 0x30, 0x4e, 0x90, 0x2b, 0xee, 0xfc, 0x67, 0x80, 0xa5, 0x23, 0x1e, 0x36, 0xfa, 0x30, 0x7a, 0x11, + 0x07, 0x28, 0x36, 0x3f, 0x06, 0x0b, 0x98, 0x46, 0x5d, 0xa1, 0xe5, 0xb7, 0xdc, 0xa9, 0xcb, 0xcd, + 0x3d, 0x94, 0xf1, 0xfa, 0x7d, 0xc9, 0xa7, 0xaf, 0xc0, 0xe6, 0x73, 0xb0, 0xc8, 0xba, 0x42, 0xa6, + 0xdd, 0x1b, 0xbb, 0x66, 0x2a, 0xed, 0x45, 0x02, 0xd0, 0x79, 0x1a, 0x7e, 0x83, 0xbd, 0x62, 0x8e, + 0xbd, 0xcf, 0xc0, 0x12, 0xe6, 0xcd, 0x56, 0x77, 0xd8, 0x64, 0xb2, 0xb5, 0x84, 0xdd, 0x52, 0x7d, + 0xfd, 0x7a, 0x54, 0x7d, 0xac, 0xa4, 0xca, 0x46, 0x1d, 0x1f, 0x60, 0x5e, 0xef, 0x0e, 0x93, 0x29, + 0xf6, 0x9e, 0x48, 0x82, 0x55, 0x6f, 0x92, 0x5f, 0x33, 0xe5, 0x37, 0x1d, 0xd4, 0x59, 0x03, 0x8f, + 0xf5, 0x3a, 0xe1, 0x45, 0x53, 0xea, 0xfc, 0x69, 0x24, 0x57, 0xe3, 0xf7, 0x51, 0x00, 0x05, 0x3a, + 0x86, 0x31, 0x24, 0xdc, 0xfc, 0x04, 0x94, 0x61, 0x57, 0x74, 0x58, 0x3c, 0xfe, 0x5b, 0x94, 0xeb, + 0xd6, 0xdb, 0xd7, 0xdb, 0xab, 0x9a, 0xe4, 0xfd, 0x20, 0x88, 0x11, 0xe7, 0x0d, 0x11, 0x63, 0x1a, + 0xfa, 0x13, 0xa8, 0xf9, 0x39, 0x58, 0x8c, 0x92, 0x13, 0xee, 0x60, 0x45, 0x95, 0xa8, 0x97, 0x25, + 0x2b, 0xbf, 0x5f, 0x9d, 0x6d, 0x19, 0xbe, 0xce, 0xd9, 0x7b, 0x26, 0x67, 0x98, 0x9c, 0x26, 0xe7, + 0xd0, 0xcf, 0xca, 0x60, 0xf2, 0xb0, 0xe4, 0x5a, 0x75, 0x36, 0x92, 0x6b, 0x23, 0xbb, 0x35, 0x9e, + 0x6c, 0xf7, 0x55, 0x11, 0x14, 0x8f, 0x78, 0x68, 0xbe, 0x04, 0x4b, 0x37, 0x2e, 0x7e, 0x67, 0x46, + 0x57, 0xb9, 0xab, 0xc7, 0xde, 0x9a, 0x8f, 0x49, 0x4d, 0x19, 0x82, 0x47, 0xf9, 0x0b, 0xe6, 0xe9, + 0xec, 0xf4, 0x1c, 0xcc, 0xde, 0x7e, 0x27, 0x58, 0x5a, 0xa8, 0x01, 0x4a, 0x63, 0xf9, 0xcc, 0xea, + 0xec, 0xd4, 0x54, 0x6e, 0xfb, 0xa3, 0xdb, 0x01, 0x59, 0xfd, 0x25, 0x3b, 0x37, 0xb4, 0xbf, 0x85, + 0x9d, 0x2c, 0xe6, 0x36, 0x76, 0x66, 0xa9, 0x60, 0x2f, 0xfc, 0x2c, 0x45, 0xae, 0x1f, 0x9f, 0xff, + 0x5b, 0x29, 0x9c, 0x5f, 0x54, 0x8c, 0x37, 0x17, 0x15, 0xe3, 0x9f, 0x8b, 0x8a, 0xf1, 0xeb, 0x65, + 0xa5, 0xf0, 0xe6, 0xb2, 0x52, 0xf8, 0xeb, 0xb2, 0x52, 0xf8, 0x61, 0x37, 0xc4, 0xa2, 0xd3, 0x6d, + 0xb9, 0x6d, 0x46, 0xbc, 0x03, 0x79, 0xf4, 0xf6, 0xb7, 0x48, 0xf4, 0x59, 0x7c, 0xa2, 0x56, 0x5e, + 0xef, 0x79, 0xd6, 0x03, 0x62, 0x18, 0x21, 0xde, 0x5a, 0x4c, 0x9e, 0xf6, 0x67, 0xff, 0x07, 0x00, + 0x00, 0xff, 0xff, 0x9f, 0xab, 0xf4, 0xf3, 0xaa, 0x08, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/csr/keeper/grpc_query_test.go b/x/csr/keeper/grpc_query_test.go index ec19f9741..e21489f2b 100644 --- a/x/csr/keeper/grpc_query_test.go +++ b/x/csr/keeper/grpc_query_test.go @@ -2,7 +2,6 @@ package keeper_test import ( "github.com/Canto-Network/Canto/v7/x/csr/types" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" "github.com/evmos/ethermint/tests" ) @@ -10,8 +9,7 @@ import ( // Special edge case for when the request made is null, cannot be routed to the query client func (suite *KeeperTestSuite) TestKeeperCSRs() { suite.SetupTest() - ctx := sdk.WrapSDKContext(suite.ctx) - res, err := suite.app.CSRKeeper.CSRs(ctx, nil) + res, err := suite.app.CSRKeeper.CSRs(suite.ctx, nil) suite.Require().Error(err) suite.Require().Nil(res) } @@ -114,10 +112,9 @@ func (suite *KeeperTestSuite) TestCSRs() { suite.Run(tc.name, func() { suite.SetupTest() - ctx := sdk.WrapSDKContext(suite.ctx) tc.prepare() - response, err := suite.queryClient.CSRs(ctx, request) + response, err := suite.queryClient.CSRs(suite.ctx, request) if tc.pass { suite.Require().NoError(err) suite.Require().Equal(expectedResponse.Pagination.Total, response.Pagination.Total) @@ -132,8 +129,7 @@ func (suite *KeeperTestSuite) TestCSRs() { // Special edge case for when the request made is null, cannot be routed to the query client func (suite *KeeperTestSuite) TestKeeperCSRsByNFT() { suite.SetupTest() - ctx := sdk.WrapSDKContext(suite.ctx) - res, err := suite.app.CSRKeeper.CSRByNFT(ctx, nil) + res, err := suite.app.CSRKeeper.CSRByNFT(suite.ctx, nil) suite.Require().Error(err) suite.Require().Nil(res) } @@ -190,10 +186,9 @@ func (suite *KeeperTestSuite) TestCSRByNFT() { suite.Run(tc.name, func() { suite.SetupTest() - ctx := sdk.WrapSDKContext(suite.ctx) tc.prepare() - response, err := suite.queryClient.CSRByNFT(ctx, request) + response, err := suite.queryClient.CSRByNFT(suite.ctx, request) if tc.pass { suite.Require().NoError(err) } else { @@ -207,8 +202,7 @@ func (suite *KeeperTestSuite) TestCSRByNFT() { // Special edge case for when the request made is null, cannot be routed to the query client func (suite *KeeperTestSuite) TestKeeperCSRsByContract() { suite.SetupTest() - ctx := sdk.WrapSDKContext(suite.ctx) - res, err := suite.app.CSRKeeper.CSRByContract(ctx, nil) + res, err := suite.app.CSRKeeper.CSRByContract(suite.ctx, nil) suite.Require().Error(err) suite.Require().Nil(res) } @@ -284,10 +278,9 @@ func (suite *KeeperTestSuite) TestCSRByContract() { suite.Run(tc.name, func() { suite.SetupTest() - ctx := sdk.WrapSDKContext(suite.ctx) tc.prepare() - response, err := suite.queryClient.CSRByContract(ctx, request) + response, err := suite.queryClient.CSRByContract(suite.ctx, request) if tc.pass { suite.Require().NoError(err) } else { @@ -300,11 +293,10 @@ func (suite *KeeperTestSuite) TestCSRByContract() { // Test the query service for params func (suite *KeeperTestSuite) TestQueryParams() { - ctx := sdk.WrapSDKContext(suite.ctx) expectedParams := types.DefaultParams() expectedParams.EnableCsr = true - res, err := suite.queryClient.Params(ctx, &types.QueryParamsRequest{}) + res, err := suite.queryClient.Params(suite.ctx, &types.QueryParamsRequest{}) suite.Require().NoError(err) suite.Require().Equal(expectedParams, res.Params) } @@ -312,12 +304,11 @@ func (suite *KeeperTestSuite) TestQueryParams() { // Test the query service that retrieves the turnstile address func (suite *KeeperTestSuite) TestQueryTurnstile() { suite.Commit() - ctx := sdk.WrapSDKContext(suite.ctx) address, found := suite.app.CSRKeeper.GetTurnstile(suite.ctx) suite.Require().True(found) - res, err := suite.queryClient.Turnstile(ctx, &types.QueryTurnstileRequest{}) + res, err := suite.queryClient.Turnstile(suite.ctx, &types.QueryTurnstileRequest{}) suite.Require().NoError(err) suite.Require().Equal(address.String(), res.Address) } diff --git a/x/csr/types/params.pb.go b/x/csr/types/params.pb.go index 1a4a2247a..bd6e05974 100644 --- a/x/csr/types/params.pb.go +++ b/x/csr/types/params.pb.go @@ -7,6 +7,7 @@ import ( cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" @@ -81,24 +82,26 @@ func init() { func init() { proto.RegisterFile("canto/csr/v1/params.proto", fileDescriptor_60f3e0cd3160b8d7) } var fileDescriptor_60f3e0cd3160b8d7 = []byte{ - // 263 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x2c, 0x90, 0xb1, 0x4e, 0xc3, 0x30, - 0x10, 0x86, 0x63, 0x86, 0x8a, 0x58, 0x4c, 0x11, 0x43, 0x5b, 0x84, 0x5b, 0x31, 0x75, 0x89, 0xad, - 0x88, 0x81, 0xbd, 0xad, 0xc4, 0x82, 0x50, 0x55, 0x36, 0x96, 0xc8, 0x39, 0xac, 0xa4, 0x2a, 0xa9, - 0x23, 0x9f, 0x09, 0xe4, 0x2d, 0x78, 0x18, 0x1e, 0xa2, 0x63, 0xc5, 0x84, 0x18, 0x2a, 0x94, 0xbc, - 0x08, 0x8a, 0xdd, 0xcd, 0xbf, 0xbf, 0xd3, 0x77, 0xfa, 0x8f, 0x8e, 0x40, 0xee, 0xac, 0x16, 0x80, - 0x46, 0xd4, 0x89, 0xa8, 0xa4, 0x91, 0x25, 0xf2, 0xca, 0x68, 0xab, 0xa3, 0x0b, 0x87, 0x38, 0xa0, - 0xe1, 0x75, 0x32, 0xbe, 0xcc, 0x75, 0xae, 0x1d, 0x10, 0xfd, 0xcb, 0xcf, 0x8c, 0x47, 0xa0, 0xb1, - 0xd4, 0x98, 0x7a, 0xe0, 0x83, 0x47, 0x37, 0x0d, 0x1d, 0xac, 0x9c, 0x2e, 0xba, 0xa6, 0x54, 0xed, - 0x64, 0xf6, 0xaa, 0x52, 0x40, 0x33, 0x24, 0x53, 0x32, 0x3b, 0x5f, 0x87, 0xfe, 0x67, 0x81, 0x26, - 0x5a, 0x51, 0x0a, 0x68, 0x52, 0x2c, 0xa4, 0x51, 0x38, 0x3c, 0x9b, 0x92, 0x59, 0x38, 0x4f, 0xf6, - 0xc7, 0x49, 0xf0, 0x7b, 0x9c, 0x5c, 0x79, 0x25, 0xbe, 0x6c, 0xf9, 0x46, 0x8b, 0x52, 0xda, 0x82, - 0x3f, 0xa8, 0x5c, 0x42, 0xb3, 0x54, 0xf0, 0xfd, 0x15, 0xd3, 0xd3, 0xc6, 0xa5, 0x82, 0x75, 0x08, - 0x68, 0x9e, 0x9c, 0x63, 0x7e, 0xbf, 0x6f, 0x19, 0x39, 0xb4, 0x8c, 0xfc, 0xb5, 0x8c, 0x7c, 0x76, - 0x2c, 0x38, 0x74, 0x2c, 0xf8, 0xe9, 0x58, 0xf0, 0x1c, 0xe7, 0x1b, 0x5b, 0xbc, 0x65, 0x1c, 0x74, - 0x29, 0x16, 0x7d, 0xbd, 0xf8, 0x51, 0xd9, 0x77, 0x6d, 0xb6, 0x3e, 0x89, 0xfa, 0x4e, 0x7c, 0xb8, - 0x63, 0xd8, 0xa6, 0x52, 0x98, 0x0d, 0x5c, 0x95, 0xdb, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xe2, - 0xa6, 0x44, 0xae, 0x26, 0x01, 0x00, 0x00, + // 295 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0x4e, 0xcc, 0x2b, + 0xc9, 0xd7, 0x4f, 0x2e, 0x2e, 0xd2, 0x2f, 0x33, 0xd4, 0x2f, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0xd6, + 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x01, 0x4b, 0xe9, 0x25, 0x17, 0x17, 0xe9, 0x95, 0x19, + 0x4a, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x25, 0xf4, 0x41, 0x2c, 0x88, 0x1a, 0x29, 0xc9, 0xe4, + 0xfc, 0xe2, 0xdc, 0xfc, 0xe2, 0x78, 0x88, 0x04, 0x84, 0x03, 0x95, 0x12, 0x4c, 0xcc, 0xcd, 0xcc, + 0xcb, 0xd7, 0x07, 0x93, 0x10, 0x21, 0xa5, 0xe9, 0x8c, 0x5c, 0x6c, 0x01, 0x60, 0x2b, 0x84, 0x64, + 0xb9, 0xb8, 0x52, 0xf3, 0x12, 0x93, 0x72, 0x52, 0xe3, 0x93, 0x8b, 0x8b, 0x24, 0x18, 0x15, 0x18, + 0x35, 0x38, 0x82, 0x38, 0x21, 0x22, 0xce, 0xc5, 0x45, 0x42, 0xa1, 0x5c, 0x5c, 0xc9, 0xc5, 0x45, + 0xf1, 0xc5, 0x19, 0x89, 0x45, 0xa9, 0xc5, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0x9c, 0x4e, 0x66, 0x27, + 0xee, 0xc9, 0x33, 0xdc, 0xba, 0x27, 0x2f, 0x0d, 0xb1, 0xa6, 0x38, 0x25, 0x5b, 0x2f, 0x33, 0x5f, + 0x3f, 0x37, 0xb1, 0x24, 0x43, 0xcf, 0x27, 0x35, 0x3d, 0x31, 0xb9, 0xd2, 0x25, 0x35, 0xf9, 0xd2, + 0x16, 0x5d, 0x2e, 0xa8, 0x2b, 0x5c, 0x52, 0x93, 0x57, 0x3c, 0xdf, 0xa0, 0xc5, 0x18, 0xc4, 0x99, + 0x5c, 0x5c, 0x14, 0x0c, 0x36, 0xc8, 0x4a, 0xbc, 0xeb, 0xf9, 0x06, 0x2d, 0x21, 0x88, 0x97, 0x2b, + 0xc0, 0x9e, 0x86, 0x38, 0xc7, 0xc9, 0xfd, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x1f, + 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, 0xe5, 0x18, + 0xa2, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x9d, 0x41, 0x1a, + 0x75, 0xfd, 0x52, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0x21, 0x3c, 0xfd, 0x32, 0x73, 0xa8, 0x49, 0x25, + 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0x60, 0x9f, 0x1a, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xa8, + 0xac, 0x11, 0xe0, 0x58, 0x01, 0x00, 0x00, } func (m *Params) Marshal() (dAtA []byte, err error) { diff --git a/x/csr/types/tx.pb.go b/x/csr/types/tx.pb.go index 4cdcf1a71..1cbf16071 100644 --- a/x/csr/types/tx.pb.go +++ b/x/csr/types/tx.pb.go @@ -136,29 +136,29 @@ func init() { func init() { proto.RegisterFile("canto/csr/v1/tx.proto", fileDescriptor_249005a6451fe2d1) } var fileDescriptor_249005a6451fe2d1 = []byte{ - // 347 bytes of a gzipped FileDescriptorProto + // 349 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4d, 0x4e, 0xcc, 0x2b, 0xc9, 0xd7, 0x4f, 0x2e, 0x2e, 0xd2, 0x2f, 0x33, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x01, 0x0b, 0xeb, 0x25, 0x17, 0x17, 0xe9, 0x95, 0x19, 0x4a, 0x89, 0xa4, 0xe7, 0xa7, 0xe7, 0x83, 0x25, 0xf4, 0x41, 0x2c, 0x88, 0x1a, 0x29, 0xf1, 0xe4, 0xfc, 0xe2, 0xdc, 0xfc, 0x62, 0xfd, 0xdc, 0xe2, 0x74, 0x90, 0xde, 0xdc, 0xe2, 0x74, 0xa8, 0x84, 0x24, 0x44, 0x22, 0x1e, 0xa2, 0x03, 0xc2, 0x81, 0x4a, 0x09, 0x26, 0xe6, 0x66, 0xe6, 0xe5, 0xeb, 0x83, 0x49, 0xb8, 0x6a, - 0x64, 0x17, 0x14, 0x24, 0x16, 0x25, 0xe6, 0x42, 0x55, 0x2b, 0xad, 0x61, 0xe4, 0xe2, 0xf7, 0x2d, + 0x64, 0x17, 0x14, 0x24, 0x16, 0x25, 0xe6, 0x42, 0x55, 0x2b, 0x6d, 0x62, 0xe4, 0xe2, 0xf7, 0x2d, 0x4e, 0x0f, 0x2d, 0x48, 0x49, 0x2c, 0x49, 0x0d, 0x00, 0xcb, 0x08, 0x99, 0x71, 0x71, 0x26, 0x96, 0x96, 0x64, 0xe4, 0x17, 0x65, 0x96, 0x54, 0x4a, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x3a, 0x49, 0x5c, 0xda, 0xa2, 0x2b, 0x02, 0xb5, 0xc6, 0x31, 0x25, 0xa5, 0x28, 0xb5, 0xb8, 0x38, 0xb8, 0xa4, 0x28, 0x33, 0x2f, 0x3d, 0x08, 0xa1, 0x54, 0xc8, 0x9c, 0x8b, 0x0d, 0x62, 0xb6, 0x04, 0x93, 0x02, 0xa3, 0x06, 0xb7, 0x91, 0x88, 0x1e, 0xb2, 0x17, 0xf5, 0x20, 0xa6, 0x3b, 0x71, 0x9e, 0xb8, 0x27, 0xcf, - 0xb0, 0xe2, 0xf9, 0x06, 0x2d, 0xc6, 0x20, 0xa8, 0x72, 0x2b, 0x8d, 0xa6, 0xe7, 0x1b, 0xb4, 0x10, - 0x06, 0x75, 0x3d, 0xdf, 0xa0, 0x05, 0x0d, 0x34, 0x34, 0xa7, 0x29, 0x49, 0x72, 0x89, 0xa3, 0x09, - 0x05, 0xa5, 0x16, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x1a, 0x25, 0x71, 0x31, 0xfb, 0x16, 0xa7, 0x0b, - 0x85, 0x70, 0xf1, 0xa0, 0x78, 0x46, 0x16, 0xd5, 0x11, 0x68, 0xba, 0xa5, 0x54, 0xf1, 0x4a, 0xc3, - 0x0c, 0x97, 0x62, 0x6d, 0x00, 0x39, 0xd8, 0xc9, 0xfd, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, - 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, - 0xe5, 0x18, 0xa2, 0x74, 0xd3, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x9d, - 0x41, 0x26, 0xea, 0xfa, 0xa5, 0x96, 0x94, 0xe7, 0x17, 0x65, 0x43, 0x78, 0xfa, 0x65, 0xe6, 0xfa, - 0x15, 0xe0, 0x08, 0x28, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x87, 0xbe, 0x31, 0x20, 0x00, - 0x00, 0xff, 0xff, 0x44, 0xa0, 0x85, 0xe5, 0x1c, 0x02, 0x00, 0x00, + 0xb0, 0xe2, 0xf9, 0x06, 0x2d, 0xc6, 0x20, 0xa8, 0x72, 0x2b, 0xbd, 0xa6, 0xe7, 0x1b, 0xb4, 0x10, + 0x06, 0x75, 0x3d, 0xdf, 0xa0, 0x25, 0x0d, 0x71, 0x72, 0x05, 0xd8, 0xd1, 0x68, 0x0e, 0x54, 0x92, + 0xe4, 0x12, 0x47, 0x13, 0x0a, 0x4a, 0x2d, 0x2e, 0xc8, 0xcf, 0x2b, 0x4e, 0x35, 0x4a, 0xe2, 0x62, + 0xf6, 0x2d, 0x4e, 0x17, 0x0a, 0xe1, 0xe2, 0x41, 0xf1, 0x92, 0x2c, 0xaa, 0x53, 0xd0, 0x74, 0x4b, + 0xa9, 0xe2, 0x95, 0x86, 0x19, 0x2e, 0xc5, 0xda, 0x00, 0x72, 0xb6, 0x93, 0xfb, 0x89, 0x47, 0x72, + 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0x3e, 0x78, 0x24, 0xc7, 0x38, 0xe1, 0xb1, 0x1c, 0xc3, 0x85, 0xc7, + 0x72, 0x0c, 0x37, 0x1e, 0xcb, 0x31, 0x44, 0xe9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, + 0xe7, 0xe7, 0xea, 0x3b, 0x83, 0x4c, 0xd4, 0xf5, 0x4b, 0x2d, 0x29, 0xcf, 0x2f, 0xca, 0x86, 0xf0, + 0xf4, 0xcb, 0xcc, 0xa1, 0x3e, 0x2a, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0xc7, 0x81, 0x31, + 0x20, 0x00, 0x00, 0xff, 0xff, 0x5c, 0x18, 0x96, 0xdc, 0x22, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/epochs/keeper/grpc_query_test.go b/x/epochs/keeper/grpc_query_test.go index 7e43e6926..76e8c1a94 100644 --- a/x/epochs/keeper/grpc_query_test.go +++ b/x/epochs/keeper/grpc_query_test.go @@ -5,7 +5,6 @@ import ( "time" "github.com/Canto-Network/Canto/v7/x/epochs/types" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" ) @@ -182,10 +181,9 @@ func (suite *KeeperTestSuite) TestCurrentEpoch() { suite.Run(fmt.Sprintf("Case %s", tc.name), func() { suite.SetupTest() // reset - ctx := sdk.WrapSDKContext(suite.ctx) tc.malleate() - res, err := suite.queryClient.CurrentEpoch(ctx, req) + res, err := suite.queryClient.CurrentEpoch(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) suite.Require().Equal(expRes, res) diff --git a/x/erc20/keeper/evm.go b/x/erc20/keeper/evm.go index e884683b0..48cca5554 100644 --- a/x/erc20/keeper/evm.go +++ b/x/erc20/keeper/evm.go @@ -5,8 +5,8 @@ import ( "math/big" errorsmod "cosmossdk.io/errors" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" sdk "github.com/cosmos/cosmos-sdk/types" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/ethereum/go-ethereum/accounts/abi" "github.com/ethereum/go-ethereum/common" @@ -183,7 +183,7 @@ func (k Keeper) CallEVMWithData( return nil, errorsmod.Wrapf(sdkerrors.ErrJSONMarshal, "failed to marshal tx args: %s", err.Error()) } - gasRes, err := k.evmKeeper.EstimateGas(sdk.WrapSDKContext(ctx), &evmtypes.EthCallRequest{ + gasRes, err := k.evmKeeper.EstimateGas(ctx, &evmtypes.EthCallRequest{ Args: args, GasCap: config.DefaultGasCap, }) diff --git a/x/erc20/keeper/evm_hooks_test.go b/x/erc20/keeper/evm_hooks_test.go index 7763f0e5f..397c36fb3 100644 --- a/x/erc20/keeper/evm_hooks_test.go +++ b/x/erc20/keeper/evm_hooks_test.go @@ -210,8 +210,7 @@ func (suite *KeeperTestSuite) TestEvmHooksRegisteredCoin() { sender, ) - ctx := sdk.WrapSDKContext(suite.ctx) - _, err := suite.app.Erc20Keeper.ConvertCoin(ctx, convertCoin) + _, err := suite.app.Erc20Keeper.ConvertCoin(suite.ctx, convertCoin) suite.Require().NoError(err, tc.name) suite.Commit() diff --git a/x/erc20/keeper/grpc_query_test.go b/x/erc20/keeper/grpc_query_test.go index 3043c3e4b..53921544b 100644 --- a/x/erc20/keeper/grpc_query_test.go +++ b/x/erc20/keeper/grpc_query_test.go @@ -3,7 +3,6 @@ package keeper_test import ( "fmt" - sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" "github.com/evmos/ethermint/tests" @@ -66,10 +65,9 @@ func (suite *KeeperTestSuite) TestTokenPairs() { suite.Run(fmt.Sprintf("Case %s", tc.name), func() { suite.SetupTest() // reset - ctx := sdk.WrapSDKContext(suite.ctx) tc.malleate() - res, err := suite.queryClient.TokenPairs(ctx, req) + res, err := suite.queryClient.TokenPairs(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) suite.Require().Equal(expRes.Pagination, res.Pagination) @@ -146,10 +144,9 @@ func (suite *KeeperTestSuite) TestTokenPair() { suite.Run(fmt.Sprintf("Case %s", tc.name), func() { suite.SetupTest() // reset - ctx := sdk.WrapSDKContext(suite.ctx) tc.malleate() - res, err := suite.queryClient.TokenPair(ctx, req) + res, err := suite.queryClient.TokenPair(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) suite.Require().Equal(expRes, res) @@ -161,10 +158,9 @@ func (suite *KeeperTestSuite) TestTokenPair() { } func (suite *KeeperTestSuite) TestQueryParams() { - ctx := sdk.WrapSDKContext(suite.ctx) expParams := types.DefaultParams() - res, err := suite.queryClient.Params(ctx, &types.QueryParamsRequest{}) + res, err := suite.queryClient.Params(suite.ctx, &types.QueryParamsRequest{}) suite.Require().NoError(err) suite.Require().Equal(expParams, res.Params) } diff --git a/x/erc20/keeper/keeper_test.go b/x/erc20/keeper/keeper_test.go index 0744aa549..01b197232 100644 --- a/x/erc20/keeper/keeper_test.go +++ b/x/erc20/keeper/keeper_test.go @@ -208,7 +208,6 @@ func (suite *KeeperTestSuite) MintFeeCollector(coins sdk.Coins) { // DeployContract deploys the ERC20MinterBurnerDecimalsContract. func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8) (common.Address, error) { - ctx := sdk.WrapSDKContext(suite.ctx) chainID := suite.app.EvmKeeper.ChainID() ctorArgs, err := contracts.ERC20MinterBurnerDecimalsContract.ABI.Pack("", name, symbol, decimals) @@ -225,7 +224,7 @@ func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8 return common.Address{}, err } - res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ + res, err := suite.queryClientEvm.EstimateGas(suite.ctx, &evm.EthCallRequest{ Args: args, GasCap: uint64(config.DefaultGasCap), }) @@ -253,7 +252,7 @@ func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8 return common.Address{}, err } - rsp, err := suite.app.EvmKeeper.EthereumTx(ctx, erc20DeployTx) + rsp, err := suite.app.EvmKeeper.EthereumTx(suite.ctx, erc20DeployTx) if err != nil { return common.Address{}, err } @@ -263,7 +262,6 @@ func (suite *KeeperTestSuite) DeployContract(name, symbol string, decimals uint8 } func (suite *KeeperTestSuite) DeployContractMaliciousDelayed(name string, symbol string) common.Address { - ctx := sdk.WrapSDKContext(suite.ctx) chainID := suite.app.EvmKeeper.ChainID() ctorArgs, err := contracts.ERC20MaliciousDelayedContract.ABI.Pack("", big.NewInt(1000000000000000000)) @@ -276,7 +274,7 @@ func (suite *KeeperTestSuite) DeployContractMaliciousDelayed(name string, symbol }) suite.Require().NoError(err) - res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ + res, err := suite.queryClientEvm.EstimateGas(suite.ctx, &evm.EthCallRequest{ Args: args, GasCap: uint64(config.DefaultGasCap), }) @@ -299,14 +297,13 @@ func (suite *KeeperTestSuite) DeployContractMaliciousDelayed(name string, symbol erc20DeployTx.From = suite.address.Hex() err = erc20DeployTx.Sign(ethtypes.LatestSignerForChainID(chainID), suite.signer) suite.Require().NoError(err) - rsp, err := suite.app.EvmKeeper.EthereumTx(ctx, erc20DeployTx) + rsp, err := suite.app.EvmKeeper.EthereumTx(suite.ctx, erc20DeployTx) suite.Require().NoError(err) suite.Require().Empty(rsp.VmError) return crypto.CreateAddress(suite.address, nonce) } func (suite *KeeperTestSuite) DeployContractDirectBalanceManipulation(name string, symbol string) common.Address { - ctx := sdk.WrapSDKContext(suite.ctx) chainID := suite.app.EvmKeeper.ChainID() ctorArgs, err := contracts.ERC20DirectBalanceManipulationContract.ABI.Pack("", big.NewInt(1000000000000000000)) @@ -319,7 +316,7 @@ func (suite *KeeperTestSuite) DeployContractDirectBalanceManipulation(name strin }) suite.Require().NoError(err) - res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ + res, err := suite.queryClientEvm.EstimateGas(suite.ctx, &evm.EthCallRequest{ Args: args, GasCap: uint64(config.DefaultGasCap), }) @@ -342,7 +339,7 @@ func (suite *KeeperTestSuite) DeployContractDirectBalanceManipulation(name strin erc20DeployTx.From = suite.address.Hex() err = erc20DeployTx.Sign(ethtypes.LatestSignerForChainID(chainID), suite.signer) suite.Require().NoError(err) - rsp, err := suite.app.EvmKeeper.EthereumTx(ctx, erc20DeployTx) + rsp, err := suite.app.EvmKeeper.EthereumTx(suite.ctx, erc20DeployTx) suite.Require().NoError(err) suite.Require().Empty(rsp.VmError) return crypto.CreateAddress(suite.address, nonce) @@ -402,12 +399,11 @@ func (suite *KeeperTestSuite) GrantERC20Token(contractAddr, from, to common.Addr } func (suite *KeeperTestSuite) sendTx(contractAddr, from common.Address, transferData []byte) *evm.MsgEthereumTx { - ctx := sdk.WrapSDKContext(suite.ctx) chainID := suite.app.EvmKeeper.ChainID() args, err := json.Marshal(&evm.TransactionArgs{To: &contractAddr, From: &from, Data: (*hexutil.Bytes)(&transferData)}) suite.Require().NoError(err) - res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ + res, err := suite.queryClientEvm.EstimateGas(suite.ctx, &evm.EthCallRequest{ Args: args, GasCap: uint64(config.DefaultGasCap), }) @@ -434,7 +430,7 @@ func (suite *KeeperTestSuite) sendTx(contractAddr, from common.Address, transfer ercTransferTx.From = suite.address.Hex() err = ercTransferTx.Sign(ethtypes.LatestSignerForChainID(chainID), suite.signer) suite.Require().NoError(err) - rsp, err := suite.app.EvmKeeper.EthereumTx(ctx, ercTransferTx) + rsp, err := suite.app.EvmKeeper.EthereumTx(suite.ctx, ercTransferTx) suite.Require().NoError(err) suite.Require().Empty(rsp.VmError) return ercTransferTx diff --git a/x/erc20/keeper/msg_server_test.go b/x/erc20/keeper/msg_server_test.go index c496480a9..ab61ef40e 100644 --- a/x/erc20/keeper/msg_server_test.go +++ b/x/erc20/keeper/msg_server_test.go @@ -340,7 +340,6 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { tc.malleate(erc20) suite.Commit() - ctx := sdk.WrapSDKContext(suite.ctx) coins := sdk.NewCoins(sdk.NewCoin(cosmosTokenBase, sdkmath.NewInt(tc.mint))) sender := sdk.AccAddress(suite.address.Bytes()) msg := types.NewMsgConvertCoin( @@ -353,7 +352,7 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeCoin() { suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) tc.extra() - res, err := suite.app.Erc20Keeper.ConvertCoin(ctx, msg) + res, err := suite.app.Erc20Keeper.ConvertCoin(suite.ctx, msg) expRes := &types.MsgConvertCoinResponse{} suite.Commit() balance := suite.BalanceOf(common.HexToAddress(pair.Erc20Address), suite.address) @@ -518,8 +517,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeCoin() { sender, ) - ctx := sdk.WrapSDKContext(suite.ctx) - _, err := suite.app.Erc20Keeper.ConvertCoin(ctx, msg) + _, err := suite.app.Erc20Keeper.ConvertCoin(suite.ctx, msg) suite.Require().NoError(err, tc.name) suite.Commit() balance := suite.BalanceOf(common.HexToAddress(pair.Erc20Address), suite.address) @@ -528,7 +526,6 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeCoin() { suite.Require().Equal(balance, big.NewInt(tc.burn)) // Convert ERC20s back to Coins - ctx = sdk.WrapSDKContext(suite.ctx) contractAddr := common.HexToAddress(pair.Erc20Address) msgConvertERC20 := types.NewMsgConvertERC20( sdkmath.NewInt(tc.reconvert), @@ -538,7 +535,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeCoin() { ) tc.malleate() - res, err := suite.app.Erc20Keeper.ConvertERC20(ctx, msgConvertERC20) + res, err := suite.app.Erc20Keeper.ConvertERC20(suite.ctx, msgConvertERC20) expRes := &types.MsgConvertERC20Response{} suite.Commit() balance = suite.BalanceOf(contractAddr, suite.address) @@ -1076,7 +1073,6 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeERC20() { // Convert Coins back to ERC20s receiver := suite.address - ctx := sdk.WrapSDKContext(suite.ctx) msg := types.NewMsgConvertCoin( sdk.NewCoin(coinName, sdkmath.NewInt(tc.convert)), receiver, @@ -1084,7 +1080,7 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeERC20() { ) tc.extra() - res, err := suite.app.Erc20Keeper.ConvertCoin(ctx, msg) + res, err := suite.app.Erc20Keeper.ConvertCoin(suite.ctx, msg) expRes := &types.MsgConvertCoinResponse{} suite.Commit() @@ -1135,12 +1131,10 @@ func (suite *KeeperTestSuite) TestWrongPairOwnerERC20NativeCoin() { pair.ContractOwner = types.OWNER_UNSPECIFIED suite.app.Erc20Keeper.SetTokenPair(suite.ctx, *pair) - ctx := sdk.WrapSDKContext(suite.ctx) - _, err := suite.app.Erc20Keeper.ConvertCoin(ctx, msg) + _, err := suite.app.Erc20Keeper.ConvertCoin(suite.ctx, msg) suite.Require().Error(err, tc.name) // Convert ERC20s back to Coins - ctx = sdk.WrapSDKContext(suite.ctx) contractAddr := common.HexToAddress(pair.Erc20Address) msgConvertERC20 := types.NewMsgConvertERC20( sdkmath.NewInt(tc.reconvert), @@ -1149,7 +1143,7 @@ func (suite *KeeperTestSuite) TestWrongPairOwnerERC20NativeCoin() { suite.address, ) - _, err = suite.app.Erc20Keeper.ConvertERC20(ctx, msgConvertERC20) + _, err = suite.app.Erc20Keeper.ConvertERC20(suite.ctx, msgConvertERC20) suite.Require().Error(err, tc.name) }) } @@ -1290,7 +1284,6 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeIBCVoucher() { tc.malleate(erc20) suite.Commit() - ctx := sdk.WrapSDKContext(suite.ctx) coins := sdk.NewCoins(sdk.NewCoin(ibcBase, sdkmath.NewInt(tc.mint))) sender := sdk.AccAddress(suite.address.Bytes()) msg := types.NewMsgConvertCoin( @@ -1303,7 +1296,7 @@ func (suite *KeeperTestSuite) TestConvertCoinNativeIBCVoucher() { suite.app.BankKeeper.SendCoinsFromModuleToAccount(suite.ctx, types.ModuleName, sender, coins) tc.extra() - res, err := suite.app.Erc20Keeper.ConvertCoin(ctx, msg) + res, err := suite.app.Erc20Keeper.ConvertCoin(suite.ctx, msg) expRes := &types.MsgConvertCoinResponse{} suite.Commit() balance := suite.BalanceOf(common.HexToAddress(pair.Erc20Address), suite.address) @@ -1468,8 +1461,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeIBCVoucher() { sender, ) - ctx := sdk.WrapSDKContext(suite.ctx) - _, err := suite.app.Erc20Keeper.ConvertCoin(ctx, msg) + _, err := suite.app.Erc20Keeper.ConvertCoin(suite.ctx, msg) suite.Require().NoError(err, tc.name) suite.Commit() balance := suite.BalanceOf(common.HexToAddress(pair.Erc20Address), suite.address) @@ -1478,7 +1470,6 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeIBCVoucher() { suite.Require().Equal(balance, big.NewInt(tc.burn)) // Convert ERC20s back to Coins - ctx = sdk.WrapSDKContext(suite.ctx) contractAddr := common.HexToAddress(pair.Erc20Address) msgConvertERC20 := types.NewMsgConvertERC20( sdkmath.NewInt(tc.reconvert), @@ -1488,7 +1479,7 @@ func (suite *KeeperTestSuite) TestConvertERC20NativeIBCVoucher() { ) tc.malleate() - res, err := suite.app.Erc20Keeper.ConvertERC20(ctx, msgConvertERC20) + res, err := suite.app.Erc20Keeper.ConvertERC20(suite.ctx, msgConvertERC20) expRes := &types.MsgConvertERC20Response{} suite.Commit() balance = suite.BalanceOf(contractAddr, suite.address) diff --git a/x/govshuttle/client/cli/tx.go b/x/govshuttle/client/cli/tx.go index e0db33d8c..b868f6dd8 100644 --- a/x/govshuttle/client/cli/tx.go +++ b/x/govshuttle/client/cli/tx.go @@ -6,24 +6,26 @@ import ( "github.com/spf13/cobra" + addresscodec "cosmossdk.io/core/address" + errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/client" + "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/address" "github.com/cosmos/cosmos-sdk/version" - "github.com/cosmos/cosmos-sdk/x/gov/client/cli" - govtypes "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" - - errorsmod "cosmossdk.io/errors" "github.com/Canto-Network/Canto/v7/x/govshuttle/types" ) var ( DefaultRelativePacketTimeoutTimestamp = uint64((time.Duration(10) * time.Minute).Nanoseconds()) + + FlagAuthority = "authority" ) // NewTxCmd returns a root CLI command handler for certain modules/govshuttle transaction commands. -func NewTxCmd() *cobra.Command { +func NewTxCmd(ac addresscodec.Codec) *cobra.Command { txCmd := &cobra.Command{ Use: types.ModuleName, Short: "govshuttle subcommands", @@ -32,12 +34,15 @@ func NewTxCmd() *cobra.Command { RunE: client.ValidateCmd, } - txCmd.AddCommand() + txCmd.AddCommand( + NewLendingMarketProposalCmd(ac), + NewTreasuryProposalCmd(ac), + ) return txCmd } // NewRegisterCoinProposalCmd implements the command to submit a community-pool-spend proposal -func NewLendingMarketProposalCmd() *cobra.Command { +func NewLendingMarketProposalCmd(ac addresscodec.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "lending-market [metadata]", Args: cobra.ExactArgs(1), @@ -51,9 +56,9 @@ Where metadata.json contains (example): { "Account": ["address_1", "address_2"], - "PropId": 1, + "PropId": 1, "values": ["canto", "osmo"], - "calldatas: ["calldata1", "calldata2"], + "calldatas": ["calldata1", "calldata2"], "signatures": ["func1", "func2"] }`, version.AppName, ), @@ -63,22 +68,7 @@ Where metadata.json contains (example): return err } - title, err := cmd.Flags().GetString(cli.FlagTitle) - if err != nil { - return err - } - - description, err := cmd.Flags().GetString(cli.FlagDescription) - if err != nil { - return err - } - - depositStr, err := cmd.Flags().GetString(cli.FlagDeposit) - if err != nil { - return err - } - - deposit, err := sdk.ParseCoinsNormalized(depositStr) + proposal, err := ReadGovPropFlags(clientCtx, cmd.Flags()) if err != nil { return err } @@ -88,40 +78,37 @@ Where metadata.json contains (example): return errorsmod.Wrap(err, "Failure to parse JSON object") } - from := clientCtx.GetFromAddress() - - content := types.NewLendingMarketProposal(title, description, &propMetaData) - - msg, err := govtypes.NewMsgSubmitProposal(content, deposit, from) - if err != nil { - return err + authority, _ := cmd.Flags().GetString(FlagAuthority) + if authority != "" { + if _, err = ac.StringToBytes(authority); err != nil { + return fmt.Errorf("invalid authority address: %w", err) + } + } else { + authority = sdk.AccAddress(address.Module("gov")).String() } - //if err := msg.ValidateBasic(); err != nil { - // return err - //} + if err := proposal.SetMsgs([]sdk.Msg{ + &types.MsgLendingMarketProposal{ + Authority: authority, + Title: proposal.Title, + Description: proposal.Summary, + Metadata: &propMetaData, + }, + }); err != nil { + return fmt.Errorf("failed to create submit lending market proposal message: %w", err) + } - return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), proposal) }, } + flags.AddTxFlagsToCmd(cmd) + AddGovPropFlagsToCmd(cmd) - cmd.Flags().String(cli.FlagTitle, "", "title of proposal") - cmd.Flags().String(cli.FlagDescription, "", "description of proposal") - cmd.Flags().String(cli.FlagDeposit, "1aevmos", "deposit of proposal") - if err := cmd.MarkFlagRequired(cli.FlagTitle); err != nil { - panic(err) - } - if err := cmd.MarkFlagRequired(cli.FlagDescription); err != nil { - panic(err) - } - if err := cmd.MarkFlagRequired(cli.FlagDeposit); err != nil { - panic(err) - } return cmd } // Register TreasuryProposal submit cmd -func NewTreasuryProposalCmd() *cobra.Command { +func NewTreasuryProposalCmd(ac addresscodec.Codec) *cobra.Command { cmd := &cobra.Command{ Use: "treasury-proposal [metadata]", Args: cobra.ExactArgs(1), @@ -135,7 +122,7 @@ Where metadata.json contains (example): { "recipient": "0xfffffff...", - "PropID": 1, + "PropID": 1, "amount": 1, "denom": "canto/note" }`, version.AppName, @@ -146,22 +133,7 @@ Where metadata.json contains (example): return err } - title, err := cmd.Flags().GetString(cli.FlagTitle) - if err != nil { - return err - } - - description, err := cmd.Flags().GetString(cli.FlagDescription) - if err != nil { - return err - } - - depositStr, err := cmd.Flags().GetString(cli.FlagDeposit) - if err != nil { - return err - } - - deposit, err := sdk.ParseCoinsNormalized(depositStr) + proposal, err := ReadGovPropFlags(clientCtx, cmd.Flags()) if err != nil { return err } @@ -171,34 +143,31 @@ Where metadata.json contains (example): return errorsmod.Wrap(err, "Failure to parse JSON object") } - from := clientCtx.GetFromAddress() - - content := types.NewTreasuryProposal(title, description, &propMetaData) - - msg, err := govtypes.NewMsgSubmitProposal(content, deposit, from) - if err != nil { - return err + authority, _ := cmd.Flags().GetString(FlagAuthority) + if authority != "" { + if _, err = ac.StringToBytes(authority); err != nil { + return fmt.Errorf("invalid authority address: %w", err) + } + } else { + authority = sdk.AccAddress(address.Module("gov")).String() } - //if err := msg.ValidateBasic(); err != nil { - // return err - //} + if err := proposal.SetMsgs([]sdk.Msg{ + &types.MsgTreasuryProposal{ + Authority: authority, + Title: proposal.Title, + Description: proposal.Summary, + Metadata: &propMetaData, + }, + }); err != nil { + return fmt.Errorf("failed to create submit treasury proposal message: %w", err) + } - return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg) + return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), proposal) }, } + flags.AddTxFlagsToCmd(cmd) + AddGovPropFlagsToCmd(cmd) - cmd.Flags().String(cli.FlagTitle, "", "title of proposal") - cmd.Flags().String(cli.FlagDescription, "", "description of proposal") - cmd.Flags().String(cli.FlagDeposit, "1aevmos", "deposit of proposal") - if err := cmd.MarkFlagRequired(cli.FlagTitle); err != nil { - panic(err) - } - if err := cmd.MarkFlagRequired(cli.FlagDescription); err != nil { - panic(err) - } - if err := cmd.MarkFlagRequired(cli.FlagDeposit); err != nil { - panic(err) - } return cmd } diff --git a/x/govshuttle/client/cli/utils.go b/x/govshuttle/client/cli/utils.go index 91ec5835b..9a67d09b4 100644 --- a/x/govshuttle/client/cli/utils.go +++ b/x/govshuttle/client/cli/utils.go @@ -1,12 +1,20 @@ package cli import ( - "encoding/json" - "io/ioutil" + "fmt" + "os" "path/filepath" - "github.com/Canto-Network/Canto/v7/x/govshuttle/types" + "github.com/spf13/cobra" + "github.com/spf13/pflag" + + "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/gov/client/cli" + govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" ) // PARSING METADATA ACCORDING TO PROPOSAL STRUCT IN GOVTYPES TYPE IN govshuttle @@ -15,17 +23,13 @@ import ( func ParseLendingMarketMetadata(cdc codec.JSONCodec, metadataFile string) (types.LendingMarketMetadata, error) { propMetaData := types.LendingMarketMetadata{} - contents, err := ioutil.ReadFile(filepath.Clean(metadataFile)) + contents, err := os.ReadFile(filepath.Clean(metadataFile)) if err != nil { return propMetaData, err } - // if err = cdc.UnmarshalJSON(contents, &propMetaData); err != nil { - // return propMetaData, err - // } - - if err = json.Unmarshal(contents, &propMetaData); err != nil { - return types.LendingMarketMetadata{}, err + if err = cdc.UnmarshalJSON(contents, &propMetaData); err != nil { + return propMetaData, err } propMetaData.PropId = 0 @@ -36,20 +40,71 @@ func ParseLendingMarketMetadata(cdc codec.JSONCodec, metadataFile string) (types func ParseTreasuryMetadata(cdc codec.JSONCodec, metadataFile string) (types.TreasuryProposalMetadata, error) { propMetaData := types.TreasuryProposalMetadata{} - contents, err := ioutil.ReadFile(filepath.Clean(metadataFile)) + contents, err := os.ReadFile(filepath.Clean(metadataFile)) if err != nil { return propMetaData, err } - // if err = cdc.UnmarshalJSON(contents, &propMetaData); err != nil { - // return propMetaData, err - // } - - if err = json.Unmarshal(contents, &propMetaData); err != nil { - return types.TreasuryProposalMetadata{}, err + if err = cdc.UnmarshalJSON(contents, &propMetaData); err != nil { + return propMetaData, err } propMetaData.PropID = 0 return propMetaData, nil } + +// AddGovPropFlagsToCmd adds flags for defining MsgSubmitProposal fields. +// +// See also ReadGovPropFlags. +// ref. github.com/cosmos/cosmos-sdk/x/gov/client/cli/util.go::AddGovPropFlagsToCmd +func AddGovPropFlagsToCmd(cmd *cobra.Command) { + cmd.Flags().String(cli.FlagTitle, "", "title of proposal") + cmd.Flags().String(cli.FlagDescription, "", "description of proposal") + cmd.Flags().String(cli.FlagDeposit, "1acanto", "deposit of proposal") + cmd.Flags().String(FlagAuthority, "", "The address of the upgrade module authority (defaults to gov)") + + if err := cmd.MarkFlagRequired(cli.FlagTitle); err != nil { + panic(err) + } + if err := cmd.MarkFlagRequired(cli.FlagDescription); err != nil { + panic(err) + } + if err := cmd.MarkFlagRequired(cli.FlagDeposit); err != nil { + panic(err) + } +} + +// ReadGovPropFlags parses a MsgSubmitProposal from the provided context and flags. +// Setting the messages is up to the caller. +// +// See also AddGovPropFlagsToCmd. +// ref. github.com/cosmos/cosmos-sdk/x/gov/client/cli/util.go::ReadGovPropFlags +func ReadGovPropFlags(clientCtx client.Context, flagSet *pflag.FlagSet) (*govv1.MsgSubmitProposal, error) { + rv := &govv1.MsgSubmitProposal{} + + deposit, err := flagSet.GetString(cli.FlagDeposit) + if err != nil { + return nil, fmt.Errorf("could not read deposit: %w", err) + } + if len(deposit) > 0 { + rv.InitialDeposit, err = sdk.ParseCoinsNormalized(deposit) + if err != nil { + return nil, fmt.Errorf("invalid deposit: %w", err) + } + } + + rv.Title, err = flagSet.GetString(cli.FlagTitle) + if err != nil { + return nil, fmt.Errorf("could not read title: %w", err) + } + + rv.Summary, err = flagSet.GetString(cli.FlagDescription) + if err != nil { + return nil, fmt.Errorf("could not read summary: %w", err) + } + + rv.Proposer = clientCtx.GetFromAddress().String() + + return rv, nil +} diff --git a/x/govshuttle/genesis.go b/x/govshuttle/genesis.go index cfd606383..cc41f5495 100644 --- a/x/govshuttle/genesis.go +++ b/x/govshuttle/genesis.go @@ -1,10 +1,12 @@ package govshuttle import ( - "github.com/Canto-Network/Canto/v7/x/govshuttle/keeper" - "github.com/Canto-Network/Canto/v7/x/govshuttle/types" sdk "github.com/cosmos/cosmos-sdk/types" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" + "github.com/ethereum/go-ethereum/common" + + "github.com/Canto-Network/Canto/v7/x/govshuttle/keeper" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" ) // InitGenesis initializes the capability module's state from a provided genesis @@ -13,6 +15,11 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, accountKeeper authkeeper.Acco // this line is used by starport scaffolding # genesis/module/init k.SetParams(ctx, genState.Params) + if genState.PortContractAddr != "" { + portAddr := common.HexToAddress(genState.PortContractAddr) + k.SetPort(ctx, portAddr) + } + if acc := accountKeeper.GetModuleAccount(ctx, types.ModuleName); acc == nil { panic("the govshuttle module account has not been set") } @@ -23,6 +30,10 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState { genesis := types.DefaultGenesis() genesis.Params = k.GetParams(ctx) + if portAddr, ok := k.GetPort(ctx); ok { + genesis.PortContractAddr = portAddr.String() + } + // this line is used by starport scaffolding # genesis/module/export return genesis diff --git a/x/govshuttle/genesis_test.go b/x/govshuttle/genesis_test.go index 13baacd83..0f79071b4 100644 --- a/x/govshuttle/genesis_test.go +++ b/x/govshuttle/genesis_test.go @@ -1,28 +1,106 @@ package govshuttle_test import ( + // "encoding/json" "testing" - //keepertest "github.com/Canto-Network/Canto/v2/testutil/keeper" - //"github.com/Canto-Network/Canto/v2/testutil/nullify" - // "github.com/Canto-Network/Canto/v2/x/govshuttle" - // "github.com/Canto-Network/Canto/v2/x/govshuttle/types" - // "github.com/stretchr/testify/require" + + "github.com/stretchr/testify/require" + "github.com/stretchr/testify/suite" + + "github.com/ethereum/go-ethereum/common" + + "cosmossdk.io/log" + dbm "github.com/cosmos/cosmos-db" + simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" + sdk "github.com/cosmos/cosmos-sdk/types" + + "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/x/govshuttle" ) -func TestGenesis(t *testing.T) { - // genesisState := types.GenesisState{ - // Params: types.DefaultParams(), +type GenesisTestSuite struct { + suite.Suite //top level testing suite + + appA *app.Canto + ctxA sdk.Context + + appB *app.Canto + ctxB sdk.Context +} + +var s *GenesisTestSuite + +func TestGenesisTestSuite(t *testing.T) { + s = new(GenesisTestSuite) + suite.Run(t, s) +} + +func (suite *GenesisTestSuite) DoSetupTest(t require.TestingT) { + suite.appA = app.NewCanto( + log.NewNopLogger(), + dbm.NewMemDB(), + nil, + true, + map[int64]bool{}, + app.DefaultNodeHome, + 0, + true, + simtestutil.NewAppOptionsWithFlagHome(app.DefaultNodeHome), + ) + suite.ctxA = suite.appA.NewContext(true) + + suite.appB = app.NewCanto( + log.NewNopLogger(), + dbm.NewMemDB(), + nil, + true, + map[int64]bool{}, + app.DefaultNodeHome, + 0, + true, + simtestutil.NewAppOptionsWithFlagHome(app.DefaultNodeHome), + ) + suite.ctxB = suite.appB.NewContext(true) +} + +func (suite *GenesisTestSuite) SetupTest() { + suite.DoSetupTest(suite.T()) +} + +func (suite *GenesisTestSuite) TestGenesis() { + testCases := []struct { + name string + portAddr common.Address + malleate func(portAddr common.Address) + }{ + { + "empty port contract address", + common.Address{}, + func(_ common.Address) {}, + }, + { + "non-empty port contract address", + common.HexToAddress("0x648a5Aa0C4FbF2C1CF5a3B432c2766EeaF8E402d"), + func(portAddr common.Address) { + suite.appA.GovshuttleKeeper.SetPort(suite.ctxA, portAddr) + }, + }, + } + + for _, tc := range testCases { + suite.Run(tc.name, func() { + suite.SetupTest() - // // this line is used by starport scaffolding # genesis/test/state - // } + tc.malleate(tc.portAddr) - // k, ctx := keepertest.govshuttleKeeper(t) - // govshuttle.InitGenesis(ctx, *k, genesisState) - // got := govshuttle.ExportGenesis(ctx, *k) - // require.NotNil(t, got) + portAddr, _ := suite.appA.GovshuttleKeeper.GetPort(suite.ctxA) + suite.Require().Equal(tc.portAddr, portAddr) - // nullify.Fill(&genesisState) - // nullify.Fill(got) + genesisState := govshuttle.ExportGenesis(suite.ctxA, suite.appA.GovshuttleKeeper) - // this line is used by starport scaffolding # genesis/test/assert + govshuttle.InitGenesis(suite.ctxB, suite.appB.GovshuttleKeeper, suite.appB.AccountKeeper, *genesisState) + portAddr, _ = suite.appB.GovshuttleKeeper.GetPort(suite.ctxB) + suite.Require().Equal(tc.portAddr, portAddr) + }) + } } diff --git a/x/govshuttle/keeper/keeper_test.go b/x/govshuttle/keeper/keeper_test.go index 730961588..647ef6cba 100644 --- a/x/govshuttle/keeper/keeper_test.go +++ b/x/govshuttle/keeper/keeper_test.go @@ -4,23 +4,33 @@ import ( "encoding/json" "math/big" "testing" + "time" + "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" "github.com/Canto-Network/Canto/v7/app" + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" + abci "github.com/cometbft/cometbft/abci/types" + "github.com/cometbft/cometbft/crypto/tmhash" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmversion "github.com/cometbft/cometbft/proto/tendermint/version" + "github.com/cometbft/cometbft/version" + "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/crypto/keyring" + "github.com/cosmos/cosmos-sdk/crypto/keys/ed25519" sdk "github.com/cosmos/cosmos-sdk/types" + stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common/hexutil" "github.com/ethereum/go-ethereum/crypto" "github.com/evmos/ethermint/server/config" evm "github.com/evmos/ethermint/x/evm/types" feemarkettypes "github.com/evmos/ethermint/x/feemarket/types" - "github.com/stretchr/testify/require" //used for deploying contracts "github.com/Canto-Network/Canto/v7/contracts" - "github.com/Canto-Network/Canto/v7/x/erc20/types" ethtypes "github.com/ethereum/go-ethereum/core/types" ) @@ -34,6 +44,7 @@ type KeeperTestSuite struct { queryClient types.QueryClient queryClientEvm evm.QueryClient signer keyring.Signer + validator stakingtypes.Validator } var s *KeeperTestSuite @@ -45,14 +56,63 @@ func TestKeeperTestSuite(t *testing.T) { // Test Helpers func (suite *KeeperTestSuite) DoSetupTest(t require.TestingT) { - checkTx := false - feemarketGenesis := feemarkettypes.DefaultGenesisState() feemarketGenesis.Params.EnableHeight = 1 feemarketGenesis.Params.NoBaseFee = false - //init app - suite.app = app.Setup(checkTx, feemarketGenesis) + // init app + suite.app = app.Setup(false, feemarketGenesis) + + // consensus key + pubKey := ed25519.GenPrivKey().PubKey() + consAddress := sdk.ConsAddress(pubKey.Address()) + + suite.ctx = suite.app.BaseApp.NewContextLegacy(false, tmproto.Header{ + Height: 1, + ChainID: "canto_9001-1", + Time: time.Now().UTC(), + ProposerAddress: consAddress.Bytes(), + + Version: tmversion.Consensus{ + Block: version.BlockProtocol, + }, + LastBlockId: tmproto.BlockID{ + Hash: tmhash.Sum([]byte("block_id")), + PartSetHeader: tmproto.PartSetHeader{ + Total: 11, + Hash: tmhash.Sum([]byte("partset_header")), + }, + }, + AppHash: tmhash.Sum([]byte("app")), + DataHash: tmhash.Sum([]byte("data")), + EvidenceHash: tmhash.Sum([]byte("evidence")), + ValidatorsHash: tmhash.Sum([]byte("validators")), + NextValidatorsHash: tmhash.Sum([]byte("next_validators")), + ConsensusHash: tmhash.Sum([]byte("consensus")), + LastResultsHash: tmhash.Sum([]byte("last_result")), + }) + + queryHelper := baseapp.NewQueryServerTestHelper(suite.ctx, suite.app.InterfaceRegistry()) + types.RegisterQueryServer(queryHelper, suite.app.GovshuttleKeeper) + suite.queryClient = types.NewQueryClient(queryHelper) + + // Set Validator + valAddr := sdk.ValAddress(pubKey.Address().Bytes()) + validator, err := stakingtypes.NewValidator(valAddr.String(), pubKey, stakingtypes.Description{}) + suite.NoError(err) + + validator = stakingkeeper.TestingUpdateValidator(suite.app.StakingKeeper, suite.ctx, validator, true) + valbz, err := suite.app.StakingKeeper.ValidatorAddressCodec().StringToBytes(validator.GetOperator()) + suite.NoError(err) + suite.app.StakingKeeper.Hooks().AfterValidatorCreated(suite.ctx, valbz) + err = suite.app.StakingKeeper.SetValidatorByConsAddr(suite.ctx, validator) + suite.NoError(err) + suite.validator = validator + + stakingParams, err := suite.app.StakingKeeper.GetParams(suite.ctx) + suite.NoError(err) + stakingParams.BondDenom = "acanto" + suite.app.StakingKeeper.SetParams(suite.ctx, stakingParams) } func (suite *KeeperTestSuite) SetupTest() { @@ -60,7 +120,6 @@ func (suite *KeeperTestSuite) SetupTest() { } func (suite *KeeperTestSuite) DeployCaller() (common.Address, error) { - ctx := sdk.WrapSDKContext(suite.ctx) chainID := suite.app.EvmKeeper.ChainID() ctorArgs, err := contracts.CallerContract.ABI.Pack("") @@ -79,7 +138,7 @@ func (suite *KeeperTestSuite) DeployCaller() (common.Address, error) { return common.Address{}, err } - res, err := suite.queryClientEvm.EstimateGas(ctx, &evm.EthCallRequest{ + res, err := suite.queryClientEvm.EstimateGas(suite.ctx, &evm.EthCallRequest{ Args: args, GasCap: uint64(config.DefaultGasCap), }) @@ -107,7 +166,7 @@ func (suite *KeeperTestSuite) DeployCaller() (common.Address, error) { return common.Address{}, err } - rsp, err := suite.app.EvmKeeper.EthereumTx(ctx, erc20DeployTx) + rsp, err := suite.app.EvmKeeper.EthereumTx(suite.ctx, erc20DeployTx) if err != nil { return common.Address{}, err } @@ -119,3 +178,26 @@ func (suite *KeeperTestSuite) DeployCaller() (common.Address, error) { func (suite *KeeperTestSuite) DeployCallee() { } + +func (suite *KeeperTestSuite) Commit() { + suite.CommitAfter(time.Nanosecond) +} + +func (suite *KeeperTestSuite) CommitAfter(t time.Duration) { + header := suite.ctx.BlockHeader() + header.Time = header.Time.Add(t) + suite.app.FinalizeBlock(&abci.RequestFinalizeBlock{ + Height: header.Height, + Time: header.Time, + ProposerAddress: suite.ctx.BlockHeader().ProposerAddress, + }) + suite.app.Commit() + + // update ctx + header.Height += 1 + suite.ctx = suite.app.BaseApp.NewUncachedContext(false, header) + + queryHelper := baseapp.NewQueryServerTestHelper(suite.ctx, suite.app.InterfaceRegistry()) + evm.RegisterQueryServer(queryHelper, suite.app.EvmKeeper) + suite.queryClientEvm = evm.NewQueryClient(queryHelper) +} diff --git a/x/govshuttle/keeper/msg_server.go b/x/govshuttle/keeper/msg_server.go index d0eb7ca41..94f12454b 100644 --- a/x/govshuttle/keeper/msg_server.go +++ b/x/govshuttle/keeper/msg_server.go @@ -3,8 +3,11 @@ package keeper import ( "context" - "github.com/Canto-Network/Canto/v7/x/govshuttle/types" + errorsmod "cosmossdk.io/errors" sdk "github.com/cosmos/cosmos-sdk/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + + "github.com/Canto-Network/Canto/v7/x/govshuttle/types" ) type msgServer struct { @@ -19,15 +22,13 @@ func NewMsgServerImpl(keeper Keeper) types.MsgServer { var _ types.MsgServer = msgServer{} -func (k Keeper) LendingMarketProposal(goCtx context.Context, req *types.MsgLendingMarketProposal) (*types.MsgLendingMarketProposalResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - legacyProposal := types.LendingMarketProposal{ - Title: req.Title, - Description: req.Description, - Metadata: req.Metadata, +func (k Keeper) LendingMarketProposal(ctx context.Context, req *types.MsgLendingMarketProposal) (*types.MsgLendingMarketProposalResponse, error) { + if k.GetAuthority() != req.Authority { + return nil, errorsmod.Wrapf(govtypes.ErrInvalidSigner, "invalid authority; expected %s, got %s", k.GetAuthority(), req.Authority) } - _, err := k.AppendLendingMarketProposal(ctx, &legacyProposal) + sdkCtx := sdk.UnwrapSDKContext(ctx) + _, err := k.AppendLendingMarketProposal(sdkCtx, req) if err != nil { return nil, err } @@ -35,17 +36,13 @@ func (k Keeper) LendingMarketProposal(goCtx context.Context, req *types.MsgLendi return &types.MsgLendingMarketProposalResponse{}, nil } -func (k Keeper) TreasuryProposal(goCtx context.Context, req *types.MsgTreasuryProposal) (*types.MsgTreasuryProposalResponse, error) { - ctx := sdk.UnwrapSDKContext(goCtx) - legacyTreasuryProposal := types.TreasuryProposal{ - Title: req.Title, - Description: req.Description, - Metadata: req.Metadata, +func (k Keeper) TreasuryProposal(ctx context.Context, req *types.MsgTreasuryProposal) (*types.MsgTreasuryProposalResponse, error) { + if k.GetAuthority() != req.Authority { + return nil, errorsmod.Wrapf(govtypes.ErrInvalidSigner, "invalid authority; expected %s, got %s", k.GetAuthority(), req.Authority) } - legacyProposal := legacyTreasuryProposal.FromTreasuryToLendingMarket() - - _, err := k.AppendLendingMarketProposal(ctx, legacyProposal) + sdkCtx := sdk.UnwrapSDKContext(ctx) + _, err := k.AppendLendingMarketProposal(sdkCtx, req.FromTreasuryToLendingMarket()) if err != nil { return nil, err } diff --git a/x/govshuttle/keeper/msg_server_test.go b/x/govshuttle/keeper/msg_server_test.go index 7253f3a95..e6344f385 100644 --- a/x/govshuttle/keeper/msg_server_test.go +++ b/x/govshuttle/keeper/msg_server_test.go @@ -1,17 +1,266 @@ package keeper_test import ( - "context" - "testing" + "encoding/hex" + "encoding/json" + "fmt" + "math" + "math/big" - //sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v7/x/govshuttle/types" - //"github.com/Canto-Network/Canto/v2/x/govshuttle/keeper" - //keepertest "github.com/Canto-Network/Canto/v2/testutil/keeper" + "github.com/ethereum/go-ethereum/common" + + sdkmath "cosmossdk.io/math" + sdk "github.com/cosmos/cosmos-sdk/types" + authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" + govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" + govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" + stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" + + "github.com/evmos/ethermint/crypto/ethsecp256k1" + "github.com/evmos/ethermint/server/config" + evmtypes "github.com/evmos/ethermint/x/evm/types" + + "github.com/Canto-Network/Canto/v7/contracts" + "github.com/Canto-Network/Canto/v7/testutil" + govshuttletypes "github.com/Canto-Network/Canto/v7/x/govshuttle/types" ) -func setupMsgServer(t testing.TB) (types.MsgServer, context.Context) { - //k, ctx := keepertest.govshuttleKeeper(t) - //return keeper.NewMsgServerImpl(*k), sdk.WrapSDKContext(ctx) - return nil, nil +type ProposalResult struct { + Id *big.Int `json:"id"` + Title string `json:"title"` + Desc string `json:"desc"` + Targets []common.Address `json:"targets"` + Values []*big.Int `json:"values"` + Signatures []string `json:"signatures"` + Calldatas [][]byte `json:"calldatas"` +} + +func (suite *KeeperTestSuite) TestMsgExecutionByProposal() { + suite.SetupTest() + + // get denom + stakingParams, err := suite.app.StakingKeeper.GetParams(suite.ctx) + suite.Require().NoError(err) + denom := stakingParams.BondDenom + + // change mindeposit for denom + govParams, err := suite.app.GovKeeper.Params.Get(suite.ctx) + suite.Require().NoError(err) + govParams.MinDeposit = []sdk.Coin{sdk.NewCoin(denom, sdkmath.NewInt(1))} + err = suite.app.GovKeeper.Params.Set(suite.ctx, govParams) + suite.Require().NoError(err) + + // create account + privKey, err := ethsecp256k1.GenerateKey() + suite.Require().NoError(err) + proposer := sdk.AccAddress(privKey.PubKey().Address().Bytes()) + + // deligate to validator + initAmount := sdkmath.NewInt(int64(math.Pow10(18)) * 2) + initBalance := sdk.NewCoins(sdk.NewCoin(denom, initAmount)) + testutil.FundAccount(suite.app.BankKeeper, suite.ctx, proposer, initBalance) + shares, err := suite.app.StakingKeeper.Delegate(suite.ctx, proposer, sdk.DefaultPowerReduction, stakingtypes.Unbonded, suite.validator, true) + suite.Require().NoError(err) + suite.Require().True(shares.GT(sdkmath.LegacyNewDec(0))) + + testCases := []struct { + name string + msg sdk.Msg + checkFunc func(uint64, sdk.Msg) + expectErr bool + }{ + { + "fail - MsgLendingMarketProposal - authority check", + &govshuttletypes.MsgLendingMarketProposal{ + Authority: "canto1yrmjye0zyfvr0lthc6fwq7qlwg9e8muftxa630", + Title: "lending market proposal test", + Description: "lending market proposal test description", + Metadata: &govshuttletypes.LendingMarketMetadata{ + Account: []string{"0x20F72265e2225837fd77C692e0781f720B93eF89", "0xf6Db2570A2417188a5788D6d5Fd9faAa5B1fE555"}, + PropId: 1, + Values: []uint64{1234, 5678}, + Calldatas: []string{hex.EncodeToString([]byte("calldata1")), hex.EncodeToString([]byte("calldata2"))}, + Signatures: []string{"sig1", "sig2"}, + }, + }, + func(uint64, sdk.Msg) {}, + true, + }, + { + "ok - MsgLendingMarketProposal", + &govshuttletypes.MsgLendingMarketProposal{ + Authority: authtypes.NewModuleAddress(govtypes.ModuleName).String(), + Title: "lending market proposal test", + Description: "lending market proposal test description", + Metadata: &govshuttletypes.LendingMarketMetadata{ + Account: []string{"0x20F72265e2225837fd77C692e0781f720B93eF89", "0xf6Db2570A2417188a5788D6d5Fd9faAa5B1fE555"}, + PropId: 1, + Values: []uint64{1234, 5678}, + Calldatas: []string{hex.EncodeToString([]byte("calldata1")), hex.EncodeToString([]byte("calldata2"))}, + Signatures: []string{"sig1", "sig2"}, + }, + }, + func(proposalId uint64, msg sdk.Msg) { + proposal, err := suite.app.GovKeeper.Proposals.Get(suite.ctx, proposalId) + suite.Require().NoError(err) + suite.Require().Equal(govtypesv1.ProposalStatus_PROPOSAL_STATUS_PASSED, proposal.Status) + + proposalMsg, ok := msg.(*govshuttletypes.MsgLendingMarketProposal) + suite.Require().True(ok) + + targets := []common.Address{} + for _, acc := range proposalMsg.Metadata.Account { + targets = append(targets, common.HexToAddress(acc)) + } + + values := []*big.Int{} + for _, value := range proposalMsg.Metadata.Values { + values = append(values, big.NewInt(int64(value))) + } + + calldatas := [][]byte{} + for _, calldata := range proposalMsg.Metadata.Calldatas { + c, err := hex.DecodeString(calldata) + suite.Require().NoError(err) + + calldatas = append(calldatas, c) + } + + suite.checkQueryPropResult( + proposalId, + ProposalResult{ + Id: big.NewInt(int64(proposalMsg.Metadata.PropId)), + Title: proposalMsg.Title, + Desc: proposalMsg.Description, + Targets: targets, + Values: values, + Signatures: proposalMsg.Metadata.Signatures, + Calldatas: calldatas, + }, + ) + }, + false, + }, + { + "fail - MsgTreasuryProposal - authority check", + &govshuttletypes.MsgTreasuryProposal{ + Authority: "canto1yrmjye0zyfvr0lthc6fwq7qlwg9e8muftxa630", + Title: "treasury proposal test", + Description: "treasury proposal test description", + Metadata: &govshuttletypes.TreasuryProposalMetadata{ + PropID: 2, + Recipient: "0x20F72265e2225837fd77C692e0781f720B93eF89", + Amount: 1234, + Denom: "acanto", + }, + }, + func(uint64, sdk.Msg) {}, + true, + }, + { + "ok - MsgTreasuryProposal", + &govshuttletypes.MsgTreasuryProposal{ + Authority: authtypes.NewModuleAddress(govtypes.ModuleName).String(), + Title: "treasury proposal test", + Description: "treasury proposal test description", + Metadata: &govshuttletypes.TreasuryProposalMetadata{ + PropID: 2, + Recipient: "0x20F72265e2225837fd77C692e0781f720B93eF89", + Amount: 1234, + Denom: "acanto", + }, + }, + func(proposalId uint64, msg sdk.Msg) { + proposal, err := suite.app.GovKeeper.Proposals.Get(suite.ctx, proposalId) + suite.Require().NoError(err) + suite.Require().Equal(govtypesv1.ProposalStatus_PROPOSAL_STATUS_PASSED, proposal.Status) + + proposalMsg, ok := msg.(*govshuttletypes.MsgTreasuryProposal) + suite.Require().True(ok) + + targets := []common.Address{common.HexToAddress(proposalMsg.Metadata.Recipient)} + values := []*big.Int{big.NewInt(int64(proposalMsg.Metadata.Amount))} + signatures := []string{proposalMsg.Metadata.Denom} + calldatas := [][]byte{} + + suite.checkQueryPropResult( + proposalId, + ProposalResult{ + Id: big.NewInt(int64(proposalMsg.Metadata.PropID)), + Title: proposalMsg.Title, + Desc: proposalMsg.Description, + Targets: targets, + Values: values, + Signatures: signatures, + Calldatas: calldatas, + }, + ) + }, + false, + }, + } + + for _, tc := range testCases { + suite.Run(tc.name, func() { + // submit proposal + proposal, err := suite.app.GovKeeper.SubmitProposal(suite.ctx, []sdk.Msg{tc.msg}, "", "test", "description", proposer, false) + if tc.expectErr { + suite.Require().Error(err) + } else { + suite.Require().NoError(err) + suite.Commit() + + ok, err := suite.app.GovKeeper.AddDeposit(suite.ctx, proposal.Id, proposer, govParams.MinDeposit) + suite.Require().NoError(err) + suite.Require().True(ok) + suite.Commit() + + err = suite.app.GovKeeper.AddVote(suite.ctx, proposal.Id, proposer, govtypesv1.NewNonSplitVoteOption(govtypesv1.OptionYes), "") + suite.Require().NoError(err) + suite.CommitAfter(*govParams.VotingPeriod) + + // check proposal result + tc.checkFunc(proposal.Id, tc.msg) + } + }) + } +} + +func (suite *KeeperTestSuite) checkQueryPropResult(propId uint64, expectedResult ProposalResult) { + // make calldata + data, err := contracts.ProposalStoreContract.ABI.Pack("QueryProp", big.NewInt(int64(propId))) + suite.Require().NoError(err) + + // get port contract address + portAddr, ok := suite.app.GovshuttleKeeper.GetPort(suite.ctx) + suite.Require().True(ok) + + txArgs := map[string]interface{}{ + "to": portAddr, + "data": fmt.Sprintf("0x%x", data), + } + txArgsJson, err := json.Marshal(txArgs) + suite.Require().NoError(err) + + // query to contract + req := &evmtypes.EthCallRequest{ + Args: txArgsJson, + GasCap: config.DefaultGasCap, + } + rpcRes, err := suite.app.EvmKeeper.EthCall(suite.ctx, req) + suite.Require().NoError(err) + + queryRes, err := contracts.ProposalStoreContract.ABI.Unpack("QueryProp", rpcRes.Ret) + suite.Require().NoError(err) + + // marshal and unmarshal to get ProposalResult + var res ProposalResult + b, err := json.Marshal(queryRes[0]) + suite.Require().NoError(err) + json.Unmarshal(b, &res) + + suite.Require().Equal( + expectedResult, + res, + ) } diff --git a/x/govshuttle/keeper/proposals.go b/x/govshuttle/keeper/proposals.go index b8e893579..b3fb3913a 100644 --- a/x/govshuttle/keeper/proposals.go +++ b/x/govshuttle/keeper/proposals.go @@ -16,7 +16,7 @@ import ( ) // method for appending govshuttle proposal types to the govshuttle Map contract -func (k *Keeper) AppendLendingMarketProposal(ctx sdk.Context, lm *types.LendingMarketProposal) (*types.LendingMarketProposal, error) { +func (k *Keeper) AppendLendingMarketProposal(ctx sdk.Context, lm *types.MsgLendingMarketProposal) (*types.MsgLendingMarketProposal, error) { m := lm.GetMetadata() var err error if m.GetPropId() == 0 { @@ -33,7 +33,7 @@ func (k *Keeper) AppendLendingMarketProposal(ctx sdk.Context, lm *types.LendingM if !found { addr, err = k.DeployMapContract(ctx, lm) if err != nil { - return &types.LendingMarketProposal{}, err + return nil, err } // set the port address in state k.SetPort(ctx, addr) @@ -50,8 +50,7 @@ func (k *Keeper) AppendLendingMarketProposal(ctx sdk.Context, lm *types.LendingM return lm, nil } -func (k Keeper) DeployMapContract(ctx sdk.Context, lm *types.LendingMarketProposal) (common.Address, error) { - +func (k Keeper) DeployMapContract(ctx sdk.Context, lm *types.MsgLendingMarketProposal) (common.Address, error) { m := lm.GetMetadata() ctorArgs, err := contracts.ProposalStoreContract.ABI.Pack("", sdkmath.NewIntFromUint64(m.GetPropId()).BigInt(), lm.GetTitle(), lm.GetDescription(), ToAddress(m.GetAccount()), diff --git a/x/govshuttle/module.go b/x/govshuttle/module.go index c439f7964..39544f205 100644 --- a/x/govshuttle/module.go +++ b/x/govshuttle/module.go @@ -11,6 +11,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" + "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" @@ -38,13 +39,9 @@ var ( // AppModuleBasic // ---------------------------------------------------------------------------- -// AppModuleBasic implements the AppModuleBasic interface for the capability module. +// AppModule implements the sdk.AppModuleBasic interface. type AppModuleBasic struct { - cdc codec.BinaryCodec -} - -func NewAppModuleBasic(cdc codec.BinaryCodec) AppModuleBasic { - return AppModuleBasic{cdc: cdc} + ac address.Codec } // Name returns the capability module's name. @@ -86,7 +83,7 @@ func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *r // GetTxCmd returns the capability module's root tx command. func (a AppModuleBasic) GetTxCmd() *cobra.Command { - return cli.NewTxCmd() + return cli.NewTxCmd(a.ac) } // GetQueryCmd returns the capability module's root query command. @@ -98,7 +95,7 @@ func (AppModuleBasic) GetQueryCmd() *cobra.Command { // AppModule // ---------------------------------------------------------------------------- -// AppModule implements the AppModule interface for the capability module. +// AppModule implements the sdk.AppModule interface. type AppModule struct { AppModuleBasic @@ -109,9 +106,10 @@ type AppModule struct { func NewAppModule( k keeper.Keeper, ak authkeeper.AccountKeeper, + ac address.Codec, ) AppModule { return AppModule{ - AppModuleBasic: AppModuleBasic{}, + AppModuleBasic: AppModuleBasic{ac: ac}, keeper: k, accountkeeper: ak, } @@ -131,6 +129,7 @@ func (am AppModule) Name() string { // RegisterServices registers a GRPC query service to respond to the // module-specific GRPC queries. func (am AppModule) RegisterServices(cfg module.Configurator) { + types.RegisterMsgServer(cfg.MsgServer(), keeper.NewMsgServerImpl(am.keeper)) types.RegisterQueryServer(cfg.QueryServer(), am.keeper) } diff --git a/x/govshuttle/types/codec.go b/x/govshuttle/types/codec.go index 4913b1f5c..203105388 100644 --- a/x/govshuttle/types/codec.go +++ b/x/govshuttle/types/codec.go @@ -2,6 +2,7 @@ package types import ( "github.com/cosmos/cosmos-sdk/codec" + "github.com/cosmos/cosmos-sdk/codec/legacy" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" sdk "github.com/cosmos/cosmos-sdk/types" @@ -20,13 +21,6 @@ var ( // The actual codec used for serialization should be provided to modules/erc20 and // defined at the application level. ModuleCdc = codec.NewProtoCodec(codectypes.NewInterfaceRegistry()) - - // AminoCdc is a amino codec created to support amino JSON compatible msgs. - AminoCdc = codec.NewAminoCodec(amino) -) - -const ( - msgUpdateParams = "canto/MsgUpdateParams" ) // NOTE: This is required for the GetSignBytes function @@ -46,6 +40,8 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { (*sdk.Msg)(nil), &LendingMarketProposal{}, &TreasuryProposal{}, + &MsgLendingMarketProposal{}, + &MsgTreasuryProposal{}, ) registry.RegisterImplementations( @@ -58,6 +54,8 @@ func RegisterInterfaces(registry codectypes.InterfaceRegistry) { } func RegisterLegacyAminoCodec(cdc *codec.LegacyAmino) { - cdc.RegisterConcrete(&LendingMarketProposal{}, "canto/LendingMarketProposal", nil) - cdc.RegisterConcrete(&TreasuryProposal{}, "canto/TreasuryProposal", nil) + legacy.RegisterAminoMsg(cdc, &LendingMarketProposal{}, "canto/LendingMarketProposal") + legacy.RegisterAminoMsg(cdc, &TreasuryProposal{}, "canto/TreasuryProposal") + legacy.RegisterAminoMsg(cdc, &MsgLendingMarketProposal{}, "canto/MsgLendingMarketProposal") + legacy.RegisterAminoMsg(cdc, &MsgTreasuryProposal{}, "canto/MsgTreasuryProposal") } diff --git a/x/govshuttle/types/genesis.pb.go b/x/govshuttle/types/genesis.pb.go index a804df3e4..cda4eb257 100644 --- a/x/govshuttle/types/genesis.pb.go +++ b/x/govshuttle/types/genesis.pb.go @@ -25,7 +25,8 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package // GenesisState defines the govshuttle module's genesis state. type GenesisState struct { - Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` + Params Params `protobuf:"bytes,1,opt,name=params,proto3" json:"params"` + PortContractAddr string `protobuf:"bytes,2,opt,name=port_contract_addr,json=portContractAddr,proto3" json:"port_contract_addr,omitempty"` } func (m *GenesisState) Reset() { *m = GenesisState{} } @@ -68,6 +69,13 @@ func (m *GenesisState) GetParams() Params { return Params{} } +func (m *GenesisState) GetPortContractAddr() string { + if m != nil { + return m.PortContractAddr + } + return "" +} + func init() { proto.RegisterType((*GenesisState)(nil), "canto.govshuttle.v1.GenesisState") } @@ -75,20 +83,23 @@ func init() { func init() { proto.RegisterFile("canto/govshuttle/v1/genesis.proto", fileDescriptor_356493b1fc5972f0) } var fileDescriptor_356493b1fc5972f0 = []byte{ - // 208 bytes of a gzipped FileDescriptorProto + // 247 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x52, 0x4c, 0x4e, 0xcc, 0x2b, 0xc9, 0xd7, 0x4f, 0xcf, 0x2f, 0x2b, 0xce, 0x28, 0x2d, 0x29, 0xc9, 0x49, 0xd5, 0x2f, 0x33, 0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0xce, 0x2c, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x06, 0x2b, 0xd1, 0x43, 0x28, 0xd1, 0x2b, 0x33, 0x94, 0x12, 0x49, 0xcf, 0x4f, 0xcf, 0x07, 0xcb, 0xeb, - 0x83, 0x58, 0x10, 0xa5, 0x52, 0x2a, 0x58, 0x4d, 0x43, 0x68, 0x04, 0xab, 0x52, 0xf2, 0xe4, 0xe2, + 0x83, 0x58, 0x10, 0xa5, 0x52, 0x2a, 0x58, 0x4d, 0x43, 0x68, 0x04, 0xab, 0x52, 0x2a, 0xe7, 0xe2, 0x71, 0x87, 0xd8, 0x10, 0x5c, 0x92, 0x58, 0x92, 0x2a, 0x64, 0xc9, 0xc5, 0x56, 0x90, 0x58, 0x94, 0x98, 0x5b, 0x2c, 0xc1, 0xa8, 0xc0, 0xa8, 0xc1, 0x6d, 0x24, 0xad, 0x87, 0xc5, 0x46, 0xbd, 0x00, - 0xb0, 0x12, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, 0x1a, 0x9c, 0xfc, 0x4e, 0x3c, 0x92, - 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, - 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, 0x24, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, - 0x39, 0x3f, 0x57, 0xdf, 0x19, 0x64, 0x9c, 0xae, 0x5f, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0x36, 0x84, - 0xa7, 0x5f, 0x66, 0xae, 0x5f, 0x81, 0xec, 0xd0, 0x92, 0xca, 0x82, 0xd4, 0xe2, 0x24, 0x36, 0xb0, - 0x0b, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xba, 0xa8, 0x69, 0x0f, 0x17, 0x01, 0x00, 0x00, + 0xb0, 0x12, 0x27, 0x96, 0x13, 0xf7, 0xe4, 0x19, 0x82, 0xa0, 0x1a, 0x84, 0x74, 0xb8, 0x84, 0x0a, + 0xf2, 0x8b, 0x4a, 0xe2, 0x93, 0xf3, 0xf3, 0x4a, 0x8a, 0x12, 0x93, 0x4b, 0xe2, 0x13, 0x53, 0x52, + 0x8a, 0x24, 0x98, 0x14, 0x18, 0x35, 0x38, 0x83, 0x04, 0x40, 0x32, 0xce, 0x50, 0x09, 0xc7, 0x94, + 0x94, 0x22, 0x27, 0xbf, 0x13, 0x8f, 0xe4, 0x18, 0x2f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, + 0x71, 0xc2, 0x63, 0x39, 0x86, 0x0b, 0x8f, 0xe5, 0x18, 0x6e, 0x3c, 0x96, 0x63, 0x88, 0x32, 0x49, + 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x77, 0x06, 0x59, 0xae, 0xeb, 0x97, + 0x5a, 0x52, 0x9e, 0x5f, 0x94, 0x0d, 0xe1, 0xe9, 0x97, 0x99, 0xeb, 0x57, 0x20, 0x7b, 0xab, 0xa4, + 0xb2, 0x20, 0xb5, 0x38, 0x89, 0x0d, 0xec, 0x1f, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x66, + 0x33, 0x38, 0xcd, 0x45, 0x01, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { @@ -111,6 +122,13 @@ func (m *GenesisState) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.PortContractAddr) > 0 { + i -= len(m.PortContractAddr) + copy(dAtA[i:], m.PortContractAddr) + i = encodeVarintGenesis(dAtA, i, uint64(len(m.PortContractAddr))) + i-- + dAtA[i] = 0x12 + } { size, err := m.Params.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -143,6 +161,10 @@ func (m *GenesisState) Size() (n int) { _ = l l = m.Params.Size() n += 1 + l + sovGenesis(uint64(l)) + l = len(m.PortContractAddr) + if l > 0 { + n += 1 + l + sovGenesis(uint64(l)) + } return n } @@ -214,6 +236,38 @@ func (m *GenesisState) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PortContractAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenesis + } + 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 ErrInvalidLengthGenesis + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenesis + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PortContractAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenesis(dAtA[iNdEx:]) diff --git a/x/govshuttle/types/govshuttle.pb.go b/x/govshuttle/types/govshuttle.pb.go index ccb21068f..132fa1afd 100644 --- a/x/govshuttle/types/govshuttle.pb.go +++ b/x/govshuttle/types/govshuttle.pb.go @@ -62,6 +62,8 @@ var xxx_messageInfo_Params proto.InternalMessageInfo // Define this object so that the govshuttle.pb.go file is generate, implements // govtypes.Content +// Deprecated: This legacy proposal is deprecated in favor of Msg-based gov +// proposals, see MsgLendingMarketProposal. type LendingMarketProposal struct { // title Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` @@ -124,6 +126,8 @@ func (m *LendingMarketProposal) GetMetadata() *LendingMarketMetadata { } // treasury proposal type, +// Deprecated: This legacy proposal is deprecated in favor of Msg-based gov +// proposals, see MsgTreasuryProposal. type TreasuryProposal struct { Title string `protobuf:"bytes,1,opt,name=title,proto3" json:"title,omitempty"` Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"` diff --git a/x/govshuttle/types/proposal.go b/x/govshuttle/types/proposal.go index 93bd05b74..1aeaec250 100644 --- a/x/govshuttle/types/proposal.go +++ b/x/govshuttle/types/proposal.go @@ -105,3 +105,22 @@ func (tp *TreasuryProposal) FromTreasuryToLendingMarket() *LendingMarketProposal Metadata: &lm, } } + +func (tp *MsgTreasuryProposal) FromTreasuryToLendingMarket() *MsgLendingMarketProposal { + m := tp.GetMetadata() + + lm := LendingMarketMetadata{ + Account: []string{m.GetRecipient()}, + PropId: m.GetPropID(), + Values: []uint64{m.GetAmount()}, + Calldatas: nil, + Signatures: []string{m.GetDenom()}, + } + + return &MsgLendingMarketProposal{ + Authority: tp.GetAuthority(), + Title: tp.GetTitle(), + Description: tp.GetDescription(), + Metadata: &lm, + } +} diff --git a/x/inflation/client/cli/tx.go b/x/inflation/client/cli/tx.go new file mode 100644 index 000000000..03d99cb99 --- /dev/null +++ b/x/inflation/client/cli/tx.go @@ -0,0 +1,23 @@ +package cli + +import ( + "fmt" + + "github.com/spf13/cobra" + + "github.com/cosmos/cosmos-sdk/client" + + "github.com/Canto-Network/Canto/v7/x/inflation/types" +) + +// GetTxCmd returns the transaction methods allowed for the CLI. +func GetTxCmd() *cobra.Command { + cmd := &cobra.Command{ + Use: types.ModuleName, + Short: fmt.Sprintf("%s has no transaction commands", types.ModuleName), + DisableFlagParsing: true, + SuggestionsMinimumDistance: 2, + RunE: client.ValidateCmd, + } + return cmd +} diff --git a/x/inflation/keeper/grpc_query_test.go b/x/inflation/keeper/grpc_query_test.go index 3c2868407..99ba66db3 100644 --- a/x/inflation/keeper/grpc_query_test.go +++ b/x/inflation/keeper/grpc_query_test.go @@ -46,10 +46,9 @@ func (suite *KeeperTestSuite) TestPeriod() { suite.Run(fmt.Sprintf("Case %s", tc.name), func() { suite.SetupTest() // reset - ctx := sdk.WrapSDKContext(suite.ctx) tc.malleate() - res, err := suite.queryClient.Period(ctx, req) + res, err := suite.queryClient.Period(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) suite.Require().Equal(expRes, res) @@ -105,10 +104,9 @@ func (suite *KeeperTestSuite) TestEpochMintProvision() { suite.Run(fmt.Sprintf("Case %s", tc.name), func() { suite.SetupTest() // reset - ctx := sdk.WrapSDKContext(suite.ctx) tc.malleate() - res, err := suite.queryClient.EpochMintProvision(ctx, req) + res, err := suite.queryClient.EpochMintProvision(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) suite.Require().Equal(expRes, res) @@ -155,10 +153,9 @@ func (suite *KeeperTestSuite) TestSkippedEpochs() { suite.Run(fmt.Sprintf("Case %s", tc.name), func() { suite.SetupTest() // reset - ctx := sdk.WrapSDKContext(suite.ctx) tc.malleate() - res, err := suite.queryClient.SkippedEpochs(ctx, req) + res, err := suite.queryClient.SkippedEpochs(suite.ctx, req) if tc.expPass { suite.Require().NoError(err) suite.Require().Equal(expRes, res) @@ -171,7 +168,6 @@ func (suite *KeeperTestSuite) TestSkippedEpochs() { func (suite *KeeperTestSuite) TestQueryCirculatingSupply() { // Team allocation is only set on mainnet - ctx := sdk.WrapSDKContext(suite.ctx) // Mint coins to increase supply mintDenom := suite.app.InflationKeeper.GetParams(suite.ctx).MintDenom @@ -182,13 +178,12 @@ func (suite *KeeperTestSuite) TestQueryCirculatingSupply() { // team allocation is zero if not on mainnet expCirculatingSupply := sdk.NewDecCoin(mintDenom, sdk.TokensFromConsensusPower(400_000_000, ethermint.PowerReduction)) - res, err := suite.queryClient.CirculatingSupply(ctx, &types.QueryCirculatingSupplyRequest{}) + res, err := suite.queryClient.CirculatingSupply(suite.ctx, &types.QueryCirculatingSupplyRequest{}) suite.Require().NoError(err) suite.Require().Equal(expCirculatingSupply, res.CirculatingSupply) } func (suite *KeeperTestSuite) TestQueryInflationRate() { - ctx := sdk.WrapSDKContext(suite.ctx) // Mint coins to increase supply mintDenom := suite.app.InflationKeeper.GetParams(suite.ctx).MintDenom @@ -197,16 +192,15 @@ func (suite *KeeperTestSuite) TestQueryInflationRate() { suite.Require().NoError(err) expInflationRate := sdkmath.LegacyMustNewDecFromStr("4.076087000000000000") - res, err := suite.queryClient.InflationRate(ctx, &types.QueryInflationRateRequest{}) + res, err := suite.queryClient.InflationRate(suite.ctx, &types.QueryInflationRateRequest{}) suite.Require().NoError(err) suite.Require().Equal(expInflationRate, res.InflationRate) } func (suite *KeeperTestSuite) TestQueryParams() { - ctx := sdk.WrapSDKContext(suite.ctx) expParams := types.DefaultParams() - res, err := suite.queryClient.Params(ctx, &types.QueryParamsRequest{}) + res, err := suite.queryClient.Params(suite.ctx, &types.QueryParamsRequest{}) suite.Require().NoError(err) suite.Require().Equal(expParams, res.Params) } diff --git a/x/inflation/module.go b/x/inflation/module.go index 55d09f32b..48b7ef7aa 100644 --- a/x/inflation/module.go +++ b/x/inflation/module.go @@ -84,7 +84,9 @@ func (b AppModuleBasic) RegisterGRPCGatewayRoutes(c client.Context, serveMux *ru } // GetTxCmd returns the root tx command for the inflation module. -func (AppModuleBasic) GetTxCmd() *cobra.Command { return nil } +func (AppModuleBasic) GetTxCmd() *cobra.Command { + return cli.GetTxCmd() +} // GetQueryCmd returns no root query command for the inflation module. func (AppModuleBasic) GetQueryCmd() *cobra.Command { diff --git a/x/inflation/types/genesis.pb.go b/x/inflation/types/genesis.pb.go index 193604292..2c131ae8d 100644 --- a/x/inflation/types/genesis.pb.go +++ b/x/inflation/types/genesis.pb.go @@ -5,6 +5,7 @@ package types import ( fmt "fmt" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" @@ -186,34 +187,36 @@ func init() { func init() { proto.RegisterFile("canto/inflation/v1/genesis.proto", fileDescriptor_5da850aabf0c3ac5) } var fileDescriptor_5da850aabf0c3ac5 = []byte{ - // 423 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0x4d, 0x6f, 0x13, 0x31, - 0x10, 0x8d, 0x9b, 0x10, 0x11, 0x17, 0x28, 0x58, 0x10, 0xa2, 0x48, 0x2c, 0xab, 0x48, 0x48, 0x69, - 0x25, 0x76, 0xd5, 0xf6, 0x00, 0xe7, 0x7e, 0x08, 0xf5, 0x00, 0x8a, 0x96, 0x1b, 0x17, 0xcb, 0xd9, - 0x9d, 0x6c, 0xad, 0xee, 0xda, 0x96, 0xed, 0x84, 0xf2, 0x2f, 0xf8, 0x13, 0xfc, 0x97, 0x1e, 0x7b, - 0xe4, 0x54, 0xa1, 0xe4, 0x8f, 0xa0, 0xb5, 0x97, 0x4d, 0x24, 0xf6, 0xe6, 0x79, 0xef, 0xcd, 0x7b, - 0x33, 0x23, 0xe3, 0x30, 0x65, 0xc2, 0xca, 0x98, 0x8b, 0x45, 0xc1, 0x2c, 0x97, 0x22, 0x5e, 0x1d, - 0xc7, 0x39, 0x08, 0x30, 0xdc, 0x44, 0x4a, 0x4b, 0x2b, 0x09, 0x71, 0x8a, 0xa8, 0x51, 0x44, 0xab, - 0xe3, 0xf1, 0xcb, 0x5c, 0xe6, 0xd2, 0xd1, 0x71, 0xf5, 0xf2, 0xca, 0xf1, 0xa4, 0xc5, 0x6b, 0xdb, - 0xe6, 0x34, 0x93, 0x07, 0x84, 0x9f, 0x7c, 0xf2, 0xfe, 0x5f, 0x2d, 0xb3, 0x40, 0x3e, 0xe2, 0xbe, - 0x62, 0x9a, 0x95, 0x66, 0x84, 0x42, 0x34, 0xdd, 0x3f, 0x19, 0x47, 0xff, 0xe7, 0x45, 0x33, 0xa7, - 0x38, 0xeb, 0xdd, 0x3d, 0xbc, 0xed, 0x24, 0xb5, 0x9e, 0x0c, 0x71, 0x5f, 0x81, 0xe6, 0x32, 0x1b, - 0xed, 0x85, 0x68, 0xda, 0x4b, 0xea, 0x8a, 0x1c, 0xe2, 0xe7, 0xa0, 0x64, 0x7a, 0x4d, 0x79, 0x06, - 0xc2, 0xf2, 0x05, 0x07, 0x3d, 0xea, 0x86, 0x68, 0x3a, 0x48, 0x0e, 0x1c, 0x7e, 0xd5, 0xc0, 0xe4, - 0x08, 0xbf, 0x70, 0x90, 0xa1, 0x0a, 0x34, 0xad, 0xdd, 0x7a, 0x21, 0x9a, 0x76, 0x6b, 0xad, 0x99, - 0x81, 0x9e, 0x79, 0xdb, 0x77, 0xf8, 0x99, 0xb9, 0xe1, 0x4a, 0x41, 0x46, 0x3d, 0x35, 0x7a, 0xe4, - 0x62, 0x9f, 0xd6, 0xe8, 0xa5, 0x03, 0x27, 0xbf, 0xf6, 0x70, 0xdf, 0x8f, 0x4b, 0xde, 0x60, 0x5c, - 0x72, 0x61, 0x69, 0x06, 0x42, 0x96, 0x6e, 0xbd, 0x41, 0x32, 0xa8, 0x90, 0x8b, 0x0a, 0x20, 0x1c, - 0xbf, 0x86, 0x5b, 0x25, 0x45, 0x35, 0x0d, 0x2b, 0x68, 0xca, 0x8a, 0x74, 0xe9, 0x57, 0x76, 0x0b, - 0xed, 0x9f, 0x1c, 0xb5, 0x9d, 0xe2, 0x72, 0xdb, 0x72, 0xbe, 0xed, 0xa8, 0x4f, 0x33, 0x84, 0x56, - 0x96, 0x2c, 0xf0, 0xb0, 0x31, 0xa1, 0x19, 0x37, 0x56, 0xf3, 0xf9, 0xd2, 0x25, 0x75, 0x5d, 0xd2, - 0x61, 0x5b, 0xd2, 0xd5, 0xbf, 0xe2, 0x62, 0xa7, 0xa1, 0x0e, 0x7a, 0xc5, 0xdb, 0x48, 0x77, 0x7a, - 0xc1, 0xe6, 0x05, 0xd0, 0x86, 0x77, 0xe7, 0x7c, 0x9c, 0x1c, 0x78, 0xbc, 0xf1, 0x3c, 0xfb, 0x7c, - 0xb7, 0x0e, 0xd0, 0xfd, 0x3a, 0x40, 0x7f, 0xd6, 0x01, 0xfa, 0xb9, 0x09, 0x3a, 0xf7, 0x9b, 0xa0, - 0xf3, 0x7b, 0x13, 0x74, 0xbe, 0x9d, 0xe6, 0xdc, 0x5e, 0x2f, 0xe7, 0x51, 0x2a, 0xcb, 0xf8, 0xbc, - 0x1a, 0xeb, 0xfd, 0x17, 0xb0, 0xdf, 0xa5, 0xbe, 0xf1, 0x55, 0xbc, 0xfa, 0x10, 0xdf, 0xee, 0x7c, - 0x32, 0xfb, 0x43, 0x81, 0x99, 0xf7, 0xdd, 0xf7, 0x3a, 0xfd, 0x1b, 0x00, 0x00, 0xff, 0xff, 0x47, - 0x97, 0xb0, 0xbc, 0xd0, 0x02, 0x00, 0x00, + // 458 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x52, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xce, 0x36, 0x21, 0x22, 0x5b, 0xa0, 0x74, 0x05, 0xc1, 0x8a, 0x54, 0x63, 0x45, 0x42, 0x4a, + 0x23, 0x61, 0xab, 0xed, 0x01, 0xc4, 0xb1, 0x3f, 0x42, 0x3d, 0x80, 0x22, 0x73, 0xe3, 0x62, 0x6d, + 0xec, 0x69, 0xba, 0x4a, 0xbc, 0xbb, 0xb2, 0x37, 0xa1, 0xbc, 0x02, 0x27, 0x1e, 0x83, 0x63, 0x1f, + 0xa3, 0x27, 0xd4, 0x23, 0xa7, 0x0a, 0x25, 0x87, 0xbe, 0x06, 0xf2, 0xac, 0x71, 0x82, 0xf0, 0xc5, + 0xf2, 0x7c, 0xf3, 0xcd, 0xf7, 0xcd, 0xcc, 0x0e, 0xf5, 0x62, 0x2e, 0x8d, 0x0a, 0x84, 0xbc, 0x98, + 0x71, 0x23, 0x94, 0x0c, 0x16, 0x07, 0xc1, 0x04, 0x24, 0xe4, 0x22, 0xf7, 0x75, 0xa6, 0x8c, 0x62, + 0x0c, 0x19, 0x7e, 0xc5, 0xf0, 0x17, 0x07, 0xbd, 0x67, 0x13, 0x35, 0x51, 0x98, 0x0e, 0x8a, 0x3f, + 0xcb, 0xec, 0xed, 0xf2, 0x54, 0x48, 0x15, 0xe0, 0xb7, 0x84, 0xfa, 0x35, 0xf2, 0x6b, 0x25, 0xe4, + 0xf4, 0xef, 0x08, 0x7d, 0xf4, 0xde, 0x5a, 0x7e, 0x32, 0xdc, 0x00, 0x7b, 0x4b, 0xdb, 0x9a, 0x67, + 0x3c, 0xcd, 0x1d, 0xe2, 0x91, 0xc1, 0xf6, 0x61, 0xcf, 0xff, 0xbf, 0x05, 0x7f, 0x84, 0x8c, 0xe3, + 0xd6, 0xcd, 0xdd, 0xcb, 0x46, 0x58, 0xf2, 0x59, 0x97, 0xb6, 0x35, 0x64, 0x42, 0x25, 0xce, 0x96, + 0x47, 0x06, 0xad, 0xb0, 0x8c, 0xd8, 0x3e, 0x7d, 0x0a, 0x5a, 0xc5, 0x97, 0x91, 0x48, 0x40, 0x1a, + 0x71, 0x21, 0x20, 0x73, 0x9a, 0x1e, 0x19, 0x74, 0xc2, 0x1d, 0xc4, 0xcf, 0x2b, 0x98, 0x0d, 0xe9, + 0x2e, 0x42, 0x79, 0xa4, 0x21, 0x8b, 0x4a, 0xb5, 0x96, 0x47, 0x06, 0xcd, 0x92, 0x9b, 0x8f, 0x20, + 0x1b, 0x59, 0xd9, 0x57, 0xf4, 0x49, 0x3e, 0x15, 0x5a, 0x43, 0x12, 0xd9, 0x94, 0xf3, 0x00, 0x6d, + 0x1f, 0x97, 0xe8, 0x19, 0x82, 0xfd, 0x9f, 0x5b, 0xb4, 0x6d, 0xdb, 0x65, 0x7b, 0x94, 0xa6, 0x42, + 0x9a, 0x28, 0x01, 0xa9, 0x52, 0x1c, 0xaf, 0x13, 0x76, 0x0a, 0xe4, 0xb4, 0x00, 0x98, 0xa4, 0x2f, + 0xe0, 0x4a, 0x2b, 0x59, 0x74, 0xc3, 0x67, 0x51, 0xcc, 0x67, 0xf1, 0xdc, 0x8e, 0x8c, 0x03, 0x6d, + 0x1f, 0x0e, 0xeb, 0x56, 0x71, 0xb6, 0x2e, 0x39, 0x59, 0x57, 0x1c, 0x77, 0x8a, 0xd5, 0xfc, 0xb8, + 0xbf, 0x1e, 0x92, 0xb0, 0x0b, 0xb5, 0x14, 0x36, 0xa5, 0xdd, 0x4a, 0x29, 0x4a, 0x44, 0x6e, 0x32, + 0x31, 0x9e, 0xa3, 0x5d, 0x13, 0xed, 0xf6, 0xeb, 0xec, 0xce, 0xff, 0x06, 0xa7, 0x1b, 0x05, 0x9b, + 0x6e, 0xcf, 0x45, 0x1d, 0x03, 0x1f, 0x41, 0xf2, 0xf1, 0x0c, 0xa2, 0x2a, 0x8f, 0x8b, 0x7d, 0x18, + 0xee, 0x58, 0xbc, 0x12, 0x7e, 0xb7, 0xf7, 0xed, 0xfe, 0x7a, 0xe8, 0xd8, 0xdb, 0xb9, 0xda, 0xb8, + 0x9e, 0xf2, 0xd1, 0x3f, 0xdc, 0x2c, 0x5d, 0x72, 0xbb, 0x74, 0xc9, 0xef, 0xa5, 0x4b, 0xbe, 0xaf, + 0xdc, 0xc6, 0xed, 0xca, 0x6d, 0xfc, 0x5a, 0xb9, 0x8d, 0xcf, 0x47, 0x13, 0x61, 0x2e, 0xe7, 0x63, + 0x3f, 0x56, 0x69, 0x70, 0x52, 0x94, 0xbf, 0xfe, 0x08, 0xe6, 0x8b, 0xca, 0xa6, 0x36, 0x0a, 0x16, + 0x6f, 0xfe, 0xd1, 0x33, 0x5f, 0x35, 0xe4, 0xe3, 0x36, 0xde, 0xe1, 0xd1, 0x9f, 0x00, 0x00, 0x00, + 0xff, 0xff, 0xb8, 0xfe, 0xa8, 0x44, 0x0c, 0x03, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/inflation/types/inflation.pb.go b/x/inflation/types/inflation.pb.go index d6df6398a..67f2a874b 100644 --- a/x/inflation/types/inflation.pb.go +++ b/x/inflation/types/inflation.pb.go @@ -7,6 +7,7 @@ import ( cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" @@ -142,31 +143,32 @@ func init() { } var fileDescriptor_aa2aa1764b029465 = []byte{ - // 376 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0xd2, 0xc1, 0x6a, 0xdb, 0x40, - 0x10, 0x00, 0x50, 0x6d, 0xdd, 0x16, 0xba, 0x6d, 0x5d, 0x10, 0x6d, 0x51, 0x5d, 0x90, 0x8b, 0x4f, - 0xbd, 0x58, 0xc2, 0xf8, 0xd0, 0x63, 0xc1, 0x76, 0x0e, 0x81, 0x24, 0x04, 0x63, 0x42, 0xf0, 0x45, - 0xac, 0xd6, 0x1b, 0x79, 0xb1, 0xb4, 0x23, 0x56, 0x2b, 0x59, 0xfe, 0x86, 0x5c, 0xf2, 0x31, 0xf9, - 0x08, 0x5f, 0x02, 0x26, 0xa7, 0x90, 0x83, 0x09, 0xf6, 0x8f, 0x04, 0x69, 0x95, 0x38, 0x67, 0xdd, - 0x66, 0x34, 0xc3, 0x13, 0x33, 0x3b, 0xb8, 0x43, 0x89, 0x50, 0xe0, 0x72, 0x71, 0x15, 0x12, 0xc5, - 0x41, 0xb8, 0x59, 0xef, 0x90, 0x38, 0xb1, 0x04, 0x05, 0xa6, 0x59, 0xf6, 0x38, 0x87, 0xcf, 0x59, - 0xaf, 0xf5, 0x3d, 0x80, 0x00, 0xca, 0xb2, 0x5b, 0x44, 0xba, 0xb3, 0xf5, 0x8b, 0x42, 0x12, 0x41, - 0xe2, 0xe9, 0x82, 0x4e, 0x74, 0xa9, 0x73, 0x87, 0xf0, 0x8f, 0xe3, 0x17, 0x61, 0xc4, 0x13, 0x25, - 0xb9, 0x9f, 0x16, 0xb1, 0x39, 0xc5, 0xdf, 0x12, 0x45, 0x16, 0x5c, 0x04, 0x9e, 0x64, 0x4b, 0x22, - 0x67, 0x89, 0x85, 0xfe, 0xa0, 0xbf, 0x9f, 0x06, 0xbd, 0xf5, 0xb6, 0x6d, 0x3c, 0x6e, 0xdb, 0xbf, - 0x35, 0x94, 0xcc, 0x16, 0x0e, 0x07, 0x37, 0x22, 0x6a, 0xee, 0x9c, 0xb0, 0x80, 0xd0, 0xd5, 0x88, - 0xd1, 0xfb, 0xdb, 0x2e, 0xae, 0xfe, 0x33, 0x62, 0x74, 0xdc, 0xac, 0xa4, 0xb1, 0x86, 0xcc, 0x4b, - 0xdc, 0xa4, 0x10, 0x45, 0xa9, 0xe0, 0x6a, 0xe5, 0xc5, 0x00, 0xa1, 0xd5, 0xa8, 0x4b, 0x7f, 0x7d, - 0x85, 0xce, 0x01, 0xc2, 0xce, 0x75, 0x03, 0xff, 0x3c, 0xca, 0x63, 0x10, 0x4c, 0x28, 0x4e, 0xc2, - 0x21, 0x09, 0x69, 0xaa, 0x87, 0x33, 0xff, 0x63, 0x44, 0xea, 0x8f, 0x80, 0x48, 0x01, 0x48, 0xeb, - 0x5d, 0x6d, 0x40, 0x16, 0x00, 0xad, 0x3f, 0x29, 0xa2, 0xc5, 0xde, 0x7c, 0x10, 0xb3, 0xe2, 0x4d, - 0x14, 0x91, 0x01, 0x53, 0xd6, 0xfb, 0xda, 0x7b, 0xab, 0xa0, 0x49, 0xe9, 0x98, 0x13, 0xfc, 0x25, - 0x22, 0xb9, 0x97, 0x11, 0xc9, 0x89, 0xa0, 0xcc, 0xfa, 0x50, 0xd7, 0xfd, 0x1c, 0x91, 0xfc, 0xa2, - 0x52, 0x06, 0xa7, 0xeb, 0x9d, 0x8d, 0x36, 0x3b, 0x1b, 0x3d, 0xed, 0x6c, 0x74, 0xb3, 0xb7, 0x8d, - 0xcd, 0xde, 0x36, 0x1e, 0xf6, 0xb6, 0x31, 0xed, 0x07, 0x5c, 0xcd, 0x53, 0xdf, 0xa1, 0x10, 0xb9, - 0xc3, 0xe2, 0x8e, 0xbb, 0x67, 0x4c, 0x2d, 0x41, 0x2e, 0x74, 0xe6, 0x66, 0xff, 0xdc, 0xfc, 0xcd, - 0xf9, 0xab, 0x55, 0xcc, 0x12, 0xff, 0x63, 0x79, 0xb3, 0xfd, 0xe7, 0x00, 0x00, 0x00, 0xff, 0xff, - 0x97, 0x5f, 0xa0, 0x6f, 0x1e, 0x03, 0x00, 0x00, + // 392 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x93, 0x41, 0x8b, 0xd4, 0x30, + 0x14, 0xc7, 0x1b, 0x57, 0x05, 0xa3, 0xae, 0x58, 0x54, 0xea, 0x0a, 0x5d, 0x99, 0x93, 0x08, 0xdb, + 0xb0, 0x2c, 0xe8, 0x7d, 0xa7, 0x1e, 0x04, 0x15, 0x19, 0x44, 0x50, 0x90, 0xf2, 0x9a, 0x89, 0x9d, + 0x30, 0x4d, 0x5e, 0x49, 0xd3, 0x4e, 0xe7, 0x5b, 0xf8, 0x21, 0x3c, 0x78, 0xf4, 0xe0, 0x87, 0x98, + 0xe3, 0xe0, 0x45, 0xf1, 0x30, 0xc8, 0xcc, 0xc1, 0xaf, 0x21, 0x6d, 0xaa, 0xb3, 0xf7, 0x5e, 0xc2, + 0x7b, 0xef, 0xff, 0xf8, 0x85, 0xff, 0xcb, 0x0b, 0x1d, 0x71, 0xd0, 0x16, 0x99, 0xd4, 0x1f, 0x73, + 0xb0, 0x12, 0x35, 0xab, 0x4f, 0xf7, 0x49, 0x54, 0x18, 0xb4, 0xe8, 0xfb, 0x5d, 0x4f, 0xb4, 0x2f, + 0xd7, 0xa7, 0x47, 0x77, 0x32, 0xcc, 0xb0, 0x93, 0x59, 0x1b, 0xb9, 0xce, 0xa3, 0xfb, 0x1c, 0x4b, + 0x85, 0x65, 0xe2, 0x04, 0x97, 0xf4, 0xd2, 0x6d, 0x50, 0x52, 0x23, 0xeb, 0x4e, 0x57, 0x1a, 0xfd, + 0x20, 0xf4, 0xee, 0xf3, 0x7f, 0xd0, 0x58, 0x96, 0xd6, 0xc8, 0xb4, 0x6a, 0x63, 0x3f, 0xa1, 0xb7, + 0x4a, 0x0b, 0x73, 0xa9, 0xb3, 0xc4, 0x88, 0x05, 0x98, 0x69, 0x19, 0x90, 0x87, 0xe4, 0xd1, 0xb5, + 0xf3, 0x27, 0xab, 0xcd, 0xb1, 0xf7, 0x6b, 0x73, 0xfc, 0xc0, 0xb1, 0xcb, 0xe9, 0x3c, 0x92, 0xc8, + 0x14, 0xd8, 0x59, 0xf4, 0x42, 0x64, 0xc0, 0x97, 0xb1, 0xe0, 0xdf, 0xbf, 0x9d, 0xd0, 0xfe, 0xea, + 0x58, 0xf0, 0x2f, 0x7f, 0xbe, 0x3e, 0x26, 0x93, 0xc3, 0x1e, 0x37, 0x71, 0x34, 0xff, 0x03, 0x3d, + 0xe4, 0xa8, 0x54, 0xa5, 0xa5, 0x5d, 0x26, 0x05, 0x62, 0x1e, 0x1c, 0x0c, 0xe2, 0xdf, 0xfc, 0x4f, + 0x7b, 0x8d, 0x98, 0x8f, 0x3e, 0x1f, 0xd0, 0x7b, 0xcf, 0x9a, 0x02, 0xb5, 0xd0, 0x56, 0x42, 0x3e, + 0x86, 0x9c, 0x57, 0xce, 0xa6, 0x1f, 0x53, 0x02, 0x03, 0xcd, 0x10, 0x68, 0x29, 0x26, 0xb8, 0x34, + 0x8c, 0x62, 0x5a, 0x0a, 0x1f, 0x68, 0x9c, 0xf0, 0x76, 0x96, 0x29, 0xea, 0x69, 0xfb, 0x58, 0x16, + 0x4c, 0x26, 0x6c, 0x70, 0x79, 0xd8, 0x2c, 0x7b, 0xda, 0x9b, 0x0e, 0xe6, 0xbf, 0xa3, 0x37, 0x14, + 0x34, 0x49, 0x0d, 0x46, 0x82, 0xe6, 0x22, 0xb8, 0x32, 0x08, 0x7e, 0x5d, 0x41, 0xf3, 0xb6, 0x47, + 0x9d, 0xbf, 0x5c, 0x6d, 0x43, 0xb2, 0xde, 0x86, 0xe4, 0xf7, 0x36, 0x24, 0x9f, 0x76, 0xa1, 0xb7, + 0xde, 0x85, 0xde, 0xcf, 0x5d, 0xe8, 0xbd, 0x3f, 0xcb, 0xa4, 0x9d, 0x55, 0x69, 0xc4, 0x51, 0xb1, + 0x71, 0xbb, 0xfd, 0x27, 0xaf, 0x84, 0x5d, 0xa0, 0x99, 0xbb, 0x8c, 0xd5, 0x4f, 0x59, 0x73, 0xe1, + 0xd3, 0xd8, 0x65, 0x21, 0xca, 0xf4, 0x6a, 0xb7, 0xd6, 0x67, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, + 0x8d, 0x43, 0x46, 0x75, 0x54, 0x03, 0x00, 0x00, } func (m *InflationDistribution) Marshal() (dAtA []byte, err error) { diff --git a/x/inflation/types/tx.pb.go b/x/inflation/types/tx.pb.go index c545a7f3f..7ad108032 100644 --- a/x/inflation/types/tx.pb.go +++ b/x/inflation/types/tx.pb.go @@ -136,7 +136,7 @@ func init() { func init() { proto.RegisterFile("canto/inflation/v1/tx.proto", fileDescriptor_3cd435bd13fdf9eb) } var fileDescriptor_3cd435bd13fdf9eb = []byte{ - // 360 bytes of a gzipped FileDescriptorProto + // 361 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0x4e, 0xcc, 0x2b, 0xc9, 0xd7, 0xcf, 0xcc, 0x4b, 0xcb, 0x49, 0x2c, 0xc9, 0xcc, 0xcf, 0xd3, 0x2f, 0x33, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x02, 0x4b, 0xea, 0xc1, 0x25, 0xf5, 0xca, @@ -144,22 +144,22 @@ var fileDescriptor_3cd435bd13fdf9eb = []byte{ 0x72, 0x7e, 0x71, 0x6e, 0x7e, 0xb1, 0x7e, 0x6e, 0x71, 0x3a, 0xc8, 0x84, 0xdc, 0xe2, 0x74, 0xa8, 0x84, 0x24, 0x44, 0x22, 0x1e, 0xa2, 0x03, 0xc2, 0x81, 0x4a, 0x09, 0x26, 0xe6, 0x66, 0xe6, 0xe5, 0xeb, 0x83, 0x49, 0xa8, 0x90, 0x02, 0x16, 0xd7, 0xa4, 0xa7, 0xe6, 0xa5, 0x16, 0x67, 0x42, 0x35, - 0x29, 0x6d, 0x62, 0xe4, 0xe2, 0xf7, 0x2d, 0x4e, 0x0f, 0x2d, 0x48, 0x49, 0x2c, 0x49, 0x0d, 0x48, + 0x29, 0xed, 0x63, 0xe4, 0xe2, 0xf7, 0x2d, 0x4e, 0x0f, 0x2d, 0x48, 0x49, 0x2c, 0x49, 0x0d, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0x16, 0x32, 0xe3, 0xe2, 0x4c, 0x2c, 0x2d, 0xc9, 0xc8, 0x2f, 0xca, 0x2c, 0xa9, 0x94, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74, 0x92, 0xb8, 0xb4, 0x45, 0x57, 0x04, 0x6a, 0x9b, 0x63, 0x4a, 0x4a, 0x51, 0x6a, 0x71, 0x71, 0x70, 0x49, 0x51, 0x66, 0x5e, 0x7a, 0x10, 0x42, 0xa9, 0x90, 0x2d, 0x17, 0x5b, 0x01, 0xd8, 0x04, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x29, 0x3d, 0x4c, 0xff, 0xea, 0x41, 0xec, 0x70, 0xe2, 0x3c, 0x71, 0x4f, 0x9e, 0x61, 0xc5, 0xf3, 0x0d, 0x5a, - 0x8c, 0x41, 0x50, 0x4d, 0x56, 0x1a, 0x4d, 0xcf, 0x37, 0x68, 0x21, 0x8c, 0xeb, 0x7a, 0xbe, 0x41, - 0x4b, 0x14, 0xe2, 0x7e, 0x34, 0x07, 0x2a, 0x49, 0x72, 0x89, 0xa3, 0x09, 0x05, 0xa5, 0x16, 0x17, - 0xe4, 0xe7, 0x15, 0xa7, 0x1a, 0xe5, 0x71, 0x31, 0xfb, 0x16, 0xa7, 0x0b, 0x25, 0x70, 0xf1, 0xa0, - 0x78, 0x49, 0x19, 0x9b, 0x53, 0xd0, 0xcc, 0x90, 0xd2, 0x26, 0x42, 0x11, 0xcc, 0x22, 0x29, 0xd6, - 0x06, 0x90, 0xe3, 0x9d, 0x7c, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, 0x23, - 0x39, 0xc6, 0x09, 0x8f, 0xe5, 0x18, 0x2e, 0x3c, 0x96, 0x63, 0xb8, 0xf1, 0x58, 0x8e, 0x21, 0xca, - 0x38, 0x3d, 0xb3, 0x24, 0xa3, 0x34, 0x49, 0x2f, 0x39, 0x3f, 0x57, 0xdf, 0x19, 0x64, 0xae, 0xae, - 0x5f, 0x6a, 0x49, 0x79, 0x7e, 0x51, 0x36, 0x84, 0xa7, 0x5f, 0x66, 0xae, 0x5f, 0x81, 0x14, 0x33, - 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x49, 0x6c, 0xe0, 0x58, 0x31, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, - 0x57, 0x98, 0x79, 0x4c, 0x47, 0x02, 0x00, 0x00, + 0x8c, 0x41, 0x50, 0x4d, 0x56, 0x26, 0x4d, 0xcf, 0x37, 0x68, 0x21, 0x8c, 0xeb, 0x7a, 0xbe, 0x41, + 0x4b, 0x11, 0xe2, 0xfe, 0x0a, 0x24, 0x1f, 0xa0, 0x39, 0x56, 0x49, 0x92, 0x4b, 0x1c, 0x4d, 0x28, + 0x28, 0xb5, 0xb8, 0x20, 0x3f, 0xaf, 0x38, 0xd5, 0x28, 0x8f, 0x8b, 0xd9, 0xb7, 0x38, 0x5d, 0x28, + 0x81, 0x8b, 0x07, 0xc5, 0x7b, 0xca, 0xd8, 0x9c, 0x85, 0x66, 0x86, 0x94, 0x36, 0x11, 0x8a, 0x60, + 0x16, 0x49, 0xb1, 0x36, 0x80, 0x3c, 0xe2, 0xe4, 0x7b, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, + 0x8c, 0x0f, 0x1e, 0xc9, 0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x70, 0xe1, 0xb1, 0x1c, 0xc3, 0x8d, 0xc7, + 0x72, 0x0c, 0x51, 0xc6, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xce, + 0x20, 0x73, 0x75, 0xfd, 0x52, 0x4b, 0xca, 0xf3, 0x8b, 0xb2, 0x21, 0x3c, 0xfd, 0x32, 0x73, 0x14, + 0x3f, 0x96, 0x54, 0x16, 0xa4, 0x16, 0x27, 0xb1, 0x81, 0x63, 0xc8, 0x18, 0x10, 0x00, 0x00, 0xff, + 0xff, 0x9e, 0x74, 0x74, 0x69, 0x53, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/x/onboarding/client/cli/tx.go b/x/onboarding/client/cli/tx.go new file mode 100644 index 000000000..6d1074ade --- /dev/null +++ b/x/onboarding/client/cli/tx.go @@ -0,0 +1,23 @@ +package cli + +import ( + "fmt" + + "github.com/spf13/cobra" + + "github.com/cosmos/cosmos-sdk/client" + + "github.com/Canto-Network/Canto/v7/x/onboarding/types" +) + +// GetTxCmd returns the transaction methods allowed for the CLI. +func GetTxCmd() *cobra.Command { + cmd := &cobra.Command{ + Use: types.ModuleName, + Short: fmt.Sprintf("%s has no transaction commands", types.ModuleName), + DisableFlagParsing: true, + SuggestionsMinimumDistance: 2, + RunE: client.ValidateCmd, + } + return cmd +} diff --git a/x/onboarding/keeper/grpc_query_test.go b/x/onboarding/keeper/grpc_query_test.go index 17f795630..b0c68019c 100644 --- a/x/onboarding/keeper/grpc_query_test.go +++ b/x/onboarding/keeper/grpc_query_test.go @@ -1,16 +1,13 @@ package keeper_test import ( - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/Canto-Network/Canto/v7/x/onboarding/types" ) func (suite *KeeperTestSuite) TestQueryParams() { - ctx := sdk.WrapSDKContext(suite.ctx) expParams := types.DefaultParams() - res, err := suite.queryClient.Params(ctx, &types.QueryParamsRequest{}) + res, err := suite.queryClient.Params(suite.ctx, &types.QueryParamsRequest{}) suite.Require().NoError(err) suite.Require().Equal(expParams, res.Params) } diff --git a/x/onboarding/keeper/ibc_callbacks.go b/x/onboarding/keeper/ibc_callbacks.go index 17b501926..5f00c9952 100644 --- a/x/onboarding/keeper/ibc_callbacks.go +++ b/x/onboarding/keeper/ibc_callbacks.go @@ -134,7 +134,7 @@ func (k Keeper) OnRecvPacket( // the ICS20 packet data // Use MsgConvertCoin to convert the Cosmos Coin to an ERC20 - if _, err = k.erc20Keeper.ConvertCoin(sdk.WrapSDKContext(ctx), convertMsg); err != nil { + if _, err = k.erc20Keeper.ConvertCoin(ctx, convertMsg); err != nil { logger.Error("failed to convert coins", "error", err) return ack } diff --git a/x/onboarding/module.go b/x/onboarding/module.go index af246e13e..97cbe2eb2 100644 --- a/x/onboarding/module.go +++ b/x/onboarding/module.go @@ -80,7 +80,9 @@ func (AppModuleBasic) RegisterGRPCGatewayRoutes(c client.Context, serveMux *runt } // GetTxCmd returns the root tx command for the onboarding module. -func (AppModuleBasic) GetTxCmd() *cobra.Command { return nil } +func (AppModuleBasic) GetTxCmd() *cobra.Command { + return cli.GetTxCmd() +} // GetQueryCmd returns no root query command for the onboarding module. func (AppModuleBasic) GetQueryCmd() *cobra.Command { diff --git a/x/onboarding/types/genesis.pb.go b/x/onboarding/types/genesis.pb.go index 5b17451f6..2f7541770 100644 --- a/x/onboarding/types/genesis.pb.go +++ b/x/onboarding/types/genesis.pb.go @@ -7,6 +7,7 @@ import ( cosmossdk_io_math "cosmossdk.io/math" fmt "fmt" _ "github.com/cosmos/cosmos-proto" + _ "github.com/cosmos/cosmos-sdk/types/tx/amino" _ "github.com/cosmos/gogoproto/gogoproto" proto "github.com/cosmos/gogoproto/proto" io "io" @@ -134,29 +135,31 @@ func init() { func init() { proto.RegisterFile("canto/onboarding/v1/genesis.proto", fileDescriptor_a3d6be42d72587d3) } var fileDescriptor_a3d6be42d72587d3 = []byte{ - // 349 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xc1, 0x4e, 0xc2, 0x30, - 0x18, 0xc7, 0xd7, 0x40, 0x88, 0x54, 0x0f, 0x32, 0x30, 0x41, 0x4c, 0x06, 0x72, 0x22, 0x21, 0xb4, - 0x41, 0x4d, 0x8c, 0x57, 0x38, 0x18, 0x2e, 0x68, 0x86, 0x27, 0x3d, 0x2c, 0xdd, 0xd6, 0x6c, 0x0b, - 0x5b, 0xbb, 0xac, 0x85, 0xe9, 0x5b, 0xf8, 0x30, 0xbe, 0x82, 0x09, 0x47, 0xe2, 0xc9, 0x78, 0x20, - 0x06, 0x5e, 0xc4, 0x6c, 0x45, 0xe1, 0xe0, 0xad, 0x5f, 0x7f, 0xff, 0xef, 0xff, 0xb5, 0xff, 0x0f, - 0x9e, 0x3b, 0x84, 0x49, 0x8e, 0x39, 0xb3, 0x39, 0x49, 0xdc, 0x80, 0x79, 0x78, 0xde, 0xc7, 0x1e, - 0x65, 0x54, 0x04, 0x02, 0xc5, 0x09, 0x97, 0x5c, 0xaf, 0xe6, 0x12, 0xb4, 0x93, 0xa0, 0x79, 0xbf, - 0x51, 0xf3, 0xb8, 0xc7, 0x73, 0x8e, 0xb3, 0x93, 0x92, 0x36, 0x4e, 0x1d, 0x2e, 0x22, 0x2e, 0x2c, - 0x05, 0x54, 0xa1, 0x50, 0x7b, 0x04, 0x8f, 0x6e, 0x95, 0xed, 0x44, 0x12, 0x49, 0xf5, 0x1b, 0x58, - 0x8a, 0x49, 0x42, 0x22, 0x51, 0x07, 0x2d, 0xd0, 0x39, 0xbc, 0x38, 0x43, 0xff, 0x8c, 0x41, 0xf7, - 0xb9, 0x64, 0x50, 0x5c, 0xac, 0x9a, 0x9a, 0xb9, 0x6d, 0x68, 0xbf, 0x03, 0x58, 0x52, 0x40, 0xef, - 0xc2, 0x0a, 0x65, 0xc4, 0x0e, 0xa9, 0xb5, 0xeb, 0xcb, 0x0d, 0x0f, 0xcc, 0x63, 0x05, 0xee, 0xfe, - 0xee, 0xf5, 0x27, 0x58, 0x25, 0x33, 0xc9, 0x2d, 0x91, 0x92, 0xd8, 0x92, 0x7e, 0x42, 0x85, 0xcf, - 0x43, 0xb7, 0x5e, 0x68, 0x81, 0x4e, 0x79, 0xd0, 0xcd, 0x46, 0x7c, 0xad, 0x9a, 0x27, 0xea, 0xd5, - 0xc2, 0x9d, 0xa2, 0x80, 0xe3, 0x88, 0x48, 0x1f, 0x8d, 0x98, 0xfc, 0x78, 0xeb, 0xc1, 0xed, 0x77, - 0x46, 0x4c, 0x9a, 0x95, 0xcc, 0x67, 0x92, 0x92, 0xf8, 0xe1, 0xd7, 0x45, 0xef, 0xc3, 0x5a, 0xea, - 0x07, 0x92, 0x86, 0x81, 0x90, 0xd4, 0xb5, 0x1c, 0x9f, 0x30, 0x46, 0x43, 0x51, 0x2f, 0xb6, 0x0a, - 0x9d, 0xb2, 0x59, 0xdd, 0x63, 0xc3, 0x2d, 0x1a, 0x8c, 0x17, 0x6b, 0x03, 0x2c, 0xd7, 0x06, 0xf8, - 0x5e, 0x1b, 0xe0, 0x75, 0x63, 0x68, 0xcb, 0x8d, 0xa1, 0x7d, 0x6e, 0x0c, 0xed, 0xf1, 0xca, 0x0b, - 0xa4, 0x3f, 0xb3, 0x91, 0xc3, 0x23, 0x3c, 0xcc, 0x62, 0xe9, 0x8d, 0xa9, 0x4c, 0x79, 0x32, 0x55, - 0x15, 0x9e, 0x5f, 0xe3, 0xe7, 0xfd, 0x9d, 0xc9, 0x97, 0x98, 0x0a, 0xbb, 0x94, 0x27, 0x7d, 0xf9, - 0x13, 0x00, 0x00, 0xff, 0xff, 0x29, 0xb4, 0xa8, 0xe9, 0xd4, 0x01, 0x00, 0x00, + // 377 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0x41, 0x6b, 0xe2, 0x40, + 0x14, 0xc7, 0x13, 0x14, 0x59, 0x67, 0xf7, 0xb0, 0x46, 0x17, 0xd4, 0x85, 0xe8, 0x7a, 0x92, 0x15, + 0x67, 0x70, 0xb7, 0x50, 0xda, 0xa3, 0x1e, 0x8a, 0x17, 0x5b, 0x62, 0x4f, 0xed, 0x21, 0x4c, 0x92, + 0x21, 0x09, 0x26, 0x33, 0x21, 0x33, 0x9a, 0xf6, 0x2b, 0xf4, 0xd4, 0x8f, 0xd2, 0x43, 0x3f, 0x84, + 0x47, 0xe9, 0xa9, 0xf4, 0x20, 0x45, 0x29, 0xfd, 0x1a, 0x25, 0x99, 0xb4, 0x5a, 0xe8, 0x65, 0x98, + 0xf7, 0x7e, 0xff, 0xf7, 0x7f, 0x3c, 0xfe, 0xe0, 0x8f, 0x8d, 0xa9, 0x60, 0x88, 0x51, 0x8b, 0xe1, + 0xd8, 0xf1, 0xa9, 0x8b, 0x16, 0x03, 0xe4, 0x12, 0x4a, 0xb8, 0xcf, 0x61, 0x14, 0x33, 0xc1, 0xb4, + 0x6a, 0x26, 0x81, 0x3b, 0x09, 0x5c, 0x0c, 0x9a, 0x35, 0x97, 0xb9, 0x2c, 0xe3, 0x28, 0xfd, 0x49, + 0x69, 0xb3, 0x61, 0x33, 0x1e, 0x32, 0x6e, 0x4a, 0x20, 0x8b, 0x1c, 0x55, 0x70, 0xe8, 0x53, 0x86, + 0xb2, 0x57, 0xb6, 0x3a, 0x63, 0xf0, 0xe3, 0x44, 0x6e, 0x9a, 0x0a, 0x2c, 0x88, 0x76, 0x04, 0x4a, + 0x11, 0x8e, 0x71, 0xc8, 0xeb, 0x6a, 0x5b, 0xed, 0x7e, 0xff, 0xf7, 0x1b, 0x7e, 0xb1, 0x19, 0x9e, + 0x65, 0x92, 0x61, 0x71, 0xb9, 0x6e, 0x29, 0x46, 0x3e, 0xd0, 0x79, 0x51, 0x41, 0x49, 0x02, 0xad, + 0x07, 0x2a, 0x84, 0x62, 0x2b, 0x20, 0xe6, 0x6e, 0x2e, 0x33, 0xfc, 0x66, 0xfc, 0x94, 0xe0, 0xf4, + 0xa3, 0xaf, 0x5d, 0x82, 0x2a, 0x9e, 0x0b, 0x66, 0xf2, 0x04, 0x47, 0xa6, 0xf0, 0x62, 0xc2, 0x3d, + 0x16, 0x38, 0xf5, 0x42, 0x5b, 0xed, 0x96, 0x87, 0xbd, 0x74, 0xc5, 0xd3, 0xba, 0xf5, 0x4b, 0x1e, + 0xc2, 0x9d, 0x19, 0xf4, 0x19, 0x0a, 0xb1, 0xf0, 0xe0, 0x98, 0x8a, 0x87, 0xfb, 0x3e, 0xc8, 0x2f, + 0x1c, 0x53, 0x61, 0x54, 0x52, 0x9f, 0x69, 0x82, 0xa3, 0xf3, 0x77, 0x17, 0x6d, 0x00, 0x6a, 0x89, + 0xe7, 0x0b, 0x12, 0xf8, 0x5c, 0x10, 0xc7, 0xb4, 0x3d, 0x4c, 0x29, 0x09, 0x78, 0xbd, 0xd8, 0x2e, + 0x74, 0xcb, 0x46, 0x75, 0x8f, 0x8d, 0x72, 0x74, 0xac, 0xdf, 0xbc, 0xde, 0xfd, 0x6d, 0xc8, 0x4c, + 0xae, 0xf6, 0x53, 0xc9, 0xaf, 0x9e, 0x2c, 0x37, 0xba, 0xba, 0xda, 0xe8, 0xea, 0xf3, 0x46, 0x57, + 0x6f, 0xb7, 0xba, 0xb2, 0xda, 0xea, 0xca, 0xe3, 0x56, 0x57, 0x2e, 0x0e, 0x5c, 0x5f, 0x78, 0x73, + 0x0b, 0xda, 0x2c, 0x44, 0xa3, 0x74, 0xbe, 0x3f, 0x21, 0x22, 0x61, 0xf1, 0x4c, 0x56, 0x68, 0x71, + 0xf8, 0xd9, 0x50, 0x5c, 0x47, 0x84, 0x5b, 0xa5, 0x2c, 0x89, 0xff, 0x6f, 0x01, 0x00, 0x00, 0xff, + 0xff, 0xf5, 0x22, 0x19, 0xb0, 0x07, 0x02, 0x00, 0x00, } func (m *GenesisState) Marshal() (dAtA []byte, err error) { diff --git a/x/onboarding/types/tx.pb.go b/x/onboarding/types/tx.pb.go index 9618b7ebe..167573a07 100644 --- a/x/onboarding/types/tx.pb.go +++ b/x/onboarding/types/tx.pb.go @@ -136,7 +136,7 @@ func init() { func init() { proto.RegisterFile("canto/onboarding/v1/tx.proto", fileDescriptor_245e19fcd2c68f2c) } var fileDescriptor_245e19fcd2c68f2c = []byte{ - // 360 bytes of a gzipped FileDescriptorProto + // 361 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0x4e, 0xcc, 0x2b, 0xc9, 0xd7, 0xcf, 0xcf, 0x4b, 0xca, 0x4f, 0x2c, 0x4a, 0xc9, 0xcc, 0x4b, 0xd7, 0x2f, 0x33, 0xd4, 0x2f, 0xa9, 0xd0, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x06, 0xcb, 0xea, 0x21, 0x64, 0xf5, @@ -144,22 +144,22 @@ var fileDescriptor_245e19fcd2c68f2c = []byte{ 0x78, 0x72, 0x7e, 0x71, 0x6e, 0x7e, 0xb1, 0x7e, 0x6e, 0x31, 0xd8, 0x88, 0xdc, 0xe2, 0x74, 0xa8, 0x84, 0x24, 0x44, 0x22, 0x1e, 0xa2, 0x03, 0xc2, 0x81, 0x4a, 0x09, 0x26, 0xe6, 0x66, 0xe6, 0xe5, 0xeb, 0x83, 0x49, 0xa8, 0x90, 0x22, 0x36, 0xf7, 0xa4, 0xa7, 0xe6, 0xa5, 0x16, 0x67, 0x42, 0x75, - 0x29, 0x6d, 0x66, 0xe4, 0xe2, 0xf7, 0x2d, 0x4e, 0x0f, 0x2d, 0x48, 0x49, 0x2c, 0x49, 0x0d, 0x48, + 0x29, 0x1d, 0x60, 0xe4, 0xe2, 0xf7, 0x2d, 0x4e, 0x0f, 0x2d, 0x48, 0x49, 0x2c, 0x49, 0x0d, 0x48, 0x2c, 0x4a, 0xcc, 0x2d, 0x16, 0x32, 0xe3, 0xe2, 0x4c, 0x2c, 0x2d, 0xc9, 0xc8, 0x2f, 0xca, 0x2c, 0xa9, 0x94, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x74, 0x92, 0xb8, 0xb4, 0x45, 0x57, 0x04, 0x6a, 0x9d, 0x63, 0x4a, 0x4a, 0x51, 0x6a, 0x71, 0x71, 0x70, 0x49, 0x51, 0x66, 0x5e, 0x7a, 0x10, 0x42, 0xa9, 0x90, 0x1d, 0x17, 0x5b, 0x01, 0xd8, 0x04, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x6e, 0x23, 0x69, 0x3d, 0x2c, 0x3e, 0xd6, 0x83, 0x58, 0xe2, 0xc4, 0x79, 0xe2, 0x9e, 0x3c, 0xc3, 0x8a, 0xe7, 0x1b, 0xb4, - 0x18, 0x83, 0xa0, 0xba, 0xac, 0x34, 0x9a, 0x9e, 0x6f, 0xd0, 0x42, 0x98, 0xd7, 0xf5, 0x7c, 0x83, - 0x96, 0x28, 0xc4, 0x07, 0x68, 0x2e, 0x54, 0x92, 0xe4, 0x12, 0x47, 0x13, 0x0a, 0x4a, 0x2d, 0x2e, - 0xc8, 0xcf, 0x2b, 0x4e, 0x35, 0x2a, 0xe0, 0x62, 0xf6, 0x2d, 0x4e, 0x17, 0x4a, 0xe2, 0xe2, 0x41, - 0xf1, 0x93, 0x0a, 0x56, 0xb7, 0xa0, 0x19, 0x22, 0xa5, 0x43, 0x8c, 0x2a, 0x98, 0x55, 0x52, 0xac, - 0x0d, 0x20, 0xe7, 0x3b, 0xf9, 0x9d, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, 0x1c, 0xe3, 0x83, 0x47, - 0x72, 0x8c, 0x13, 0x1e, 0xcb, 0x31, 0x5c, 0x78, 0x2c, 0xc7, 0x70, 0xe3, 0xb1, 0x1c, 0x43, 0x94, - 0x49, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0xbe, 0x33, 0xc8, 0x60, 0x5d, - 0xbf, 0xd4, 0x92, 0xf2, 0xfc, 0xa2, 0x6c, 0x08, 0x4f, 0xbf, 0xcc, 0x5c, 0xbf, 0x02, 0x39, 0x76, - 0x4a, 0x2a, 0x0b, 0x52, 0x8b, 0x93, 0xd8, 0xc0, 0x31, 0x63, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, - 0xf5, 0xc3, 0xb9, 0x64, 0x4e, 0x02, 0x00, 0x00, + 0x18, 0x83, 0xa0, 0xba, 0xac, 0x4c, 0x9b, 0x9e, 0x6f, 0xd0, 0x42, 0x98, 0xd7, 0xf5, 0x7c, 0x83, + 0x96, 0x12, 0xc4, 0x07, 0x15, 0xc8, 0x7e, 0x40, 0x73, 0xae, 0x92, 0x24, 0x97, 0x38, 0x9a, 0x50, + 0x50, 0x6a, 0x71, 0x41, 0x7e, 0x5e, 0x71, 0xaa, 0x51, 0x01, 0x17, 0xb3, 0x6f, 0x71, 0xba, 0x50, + 0x12, 0x17, 0x0f, 0x8a, 0x07, 0x55, 0xb0, 0x3a, 0x0c, 0xcd, 0x10, 0x29, 0x1d, 0x62, 0x54, 0xc1, + 0xac, 0x92, 0x62, 0x6d, 0x00, 0xf9, 0xc5, 0xc9, 0xef, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, + 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf0, 0x58, 0x8e, 0xe1, 0xc2, 0x63, 0x39, 0x86, 0x1b, 0x8f, + 0xe5, 0x18, 0xa2, 0x4c, 0xd2, 0x33, 0x4b, 0x32, 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0x9d, + 0x41, 0x06, 0xeb, 0xfa, 0xa5, 0x96, 0x94, 0xe7, 0x17, 0x65, 0x43, 0x78, 0xfa, 0x65, 0xe6, 0xa8, + 0xde, 0x2c, 0xa9, 0x2c, 0x48, 0x2d, 0x4e, 0x62, 0x03, 0x47, 0x93, 0x31, 0x20, 0x00, 0x00, 0xff, + 0xff, 0xd6, 0xc7, 0xfc, 0x13, 0x5b, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used.