move encrypt cmd to e2ee module

cmd/cronosd/cmd/root.go

@@ -191,7 +191,6 @@ func initRootCmd(
 		txCommand(),
 		ethermintclient.KeyCommands(app.DefaultNodeHome),
 		e2eecli.E2EECommand(),
-		EncryptMsgCommand(),
 		DecryptMsgCommand(),
 	)
 

integration_tests/cosmoscli.py

@@ -1,6 +1,7 @@
 import binascii
 import enum
 import hashlib
+import itertools
 import json
 import os
 import re
@@ -1874,11 +1875,12 @@ def set_e2ee_key(self, key, **kwargs):
     def keygen(self, **kwargs):
         return self.raw("e2ee", "keygen", home=self.data_dir, **kwargs).strip().decode()
 
-    def encrypt(self, input, receipts, **kwargs):
+    def encrypt(self, input, *recipients, **kwargs):
         return self.raw(
+            "e2ee",
             "encrypt",
             input,
-            *[val for a in [["--r", val] for val in receipts] for val in a],
+            *itertools.chain.from_iterable(("-r", r) for r in recipients),
             **kwargs,
         )
 

integration_tests/test_e2ee.py

@@ -18,10 +18,12 @@ def test_encrypt_decrypt(cronos):
     key1 = f"{key_dir}/key1"
     pubkey0 = cli.keygen(o=key0)
     pubkey1 = cli.keygen(o=key1)
+    # TODO
+    # save pubkey on chain
     input = f"{key_dir}/input"
     decrypted = f"{key_dir}/input.age"
     data = "Hello, World!"
     with open(input, "w") as file:
         file.write(data)
-    cli.encrypt(input, [pubkey0, pubkey1], o=decrypted)
+    cli.encrypt(input, pubkey0, pubkey1, output=decrypted)
     assert cli.decrypt(decrypted, i=key0) == cli.decrypt(decrypted, i=key1) == data

x/e2ee/client/cli/cmd.go

@@ -10,6 +10,7 @@ func E2EECommand() *cobra.Command {
 
 	cmd.AddCommand(
 		KeygenCommand(),
+		EncryptCommand(),
 	)
 
 	return cmd

x/e2ee/client/cli/encrypt.go

@@ -0,0 +1,105 @@
+package cli
+
+import (
+	"errors"
+	"io"
+	"os"
+
+	"filippo.io/age"
+	"github.com/cosmos/cosmos-sdk/client"
+	"github.com/cosmos/cosmos-sdk/client/flags"
+	"github.com/spf13/cobra"
+
+	"github.com/crypto-org-chain/cronos/v2/x/e2ee/types"
+)
+
+const (
+	FlagRecipient = "recipient"
+	flagO         = "o"
+)
+
+func EncryptCommand() *cobra.Command {
+	cmd := &cobra.Command{
+		Use:   "encrypt [input-file]",
+		Short: "Encrypt input file to one or multiple recipients",
+		Args:  cobra.ExactArgs(1),
+		RunE: func(cmd *cobra.Command, args []string) error {
+			clientCtx, err := client.GetClientQueryContext(cmd)
+			if err != nil {
+				return err
+			}
+
+			outputFile, err := cmd.Flags().GetString(flags.FlagOutput)
+			if err != nil {
+				return err
+			}
+
+			recs, err := cmd.Flags().GetStringArray(FlagRecipient)
+			if err != nil {
+				return err
+			}
+
+			// query encryption key from chain state
+			client := types.NewQueryClient(clientCtx.GRPCClient)
+			recipients := make([]age.Recipient, len(recs))
+			for i, rec := range recs {
+				rsp, err := client.Key(clientCtx.CmdContext, &types.KeyRequest{
+					Address: rec,
+				})
+				if err != nil {
+					return err
+				}
+				recipient, err := age.ParseX25519Recipient(string(rsp.Key))
+				if err != nil {
+					return err
+				}
+				recipients[i] = recipient
+			}
+
+			inputFile := args[0]
+			var input io.Reader
+			if inputFile == "-" {
+				input = os.Stdin
+			} else {
+				f, err := os.Open(inputFile)
+				if err != nil {
+					return err
+				}
+				defer f.Close()
+				input = f
+			}
+
+			var output io.Writer
+			if outputFile == "-" {
+				output = os.Stdout
+			} else {
+				fp, err := os.Create(outputFile)
+				if err != nil {
+					return err
+				}
+				defer fp.Close()
+				output = fp
+			}
+			return encrypt(recipients, input, output)
+		},
+	}
+	f := cmd.Flags()
+	f.StringArrayP(FlagRecipient, "r", []string{}, "recipients")
+	f.StringP(flags.FlagOutput, "o", "-", "output file (default stdout)")
+	return cmd
+}
+
+func encrypt(recipients []age.Recipient, in io.Reader, out io.Writer) (err error) {
+	var w io.WriteCloser
+	w, err = age.Encrypt(out, recipients...)
+	if err != nil {
+		return err
+	}
+
+	defer func() {
+		err = errors.Join(err, w.Close())
+	}()
+
+	_, err = io.Copy(w, in)
+	return
+}