From 972d84db55e27bdbb2c5e95eeb7e82f352183885 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Tue, 12 Dec 2023 18:03:12 +0100
Subject: [PATCH 1/8] fix: move `tm2/pkg/keys/client` to `gno.land/pkg/keyscmd`

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 gno.land/cmd/gnofaucet/serve.go                        | 10 +++++-----
 gno.land/cmd/gnokey/main.go                            |  6 +++---
 .../crypto/keys/client => gno.land/pkg/keyscmd}/add.go |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/add_test.go   |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/addpkg.go     |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/broadcast.go  |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/call.go       |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/common.go     |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/delete.go     |  2 +-
 .../client => gno.land/pkg/keyscmd}/delete_test.go     |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/export.go     |  2 +-
 .../client => gno.land/pkg/keyscmd}/export_test.go     |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/generate.go   |  2 +-
 .../client => gno.land/pkg/keyscmd}/generate_test.go   |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/helper.go     |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/import.go     |  2 +-
 .../client => gno.land/pkg/keyscmd}/import_test.go     |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/list.go       |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/list_test.go  |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/maketx.go     |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/query.go      |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/root.go       |  2 +-
 .../crypto/keys/client => gno.land/pkg/keyscmd}/run.go |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/send.go       |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/sign.go       |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/sign_test.go  |  2 +-
 .../keys/client => gno.land/pkg/keyscmd}/verify.go     |  2 +-
 .../client => gno.land/pkg/keyscmd}/verify_test.go     |  2 +-
 28 files changed, 34 insertions(+), 34 deletions(-)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/add.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/add_test.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/addpkg.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/broadcast.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/call.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/common.go (95%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/delete.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/delete_test.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/export.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/export_test.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/generate.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/generate_test.go (98%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/helper.go (96%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/import.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/import_test.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/list.go (98%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/list_test.go (98%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/maketx.go (98%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/query.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/root.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/run.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/send.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/sign.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/sign_test.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/verify.go (99%)
 rename {tm2/pkg/crypto/keys/client => gno.land/pkg/keyscmd}/verify_test.go (99%)

diff --git a/gno.land/cmd/gnofaucet/serve.go b/gno.land/cmd/gnofaucet/serve.go
index e00406a6e80..db211cc8d67 100644
--- a/gno.land/cmd/gnofaucet/serve.go
+++ b/gno.land/cmd/gnofaucet/serve.go
@@ -11,12 +11,12 @@ import (
 	"time"
 
 	"github.com/gnolang/gno/gno.land/pkg/gnoland"
+	keyscmd "github.com/gnolang/gno/gno.land/pkg/keyscmd"
 	"github.com/gnolang/gno/tm2/pkg/amino"
 	rpcclient "github.com/gnolang/gno/tm2/pkg/bft/rpc/client"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	"github.com/gnolang/gno/tm2/pkg/crypto/keys"
-	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
 	"github.com/gnolang/gno/tm2/pkg/errors"
 	"github.com/gnolang/gno/tm2/pkg/sdk/bank"
 	"github.com/gnolang/gno/tm2/pkg/std"
@@ -35,7 +35,7 @@ type SiteVerifyResponse struct {
 }
 
 type config struct {
-	client.BaseOptions // home, ...
+	keyscmd.BaseOptions // home, ...
 
 	ChainID               string
 	GasWanted             int64
@@ -69,21 +69,21 @@ func (c *config) RegisterFlags(fs *flag.FlagSet) {
 	fs.StringVar(
 		&c.BaseOptions.Home,
 		"home",
-		client.DefaultBaseOptions.Home,
+		keyscmd.DefaultBaseOptions.Home,
 		"home directory",
 	)
 
 	fs.StringVar(
 		&c.BaseOptions.Remote,
 		"remote",
-		client.DefaultBaseOptions.Remote,
+		keyscmd.DefaultBaseOptions.Remote,
 		"remote node URL",
 	)
 
 	fs.BoolVar(
 		&c.BaseOptions.Quiet,
 		"quiet",
-		client.DefaultBaseOptions.Quiet,
+		keyscmd.DefaultBaseOptions.Quiet,
 		"for parsing output",
 	)
 
diff --git a/gno.land/cmd/gnokey/main.go b/gno.land/cmd/gnokey/main.go
index 57a58bfee9c..1fcf03238ab 100644
--- a/gno.land/cmd/gnokey/main.go
+++ b/gno.land/cmd/gnokey/main.go
@@ -5,18 +5,18 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/gnolang/gno/gno.land/pkg/keyscmd"
 	"github.com/gnolang/gno/gnovm/pkg/gnoenv"
 	"github.com/gnolang/gno/tm2/pkg/commands"
-	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
 )
 
 func main() {
-	baseCfg := client.BaseOptions{
+	baseCfg := keyscmd.BaseOptions{
 		Home:   gnoenv.HomeDir(),
 		Remote: "127.0.0.1:26657",
 	}
 
-	cmd := client.NewRootCmdWithBaseConfig(commands.NewDefaultIO(), baseCfg)
+	cmd := keyscmd.NewRootCmdWithBaseConfig(commands.NewDefaultIO(), baseCfg)
 	if err := cmd.ParseAndRun(context.Background(), os.Args[1:]); err != nil {
 		_, _ = fmt.Fprintf(os.Stderr, "%+v\n", err)
 
diff --git a/tm2/pkg/crypto/keys/client/add.go b/gno.land/pkg/keyscmd/add.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/add.go
rename to gno.land/pkg/keyscmd/add.go
index 71dc6f03090..dccba1d1819 100644
--- a/tm2/pkg/crypto/keys/client/add.go
+++ b/gno.land/pkg/keyscmd/add.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/add_test.go b/gno.land/pkg/keyscmd/add_test.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/add_test.go
rename to gno.land/pkg/keyscmd/add_test.go
index 94cb945f113..ac46b55df02 100644
--- a/tm2/pkg/crypto/keys/client/add_test.go
+++ b/gno.land/pkg/keyscmd/add_test.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"fmt"
diff --git a/tm2/pkg/crypto/keys/client/addpkg.go b/gno.land/pkg/keyscmd/addpkg.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/addpkg.go
rename to gno.land/pkg/keyscmd/addpkg.go
index 5bbd3f08ad0..64c11091a29 100644
--- a/tm2/pkg/crypto/keys/client/addpkg.go
+++ b/gno.land/pkg/keyscmd/addpkg.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 // TODO: move most of the logic in ROOT/gno.land/...
 
diff --git a/tm2/pkg/crypto/keys/client/broadcast.go b/gno.land/pkg/keyscmd/broadcast.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/broadcast.go
rename to gno.land/pkg/keyscmd/broadcast.go
index 9c05f2c43b3..f6a9571509b 100644
--- a/tm2/pkg/crypto/keys/client/broadcast.go
+++ b/gno.land/pkg/keyscmd/broadcast.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/call.go b/gno.land/pkg/keyscmd/call.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/call.go
rename to gno.land/pkg/keyscmd/call.go
index 6f9c9d52f5f..58522aa51e7 100644
--- a/tm2/pkg/crypto/keys/client/call.go
+++ b/gno.land/pkg/keyscmd/call.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/common.go b/gno.land/pkg/keyscmd/common.go
similarity index 95%
rename from tm2/pkg/crypto/keys/client/common.go
rename to gno.land/pkg/keyscmd/common.go
index a6b52b6cad3..a5e769c316e 100644
--- a/tm2/pkg/crypto/keys/client/common.go
+++ b/gno.land/pkg/keyscmd/common.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 type BaseOptions struct {
 	Home                  string
diff --git a/tm2/pkg/crypto/keys/client/delete.go b/gno.land/pkg/keyscmd/delete.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/delete.go
rename to gno.land/pkg/keyscmd/delete.go
index cf65b8fc60a..40cf261116a 100644
--- a/tm2/pkg/crypto/keys/client/delete.go
+++ b/gno.land/pkg/keyscmd/delete.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/delete_test.go b/gno.land/pkg/keyscmd/delete_test.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/delete_test.go
rename to gno.land/pkg/keyscmd/delete_test.go
index b3f83f1d9a2..b7084c7e4f0 100644
--- a/tm2/pkg/crypto/keys/client/delete_test.go
+++ b/gno.land/pkg/keyscmd/delete_test.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"strings"
diff --git a/tm2/pkg/crypto/keys/client/export.go b/gno.land/pkg/keyscmd/export.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/export.go
rename to gno.land/pkg/keyscmd/export.go
index c3921c31fd7..fc8db532e92 100644
--- a/tm2/pkg/crypto/keys/client/export.go
+++ b/gno.land/pkg/keyscmd/export.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/export_test.go b/gno.land/pkg/keyscmd/export_test.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/export_test.go
rename to gno.land/pkg/keyscmd/export_test.go
index 0f4c5311dfa..dd859c04bff 100644
--- a/tm2/pkg/crypto/keys/client/export_test.go
+++ b/gno.land/pkg/keyscmd/export_test.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"fmt"
diff --git a/tm2/pkg/crypto/keys/client/generate.go b/gno.land/pkg/keyscmd/generate.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/generate.go
rename to gno.land/pkg/keyscmd/generate.go
index 04a0ea8947f..87432a6abc0 100644
--- a/tm2/pkg/crypto/keys/client/generate.go
+++ b/gno.land/pkg/keyscmd/generate.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/generate_test.go b/gno.land/pkg/keyscmd/generate_test.go
similarity index 98%
rename from tm2/pkg/crypto/keys/client/generate_test.go
rename to gno.land/pkg/keyscmd/generate_test.go
index 516912046b6..6417aafcfb4 100644
--- a/tm2/pkg/crypto/keys/client/generate_test.go
+++ b/gno.land/pkg/keyscmd/generate_test.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"strings"
diff --git a/tm2/pkg/crypto/keys/client/helper.go b/gno.land/pkg/keyscmd/helper.go
similarity index 96%
rename from tm2/pkg/crypto/keys/client/helper.go
rename to gno.land/pkg/keyscmd/helper.go
index 525ad9071f8..7db45a79c59 100644
--- a/tm2/pkg/crypto/keys/client/helper.go
+++ b/gno.land/pkg/keyscmd/helper.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import "github.com/gnolang/gno/tm2/pkg/crypto/bip39"
 
diff --git a/tm2/pkg/crypto/keys/client/import.go b/gno.land/pkg/keyscmd/import.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/import.go
rename to gno.land/pkg/keyscmd/import.go
index e4f20ff6402..ee790f7dfc4 100644
--- a/tm2/pkg/crypto/keys/client/import.go
+++ b/gno.land/pkg/keyscmd/import.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/import_test.go b/gno.land/pkg/keyscmd/import_test.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/import_test.go
rename to gno.land/pkg/keyscmd/import_test.go
index 7bc00e06ec9..05fe8a1c1e9 100644
--- a/tm2/pkg/crypto/keys/client/import_test.go
+++ b/gno.land/pkg/keyscmd/import_test.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"fmt"
diff --git a/tm2/pkg/crypto/keys/client/list.go b/gno.land/pkg/keyscmd/list.go
similarity index 98%
rename from tm2/pkg/crypto/keys/client/list.go
rename to gno.land/pkg/keyscmd/list.go
index bdee6b3bbe9..4ec1492db1c 100644
--- a/tm2/pkg/crypto/keys/client/list.go
+++ b/gno.land/pkg/keyscmd/list.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/list_test.go b/gno.land/pkg/keyscmd/list_test.go
similarity index 98%
rename from tm2/pkg/crypto/keys/client/list_test.go
rename to gno.land/pkg/keyscmd/list_test.go
index ee0a147f3d3..90b4a6c6d1e 100644
--- a/tm2/pkg/crypto/keys/client/list_test.go
+++ b/gno.land/pkg/keyscmd/list_test.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"testing"
diff --git a/tm2/pkg/crypto/keys/client/maketx.go b/gno.land/pkg/keyscmd/maketx.go
similarity index 98%
rename from tm2/pkg/crypto/keys/client/maketx.go
rename to gno.land/pkg/keyscmd/maketx.go
index c424b566c95..f09b1a9fe56 100644
--- a/tm2/pkg/crypto/keys/client/maketx.go
+++ b/gno.land/pkg/keyscmd/maketx.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"flag"
diff --git a/tm2/pkg/crypto/keys/client/query.go b/gno.land/pkg/keyscmd/query.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/query.go
rename to gno.land/pkg/keyscmd/query.go
index 746048e772c..306b8f2ff1a 100644
--- a/tm2/pkg/crypto/keys/client/query.go
+++ b/gno.land/pkg/keyscmd/query.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/root.go b/gno.land/pkg/keyscmd/root.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/root.go
rename to gno.land/pkg/keyscmd/root.go
index e09b31d45dd..79c87c80857 100644
--- a/tm2/pkg/crypto/keys/client/root.go
+++ b/gno.land/pkg/keyscmd/root.go
@@ -1,5 +1,5 @@
 // Dedicated to my love, Lexi.
-package client
+package keyscmd
 
 import (
 	"flag"
diff --git a/tm2/pkg/crypto/keys/client/run.go b/gno.land/pkg/keyscmd/run.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/run.go
rename to gno.land/pkg/keyscmd/run.go
index 1ae702c990e..7df9369e2c2 100644
--- a/tm2/pkg/crypto/keys/client/run.go
+++ b/gno.land/pkg/keyscmd/run.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/send.go b/gno.land/pkg/keyscmd/send.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/send.go
rename to gno.land/pkg/keyscmd/send.go
index a5098aea08c..df7e2f5e68c 100644
--- a/tm2/pkg/crypto/keys/client/send.go
+++ b/gno.land/pkg/keyscmd/send.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/sign.go b/gno.land/pkg/keyscmd/sign.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/sign.go
rename to gno.land/pkg/keyscmd/sign.go
index f8fcc02fdde..2f25a4f7609 100644
--- a/tm2/pkg/crypto/keys/client/sign.go
+++ b/gno.land/pkg/keyscmd/sign.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/sign_test.go b/gno.land/pkg/keyscmd/sign_test.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/sign_test.go
rename to gno.land/pkg/keyscmd/sign_test.go
index 6e9b1da5946..d83e8a2bbf7 100644
--- a/tm2/pkg/crypto/keys/client/sign_test.go
+++ b/gno.land/pkg/keyscmd/sign_test.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"fmt"
diff --git a/tm2/pkg/crypto/keys/client/verify.go b/gno.land/pkg/keyscmd/verify.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/verify.go
rename to gno.land/pkg/keyscmd/verify.go
index fff2fcd852f..c82897834be 100644
--- a/tm2/pkg/crypto/keys/client/verify.go
+++ b/gno.land/pkg/keyscmd/verify.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"context"
diff --git a/tm2/pkg/crypto/keys/client/verify_test.go b/gno.land/pkg/keyscmd/verify_test.go
similarity index 99%
rename from tm2/pkg/crypto/keys/client/verify_test.go
rename to gno.land/pkg/keyscmd/verify_test.go
index 206c14682fd..010343f8cdf 100644
--- a/tm2/pkg/crypto/keys/client/verify_test.go
+++ b/gno.land/pkg/keyscmd/verify_test.go
@@ -1,4 +1,4 @@
-package client
+package keyscmd
 
 import (
 	"encoding/hex"

From ea8f1a718c592f5e5a4467217c24354b668a9dbd Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Wed, 13 Dec 2023 10:43:00 +0100
Subject: [PATCH 2/8] chore: fixup keyscmd import

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 contribs/gnokeykc/main.go                       | 2 +-
 gno.land/cmd/genesis/validator_add_test.go      | 5 ++---
 gno.land/pkg/integration/testing_integration.go | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/contribs/gnokeykc/main.go b/contribs/gnokeykc/main.go
index 8060f8cb1e3..3a48bfa8960 100644
--- a/contribs/gnokeykc/main.go
+++ b/contribs/gnokeykc/main.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
+	client "github.com/gnolang/gno/gno.land/pkg/keyscmd"
 	"github.com/gnolang/gno/tm2/pkg/commands"
-	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
 	"github.com/zalando/go-keyring"
 )
 
diff --git a/gno.land/cmd/genesis/validator_add_test.go b/gno.land/cmd/genesis/validator_add_test.go
index 37af4157e7c..fada5f96cee 100644
--- a/gno.land/cmd/genesis/validator_add_test.go
+++ b/gno.land/cmd/genesis/validator_add_test.go
@@ -4,12 +4,12 @@ import (
 	"context"
 	"testing"
 
+	"github.com/gnolang/gno/gno.land/pkg/keyscmd"
 	"github.com/gnolang/gno/tm2/pkg/bft/types"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	"github.com/gnolang/gno/tm2/pkg/crypto/bip39"
 	"github.com/gnolang/gno/tm2/pkg/crypto/hd"
-	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
 	"github.com/gnolang/gno/tm2/pkg/crypto/secp256k1"
 	"github.com/gnolang/gno/tm2/pkg/testutils"
 	"github.com/stretchr/testify/assert"
@@ -21,11 +21,10 @@ import (
 func getDummyKey(t *testing.T) crypto.PubKey {
 	t.Helper()
 
-	mnemonic, err := client.GenerateMnemonic(256)
+	mnemonic, err := keyscmd.GenerateMnemonic(256)
 	require.NoError(t, err)
 
 	seed := bip39.NewSeed(mnemonic, "")
-
 	return generateKeyFromSeed(seed, 0).PubKey()
 }
 
diff --git a/gno.land/pkg/integration/testing_integration.go b/gno.land/pkg/integration/testing_integration.go
index 0d19237eab3..72ee06db360 100644
--- a/gno.land/pkg/integration/testing_integration.go
+++ b/gno.land/pkg/integration/testing_integration.go
@@ -10,11 +10,11 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/gnolang/gno/gno.land/pkg/keyscmd"
 	"github.com/gnolang/gno/gnovm/pkg/gnoenv"
 	"github.com/gnolang/gno/tm2/pkg/bft/node"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/crypto/keys"
-	"github.com/gnolang/gno/tm2/pkg/crypto/keys/client"
 	"github.com/gnolang/gno/tm2/pkg/log"
 	"github.com/rogpeppe/go-internal/testscript"
 )
@@ -181,7 +181,7 @@ func setupGnolandTestScript(t *testing.T, txtarDir string) testscript.Params {
 				io := commands.NewTestIO()
 				io.SetOut(commands.WriteNopCloser(ts.Stdout()))
 				io.SetErr(commands.WriteNopCloser(ts.Stderr()))
-				cmd := client.NewRootCmd(io)
+				cmd := keyscmd.NewRootCmd(io)
 
 				io.SetIn(strings.NewReader("\n")) // Inject empty password to stdin.
 				defaultArgs := []string{

From 007678dd62b1419605a2053a4731adbdbfcf8e68 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Wed, 13 Dec 2023 11:15:16 +0100
Subject: [PATCH 3/8] chore: rename `keyscmd` to `keyscli`

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 contribs/gnokeykc/main.go                          |  4 ++--
 gno.land/cmd/genesis/validator_add_test.go         |  4 ++--
 gno.land/cmd/gnofaucet/serve.go                    | 10 +++++-----
 gno.land/cmd/gnokey/main.go                        |  6 +++---
 gno.land/pkg/integration/testing_integration.go    |  4 ++--
 gno.land/pkg/{keyscmd => keyscli}/add.go           |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/add_test.go      |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/addpkg.go        |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/broadcast.go     |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/call.go          |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/common.go        |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/delete.go        |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/delete_test.go   |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/export.go        |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/export_test.go   |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/generate.go      |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/generate_test.go |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/helper.go        |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/import.go        |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/import_test.go   |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/list.go          |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/list_test.go     |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/maketx.go        |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/query.go         |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/root.go          |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/run.go           |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/send.go          |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/sign.go          |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/sign_test.go     |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/verify.go        |  2 +-
 gno.land/pkg/{keyscmd => keyscli}/verify_test.go   |  2 +-
 31 files changed, 40 insertions(+), 40 deletions(-)
 rename gno.land/pkg/{keyscmd => keyscli}/add.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/add_test.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/addpkg.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/broadcast.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/call.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/common.go (95%)
 rename gno.land/pkg/{keyscmd => keyscli}/delete.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/delete_test.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/export.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/export_test.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/generate.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/generate_test.go (98%)
 rename gno.land/pkg/{keyscmd => keyscli}/helper.go (96%)
 rename gno.land/pkg/{keyscmd => keyscli}/import.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/import_test.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/list.go (98%)
 rename gno.land/pkg/{keyscmd => keyscli}/list_test.go (98%)
 rename gno.land/pkg/{keyscmd => keyscli}/maketx.go (98%)
 rename gno.land/pkg/{keyscmd => keyscli}/query.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/root.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/run.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/send.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/sign.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/sign_test.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/verify.go (99%)
 rename gno.land/pkg/{keyscmd => keyscli}/verify_test.go (99%)

diff --git a/contribs/gnokeykc/main.go b/contribs/gnokeykc/main.go
index 3a48bfa8960..f5e2f2d2292 100644
--- a/contribs/gnokeykc/main.go
+++ b/contribs/gnokeykc/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	client "github.com/gnolang/gno/gno.land/pkg/keyscmd"
+	"github.com/gnolang/gno/gno.land/pkg/keyscli"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/zalando/go-keyring"
 )
@@ -13,7 +13,7 @@ import (
 func main() {
 	stdio := commands.NewDefaultIO()
 	wrappedio := &wrappedIO{IO: stdio}
-	cmd := client.NewRootCmd(wrappedio)
+	cmd := keyscli.NewRootCmd(wrappedio)
 	cmd.AddSubCommands(newKcCmd(stdio))
 
 	if err := cmd.ParseAndRun(context.Background(), os.Args[1:]); err != nil {
diff --git a/gno.land/cmd/genesis/validator_add_test.go b/gno.land/cmd/genesis/validator_add_test.go
index fada5f96cee..569df324c95 100644
--- a/gno.land/cmd/genesis/validator_add_test.go
+++ b/gno.land/cmd/genesis/validator_add_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gnolang/gno/gno.land/pkg/keyscmd"
+	"github.com/gnolang/gno/gno.land/pkg/keyscli"
 	"github.com/gnolang/gno/tm2/pkg/bft/types"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
@@ -21,7 +21,7 @@ import (
 func getDummyKey(t *testing.T) crypto.PubKey {
 	t.Helper()
 
-	mnemonic, err := keyscmd.GenerateMnemonic(256)
+	mnemonic, err := keyscli.GenerateMnemonic(256)
 	require.NoError(t, err)
 
 	seed := bip39.NewSeed(mnemonic, "")
diff --git a/gno.land/cmd/gnofaucet/serve.go b/gno.land/cmd/gnofaucet/serve.go
index db211cc8d67..4366f57f048 100644
--- a/gno.land/cmd/gnofaucet/serve.go
+++ b/gno.land/cmd/gnofaucet/serve.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/gnolang/gno/gno.land/pkg/gnoland"
-	keyscmd "github.com/gnolang/gno/gno.land/pkg/keyscmd"
+	keyscli "github.com/gnolang/gno/gno.land/pkg/keyscli"
 	"github.com/gnolang/gno/tm2/pkg/amino"
 	rpcclient "github.com/gnolang/gno/tm2/pkg/bft/rpc/client"
 	"github.com/gnolang/gno/tm2/pkg/commands"
@@ -35,7 +35,7 @@ type SiteVerifyResponse struct {
 }
 
 type config struct {
-	keyscmd.BaseOptions // home, ...
+	keyscli.BaseOptions // home, ...
 
 	ChainID               string
 	GasWanted             int64
@@ -69,21 +69,21 @@ func (c *config) RegisterFlags(fs *flag.FlagSet) {
 	fs.StringVar(
 		&c.BaseOptions.Home,
 		"home",
-		keyscmd.DefaultBaseOptions.Home,
+		keyscli.DefaultBaseOptions.Home,
 		"home directory",
 	)
 
 	fs.StringVar(
 		&c.BaseOptions.Remote,
 		"remote",
-		keyscmd.DefaultBaseOptions.Remote,
+		keyscli.DefaultBaseOptions.Remote,
 		"remote node URL",
 	)
 
 	fs.BoolVar(
 		&c.BaseOptions.Quiet,
 		"quiet",
-		keyscmd.DefaultBaseOptions.Quiet,
+		keyscli.DefaultBaseOptions.Quiet,
 		"for parsing output",
 	)
 
diff --git a/gno.land/cmd/gnokey/main.go b/gno.land/cmd/gnokey/main.go
index 1fcf03238ab..c0c0792eda3 100644
--- a/gno.land/cmd/gnokey/main.go
+++ b/gno.land/cmd/gnokey/main.go
@@ -5,18 +5,18 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gnolang/gno/gno.land/pkg/keyscmd"
+	"github.com/gnolang/gno/gno.land/pkg/keyscli"
 	"github.com/gnolang/gno/gnovm/pkg/gnoenv"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 )
 
 func main() {
-	baseCfg := keyscmd.BaseOptions{
+	baseCfg := keyscli.BaseOptions{
 		Home:   gnoenv.HomeDir(),
 		Remote: "127.0.0.1:26657",
 	}
 
-	cmd := keyscmd.NewRootCmdWithBaseConfig(commands.NewDefaultIO(), baseCfg)
+	cmd := keyscli.NewRootCmdWithBaseConfig(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/pkg/integration/testing_integration.go b/gno.land/pkg/integration/testing_integration.go
index 72ee06db360..b1cad8e8db7 100644
--- a/gno.land/pkg/integration/testing_integration.go
+++ b/gno.land/pkg/integration/testing_integration.go
@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gnolang/gno/gno.land/pkg/keyscmd"
+	"github.com/gnolang/gno/gno.land/pkg/keyscli"
 	"github.com/gnolang/gno/gnovm/pkg/gnoenv"
 	"github.com/gnolang/gno/tm2/pkg/bft/node"
 	"github.com/gnolang/gno/tm2/pkg/commands"
@@ -181,7 +181,7 @@ func setupGnolandTestScript(t *testing.T, txtarDir string) testscript.Params {
 				io := commands.NewTestIO()
 				io.SetOut(commands.WriteNopCloser(ts.Stdout()))
 				io.SetErr(commands.WriteNopCloser(ts.Stderr()))
-				cmd := keyscmd.NewRootCmd(io)
+				cmd := keyscli.NewRootCmd(io)
 
 				io.SetIn(strings.NewReader("\n")) // Inject empty password to stdin.
 				defaultArgs := []string{
diff --git a/gno.land/pkg/keyscmd/add.go b/gno.land/pkg/keyscli/add.go
similarity index 99%
rename from gno.land/pkg/keyscmd/add.go
rename to gno.land/pkg/keyscli/add.go
index dccba1d1819..aa622fcba61 100644
--- a/gno.land/pkg/keyscmd/add.go
+++ b/gno.land/pkg/keyscli/add.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/add_test.go b/gno.land/pkg/keyscli/add_test.go
similarity index 99%
rename from gno.land/pkg/keyscmd/add_test.go
rename to gno.land/pkg/keyscli/add_test.go
index ac46b55df02..f9721125f24 100644
--- a/gno.land/pkg/keyscmd/add_test.go
+++ b/gno.land/pkg/keyscli/add_test.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"fmt"
diff --git a/gno.land/pkg/keyscmd/addpkg.go b/gno.land/pkg/keyscli/addpkg.go
similarity index 99%
rename from gno.land/pkg/keyscmd/addpkg.go
rename to gno.land/pkg/keyscli/addpkg.go
index 64c11091a29..8910b20641c 100644
--- a/gno.land/pkg/keyscmd/addpkg.go
+++ b/gno.land/pkg/keyscli/addpkg.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 // TODO: move most of the logic in ROOT/gno.land/...
 
diff --git a/gno.land/pkg/keyscmd/broadcast.go b/gno.land/pkg/keyscli/broadcast.go
similarity index 99%
rename from gno.land/pkg/keyscmd/broadcast.go
rename to gno.land/pkg/keyscli/broadcast.go
index f6a9571509b..ddff453921a 100644
--- a/gno.land/pkg/keyscmd/broadcast.go
+++ b/gno.land/pkg/keyscli/broadcast.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/call.go b/gno.land/pkg/keyscli/call.go
similarity index 99%
rename from gno.land/pkg/keyscmd/call.go
rename to gno.land/pkg/keyscli/call.go
index 58522aa51e7..abc561f29f0 100644
--- a/gno.land/pkg/keyscmd/call.go
+++ b/gno.land/pkg/keyscli/call.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/common.go b/gno.land/pkg/keyscli/common.go
similarity index 95%
rename from gno.land/pkg/keyscmd/common.go
rename to gno.land/pkg/keyscli/common.go
index a5e769c316e..0e638e147e9 100644
--- a/gno.land/pkg/keyscmd/common.go
+++ b/gno.land/pkg/keyscli/common.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 type BaseOptions struct {
 	Home                  string
diff --git a/gno.land/pkg/keyscmd/delete.go b/gno.land/pkg/keyscli/delete.go
similarity index 99%
rename from gno.land/pkg/keyscmd/delete.go
rename to gno.land/pkg/keyscli/delete.go
index 40cf261116a..566503d5fa7 100644
--- a/gno.land/pkg/keyscmd/delete.go
+++ b/gno.land/pkg/keyscli/delete.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/delete_test.go b/gno.land/pkg/keyscli/delete_test.go
similarity index 99%
rename from gno.land/pkg/keyscmd/delete_test.go
rename to gno.land/pkg/keyscli/delete_test.go
index b7084c7e4f0..01c62c7a3ca 100644
--- a/gno.land/pkg/keyscmd/delete_test.go
+++ b/gno.land/pkg/keyscli/delete_test.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"strings"
diff --git a/gno.land/pkg/keyscmd/export.go b/gno.land/pkg/keyscli/export.go
similarity index 99%
rename from gno.land/pkg/keyscmd/export.go
rename to gno.land/pkg/keyscli/export.go
index fc8db532e92..d4fb73f3225 100644
--- a/gno.land/pkg/keyscmd/export.go
+++ b/gno.land/pkg/keyscli/export.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/export_test.go b/gno.land/pkg/keyscli/export_test.go
similarity index 99%
rename from gno.land/pkg/keyscmd/export_test.go
rename to gno.land/pkg/keyscli/export_test.go
index dd859c04bff..1f00031d0d0 100644
--- a/gno.land/pkg/keyscmd/export_test.go
+++ b/gno.land/pkg/keyscli/export_test.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"fmt"
diff --git a/gno.land/pkg/keyscmd/generate.go b/gno.land/pkg/keyscli/generate.go
similarity index 99%
rename from gno.land/pkg/keyscmd/generate.go
rename to gno.land/pkg/keyscli/generate.go
index 87432a6abc0..b9161df9113 100644
--- a/gno.land/pkg/keyscmd/generate.go
+++ b/gno.land/pkg/keyscli/generate.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/generate_test.go b/gno.land/pkg/keyscli/generate_test.go
similarity index 98%
rename from gno.land/pkg/keyscmd/generate_test.go
rename to gno.land/pkg/keyscli/generate_test.go
index 6417aafcfb4..044d82dfa81 100644
--- a/gno.land/pkg/keyscmd/generate_test.go
+++ b/gno.land/pkg/keyscli/generate_test.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"strings"
diff --git a/gno.land/pkg/keyscmd/helper.go b/gno.land/pkg/keyscli/helper.go
similarity index 96%
rename from gno.land/pkg/keyscmd/helper.go
rename to gno.land/pkg/keyscli/helper.go
index 7db45a79c59..2617e3a05e3 100644
--- a/gno.land/pkg/keyscmd/helper.go
+++ b/gno.land/pkg/keyscli/helper.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import "github.com/gnolang/gno/tm2/pkg/crypto/bip39"
 
diff --git a/gno.land/pkg/keyscmd/import.go b/gno.land/pkg/keyscli/import.go
similarity index 99%
rename from gno.land/pkg/keyscmd/import.go
rename to gno.land/pkg/keyscli/import.go
index ee790f7dfc4..008ea1f08dc 100644
--- a/gno.land/pkg/keyscmd/import.go
+++ b/gno.land/pkg/keyscli/import.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/import_test.go b/gno.land/pkg/keyscli/import_test.go
similarity index 99%
rename from gno.land/pkg/keyscmd/import_test.go
rename to gno.land/pkg/keyscli/import_test.go
index 05fe8a1c1e9..8e3ef80e30c 100644
--- a/gno.land/pkg/keyscmd/import_test.go
+++ b/gno.land/pkg/keyscli/import_test.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"fmt"
diff --git a/gno.land/pkg/keyscmd/list.go b/gno.land/pkg/keyscli/list.go
similarity index 98%
rename from gno.land/pkg/keyscmd/list.go
rename to gno.land/pkg/keyscli/list.go
index 4ec1492db1c..068a302cd17 100644
--- a/gno.land/pkg/keyscmd/list.go
+++ b/gno.land/pkg/keyscli/list.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/list_test.go b/gno.land/pkg/keyscli/list_test.go
similarity index 98%
rename from gno.land/pkg/keyscmd/list_test.go
rename to gno.land/pkg/keyscli/list_test.go
index 90b4a6c6d1e..c5adc61a379 100644
--- a/gno.land/pkg/keyscmd/list_test.go
+++ b/gno.land/pkg/keyscli/list_test.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"testing"
diff --git a/gno.land/pkg/keyscmd/maketx.go b/gno.land/pkg/keyscli/maketx.go
similarity index 98%
rename from gno.land/pkg/keyscmd/maketx.go
rename to gno.land/pkg/keyscli/maketx.go
index f09b1a9fe56..774580d0b7d 100644
--- a/gno.land/pkg/keyscmd/maketx.go
+++ b/gno.land/pkg/keyscli/maketx.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"flag"
diff --git a/gno.land/pkg/keyscmd/query.go b/gno.land/pkg/keyscli/query.go
similarity index 99%
rename from gno.land/pkg/keyscmd/query.go
rename to gno.land/pkg/keyscli/query.go
index 306b8f2ff1a..0f2adb74a57 100644
--- a/gno.land/pkg/keyscmd/query.go
+++ b/gno.land/pkg/keyscli/query.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/root.go b/gno.land/pkg/keyscli/root.go
similarity index 99%
rename from gno.land/pkg/keyscmd/root.go
rename to gno.land/pkg/keyscli/root.go
index 79c87c80857..99ed6e67093 100644
--- a/gno.land/pkg/keyscmd/root.go
+++ b/gno.land/pkg/keyscli/root.go
@@ -1,5 +1,5 @@
 // Dedicated to my love, Lexi.
-package keyscmd
+package keyscli
 
 import (
 	"flag"
diff --git a/gno.land/pkg/keyscmd/run.go b/gno.land/pkg/keyscli/run.go
similarity index 99%
rename from gno.land/pkg/keyscmd/run.go
rename to gno.land/pkg/keyscli/run.go
index 7df9369e2c2..914af0304e8 100644
--- a/gno.land/pkg/keyscmd/run.go
+++ b/gno.land/pkg/keyscli/run.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/send.go b/gno.land/pkg/keyscli/send.go
similarity index 99%
rename from gno.land/pkg/keyscmd/send.go
rename to gno.land/pkg/keyscli/send.go
index df7e2f5e68c..026370df9b1 100644
--- a/gno.land/pkg/keyscmd/send.go
+++ b/gno.land/pkg/keyscli/send.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/sign.go b/gno.land/pkg/keyscli/sign.go
similarity index 99%
rename from gno.land/pkg/keyscmd/sign.go
rename to gno.land/pkg/keyscli/sign.go
index 2f25a4f7609..b399a1c3418 100644
--- a/gno.land/pkg/keyscmd/sign.go
+++ b/gno.land/pkg/keyscli/sign.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/sign_test.go b/gno.land/pkg/keyscli/sign_test.go
similarity index 99%
rename from gno.land/pkg/keyscmd/sign_test.go
rename to gno.land/pkg/keyscli/sign_test.go
index d83e8a2bbf7..cc7538960cf 100644
--- a/gno.land/pkg/keyscmd/sign_test.go
+++ b/gno.land/pkg/keyscli/sign_test.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"fmt"
diff --git a/gno.land/pkg/keyscmd/verify.go b/gno.land/pkg/keyscli/verify.go
similarity index 99%
rename from gno.land/pkg/keyscmd/verify.go
rename to gno.land/pkg/keyscli/verify.go
index c82897834be..65e8b0dba7c 100644
--- a/gno.land/pkg/keyscmd/verify.go
+++ b/gno.land/pkg/keyscli/verify.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"context"
diff --git a/gno.land/pkg/keyscmd/verify_test.go b/gno.land/pkg/keyscli/verify_test.go
similarity index 99%
rename from gno.land/pkg/keyscmd/verify_test.go
rename to gno.land/pkg/keyscli/verify_test.go
index 010343f8cdf..dc15e32b790 100644
--- a/gno.land/pkg/keyscmd/verify_test.go
+++ b/gno.land/pkg/keyscli/verify_test.go
@@ -1,4 +1,4 @@
-package keyscmd
+package keyscli
 
 import (
 	"encoding/hex"

From 6daf287f7461882e4c99c89f70460c231b3ba674 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Wed, 13 Dec 2023 17:30:04 +0100
Subject: [PATCH 4/8] fix: add some information about the deprecated client

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 tm2/pkg/crypto/keys/client/README.md     | 11 +++++++++++
 tm2/pkg/crypto/keys/client/deprecated.go | 11 +++++++++++
 2 files changed, 22 insertions(+)
 create mode 100644 tm2/pkg/crypto/keys/client/README.md
 create mode 100644 tm2/pkg/crypto/keys/client/deprecated.go

diff --git a/tm2/pkg/crypto/keys/client/README.md b/tm2/pkg/crypto/keys/client/README.md
new file mode 100644
index 00000000000..e06316a0d62
--- /dev/null
+++ b/tm2/pkg/crypto/keys/client/README.md
@@ -0,0 +1,11 @@
+# keys/client (Deprecated)
+
+## Deprecation Notice
+
+The `client` package has been deprecated. The functionality that was previously offered by this package is now available in `gno.land/pkg/keycli`. This change has been made to streamline the project structure and enhance maintainability.
+
+For more details on this transition, please refer to the following resources:
+- **Issue Discussion**: [Issue #1174](https://github.com/gnolang/gno/issues/1174)
+- **Pull Request**: [PR #1438](https://github.com/gnolang/gno/pull/1438)
+
+If you are still using this `client` package, it is recommended to migrate your code to use `gno.land/pkg/keycli` instead.
diff --git a/tm2/pkg/crypto/keys/client/deprecated.go b/tm2/pkg/crypto/keys/client/deprecated.go
new file mode 100644
index 00000000000..7c0e3e84645
--- /dev/null
+++ b/tm2/pkg/crypto/keys/client/deprecated.go
@@ -0,0 +1,11 @@
+package client
+
+import "github.com/gnolang/gno/tm2/pkg/commands"
+
+// Deprecated: NewRootCmd is deprecated and no longer maintained. It has been
+// moved in `gno.land/pkg/keycli`. Please update your code to use the new
+// package. This function now only serves as a placeholder and will panic if
+// called to encourage migration.
+func NewRootCmd(io commands.IO) *commands.Command {
+	panic("NewRootCmd: has been deprecated, use `gno.land/pkg/keycli` instead")
+}

From e71b3c6ea34f186c868b98f7462a963b7ba79fb4 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Thu, 14 Dec 2023 11:13:39 +0100
Subject: [PATCH 5/8] chore: small readme update

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 tm2/pkg/crypto/keys/client/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tm2/pkg/crypto/keys/client/README.md b/tm2/pkg/crypto/keys/client/README.md
index e06316a0d62..b3be41de23a 100644
--- a/tm2/pkg/crypto/keys/client/README.md
+++ b/tm2/pkg/crypto/keys/client/README.md
@@ -2,7 +2,7 @@
 
 ## Deprecation Notice
 
-The `client` package has been deprecated. The functionality that was previously offered by this package is now available in `gno.land/pkg/keycli`. This change has been made to streamline the project structure and enhance maintainability.
+The `keys/client` package has been deprecated. The functionality that was previously offered by this package is now available in `gno.land/pkg/keycli`. This change has been made to streamline the project structure and enhance maintainability.
 
 For more details on this transition, please refer to the following resources:
 - **Issue Discussion**: [Issue #1174](https://github.com/gnolang/gno/issues/1174)

From e6478c38c70f64d89c4432fd4bdfa117966bf61c Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Thu, 14 Dec 2023 16:01:05 +0100
Subject: [PATCH 6/8] chore: fixup comment

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 tm2/pkg/crypto/keys/client/deprecated.go | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tm2/pkg/crypto/keys/client/deprecated.go b/tm2/pkg/crypto/keys/client/deprecated.go
index 7c0e3e84645..f4adb06dc8f 100644
--- a/tm2/pkg/crypto/keys/client/deprecated.go
+++ b/tm2/pkg/crypto/keys/client/deprecated.go
@@ -2,10 +2,18 @@ package client
 
 import "github.com/gnolang/gno/tm2/pkg/commands"
 
-// Deprecated: NewRootCmd is deprecated and no longer maintained. It has been
-// moved in `gno.land/pkg/keycli`. Please update your code to use the new
-// package. This function now only serves as a placeholder and will panic if
-// called to encourage migration.
+// Deprecated: NewRootCmd is deprecated and has been moved in
+// `gno.land/pkg/keycli`. Please update your code to use the new package. This
+// function now only serves as a placeholder and will panic if called to
+// encourage migration.
 func NewRootCmd(io commands.IO) *commands.Command {
 	panic("NewRootCmd: has been deprecated, use `gno.land/pkg/keycli` instead")
 }
+
+// Deprecated: NewRootCmdWithBaseConfig as has been moved in
+// `gno.land/pkg/keycli`. Please update your code to use the new package. This
+// function now only serves as a placeholder and will panic if called to
+// encourage migration.
+func NewRootCmdWithBaseConfig(io commands.IO, cfg interface{}) *commands.Command {
+	panic("NewRootCmdWithBaseConfig: has been deprecated, use `gno.land/pkg/keycli` instead")
+}

From 30b0f66e3473092290bdfc589d686b6ae3b83e23 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Fri, 15 Dec 2023 00:35:08 +0100
Subject: [PATCH 7/8] fix: add build constraint on `keys/client`

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 tm2/pkg/crypto/keys/client/deprecated.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tm2/pkg/crypto/keys/client/deprecated.go b/tm2/pkg/crypto/keys/client/deprecated.go
index f4adb06dc8f..fc1f64e6591 100644
--- a/tm2/pkg/crypto/keys/client/deprecated.go
+++ b/tm2/pkg/crypto/keys/client/deprecated.go
@@ -1,3 +1,5 @@
+//go:build deprecated
+
 package client
 
 import "github.com/gnolang/gno/tm2/pkg/commands"

From 68dc0917be2e21ba9019e64d8add87bbacc6e261 Mon Sep 17 00:00:00 2001
From: gfanton <8671905+gfanton@users.noreply.github.com>
Date: Wed, 20 Dec 2023 16:12:23 +0100
Subject: [PATCH 8/8] fix: remove all method signature in `keys/client`

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 tm2/pkg/crypto/keys/client/deprecated.go | 21 +--------------------
 1 file changed, 1 insertion(+), 20 deletions(-)

diff --git a/tm2/pkg/crypto/keys/client/deprecated.go b/tm2/pkg/crypto/keys/client/deprecated.go
index fc1f64e6591..c3a249d6ead 100644
--- a/tm2/pkg/crypto/keys/client/deprecated.go
+++ b/tm2/pkg/crypto/keys/client/deprecated.go
@@ -1,21 +1,2 @@
-//go:build deprecated
-
+// Deprecated: Please use 'gno.land/pkg/keycli'
 package client
-
-import "github.com/gnolang/gno/tm2/pkg/commands"
-
-// Deprecated: NewRootCmd is deprecated and has been moved in
-// `gno.land/pkg/keycli`. Please update your code to use the new package. This
-// function now only serves as a placeholder and will panic if called to
-// encourage migration.
-func NewRootCmd(io commands.IO) *commands.Command {
-	panic("NewRootCmd: has been deprecated, use `gno.land/pkg/keycli` instead")
-}
-
-// Deprecated: NewRootCmdWithBaseConfig as has been moved in
-// `gno.land/pkg/keycli`. Please update your code to use the new package. This
-// function now only serves as a placeholder and will panic if called to
-// encourage migration.
-func NewRootCmdWithBaseConfig(io commands.IO, cfg interface{}) *commands.Command {
-	panic("NewRootCmdWithBaseConfig: has been deprecated, use `gno.land/pkg/keycli` instead")
-}