Added ERC721 fields to post

public-awesome · shanev · Mar 13, 2021 · Mar 10, 2021 · Mar 10, 2021 · Mar 10, 2021
commit d631d6cfbef1dd29966ba98bacb88c9c19c55f82
diff --git a/proto/stargaze/curating/v1beta1/curating.proto b/proto/stargaze/curating/v1beta1/curating.proto
@@ -54,6 +54,24 @@ message Post {
     (gogoproto.moretags) = "yaml:\"total_amount\"",
     (gogoproto.jsontag) = "total_amount"
   ];
+  string chain_id = 11 [
+    (gogoproto.customname) = "ChainID",
+    (gogoproto.moretags) = "yaml:\"chain_id\"",
+    (gogoproto.jsontag) = "chain_id",
+    (gogoproto.nullable) = true
+  ];
+  string owner = 12 [ (gogoproto.moretags) = "yaml:\"owner\"" ];
+  string contract_address = 13
+      [ (gogoproto.moretags) = "yaml:\"contract_address\"" ];
+  string metadata = 14 [ (gogoproto.moretags) = "yaml:\"metadata\"" ];
+  bool locked = 15 [ (gogoproto.moretags) = "yaml:\"locked\"" ];
+  string parent_id = 16 [
+    (gogoproto.customname) = "ParentID",
+    (gogoproto.customtype) = "PostID",
+    (gogoproto.moretags) = "yaml:\"parent_id\"",
+    (gogoproto.jsontag) = "parent_id",
+    (gogoproto.nullable) = true
+  ];
 }
 
 message Upvote {

diff --git a/proto/stargaze/curating/v1beta1/tx.proto b/proto/stargaze/curating/v1beta1/tx.proto
@@ -43,6 +43,22 @@ message MsgPost {
   string reward_account = 4
       [ (gogoproto.moretags) = "yaml:\"reward_account\"" ];
   string body = 5 [ (gogoproto.moretags) = "yaml:\"body\"" ];
+  string chain_id = 6 [
+    (gogoproto.customname) = "ChainID",
+    (gogoproto.moretags) = "yaml:\"chain_id\"",
+    (gogoproto.jsontag) = "chain_id",
+    (gogoproto.nullable) = true
+  ];
+  string contract_address = 7
+      [ (gogoproto.moretags) = "yaml:\"contract_address\"" ];
+  string metadata = 8 [ (gogoproto.moretags) = "yaml:\"metadata\"" ];
+  string parent_id = 9 [
+    (gogoproto.customname) = "ParentID",
+    (gogoproto.customtype) = "PostID",
+    (gogoproto.moretags) = "yaml:\"parent_id\"",
+    (gogoproto.jsontag) = "parent_id",
+    (gogoproto.nullable) = true
+  ];
 }
 
 message MsgUpvote {

diff --git a/x/curating/abci_test.go b/x/curating/abci_test.go
@@ -31,7 +31,19 @@ func setup(t *testing.T) (*simapp.SimApp, sdk.Context) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], addrs[0])
+	err = app.CuratingKeeper.CreatePost(
+		ctx,
+		vendorID,
+		&postID,
+		bodyHash,
+		body,
+		addrs[0],
+		addrs[0],
+		"chain id",
+		nil,
+		"metadata",
+		nil,
+	)
 	require.NoError(t, err)
 
 	_, found, err := app.CuratingKeeper.GetPost(ctx, vendorID, postID)
