Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

improve nft module #245

Merged
merged 3 commits into from
Jan 13, 2022
Merged

improve nft module #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0094ff6
improve nft module
Jan 13, 2022
6d842b2
format code
Jan 13, 2022
83f8dc6
revert code
Jan 13, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 31 additions & 14 deletions modules/nft/client/cli/cli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ func (s *IntegrationTestSuite) TestNft() {

from := val.Address
tokenName := "Kitty Token"
tokenURI := "uri"
tokenData := "data"
uri := "uri"
uriHash := "uriHash"
description := "description"
data := "data"
tokenID := "kitty"
//owner := "owner"
denomName := "name"
Expand All @@ -73,6 +75,10 @@ func (s *IntegrationTestSuite) TestNft() {
fmt.Sprintf("--%s=%s", nftcli.FlagDenomName, denomName),
fmt.Sprintf("--%s=%s", nftcli.FlagSchema, schema),
fmt.Sprintf("--%s=%s", nftcli.FlagSymbol, symbol),
fmt.Sprintf("--%s=%s", nftcli.FlagURI, uri),
fmt.Sprintf("--%s=%s", nftcli.FlagURIHash, uriHash),
fmt.Sprintf("--%s=%s", nftcli.FlagDescription, description),
fmt.Sprintf("--%s=%s", nftcli.FlagData, data),
fmt.Sprintf("--%s=%t", nftcli.FlagMintRestricted, mintRestricted),
fmt.Sprintf("--%s=%t", nftcli.FlagUpdateRestricted, updateRestricted),

Expand Down Expand Up @@ -101,6 +107,10 @@ func (s *IntegrationTestSuite) TestNft() {
s.Require().Equal(denomName, denomItem.Name)
s.Require().Equal(schema, denomItem.Schema)
s.Require().Equal(symbol, denomItem.Symbol)
s.Require().Equal(uri, denomItem.Uri)
s.Require().Equal(uriHash, denomItem.UriHash)
s.Require().Equal(description, denomItem.Description)
s.Require().Equal(data, denomItem.Data)
s.Require().Equal(mintRestricted, denomItem.MintRestricted)
s.Require().Equal(updateRestricted, denomItem.UpdateRestricted)

Expand All @@ -115,9 +125,10 @@ func (s *IntegrationTestSuite) TestNft() {

//------test GetCmdMintNFT()-------------
args = []string{
fmt.Sprintf("--%s=%s", nftcli.FlagTokenData, tokenData),
fmt.Sprintf("--%s=%s", nftcli.FlagData, data),
fmt.Sprintf("--%s=%s", nftcli.FlagRecipient, from.String()),
fmt.Sprintf("--%s=%s", nftcli.FlagTokenURI, tokenURI),
fmt.Sprintf("--%s=%s", nftcli.FlagURI, uri),
fmt.Sprintf("--%s=%s", nftcli.FlagURIHash, uriHash),
fmt.Sprintf("--%s=%s", nftcli.FlagTokenName, tokenName),

fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
Expand Down Expand Up @@ -149,8 +160,9 @@ func (s *IntegrationTestSuite) TestNft() {
nftItem := respType.(*nfttypes.BaseNFT)
s.Require().Equal(tokenID, nftItem.Id)
s.Require().Equal(tokenName, nftItem.Name)
s.Require().Equal(tokenURI, nftItem.URI)
s.Require().Equal(tokenData, nftItem.Data)
s.Require().Equal(uri, nftItem.URI)
s.Require().Equal(uriHash, nftItem.UriHash)
s.Require().Equal(data, nftItem.Data)
s.Require().Equal(from.String(), nftItem.Owner)

//------test GetCmdQueryOwner()-------------
Expand All @@ -174,10 +186,12 @@ func (s *IntegrationTestSuite) TestNft() {
//------test GetCmdEditNFT()-------------
newTokenDate := "newdata"
newTokenURI := "newuri"
newTokenURIHash := "newuriHash"
newTokenName := "new Kitty Token"
args = []string{
fmt.Sprintf("--%s=%s", nftcli.FlagTokenData, newTokenDate),
fmt.Sprintf("--%s=%s", nftcli.FlagTokenURI, newTokenURI),
fmt.Sprintf("--%s=%s", nftcli.FlagData, newTokenDate),
fmt.Sprintf("--%s=%s", nftcli.FlagURI, newTokenURI),
fmt.Sprintf("--%s=%s", nftcli.FlagURIHash, newTokenURIHash),
fmt.Sprintf("--%s=%s", nftcli.FlagTokenName, newTokenName),

fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
Expand All @@ -200,14 +214,16 @@ func (s *IntegrationTestSuite) TestNft() {
newNftItem := respType.(*nfttypes.BaseNFT)
s.Require().Equal(newTokenName, newNftItem.Name)
s.Require().Equal(newTokenURI, newNftItem.URI)
s.Require().Equal(newTokenURIHash, newNftItem.UriHash)
s.Require().Equal(newTokenDate, newNftItem.Data)

//------test GetCmdTransferNFT()-------------
recipient := sdk.AccAddress(crypto.AddressHash([]byte("dgsbl")))

args = []string{
fmt.Sprintf("--%s=%s", nftcli.FlagTokenData, tokenData),
fmt.Sprintf("--%s=%s", nftcli.FlagTokenURI, tokenURI),
fmt.Sprintf("--%s=%s", nftcli.FlagData, data),
fmt.Sprintf("--%s=%s", nftcli.FlagURI, uri),
fmt.Sprintf("--%s=%s", nftcli.FlagURIHash, uriHash),
fmt.Sprintf("--%s=%s", nftcli.FlagTokenName, tokenName),

fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
Expand All @@ -230,16 +246,17 @@ func (s *IntegrationTestSuite) TestNft() {
nftItem = respType.(*nfttypes.BaseNFT)
s.Require().Equal(tokenID, nftItem.Id)
s.Require().Equal(tokenName, nftItem.Name)
s.Require().Equal(tokenURI, nftItem.URI)
s.Require().Equal(tokenData, nftItem.Data)
s.Require().Equal(uri, nftItem.URI)
s.Require().Equal(uriHash, nftItem.UriHash)
s.Require().Equal(data, nftItem.Data)
s.Require().Equal(recipient.String(), nftItem.Owner)

//------test GetCmdBurnNFT()-------------
newTokenID := "dgsbl"
args = []string{
fmt.Sprintf("--%s=%s", nftcli.FlagTokenData, newTokenDate),
fmt.Sprintf("--%s=%s", nftcli.FlagData, newTokenDate),
fmt.Sprintf("--%s=%s", nftcli.FlagRecipient, from.String()),
fmt.Sprintf("--%s=%s", nftcli.FlagTokenURI, newTokenURI),
fmt.Sprintf("--%s=%s", nftcli.FlagURI, newTokenURI),
fmt.Sprintf("--%s=%s", nftcli.FlagTokenName, newTokenName),

fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
Expand Down
33 changes: 21 additions & 12 deletions modules/nft/client/cli/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ import (
)

const (
FlagTokenName = "name"
FlagTokenURI = "uri"
FlagTokenData = "data"
FlagRecipient = "recipient"
FlagOwner = "owner"
FlagTokenName = "name"
FlagURI = "uri"
FlagURIHash = "uri-hash"
FlagDescription = "description"
FlagRecipient = "recipient"
FlagOwner = "owner"
FlagData = "data"

FlagDenomName = "name"
FlagDenomID = "denom-id"
Expand All @@ -31,22 +33,29 @@ var (

func init() {
FsIssueDenom.String(FlagSchema, "", "Denom data structure definition")
FsIssueDenom.String(FlagURI, "", "The uri for the class metadata stored off chain. It can define schema for Class and NFT `Data` attributes. Optional")
FsIssueDenom.String(FlagURIHash, "", "The uri-hash is a hash of the document pointed by uri. Optional")
FsIssueDenom.String(FlagDescription, "", "The description is a brief description of nft classification. Optional")
FsIssueDenom.String(FlagDenomName, "", "The name of the denom")
FsIssueDenom.String(FlagSymbol, "", "The symbol of the denom")
FsIssueDenom.String(FlagData, "", "The data is the app specific metadata of the NFT class. Optional")
FsIssueDenom.Bool(FlagMintRestricted, false, "mint restricted of nft under denom")
FsIssueDenom.Bool(FlagUpdateRestricted, false, "update restricted of nft under denom")

FsMintNFT.String(FlagTokenURI, "", "URI for supplemental off-chain tokenData (should return a JSON object)")
FsMintNFT.String(FlagRecipient, "", "Receiver of the nft, if not filled, the default is the sender of the transaction")
FsMintNFT.String(FlagTokenData, "", "The origin data of the nft")
FsMintNFT.String(FlagURI, "", "The uri for supplemental off-chain tokenData (should return a JSON object)")
FsMintNFT.String(FlagURIHash, "", "The uri_hash is a hash of the document pointed by uri. Optional")
FsMintNFT.String(FlagRecipient, "", "The receiver of the nft, if not filled, the default is the sender of the transaction")
FsMintNFT.String(FlagData, "", "The origin data of the nft")
FsMintNFT.String(FlagTokenName, "", "The name of the nft")

FsEditNFT.String(FlagTokenURI, "[do-not-modify]", "URI for the supplemental off-chain token data (should return a JSON object)")
FsEditNFT.String(FlagTokenData, "[do-not-modify]", "The token data of the nft")
FsEditNFT.String(FlagURI, "[do-not-modify]", "URI for the supplemental off-chain token data (should return a JSON object)")
FsEditNFT.String(FlagURIHash, "[do-not-modify]", "The uri_hash is a hash of the document pointed by uri. Optional")
FsEditNFT.String(FlagData, "[do-not-modify]", "The token data of the nft")
FsEditNFT.String(FlagTokenName, "[do-not-modify]", "The name of the nft")

FsTransferNFT.String(FlagTokenURI, "[do-not-modify]", "URI for the supplemental off-chain token data (should return a JSON object)")
FsTransferNFT.String(FlagTokenData, "[do-not-modify]", "The token data of the nft")
FsTransferNFT.String(FlagURI, "[do-not-modify]", "URI for the supplemental off-chain token data (should return a JSON object)")
FsTransferNFT.String(FlagURIHash, "[do-not-modify]", "The uri_hash is a hash of the document pointed by uri. Optional")
FsTransferNFT.String(FlagData, "[do-not-modify]", "The token data of the nft")
FsTransferNFT.String(FlagTokenName, "[do-not-modify]", "The name of the nft")

FsQuerySupply.String(FlagOwner, "", "The owner of the nft")
Expand Down
54 changes: 48 additions & 6 deletions modules/nft/client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ func GetCmdIssueDenom() *cobra.Command {
"--mint-restricted=<mint-restricted> "+
"--update-restricted=<update-restricted> "+
"--schema=<schema-content or path to schema.json> "+
"--description=<description> "+
"--uri=<uri> "+
"--uri-hash=<uri-hash> "+
"--data=<data> "+
"--chain-id=<chain-id> "+
"--fees=<fee>",
version.AppName,
Expand Down Expand Up @@ -82,6 +86,22 @@ func GetCmdIssueDenom() *cobra.Command {
if err != nil {
return err
}
uri, err := cmd.Flags().GetString(FlagURI)
if err != nil {
return err
}
uriHash, err := cmd.Flags().GetString(FlagURIHash)
if err != nil {
return err
}
description, err := cmd.Flags().GetString(FlagDescription)
if err != nil {
return err
}
data, err := cmd.Flags().GetString(FlagData)
if err != nil {
return err
}
optionsContent, err := ioutil.ReadFile(schema)
if err == nil {
schema = string(optionsContent)
Expand All @@ -95,6 +115,10 @@ func GetCmdIssueDenom() *cobra.Command {
symbol,
mintRestricted,
updateRestricted,
description,
uri,
uriHash,
data,
)
if err := msg.ValidateBasic(); err != nil {
return err
Expand All @@ -118,6 +142,7 @@ func GetCmdMintNFT() *cobra.Command {
Example: fmt.Sprintf(
"$ %s tx nft mint <denom-id> <nft-id> "+
"--uri=<uri> "+
"--uri-hash=<uri-hash> "+
"--recipient=<recipient> "+
"--from=<key-name> "+
"--chain-id=<chain-id> "+
Expand Down Expand Up @@ -151,11 +176,15 @@ func GetCmdMintNFT() *cobra.Command {
if err != nil {
return err
}
tokenURI, err := cmd.Flags().GetString(FlagTokenURI)
tokenURI, err := cmd.Flags().GetString(FlagURI)
if err != nil {
return err
}
tokenURIHash, err := cmd.Flags().GetString(FlagURIHash)
if err != nil {
return err
}
tokenData, err := cmd.Flags().GetString(FlagTokenData)
tokenData, err := cmd.Flags().GetString(FlagData)
if err != nil {
return err
}
Expand All @@ -165,6 +194,7 @@ func GetCmdMintNFT() *cobra.Command {
args[0],
tokenName,
tokenURI,
tokenURIHash,
tokenData,
sender,
recipient,
Expand All @@ -189,6 +219,7 @@ func GetCmdEditNFT() *cobra.Command {
Example: fmt.Sprintf(
"$ %s tx nft edit <denom-id> <nft-id> "+
"--uri=<uri> "+
"--uri-hash=<uri-hash> "+
"--from=<key-name> "+
"--chain-id=<chain-id> "+
"--fees=<fee>",
Expand All @@ -205,11 +236,15 @@ func GetCmdEditNFT() *cobra.Command {
if err != nil {
return err
}
tokenURI, err := cmd.Flags().GetString(FlagTokenURI)
tokenURI, err := cmd.Flags().GetString(FlagURI)
if err != nil {
return err
}
tokenData, err := cmd.Flags().GetString(FlagTokenData)
tokenURIHash, err := cmd.Flags().GetString(FlagURIHash)
if err != nil {
return err
}
tokenData, err := cmd.Flags().GetString(FlagData)
if err != nil {
return err
}
Expand All @@ -218,6 +253,7 @@ func GetCmdEditNFT() *cobra.Command {
args[0],
tokenName,
tokenURI,
tokenURIHash,
tokenData,
clientCtx.GetFromAddress().String(),
)
Expand All @@ -241,6 +277,7 @@ func GetCmdTransferNFT() *cobra.Command {
Example: fmt.Sprintf(
"$ %s tx nft transfer <recipient> <denom-id> <nft-id> "+
"--uri=<uri> "+
"--uri-hash=<uri-hash> "+
"--from=<key-name> "+
"--chain-id=<chain-id> "+
"--fees=<fee>",
Expand All @@ -261,11 +298,15 @@ func GetCmdTransferNFT() *cobra.Command {
if err != nil {
return err
}
tokenURI, err := cmd.Flags().GetString(FlagTokenURI)
tokenURI, err := cmd.Flags().GetString(FlagURI)
if err != nil {
return err
}
tokenURIHash, err := cmd.Flags().GetString(FlagURIHash)
if err != nil {
return err
}
tokenData, err := cmd.Flags().GetString(FlagTokenData)
tokenData, err := cmd.Flags().GetString(FlagData)
if err != nil {
return err
}
Expand All @@ -274,6 +315,7 @@ func GetCmdTransferNFT() *cobra.Command {
args[1],
tokenName,
tokenURI,
tokenURIHash,
tokenData,
clientCtx.GetFromAddress().String(),
args[0],
Expand Down
24 changes: 18 additions & 6 deletions modules/nft/client/rest/grpc_query_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ func (s *IntegrationTestSuite) TestNft() {

from := val.Address
tokenName := "Kitty Token"
tokenURI := "uri"
tokenData := "data"
uri := "uri"
uriHash := "uriHash"
description := "description"
data := "data"
tokenID := "kitty"
//owner := "owner"
denomName := "name"
Expand All @@ -74,6 +76,10 @@ func (s *IntegrationTestSuite) TestNft() {
fmt.Sprintf("--%s=%s", nftcli.FlagDenomName, denomName),
fmt.Sprintf("--%s=%s", nftcli.FlagSymbol, symbol),
fmt.Sprintf("--%s=%s", nftcli.FlagSchema, schema),
fmt.Sprintf("--%s=%s", nftcli.FlagURI, uri),
fmt.Sprintf("--%s=%s", nftcli.FlagURIHash, uriHash),
fmt.Sprintf("--%s=%s", nftcli.FlagDescription, description),
fmt.Sprintf("--%s=%s", nftcli.FlagData, data),
fmt.Sprintf("--%s=%t", nftcli.FlagMintRestricted, mintRestricted),
fmt.Sprintf("--%s=%t", nftcli.FlagUpdateRestricted, updateRestricted),

Expand Down Expand Up @@ -103,6 +109,10 @@ func (s *IntegrationTestSuite) TestNft() {
s.Require().Equal(denomName, denomItem.Denom.Name)
s.Require().Equal(schema, denomItem.Denom.Schema)
s.Require().Equal(symbol, denomItem.Denom.Symbol)
s.Require().Equal(uri, denomItem.Denom.Uri)
s.Require().Equal(uriHash, denomItem.Denom.UriHash)
s.Require().Equal(description, denomItem.Denom.Description)
s.Require().Equal(data, denomItem.Denom.Data)
s.Require().Equal(mintRestricted, denomItem.Denom.MintRestricted)
s.Require().Equal(updateRestricted, denomItem.Denom.UpdateRestricted)

Expand All @@ -118,9 +128,10 @@ func (s *IntegrationTestSuite) TestNft() {

//------test GetCmdMintNFT()-------------
args = []string{
fmt.Sprintf("--%s=%s", nftcli.FlagTokenData, tokenData),
fmt.Sprintf("--%s=%s", nftcli.FlagData, data),
fmt.Sprintf("--%s=%s", nftcli.FlagRecipient, from.String()),
fmt.Sprintf("--%s=%s", nftcli.FlagTokenURI, tokenURI),
fmt.Sprintf("--%s=%s", nftcli.FlagURI, uri),
fmt.Sprintf("--%s=%s", nftcli.FlagURIHash, uriHash),
fmt.Sprintf("--%s=%s", nftcli.FlagTokenName, tokenName),

fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
Expand Down Expand Up @@ -154,8 +165,9 @@ func (s *IntegrationTestSuite) TestNft() {
nftItem := respType.(*nfttypes.QueryNFTResponse)
s.Require().Equal(tokenID, nftItem.NFT.Id)
s.Require().Equal(tokenName, nftItem.NFT.Name)
s.Require().Equal(tokenURI, nftItem.NFT.URI)
s.Require().Equal(tokenData, nftItem.NFT.Data)
s.Require().Equal(uri, nftItem.NFT.URI)
s.Require().Equal(uriHash, nftItem.NFT.UriHash)
s.Require().Equal(data, nftItem.NFT.Data)
s.Require().Equal(from.String(), nftItem.NFT.Owner)

//------test GetCmdQueryOwner()-------------
Expand Down
Loading