Receive keep alive messages from pigeon #387

proto/valset/params.proto

@@ -8,5 +8,4 @@ option go_package = "github.com/palomachain/paloma/x/valset/types";
 // Params defines the parameters for the module.
 message Params {
   option (gogoproto.goproto_stringer) = false;
-
 }

proto/valset/query.proto

@@ -6,6 +6,7 @@ import "google/api/annotations.proto";
 import "cosmos/base/query/v1beta1/pagination.proto";
 import "valset/params.proto";
 import "valset/snapshot.proto";
+import "google/protobuf/timestamp.proto";
 // this line is used by starport scaffolding # 1
 
 option go_package = "github.com/palomachain/paloma/x/valset/types";
@@ -26,6 +27,11 @@ service Query {
 		option (google.api.http).get = "/palomachain/paloma/valset/get_snapshot_by_id/{snapshotId}";
 	}
 
+// Queries a list of GetValidatorAliveUntil items.
+	rpc GetValidatorAliveUntil(QueryGetValidatorAliveUntilRequest) returns (QueryGetValidatorAliveUntilResponse) {
+		option (google.api.http).get = "/palomachain/paloma/valset/get_validator_alive_until";
+	}
+
 // this line is used by starport scaffolding # 2
 }
 
@@ -54,4 +60,16 @@ message QueryGetSnapshotByIDResponse {
   Snapshot snapshot = 1;
 }
 
+message QueryGetValidatorAliveUntilRequest {
+  bytes valAddress = 1[ (gogoproto.casttype) =
+                         "github.com/cosmos/cosmos-sdk/types.ValAddress" ];
+}
+
+message QueryGetValidatorAliveUntilResponse {
+  google.protobuf.Timestamp aliveUntil = 1 [
+    (gogoproto.nullable) = false,
+    (gogoproto.stdtime) = true
+  ];
+}
+
 // this line is used by starport scaffolding # 3

proto/valset/tx.proto

@@ -10,6 +10,7 @@ option go_package = "github.com/palomachain/paloma/x/valset/types";
 // Msg defines the Msg service.
 service Msg {
   rpc AddExternalChainInfoForValidator(MsgAddExternalChainInfoForValidator) returns (MsgAddExternalChainInfoForValidatorResponse);
+  rpc KeepAlive(MsgKeepAlive) returns (MsgKeepAliveResponse);
 // this line is used by starport scaffolding # proto/tx/rpc
 }
 
@@ -21,4 +22,11 @@ message MsgAddExternalChainInfoForValidator {
 message MsgAddExternalChainInfoForValidatorResponse {
 }
 
+message MsgKeepAlive {
+  string creator = 1;
+}
+
+message MsgKeepAliveResponse {
+}
+
 // this line is used by starport scaffolding # proto/tx/message

util/keeper/iter.go

@@ -20,6 +20,16 @@ func IterAll[T codec.ProtoMarshaler](store sdk.KVStore, pu protoUnmarshaler) ([]
 	return keys, res, nil
 }
 
+func IterAllRaw(store sdk.KVStore, pu protoUnmarshaler) (keys [][]byte, values [][]byte, _err error) {
+	iterator := store.Iterator(nil, nil)
+	defer iterator.Close()
+	for ; iterator.Valid(); iterator.Next() {
+		keys = append(keys, iterator.Key())
+		values = append(values, iterator.Value())
+	}
+	return
+}
+
 func IterAllFnc[T codec.ProtoMarshaler](store sdk.KVStore, pu protoUnmarshaler, fnc func([]byte, T) bool) error {
 	res := []T{}
 	iterator := store.Iterator(nil, nil)

x/consensus/keeper/msg_server.go

@@ -36,6 +36,10 @@ func (k msgServer) AddMessagesSignatures(goCtx context.Context, msg *types.MsgAd
 	); err != nil {
 		return nil, err
 	}
+	err := k.Keeper.valset.KeepValidatorAlive(ctx, valAddr)
+	if err != nil {
+		return nil, err
+	}
 
 	return &types.MsgAddMessagesSignaturesResponse{}, nil
 }

x/consensus/keeper/msg_server_add_evidence.go

@@ -23,5 +23,10 @@ func (k msgServer) AddEvidence(goCtx context.Context, msg *types.MsgAddEvidence)
 		return nil, err
 	}
 
+	err = k.Keeper.valset.KeepValidatorAlive(ctx, valAddr)
+	if err != nil {
+		return nil, err
+	}
+
 	return &types.MsgAddEvidenceResponse{}, nil
 }

x/consensus/keeper/msg_server_set_public_access_data.go

