From 6d945c211c37b2c8e6b075816da11fde1ac18693 Mon Sep 17 00:00:00 2001 From: yuandu Date: Mon, 11 Sep 2023 16:48:56 +0800 Subject: [PATCH 1/9] feat: support x/nft api --- modules/nft/module/module.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/nft/module/module.go b/modules/nft/module/module.go index 02a2fae9..1e5128be 100644 --- a/modules/nft/module/module.go +++ b/modules/nft/module/module.go @@ -16,7 +16,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - sdkbftsim "github.com/cosmos/cosmos-sdk/x/nft/simulation" + sdknfttypes "github.com/cosmos/cosmos-sdk/x/nft" + sdknftsim "github.com/cosmos/cosmos-sdk/x/nft/simulation" "github.com/irisnet/irismod/modules/nft/client/cli" "github.com/irisnet/irismod/modules/nft/keeper" @@ -65,6 +66,7 @@ func (AppModuleBasic) ValidateGenesis( // RegisterGRPCGatewayRoutes registers the gRPC Gateway routes for the NFT module. func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *runtime.ServeMux) { _ = types.RegisterQueryHandlerClient(context.Background(), mux, types.NewQueryClient(clientCtx)) + _ = sdknfttypes.RegisterQueryHandlerClient(context.Background(), mux, sdknfttypes.NewQueryClient(clientCtx)) } // GetTxCmd returns the root tx command for the NFT module. @@ -115,6 +117,7 @@ func (AppModule) Name() string { return types.ModuleName } func (am AppModule) RegisterServices(cfg module.Configurator) { types.RegisterMsgServer(cfg.MsgServer(), am.keeper) types.RegisterQueryServer(cfg.QueryServer(), am.keeper) + sdknfttypes.RegisterQueryServer(cfg.QueryServer(), am.keeper.NFTkeeper()) m := keeper.NewMigrator(am.keeper) if err := cfg.RegisterMigration(types.ModuleName, 1, m.Migrate1to2); err != nil { @@ -162,7 +165,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { // RegisterStoreDecoder registers a decoder for NFT module's types func (am AppModule) RegisterStoreDecoder(sdr sdk.StoreDecoderRegistry) { - sdr[types.StoreKey] = sdkbftsim.NewDecodeStore(am.cdc) + sdr[types.StoreKey] = sdknftsim.NewDecodeStore(am.cdc) } // WeightedOperations returns the all the NFT module operations with their respective weights. From a386893c4425d9db1de99e954fbd72befbbb4715 Mon Sep 17 00:00:00 2001 From: yuandu Date: Fri, 15 Sep 2023 18:46:10 +0800 Subject: [PATCH 2/9] fix: allow query for ibc class by rest api --- api/irismod/nft/query.pulsar.go | 69 +++++++++++----------- modules/nft/types/query.pb.go | 98 ++++++++++++++++---------------- modules/nft/types/query.pb.gw.go | 4 +- proto/irismod/nft/query.proto | 4 +- 4 files changed, 88 insertions(+), 87 deletions(-) diff --git a/api/irismod/nft/query.pulsar.go b/api/irismod/nft/query.pulsar.go index 7b7d24a5..4ae388e2 100644 --- a/api/irismod/nft/query.pulsar.go +++ b/api/irismod/nft/query.pulsar.go @@ -6387,7 +6387,7 @@ var file_irismod_nft_query_proto_rawDesc = []byte{ 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x03, 0x6e, 0x66, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x4e, 0x46, 0x54, 0x42, 0x07, 0xe2, 0xde, 0x1f, 0x03, 0x4e, 0x46, 0x54, 0x52, 0x03, - 0x6e, 0x66, 0x74, 0x32, 0xd7, 0x05, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x7f, 0x0a, + 0x6e, 0x66, 0x74, 0x32, 0xdd, 0x05, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x7f, 0x0a, 0x06, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x1f, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, @@ -6403,46 +6403,47 @@ var file_irismod_nft_query_proto_rawDesc = []byte{ 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, 0x73, 0x4f, 0x66, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x12, 0x11, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, - 0x2f, 0x6e, 0x66, 0x74, 0x73, 0x12, 0x84, 0x01, 0x0a, 0x0a, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, + 0x2f, 0x6e, 0x66, 0x74, 0x73, 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x2b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x25, 0x12, 0x23, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, + 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x12, 0x26, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x70, 0x0a, 0x05, - 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1e, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, - 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, - 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x52, 0x65, - 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x26, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x20, 0x12, 0x1e, - 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x64, 0x65, 0x6e, - 0x6f, 0x6d, 0x73, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x7d, 0x12, 0x68, - 0x0a, 0x06, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x1f, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, + 0x73, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x3d, 0x2a, 0x2a, 0x7d, 0x12, + 0x73, 0x0a, 0x05, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1e, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, - 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x69, 0x72, 0x69, 0x73, - 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, - 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, - 0x74, 0x2f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x73, 0x0a, 0x03, 0x4e, 0x46, 0x54, 0x12, - 0x1c, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, - 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x4e, 0x46, 0x54, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, - 0x66, 0x74, 0x2f, 0x6e, 0x66, 0x74, 0x73, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, - 0x64, 0x7d, 0x2f, 0x7b, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x69, 0x64, 0x7d, 0x42, 0x96, 0x01, - 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, - 0x74, 0x42, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, - 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69, 0x72, 0x69, 0x73, - 0x6e, 0x65, 0x74, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, - 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0xa2, 0x02, 0x03, 0x49, 0x4e, - 0x58, 0xaa, 0x02, 0x0b, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x4e, 0x66, 0x74, 0xca, - 0x02, 0x0b, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x4e, 0x66, 0x74, 0xe2, 0x02, 0x17, - 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x4e, 0x66, 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, - 0x64, 0x3a, 0x3a, 0x4e, 0x66, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, + 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, + 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x23, 0x12, 0x21, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, + 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, + 0x3d, 0x2a, 0x2a, 0x7d, 0x12, 0x68, 0x0a, 0x06, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x1f, + 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, + 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x20, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, + 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x69, 0x72, 0x69, 0x73, + 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x73, + 0x0a, 0x03, 0x4e, 0x46, 0x54, 0x12, 0x1c, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, + 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, + 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x69, 0x72, 0x69, + 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x6e, 0x66, 0x74, 0x73, 0x2f, 0x7b, 0x64, + 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x7b, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, + 0x69, 0x64, 0x7d, 0x42, 0x96, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x69, 0x72, 0x69, 0x73, + 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x42, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, + 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6e, 0x65, 0x74, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, + 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, + 0x74, 0xa2, 0x02, 0x03, 0x49, 0x4e, 0x58, 0xaa, 0x02, 0x0b, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, + 0x64, 0x2e, 0x4e, 0x66, 0x74, 0xca, 0x02, 0x0b, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, + 0x4e, 0x66, 0x74, 0xe2, 0x02, 0x17, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x4e, 0x66, + 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, + 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x3a, 0x3a, 0x4e, 0x66, 0x74, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/modules/nft/types/query.pb.go b/modules/nft/types/query.pb.go index 5c0f94f0..fe03f0b4 100644 --- a/modules/nft/types/query.pb.go +++ b/modules/nft/types/query.pb.go @@ -659,56 +659,56 @@ func init() { func init() { proto.RegisterFile("irismod/nft/query.proto", fileDescriptor_cb492a2e23c2c143) } var fileDescriptor_cb492a2e23c2c143 = []byte{ - // 774 bytes of a gzipped FileDescriptorProto + // 779 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x4f, 0x13, 0x4f, - 0x18, 0xee, 0xb4, 0xb4, 0xf0, 0x1b, 0x7e, 0x09, 0x30, 0xe5, 0x4f, 0xad, 0xb8, 0x6d, 0x96, 0xbf, - 0x22, 0xee, 0x08, 0x1e, 0x4c, 0x3c, 0x78, 0x28, 0xa6, 0x86, 0x0b, 0x68, 0xe5, 0x44, 0x4c, 0xcc, - 0xb6, 0x9d, 0x96, 0xc6, 0x76, 0x66, 0xe9, 0x4c, 0x35, 0x0d, 0x21, 0x26, 0xc6, 0xab, 0x09, 0x89, - 0x47, 0x3f, 0x89, 0xdf, 0x80, 0x23, 0x89, 0x07, 0x3d, 0x35, 0xa6, 0xf8, 0x09, 0xf8, 0x04, 0x66, - 0x67, 0x66, 0xe9, 0x2e, 0xdb, 0x82, 0x69, 0xb8, 0xed, 0xce, 0x3c, 0xf3, 0x3c, 0xcf, 0x3e, 0xef, - 0xbc, 0x6f, 0x0b, 0xe7, 0x6a, 0xcd, 0x1a, 0x6f, 0xb0, 0x32, 0xa6, 0x15, 0x81, 0x0f, 0x5b, 0xa4, - 0xd9, 0xb6, 0x9c, 0x26, 0x13, 0x0c, 0x8d, 0xeb, 0x0d, 0x8b, 0x56, 0x44, 0x7a, 0xba, 0xca, 0xaa, - 0x4c, 0xae, 0x63, 0xf7, 0x49, 0x41, 0xd2, 0xf3, 0x55, 0xc6, 0xaa, 0x75, 0x82, 0x6d, 0xa7, 0x86, - 0x6d, 0x4a, 0x99, 0xb0, 0x45, 0x8d, 0x51, 0xae, 0x77, 0x67, 0xfc, 0xcc, 0xb4, 0x22, 0xf4, 0xf2, - 0x5a, 0x89, 0xf1, 0x06, 0xe3, 0xb8, 0x68, 0x73, 0xa2, 0x04, 0xf1, 0xfb, 0x8d, 0x22, 0x11, 0xf6, - 0x06, 0x76, 0xec, 0x6a, 0x8d, 0x4a, 0x0e, 0x85, 0x35, 0xf7, 0x21, 0x7a, 0xe5, 0x22, 0x5e, 0xb7, - 0x1c, 0xa7, 0xde, 0x2e, 0x90, 0xc3, 0x16, 0xe1, 0x02, 0x59, 0x70, 0xac, 0x4c, 0x28, 0x6b, 0xbc, - 0xad, 0x95, 0x53, 0x20, 0x0b, 0x56, 0xff, 0xcb, 0x25, 0x2f, 0x3a, 0x99, 0x89, 0xb6, 0xdd, 0xa8, - 0x3f, 0x35, 0xbd, 0x1d, 0xb3, 0x30, 0x2a, 0x1f, 0xb7, 0xcb, 0x68, 0x1a, 0xc6, 0xd9, 0x07, 0x4a, - 0x9a, 0xa9, 0xa8, 0x0b, 0x2e, 0xa8, 0x17, 0xf3, 0x21, 0x4c, 0x06, 0xb8, 0xb9, 0xc3, 0x28, 0x27, - 0x68, 0x16, 0x26, 0xec, 0x06, 0x6b, 0x51, 0x21, 0xa9, 0x47, 0x0a, 0xfa, 0xcd, 0xfc, 0x0e, 0xe0, - 0x9c, 0xc4, 0xef, 0xe4, 0xf7, 0xf8, 0x6e, 0x65, 0xd7, 0xe5, 0x18, 0xd6, 0xd0, 0x72, 0xc0, 0x50, - 0x6e, 0xf2, 0xa2, 0x93, 0xf9, 0x5f, 0x81, 0x95, 0x35, 0x6d, 0x11, 0xe5, 0x21, 0xec, 0x45, 0x92, - 0x8a, 0x65, 0xc1, 0xea, 0xf8, 0xe6, 0xb2, 0xa5, 0xf2, 0xb3, 0xdc, 0xfc, 0x2c, 0x55, 0x30, 0x9d, - 0x9f, 0xf5, 0xd2, 0xae, 0x12, 0xed, 0xa9, 0xe0, 0x3b, 0x69, 0x7e, 0x01, 0x30, 0x15, 0xf6, 0xae, - 0x3f, 0x78, 0xd5, 0x33, 0x03, 0x24, 0x3f, 0xb2, 0x7c, 0x75, 0xb7, 0x14, 0x54, 0xdb, 0x79, 0x11, - 0xb0, 0x13, 0x95, 0xf0, 0x95, 0x1b, 0xed, 0x28, 0x99, 0x80, 0x9f, 0x13, 0x00, 0x67, 0xa5, 0x9f, - 0x2d, 0x56, 0xaf, 0x93, 0x92, 0xbb, 0x36, 0x6c, 0x94, 0xf9, 0x3e, 0x9e, 0x86, 0x89, 0xe8, 0x9b, - 0x57, 0x5e, 0xbf, 0x25, 0x9d, 0xd0, 0x13, 0x08, 0x4b, 0x97, 0xab, 0x3a, 0xa6, 0xb9, 0x40, 0x4c, - 0xbe, 0x43, 0x3e, 0xe8, 0xed, 0x05, 0xb6, 0x05, 0xa7, 0xa4, 0xb9, 0xe7, 0xee, 0x57, 0x0f, 0x19, - 0x95, 0xf9, 0x4c, 0x37, 0x93, 0x26, 0xe9, 0x95, 0x5f, 0x02, 0xfa, 0x96, 0x5f, 0x41, 0x15, 0xc0, - 0x7c, 0xe3, 0x3f, 0xcf, 0x3d, 0x17, 0xc1, 0x02, 0x80, 0xa1, 0x0b, 0x70, 0x02, 0x74, 0x3f, 0x7a, - 0xf4, 0xda, 0xdf, 0x23, 0x98, 0x90, 0xf2, 0x3c, 0x05, 0xb2, 0xb1, 0xfe, 0x06, 0x73, 0x23, 0xa7, - 0x9d, 0x4c, 0xa4, 0xa0, 0x71, 0xb7, 0x97, 0xfa, 0x21, 0x9c, 0xf0, 0xba, 0x66, 0xd8, 0xeb, 0x69, - 0xc1, 0x31, 0xc1, 0xde, 0x11, 0xea, 0xe2, 0xa3, 0x57, 0xf1, 0xde, 0x8e, 0x59, 0x18, 0x95, 0x8f, - 0xdb, 0x65, 0x73, 0x0b, 0x4e, 0xf6, 0x24, 0x75, 0x02, 0x18, 0xc6, 0x68, 0x45, 0xe8, 0x68, 0xa7, - 0x03, 0x9f, 0x9f, 0xb3, 0x39, 0xd9, 0xc9, 0xef, 0xe5, 0x46, 0xbb, 0x9d, 0x4c, 0xcc, 0x3d, 0xe3, - 0x22, 0x37, 0x7f, 0xc6, 0x61, 0x5c, 0xb2, 0xa0, 0x8f, 0x30, 0xa1, 0xc6, 0x1b, 0xca, 0x04, 0xce, - 0x85, 0x87, 0x6a, 0x3a, 0x3b, 0x18, 0xa0, 0x7c, 0x98, 0x9b, 0x9f, 0x7e, 0xfc, 0xf9, 0x1a, 0x5d, - 0x47, 0x6b, 0xd8, 0x3f, 0xd8, 0x7b, 0xd7, 0x9d, 0xe3, 0x23, 0x2f, 0x81, 0x63, 0xcc, 0x95, 0x6c, - 0x0b, 0x8e, 0xfb, 0x66, 0x0e, 0x5a, 0x0c, 0x8b, 0x84, 0xc7, 0x69, 0x7a, 0xe9, 0x06, 0x94, 0xf6, - 0x73, 0x47, 0xfa, 0x49, 0xa2, 0x29, 0x7c, 0xe5, 0x87, 0x86, 0xa3, 0xcf, 0x00, 0xc2, 0x5e, 0x4f, - 0xa2, 0x85, 0x30, 0x61, 0x68, 0xf2, 0xa4, 0x17, 0xaf, 0x07, 0x69, 0xd1, 0x07, 0x52, 0x74, 0x09, - 0x2d, 0xfc, 0x43, 0x08, 0xc8, 0x81, 0x71, 0x79, 0x41, 0x91, 0x11, 0xe6, 0xf6, 0xb7, 0x72, 0x3a, - 0x33, 0x70, 0x5f, 0xcb, 0x2e, 0x4b, 0xd9, 0x2c, 0x32, 0x02, 0xb2, 0xea, 0xc2, 0xfb, 0x15, 0x0f, - 0x60, 0x42, 0xf5, 0x0f, 0x1a, 0x44, 0xc9, 0xaf, 0x29, 0x78, 0xb0, 0xf5, 0xcc, 0xbb, 0x52, 0x74, - 0x06, 0x25, 0xfb, 0x88, 0x22, 0x0e, 0xdd, 0x0b, 0x87, 0xe6, 0xfb, 0xd6, 0xca, 0xd3, 0xb8, 0x37, - 0x60, 0x57, 0x0b, 0x60, 0x29, 0x70, 0x1f, 0xad, 0x84, 0x2a, 0xe8, 0xbf, 0x4a, 0x47, 0x5e, 0x9f, - 0x1c, 0xe7, 0xf2, 0xa7, 0x5d, 0x03, 0x9c, 0x75, 0x0d, 0xf0, 0xbb, 0x6b, 0x80, 0x93, 0x73, 0x23, - 0x72, 0x76, 0x6e, 0x44, 0x7e, 0x9d, 0x1b, 0x91, 0xfd, 0xf5, 0x6a, 0x4d, 0x1c, 0xb4, 0x8a, 0x56, - 0x89, 0x35, 0x24, 0x19, 0x25, 0xe2, 0x92, 0xb4, 0xc1, 0xca, 0xad, 0x3a, 0xe1, 0x92, 0x5c, 0xb4, - 0x1d, 0xc2, 0x8b, 0x09, 0xf9, 0xf7, 0xe2, 0xf1, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x2a, 0x0e, - 0xa1, 0xc1, 0xfd, 0x08, 0x00, 0x00, + 0x18, 0xee, 0xb4, 0xb4, 0xf0, 0x1b, 0x7e, 0x09, 0x30, 0xe5, 0x4f, 0xad, 0xd8, 0xd6, 0x05, 0xa1, + 0x34, 0xb8, 0x23, 0x78, 0x30, 0x31, 0xd1, 0x43, 0x31, 0x35, 0x5c, 0x40, 0x2b, 0x27, 0x62, 0x62, + 0xb6, 0xed, 0xb4, 0x34, 0xb6, 0x33, 0xa5, 0x33, 0xab, 0x69, 0x08, 0x31, 0xf1, 0xe2, 0xc9, 0x84, + 0xc4, 0xa3, 0x9f, 0xc4, 0x6f, 0xc0, 0x91, 0xc4, 0x8b, 0x17, 0x1b, 0x53, 0xfc, 0x04, 0x7c, 0x02, + 0xb3, 0x33, 0xb3, 0x74, 0x97, 0x6d, 0x21, 0x69, 0xb8, 0xed, 0xce, 0x3c, 0xf3, 0x3c, 0xcf, 0x3e, + 0xef, 0xbc, 0x6f, 0x0b, 0x17, 0xea, 0xed, 0x3a, 0x6f, 0xb2, 0x0a, 0xa6, 0x55, 0x81, 0x0f, 0x6d, + 0xd2, 0xee, 0x98, 0xad, 0x36, 0x13, 0x0c, 0x4d, 0xea, 0x0d, 0x93, 0x56, 0x45, 0x72, 0xb6, 0xc6, + 0x6a, 0x4c, 0xae, 0x63, 0xe7, 0x49, 0x41, 0x92, 0x8b, 0x35, 0xc6, 0x6a, 0x0d, 0x82, 0xad, 0x56, + 0x1d, 0x5b, 0x94, 0x32, 0x61, 0x89, 0x3a, 0xa3, 0x5c, 0xef, 0xce, 0x79, 0x99, 0x69, 0x55, 0xe8, + 0xe5, 0x5c, 0x99, 0xf1, 0x26, 0xe3, 0xb8, 0x64, 0x71, 0xa2, 0x04, 0xf1, 0x87, 0x8d, 0x12, 0x11, + 0xd6, 0x06, 0x6e, 0x59, 0xb5, 0x3a, 0x95, 0x1c, 0x0a, 0x6b, 0xec, 0x43, 0xf4, 0xda, 0x41, 0xbc, + 0xb1, 0x5b, 0xad, 0x46, 0xa7, 0x48, 0x0e, 0x6d, 0xc2, 0x05, 0x32, 0xe1, 0x44, 0x85, 0x50, 0xd6, + 0x7c, 0x57, 0xaf, 0x24, 0x40, 0x06, 0x64, 0xff, 0xcb, 0xc7, 0x2f, 0xba, 0xe9, 0xa9, 0x8e, 0xd5, + 0x6c, 0x3c, 0x35, 0xdc, 0x1d, 0xa3, 0x38, 0x2e, 0x1f, 0xb7, 0x2b, 0x68, 0x16, 0x46, 0xd9, 0x47, + 0x4a, 0xda, 0x89, 0xb0, 0x03, 0x2e, 0xaa, 0x17, 0xe3, 0x21, 0x8c, 0xfb, 0xb8, 0x79, 0x8b, 0x51, + 0x4e, 0xd0, 0x3c, 0x8c, 0x59, 0x4d, 0x66, 0x53, 0x21, 0xa9, 0xc7, 0x8a, 0xfa, 0xcd, 0xf8, 0x01, + 0xe0, 0x82, 0xc4, 0xef, 0x14, 0xf6, 0xf8, 0x6e, 0x75, 0xd7, 0xe1, 0x18, 0xd5, 0xd0, 0x8a, 0xcf, + 0x50, 0x7e, 0xfa, 0xa2, 0x9b, 0xfe, 0x5f, 0x81, 0x95, 0x35, 0x6d, 0x11, 0x15, 0x20, 0xec, 0x47, + 0x92, 0x88, 0x64, 0x40, 0x76, 0x72, 0x73, 0xc5, 0x54, 0xf9, 0x99, 0x4e, 0x7e, 0xa6, 0x2a, 0x98, + 0xce, 0xcf, 0x7c, 0x65, 0xd5, 0x88, 0xf6, 0x54, 0xf4, 0x9c, 0x34, 0xbe, 0x02, 0x98, 0x08, 0x7a, + 0xd7, 0x1f, 0x9c, 0x75, 0xcd, 0x00, 0xc9, 0x8f, 0x4c, 0x4f, 0xdd, 0x4d, 0x05, 0xd5, 0x76, 0x5e, + 0xfa, 0xec, 0x84, 0x25, 0x7c, 0xf5, 0x46, 0x3b, 0x4a, 0xc6, 0xe7, 0xe7, 0x04, 0xc0, 0x79, 0xe9, + 0x67, 0x8b, 0x35, 0x1a, 0xa4, 0xec, 0xac, 0x8d, 0x1a, 0x65, 0x61, 0x80, 0xa7, 0x51, 0x22, 0xfa, + 0xee, 0x96, 0xd7, 0x6b, 0x49, 0x27, 0xf4, 0x04, 0xc2, 0xf2, 0xe5, 0xaa, 0x8e, 0x69, 0xc1, 0x17, + 0x93, 0xe7, 0x90, 0x07, 0x7a, 0x7b, 0x81, 0x6d, 0xc1, 0x19, 0x69, 0xee, 0x85, 0xf3, 0xd5, 0x23, + 0x46, 0x65, 0x3c, 0xd7, 0xcd, 0xa4, 0x49, 0xfa, 0xe5, 0x97, 0x80, 0x81, 0xe5, 0x57, 0x50, 0x05, + 0x30, 0xde, 0x7a, 0xcf, 0x73, 0xd7, 0x85, 0xbf, 0x00, 0x60, 0xe4, 0x02, 0x9c, 0x00, 0xdd, 0x8f, + 0x2e, 0xbd, 0xf6, 0xf7, 0x08, 0xc6, 0xa4, 0x3c, 0x4f, 0x80, 0x4c, 0x64, 0xb0, 0xc1, 0xfc, 0xd8, + 0x69, 0x37, 0x1d, 0x2a, 0x6a, 0xdc, 0xed, 0xa5, 0x7e, 0x08, 0xa7, 0xdc, 0xae, 0x19, 0xf5, 0x7a, + 0x9a, 0x70, 0x42, 0xb0, 0xf7, 0x84, 0x3a, 0xf8, 0xf0, 0x55, 0xbc, 0xbb, 0x63, 0x14, 0xc7, 0xe5, + 0xe3, 0x76, 0xc5, 0xd8, 0x82, 0xd3, 0x7d, 0x49, 0x9d, 0x00, 0x86, 0x11, 0x5a, 0x15, 0x3a, 0xda, + 0x59, 0xdf, 0xe7, 0xe7, 0x2d, 0x4e, 0x76, 0x0a, 0x7b, 0xf9, 0xf1, 0x5e, 0x37, 0x1d, 0x71, 0xce, + 0x38, 0xc8, 0xcd, 0xdf, 0x51, 0x18, 0x95, 0x2c, 0xe8, 0x13, 0x8c, 0xa9, 0xf1, 0x86, 0xd2, 0xbe, + 0x73, 0xc1, 0xa1, 0x9a, 0xcc, 0x0c, 0x07, 0x28, 0x1f, 0xc6, 0xe6, 0xe7, 0x9f, 0x7f, 0xbf, 0x85, + 0xd7, 0x51, 0x0e, 0x7b, 0x07, 0x7b, 0xff, 0xba, 0x73, 0x7c, 0xe4, 0x26, 0x70, 0x8c, 0xb9, 0x92, + 0xb5, 0xe1, 0xa4, 0x67, 0xe6, 0xa0, 0xe5, 0xa0, 0x48, 0x70, 0x9c, 0x26, 0x1f, 0xdc, 0x80, 0xd2, + 0x7e, 0xee, 0x48, 0x3f, 0x71, 0x34, 0x83, 0xaf, 0xfc, 0xd0, 0x70, 0xf4, 0x05, 0x40, 0xd8, 0xef, + 0x49, 0xb4, 0x14, 0x24, 0x0c, 0x4c, 0x9e, 0xe4, 0xf2, 0xf5, 0x20, 0x2d, 0x6a, 0x4a, 0xd1, 0x2c, + 0x5a, 0xb9, 0x39, 0x84, 0x67, 0xb9, 0xdc, 0x31, 0xe2, 0x30, 0x2a, 0xef, 0x28, 0x4a, 0x05, 0xe9, + 0xbd, 0xdd, 0x9c, 0x4c, 0x0f, 0xdd, 0xd7, 0xca, 0x6b, 0x52, 0x79, 0x09, 0xdd, 0xf7, 0x29, 0xab, + 0x3b, 0x7f, 0x45, 0xf4, 0x00, 0xc6, 0x54, 0x17, 0xa1, 0x61, 0xac, 0xfc, 0x9a, 0xb2, 0xfb, 0x1b, + 0xd0, 0xb8, 0x2b, 0x75, 0xe7, 0x50, 0x7c, 0x80, 0x2e, 0xe2, 0xd0, 0xb9, 0x76, 0x68, 0x71, 0x60, + 0xc5, 0x5c, 0x8d, 0x7b, 0x43, 0x76, 0xb5, 0x00, 0x96, 0x02, 0x6b, 0x68, 0x35, 0x50, 0x47, 0xef, + 0x85, 0x3a, 0x72, 0xbb, 0xe5, 0x38, 0x5f, 0x38, 0xed, 0xa5, 0xc0, 0x59, 0x2f, 0x05, 0xfe, 0xf4, + 0x52, 0xe0, 0xe4, 0x3c, 0x15, 0x3a, 0x3b, 0x4f, 0x85, 0x7e, 0x9d, 0xa7, 0x42, 0xfb, 0xeb, 0xb5, + 0xba, 0x38, 0xb0, 0x4b, 0x66, 0x99, 0x35, 0x25, 0x19, 0x25, 0xe2, 0x92, 0xb4, 0xc9, 0x2a, 0x76, + 0x83, 0x70, 0x49, 0x2e, 0x3a, 0x2d, 0xc2, 0x4b, 0x31, 0xf9, 0x27, 0xe3, 0xf1, 0xbf, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x47, 0x7d, 0x6b, 0x67, 0x03, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/modules/nft/types/query.pb.gw.go b/modules/nft/types/query.pb.gw.go index 77f5028f..0fe0d255 100644 --- a/modules/nft/types/query.pb.gw.go +++ b/modules/nft/types/query.pb.gw.go @@ -692,9 +692,9 @@ var ( pattern_Query_NFTsOfOwner_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"irismod", "nft", "nfts"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Collection_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"irismod", "nft", "collections", "denom_id"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Collection_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 3, 0, 4, 1, 5, 3}, []string{"irismod", "nft", "collections", "denom_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Denom_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3}, []string{"irismod", "nft", "denoms", "denom_id"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Denom_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 3, 0, 4, 1, 5, 3}, []string{"irismod", "nft", "denoms", "denom_id"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_Denoms_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"irismod", "nft", "denoms"}, "", runtime.AssumeColonVerbOpt(false))) diff --git a/proto/irismod/nft/query.proto b/proto/irismod/nft/query.proto index c7885444..cc1af4fa 100644 --- a/proto/irismod/nft/query.proto +++ b/proto/irismod/nft/query.proto @@ -22,12 +22,12 @@ service Query { // Collection queries the NFTs of the specified denom rpc Collection(QueryCollectionRequest) returns (QueryCollectionResponse) { - option (google.api.http).get = "/irismod/nft/collections/{denom_id}"; + option (google.api.http).get = "/irismod/nft/collections/{denom_id=**}"; } // Denom queries the definition of a given denom rpc Denom(QueryDenomRequest) returns (QueryDenomResponse) { - option (google.api.http).get = "/irismod/nft/denoms/{denom_id}"; + option (google.api.http).get = "/irismod/nft/denoms/{denom_id=**}"; } // Denoms queries all the denoms From 758eede499a1584ac7e8fb409c0a76d83a84e4ff Mon Sep 17 00:00:00 2001 From: yuandu Date: Mon, 18 Sep 2023 10:56:22 +0800 Subject: [PATCH 3/9] fix: denoms and denom api conflict --- api/irismod/nft/query.pulsar.go | 116 +++++++++++------------ api/irismod/nft/query_grpc.pb.go | 56 +++++------ modules/nft/types/query.pb.go | 154 +++++++++++++++---------------- modules/nft/types/query.pb.gw.go | 108 +++++++++++----------- proto/irismod/nft/query.proto | 14 +-- 5 files changed, 224 insertions(+), 224 deletions(-) diff --git a/api/irismod/nft/query.pulsar.go b/api/irismod/nft/query.pulsar.go index 4ae388e2..fc44e739 100644 --- a/api/irismod/nft/query.pulsar.go +++ b/api/irismod/nft/query.pulsar.go @@ -6387,63 +6387,63 @@ var file_irismod_nft_query_proto_rawDesc = []byte{ 0x73, 0x65, 0x12, 0x2f, 0x0a, 0x03, 0x6e, 0x66, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x42, 0x61, 0x73, 0x65, 0x4e, 0x46, 0x54, 0x42, 0x07, 0xe2, 0xde, 0x1f, 0x03, 0x4e, 0x46, 0x54, 0x52, 0x03, - 0x6e, 0x66, 0x74, 0x32, 0xdd, 0x05, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x7f, 0x0a, - 0x06, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x1f, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, - 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x75, 0x70, 0x70, 0x6c, - 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, + 0x6e, 0x66, 0x74, 0x32, 0xe4, 0x05, 0x0a, 0x05, 0x51, 0x75, 0x65, 0x72, 0x79, 0x12, 0x82, 0x01, + 0x0a, 0x06, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x1f, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x75, 0x70, 0x70, - 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x2c, 0x12, 0x2a, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, - 0x2f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x7b, 0x64, 0x65, - 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x73, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x75, - 0x0a, 0x0b, 0x4e, 0x46, 0x54, 0x73, 0x4f, 0x66, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x12, 0x24, 0x2e, + 0x6c, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x69, 0x72, 0x69, 0x73, + 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x53, 0x75, 0x70, + 0x70, 0x6c, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x35, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x2f, 0x12, 0x2d, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, + 0x74, 0x2f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x7b, 0x64, + 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x3d, 0x2a, 0x2a, 0x7d, 0x2f, 0x73, 0x75, 0x70, 0x70, + 0x6c, 0x79, 0x12, 0x75, 0x0a, 0x0b, 0x4e, 0x46, 0x54, 0x73, 0x4f, 0x66, 0x4f, 0x77, 0x6e, 0x65, + 0x72, 0x12, 0x24, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, + 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, 0x73, 0x4f, 0x66, 0x4f, 0x77, 0x6e, 0x65, 0x72, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, + 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, 0x73, 0x4f, + 0x66, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x19, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x12, 0x11, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, + 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x6e, 0x66, 0x74, 0x73, 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x43, 0x6f, + 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, + 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x6c, 0x6c, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, - 0x79, 0x4e, 0x46, 0x54, 0x73, 0x4f, 0x66, 0x4f, 0x77, 0x6e, 0x65, 0x72, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, - 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, 0x73, 0x4f, 0x66, 0x4f, 0x77, 0x6e, - 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x13, 0x12, 0x11, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, - 0x2f, 0x6e, 0x66, 0x74, 0x73, 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x23, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, - 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x24, 0x2e, 0x69, 0x72, 0x69, 0x73, - 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x43, 0x6f, 0x6c, - 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, - 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x12, 0x26, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, - 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x73, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x3d, 0x2a, 0x2a, 0x7d, 0x12, - 0x73, 0x0a, 0x05, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1e, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, - 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, - 0x6d, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, - 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, - 0x6d, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x23, 0x12, 0x21, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, - 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, - 0x3d, 0x2a, 0x2a, 0x7d, 0x12, 0x68, 0x0a, 0x06, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x1f, + 0x79, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x22, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x28, 0x12, 0x26, 0x2f, 0x69, 0x72, + 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x3d, + 0x2a, 0x2a, 0x7d, 0x12, 0x68, 0x0a, 0x06, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x1f, 0x2e, + 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, + 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, - 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, - 0x20, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, - 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, - 0x65, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x69, 0x72, 0x69, 0x73, - 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x73, - 0x0a, 0x03, 0x4e, 0x46, 0x54, 0x12, 0x1c, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, - 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, 0x52, 0x65, 0x71, 0x75, - 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, - 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x69, 0x72, 0x69, - 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x6e, 0x66, 0x74, 0x73, 0x2f, 0x7b, 0x64, - 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x7d, 0x2f, 0x7b, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, - 0x69, 0x64, 0x7d, 0x42, 0x96, 0x01, 0x0a, 0x0f, 0x63, 0x6f, 0x6d, 0x2e, 0x69, 0x72, 0x69, 0x73, - 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x42, 0x0a, 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6e, 0x65, 0x74, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, - 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, - 0x74, 0xa2, 0x02, 0x03, 0x49, 0x4e, 0x58, 0xaa, 0x02, 0x0b, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, - 0x64, 0x2e, 0x4e, 0x66, 0x74, 0xca, 0x02, 0x0b, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, - 0x4e, 0x66, 0x74, 0xe2, 0x02, 0x17, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x4e, 0x66, - 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, - 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x3a, 0x3a, 0x4e, 0x66, 0x74, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, + 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, + 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x73, 0x12, 0x73, 0x0a, + 0x05, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x1e, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, + 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1f, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, + 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x44, 0x65, 0x6e, 0x6f, 0x6d, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x29, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x23, 0x12, + 0x21, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x64, 0x65, + 0x6e, 0x6f, 0x6d, 0x73, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x3d, 0x2a, + 0x2a, 0x7d, 0x12, 0x76, 0x0a, 0x03, 0x4e, 0x46, 0x54, 0x12, 0x1c, 0x2e, 0x69, 0x72, 0x69, 0x73, + 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x1d, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, + 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4e, 0x46, 0x54, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x32, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x2c, 0x12, 0x2a, + 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0x2f, 0x6e, 0x66, 0x74, + 0x73, 0x2f, 0x7b, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x5f, 0x69, 0x64, 0x3d, 0x2a, 0x2a, 0x7d, 0x2f, + 0x7b, 0x74, 0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x69, 0x64, 0x7d, 0x42, 0x96, 0x01, 0x0a, 0x0f, 0x63, + 0x6f, 0x6d, 0x2e, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x6e, 0x66, 0x74, 0x42, 0x0a, + 0x51, 0x75, 0x65, 0x72, 0x79, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x2a, 0x67, 0x69, + 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6e, 0x65, 0x74, + 0x2f, 0x69, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x69, 0x72, 0x69, + 0x73, 0x6d, 0x6f, 0x64, 0x2f, 0x6e, 0x66, 0x74, 0xa2, 0x02, 0x03, 0x49, 0x4e, 0x58, 0xaa, 0x02, + 0x0b, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x2e, 0x4e, 0x66, 0x74, 0xca, 0x02, 0x0b, 0x49, + 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x4e, 0x66, 0x74, 0xe2, 0x02, 0x17, 0x49, 0x72, 0x69, + 0x73, 0x6d, 0x6f, 0x64, 0x5c, 0x4e, 0x66, 0x74, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0c, 0x49, 0x72, 0x69, 0x73, 0x6d, 0x6f, 0x64, 0x3a, 0x3a, + 0x4e, 0x66, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -6494,14 +6494,14 @@ var file_irismod_nft_query_proto_depIdxs = []int32{ 0, // 11: irismod.nft.Query.Supply:input_type -> irismod.nft.QuerySupplyRequest 2, // 12: irismod.nft.Query.NFTsOfOwner:input_type -> irismod.nft.QueryNFTsOfOwnerRequest 4, // 13: irismod.nft.Query.Collection:input_type -> irismod.nft.QueryCollectionRequest - 6, // 14: irismod.nft.Query.Denom:input_type -> irismod.nft.QueryDenomRequest - 8, // 15: irismod.nft.Query.Denoms:input_type -> irismod.nft.QueryDenomsRequest + 8, // 14: irismod.nft.Query.Denoms:input_type -> irismod.nft.QueryDenomsRequest + 6, // 15: irismod.nft.Query.Denom:input_type -> irismod.nft.QueryDenomRequest 10, // 16: irismod.nft.Query.NFT:input_type -> irismod.nft.QueryNFTRequest 1, // 17: irismod.nft.Query.Supply:output_type -> irismod.nft.QuerySupplyResponse 3, // 18: irismod.nft.Query.NFTsOfOwner:output_type -> irismod.nft.QueryNFTsOfOwnerResponse 5, // 19: irismod.nft.Query.Collection:output_type -> irismod.nft.QueryCollectionResponse - 7, // 20: irismod.nft.Query.Denom:output_type -> irismod.nft.QueryDenomResponse - 9, // 21: irismod.nft.Query.Denoms:output_type -> irismod.nft.QueryDenomsResponse + 9, // 20: irismod.nft.Query.Denoms:output_type -> irismod.nft.QueryDenomsResponse + 7, // 21: irismod.nft.Query.Denom:output_type -> irismod.nft.QueryDenomResponse 11, // 22: irismod.nft.Query.NFT:output_type -> irismod.nft.QueryNFTResponse 17, // [17:23] is the sub-list for method output_type 11, // [11:17] is the sub-list for method input_type diff --git a/api/irismod/nft/query_grpc.pb.go b/api/irismod/nft/query_grpc.pb.go index b961186e..59e0da59 100644 --- a/api/irismod/nft/query_grpc.pb.go +++ b/api/irismod/nft/query_grpc.pb.go @@ -22,8 +22,8 @@ const ( Query_Supply_FullMethodName = "/irismod.nft.Query/Supply" Query_NFTsOfOwner_FullMethodName = "/irismod.nft.Query/NFTsOfOwner" Query_Collection_FullMethodName = "/irismod.nft.Query/Collection" - Query_Denom_FullMethodName = "/irismod.nft.Query/Denom" Query_Denoms_FullMethodName = "/irismod.nft.Query/Denoms" + Query_Denom_FullMethodName = "/irismod.nft.Query/Denom" Query_NFT_FullMethodName = "/irismod.nft.Query/NFT" ) @@ -37,10 +37,10 @@ type QueryClient interface { NFTsOfOwner(ctx context.Context, in *QueryNFTsOfOwnerRequest, opts ...grpc.CallOption) (*QueryNFTsOfOwnerResponse, error) // Collection queries the NFTs of the specified denom Collection(ctx context.Context, in *QueryCollectionRequest, opts ...grpc.CallOption) (*QueryCollectionResponse, error) - // Denom queries the definition of a given denom - Denom(ctx context.Context, in *QueryDenomRequest, opts ...grpc.CallOption) (*QueryDenomResponse, error) // Denoms queries all the denoms Denoms(ctx context.Context, in *QueryDenomsRequest, opts ...grpc.CallOption) (*QueryDenomsResponse, error) + // Denom queries the definition of a given denom + Denom(ctx context.Context, in *QueryDenomRequest, opts ...grpc.CallOption) (*QueryDenomResponse, error) // NFT queries the NFT for the given denom and token ID NFT(ctx context.Context, in *QueryNFTRequest, opts ...grpc.CallOption) (*QueryNFTResponse, error) } @@ -80,18 +80,18 @@ func (c *queryClient) Collection(ctx context.Context, in *QueryCollectionRequest return out, nil } -func (c *queryClient) Denom(ctx context.Context, in *QueryDenomRequest, opts ...grpc.CallOption) (*QueryDenomResponse, error) { - out := new(QueryDenomResponse) - err := c.cc.Invoke(ctx, Query_Denom_FullMethodName, in, out, opts...) +func (c *queryClient) Denoms(ctx context.Context, in *QueryDenomsRequest, opts ...grpc.CallOption) (*QueryDenomsResponse, error) { + out := new(QueryDenomsResponse) + err := c.cc.Invoke(ctx, Query_Denoms_FullMethodName, in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) Denoms(ctx context.Context, in *QueryDenomsRequest, opts ...grpc.CallOption) (*QueryDenomsResponse, error) { - out := new(QueryDenomsResponse) - err := c.cc.Invoke(ctx, Query_Denoms_FullMethodName, in, out, opts...) +func (c *queryClient) Denom(ctx context.Context, in *QueryDenomRequest, opts ...grpc.CallOption) (*QueryDenomResponse, error) { + out := new(QueryDenomResponse) + err := c.cc.Invoke(ctx, Query_Denom_FullMethodName, in, out, opts...) if err != nil { return nil, err } @@ -117,10 +117,10 @@ type QueryServer interface { NFTsOfOwner(context.Context, *QueryNFTsOfOwnerRequest) (*QueryNFTsOfOwnerResponse, error) // Collection queries the NFTs of the specified denom Collection(context.Context, *QueryCollectionRequest) (*QueryCollectionResponse, error) - // Denom queries the definition of a given denom - Denom(context.Context, *QueryDenomRequest) (*QueryDenomResponse, error) // Denoms queries all the denoms Denoms(context.Context, *QueryDenomsRequest) (*QueryDenomsResponse, error) + // Denom queries the definition of a given denom + Denom(context.Context, *QueryDenomRequest) (*QueryDenomResponse, error) // NFT queries the NFT for the given denom and token ID NFT(context.Context, *QueryNFTRequest) (*QueryNFTResponse, error) mustEmbedUnimplementedQueryServer() @@ -139,12 +139,12 @@ func (UnimplementedQueryServer) NFTsOfOwner(context.Context, *QueryNFTsOfOwnerRe func (UnimplementedQueryServer) Collection(context.Context, *QueryCollectionRequest) (*QueryCollectionResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Collection not implemented") } -func (UnimplementedQueryServer) Denom(context.Context, *QueryDenomRequest) (*QueryDenomResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Denom not implemented") -} func (UnimplementedQueryServer) Denoms(context.Context, *QueryDenomsRequest) (*QueryDenomsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Denoms not implemented") } +func (UnimplementedQueryServer) Denom(context.Context, *QueryDenomRequest) (*QueryDenomResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Denom not implemented") +} func (UnimplementedQueryServer) NFT(context.Context, *QueryNFTRequest) (*QueryNFTResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method NFT not implemented") } @@ -215,38 +215,38 @@ func _Query_Collection_Handler(srv interface{}, ctx context.Context, dec func(in return interceptor(ctx, in, info, handler) } -func _Query_Denom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryDenomRequest) +func _Query_Denoms_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryDenomsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Denom(ctx, in) + return srv.(QueryServer).Denoms(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Query_Denom_FullMethodName, + FullMethod: Query_Denoms_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Denom(ctx, req.(*QueryDenomRequest)) + return srv.(QueryServer).Denoms(ctx, req.(*QueryDenomsRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_Denoms_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryDenomsRequest) +func _Query_Denom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryDenomRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Denoms(ctx, in) + return srv.(QueryServer).Denom(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Query_Denoms_FullMethodName, + FullMethod: Query_Denom_FullMethodName, } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Denoms(ctx, req.(*QueryDenomsRequest)) + return srv.(QueryServer).Denom(ctx, req.(*QueryDenomRequest)) } return interceptor(ctx, in, info, handler) } @@ -288,14 +288,14 @@ var Query_ServiceDesc = grpc.ServiceDesc{ MethodName: "Collection", Handler: _Query_Collection_Handler, }, - { - MethodName: "Denom", - Handler: _Query_Denom_Handler, - }, { MethodName: "Denoms", Handler: _Query_Denoms_Handler, }, + { + MethodName: "Denom", + Handler: _Query_Denom_Handler, + }, { MethodName: "NFT", Handler: _Query_NFT_Handler, diff --git a/modules/nft/types/query.pb.go b/modules/nft/types/query.pb.go index fe03f0b4..2816e35c 100644 --- a/modules/nft/types/query.pb.go +++ b/modules/nft/types/query.pb.go @@ -659,56 +659,56 @@ func init() { func init() { proto.RegisterFile("irismod/nft/query.proto", fileDescriptor_cb492a2e23c2c143) } var fileDescriptor_cb492a2e23c2c143 = []byte{ - // 779 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x4f, 0x13, 0x4f, - 0x18, 0xee, 0xb4, 0xb4, 0xf0, 0x1b, 0x7e, 0x09, 0x30, 0xe5, 0x4f, 0xad, 0xd8, 0xd6, 0x05, 0xa1, - 0x34, 0xb8, 0x23, 0x78, 0x30, 0x31, 0xd1, 0x43, 0x31, 0x35, 0x5c, 0x40, 0x2b, 0x27, 0x62, 0x62, - 0xb6, 0xed, 0xb4, 0x34, 0xb6, 0x33, 0xa5, 0x33, 0xab, 0x69, 0x08, 0x31, 0xf1, 0xe2, 0xc9, 0x84, - 0xc4, 0xa3, 0x9f, 0xc4, 0x6f, 0xc0, 0x91, 0xc4, 0x8b, 0x17, 0x1b, 0x53, 0xfc, 0x04, 0x7c, 0x02, - 0xb3, 0x33, 0xb3, 0x74, 0x97, 0x6d, 0x21, 0x69, 0xb8, 0xed, 0xce, 0x3c, 0xf3, 0x3c, 0xcf, 0x3e, - 0xef, 0xbc, 0x6f, 0x0b, 0x17, 0xea, 0xed, 0x3a, 0x6f, 0xb2, 0x0a, 0xa6, 0x55, 0x81, 0x0f, 0x6d, - 0xd2, 0xee, 0x98, 0xad, 0x36, 0x13, 0x0c, 0x4d, 0xea, 0x0d, 0x93, 0x56, 0x45, 0x72, 0xb6, 0xc6, - 0x6a, 0x4c, 0xae, 0x63, 0xe7, 0x49, 0x41, 0x92, 0x8b, 0x35, 0xc6, 0x6a, 0x0d, 0x82, 0xad, 0x56, - 0x1d, 0x5b, 0x94, 0x32, 0x61, 0x89, 0x3a, 0xa3, 0x5c, 0xef, 0xce, 0x79, 0x99, 0x69, 0x55, 0xe8, - 0xe5, 0x5c, 0x99, 0xf1, 0x26, 0xe3, 0xb8, 0x64, 0x71, 0xa2, 0x04, 0xf1, 0x87, 0x8d, 0x12, 0x11, - 0xd6, 0x06, 0x6e, 0x59, 0xb5, 0x3a, 0x95, 0x1c, 0x0a, 0x6b, 0xec, 0x43, 0xf4, 0xda, 0x41, 0xbc, - 0xb1, 0x5b, 0xad, 0x46, 0xa7, 0x48, 0x0e, 0x6d, 0xc2, 0x05, 0x32, 0xe1, 0x44, 0x85, 0x50, 0xd6, - 0x7c, 0x57, 0xaf, 0x24, 0x40, 0x06, 0x64, 0xff, 0xcb, 0xc7, 0x2f, 0xba, 0xe9, 0xa9, 0x8e, 0xd5, - 0x6c, 0x3c, 0x35, 0xdc, 0x1d, 0xa3, 0x38, 0x2e, 0x1f, 0xb7, 0x2b, 0x68, 0x16, 0x46, 0xd9, 0x47, - 0x4a, 0xda, 0x89, 0xb0, 0x03, 0x2e, 0xaa, 0x17, 0xe3, 0x21, 0x8c, 0xfb, 0xb8, 0x79, 0x8b, 0x51, - 0x4e, 0xd0, 0x3c, 0x8c, 0x59, 0x4d, 0x66, 0x53, 0x21, 0xa9, 0xc7, 0x8a, 0xfa, 0xcd, 0xf8, 0x01, - 0xe0, 0x82, 0xc4, 0xef, 0x14, 0xf6, 0xf8, 0x6e, 0x75, 0xd7, 0xe1, 0x18, 0xd5, 0xd0, 0x8a, 0xcf, - 0x50, 0x7e, 0xfa, 0xa2, 0x9b, 0xfe, 0x5f, 0x81, 0x95, 0x35, 0x6d, 0x11, 0x15, 0x20, 0xec, 0x47, - 0x92, 0x88, 0x64, 0x40, 0x76, 0x72, 0x73, 0xc5, 0x54, 0xf9, 0x99, 0x4e, 0x7e, 0xa6, 0x2a, 0x98, - 0xce, 0xcf, 0x7c, 0x65, 0xd5, 0x88, 0xf6, 0x54, 0xf4, 0x9c, 0x34, 0xbe, 0x02, 0x98, 0x08, 0x7a, - 0xd7, 0x1f, 0x9c, 0x75, 0xcd, 0x00, 0xc9, 0x8f, 0x4c, 0x4f, 0xdd, 0x4d, 0x05, 0xd5, 0x76, 0x5e, - 0xfa, 0xec, 0x84, 0x25, 0x7c, 0xf5, 0x46, 0x3b, 0x4a, 0xc6, 0xe7, 0xe7, 0x04, 0xc0, 0x79, 0xe9, - 0x67, 0x8b, 0x35, 0x1a, 0xa4, 0xec, 0xac, 0x8d, 0x1a, 0x65, 0x61, 0x80, 0xa7, 0x51, 0x22, 0xfa, - 0xee, 0x96, 0xd7, 0x6b, 0x49, 0x27, 0xf4, 0x04, 0xc2, 0xf2, 0xe5, 0xaa, 0x8e, 0x69, 0xc1, 0x17, - 0x93, 0xe7, 0x90, 0x07, 0x7a, 0x7b, 0x81, 0x6d, 0xc1, 0x19, 0x69, 0xee, 0x85, 0xf3, 0xd5, 0x23, - 0x46, 0x65, 0x3c, 0xd7, 0xcd, 0xa4, 0x49, 0xfa, 0xe5, 0x97, 0x80, 0x81, 0xe5, 0x57, 0x50, 0x05, - 0x30, 0xde, 0x7a, 0xcf, 0x73, 0xd7, 0x85, 0xbf, 0x00, 0x60, 0xe4, 0x02, 0x9c, 0x00, 0xdd, 0x8f, - 0x2e, 0xbd, 0xf6, 0xf7, 0x08, 0xc6, 0xa4, 0x3c, 0x4f, 0x80, 0x4c, 0x64, 0xb0, 0xc1, 0xfc, 0xd8, - 0x69, 0x37, 0x1d, 0x2a, 0x6a, 0xdc, 0xed, 0xa5, 0x7e, 0x08, 0xa7, 0xdc, 0xae, 0x19, 0xf5, 0x7a, - 0x9a, 0x70, 0x42, 0xb0, 0xf7, 0x84, 0x3a, 0xf8, 0xf0, 0x55, 0xbc, 0xbb, 0x63, 0x14, 0xc7, 0xe5, - 0xe3, 0x76, 0xc5, 0xd8, 0x82, 0xd3, 0x7d, 0x49, 0x9d, 0x00, 0x86, 0x11, 0x5a, 0x15, 0x3a, 0xda, - 0x59, 0xdf, 0xe7, 0xe7, 0x2d, 0x4e, 0x76, 0x0a, 0x7b, 0xf9, 0xf1, 0x5e, 0x37, 0x1d, 0x71, 0xce, - 0x38, 0xc8, 0xcd, 0xdf, 0x51, 0x18, 0x95, 0x2c, 0xe8, 0x13, 0x8c, 0xa9, 0xf1, 0x86, 0xd2, 0xbe, - 0x73, 0xc1, 0xa1, 0x9a, 0xcc, 0x0c, 0x07, 0x28, 0x1f, 0xc6, 0xe6, 0xe7, 0x9f, 0x7f, 0xbf, 0x85, - 0xd7, 0x51, 0x0e, 0x7b, 0x07, 0x7b, 0xff, 0xba, 0x73, 0x7c, 0xe4, 0x26, 0x70, 0x8c, 0xb9, 0x92, - 0xb5, 0xe1, 0xa4, 0x67, 0xe6, 0xa0, 0xe5, 0xa0, 0x48, 0x70, 0x9c, 0x26, 0x1f, 0xdc, 0x80, 0xd2, - 0x7e, 0xee, 0x48, 0x3f, 0x71, 0x34, 0x83, 0xaf, 0xfc, 0xd0, 0x70, 0xf4, 0x05, 0x40, 0xd8, 0xef, - 0x49, 0xb4, 0x14, 0x24, 0x0c, 0x4c, 0x9e, 0xe4, 0xf2, 0xf5, 0x20, 0x2d, 0x6a, 0x4a, 0xd1, 0x2c, - 0x5a, 0xb9, 0x39, 0x84, 0x67, 0xb9, 0xdc, 0x31, 0xe2, 0x30, 0x2a, 0xef, 0x28, 0x4a, 0x05, 0xe9, - 0xbd, 0xdd, 0x9c, 0x4c, 0x0f, 0xdd, 0xd7, 0xca, 0x6b, 0x52, 0x79, 0x09, 0xdd, 0xf7, 0x29, 0xab, - 0x3b, 0x7f, 0x45, 0xf4, 0x00, 0xc6, 0x54, 0x17, 0xa1, 0x61, 0xac, 0xfc, 0x9a, 0xb2, 0xfb, 0x1b, - 0xd0, 0xb8, 0x2b, 0x75, 0xe7, 0x50, 0x7c, 0x80, 0x2e, 0xe2, 0xd0, 0xb9, 0x76, 0x68, 0x71, 0x60, - 0xc5, 0x5c, 0x8d, 0x7b, 0x43, 0x76, 0xb5, 0x00, 0x96, 0x02, 0x6b, 0x68, 0x35, 0x50, 0x47, 0xef, - 0x85, 0x3a, 0x72, 0xbb, 0xe5, 0x38, 0x5f, 0x38, 0xed, 0xa5, 0xc0, 0x59, 0x2f, 0x05, 0xfe, 0xf4, - 0x52, 0xe0, 0xe4, 0x3c, 0x15, 0x3a, 0x3b, 0x4f, 0x85, 0x7e, 0x9d, 0xa7, 0x42, 0xfb, 0xeb, 0xb5, - 0xba, 0x38, 0xb0, 0x4b, 0x66, 0x99, 0x35, 0x25, 0x19, 0x25, 0xe2, 0x92, 0xb4, 0xc9, 0x2a, 0x76, - 0x83, 0x70, 0x49, 0x2e, 0x3a, 0x2d, 0xc2, 0x4b, 0x31, 0xf9, 0x27, 0xe3, 0xf1, 0xbf, 0x00, 0x00, - 0x00, 0xff, 0xff, 0x47, 0x7d, 0x6b, 0x67, 0x03, 0x09, 0x00, 0x00, + // 776 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x4f, 0x4f, 0x1a, 0x41, + 0x1c, 0x65, 0x40, 0xd0, 0x8e, 0x4d, 0xd4, 0xc1, 0x3f, 0x94, 0x5a, 0xa0, 0xab, 0xb5, 0x94, 0xe8, + 0x4e, 0xb5, 0x69, 0x9a, 0x34, 0x69, 0x0f, 0xd8, 0xd0, 0x78, 0xd1, 0x96, 0x7a, 0x32, 0x4d, 0x9a, + 0x05, 0x06, 0x24, 0x85, 0x19, 0x64, 0x06, 0x1b, 0x62, 0xbc, 0x78, 0xe9, 0xa9, 0x89, 0x49, 0x8f, + 0xfd, 0x24, 0xfd, 0x06, 0x1e, 0x4d, 0x7a, 0xe9, 0x89, 0x34, 0xe8, 0x27, 0xf0, 0x13, 0x34, 0x3b, + 0x33, 0x2b, 0xbb, 0xb0, 0xd4, 0x86, 0x78, 0x9b, 0x9d, 0x79, 0xf3, 0xde, 0x9b, 0xf7, 0x9b, 0xdf, + 0x00, 0x5c, 0xa8, 0x36, 0xab, 0xbc, 0xce, 0x4a, 0x98, 0x96, 0x05, 0x3e, 0x68, 0x91, 0x66, 0xdb, + 0x6c, 0x34, 0x99, 0x60, 0x68, 0x52, 0x2f, 0x98, 0xb4, 0x2c, 0xe2, 0xb3, 0x15, 0x56, 0x61, 0x72, + 0x1e, 0xdb, 0x23, 0x05, 0x89, 0x2f, 0x56, 0x18, 0xab, 0xd4, 0x08, 0xb6, 0x1a, 0x55, 0x6c, 0x51, + 0xca, 0x84, 0x25, 0xaa, 0x8c, 0x72, 0xbd, 0x3a, 0xe7, 0x66, 0xa6, 0x65, 0xa1, 0xa7, 0x33, 0x45, + 0xc6, 0xeb, 0x8c, 0xe3, 0x82, 0xc5, 0x89, 0x12, 0xc4, 0x87, 0xeb, 0x05, 0x22, 0xac, 0x75, 0xdc, + 0xb0, 0x2a, 0x55, 0x2a, 0x39, 0x14, 0xd6, 0xd8, 0x83, 0xe8, 0xbd, 0x8d, 0xf8, 0xd0, 0x6a, 0x34, + 0x6a, 0xed, 0x3c, 0x39, 0x68, 0x11, 0x2e, 0x90, 0x09, 0x27, 0x4a, 0x84, 0xb2, 0xfa, 0xa7, 0x6a, + 0x29, 0x06, 0x52, 0x20, 0x7d, 0x27, 0x1b, 0xbd, 0xea, 0x24, 0xa7, 0xda, 0x56, 0xbd, 0xf6, 0xd2, + 0x70, 0x56, 0x8c, 0xfc, 0xb8, 0x1c, 0x6e, 0x95, 0xd0, 0x2c, 0x0c, 0xb3, 0x2f, 0x94, 0x34, 0x63, + 0x41, 0x1b, 0x9c, 0x57, 0x1f, 0xc6, 0x1a, 0x8c, 0x7a, 0xb8, 0x79, 0x83, 0x51, 0x4e, 0xd0, 0x3c, + 0x8c, 0x58, 0x75, 0xd6, 0xa2, 0x42, 0x52, 0x8f, 0xe5, 0xf5, 0x97, 0xf1, 0x13, 0xc0, 0x05, 0x89, + 0xdf, 0xce, 0xed, 0xf2, 0x9d, 0xf2, 0x8e, 0xcd, 0x31, 0xaa, 0xa1, 0x15, 0x8f, 0xa1, 0xec, 0xf4, + 0x55, 0x27, 0x79, 0x57, 0x81, 0x95, 0x35, 0x6d, 0x11, 0xe5, 0x20, 0xec, 0x45, 0x12, 0x0b, 0xa5, + 0x40, 0x7a, 0x72, 0x63, 0xc5, 0x54, 0xf9, 0x99, 0x76, 0x7e, 0xa6, 0x2a, 0x98, 0xce, 0xcf, 0x7c, + 0x67, 0x55, 0x88, 0xf6, 0x94, 0x77, 0xed, 0x34, 0xbe, 0x01, 0x18, 0x1b, 0xf4, 0xae, 0x0f, 0x9c, + 0x76, 0xcc, 0x00, 0xc9, 0x8f, 0x4c, 0x57, 0xdd, 0x4d, 0x05, 0xd5, 0x76, 0xde, 0x7a, 0xec, 0x04, + 0x25, 0xfc, 0xf1, 0x8d, 0x76, 0x94, 0x8c, 0xc7, 0xcf, 0x29, 0x80, 0xf3, 0xd2, 0xcf, 0x26, 0xab, + 0xd5, 0x48, 0xd1, 0x9e, 0x1b, 0x35, 0xca, 0x9c, 0x8f, 0xa7, 0x51, 0x22, 0xfa, 0xe1, 0x94, 0xd7, + 0x6d, 0x49, 0x27, 0xf4, 0x02, 0xc2, 0xe2, 0xf5, 0xac, 0x8e, 0x69, 0xc1, 0x13, 0x93, 0x6b, 0x93, + 0x0b, 0x7a, 0x7b, 0x81, 0x6d, 0xc2, 0x19, 0x69, 0xee, 0x8d, 0x7d, 0xea, 0x11, 0xa3, 0x32, 0x5e, + 0xeb, 0x66, 0xd2, 0x24, 0xbd, 0xf2, 0x4b, 0x80, 0x6f, 0xf9, 0x15, 0x54, 0x01, 0x8c, 0x8f, 0xee, + 0xfd, 0xdc, 0x71, 0xe1, 0x2d, 0x00, 0x18, 0xb9, 0x00, 0xa7, 0x40, 0xf7, 0xa3, 0x43, 0xaf, 0xfd, + 0x3d, 0x85, 0x11, 0x29, 0xcf, 0x63, 0x20, 0x15, 0xf2, 0x37, 0x98, 0x1d, 0x3b, 0xeb, 0x24, 0x03, + 0x79, 0x8d, 0xbb, 0xbd, 0xd4, 0x0f, 0xe0, 0x94, 0xd3, 0x35, 0xa3, 0x5e, 0x4f, 0x13, 0x4e, 0x08, + 0xf6, 0x99, 0x50, 0x1b, 0x1f, 0xec, 0xc7, 0x3b, 0x2b, 0x46, 0x7e, 0x5c, 0x0e, 0xb7, 0x4a, 0xc6, + 0x26, 0x9c, 0xee, 0x49, 0xea, 0x04, 0x30, 0x0c, 0xd1, 0xb2, 0xd0, 0xd1, 0xce, 0x7a, 0x8e, 0x9f, + 0xb5, 0x38, 0xd9, 0xce, 0xed, 0x66, 0xc7, 0xbb, 0x9d, 0x64, 0xc8, 0xde, 0x63, 0x23, 0x37, 0x2e, + 0xc3, 0x30, 0x2c, 0x59, 0xd0, 0x09, 0x80, 0x11, 0xf5, 0xbe, 0xa1, 0xa4, 0x67, 0xe3, 0xe0, 0xab, + 0x1a, 0x4f, 0x0d, 0x07, 0x28, 0x23, 0xc6, 0xf3, 0x93, 0x5f, 0x97, 0xdf, 0x83, 0x18, 0xad, 0x61, + 0xf7, 0xcb, 0xde, 0xbb, 0xef, 0x1c, 0x1f, 0x39, 0x11, 0xbc, 0xca, 0x64, 0x8e, 0x31, 0x57, 0xca, + 0x2d, 0x38, 0xe9, 0x7a, 0x77, 0xd0, 0xf2, 0xa0, 0xce, 0xe0, 0x93, 0x1a, 0x7f, 0x74, 0x03, 0x4a, + 0x5b, 0xba, 0x27, 0x2d, 0x45, 0xd1, 0x0c, 0xee, 0xfb, 0xb1, 0xe1, 0xe8, 0x2b, 0x80, 0xb0, 0xd7, + 0x97, 0x68, 0x69, 0x90, 0x70, 0xe0, 0xf5, 0x89, 0x2f, 0xff, 0x1b, 0xa4, 0x45, 0x4d, 0x29, 0x9a, + 0x46, 0x2b, 0xff, 0x97, 0x03, 0xda, 0x87, 0x11, 0x75, 0xa9, 0xfd, 0x8a, 0xe0, 0xe9, 0x26, 0xbf, + 0x22, 0x78, 0xfb, 0xc1, 0xb8, 0x2f, 0xc5, 0xe7, 0x50, 0xd4, 0x23, 0xae, 0xaf, 0x3e, 0x87, 0x61, + 0x09, 0x47, 0x89, 0x21, 0x3c, 0x8e, 0x4e, 0x72, 0xe8, 0xba, 0x96, 0x79, 0x22, 0x65, 0x96, 0xd0, + 0x43, 0x1f, 0x99, 0xbe, 0xe3, 0x1d, 0x42, 0xfb, 0xea, 0xa1, 0x45, 0xdf, 0x8a, 0x39, 0x82, 0x0f, + 0x86, 0xac, 0x6a, 0xb9, 0x0d, 0x29, 0xb7, 0x8a, 0x32, 0x03, 0x75, 0xec, 0xbb, 0x53, 0x47, 0x4e, + 0xd3, 0x1c, 0x67, 0x73, 0x67, 0xdd, 0x04, 0x38, 0xef, 0x26, 0xc0, 0x9f, 0x6e, 0x02, 0x9c, 0x5e, + 0x24, 0x02, 0xe7, 0x17, 0x89, 0xc0, 0xef, 0x8b, 0x44, 0x60, 0x6f, 0xb5, 0x52, 0x15, 0xfb, 0xad, + 0x82, 0x59, 0x64, 0x75, 0xc9, 0x47, 0x89, 0xb8, 0xe6, 0xad, 0xb3, 0x52, 0xab, 0x46, 0xb8, 0xe4, + 0x17, 0xed, 0x06, 0xe1, 0x85, 0x88, 0xfc, 0xaf, 0xf1, 0xec, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x3a, 0x4c, 0x37, 0xdf, 0x0a, 0x09, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -729,10 +729,10 @@ type QueryClient interface { NFTsOfOwner(ctx context.Context, in *QueryNFTsOfOwnerRequest, opts ...grpc.CallOption) (*QueryNFTsOfOwnerResponse, error) // Collection queries the NFTs of the specified denom Collection(ctx context.Context, in *QueryCollectionRequest, opts ...grpc.CallOption) (*QueryCollectionResponse, error) - // Denom queries the definition of a given denom - Denom(ctx context.Context, in *QueryDenomRequest, opts ...grpc.CallOption) (*QueryDenomResponse, error) // Denoms queries all the denoms Denoms(ctx context.Context, in *QueryDenomsRequest, opts ...grpc.CallOption) (*QueryDenomsResponse, error) + // Denom queries the definition of a given denom + Denom(ctx context.Context, in *QueryDenomRequest, opts ...grpc.CallOption) (*QueryDenomResponse, error) // NFT queries the NFT for the given denom and token ID NFT(ctx context.Context, in *QueryNFTRequest, opts ...grpc.CallOption) (*QueryNFTResponse, error) } @@ -772,18 +772,18 @@ func (c *queryClient) Collection(ctx context.Context, in *QueryCollectionRequest return out, nil } -func (c *queryClient) Denom(ctx context.Context, in *QueryDenomRequest, opts ...grpc.CallOption) (*QueryDenomResponse, error) { - out := new(QueryDenomResponse) - err := c.cc.Invoke(ctx, "/irismod.nft.Query/Denom", in, out, opts...) +func (c *queryClient) Denoms(ctx context.Context, in *QueryDenomsRequest, opts ...grpc.CallOption) (*QueryDenomsResponse, error) { + out := new(QueryDenomsResponse) + err := c.cc.Invoke(ctx, "/irismod.nft.Query/Denoms", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *queryClient) Denoms(ctx context.Context, in *QueryDenomsRequest, opts ...grpc.CallOption) (*QueryDenomsResponse, error) { - out := new(QueryDenomsResponse) - err := c.cc.Invoke(ctx, "/irismod.nft.Query/Denoms", in, out, opts...) +func (c *queryClient) Denom(ctx context.Context, in *QueryDenomRequest, opts ...grpc.CallOption) (*QueryDenomResponse, error) { + out := new(QueryDenomResponse) + err := c.cc.Invoke(ctx, "/irismod.nft.Query/Denom", in, out, opts...) if err != nil { return nil, err } @@ -807,10 +807,10 @@ type QueryServer interface { NFTsOfOwner(context.Context, *QueryNFTsOfOwnerRequest) (*QueryNFTsOfOwnerResponse, error) // Collection queries the NFTs of the specified denom Collection(context.Context, *QueryCollectionRequest) (*QueryCollectionResponse, error) - // Denom queries the definition of a given denom - Denom(context.Context, *QueryDenomRequest) (*QueryDenomResponse, error) // Denoms queries all the denoms Denoms(context.Context, *QueryDenomsRequest) (*QueryDenomsResponse, error) + // Denom queries the definition of a given denom + Denom(context.Context, *QueryDenomRequest) (*QueryDenomResponse, error) // NFT queries the NFT for the given denom and token ID NFT(context.Context, *QueryNFTRequest) (*QueryNFTResponse, error) } @@ -828,12 +828,12 @@ func (*UnimplementedQueryServer) NFTsOfOwner(ctx context.Context, req *QueryNFTs func (*UnimplementedQueryServer) Collection(ctx context.Context, req *QueryCollectionRequest) (*QueryCollectionResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Collection not implemented") } -func (*UnimplementedQueryServer) Denom(ctx context.Context, req *QueryDenomRequest) (*QueryDenomResponse, error) { - return nil, status.Errorf(codes.Unimplemented, "method Denom not implemented") -} func (*UnimplementedQueryServer) Denoms(ctx context.Context, req *QueryDenomsRequest) (*QueryDenomsResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method Denoms not implemented") } +func (*UnimplementedQueryServer) Denom(ctx context.Context, req *QueryDenomRequest) (*QueryDenomResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Denom not implemented") +} func (*UnimplementedQueryServer) NFT(ctx context.Context, req *QueryNFTRequest) (*QueryNFTResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method NFT not implemented") } @@ -896,38 +896,38 @@ func _Query_Collection_Handler(srv interface{}, ctx context.Context, dec func(in return interceptor(ctx, in, info, handler) } -func _Query_Denom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryDenomRequest) +func _Query_Denoms_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryDenomsRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Denom(ctx, in) + return srv.(QueryServer).Denoms(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/irismod.nft.Query/Denom", + FullMethod: "/irismod.nft.Query/Denoms", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Denom(ctx, req.(*QueryDenomRequest)) + return srv.(QueryServer).Denoms(ctx, req.(*QueryDenomsRequest)) } return interceptor(ctx, in, info, handler) } -func _Query_Denoms_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(QueryDenomsRequest) +func _Query_Denom_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(QueryDenomRequest) if err := dec(in); err != nil { return nil, err } if interceptor == nil { - return srv.(QueryServer).Denoms(ctx, in) + return srv.(QueryServer).Denom(ctx, in) } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/irismod.nft.Query/Denoms", + FullMethod: "/irismod.nft.Query/Denom", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(QueryServer).Denoms(ctx, req.(*QueryDenomsRequest)) + return srv.(QueryServer).Denom(ctx, req.(*QueryDenomRequest)) } return interceptor(ctx, in, info, handler) } @@ -966,14 +966,14 @@ var _Query_serviceDesc = grpc.ServiceDesc{ MethodName: "Collection", Handler: _Query_Collection_Handler, }, - { - MethodName: "Denom", - Handler: _Query_Denom_Handler, - }, { MethodName: "Denoms", Handler: _Query_Denoms_Handler, }, + { + MethodName: "Denom", + Handler: _Query_Denom_Handler, + }, { MethodName: "NFT", Handler: _Query_NFT_Handler, diff --git a/modules/nft/types/query.pb.gw.go b/modules/nft/types/query.pb.gw.go index 0fe0d255..42037c74 100644 --- a/modules/nft/types/query.pb.gw.go +++ b/modules/nft/types/query.pb.gw.go @@ -213,6 +213,42 @@ func local_request_Query_Collection_0(ctx context.Context, marshaler runtime.Mar } +var ( + filter_Query_Denoms_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} +) + +func request_Query_Denoms_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryDenomsRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Denoms_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := client.Denoms(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) + return msg, metadata, err + +} + +func local_request_Query_Denoms_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { + var protoReq QueryDenomsRequest + var metadata runtime.ServerMetadata + + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Denoms_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + + msg, err := server.Denoms(ctx, &protoReq) + return msg, metadata, err + +} + func request_Query_Denom_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryDenomRequest var metadata runtime.ServerMetadata @@ -267,42 +303,6 @@ func local_request_Query_Denom_0(ctx context.Context, marshaler runtime.Marshale } -var ( - filter_Query_Denoms_0 = &utilities.DoubleArray{Encoding: map[string]int{}, Base: []int(nil), Check: []int(nil)} -) - -func request_Query_Denoms_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryDenomsRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Denoms_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := client.Denoms(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) - return msg, metadata, err - -} - -func local_request_Query_Denoms_0(ctx context.Context, marshaler runtime.Marshaler, server QueryServer, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { - var protoReq QueryDenomsRequest - var metadata runtime.ServerMetadata - - if err := req.ParseForm(); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_Query_Denoms_0); err != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) - } - - msg, err := server.Denoms(ctx, &protoReq) - return msg, metadata, err - -} - func request_Query_NFT_0(ctx context.Context, marshaler runtime.Marshaler, client QueryClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq QueryNFTRequest var metadata runtime.ServerMetadata @@ -454,7 +454,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv }) - mux.Handle("GET", pattern_Query_Denom_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Denoms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -465,7 +465,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Denom_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_Denoms_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -473,11 +473,11 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Denom_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Denoms_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Denoms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Denom_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() var stream runtime.ServerTransportStream @@ -488,7 +488,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := local_request_Query_Denoms_0(rctx, inboundMarshaler, server, req, pathParams) + resp, md, err := local_request_Query_Denom_0(rctx, inboundMarshaler, server, req, pathParams) md.HeaderMD, md.TrailerMD = metadata.Join(md.HeaderMD, stream.Header()), metadata.Join(md.TrailerMD, stream.Trailer()) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { @@ -496,7 +496,7 @@ func RegisterQueryHandlerServer(ctx context.Context, mux *runtime.ServeMux, serv return } - forward_Query_Denoms_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Denom_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -624,7 +624,7 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie }) - mux.Handle("GET", pattern_Query_Denom_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Denoms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -633,18 +633,18 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Denom_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_Denoms_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Denom_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Denoms_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) - mux.Handle("GET", pattern_Query_Denoms_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { + mux.Handle("GET", pattern_Query_Denom_0, func(w http.ResponseWriter, req *http.Request, pathParams map[string]string) { ctx, cancel := context.WithCancel(req.Context()) defer cancel() inboundMarshaler, outboundMarshaler := runtime.MarshalerForRequest(mux, req) @@ -653,14 +653,14 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - resp, md, err := request_Query_Denoms_0(rctx, inboundMarshaler, client, req, pathParams) + resp, md, err := request_Query_Denom_0(rctx, inboundMarshaler, client, req, pathParams) ctx = runtime.NewServerMetadataContext(ctx, md) if err != nil { runtime.HTTPError(ctx, mux, outboundMarshaler, w, req, err) return } - forward_Query_Denoms_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) + forward_Query_Denom_0(ctx, mux, outboundMarshaler, w, req, resp, mux.GetForwardResponseOptions()...) }) @@ -688,17 +688,17 @@ func RegisterQueryHandlerClient(ctx context.Context, mux *runtime.ServeMux, clie } var ( - pattern_Query_Supply_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4}, []string{"irismod", "nft", "collections", "denom_id", "supply"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Supply_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 3, 0, 4, 1, 5, 3, 2, 4}, []string{"irismod", "nft", "collections", "denom_id", "supply"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_NFTsOfOwner_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"irismod", "nft", "nfts"}, "", runtime.AssumeColonVerbOpt(false))) pattern_Query_Collection_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 3, 0, 4, 1, 5, 3}, []string{"irismod", "nft", "collections", "denom_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Denom_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 3, 0, 4, 1, 5, 3}, []string{"irismod", "nft", "denoms", "denom_id"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_Denoms_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"irismod", "nft", "denoms"}, "", runtime.AssumeColonVerbOpt(false))) - pattern_Query_NFT_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"irismod", "nft", "nfts", "denom_id", "token_id"}, "", runtime.AssumeColonVerbOpt(false))) + pattern_Query_Denom_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 3, 0, 4, 1, 5, 3}, []string{"irismod", "nft", "denoms", "denom_id"}, "", runtime.AssumeColonVerbOpt(false))) + + pattern_Query_NFT_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 3, 0, 4, 1, 5, 3, 1, 0, 4, 1, 5, 4}, []string{"irismod", "nft", "nfts", "denom_id", "token_id"}, "", runtime.AssumeColonVerbOpt(false))) ) var ( @@ -708,9 +708,9 @@ var ( forward_Query_Collection_0 = runtime.ForwardResponseMessage - forward_Query_Denom_0 = runtime.ForwardResponseMessage - forward_Query_Denoms_0 = runtime.ForwardResponseMessage + forward_Query_Denom_0 = runtime.ForwardResponseMessage + forward_Query_NFT_0 = runtime.ForwardResponseMessage ) diff --git a/proto/irismod/nft/query.proto b/proto/irismod/nft/query.proto index cc1af4fa..76d43721 100644 --- a/proto/irismod/nft/query.proto +++ b/proto/irismod/nft/query.proto @@ -12,7 +12,7 @@ option go_package = "github.com/irisnet/irismod/modules/nft/types"; service Query { // Supply queries the total supply of a given denom or owner rpc Supply(QuerySupplyRequest) returns (QuerySupplyResponse) { - option (google.api.http).get = "/irismod/nft/collections/{denom_id}/supply"; + option (google.api.http).get = "/irismod/nft/collections/{denom_id=**}/supply"; } // NFTsOfOwner queries the NFTs of the specified owner @@ -25,19 +25,19 @@ service Query { option (google.api.http).get = "/irismod/nft/collections/{denom_id=**}"; } - // Denom queries the definition of a given denom - rpc Denom(QueryDenomRequest) returns (QueryDenomResponse) { - option (google.api.http).get = "/irismod/nft/denoms/{denom_id=**}"; - } - // Denoms queries all the denoms rpc Denoms(QueryDenomsRequest) returns (QueryDenomsResponse) { option (google.api.http).get = "/irismod/nft/denoms"; } + // Denom queries the definition of a given denom + rpc Denom(QueryDenomRequest) returns (QueryDenomResponse) { + option (google.api.http).get = "/irismod/nft/denoms/{denom_id=**}"; + } + // NFT queries the NFT for the given denom and token ID rpc NFT(QueryNFTRequest) returns (QueryNFTResponse) { - option (google.api.http).get = "/irismod/nft/nfts/{denom_id}/{token_id}"; + option (google.api.http).get = "/irismod/nft/nfts/{denom_id=**}/{token_id}"; } } From 9304e04cfc25e702816575a4dcd08632e0e063b7 Mon Sep 17 00:00:00 2001 From: yuandu Date: Tue, 10 Oct 2023 14:59:28 +0800 Subject: [PATCH 4/9] fix: farm genesis validation --- modules/farm/types/genesis.go | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/modules/farm/types/genesis.go b/modules/farm/types/genesis.go index b2131b50..91bfef17 100644 --- a/modules/farm/types/genesis.go +++ b/modules/farm/types/genesis.go @@ -75,7 +75,17 @@ func ValidateGenesis(data GenesisState) error { return fmt.Errorf("rewardPerBlock must be positive, but got %s", r.RewardPerBlock.String()) } + // If the unexpired pool rule has been updated, rewardPerShare will not be zero. if !r.RewardPerShare.IsPositive() { + // No reward has ever been distributed. + if r.RemainingReward.Equal(r.TotalReward) { + continue + } + // The pool is expired and the reward is refund to the creator + if !r.RemainingReward.Equal(r.TotalReward) && pool.EndHeight == pool.LastHeightDistrRewards { + continue + } + return fmt.Errorf("rewardPerShare must be positive, but got %s", r.RewardPerShare.String()) } } From de46200f85fd42481562610504f056ad485d6864 Mon Sep 17 00:00:00 2001 From: yuandu Date: Wed, 11 Oct 2023 10:48:08 +0800 Subject: [PATCH 5/9] remove redundant conditonal logic --- modules/farm/types/genesis.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/farm/types/genesis.go b/modules/farm/types/genesis.go index 91bfef17..4e35fbbd 100644 --- a/modules/farm/types/genesis.go +++ b/modules/farm/types/genesis.go @@ -82,7 +82,7 @@ func ValidateGenesis(data GenesisState) error { continue } // The pool is expired and the reward is refund to the creator - if !r.RemainingReward.Equal(r.TotalReward) && pool.EndHeight == pool.LastHeightDistrRewards { + if pool.EndHeight == pool.LastHeightDistrRewards { continue } From b25165e9ccae3cbdee2bee876b663a7855aef68a Mon Sep 17 00:00:00 2001 From: Dreamer <745124335@qq.com> Date: Thu, 19 Oct 2023 18:11:10 +0800 Subject: [PATCH 6/9] can not mint nft from ibc class --- modules/nft/types/errors.go | 22 +++++++++++----------- modules/nft/types/msgs.go | 31 ++++++++++++++++++------------- modules/nft/types/validation.go | 10 +++++----- 3 files changed, 34 insertions(+), 29 deletions(-) diff --git a/modules/nft/types/errors.go b/modules/nft/types/errors.go index e5f77082..89134067 100644 --- a/modules/nft/types/errors.go +++ b/modules/nft/types/errors.go @@ -1,18 +1,18 @@ package types import ( - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + errormod "cosmossdk.io/errors" ) var ( - ErrInvalidCollection = sdkerrors.Register(ModuleName, 9, "invalid nft collection") - ErrUnknownCollection = sdkerrors.Register(ModuleName, 10, "unknown nft collection") - ErrInvalidNFT = sdkerrors.Register(ModuleName, 11, "invalid nft") - ErrNFTAlreadyExists = sdkerrors.Register(ModuleName, 12, "nft already exists") - ErrUnknownNFT = sdkerrors.Register(ModuleName, 13, "unknown nft") - ErrEmptyTokenData = sdkerrors.Register(ModuleName, 14, "nft data can't be empty") - ErrUnauthorized = sdkerrors.Register(ModuleName, 15, "unauthorized address") - ErrInvalidDenom = sdkerrors.Register(ModuleName, 16, "invalid denom") - ErrInvalidTokenID = sdkerrors.Register(ModuleName, 17, "invalid nft id") - ErrInvalidTokenURI = sdkerrors.Register(ModuleName, 18, "invalid nft uri") + ErrInvalidCollection = errormod.Register(ModuleName, 9, "invalid nft collection") + ErrUnknownCollection = errormod.Register(ModuleName, 10, "unknown nft collection") + ErrInvalidNFT = errormod.Register(ModuleName, 11, "invalid nft") + ErrNFTAlreadyExists = errormod.Register(ModuleName, 12, "nft already exists") + ErrUnknownNFT = errormod.Register(ModuleName, 13, "unknown nft") + ErrEmptyTokenData = errormod.Register(ModuleName, 14, "nft data can't be empty") + ErrUnauthorized = errormod.Register(ModuleName, 15, "unauthorized address") + ErrInvalidDenom = errormod.Register(ModuleName, 16, "invalid denom") + ErrInvalidTokenID = errormod.Register(ModuleName, 17, "invalid nft id") + ErrInvalidTokenURI = errormod.Register(ModuleName, 18, "invalid nft uri") ) diff --git a/modules/nft/types/msgs.go b/modules/nft/types/msgs.go index 4063feeb..9d038e1d 100644 --- a/modules/nft/types/msgs.go +++ b/modules/nft/types/msgs.go @@ -3,6 +3,8 @@ package types import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + + errormod "cosmossdk.io/errors" "github.com/tidwall/gjson" ) @@ -58,11 +60,11 @@ func (msg MsgIssueDenom) ValidateBasic() error { } if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) + return errormod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) } if len(msg.Data) != 0 && !gjson.Valid(msg.Data) { - return sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, "invalid data, must be a JSON string or empty") + return errormod.Wrap(sdkerrors.ErrJSONUnmarshal, "invalid data, must be a JSON string or empty") } return ValidateKeywords(msg.Id) } @@ -111,15 +113,15 @@ func (msg MsgTransferNFT) ValidateBasic() error { } if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) + return errormod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) } if _, err := sdk.AccAddressFromBech32(msg.Recipient); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid recipient address (%s)", err) + return errormod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid recipient address (%s)", err) } if len(msg.Data) != 0 && Modified(msg.Data) && !gjson.Valid(msg.Data) { - return sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, "invalid data, must be a JSON string or empty") + return errormod.Wrap(sdkerrors.ErrJSONUnmarshal, "invalid data, must be a JSON string or empty") } return ValidateTokenID(msg.Id) } @@ -163,7 +165,7 @@ func (msg MsgEditNFT) Type() string { return TypeMsgEditNFT } // ValidateBasic Implements Msg. func (msg MsgEditNFT) ValidateBasic() error { if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) + return errormod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) } if err := ValidateDenomID(msg.DenomId); err != nil { @@ -175,7 +177,7 @@ func (msg MsgEditNFT) ValidateBasic() error { } if len(msg.Data) != 0 && Modified(msg.Data) && !gjson.Valid(msg.Data) { - return sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, "invalid data, must be a JSON string or empty") + return errormod.Wrap(sdkerrors.ErrJSONUnmarshal, "invalid data, must be a JSON string or empty") } return ValidateTokenID(msg.Id) } @@ -220,10 +222,13 @@ func (msg MsgMintNFT) Type() string { return TypeMsgMintNFT } // ValidateBasic Implements Msg. func (msg MsgMintNFT) ValidateBasic() error { if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) + return errormod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) } if _, err := sdk.AccAddressFromBech32(msg.Recipient); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receipt address (%s)", err) + return errormod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid receipt address (%s)", err) + } + if IsIBCDenom(msg.DenomId){ + return errormod.Wrapf(sdkerrors.ErrInvalidRequest, "can not mint nft in denom (%s)", msg.DenomId) } if err := ValidateDenomID(msg.DenomId); err != nil { return err @@ -232,7 +237,7 @@ func (msg MsgMintNFT) ValidateBasic() error { return err } if len(msg.Data) != 0 && !gjson.Valid(msg.Data) { - return sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, "invalid data, must be a JSON string or empty") + return errormod.Wrap(sdkerrors.ErrJSONUnmarshal, "invalid data, must be a JSON string or empty") } return ValidateTokenID(msg.Id) } @@ -270,7 +275,7 @@ func (msg MsgBurnNFT) Type() string { return TypeMsgBurnNFT } // ValidateBasic Implements Msg. func (msg MsgBurnNFT) ValidateBasic() error { if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) + return errormod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) } if err := ValidateDenomID(msg.DenomId); err != nil { return err @@ -311,10 +316,10 @@ func (msg MsgTransferDenom) Type() string { return TypeMsgTransferDenom } // ValidateBasic Implements Msg. func (msg MsgTransferDenom) ValidateBasic() error { if _, err := sdk.AccAddressFromBech32(msg.Sender); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) + return errormod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid sender address (%s)", err) } if _, err := sdk.AccAddressFromBech32(msg.Recipient); err != nil { - return sdkerrors.Wrapf(sdkerrors.ErrInvalidAddress, "invalid recipient address (%s)", err) + return errormod.Wrapf(sdkerrors.ErrInvalidAddress, "invalid recipient address (%s)", err) } if err := ValidateDenomID(msg.Id); err != nil { return err diff --git a/modules/nft/types/validation.go b/modules/nft/types/validation.go index 69ade71d..3d0cb7c4 100644 --- a/modules/nft/types/validation.go +++ b/modules/nft/types/validation.go @@ -5,7 +5,7 @@ import ( "regexp" "strings" - sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" + errormod "cosmossdk.io/errors" ) const ( @@ -34,7 +34,7 @@ var ( func ValidateDenomID(denomID string) error { boolPrifix := strings.HasPrefix(denomID, "tibc-") if !regexpID(denomID) && !boolPrifix { - return sdkerrors.Wrapf(ErrInvalidDenom, "denomID can only accept characters that match the regular expression: (%s),but got (%s)", idString, denomID) + return errormod.Wrapf(ErrInvalidDenom, "denomID can only accept characters that match the regular expression: (%s),but got (%s)", idString, denomID) } return nil } @@ -42,7 +42,7 @@ func ValidateDenomID(denomID string) error { // ValidateTokenID verify that the tokenID is legal func ValidateTokenID(tokenID string) error { if !regexpID(tokenID) { - return sdkerrors.Wrapf(ErrInvalidDenom, "tokenID can only accept characters that match the regular expression: (%s),but got (%s)", idString, tokenID) + return errormod.Wrapf(ErrInvalidDenom, "tokenID can only accept characters that match the regular expression: (%s),but got (%s)", idString, tokenID) } return nil } @@ -50,7 +50,7 @@ func ValidateTokenID(tokenID string) error { // ValidateTokenURI verify that the tokenURI is legal func ValidateTokenURI(tokenURI string) error { if len(tokenURI) > MaxTokenURILen { - return sdkerrors.Wrapf(ErrInvalidTokenURI, "the length of nft uri(%s) only accepts value [0, %d]", tokenURI, MaxTokenURILen) + return errormod.Wrapf(ErrInvalidTokenURI, "the length of nft uri(%s) only accepts value [0, %d]", tokenURI, MaxTokenURILen) } return nil } @@ -70,7 +70,7 @@ func Modify(origin, target string) string { // ValidateKeywords checks if the given denomId begins with `DenomKeywords` func ValidateKeywords(denomId string) error { if regexpKeyword(denomId) { - return sdkerrors.Wrapf(ErrInvalidDenom, "invalid denomId: %s, can not begin with keyword: (%s)", denomId, keywords) + return errormod.Wrapf(ErrInvalidDenom, "invalid denomId: %s, can not begin with keyword: (%s)", denomId, keywords) } return nil } From e600314247793389bbcf815303472d15ab20bcf5 Mon Sep 17 00:00:00 2001 From: dreamer Date: Tue, 14 Nov 2023 16:19:27 +0800 Subject: [PATCH 7/9] fix dependabot alerts --- go.mod | 18 ++++++------- go.sum | 81 +++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 57 insertions(+), 42 deletions(-) diff --git a/go.mod b/go.mod index 6faaa4e4..e57718af 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( cosmossdk.io/api v0.3.1 cosmossdk.io/core v0.5.1 cosmossdk.io/depinject v1.0.0-alpha.3 + cosmossdk.io/errors v1.0.0 cosmossdk.io/math v1.0.1 github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.7.0 @@ -23,7 +24,7 @@ require ( github.com/tidwall/gjson v1.14.4 github.com/xeipuuv/gojsonschema v1.2.0 google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 - google.golang.org/grpc v1.56.2 + google.golang.org/grpc v1.56.3 google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 sigs.k8s.io/yaml v1.3.0 @@ -35,7 +36,6 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.0 // indirect cloud.google.com/go/storage v1.30.1 // indirect - cosmossdk.io/errors v1.0.0 // indirect cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect @@ -77,8 +77,6 @@ require ( github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-playground/validator/v10 v10.11.1 // indirect - github.com/goccy/go-json v0.9.11 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -156,13 +154,13 @@ require ( github.com/zondax/ledger-go v0.14.0 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.11.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect - golang.org/x/net v0.12.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/term v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect @@ -182,7 +180,7 @@ replace ( github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 - github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1 + github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 // Downgraded to avoid bugs in following commits which caused simulations to fail. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) diff --git a/go.sum b/go.sum index b4fd1d57..d52ce75a 100644 --- a/go.sum +++ b/go.sum @@ -259,6 +259,9 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA= +github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -272,6 +275,9 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= @@ -404,8 +410,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= -github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= +github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -421,14 +427,13 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= -github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= -github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU= +github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= @@ -437,9 +442,8 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= -github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= +github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -681,6 +685,8 @@ github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -715,6 +721,7 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= @@ -797,7 +804,7 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= @@ -944,11 +951,11 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= +github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= @@ -996,6 +1003,8 @@ go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1008,13 +1017,12 @@ golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1116,8 +1124,10 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1256,14 +1266,18 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= -golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1275,8 +1289,10 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1568,8 +1584,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= -google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1635,6 +1651,7 @@ nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= From 2699028b980fdc5e0379d98e09a2ce0c1da7a107 Mon Sep 17 00:00:00 2001 From: Dreamer <745124335@qq.com> Date: Tue, 14 Nov 2023 16:33:21 +0800 Subject: [PATCH 8/9] fix dependabot alerts (#382) Co-authored-by: dreamer --- go.mod | 18 ++++++------- go.sum | 81 +++++++++++++++++++++++++++++++++++----------------------- 2 files changed, 57 insertions(+), 42 deletions(-) diff --git a/go.mod b/go.mod index 6faaa4e4..e57718af 100644 --- a/go.mod +++ b/go.mod @@ -6,6 +6,7 @@ require ( cosmossdk.io/api v0.3.1 cosmossdk.io/core v0.5.1 cosmossdk.io/depinject v1.0.0-alpha.3 + cosmossdk.io/errors v1.0.0 cosmossdk.io/math v1.0.1 github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.7.0 @@ -23,7 +24,7 @@ require ( github.com/tidwall/gjson v1.14.4 github.com/xeipuuv/gojsonschema v1.2.0 google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 - google.golang.org/grpc v1.56.2 + google.golang.org/grpc v1.56.3 google.golang.org/protobuf v1.31.0 gopkg.in/yaml.v2 v2.4.0 sigs.k8s.io/yaml v1.3.0 @@ -35,7 +36,6 @@ require ( cloud.google.com/go/compute/metadata v0.2.3 // indirect cloud.google.com/go/iam v1.1.0 // indirect cloud.google.com/go/storage v1.30.1 // indirect - cosmossdk.io/errors v1.0.0 // indirect cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect cosmossdk.io/tools/rosetta v0.2.1 // indirect filippo.io/edwards25519 v1.0.0 // indirect @@ -77,8 +77,6 @@ require ( github.com/go-kit/kit v0.12.0 // indirect github.com/go-kit/log v0.2.1 // indirect github.com/go-logfmt/logfmt v0.5.1 // indirect - github.com/go-playground/validator/v10 v10.11.1 // indirect - github.com/goccy/go-json v0.9.11 // indirect github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/gogo/googleapis v1.4.1 // indirect github.com/gogo/protobuf v1.3.2 // indirect @@ -156,13 +154,13 @@ require ( github.com/zondax/ledger-go v0.14.0 // indirect go.etcd.io/bbolt v1.3.7 // indirect go.opencensus.io v0.24.0 // indirect - golang.org/x/crypto v0.11.0 // indirect + golang.org/x/crypto v0.14.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect - golang.org/x/net v0.12.0 // indirect + golang.org/x/net v0.17.0 // indirect golang.org/x/oauth2 v0.8.0 // indirect - golang.org/x/sys v0.10.0 // indirect - golang.org/x/term v0.10.0 // indirect - golang.org/x/text v0.11.0 // indirect + golang.org/x/sys v0.13.0 // indirect + golang.org/x/term v0.13.0 // indirect + golang.org/x/text v0.13.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect @@ -182,7 +180,7 @@ replace ( github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 - github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1 + github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.9.0 // Downgraded to avoid bugs in following commits which caused simulations to fail. github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 ) diff --git a/go.sum b/go.sum index b4fd1d57..d52ce75a 100644 --- a/go.sum +++ b/go.sum @@ -259,6 +259,9 @@ github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY github.com/btcsuite/btcd/btcutil v1.1.2 h1:XLMbX8JQEiwMcYft2EGi8zPUkoa0abKIU6/BJSRsjzQ= github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U= github.com/bufbuild/protocompile v0.4.0 h1:LbFKd2XowZvQ/kajzguUp2DC9UEIQhIq77fZZlaQsNA= +github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM= +github.com/bytedance/sonic v1.8.0 h1:ea0Xadu+sHlu7x5O3gKhRpQ1IKiMrSiHttPF0ybECuA= +github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U= github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= @@ -272,6 +275,9 @@ github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XL github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s= +github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams= +github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/logex v1.2.1 h1:XHDu3E6q+gdHgsdTPH6ImJMIp436vR6MPtH8gP05QzM= github.com/chzyer/logex v1.2.1/go.mod h1:JLbx6lG2kDbNRFnfkgvh4eRJRPX1QCoOIWomwysCBrQ= @@ -404,8 +410,8 @@ github.com/fsnotify/fsnotify v1.6.0/go.mod h1:sl3t1tCWJFWoRz9R8WJCbQihKKwmorjAbS github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.8.1 h1:4+fr/el88TOO3ewCmQr8cx/CtZ/umlIRIs5M4NTNjf8= -github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk= +github.com/gin-gonic/gin v1.9.0 h1:OjyFBKICoexlu99ctXNR2gg+c5pKrKMuyjgARg9qeY8= +github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k= github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= @@ -421,14 +427,13 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logfmt/logfmt v0.5.1 h1:otpy5pqBCBZ1ng9RQ0dPu4PN7ba75Y/aA+UpowDyNVA= github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb8WugfUU= -github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs= -github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho= -github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA= -github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos= -github.com/go-playground/validator/v10 v10.11.1 h1:prmOlTVv+YjZjmRmNSF3VmspqJIxJWXmqUsHwfTRRkQ= -github.com/go-playground/validator/v10 v10.11.1/go.mod h1:i+3WkQ1FvaUjjxh1kSvIA4dMGDBiPU55YFDl0WbKdWU= +github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU= +github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee h1:s+21KNqlpePfkah2I+gwHF8xmJWRjooY+5248k6m4A0= @@ -437,9 +442,8 @@ github.com/gobwas/pool v0.2.0 h1:QEmUOlnSjWtnpRGHF3SauEiOsy82Cup83Vf2LcMlnc8= github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= github.com/gobwas/ws v1.0.2 h1:CoAavW/wd/kulfZmSIBt6p24n4j7tHgNVCjsfHVNUbo= github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= -github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= -github.com/goccy/go-json v0.9.11 h1:/pAaQDLHEoCq/5FFmSKBswWmK6H0e8g4159Kc/X/nqk= -github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= +github.com/goccy/go-json v0.10.0 h1:mXKd9Qw4NuzShiRlOXKews24ufknHO7gx30lsDyokKA= +github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= @@ -681,6 +685,8 @@ github.com/klauspost/compress v1.12.3/go.mod h1:8dP1Hq4DHOhN9w426knH3Rhby4rFm6D8 github.com/klauspost/compress v1.15.11/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM= github.com/klauspost/compress v1.16.3 h1:XuJt9zzcnaz6a16/OU53ZjWp/v7/42WcR5t2a0PcNQY= github.com/klauspost/compress v1.16.3/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= +github.com/klauspost/cpuid/v2 v2.0.9 h1:lgaqFMSdTdQYdZ04uHyN2d/eKdOMyi2YLSvlQIBFYa4= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= @@ -715,6 +721,7 @@ github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNx github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= +github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= @@ -797,7 +804,7 @@ github.com/pborman/uuid v1.2.0/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtP github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= +github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/pelletier/go-toml/v2 v2.0.7 h1:muncTPStnKRos5dpVKULv2FVd4bMOhNePj9CjgDb8Us= github.com/pelletier/go-toml/v2 v2.0.7/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek= github.com/performancecopilot/speed v3.0.0+incompatible/go.mod h1:/CLtqpZ5gBg1M9iaPbIdPPGyKcA8hKdoy6hAWba7Yac= @@ -944,11 +951,11 @@ github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= -github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo= -github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= -github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= -github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= +github.com/ugorji/go/codec v1.2.9 h1:rmenucSohSTiyL09Y+l2OCk+FrMxGMzho2+tjr5ticU= +github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= github.com/ulikunitz/xz v0.5.10/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= @@ -996,6 +1003,8 @@ go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+ go.uber.org/tools v0.0.0-20190618225709-2cfd321de3ee/go.mod h1:vJERXedbb3MVM5f9Ejo0C68/HhF8uaILCdgjnY+goOA= go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.13.0/go.mod h1:zwrFLgMcdUuIBviXEYEH1YKNaOBnKXsx2IPda5bBwHM= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670 h1:18EFjUmQOcUvxNYSkA6jO9VAiXCnxFY6NyDX0bHDmkU= +golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1008,13 +1017,12 @@ golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200728195943-123391ffb6de/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210421170649-83a5a9bb288b/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= -golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.0.0-20220314234659-1baeb1ce4c0b/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA= -golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio= +golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU= +golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= +golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -1116,8 +1124,10 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco= -golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50= -golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA= +golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws= +golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= +golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1256,14 +1266,18 @@ golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA= -golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= +golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c= -golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o= +golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= +golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1275,8 +1289,10 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= -golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4= -golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1568,8 +1584,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= -google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= +google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1635,6 +1651,7 @@ nhooyr.io/websocket v1.8.6/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0 pgregory.net/rapid v0.5.5 h1:jkgx1TjbQPD/feRoK+S/mXw9e1uj6WilpHrXJowi6oA= pgregory.net/rapid v0.5.5/go.mod h1:PY5XlDGj0+V1FCq0o192FdRhpKHGTRIWBgqjDBTrq04= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= From 30fc061b8f16d76d2e965534cf28dd4f83cc28db Mon Sep 17 00:00:00 2001 From: dreamer <745124335@qq.com> Date: Fri, 17 Nov 2023 16:11:15 +0800 Subject: [PATCH 9/9] modify changelog --- CHANGELOG.md | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2d8400b0..a84328a0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,34 @@ Ref: https://keepachangelog.com/en/1.0.0/ ## [Unreleased] +### Improvements + +* [\#382](https://github.com/irisnet/irismod/pull/382) Fix dependabot alerts. +* [\#381](https://github.com/irisnet/irismod/pull/381) Forbidden to mint nft under ibc class. +* [\#378](https://github.com/irisnet/irismod/pull/378) Support cosmos-sdk `x/nft` api. +* [\#376](https://github.com/irisnet/irismod/pull/376) Bump up cosmos-sdk to v0.47.4. +* [\#374](https://github.com/irisnet/irismod/pull/374) Move proto file to irismod directory. +* [\#369](https://github.com/irisnet/irismod/pull/369) Support cosmos depinject. +* [\#368](https://github.com/irisnet/irismod/pull/368) Remove sdk simapp dep. +* [\#367](https://github.com/irisnet/irismod/pull/367) Lint proto. +* [\#365](https://github.com/irisnet/irismod/pull/365) Remove duplicate events. +* [\#364](https://github.com/irisnet/irismod/pull/364) Migrate token params. +* [\#363](https://github.com/irisnet/irismod/pull/363) Migrate service params. +* [\#362](https://github.com/irisnet/irismod/pull/362) Migrate htlc params. +* [\#361](https://github.com/irisnet/irismod/pull/361) Migrate farm params. +* [\#360](https://github.com/irisnet/irismod/pull/360) Migrate coinswap params. + +### Bug Fixes + +* [\#380](https://github.com/irisnet/irismod/pull/380) Fix farm genesis validation. +* [\#367](https://github.com/irisnet/irismod/pull/367) Fix `mt` module rest url conflict. +* [\#356](https://github.com/irisnet/irismod/pull/356) Replace base64.StdEncoding with base64.RawStdEncoding. +* [\#351](https://github.com/irisnet/irismod/pull/351) Fix wrong addr length of the service module. + +### API Breaking Changes + +* [\#353](https://github.com/irisnet/irismod/pull/353) The commands of the token module only supports the main unit coin + ## [v1.7.3] ### Improvements