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: Burn and Recover msgs public key checks and cli commands #13

Merged
merged 3 commits into from
Oct 9, 2024
Merged

fix: Burn and Recover msgs public key checks and cli commands #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2eab0fc
fix: added missing `pub_key` handling on the Burn/Recover cli txs
g-luca Sep 30, 2024
038604e
fix: added missing `nil` checks on the `pub_key` value
g-luca Sep 30, 2024
8862c95
chore: sync main
johnletey Oct 7, 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
30 changes: 26 additions & 4 deletions client/cli/tx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ import (
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
"github.com/cosmos/cosmos-sdk/client/tx"
codectypes "github.com/cosmos/cosmos-sdk/codec/types"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
"github.com/monerium/module-noble/v2/types"
"github.com/spf13/cobra"
)
Expand Down Expand Up @@ -160,9 +162,9 @@ func TxAllowDenom() *cobra.Command {

func TxBurn() *cobra.Command {
cmd := &cobra.Command{
Use: "burn [denom] [from] [amount] [signature]",
Use: "burn [denom] [from] [amount] [signature] [pub_key]",
Short: "Transaction that burns a specific denom",
Args: cobra.ExactArgs(4),
Args: cobra.ExactArgs(5),
RunE: func(cmd *cobra.Command, args []string) error {
clientCtx, err := client.GetClientTxContext(cmd)
if err != nil {
Expand All @@ -179,12 +181,22 @@ func TxBurn() *cobra.Command {
return err
}

var pubKey cryptotypes.PubKey
if err = clientCtx.Codec.UnmarshalInterfaceJSON([]byte(args[4]), &pubKey); err != nil {
return err
}
anyPubKey, err := codectypes.NewAnyWithValue(pubKey)
if err != nil {
return err
}

msg := &types.MsgBurn{
Denom: args[0],
Signer: clientCtx.GetFromAddress().String(),
From: args[1],
Amount: amount,
Signature: signature,
PubKey: anyPubKey,
}

return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
Expand Down Expand Up @@ -230,9 +242,9 @@ func TxMint() *cobra.Command {

func TxRecover() *cobra.Command {
cmd := &cobra.Command{
Use: "recover [denom] [from] [to] [signature]",
Use: "recover [denom] [from] [to] [signature] [pub_key]",
Short: "Recover balance of a specific denom from an account",
Args: cobra.ExactArgs(4),
Args: cobra.ExactArgs(5),
RunE: func(cmd *cobra.Command, args []string) error {
clientCtx, err := client.GetClientTxContext(cmd)
if err != nil {
Expand All @@ -244,12 +256,22 @@ func TxRecover() *cobra.Command {
return err
}

var pubKey cryptotypes.PubKey
if err = clientCtx.Codec.UnmarshalInterfaceJSON([]byte(args[4]), &pubKey); err != nil {
return err
}
anyPubKey, err := codectypes.NewAnyWithValue(pubKey)
if err != nil {
return err
}

msg := &types.MsgRecover{
Denom: args[0],
Signer: clientCtx.GetFromAddress().String(),
From: args[1],
To: args[2],
Signature: signature,
PubKey: anyPubKey,
}

return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
Expand Down
6 changes: 6 additions & 0 deletions keeper/msg_server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,9 @@ func (k msgServer) Burn(ctx context.Context, msg *types.MsgBurn) (*types.MsgBurn
if !k.IsSystem(ctx, msg.Denom, msg.Signer) {
return nil, types.ErrInvalidSystem
}
if msg.PubKey == nil {
return nil, types.ErrInvalidPubKey
}

var pubKey cryptotypes.PubKey
if err := k.cdc.UnpackAny(msg.PubKey, &pubKey); err != nil {
Expand Down Expand Up @@ -211,6 +214,9 @@ func (k msgServer) Recover(ctx context.Context, msg *types.MsgRecover) (*types.M
if !k.IsSystem(ctx, msg.Denom, msg.Signer) {
return nil, types.ErrInvalidSystem
}
if msg.PubKey == nil {
return nil, types.ErrInvalidPubKey
}

var pubKey cryptotypes.PubKey
if err := k.cdc.UnpackAny(msg.PubKey, &pubKey); err != nil {
Expand Down
18 changes: 18 additions & 0 deletions keeper/msg_server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,15 @@ func TestBurn(t *testing.T) {
// ASSERT: The action should've failed due to invalid user address.
require.ErrorContains(t, err, "unable to decode user address")

// ACT: Attempt to burn with missing public key.
_, err = server.Burn(ctx, &types.MsgBurn{
Denom: "ueure",
Signer: system.Address,
From: utils.TestAccount().Address,
})
// ASSERT: The action should've failed due to invalid public key.
require.ErrorIs(t, err, types.ErrInvalidPubKey)

// ACT: Attempt to burn with invalid public key.
invalidPubKey, _ = codectypes.NewAnyWithValue(secp256k1.GenPrivKey().PubKey())
_, err = server.Burn(ctx, &types.MsgBurn{
Expand Down Expand Up @@ -597,6 +606,15 @@ func TestRecover(t *testing.T) {
// ASSERT: The action should've failed due to invalid public key.
require.ErrorIs(t, err, types.ErrInvalidPubKey)

// ACT: Attempt to recover with missing public key.
_, err = server.Recover(ctx, &types.MsgRecover{
Denom: "ueure",
Signer: system.Address,
From: "noble1rwvjzk28l38js7xx6mq23nrpghd8qqvxmj6ep2",
})
// ASSERT: The action should've failed due to invalid public key.
require.ErrorIs(t, err, types.ErrInvalidPubKey)

// ACT: Attempt to recover with invalid signature.
signature, _ := base64.StdEncoding.DecodeString("QBrRfIqjdBvXx9zaBcuiE9P5SVesxFO/He3deyx2OE0NoSNqwmSb7b5iP2UhZRI1duiOeho3+NETUkCBv14zjQ==")
_, err = server.Recover(ctx, &types.MsgRecover{
Expand Down