@@ -22,6 +22,10 @@ func (k msgServer) SetPublicAccessData(goCtx context.Context, msg *types.MsgSetP
 	if err != nil {
 		return nil, err
 	}
+	err = k.Keeper.valset.KeepValidatorAlive(ctx, valAddr)
+	if err != nil {
+		return nil, err
+	}
 
 	return &types.MsgSetPublicAccessDataResponse{}, nil
 }

x/consensus/types/expected_keepers.go

@@ -23,4 +23,5 @@ type ValsetKeeper interface {
 	GetSigningKey(ctx sdk.Context, valAddr sdk.ValAddress, chainType, chainReferenceID, signedByAddress string) ([]byte, error)
 	GetCurrentSnapshot(ctx sdk.Context) (*valsettypes.Snapshot, error)
 	CanAcceptValidator(ctx sdk.Context, valAddr sdk.ValAddress) error
+	KeepValidatorAlive(ctx sdk.Context, valAddr sdk.ValAddress) error
 }

x/evm/types/expected_keepers.go

@@ -29,4 +29,5 @@ type ConsensusKeeper interface {
 type ValsetKeeper interface {
 	FindSnapshotByID(ctx sdk.Context, id uint64) (*valsettypes.Snapshot, error)
 	GetCurrentSnapshot(ctx sdk.Context) (*valsettypes.Snapshot, error)
+	KeepValidatorAlive(ctx sdk.Context, valAddr sdk.ValAddress) error
 }

x/valset/client/cli/query.go

@@ -29,6 +29,8 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
 
 	cmd.AddCommand(CmdGetSnapshotByID())
 
+	cmd.AddCommand(CmdGetValidatorAliveUntil())
+
 	// this line is used by starport scaffolding # 1
 
 	return cmd

x/valset/client/cli/query_get_validator_alive_until.go

@@ -0,0 +1,42 @@
+package cli
+
+import (
+	"strconv"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/palomachain/paloma/x/valset/types"
+	"github.com/spf13/cobra"
+)
+
+var _ = strconv.Itoa(0)
+
+func CmdGetValidatorAliveUntil() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "get-validator-alive-until",
+		Short: "Query GetValidatorAliveUntil",
+		Args:  cobra.ExactArgs(0),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := types.NewQueryClient(clientCtx)
+
+			params := &types.QueryGetValidatorAliveUntilRequest{}
+
+			res, err := queryClient.GetValidatorAliveUntil(cmd.Context(), params)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(res)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}

x/valset/client/cli/tx.go

@@ -31,6 +31,7 @@ func GetTxCmd() *cobra.Command {
 	}
 
 	cmd.AddCommand(CmdAddExternalChainInfoForValidator())
+	cmd.AddCommand(CmdKeepAlive())
 	// this line is used by starport scaffolding # 1
 
 	return cmd

x/valset/client/cli/tx_keep_alive.go

@@ -0,0 +1,40 @@
+package cli
+
+import (
+	"strconv"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/cosmos/cosmos-sdk/client/tx"
+	"github.com/palomachain/paloma/x/valset/types"
+	"github.com/spf13/cobra"
+)
+
+var _ = strconv.Itoa(0)
+
+func CmdKeepAlive() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "keep-alive",
+		Short: "Broadcast message KeepAlive",
+		Args:  cobra.ExactArgs(0),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			msg := types.NewMsgKeepAlive(
+				clientCtx.GetFromAddress().String(),
+			)
+			if err := msg.ValidateBasic(); err != nil {
+				return err
+			}
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+		},
+	}
+
+	flags.AddTxFlagsToCmd(cmd)
+
+	return cmd
+}

x/valset/handler.go

@@ -20,6 +20,9 @@ func NewHandler(k keeper.Keeper) sdk.Handler {
 		case *types.MsgAddExternalChainInfoForValidator:
 			res, err := msgServer.AddExternalChainInfoForValidator(sdk.WrapSDKContext(ctx), msg)
 			return sdk.WrapServiceResult(ctx, res, err)
+		case *types.MsgKeepAlive:
+			res, err := msgServer.KeepAlive(sdk.WrapSDKContext(ctx), msg)
+			return sdk.WrapServiceResult(ctx, res, err)
 			// this line is used by starport scaffolding # 1
 		default:
 			errMsg := fmt.Sprintf("unrecognized %s message type: %T", types.ModuleName, msg)

x/valset/keeper/errors.go

@@ -6,6 +6,7 @@ import (
 
 const (
 	ErrValidatorWithAddrNotFound   = whoops.Errorf("validator with addr %s was not found")
+	ErrValidatorNotInKeepAlive     = whoops.Errorf("validator is not in keep alive store %s")
 	ErrMaxNumberOfExternalAccounts = whoops.Errorf("trying to submit %d accounts while the limit is %d")
 	ErrValidatorCannotBePigeon     = whoops.Errorf("validator %s cannot be a pigeon")