@@ -159,12 +171,12 @@ func TestEndBlocker_RemoveFromExpiredQueue(t *testing.T) {
 
 	postID, err := types.PostIDFromString("777")
 	require.NoError(t, err)
-	_, err = app.CuratingKeeper.CreatePost(ctx, uint32(1), &postID, bodyHash, body, addrs[0], addrs[0])
+	_, err = app.CuratingKeeper.CreatePost(ctx, uint32(1), postID, bodyHash, body, addrs[0], addrs[0], "", nil, "", nil)
 	require.NoError(t, err)
 
 	postID, err = types.PostIDFromString("888")
 	require.NoError(t, err)
-	_, err = app.CuratingKeeper.CreatePost(ctx, uint32(1), &postID, bodyHash, body, addrs[0], addrs[0])
+	_, err = app.CuratingKeeper.CreatePost(ctx, uint32(1), &postID, bodyHash, body, addrs[0], addrs[0], "", nil, "", nil)
 	require.NoError(t, err)
 
 	// force 2 different keys in the iterator underlying store
@@ -173,7 +185,7 @@ func TestEndBlocker_RemoveFromExpiredQueue(t *testing.T) {
 
 	postID, err = types.PostIDFromString("999")
 	require.NoError(t, err)
-	_, err = app.CuratingKeeper.CreatePost(ctx.WithBlockHeader(b), uint32(1), &postID, bodyHash, body, addrs[0], addrs[0])
+	_, err = app.CuratingKeeper.CreatePost(ctx.WithBlockHeader(b), uint32(1), &postID, bodyHash, body, addrs[0], addrs[0], "", nil, "", nil)
 	require.NoError(t, err)
 
 	// fast-forward blocktime to simulate end of curation window
@@ -217,7 +229,7 @@ func TestEndblocker_BurnCoinsFromVotingPool(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[1], addrs[1])
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[1], addrs[1], "", nil, "", nil)
 	require.NoError(t, err)
 
 	// amt = 1

diff --git a/x/curating/keeper/keeper_test.go b/x/curating/keeper/keeper_test.go
@@ -25,7 +25,16 @@ func TestPost(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], addrs[0])
+	_, err = app.CuratingKeeper.CreatePost(
+		ctx,
+		vendorID,
+		&postID,
+		bodyHash,
+		body,
+		addrs[0],
+		addrs[0],
+		"chain_id", nil, "metadata", nil,
+	)
 	require.NoError(t, err)
 
 	_, found, err := app.CuratingKeeper.GetPost(ctx, vendorID, postID)
@@ -38,7 +47,7 @@ func TestPost(t *testing.T) {
 	vps := app.CuratingKeeper.GetCurationQueueTimeSlice(ctx, ctx.BlockTime())
 	require.NotNil(t, vps)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], addrs[0])
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], addrs[0], "", nil, "", nil)
 	require.Equal(t, types.ErrDuplicatePost, err)
 }
 
@@ -56,7 +65,7 @@ func TestPost_EmptyCreator(t *testing.T) {
 	require.NoError(t, err)
 
 	addrs := simapp.AddTestAddrsIncremental(app, ctx, 3, sdk.NewInt(1000000))
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, nil, addrs[1])
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, nil, addrs[1], "", nil, "", nil)
 	require.NoError(t, err)
 
 	_, found, err := app.CuratingKeeper.GetPost(ctx, vendorID, postID)
@@ -87,7 +96,7 @@ func TestPost_EmptyRewardAccount(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], nil)
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], nil, "", nil, "", nil)
 	require.NoError(t, err)
 
 	_, found, err := app.CuratingKeeper.GetPost(ctx, vendorID, postID)
@@ -115,7 +124,7 @@ func TestPost_WithRewardAccount(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], addrs[1])
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], addrs[1], "", nil, "", nil)
 	require.NoError(t, err)
 
 	_, found, err := app.CuratingKeeper.GetPost(ctx, vendorID, postID)
@@ -146,7 +155,7 @@ func TestDeletePost(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], addrs[1])
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], addrs[1], "", nil, "", nil)
 	require.NoError(t, err)
 
 	_, found, err := app.CuratingKeeper.GetPost(ctx, vendorID, postID)

diff --git a/x/curating/keeper/msg_server.go b/x/curating/keeper/msg_server.go
@@ -43,8 +43,19 @@ func (k msgServer) Post(goCtx context.Context, msg *types.MsgPost) (*types.MsgPo
 		return nil, err
 	}
 
-	post, err := k.CreatePost(
-		ctx, msg.VendorID, &postID, bodyHash, msg.Body, creator, rewardAccount)
+	post, err = k.CreatePost(
+		ctx,
+		msg.VendorID,
+		&postID,
+		bodyHash,
+		msg.Body,
+		creator,
+		rewardAccount,
+		msg.ChainID,
+		creator, // owner = creator intially
+		msg.Metadata,
+		msg.ParentID,
+	)
 	if err != nil {
 		return nil, err
 	}

