[cli] Add wallet filepath to anti wallet info

Author: paolino

cli/src/Core/Types/Mnemonics/Options.hs

@@ -1,6 +1,7 @@
 module Core.Types.Mnemonics.Options
     ( mnemonicsParser
     , walletPassphraseCommon
+    , walletFileOption
     ) where
 
 import Core.Encryption (decryptText)
@@ -60,7 +61,7 @@ walletFileOption =
     setting
         [ env "ANTI_WALLET_FILE"
         , metavar "FILEPATH"
-        , help "The file path to the wallet secrets"
+        , help "The file path to the wallet secrets mnemonics"
         , reader str
         ]
 

cli/src/Wallet/Cli.hs

@@ -30,17 +30,20 @@ instance (ToJSON m a, Monad m) => ToJSON m (Either WalletError a) where
 data WalletInfo = WalletInfo
     { address :: Address
     , owner :: Owner
+    , filePath :: FilePath
     }
 
 instance Monad m => ToJSON m WalletInfo where
-    toJSON WalletInfo{address, owner} =
+    toJSON WalletInfo{address, owner, filePath} =
         object
             [ "address" .= address
             , "owner" .= owner
+            , "filePath" .= filePath
             ]
 
 data WalletCommand a where
-    Info :: Wallet -> WalletCommand (Either WalletError WalletInfo)
+    Info
+        :: Wallet -> FilePath -> WalletCommand (Either WalletError WalletInfo)
     Create
         :: FilePath
         -> Maybe Text
@@ -50,12 +53,13 @@ deriving instance Show (WalletCommand a)
 deriving instance Eq (WalletCommand a)
 
 walletCmd :: WalletCommand a -> IO a
-walletCmd (Info wallet) =
+walletCmd (Info wallet filePath) =
     pure
         $ Right
         $ WalletInfo
             { address = wallet.address
             , owner = wallet.owner
+            , filePath = filePath
             }
 walletCmd (Create walletFile passphrase) = do
     w12 <- replicateM 12 $ element englishWords
@@ -68,6 +72,7 @@ walletCmd (Create walletFile passphrase) = do
                 $ WalletInfo
                     { address = wallet.address
                     , owner = wallet.owner
+                    , filePath = walletFile
                     }
 
 element :: [a] -> IO a

cli/src/Wallet/Options.hs

@@ -5,21 +5,15 @@ module Wallet.Options
     ) where
 
 import Core.Options (walletOption)
-import Core.Types.Mnemonics.Options (walletPassphraseCommon)
+import Core.Types.Mnemonics.Options
+    ( walletFileOption
+    , walletPassphraseCommon
+    )
 import Data.Text (Text)
 import Lib.Box (Box (..))
 import OptEnvConf
 import Wallet.Cli (WalletCommand (..))
 
-walletFileOption :: Parser FilePath
-walletFileOption =
-    setting
-        [ help "File to store the wallet mnemonic"
-        , metavar "MNEMONICS"
-        , env "ANTI_WALLET_FILE"
-        , reader str
-        ]
-
 walletCommandParser :: Parser (Box WalletCommand)
 walletCommandParser =
     commands
@@ -32,8 +26,9 @@ walletCommandParser =
         , command
             "info"
             "Get the wallet information"
-            $ Box . Info
+            $ fmap Box . Info
                 <$> walletOption
+                <*> walletFileOption
         ]
 
 passphraseOption :: Parser (Maybe Text)