Merge pull request #82 from oursky/feat/nft-on-xnft-rc1

StarFerry upgrade.

Author: williamchong

.github/workflows/test.yml

@@ -10,7 +10,7 @@ jobs:
   test:
     name: Run test
     runs-on: ubuntu-latest
-    timeout-minutes: 10
+    timeout-minutes: 15
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3

.gitignore

@@ -12,3 +12,5 @@ build
 dist
 release
 deploy/liked.service
+
+x/likenft/testutil/generated_*

Makefile

@@ -41,7 +41,11 @@ go.sum: go.mod
 install: go.sum $(BUILDDIR)/
 	go install -mod=readonly $(BUILD_FLAGS) ./...
 
-test:
+codegen:
+	go install github.com/golang/mock/mockgen@v1.6.0
+	go generate ./...
+
+test: codegen
 	go test -v ./...
 
 clean:

app/app.go

@@ -97,6 +97,10 @@ import (
 	"github.com/likecoin/likecoin-chain/v3/backport/cosmos-sdk/v0.46.0-rc1/x/nft"
 	nftkeeper "github.com/likecoin/likecoin-chain/v3/backport/cosmos-sdk/v0.46.0-rc1/x/nft/keeper"
 	nftmodule "github.com/likecoin/likecoin-chain/v3/backport/cosmos-sdk/v0.46.0-rc1/x/nft/module"
+
+	"github.com/likecoin/likecoin-chain/v3/x/likenft"
+	likenftkeeper "github.com/likecoin/likecoin-chain/v3/x/likenft/keeper"
+	likenfttypes "github.com/likecoin/likecoin-chain/v3/x/likenft/types"
 )
 
 var (
@@ -138,6 +142,7 @@ var (
 
 		// LikeCoin
 		iscn.AppModuleBasic{},
+		likenft.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -150,6 +155,7 @@ var (
 		govtypes.ModuleName:            {authtypes.Burner},
 		ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
 		nft.ModuleName:                 nil,
+		likenfttypes.ModuleName:        nil,
 	}
 )
 
@@ -188,6 +194,7 @@ type LikeApp struct {
 	FeeGrantKeeper   feegrantkeeper.Keeper
 	IscnKeeper       iscnkeeper.Keeper
 	NftKeeper        nftkeeper.Keeper
+	LikeNftKeeper    likenftkeeper.Keeper
 
 	// make scoped keepers public for test purposes
 	ScopedIBCKeeper      capabilitykeeper.ScopedKeeper
@@ -234,9 +241,10 @@ func NewLikeApp(
 		authzkeeper.StoreKey,
 		iscntypes.StoreKey,
 		nftkeeper.StoreKey,
+		likenfttypes.StoreKey,
 	)
 	tkeys := sdk.NewTransientStoreKeys(paramstypes.TStoreKey)
-	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey)
+	memKeys := sdk.NewMemoryStoreKeys(capabilitytypes.MemStoreKey, likenfttypes.MemStoreKey)
 
 	app := &LikeApp{
 		BaseApp:           bApp,
@@ -265,6 +273,7 @@ func NewLikeApp(
 	ibcTransferSubspace := app.ParamsKeeper.Subspace(ibctransfertypes.ModuleName)
 	ibcHostSubspace := app.ParamsKeeper.Subspace(ibchost.ModuleName)
 	iscnSubspace := app.ParamsKeeper.Subspace(iscntypes.ModuleName)
+	likeNftSubspace := app.ParamsKeeper.Subspace(likenfttypes.ModuleName)
 
 	bApp.SetParamStore(
 		app.ParamsKeeper.Subspace(baseapp.Paramspace).
@@ -316,6 +325,7 @@ func NewLikeApp(
 	app.IscnKeeper = iscnkeeper.NewKeeper(appCodec, keys[iscntypes.StoreKey], app.AccountKeeper, app.BankKeeper, iscnSubspace)
 
 	app.NftKeeper = nftkeeper.NewKeeper(keys[nftkeeper.StoreKey], appCodec, app.AccountKeeper, app.BankKeeper)
+	app.LikeNftKeeper = *likenftkeeper.NewKeeper(app.appCodec, keys[likenfttypes.StoreKey], app.memKeys[likenfttypes.MemStoreKey], likeNftSubspace, app.AccountKeeper, app.BankKeeper, app.IscnKeeper, app.NftKeeper)
 
 	// register the staking hooks
 	// NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks
@@ -394,6 +404,7 @@ func NewLikeApp(
 		authzmodule.NewAppModule(appCodec, app.AuthzKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
 		iscn.NewAppModule(app.IscnKeeper),
 		nftmodule.NewAppModule(appCodec, app.NftKeeper, app.AccountKeeper, app.BankKeeper, app.interfaceRegistry),
+		likenft.NewAppModule(appCodec, app.LikeNftKeeper, app.AccountKeeper, app.BankKeeper),
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that
@@ -422,6 +433,7 @@ func NewLikeApp(
 		paramstypes.ModuleName,
 		iscntypes.ModuleName,
 		nft.ModuleName,
+		likenfttypes.ModuleName,
 	)
 
 	app.mm.SetOrderEndBlockers(
@@ -444,6 +456,7 @@ func NewLikeApp(
 		upgradetypes.ModuleName,
 		iscntypes.ModuleName,
 		nft.ModuleName,
+		likenfttypes.ModuleName,
 	)
 
 	// NOTE: The genutils module must occur after staking so that pools are
@@ -471,6 +484,7 @@ func NewLikeApp(
 		upgradetypes.ModuleName,
 		iscntypes.ModuleName,
 		nft.ModuleName,
+		likenfttypes.ModuleName,
 	)
 
 	app.mm.RegisterInvariants(&app.CrisisKeeper)
@@ -557,7 +571,7 @@ func (app *LikeApp) registerUpgradeHandlers() {
 
 	if upgradeInfo.Name == "v3.0.0" && !app.UpgradeKeeper.IsSkipHeight(upgradeInfo.Height) {
 		storeUpgrades := storetypes.StoreUpgrades{
-			Added: []string{nft.StoreKey},
+			Added: []string{nft.StoreKey, likenfttypes.StoreKey},
 		}
 
 		// configure store loader that checks if version == upgradeHeight and applies store upgrades

go.mod

@@ -6,6 +6,7 @@ require (
 	github.com/cosmos/cosmos-sdk v0.45.6
 	github.com/cosmos/ibc-go/v2 v2.3.0
 	github.com/gogo/protobuf v1.3.3
+	github.com/golang/mock v1.6.0
 	github.com/golang/protobuf v1.5.2
 	github.com/gorilla/mux v1.8.0
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
@@ -19,6 +20,7 @@ require (
 	github.com/tendermint/tm-db v0.6.6
 	google.golang.org/genproto v0.0.0-20211223182754-3ac035c7e7cb
 	google.golang.org/grpc v1.45.0
+	google.golang.org/protobuf v1.27.1
 )
 
 require (
@@ -121,7 +123,6 @@ require (
 	golang.org/x/sys v0.0.0-20220114195835-da31bd327af9 // indirect
 	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect

proto/buf.lock

@@ -8,7 +8,7 @@ deps:
   - remote: buf.build
     owner: cosmos
     repository: cosmos-sdk
-    commit: 5463f864d90d42678e5622499c08548a
+    commit: 5a0f723faed2400d8f1ed75519f1b063
   - remote: buf.build
     owner: cosmos
     repository: gogo-proto

proto/buf.yaml

@@ -10,7 +10,6 @@ lint:
     - UNARY_RPC
     - COMMENT_FIELD
     - SERVICE_SUFFIX
-    - PACKAGE_VERSION_SUFFIX
     - RPC_REQUEST_STANDARD_NAME
     - COMMENT_RPC
     - COMMENT_MESSAGE
@@ -19,7 +18,7 @@ lint:
     - ENUM_VALUE_PREFIX
     - ENUM_ZERO_VALUE_SUFFIX
   ignore:
-    - iscn
+    - likechain/iscn
 breaking:
   use:
     - FILE

proto/iscn/genesis.proto renamed to proto/likechain/iscn/genesis.proto

@@ -3,7 +3,7 @@ syntax = "proto3";
 package likechain.iscn;
 
 import "gogoproto/gogo.proto";
-import "iscn/params.proto";
+import "likechain/iscn/params.proto";
 
 option go_package = "github.com/likecoin/likecoin-chain/v3/x/iscn/types";
 

proto/iscn/iscnid.proto renamed to proto/likechain/iscn/iscnid.proto

@@ -4,7 +4,7 @@ package likechain.iscn;
 
 import "gogoproto/gogo.proto";
 import "google/api/annotations.proto";
-import "iscn/params.proto";
+import "likechain/iscn/params.proto";
 
 option go_package = "github.com/likecoin/likecoin-chain/v3/x/iscn/types";
 

proto/iscn/params.proto renamed to proto/likechain/iscn/params.proto

@@ -3,7 +3,7 @@ syntax = "proto3";
 package likechain.iscn;
 
 import "gogoproto/gogo.proto";
-import "iscn/iscnid.proto";
+import "likechain/iscn/iscnid.proto";
 
 option go_package = "github.com/likecoin/likecoin-chain/v3/x/iscn/types";
 

proto/iscn/query.proto renamed to proto/likechain/iscn/query.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+
+package likechain.likenft.v1;
+
+import "gogoproto/gogo.proto";
+import "likechain/likenft/v1/nft_input.proto";
+
+option go_package = "github.com/likecoin/likecoin-chain/v3/x/likenft/types";
+
+message BlindBoxContent {
+  string class_id = 1;
+  string id = 2;
+  NFTInput input = 3 [(gogoproto.nullable) = false];
+}

proto/iscn/store.proto renamed to proto/likechain/iscn/store.proto

@@ -0,0 +1,59 @@
+syntax = "proto3";
+
+package likechain.likenft.v1;
+
+import "gogoproto/gogo.proto";
+import "google/protobuf/timestamp.proto";
+
+option go_package = "github.com/likecoin/likecoin-chain/v3/x/likenft/types";
+
+message ClassData {
+  bytes metadata = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.customtype) = "JsonInput"
+  ];
+  ClassParent parent = 2 [(gogoproto.nullable) = false];
+  ClassConfig config = 3 [(gogoproto.nullable) = false];
+  BlindBoxState blind_box_state = 4 [(gogoproto.nullable) = false];
+}
+
+enum ClassParentType {
+  UNKNOWN = 0;
+  ISCN = 1;
+  ACCOUNT = 2;
+}
+
+message ClassParent {
+  ClassParentType type = 1;
+  string iscn_id_prefix = 2 [(gogoproto.nullable) = true];
+  uint64 iscn_version_at_mint = 3 [(gogoproto.nullable) = true];
+  string account = 4 [(gogoproto.nullable) = true];
+}
+
+message MintPeriod {
+  google.protobuf.Timestamp start_time = 1 [
+    (gogoproto.stdtime) = true,
+    (gogoproto.nullable) = false
+  ];
+  repeated string allowed_addresses = 2;
+  uint64 mint_price = 3;
+}
+
+message ClassConfig {
+  bool burnable = 1;
+  uint64 max_supply = 2;
+  BlindBoxConfig blind_box_config = 3 [(gogoproto.nullable) = true];
+}
+
+message BlindBoxConfig {
+  repeated MintPeriod mint_periods = 1 [(gogoproto.nullable) = false];
+  google.protobuf.Timestamp reveal_time = 2 [
+    (gogoproto.stdtime) = true,
+    (gogoproto.nullable) = false
+  ];
+}
+
+message BlindBoxState {
+  uint64 content_count = 1;
+  bool to_be_revealed = 2;
+}

proto/iscn/tx.proto renamed to proto/likechain/iscn/tx.proto

@@ -0,0 +1,27 @@
+syntax = "proto3";
+
+package likechain.likenft.v1;
+
+import "gogoproto/gogo.proto";
+import "likechain/likenft/v1/class_data.proto";
+
+option go_package = "github.com/likecoin/likecoin-chain/v3/x/likenft/types";
+
+message ClassInput {
+  string name = 1;
+  string symbol = 2;
+  string description = 3;
+  string uri = 4;
+  string uri_hash = 5;
+  bytes metadata = 6 [
+    (gogoproto.nullable) = false,
+    (gogoproto.customtype) = "JsonInput"
+  ];
+  ClassConfig config = 7 [(gogoproto.nullable) = false];
+}
+
+message ClassParentInput {
+  ClassParentType type = 1;
+  string iscn_id_prefix = 2 [(gogoproto.nullable) = true];
+  // for account, infers to use message sender's address
+}

proto/likechain/likenft/v1/blind_box_content.proto

@@ -0,0 +1,16 @@
+syntax = "proto3";
+
+package likechain.likenft.v1;
+
+import "gogoproto/gogo.proto";
+import "google/protobuf/timestamp.proto";
+
+option go_package = "github.com/likecoin/likecoin-chain/v3/x/likenft/types";
+
+message ClassRevealQueueEntry {
+  google.protobuf.Timestamp reveal_time = 1 [
+    (gogoproto.stdtime) = true,
+    (gogoproto.nullable) = false
+  ];
+  string class_id = 2;
+}

proto/likechain/likenft/v1/class_data.proto

@@ -0,0 +1,17 @@
+syntax = "proto3";
+
+package likechain.likenft.v1;
+
+import "gogoproto/gogo.proto";
+
+option go_package = "github.com/likecoin/likecoin-chain/v3/x/likenft/types";
+
+message ClassesByAccount {
+  string account = 1;
+  repeated string class_ids = 2;
+}
+
+message ClassesByAccountStoreRecord {
+  bytes acc_address = 1 [(gogoproto.casttype) = "github.com/cosmos/cosmos-sdk/types.AccAddress"];
+  repeated string class_ids = 2;
+}

proto/likechain/likenft/v1/class_input.proto

@@ -0,0 +1,10 @@
+syntax = "proto3";
+
+package likechain.likenft.v1;
+
+option go_package = "github.com/likecoin/likecoin-chain/v3/x/likenft/types";
+
+message ClassesByISCN {
+  string iscn_id_prefix = 1;
+  repeated string class_ids = 2;
+}