diff --git a/x/curating/keeper/post.go b/x/curating/keeper/post.go
@@ -35,8 +35,18 @@ func (k Keeper) GetPost(
 
 // CreatePost registers a post on-chain and starts the curation period.
 // It can be called from CreateUpvote() when a post doesn't exist yet.
-func (k Keeper) CreatePost(ctx sdk.Context, vendorID uint32, postID *types.PostID,
-	bodyHash types.BodyHash, body string, creator, rewardAccount sdk.AccAddress) (post types.Post, err error) {
+func (k Keeper) CreatePost(
+	ctx sdk.Context,
+	vendorID uint32,
+	postID *types.PostID,
+	bodyHash types.BodyHash,
+	body string,
+	creator, rewardAccount sdk.AccAddress,
+	chainID string,
+	contractAddress sdk.AccAddress,
+	metadata string,
+	parentID *types.PostID,
+) (post types.Post, err error) {
 
 	err = k.validateVendorID(ctx, vendorID)
 	if err != nil {
@@ -56,6 +66,21 @@ func (k Keeper) CreatePost(ctx sdk.Context, vendorID uint32, postID *types.PostI
 
 	curationWindow := k.GetParams(ctx).CurationWindow
 	curationEndTime := ctx.BlockTime().Add(curationWindow)
+	post := types.NewPost(
+		vendorID,
+		postID,
+		bodyHash,
+		body,
+		creator,
+		rewardAccount,
+		curationEndTime,
+		chainID,
+		creator,
+		contractAddress,
+		metadata,
+		false,
+		parentID,
+	)
 
 	if postID != nil {
 		_, found, err := k.GetPost(ctx, vendorID, *postID)
@@ -91,9 +116,24 @@ func (k Keeper) CreatePost(ctx sdk.Context, vendorID uint32, postID *types.PostI
 			sdk.NewAttribute(types.AttributeKeyBody, body),
 			sdk.NewAttribute(types.AttributeCurationEndTime, curationEndTime.Format(time.RFC3339)),
 			sdk.NewAttribute(types.AttributeKeyVoteDenom, types.DefaultVoteDenom),
+			sdk.NewAttribute(types.AttributeKeyChainID, chainID),
+			sdk.NewAttribute(types.AttributeKeyContractAddress, contractAddress.String()),
+			sdk.NewAttribute(types.AttributeKeyMetadata, metadata),
+			sdk.NewAttribute(types.AttributeKeyLocked, "false"),
 		),
 	})
 
+	if parentID != nil {
+		ctx.EventManager().EmitEvents(sdk.Events{
+			sdk.NewEvent(
+				types.EventTypePost,
+				sdk.NewAttribute(types.AttributeKeyVendorID, fmt.Sprintf("%d", vendorID)),
+				sdk.NewAttribute(types.AttributeKeyPostID, postID.String()),
+				sdk.NewAttribute(types.AttributeKeyParentID, parentID.String()),
+			),
+		})
+	}
+
 	return post, nil
 }
 

diff --git a/x/curating/keeper/post_test.go b/x/curating/keeper/post_test.go
@@ -28,7 +28,7 @@ func TestCreatePost(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], addrs[0])
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[0], addrs[0], "", nil, "", nil)
 	require.NoError(t, err)
 
 	post, found, err := app.CuratingKeeper.GetPost(ctx, vendorID, postID)
@@ -76,7 +76,7 @@ func TestCreateVendor0Post(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, nil, bodyHash, body, addrs[0], addrs[0])
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, nil, bodyHash, body, addrs[0], addrs[0], "", nil, "", nil)
 	require.NoError(t, err)
 
 	post, found, err := app.CuratingKeeper.GetPost(ctx, vendorID, postID)
@@ -96,6 +96,7 @@ func TestCreateVendor0Post(t *testing.T) {
 	// add another post
 	postID, err = types.PostIDFromString("2")
 	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, nil, bodyHash, body, addrs[0], addrs[0])
+	err = app.CuratingKeeper.CreatePost(ctx, vendorID, postID, bodyHash, body, addrs[0], addrs[0], "", nil, "", nil)
 	require.NoError(t, err)
 
 	// fast forward block time

