diff --git a/Makefile b/Makefile index 78b98e8..f16755c 100755 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ BRANCH := $(shell git rev-parse --abbrev-ref HEAD) COMMIT := $(shell git log -1 --format='%H') -VERSION := v0.2.5 +VERSION := v0.2.6 # don't override user values ifeq (,$(VERSION)) diff --git a/app/app.go b/app/app.go index d3cfad1..82495c2 100644 --- a/app/app.go +++ b/app/app.go @@ -1091,11 +1091,18 @@ func initParamsKeeper( func (app *Uptick) registerUpgradeHandlers() { app.UpgradeKeeper.SetUpgradeHandler( - "v0.2.5", + "v0.2.6", func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { // Refs: // - https://docs.cosmos.network/master/building-modules/upgrade.html#registering-migrations // - https://docs.cosmos.network/master/migrations/chain-upgrade-guide-044.html#chain-upgrade + gs := ibcnfttransfertypes.DefaultGenesisState() + bz, err := ibcnfttransfertypes.ModuleCdc.MarshalJSON(gs) + if err != nil { + panic(fmt.Errorf("failed to ModuleCdc %s: %w", ibcnfttransfertypes.ModuleName, err)) + } + _ = app.mm.Modules[ibcnfttransfertypes.ModuleName].InitGenesis( + ctx, ibcnfttransfertypes.ModuleCdc, bz) return app.mm.RunMigrations(ctx, app.configurator, vm) }) diff --git a/release/uptick-v0.2.5.tar.gz b/release/uptick-v0.2.6.tar.gz similarity index 82% rename from release/uptick-v0.2.5.tar.gz rename to release/uptick-v0.2.6.tar.gz index cb58bfa..5a62995 100644 Binary files a/release/uptick-v0.2.5.tar.gz and b/release/uptick-v0.2.6.tar.gz differ diff --git a/x/collection/client/cli/query.go b/x/collection/client/cli/query.go index 2e212a6..c9180a2 100644 --- a/x/collection/client/cli/query.go +++ b/x/collection/client/cli/query.go @@ -39,7 +39,7 @@ func GetCmdQuerySupply() *cobra.Command { cmd := &cobra.Command{ Use: "supply [denom-id]", Long: "total supply of a collection or owner of NFTs.", - Example: fmt.Sprintf("$ %s query nft supply ", version.AppName), + Example: fmt.Sprintf("$ %s query collection supply ", version.AppName), Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientTxContext(cmd) @@ -82,7 +82,7 @@ func GetCmdQueryOwner() *cobra.Command { cmd := &cobra.Command{ Use: "owner [address]", Long: "Get the NFTs owned by an account address.", - Example: fmt.Sprintf("$ %s query nft owner
--denom-id=", version.AppName), + Example: fmt.Sprintf("$ %s query collection owner
--denom-id=", version.AppName), Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientTxContext(cmd) @@ -125,7 +125,7 @@ func GetCmdQueryCollection() *cobra.Command { cmd := &cobra.Command{ Use: "collection [denom-id]", Long: "Get all the NFTs from a given collection.", - Example: fmt.Sprintf("$ %s query nft collection ", version.AppName), + Example: fmt.Sprintf("$ %s query collection collection ", version.AppName), Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientTxContext(cmd) @@ -162,7 +162,7 @@ func GetCmdQueryDenoms() *cobra.Command { cmd := &cobra.Command{ Use: "denoms", Long: "Query all denominations of all collections of NFTs.", - Example: fmt.Sprintf("$ %s query nft denoms", version.AppName), + Example: fmt.Sprintf("$ %s query collection denoms", version.AppName), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientTxContext(cmd) if err != nil { @@ -191,7 +191,7 @@ func GetCmdQueryDenom() *cobra.Command { cmd := &cobra.Command{ Use: "denom [denom-id]", Long: "Query the denom by the specified denom id.", - Example: fmt.Sprintf("$ %s query nft denom ", version.AppName), + Example: fmt.Sprintf("$ %s query collection denom ", version.AppName), Args: cobra.ExactArgs(1), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientTxContext(cmd) @@ -220,7 +220,7 @@ func GetCmdQueryNFT() *cobra.Command { cmd := &cobra.Command{ Use: "token [denom-id] [nft-id]", Long: "Query a single NFT from a collection.", - Example: fmt.Sprintf("$ %s query nft token ", version.AppName), + Example: fmt.Sprintf("$ %s query collection token ", version.AppName), Args: cobra.ExactArgs(2), RunE: func(cmd *cobra.Command, args []string) error { clientCtx, err := client.GetClientTxContext(cmd) diff --git a/x/collection/client/cli/tx.go b/x/collection/client/cli/tx.go index d63e4d8..306d142 100644 --- a/x/collection/client/cli/tx.go +++ b/x/collection/client/cli/tx.go @@ -44,7 +44,7 @@ func GetCmdIssueDenom() *cobra.Command { Use: "issue [denom-id]", Long: "Issue a new denom.", Example: fmt.Sprintf( - "$ %s tx nft issue "+ + "$ %s tx collection issue "+ "--from= "+ "--name= "+ "--symbol= "+ @@ -140,7 +140,7 @@ func GetCmdMintNFT() *cobra.Command { Use: "mint [denom-id] [nft-id]", Long: "Mint an NFT and set the owner to the recipient.", Example: fmt.Sprintf( - "$ %s tx nft mint "+ + "$ %s tx collection mint "+ "--uri= "+ "--uri-hash= "+ "--recipient= "+ @@ -217,7 +217,7 @@ func GetCmdEditNFT() *cobra.Command { Use: "edit [denom-id] [nft-id]", Long: "Edit the token data of an NFT.", Example: fmt.Sprintf( - "$ %s tx nft edit "+ + "$ %s tx collection edit "+ "--uri= "+ "--uri-hash= "+ "--from= "+ @@ -275,7 +275,7 @@ func GetCmdTransferNFT() *cobra.Command { Use: "transfer [recipient] [denom-id] [nft-id]", Long: "Transfer an NFT to a recipient.", Example: fmt.Sprintf( - "$ %s tx nft transfer "+ + "$ %s tx collection transfer "+ "--uri= "+ "--uri-hash= "+ "--from= "+ @@ -338,7 +338,7 @@ func GetCmdBurnNFT() *cobra.Command { Use: "burn [denom-id] [nft-id]", Long: "Burn an NFT.", Example: fmt.Sprintf( - "$ %s tx nft burn "+ + "$ %s tx collection burn "+ "--from= "+ "--chain-id= "+ "--fees=", @@ -373,7 +373,7 @@ func GetCmdTransferDenom() *cobra.Command { Use: "transfer-denom [recipient] [denom-id]", Long: "Transfer an Denom to a recipient.", Example: fmt.Sprintf( - "$ %s tx nft transfer-denom "+ + "$ %s tx collection transfer-denom "+ "--from= "+ "--chain-id= "+ "--fees=",