Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(btcstaking): restore AddReceiver/RemoveReceiver #47

Merged
merged 5 commits into from
Jun 17, 2024
Merged

fix(btcstaking): restore AddReceiver/RemoveReceiver #47

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fa216ed
fix(btcstaking): restore AddReceiver/RemoveReceiver
473n Jun 14, 2024
fd9661c
fix(btcstaking/cli): fix error handling and naming inconsistency
473n Jun 13, 2024
248946a
Merge branch 'main' into restore_add_receivers
473n Jun 17, 2024
a2753ea
chores(btcstaking): code format
473n Jun 17, 2024
ba7db67
fix(btcstaking): register MsgAddReceiver/MsgRemoveReceiver/MsgUpdateP…
473n Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions proto/lorenzo/btcstaking/v1/tx.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down Expand Up @@ -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 {
Comment on lines +70 to +79
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

MsgAddReceiver and MsgRemoveReceiver should be registered.example:

func RegisterInterfaces(registry cdctypes.InterfaceRegistry) {
	// Register messages
	registry.RegisterImplementations(
		(*sdk.Msg)(nil),
		&MsgCreateBTCStaking{},
		&MsgBurnRequest{},
                &MsgAddReceiver{},
                &MsgRemoveReceiver{},
	)

	msgservice.RegisterMsgServiceDesc(registry, &_Msg_serviceDesc)
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done.

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";

Expand Down
6 changes: 6 additions & 0 deletions x/btcstaking/keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,3 +280,9 @@ 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")
}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The methods AddReceiver and RemoveReceiver are marked as deprecated and advise the use of UpdateParams instead. If these methods are not intended to be used, consider removing them or implementing a redirect mechanism within these methods to UpdateParams.

32 changes: 32 additions & 0 deletions x/btcstaking/types/msg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -13,6 +14,8 @@ import (
var (
_ sdk.Msg = &MsgCreateBTCStaking{}
_ sdk.Msg = &MsgBurnRequest{}
_ sdk.Msg = &MsgRemoveReceiver{}
_ sdk.Msg = &MsgAddReceiver{}
_ sdk.Msg = &MsgUpdateParams{}
)

Expand All @@ -30,6 +33,35 @@ 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 {
Expand Down
Loading
Loading