diff --git a/x/curating/keeper/upvote.go b/x/curating/keeper/upvote.go
@@ -41,7 +41,19 @@ func (k Keeper) CreateUpvote(
 	if !found {
 		// no deposit is locked
 		// this curator gets both creator + curator rewards (sent to reward_account)
-		_, err = k.CreatePost(ctx, vendorID, &postID, types.BodyHash{}, "", nil, rewardAccount)
+		_, err = k.CreatePost(
+			ctx,
+			vendorID,
+			&postID,
+			types.BodyHash{},
+			"",
+			nil,
+			rewardAccount,
+			"",
+			nil,
+			"",
+			nil,
+		)
 		if err != nil {
 			return err
 		}

diff --git a/x/curating/keeper/upvote_test.go b/x/curating/keeper/upvote_test.go
@@ -59,7 +59,11 @@ func TestCreateUpvote_ExistingPost(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
+<<<<<<< HEAD
 	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[1], addrs[1])
+=======
+	err = app.CuratingKeeper.CreatePost(ctx, vendorID, postID, bodyHash, body, addrs[1], addrs[1], "", nil, "", nil)
+>>>>>>> a3cf992 (Added ERC721 fields to post)
 	require.NoError(t, err)
 
 	err = app.CuratingKeeper.CreateUpvote(ctx, vendorID, postID, addrs[0], addrs[0], 5)
@@ -98,7 +102,7 @@ func TestCreateUpvote_ExpiredPost(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[1], addrs[1])
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[1], addrs[1], "", nil, "", nil)
 	require.NoError(t, err)
 
 	ctx = ctx.WithBlockTime(ctx.BlockTime().Add(time.Hour*24*3 + 1))
@@ -123,7 +127,7 @@ func TestMultipleUpvotes(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[1], addrs[1])
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, postID, bodyHash, body, addrs[1], addrs[1], "", nil, "", nil)
 	require.NoError(t, err)
 
 	// amt = 1
@@ -164,7 +168,7 @@ func TestCreateUpvote_ExistingUpvote(t *testing.T) {
 	bodyHash, err := types.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, addrs[1], addrs[1])
+	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, postID, bodyHash, body, addrs[1], addrs[1], "", nil, "", nil)
 	require.NoError(t, err)
 
 	err = app.CuratingKeeper.CreateUpvote(ctx, vendorID, postID, addrs[0], addrs[0], 5)

diff --git a/x/curating/types/events.go b/x/curating/types/events.go
@@ -20,6 +20,11 @@ const (
 	AttributeKeyVoteDenom          = "vote_denom"
 	AttributeKeyProtocolRewardType = "reward_type"
 	AttributeKeyRewardAmount       = "reward_amount"
+	AttributeKeyChainID            = "chain_id"
+	AttributeKeyContractAddress    = "contract_address"
+	AttributeKeyMetadata           = "metadata"
+	AttributeKeyParentID           = "parent_id"
+	AttributeKeyLocked             = "locked"
 
 	AttributeValueCategory = ModuleName
 )
diff --git a/x/curating/types/post.go b/x/curating/types/post.go
@@ -119,7 +119,9 @@ type CuratingQueue []VPPair
 // NewPost allocates and returns a new `Post` struct
 func NewPost(
 	vendorID uint32, postID PostID, bodyHash BodyHash, body string, creator,
-	rewardAccount sdk.AccAddress, curatingEndTime time.Time) Post {
+	rewardAccount sdk.AccAddress, curatingEndTime time.Time,
+	chainID string, owner sdk.AccAddress, contractAddress sdk.AccAddress,
+	metaData string, locked bool, parentID *PostID) Post {
 
 	return Post{
 		VendorID:        vendorID,
@@ -131,6 +133,12 @@ func NewPost(
 		CuratingEndTime: curatingEndTime,
 		TotalVotes:      0,
 		TotalAmount:     sdk.Coin{},
+		ChainID:         chainID,
+		Owner:           owner.String(),
+		ContractAddress: contractAddress.String(),
+		Metadata:        metaData,
+		Locked:          locked,
+		ParentID:        parentID,
 	}
 }
 

diff --git a/x/stake/keeper/keeper_test.go b/x/stake/keeper/keeper_test.go
@@ -45,7 +45,19 @@ func TestPerformStakeAndUnstake(t *testing.T) {
 	bodyHash, err := curatingtypes.BodyHashFromString(body)
 	require.NoError(t, err)
 
-	_, err = app.CuratingKeeper.CreatePost(ctx, vendorID, &postID, bodyHash, body, delAddr, delAddr)
+	_, err = app.CuratingKeeper.CreatePost(
+		ctx,
+		vendorID,
+		&postID,
+		bodyHash,
+		body,
+		delAddr,
+		delAddr,
+		"",
+		nil,
+		"",
+		nil,
+	)
 	require.NoError(t, err)
 
 	staking.EndBlocker(ctx, app.StakingKeeper)