From 4e7da283ad41a590f479ba9eb766ebaf8a8f6dd4 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Thu, 21 Dec 2023 23:41:32 +0100
Subject: [PATCH] chore: cleanup root

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 gno.land/cmd/gnokey/main.go |  2 +-
 gno.land/cmd/gnokey/root.go | 46 +++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)

diff --git a/gno.land/cmd/gnokey/main.go b/gno.land/cmd/gnokey/main.go
index 57a58bfee9c..20ae8268b23 100644
--- a/gno.land/cmd/gnokey/main.go
+++ b/gno.land/cmd/gnokey/main.go
@@ -16,7 +16,7 @@ func main() {
 		Remote: "127.0.0.1:26657",
 	}
 
-	cmd := client.NewRootCmdWithBaseConfig(commands.NewDefaultIO(), baseCfg)
+	cmd := NewRoot(commands.NewDefaultIO(), baseCfg)
 	if err := cmd.ParseAndRun(context.Background(), os.Args[1:]); err != nil {
 		_, _ = fmt.Fprintf(os.Stderr, "%+v\n", err)
 
diff --git a/gno.land/cmd/gnokey/root.go b/gno.land/cmd/gnokey/root.go
index 06ab7d0f9a3..77b69416b0a 100644
--- a/gno.land/cmd/gnokey/root.go
+++ b/gno.land/cmd/gnokey/root.go
@@ -1 +1,47 @@
+// Dedicated to my love, Lexi.
 package main
+
+import (
+	"github.com/gnolang/gno/tm2/pkg/commands"
+	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
+
+	"github.com/peterbourgon/ff/v3"
+	"github.com/peterbourgon/ff/v3/fftoml"
+)
+
+func NewRoot(io commands.IO, base client.BaseOptions) *commands.Command {
+	cfg := &client.BaseCfg{
+		BaseOptions: base,
+	}
+
+	cmd := commands.NewCommand(
+		commands.Metadata{
+			ShortUsage: "<subcommand> [flags] [<arg>...]",
+			LongHelp:   "Manages private keys for the node",
+			Options: []ff.Option{
+				ff.WithConfigFileFlag("config"),
+				ff.WithConfigFileParser(fftoml.Parser),
+			},
+		},
+		cfg,
+		commands.HelpExec,
+	)
+
+	cmd.AddSubCommands(
+		client.NewAddCmd(cfg, io),
+		client.NewDeleteCmd(cfg, io),
+		client.NewGenerateCmd(cfg, io),
+		client.NewExportCmd(cfg, io),
+		client.NewImportCmd(cfg, io),
+		client.NewListCmd(cfg, io),
+		client.NewSignCmd(cfg, io),
+		client.NewVerifyCmd(cfg, io),
+		client.NewQueryCmd(cfg, io),
+		client.NewBroadcastCmd(cfg, io),
+
+		// Use custom MakeTX command
+		NewMakeTxCmd(cfg, io),
+	)
+
+	return cmd
+}