feat(sudo): CLI fns + tests. Also, switches testutil to use secp256k1

CHANGELOG.md

@@ -42,6 +42,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Breaking
 
+* [#1317](https://github.com/NibiruChain/nibiru/pull/1317) - feat(sudo): Implement and test CLI commands for tx and queries. 
 * [#1307](https://github.com/NibiruChain/nibiru/pull/1307) - feat(sudo): Create the x/sudo module + integration tests
 * [#1299](https://github.com/NibiruChain/nibiru/pull/1299) - feat(wasm): Add peg shift bindings
 * [#1292](https://github.com/NibiruChain/nibiru/pull/1292) - feat(wasm): Add module bindings for execute calls in x/perp: OpenPosition, ClosePosition, AddMargin, RemoveMargin.
@@ -69,8 +70,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Improvements
 
-* [#1321](https://github.com/NibiruChain/nibiru/pull/1321) - build(deps): bump github.com/prometheus/client_golang from 1.15.0 to 1.15.1
+* [#1317](https://github.com/NibiruChain/nibiru/pull/1317) - feat(testutil): Use secp256k1 algo for private key generation in common/testutil.
 * [#1322](https://gitub.com/NibiruChain/nibiru/pull/1322) - build(deps): Bumps github.com/armon/go-metrics from 0.4.0 to 0.4.1.
+* [#1321](https://github.com/NibiruChain/nibiru/pull/1321) - build(deps): bump github.com/prometheus/client_golang from 1.15.0 to 1.15.1
 * [#1295](https://github.com/NibiruChain/nibiru/pull/1295) - refactor(app): Organize keepers, store keys, and module manager initialization in app.go
 * [#1248](https://github.com/NibiruChain/nibiru/pull/1248) - refactor(common): Combine x/testutil and x/common/testutil.
 * [#1245](https://github.com/NibiruChain/nibiru/pull/1245) - fix(localnet.sh): force localnet.sh to work even if Coingecko is down

x/common/testutil/cli/query.go

@@ -17,6 +17,8 @@ import (
 	perpammtypes "github.com/NibiruChain/nibiru/x/perp/amm/types"
 	perpcli "github.com/NibiruChain/nibiru/x/perp/client/cli"
 	perptypes "github.com/NibiruChain/nibiru/x/perp/types"
+	sudocli "github.com/NibiruChain/nibiru/x/sudo/cli"
+	sudotypes "github.com/NibiruChain/nibiru/x/sudo/pb"
 )
 
 // ExecQueryOption defines a type which customizes a CLI query operation.
@@ -114,3 +116,16 @@ func QueryCumulativePremiumFraction(clientCtx client.Context, pair asset.Pair) (
 	}
 	return &queryResp, nil
 }
+
+func QuerySudoers(clientCtx client.Context) (*sudotypes.QuerySudoersResponse, error) {
+	var queryResp sudotypes.QuerySudoersResponse
+	if err := ExecQuery(
+		clientCtx,
+		sudocli.CmdQuerySudoers(),
+		[]string{},
+		&queryResp,
+	); err != nil {
+		return nil, err
+	}
+	return &queryResp, nil
+}

x/common/testutil/genesis/perp_genesis.go

@@ -4,9 +4,11 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 
 	"github.com/NibiruChain/nibiru/app"
+
 	"github.com/NibiruChain/nibiru/x/common"
 	"github.com/NibiruChain/nibiru/x/common/asset"
 	"github.com/NibiruChain/nibiru/x/common/denoms"
+
 	oracletypes "github.com/NibiruChain/nibiru/x/oracle/types"
 	perpammtypes "github.com/NibiruChain/nibiru/x/perp/amm/types"
 	perptypes "github.com/NibiruChain/nibiru/x/perp/types"

x/common/testutil/genesis/sudo_genesis.go

@@ -0,0 +1,41 @@
+package genesis
+
+import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/NibiruChain/nibiru/app"
+
+	"github.com/NibiruChain/nibiru/x/sudo"
+	sudotypes "github.com/NibiruChain/nibiru/x/sudo/pb"
+
+	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
+
+	"github.com/NibiruChain/nibiru/x/common/testutil"
+)
+
+func AddSudoGenesis(gen app.GenesisState) (
+	genState app.GenesisState,
+	rootPrivKey cryptotypes.PrivKey,
+	rootAddr sdk.AccAddress,
+) {
+	sudoGenesis, rootPrivKey, rootAddr := SudoGenesis()
+	gen[sudotypes.ModuleName] = TEST_ENCODING_CONFIG.Marshaler.
+		MustMarshalJSON(sudoGenesis)
+	return gen, rootPrivKey, rootAddr
+}
+
+func SudoGenesis() (
+	genState *sudotypes.GenesisState,
+	rootPrivKey cryptotypes.PrivKey,
+	rootAddr sdk.AccAddress,
+) {
+	sudoGenesis := sudo.DefaultGenesis()
+
+	// Set the root user
+	privKeys, addrs := testutil.PrivKeyAddressPairs(1)
+	rootPrivKey = privKeys[0]
+	rootAddr = addrs[0]
+	sudoGenesis.Sudoers.Root = rootAddr.String()
+
+	return sudoGenesis, rootPrivKey, rootAddr
+}

x/common/testutil/sample.go

@@ -3,7 +3,8 @@ package testutil
 import (
 	"math/rand"
 
-	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
+	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
+
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/store"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -13,15 +14,23 @@ import (
 	tmdb "github.com/tendermint/tm-db"
 )
 
-// AccAddress Returns a sample account address (sdk.AccAddress)
+// AccAddress returns a sample address (sdk.AccAddress) created using secp256k1.
 // Note that AccAddress().String() can be used to get a string representation.
 func AccAddress() sdk.AccAddress {
-	pk := ed25519.GenPrivKey().PubKey()
-	addr := pk.Address()
-	return sdk.AccAddress(addr)
+	_, accAddr := PrivKey()
+	return accAddr
+}
+
+// PrivKey returns a private key and corresponding on-chain address.
+func PrivKey() (*secp256k1.PrivKey, sdk.AccAddress) {
+	privKey := secp256k1.GenPrivKey()
+	pubKey := privKey.PubKey()
+	addr := pubKey.Address()
+	return privKey, sdk.AccAddress(addr)
 }
 
-// PrivKeyAddressPairs generates (deterministically) a total of n private keys and addresses.
+// PrivKeyAddressPairs generates (deterministically) a total of n private keys
+// and addresses.
 func PrivKeyAddressPairs(n int) (keys []cryptotypes.PrivKey, addrs []sdk.AccAddress) {
 	r := rand.New(rand.NewSource(12345)) // make the generation deterministic
 	keys = make([]cryptotypes.PrivKey, n)
@@ -32,7 +41,7 @@ func PrivKeyAddressPairs(n int) (keys []cryptotypes.PrivKey, addrs []sdk.AccAddr
 		if err != nil {
 			panic("Could not read randomness")
 		}
-		keys[i] = ed25519.GenPrivKeyFromSecret(secret)
+		keys[i] = secp256k1.GenPrivKeyFromSecret(secret)
 		addrs[i] = sdk.AccAddress(keys[i].PubKey().Address())
 	}
 	return

x/sudo/cli/cli.go

@@ -0,0 +1,143 @@
+package cli
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/cosmos/cosmos-sdk/client/tx"
+	"github.com/cosmos/cosmos-sdk/version"
+
+	"github.com/spf13/cobra"
+
+	"github.com/NibiruChain/nibiru/x/sudo/pb"
+)
+
+// GetTxCmd returns a cli command for this module's transactions
+func GetTxCmd() *cobra.Command {
+	txCmd := &cobra.Command{
+		Use:                        pb.ModuleName,
+		Short:                      fmt.Sprintf("x/%s transaction subcommands", pb.ModuleName),
+		DisableFlagParsing:         true,
+		SuggestionsMinimumDistance: 2,
+		RunE:                       client.ValidateCmd,
+	}
+
+	// Add subcommands
+	txCmd.AddCommand(
+		CmdEditSudoers(),
+	)
+
+	return txCmd
+}
+
+// GetQueryCmd returns a cli command for this module's queries
+func GetQueryCmd() *cobra.Command {
+	moduleQueryCmd := &cobra.Command{
+		Use: pb.ModuleName,
+		Short: fmt.Sprintf(
+			"Query commands for the x/%s module", pb.ModuleName),
+		DisableFlagParsing:         true,
+		SuggestionsMinimumDistance: 2,
+		RunE:                       client.ValidateCmd,
+	}
+
+	// Add subcommands
+	cmds := []*cobra.Command{
+		CmdQuerySudoers(),
+	}
+	for _, cmd := range cmds {
+		moduleQueryCmd.AddCommand(cmd)
+	}
+
+	return moduleQueryCmd
+}
+
+// CmdEditSudoers is a terminal command corresponding to the EditSudoers
+// function of the sdk.Msg handler for x/sudo.
+func CmdEditSudoers() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "edit [edit-json]",
+		Args:  cobra.ExactArgs(1),
+		Short: "Edit the x/sudo state (sudoers) by adding or removing contracts",
+		Example: strings.TrimSpace(fmt.Sprintf(`
+			Example: 
+			$ %s tx sudo edit <path/to/edit.json> --from=<key_or_address> 
+			`, version.AppName)),
+		Long: strings.TrimSpace(
+			`Adds or removes contracts from the x/sudo state, giving the 
+			contracts permissioned access to certain bindings in x/wasm.
+
+			The edit.json for 'EditSudoers' is of the form:
+			{
+			  "action": "add_contracts",
+			  "contracts": "..."
+			}
+
+			- Valid action types: "add_contracts", "remove_contracts"	
+			`),
+		RunE: func(cmd *cobra.Command, args []string) (err error) {
+			clientCtx, err := client.GetClientTxContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			msg := new(pb.MsgEditSudoers)
+
+			// marshals contents into the proto.Message to which 'msg' points.
+			contents, err := os.ReadFile(args[0])
+			if err != nil {
+				return err
+			}
+			if err = clientCtx.Codec.UnmarshalJSON(contents, msg); err != nil {
+				return err
+			}
+
+			// Parse the message sender
+			from := clientCtx.GetFromAddress()
+			msg.Sender = from.String()
+
+			if err = msg.ValidateBasic(); err != nil {
+				return err
+			}
+
+			return tx.GenerateOrBroadcastTxCLI(clientCtx, cmd.Flags(), msg)
+		},
+	}
+
+	flags.AddTxFlagsToCmd(cmd)
+
+	return cmd
+}
+
+func CmdQuerySudoers() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "state",
+		Short: "displays the internal state (sudoers) of the x/sudo module",
+		Args:  cobra.NoArgs,
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			queryClient := pb.NewQueryClient(clientCtx)
+
+			req := new(pb.QuerySudoersRequest)
+			resp, err := queryClient.QuerySudoers(
+				cmd.Context(), req,
+			)
+			if err != nil {
+				return err
+			}
+
+			return clientCtx.PrintProto(resp)
+		},
+	}
+
+	flags.AddQueryFlagsToCmd(cmd)
+
+	return cmd
+}