Merge branch 'master' into marston/recovery

JackalLabs · Oct 3, 2024 · c5fa895 · c5fa895
2 parents f2f9bc0 + c5c13f8
commit c5fa895
Show file tree

Hide file tree

Showing 28 changed files with 606 additions and 24 deletions.
diff --git a/.github/workflows/cov.yml b/.github/workflows/cov.yml
@@ -30,7 +30,7 @@ jobs:
         go tool cover -func coverage3.out
         rm coverage2.out
         rm coverage.out
-    - uses: codecov/codecov-action@v4.5.0
+    - uses: codecov/codecov-action@v4.6.0
       with:
         token: ${{ secrets.CODECOV }}
 
diff --git a/x/filetree/keeper/msg_server_postkey.go b/x/filetree/keeper/msg_server_postkey.go
@@ -22,13 +22,6 @@ func (k msgServer) PostKey(goCtx context.Context, msg *types.MsgPostKey) (*types
 		),
 	)
 
-	ctx.EventManager().EmitEvent(
-		sdk.NewEvent(
-			types.EventTypePostKey,
-			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
-		),
-	)
-
 	ctx.EventManager().EmitEvent(
 		sdk.NewEvent(
 			types.EventTypeJackalMessage,

diff --git a/x/notifications/keeper/blocks.go b/x/notifications/keeper/blocks.go
@@ -14,6 +14,14 @@ func (k Keeper) SetBlock(ctx sdk.Context, block types.Block) {
 		block.Address,
 		block.BlockedAddress,
 	), b)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventBlock,
+			sdk.NewAttribute(types.AttributeBlocker, block.Address),
+			sdk.NewAttribute(types.AttributeBlockee, block.BlockedAddress),
+		),
+	)
 }
 
 // IsBlocked returns if a user is blocked

diff --git a/x/notifications/keeper/msg_server_block_senders.go b/x/notifications/keeper/msg_server_block_senders.go
@@ -27,5 +27,12 @@ func (k msgServer) BlockSenders(goCtx context.Context, msg *types.MsgBlockSender
 
 	}
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventBlockSenders,
+			sdk.NewAttribute(types.AttributeSigner, msg.Creator),
+		),
+	)
+
 	return &types.MsgBlockSendersResponse{}, nil
 }
diff --git a/x/notifications/keeper/msg_server_create_notifications.go b/x/notifications/keeper/msg_server_create_notifications.go
@@ -39,5 +39,12 @@ func (k msgServer) CreateNotification(goCtx context.Context, msg *types.MsgCreat
 
 	k.SetNotification(ctx, noti)
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventCreateNotification,
+			sdk.NewAttribute(types.AttributeSigner, msg.Creator),
+		),
+	)
+
 	return &types.MsgCreateNotificationResponse{}, nil
 }
diff --git a/x/notifications/keeper/msg_server_delete_notifications.go b/x/notifications/keeper/msg_server_delete_notifications.go
@@ -13,5 +13,12 @@ func (k msgServer) DeleteNotification(goCtx context.Context, msg *types.MsgDelet
 
 	k.RemoveNotification(ctx, msg.Creator, msg.From, msg.Time)
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventRemoveNotification,
+			sdk.NewAttribute(types.AttributeSigner, msg.Creator),
+		),
+	)
+
 	return &types.MsgDeleteNotificationResponse{}, nil
 }
diff --git a/x/notifications/keeper/notifications.go b/x/notifications/keeper/notifications.go
@@ -17,6 +17,15 @@ func (k Keeper) SetNotification(ctx sdk.Context, notification types.Notification
 		notification.From,
 		notification.Time,
 	), b)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventSetNotification,
+			sdk.NewAttribute(types.AttributeTo, notification.To),
+			sdk.NewAttribute(types.AttributeFrom, notification.From),
+			sdk.NewAttribute(types.AttributeWhen, fmt.Sprintf("%d", notification.Time)),
+		),
+	)
 }
 
 // GetNotification returns a notification from its index
@@ -55,6 +64,15 @@ func (k Keeper) RemoveNotification(
 		from,
 		timeStamp,
 	))
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventRemoveNotification,
+			sdk.NewAttribute(types.AttributeTo, to),
+			sdk.NewAttribute(types.AttributeFrom, from),
+			sdk.NewAttribute(types.AttributeWhen, fmt.Sprintf("%d", timeStamp)),
+		),
+	)
 }
 
 // GetAllNotifications returns all notifications

diff --git a/x/notifications/types/events.go b/x/notifications/types/events.go
@@ -0,0 +1,17 @@
+package types
+
+const (
+	EventBlockSenders       = "block_senders"
+	EventBlock              = "block"
+	EventRemoveNotification = "notification_removed"
+	EventCreateNotification = "create_notification"
+	EventSetNotification    = "set_notification"
+
+	AttributeBlocker = "blocker"
+	AttributeBlockee = "blockee"
+	AttributeTo      = "to"
+	AttributeFrom    = "from"
+	AttributeWhen    = "when"
+
+	AttributeSigner = "signer"
+)
diff --git a/x/rns/keeper/bids.go b/x/rns/keeper/bids.go
@@ -13,6 +13,14 @@ func (k Keeper) SetBids(ctx sdk.Context, bids types.Bids) {
 	store.Set(types.BidsKey(
 		bids.Index,
 	), b)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventSetBid,
+			sdk.NewAttribute(types.AttributeName, bids.Name),
+			sdk.NewAttribute(types.AttributeBidder, bids.Bidder),
+		),
+	)
 }
 
 // GetBids returns a bids from its index

