Merge pull request #47 from Lorenzo-Protocol/restore_add_receivers

fix(btcstaking): restore AddReceiver/RemoveReceiver

proto/lorenzo/btcstaking/v1/query.proto

@@ -23,8 +23,8 @@ message QueryParamsResponse {
 }
 
 message StakingRecordDisplay {
-    string txId = 1;
-    string mintToAddress = 2;
+    string tx_id = 1;
+    string mint_to_address = 2;
     string amount = 3;
     string btc_receiver_name = 4;
     string btc_receiver_addr = 5;

proto/lorenzo/btcstaking/v1/tx.proto

@@ -17,6 +17,10 @@ service Msg {
 
   rpc Burn(MsgBurnRequest) returns (MsgBurnResponse);
 
+  rpc AddReceiver(MsgAddReceiver) returns (MsgAddReceiverResponse);
+
+  rpc RemoveReceiver(MsgRemoveReceiver) returns (MsgRemoveReceiverResponse);
+
   rpc UpdateParams(MsgUpdateParams) returns (MsgUpdateParamsResponse);
 }
 
@@ -63,6 +67,23 @@ message MsgBurnRequest {
 
 message MsgBurnResponse{}
 
+message MsgAddReceiver {
+  option (cosmos.msg.v1.signer) = "authority";
+
+  string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+
+  Receiver receiver = 2 [ (gogoproto.nullable) = false ];
+}
+
+message MsgAddReceiverResponse {}
+message MsgRemoveReceiver {
+  option (cosmos.msg.v1.signer) = "authority";
+
+  string authority = 1 [ (cosmos_proto.scalar) = "cosmos.AddressString" ];
+
+  string receiver = 2 ;
+}
+message MsgRemoveReceiverResponse {}
 message MsgUpdateParams {
   option (cosmos.msg.v1.signer) = "authority";
 

x/btcstaking/client/cli/query.go

@@ -31,9 +31,10 @@ func GetQueryCmd(queryRoute string) *cobra.Command {
 
 func CmdGetParams() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-params",
-		Short: "get btc staking params",
-		Args:  cobra.NoArgs,
+		Use:     "get-params",
+		Aliases: []string{"params"},
+		Short:   "get btc staking params",
+		Args:    cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			queryClient := types.NewQueryClient(clientCtx)
@@ -52,9 +53,10 @@ func CmdGetParams() *cobra.Command {
 
 func CmdGetBTCStakingRecord() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:   "get-btc-staking-record [btc_staking_tx_id]",
-		Short: "get the btc staking record",
-		Args:  cobra.ExactArgs(1),
+		Use:     "get-btc-staking-record [btc_staking_tx_id]",
+		Aliases: []string{"record"},
+		Short:   "get the btc staking record",
+		Args:    cobra.ExactArgs(1),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			queryClient := types.NewQueryClient(clientCtx)
@@ -63,6 +65,9 @@ func CmdGetBTCStakingRecord() *cobra.Command {
 				return err
 			}
 			res, err := queryClient.StakingRecord(cmd.Context(), &types.QueryStakingRecordRequest{TxHash: txHashBytes[:]})
+			if err != nil {
+				return err
+			}
 			if res.Record == nil {
 				return fmt.Errorf("record not found")
 			}
@@ -72,9 +77,6 @@ func CmdGetBTCStakingRecord() *cobra.Command {
 			resDisp.MintToAddress = "0x" + hex.EncodeToString(res.Record.MintToAddr)
 			resDisp.BtcReceiverName = res.Record.BtcReceiverName
 			resDisp.BtcReceiverAddr = res.Record.BtcReceiverAddr
-			if err != nil {
-				return err
-			}
 			return clientCtx.PrintProto(&resDisp)
 		},
 	}

x/btcstaking/keeper/msg_server.go

@@ -282,3 +282,11 @@ func (ms msgServer) UpdateParams(goCtx context.Context, req *types.MsgUpdatePara
 	}
 	return &types.MsgUpdateParamsResponse{}, nil
 }
+
+func (ms msgServer) AddReceiver(goCtx context.Context, req *types.MsgAddReceiver) (*types.MsgAddReceiverResponse, error) {
+	return nil, fmt.Errorf("deprecated, use UpdateParams instead")
+}
+
+func (ms msgServer) RemoveReceiver(goCtx context.Context, req *types.MsgRemoveReceiver) (*types.MsgRemoveReceiverResponse, error) {
+	return nil, fmt.Errorf("deprecated, use UpdateParams instead")
+}

x/btcstaking/types/codec.go

@@ -18,6 +18,9 @@ func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
 		(*sdk.Msg)(nil),
 		&MsgCreateBTCStaking{},
 		&MsgBurnRequest{},
+		&MsgRemoveReceiver{},
+		&MsgAddReceiver{},
+		&MsgUpdateParams{},
 	)
 
 	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)

x/btcstaking/types/msg.go

@@ -3,6 +3,7 @@ package types
 import (
 	fmt "fmt"
 
+	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
@@ -13,6 +14,8 @@ import (
 var (
 	_ sdk.Msg = &MsgCreateBTCStaking{}
 	_ sdk.Msg = &MsgBurnRequest{}
+	_ sdk.Msg = &MsgRemoveReceiver{}
+	_ sdk.Msg = &MsgAddReceiver{}
 	_ sdk.Msg = &MsgUpdateParams{}
 )
 
@@ -30,6 +33,36 @@ func (m *MsgCreateBTCStaking) ValidateBasic() error {
 	return nil
 }
 
+func (m *MsgAddReceiver) GetSigners() []sdk.AccAddress {
+	addr, _ := sdk.AccAddressFromBech32(m.Authority)
+	return []sdk.AccAddress{addr}
+}
+
+func (m *MsgAddReceiver) ValidateBasic() error {
+	if _, err := sdk.AccAddressFromBech32(m.Authority); err != nil {
+		return errorsmod.Wrap(err, "invalid authority address")
+	}
+	if err := m.Receiver.Validate(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (m *MsgRemoveReceiver) GetSigners() []sdk.AccAddress {
+	addr, _ := sdk.AccAddressFromBech32(m.Authority)
+	return []sdk.AccAddress{addr}
+}
+
+func (m *MsgRemoveReceiver) ValidateBasic() error {
+	if _, err := sdk.AccAddressFromBech32(m.Authority); err != nil {
+		return errorsmod.Wrap(err, "invalid authority address")
+	}
+	if len(m.Receiver) == 0 {
+		return fmt.Errorf("receiver name cannot be empty")
+	}
+	return nil
+}
+
 func (msg *MsgCreateBTCStaking) GetSigners() []sdk.AccAddress {
 	signer, err := sdk.AccAddressFromBech32(msg.Signer)
 	if err != nil {