moving storage events (#475)

JackalLabs · Sep 4, 2024 · 02299dc · 02299dc
2 parents 59be453 + 573edbc
commit 02299dc
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 28 deletions.
diff --git a/x/storage/keeper/msg_server_post_file.go b/x/storage/keeper/msg_server_post_file.go
@@ -40,6 +40,35 @@ func (k msgServer) PostFile(goCtx context.Context, msg *types.MsgPostFile) (*typ
 
 	res := &types.MsgPostFileResponse{ProviderIps: ips, StartBlock: ctx.BlockHeight()}
 
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			sdk.EventTypeMessage,
+			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
+		),
+	)
+
+	b := False // pay once event
+	if msg.Expires > 0 {
+		b = True
+	}
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventTypeSignContract,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+			sdk.NewAttribute(types.AttributeKeyContract, hex.EncodeToString(msg.Merkle)),
+			sdk.NewAttribute(types.AttributeKeyPayOnce, b),
+			sdk.NewAttribute(types.AttributeKeyStart, fmt.Sprintf("%d", ctx.BlockHeight())),
+		),
+	)
+
+	ctx.EventManager().EmitEvent(
+		sdk.NewEvent(
+			types.EventTypeJackalMessage,
+			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
+		),
+	)
+
 	totalSize := msg.FileSize * msg.MaxProofs
 	if msg.Expires > 0 { // if the file is posted as a one-time payment
 		kbs := totalSize / 1000
@@ -112,33 +141,5 @@ func (k msgServer) PostFile(goCtx context.Context, msg *types.MsgPostFile) (*typ
 
 	k.SetStoragePaymentInfo(ctx, paymentInfo)
 
-	ctx.EventManager().EmitEvent(
-		sdk.NewEvent(
-			sdk.EventTypeMessage,
-			sdk.NewAttribute(sdk.AttributeKeyModule, types.AttributeValueCategory),
-		),
-	)
-
-	b := False // pay once event
-	if msg.Expires > 0 {
-		b = True
-	}
-
-	ctx.EventManager().EmitEvent(
-		sdk.NewEvent(
-			types.EventTypeSignContract,
-			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
-			sdk.NewAttribute(types.AttributeKeyContract, hex.EncodeToString(msg.Merkle)),
-			sdk.NewAttribute(types.AttributeKeyPayOnce, b),
-		),
-	)
-
-	ctx.EventManager().EmitEvent(
-		sdk.NewEvent(
-			types.EventTypeJackalMessage,
-			sdk.NewAttribute(types.AttributeKeySigner, msg.Creator),
-		),
-	)
-
 	return res, nil
 }
diff --git a/x/storage/types/events.go b/x/storage/types/events.go
@@ -16,6 +16,7 @@ const (
 	AttributeKeySigner   = "signer" // sign storage deal
 	AttributeKeyContract = "file"
 	AttributeKeyPayOnce  = "pay_once"
+	AttributeKeyStart    = "start"
 
 	EventTypeJackalMessage = "jackal_message"
 )