chore: add logs in hook handlers

x/lease/client/cli/flags.go

@@ -0,0 +1,6 @@
+package cli
+
+const (
+	flagDenom     = "denom"
+	flagRenewable = "renewable"
+)

x/lease/client/cli/tx.go

@@ -47,9 +47,9 @@ func txEndLease() *cobra.Command {
 
 func txRenewLease() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "renew-lease [id] [hours] [denom]",
+		Use:   "renew-lease [id] [hours]",
 		Short: "Renew an existing lease for a specified duration",
-		Args:  cobra.ExactArgs(3),
+		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx, err := client.GetClientTxContext(cmd)
 			if err != nil {
@@ -66,11 +66,16 @@ func txRenewLease() *cobra.Command {
 				return err
 			}
 
+			denom, err := cmd.Flags().GetString(flagDenom)
+			if err != nil {
+				return err
+			}
+
 			msg := v1.NewMsgRenewLeaseRequest(
 				ctx.FromAddress.Bytes(),
 				id,
 				hours,
-				args[2],
+				denom,
 			)
 			if err = msg.ValidateBasic(); err != nil {
 				return err
@@ -81,15 +86,16 @@ func txRenewLease() *cobra.Command {
 	}
 
 	flags.AddTxFlagsToCmd(cmd)
+	cmd.Flags().String(flagDenom, "", "Specify the payment denomination for the lease")
 
 	return cmd
 }
 
 func txStartLease() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "start-lease [node-addr] [hours] [denom] [renewable]",
+		Use:   "start-lease [node-addr] [hours]",
 		Short: "Start a lease with a node for the specified duration",
-		Args:  cobra.ExactArgs(4),
+		Args:  cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx, err := client.GetClientTxContext(cmd)
 			if err != nil {
@@ -106,7 +112,12 @@ func txStartLease() *cobra.Command {
 				return err
 			}
 
-			renewable, err := strconv.ParseBool(args[3])
+			denom, err := cmd.Flags().GetString(flagDenom)
+			if err != nil {
+				return err
+			}
+
+			renewable, err := cmd.Flags().GetBool(flagRenewable)
 			if err != nil {
 				return err
 			}
@@ -115,7 +126,7 @@ func txStartLease() *cobra.Command {
 				ctx.FromAddress.Bytes(),
 				nodeAddr,
 				hours,
-				args[2],
+				denom,
 				renewable,
 			)
 			if err = msg.ValidateBasic(); err != nil {
@@ -127,15 +138,17 @@ func txStartLease() *cobra.Command {
 	}
 
 	flags.AddTxFlagsToCmd(cmd)
+	cmd.Flags().String(flagDenom, "", "Specify the payment denomination for the lease")
+	cmd.Flags().Bool(flagRenewable, false, "Specify if the lease is renewable")
 
 	return cmd
 }
 
 func txUpdateLease() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "update-lease [id] [renewable]",
+		Use:   "update-lease [id]",
 		Short: "Update the details of an existing lease",
-		Args:  cobra.ExactArgs(2),
+		Args:  cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			ctx, err := client.GetClientTxContext(cmd)
 			if err != nil {
@@ -147,7 +160,7 @@ func txUpdateLease() *cobra.Command {
 				return err
 			}
 
-			renewable, err := strconv.ParseBool(args[1])
+			renewable, err := cmd.Flags().GetBool(flagRenewable)
 			if err != nil {
 				return err
 			}
@@ -166,6 +179,7 @@ func txUpdateLease() *cobra.Command {
 	}
 
 	flags.AddTxFlagsToCmd(cmd)
+	cmd.Flags().Bool(flagRenewable, false, "Specify if the lease is renewable")
 
 	return cmd
 }

x/lease/keeper/hooks.go

@@ -11,6 +11,8 @@ import (
 
 // NodeInactivePreHook is triggered when a node becomes inactive. It ends all leases associated with the specified node address.
 func (k *Keeper) NodeInactivePreHook(ctx sdk.Context, addr base.NodeAddress) error {
+	k.Logger(ctx).Info("Running node inactive pre-hook", "address", addr.String())
+
 	// Iterate through all leases associated with the given node address
 	return k.IterateLeasesForNode(ctx, addr, func(_ int, item v1.Lease) (bool, error) {
 		// Create a message to end the lease
@@ -39,6 +41,8 @@ func (k *Keeper) NodeInactivePreHook(ctx sdk.Context, addr base.NodeAddress) err
 
 // ProviderInactivePreHook is triggered when a provider becomes inactive. It ends all leases associated with the specified provider address.
 func (k *Keeper) ProviderInactivePreHook(ctx sdk.Context, addr base.ProvAddress) error {
+	k.Logger(ctx).Info("Running provider inactive pre-hook", "address", addr.String())
+
 	// Iterate through all leases associated with the given provider address
 	return k.IterateLeasesForProvider(ctx, addr, func(_ int, item v1.Lease) (bool, error) {
 		// Create a message to end the lease

x/lease/services/v1/msg_server.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 
 	"github.com/sentinel-official/hub/v12/x/lease/keeper"
 	"github.com/sentinel-official/hub/v12/x/lease/types/v1"
@@ -28,8 +26,9 @@ func (m *msgServer) MsgEndLease(c context.Context, req *v1.MsgEndLeaseRequest) (
 	return m.HandleMsgEndLease(ctx, req)
 }
 
-func (m *msgServer) MsgRenewLease(_ context.Context, _ *v1.MsgRenewLeaseRequest) (*v1.MsgRenewLeaseResponse, error) {
-	return nil, status.Error(codes.Unimplemented, "")
+func (m *msgServer) MsgRenewLease(c context.Context, req *v1.MsgRenewLeaseRequest) (*v1.MsgRenewLeaseResponse, error) {
+	ctx := sdk.UnwrapSDKContext(c)
+	return m.HandleMsgRenewLease(ctx, req)
 }
 
 func (m *msgServer) MsgStartLease(c context.Context, req *v1.MsgStartLeaseRequest) (*v1.MsgStartLeaseResponse, error) {

x/node/keeper/hooks.go

@@ -12,6 +12,8 @@ import (
 
 // SessionInactivePreHook handles operations when a session transitions to the inactive state.
 func (k *Keeper) SessionInactivePreHook(ctx sdk.Context, id uint64) error {
+	k.Logger(ctx).Info("Running session inactive pre-hook", "id", id)
+
 	// Retrieve the session by ID and return an error if not found.
 	item, found := k.GetSession(ctx, id)
 	if !found {

x/oracle/keeper/abci.go

@@ -18,13 +18,13 @@ func (k *Keeper) BeginBlock(ctx sdk.Context) {
 
 	portID := k.GetPortID(ctx)
 	if portID == "" {
-		ctx.Logger().Info("PortID is empty, skipping BeginBlock execution")
+		k.Logger(ctx).Info("PortID is empty, skipping BeginBlock execution")
 		return
 	}
 
 	channelID := k.GetChannelID(ctx)
 	if channelID == "" {
-		ctx.Logger().Info("ChannelID is empty, skipping BeginBlock execution")
+		k.Logger(ctx).Info("ChannelID is empty, skipping BeginBlock execution")
 		return
 	}
 
@@ -33,7 +33,7 @@ func (k *Keeper) BeginBlock(ctx sdk.Context) {
 	// Get the channel capability to ensure we have the authority to send packets.
 	channelCap, found := k.capability.GetCapability(ctx, ibchost.ChannelCapabilityPath(portID, channelID))
 	if !found {
-		ctx.Logger().Info("Channel capability not found, skipping BeginBlock execution")
+		k.Logger(ctx).Info("Channel capability not found, skipping BeginBlock execution")
 		return
 	}
 
@@ -53,7 +53,7 @@ func (k *Keeper) BeginBlock(ctx sdk.Context) {
 		// Send the GetProtoRevPool query packet over IBC.
 		sequence, err := k.SendQueryPacket(ctx, channelCap, portID, channelID, uint64(timeout), req)
 		if err != nil {
-			ctx.Logger().Error("Failed to send query packet", "asset", item.Denom, "error", err)
+			k.Logger(ctx).Error("Failed to send query packet", "asset", item.Denom, "error", err)
 			return false
 		}
 

x/oracle/keeper/keeper.go

@@ -1,11 +1,14 @@
 package keeper
 
 import (
+	"github.com/cometbft/cometbft/libs/log"
 	"github.com/cosmos/cosmos-sdk/codec"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	ibcporttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+
+	"github.com/sentinel-official/hub/v12/x/oracle/types"
 )
 
 type Keeper struct {
@@ -34,6 +37,10 @@ func (k *Keeper) GetAuthority() string {
 	return k.authority
 }
 
+func (k *Keeper) Logger(ctx sdk.Context) log.Logger {
+	return ctx.Logger().With("module", "x/"+types.ModuleName)
+}
+
 func (k *Keeper) Store(ctx sdk.Context) sdk.KVStore {
 	return ctx.KVStore(k.key)
 }

x/plan/keeper/hooks.go

@@ -13,6 +13,8 @@ import (
 
 // LeaseInactivePreHook handles the necessary operations when a lease becomes inactive.
 func (k *Keeper) LeaseInactivePreHook(ctx sdk.Context, id uint64) error {
+	k.Logger(ctx).Info("Running lease inactive pre-hook", "id", id)
+
 	// Retrieve the lease by ID and check if it exists, return an error if not found.
 	lease, found := k.GetLease(ctx, id)
 	if !found {
@@ -58,6 +60,8 @@ func (k *Keeper) LeaseInactivePreHook(ctx sdk.Context, id uint64) error {
 
 // ProviderInactivePreHook handles the necessary operations when a provider becomes inactive.
 func (k *Keeper) ProviderInactivePreHook(ctx sdk.Context, addr base.ProvAddress) error {
+	k.Logger(ctx).Info("Running provider inactive pre-hook", "address", addr.String())
+
 	// Iterate through all plans associated with the given provider address.
 	return k.IteratePlansForProvider(ctx, addr, func(_ int, item v3.Plan) (bool, error) {
 		// Check if the plan status is active; if not, skip to the next plan.

x/session/keeper/hooks.go

@@ -12,6 +12,8 @@ import (
 
 // NodeInactivePreHook handles the necessary operations when a node becomes inactive.
 func (k *Keeper) NodeInactivePreHook(ctx sdk.Context, addr base.NodeAddress) error {
+	k.Logger(ctx).Info("Running node inactive pre-hook", "address", addr.String())
+
 	// Iterate through all active sessions associated with the given node address.
 	return k.IterateSessionsForNode(ctx, addr, func(_ int, item v3.Session) (bool, error) {
 		// Skip the session if it is not active.
@@ -45,6 +47,8 @@ func (k *Keeper) NodeInactivePreHook(ctx sdk.Context, addr base.NodeAddress) err
 
 // SubscriptionInactivePendingPreHook handles the necessary operations when a subscription becomes inactive pending.
 func (k *Keeper) SubscriptionInactivePendingPreHook(ctx sdk.Context, id uint64) error {
+	k.Logger(ctx).Info("Running subscription inactive pending pre-hook", "id", id)
+
 	// Iterate through all active sessions associated with the given subscription ID.
 	return k.IterateSessionsForSubscription(ctx, id, func(_ int, item v3.Session) (bool, error) {
 		// Skip the session if it is not active.
@@ -78,6 +82,8 @@ func (k *Keeper) SubscriptionInactivePendingPreHook(ctx sdk.Context, id uint64)
 
 // PlanUnlinkNodePreHook handles the necessary operations when unlinking a node from a plan.
 func (k *Keeper) PlanUnlinkNodePreHook(ctx sdk.Context, id uint64, addr base.NodeAddress) error {
+	k.Logger(ctx).Info("Running plan unlink node pre-hook", "id", id, "address", addr.String())
+
 	// Iterate through all active sessions associated with the given plan ID and node address.
 	return k.IterateSessionsForPlanByNode(ctx, id, addr, func(_ int, item v3.Session) (bool, error) {
 		// Skip the session if it is not active.

x/subscription/keeper/hooks.go

@@ -11,6 +11,8 @@ import (
 
 // SessionInactivePreHook handles the necessary operations when a session becomes inactive.
 func (k *Keeper) SessionInactivePreHook(ctx sdk.Context, id uint64) error {
+	k.Logger(ctx).Info("Running session inactive pre-hook", "id", id)
+
 	// Retrieve the session by ID; return an error if not found.
 	item, found := k.GetSession(ctx, id)
 	if !found {

x/subscription/services/v3/msg_server.go

@@ -4,8 +4,6 @@ import (
 	"context"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
 
 	"github.com/sentinel-official/hub/v12/x/subscription/keeper"
 	"github.com/sentinel-official/hub/v12/x/subscription/types/v3"
@@ -28,8 +26,9 @@ func (m *msgServer) MsgCancelSubscription(c context.Context, req *v3.MsgCancelSu
 	return m.HandleMsgCancelSubscription(ctx, req)
 }
 
-func (m *msgServer) MsgRenewSubscription(_ context.Context, _ *v3.MsgRenewSubscriptionRequest) (*v3.MsgRenewSubscriptionResponse, error) {
-	return nil, status.Error(codes.Unimplemented, "")
+func (m *msgServer) MsgRenewSubscription(c context.Context, req *v3.MsgRenewSubscriptionRequest) (*v3.MsgRenewSubscriptionResponse, error) {
+	ctx := sdk.UnwrapSDKContext(c)
+	return m.HandleMsgRenewSubscription(ctx, req)
 }
 
 func (m *msgServer) MsgShareSubscription(c context.Context, req *v3.MsgShareSubscriptionRequest) (*v3.MsgShareSubscriptionResponse, error) {