diff --git a/x/rns/keeper/forsale.go b/x/rns/keeper/forsale.go
@@ -13,6 +13,15 @@ func (k Keeper) SetForsale(ctx sdk.Context, forsale types.Forsale) {
 	store.Set(types.ForsaleKey(
 		forsale.Name,
 	), b)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventSetSale,
+			sdk.NewAttribute(types.AttributeName, forsale.Name),
+			sdk.NewAttribute(types.AttributeOwner, forsale.Owner),
+			sdk.NewAttribute(types.AttributePrice, forsale.Price),
+		),
+	)
 }
 
 // GetForsale returns a forsale from its index
@@ -42,6 +51,13 @@ func (k Keeper) RemoveForsale(
 	store.Delete(types.ForsaleKey(
 		name,
 	))
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventRemoveSale,
+			sdk.NewAttribute(types.AttributeName, name),
+		),
+	)
 }
 
 // GetAllForsale returns all forsale

diff --git a/x/rns/keeper/msg_server_accept_bid.go b/x/rns/keeper/msg_server_accept_bid.go
@@ -67,6 +67,15 @@ func (k Keeper) AcceptOneBid(ctx sdk.Context, sender string, name string, bidder
 	// Write whois information to the store
 	k.SetNames(ctx, whois)
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventAcceptBid,
+			sdk.NewAttribute(types.AttributeName, fmt.Sprintf("%s.%s", whois.Name, whois.Tld)),
+			sdk.NewAttribute(types.AttributeBidder, bid.Bidder),
+			sdk.NewAttribute(types.AttributeOwner, whois.Value),
+		),
+	)
+
 	return nil
 }
 
@@ -75,5 +84,26 @@ func (k msgServer) AcceptBid(goCtx context.Context, msg *types.MsgAcceptBid) (*t
 
 	err := k.AcceptOneBid(ctx, msg.Creator, msg.Name, msg.From)
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventTypeJackalMessage,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			sdk.EventTypeMessage,
+			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventAcceptBid,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
 	return &types.MsgAcceptBidResponse{}, err
 }
diff --git a/x/rns/keeper/msg_server_add_record.go b/x/rns/keeper/msg_server_add_record.go
@@ -63,5 +63,28 @@ func (k msgServer) AddRecord(goCtx context.Context, msg *types.MsgAddRecord) (*t
 
 	k.SetNames(ctx, whois)
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventAddRecord,
+			sdk.NewAttribute(types.AttributeName, msg.Name),
+			sdk.NewAttribute(types.AttributeOwner, msg.Creator),
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventTypeJackalMessage,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			sdk.EventTypeMessage,
+			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
+		),
+	)
+
 	return &types.MsgAddRecordResponse{}, nil
 }
diff --git a/x/rns/keeper/msg_server_bid.go b/x/rns/keeper/msg_server_bid.go
@@ -43,5 +43,26 @@ func (k msgServer) Bid(goCtx context.Context, msg *types.MsgBid) (*types.MsgBidR
 
 	err := k.AddBid(ctx, msg.Creator, msg.Name, msg.Bid.String())
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventTypeJackalMessage,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			sdk.EventTypeMessage,
+			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventSetBid,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
 	return &types.MsgBidResponse{}, err
 }
diff --git a/x/rns/keeper/msg_server_buy.go b/x/rns/keeper/msg_server_buy.go
@@ -67,6 +67,14 @@ func (k Keeper) BuyName(ctx sdk.Context, sender string, nm string) error {
 	name.Data = "{}"
 	k.SetNames(ctx, name)
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventBuyName,
+			sdk.NewAttribute(types.AttributeName, nm),
+			sdk.NewAttribute(types.AttributeOwner, sender),
+		),
+	)
+
 	return nil
 }
 
@@ -75,5 +83,26 @@ func (k msgServer) Buy(goCtx context.Context, msg *types.MsgBuy) (*types.MsgBuyR
 
 	err := k.BuyName(ctx, msg.Creator, msg.Name)
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventTypeJackalMessage,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			sdk.EventTypeMessage,
+			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventBuyName,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
 	return &types.MsgBuyResponse{}, err
 }
diff --git a/x/rns/keeper/msg_server_cancel_bid.go b/x/rns/keeper/msg_server_cancel_bid.go
@@ -36,6 +36,14 @@ func (k Keeper) CancelOneBid(ctx sdk.Context, sender string, name string) error
 
 	k.RemoveBids(ctx, fmt.Sprintf("%s%s", sender, name))
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventRemoveBid,
+			sdk.NewAttribute(types.AttributeName, name),
+			sdk.NewAttribute(types.AttributeOwner, sender),
+		),
+	)
+
 	return nil
 }
 
@@ -44,5 +52,26 @@ func (k msgServer) CancelBid(goCtx context.Context, msg *types.MsgCancelBid) (*t
 
 	err := k.CancelOneBid(ctx, msg.Creator, msg.Name)
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventTypeJackalMessage,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			sdk.EventTypeMessage,
+			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventRemoveBid,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
 	return &types.MsgCancelBidResponse{}, err
 }
diff --git a/x/rns/keeper/msg_server_del_record.go b/x/rns/keeper/msg_server_del_record.go
@@ -55,5 +55,34 @@ func (k msgServer) DelRecord(goCtx context.Context, msg *types.MsgDelRecord) (*t
 	val.Subdomains = dms
 	k.SetNames(ctx, val)
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventRemoveRecord,
+			sdk.NewAttribute(types.AttributeName, msg.Name),
+			sdk.NewAttribute(types.AttributeOwner, msg.Creator),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventTypeJackalMessage,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			sdk.EventTypeMessage,
+			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventRemoveRecord,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
 	return &types.MsgDelRecordResponse{}, nil
 }