feat(rpc): implement getincomingvk

-  Shield form created
	 -  Deshield form created
	 Both forms have the 'Process' button de-activated. Must be linked
	 to the appropiate funciton

CHANGELOG.md

@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.8.0.0-beta]
+
+### Added
+
+- RPC methods:
+	- `shieldnotes`
+	- `deshieldfunds`
+	- `getfullvk`
+	- `getincomingvk`
+
 ## [0.7.2.0-beta]
 
 ### Fixed

app/Server.hs

@@ -67,7 +67,7 @@ main = do
                           zebraPort
                           (zgb_net chainInfo)
                       threadDelay 90000000
-                  putStrLn "Zenith RPC Server 0.7.2.0-beta"
+                  putStrLn "Zenith RPC Server 0.8.0.0-beta"
                   putStrLn "------------------------------"
                   putStrLn $
                     "Connected to " ++

src/Zenith/CLI.hs

@@ -79,6 +79,7 @@ import Data.Scientific (Scientific, scientific)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
+import qualified Data.UUID as U
 import qualified Data.Vector as Vec
 import Database.Persist
 import Database.Persist.Sqlite
@@ -116,6 +117,7 @@ import Zenith.Types
   , ValidAddressAPI(..)
   , ZcashNetDB(..)
   , ZenithStatus(..)
+  , ZenithUuid(..)
   )
 import Zenith.Utils
   ( displayTaz
@@ -1283,28 +1285,9 @@ appEvent (BT.VtyEvent e) = do
                                         Just (_j, w1) -> return w1
                                     Just (_k, w) -> return w
                              fs1 <- BT.zoom deshieldForm $ BT.gets formState
-                             let tAddrMaybe =
-                                   Transparent <$>
-                                   ((decodeTransparentAddress .
-                                     E.encodeUtf8 .
-                                     encodeTransparentReceiver (s ^. network)) =<<
-                                    (t_rec =<<
-                                     (isValidUnifiedAddress .
-                                      E.encodeUtf8 .
-                                      getUA . walletAddressUAddress)
-                                       (entityVal selAddr)))
                              bl <-
                                liftIO $
                                getChainTip (s ^. zebraHost) (s ^. zebraPort)
-                             case tAddrMaybe of
-                               Nothing -> do
-                                 BT.modify $
-                                   set
-                                     msg
-                                     "Failed to obtain transparent address"
-                                 BT.modify $ set displayBox MsgDisplay
-                                 BT.modify $ set dialogBox Blank
-                               Just tAddr -> do
                              _ <-
                                liftIO $
                                forkIO $
@@ -1316,10 +1299,7 @@ appEvent (BT.VtyEvent e) = do
                                  (s ^. network)
                                  (entityKey selAcc)
                                  bl
-                                     (ProposedNote
-                                        (ValidAddressAPI tAddr)
                                  (fs1 ^. shAmt)
-                                        Nothing)
                              BT.modify $ set displayBox SendDisplay
                              BT.modify $ set dialogBox Blank
                            else do
@@ -2050,19 +2030,20 @@ shieldTransaction ::
 shieldTransaction pool chan zHost zPort znet accId bl = do
   BC.writeBChan chan $ TickMsg "Preparing shielding transaction..."
   res <- runNoLoggingT $ shieldTransparentNotes pool zHost zPort znet accId bl
-  forM_ res $ \case
-    Left e -> BC.writeBChan chan $ TickMsg $ show e
-    Right rawTx -> do
-      BC.writeBChan chan $ TickMsg "Transaction ready, sending to Zebra..."
-      resp <-
-        makeZebraCall
-          zHost
-          zPort
-          "sendrawtransaction"
-          [Data.Aeson.String $ toText rawTx]
-      case resp of
-        Left e1 -> BC.writeBChan chan $ TickMsg $ "Zebra error: " ++ show e1
-        Right txId -> BC.writeBChan chan $ TickTx txId
+  ops <-
+    mapM
+      (\case
+         Left e -> return $ T.pack $ show e
+         Right x -> do
+           thisOp <- getOperation pool x
+           case thisOp of
+             Nothing -> return ""
+             Just o ->
+               return $
+               (U.toText . getUuid . operationUuid $ entityVal o) <>
+               ": " <> (T.pack . show . operationStatus $ entityVal o))
+      res
+  BC.writeBChan chan $ TickMsg $ T.unpack $ T.intercalate "\n" ops
 
 deshieldTransaction ::
      ConnectionPool
@@ -2072,7 +2053,7 @@ deshieldTransaction ::
   -> ZcashNet
   -> ZcashAccountId
   -> Int
-  -> ProposedNote
+  -> Scientific
   -> IO ()
 deshieldTransaction pool chan zHost zPort znet accId bl pnote = do
   BC.writeBChan chan $ TickMsg "Deshielding funds..."

src/Zenith/Core.hs

@@ -3,6 +3,7 @@
 -- | Core wallet functionality for Zenith
 module Zenith.Core where
 
+import Control.Concurrent (forkIO)
 import Control.Exception (throwIO, try)
 import Control.Monad (forM, unless, when)
 import Control.Monad.IO.Class (liftIO)
@@ -25,6 +26,8 @@ import Data.Scientific (Scientific, scientific, toBoundedInteger)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
 import Data.Time
+import qualified Data.UUID as U
+import Data.UUID.V4 (nextRandom)
 import qualified Database.Esqueleto.Experimental as ESQ
 import Database.Persist
 import Database.Persist.Sqlite
@@ -41,6 +44,7 @@ import ZcashHaskell.Orchard
   , getOrchardTreeParts
   , getOrchardWitness
   , isValidUnifiedAddress
+  , parseAddress
   , updateOrchardCommitmentTree
   , updateOrchardWitness
   )
@@ -80,7 +84,10 @@ import Zenith.Types
   , ValidAddressAPI(..)
   , ZcashNetDB(..)
   , ZebraTreeInfo(..)
+  , ZenithStatus(..)
+  , ZenithUuid(..)
   )
+import Zenith.Utils (getTransparentFromUA)
 
 -- * Zebra Node interaction
 -- | Checks the status of the `zebrad` node
@@ -746,14 +753,37 @@ deshieldNotes ::
   -> ZcashNet
   -> ZcashAccountId
   -> Int
-  -> ProposedNote
+  -> Scientific
   -> NoLoggingT IO (Either TxError HexString)
 deshieldNotes pool zebraHost zebraPort znet za bh pnote = do
   bal <- liftIO $ getShieldedBalance pool za
-  let zats = pn_amt pnote * scientific 1 8
+  addrs <- getAddresses pool za
+  let defAddr =
+        parseAddress $
+        E.encodeUtf8 $ getUA $ walletAddressUAddress $ entityVal $ head addrs
+  case defAddr of
+    Nothing -> return $ Left ZHError
+    Just (Unified x) -> do
+      case getTransparentFromUA x of
+        Nothing -> return $ Left ZHError
+        Just ta -> do
+          let zats = pnote * scientific 1 8
           if fromInteger bal > (scientific 2 4 + zats)
-    then prepareTxV2 pool zebraHost zebraPort znet za bh [pnote] Low
+            then prepareTxV2
+                   pool
+                   zebraHost
+                   zebraPort
+                   znet
+                   za
+                   bh
+                   [ ProposedNote
+                       (ValidAddressAPI $ Transparent ta)
+                       pnote
+                       Nothing
+                   ]
+                   Low
             else return $ Left InsufficientFunds
+    _anyOther -> return $ Left ZHError
 
 shieldTransparentNotes ::
      ConnectionPool
@@ -762,8 +792,8 @@ shieldTransparentNotes ::
   -> ZcashNet
   -> ZcashAccountId
   -> Int
-  -> NoLoggingT IO [Either TxError HexString]
-shieldTransparentNotes pool zebraHost zebraPort znet za bh = do
+  -> NoLoggingT IO [Either TxError U.UUID]
+shieldTransparentNotes pool zHost zPort znet za bh = do
   accRead <- liftIO $ getAccountById pool za
   logDebugN $ T.pack $ "Target block: " ++ show bh
   case accRead of
@@ -772,15 +802,29 @@ shieldTransparentNotes pool zebraHost zebraPort znet za bh = do
       return [Left ZHError]
     Just acc -> do
       trNotes' <- liftIO $ getWalletUnspentTrNotes pool za
+      if null trNotes'
+        then return [Left InsufficientFunds]
+        else do
           dRecvs <- liftIO $ getReceivers pool trNotes'
           let fNotes =
                 map
                   (\x ->
-                 filter (\y -> walletTrNoteAddress (entityVal y) == x) trNotes')
+                     filter
+                       (\y -> walletTrNoteAddress (entityVal y) == x)
+                       trNotes')
                   dRecvs
           sTree <- liftIO $ getSaplingTree pool
           oTree <- liftIO $ getOrchardTree pool
           forM fNotes $ \trNotes -> do
+            opid <- liftIO nextRandom
+            startTime <- liftIO getCurrentTime
+            opkey <-
+              liftIO $
+              saveOperation pool $
+              Operation (ZenithUuid opid) startTime Nothing Processing Nothing
+            case opkey of
+              Nothing -> return $ Left ZHError
+              Just opkey' -> do
                 let noteTotal = getTotalAmount (trNotes, [], [])
                 tSpends <-
                   liftIO $
@@ -796,7 +840,8 @@ shieldTransparentNotes pool zebraHost zebraPort znet za bh = do
                 let dummy =
                       OutgoingNote
                         4
-                (getBytes $ getOrchSK $ zcashAccountOrchSpendKey $ entityVal acc)
+                        (getBytes $
+                         getOrchSK $ zcashAccountOrchSpendKey $ entityVal acc)
                         (getBytes oRcvr)
                         (fromIntegral $ noteTotal - 500)
                         ""
@@ -805,11 +850,15 @@ shieldTransparentNotes pool zebraHost zebraPort znet za bh = do
                 let snote =
                       OutgoingNote
                         4
-                (getBytes $ getOrchSK $ zcashAccountOrchSpendKey $ entityVal acc)
+                        (getBytes $
+                         getOrchSK $ zcashAccountOrchSpendKey $ entityVal acc)
                         (getBytes oRcvr)
                         (fromIntegral $ noteTotal - fromIntegral feeAmt)
                         ""
                         True
+                _ <-
+                  liftIO $
+                  forkIO $ do
                     tx <-
                       liftIO $
                       createTransaction
@@ -822,8 +871,25 @@ shieldTransparentNotes pool zebraHost zebraPort znet za bh = do
                         znet
                         (bh + 3)
                         True
-        logDebugN $ T.pack $ show tx
-        return tx
+                    case tx of
+                      Left e ->
+                        finalizeOperation pool opkey' Failed $ T.pack $ show e
+                      Right rawTx -> do
+                        zebraRes <-
+                          makeZebraCall
+                            zHost
+                            zPort
+                            "sendrawtransaction"
+                            [Data.Aeson.String $ toText rawTx]
+                        case zebraRes of
+                          Left e1 ->
+                            finalizeOperation pool opkey' Failed $
+                            T.pack $ show e1
+                          Right txId ->
+                            finalizeOperation pool opkey' Successful $
+                            "Tx ID: " <> toText txId
+                logDebugN $ T.pack $ show opid
+                return $ Right opid
   where
     getTotalAmount ::
          ( [Entity WalletTrNote]

src/Zenith/DB.hs

@@ -630,6 +630,7 @@ getAddresses pool a =
       addrs <- from $ table @WalletAddress
       where_ (addrs ^. WalletAddressAccId ==. val a)
       where_ (addrs ^. WalletAddressScope ==. val (ScopeDB External))
+      orderBy [asc $ addrs ^. WalletAddressId]
       pure addrs
 
 getAddressById ::

src/Zenith/GUI.hs

@@ -28,6 +28,7 @@ import Data.Scientific (Scientific, fromFloatDigits)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
+import qualified Data.UUID as U
 import Database.Esqueleto.Experimental (ConnectionPool, fromSqlKey)
 import Database.Persist
 import Lens.Micro ((&), (+~), (.~), (?~), (^.), set)
@@ -1768,19 +1769,20 @@ shieldTransaction config znet accId sendMsg = do
   pool <- runNoLoggingT $ initPool dbPath
   bl <- getChainTip zHost zPort
   res <- runNoLoggingT $ shieldTransparentNotes pool zHost zPort znet accId bl
-  forM_ res $ \case
-    Left e -> sendMsg $ ShowError $ T.pack (show e)
-    Right rawTx -> do
-      sendMsg $ ShowMsg "Transaction ready, sending to Zebra..."
-      resp <-
-        makeZebraCall
-          zHost
-          zPort
-          "sendrawtransaction"
-          [Data.Aeson.String $ toText rawTx]
-      case resp of
-        Left e1 -> sendMsg $ ShowError $ "Zebra error: " <> T.pack (show e1)
-        Right txId -> sendMsg $ ShowTxId txId
+  ops <-
+    mapM
+      (\case
+         Left e -> return $ T.pack $ show e
+         Right x -> do
+           thisOp <- getOperation pool x
+           case thisOp of
+             Nothing -> return ""
+             Just o ->
+               return $
+               (U.toText . getUuid . operationUuid $ entityVal o) <>
+               ": " <> (T.pack . show . operationStatus $ entityVal o))
+      res
+  sendMsg $ ShowMsg $ T.intercalate "\n" ops
 
 deshieldTransaction ::
      Config
@@ -1800,27 +1802,7 @@ deshieldTransaction config znet accId addR pnote sendMsg = do
       let zPort = c_zebraPort config
       pool <- runNoLoggingT $ initPool dbPath
       bl <- getChainTip zHost zPort
-      let tAddrMaybe =
-            Transparent <$>
-            ((decodeTransparentAddress .
-              E.encodeUtf8 . encodeTransparentReceiver znet) =<<
-             (t_rec =<<
-              (isValidUnifiedAddress .
-               E.encodeUtf8 . getUA . walletAddressUAddress)
-                (entityVal addr)))
-      case tAddrMaybe of
-        Nothing -> sendMsg $ ShowError "No transparent address available"
-        Just tAddr -> do
-          res <-
-            runNoLoggingT $
-            deshieldNotes
-              pool
-              zHost
-              zPort
-              znet
-              accId
-              bl
-              (ProposedNote (ValidAddressAPI tAddr) pnote Nothing)
+      res <- runNoLoggingT $ deshieldNotes pool zHost zPort znet accId bl pnote
       case res of
         Left e -> sendMsg $ ShowError $ T.pack (show e)
         Right rawTx -> do

src/Zenith/RPC.hs

@@ -13,14 +13,14 @@
 module Zenith.RPC where
 
 import Control.Concurrent (forkIO)
-import Control.Exception (try)
-import Control.Monad (unless, when)
+import Control.Exception (SomeException(..), try)
+import Control.Monad (unless)
 import Control.Monad.IO.Class (liftIO)
-import Control.Monad.Logger (runFileLoggingT, runNoLoggingT, runStderrLoggingT)
+import Control.Monad.Logger (runNoLoggingT, runStderrLoggingT)
 import Data.Aeson
 import qualified Data.HexString as H
 import Data.Int
-import Data.Scientific (floatingOrInteger)
+import Data.Scientific (Scientific(..), floatingOrInteger)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
 import Data.Time.Clock (getCurrentTime)
@@ -36,7 +36,7 @@ import Database.Esqueleto.Experimental
   )
 import Servant
 import Text.Read (readMaybe)
-import ZcashHaskell.Keys (generateWalletSeedPhrase)
+import ZcashHaskell.Keys (deriveUfvk, deriveUivk, generateWalletSeedPhrase)
 import ZcashHaskell.Orchard (parseAddress)
 import ZcashHaskell.Types
   ( BlockResponse(..)
@@ -50,7 +50,9 @@ import Zenith.Core
   ( checkBlockChain
   , createCustomWalletAddress
   , createZcashAccount
+  , deshieldNotes
   , prepareTxV2
+  , shieldTransparentNotes
   , syncWallet
   , updateCommitmentTrees
   )
@@ -96,9 +98,12 @@ import Zenith.Types
   ( AccountBalance(..)
   , Config(..)
   , HexStringDB(..)
+  , OrchardSpendingKeyDB(..)
   , PhraseDB(..)
   , PrivacyPolicy(..)
   , ProposedNote(..)
+  , SaplingSpendingKeyDB(..)
+  , TransparentSpendingKeyDB(..)
   , ZcashAccountAPI(..)
   , ZcashAddressAPI(..)
   , ZcashNetDB(..)
@@ -121,6 +126,10 @@ data ZenithMethod
   | GetNewAddress
   | GetOperationStatus
   | SendMany
+  | ShieldNotes
+  | DeshieldFunds
+  | GetFVK
+  | GetIVK
   | UnknownMethod
   deriving (Eq, Prelude.Show)
 
@@ -136,6 +145,10 @@ instance ToJSON ZenithMethod where
   toJSON GetNewAddress = Data.Aeson.String "getnewaddress"
   toJSON GetOperationStatus = Data.Aeson.String "getoperationstatus"
   toJSON SendMany = Data.Aeson.String "sendmany"
+  toJSON ShieldNotes = Data.Aeson.String "shieldnotes"
+  toJSON DeshieldFunds = Data.Aeson.String "deshieldfunds"
+  toJSON GetFVK = Data.Aeson.String "getfullvk"
+  toJSON GetIVK = Data.Aeson.String "getincomingvk"
   toJSON UnknownMethod = Data.Aeson.Null
 
 instance FromJSON ZenithMethod where
@@ -152,6 +165,10 @@ instance FromJSON ZenithMethod where
       "getnewaddress" -> pure GetNewAddress
       "getoperationstatus" -> pure GetOperationStatus
       "sendmany" -> pure SendMany
+      "shieldnotes" -> pure ShieldNotes
+      "deshieldfunds" -> pure DeshieldFunds
+      "getfullvk" -> pure GetFVK
+      "getincomingvk" -> pure GetIVK
       _ -> pure UnknownMethod
 
 data ZenithParams
@@ -167,6 +184,9 @@ data ZenithParams
   | OpParams !ZenithUuid
   | SendParams !Int ![ProposedNote] !PrivacyPolicy
   | TestParams !T.Text
+  | ShieldNotesParams !Int
+  | DeshieldParams !Int !Scientific
+  | ViewingKeyParams !Int
   deriving (Eq, Prelude.Show)
 
 instance ToJSON ZenithParams where
@@ -191,6 +211,10 @@ instance ToJSON ZenithParams where
     Data.Aeson.Array $ V.fromList [Data.Aeson.String $ U.toText $ getUuid i]
   toJSON (SendParams i ns p) =
     Data.Aeson.Array $ V.fromList [jsonNumber i, toJSON ns, toJSON p]
+  toJSON (ShieldNotesParams i) = Data.Aeson.Array $ V.fromList [jsonNumber i]
+  toJSON (DeshieldParams i s) =
+    Data.Aeson.Array $ V.fromList [jsonNumber i, Data.Aeson.Number s]
+  toJSON (ViewingKeyParams i) = Data.Aeson.Array $ V.fromList [jsonNumber i]
 
 data ZenithResponse
   = InfoResponse !T.Text !ZenithInfo
@@ -203,6 +227,8 @@ data ZenithResponse
   | NewAddrResponse !T.Text !ZcashAddressAPI
   | OpResponse !T.Text !Operation
   | SendResponse !T.Text !U.UUID
+  | MultiOpResponse !T.Text ![T.Text]
+  | ViewingKeyResponse !T.Text !T.Text
   | ErrorResponse !T.Text !Double !T.Text
   deriving (Eq, Prelude.Show)
 
@@ -224,6 +250,8 @@ instance ToJSON ZenithResponse where
   toJSON (NewAddrResponse i a) = packRpcResponse i a
   toJSON (OpResponse i u) = packRpcResponse i u
   toJSON (SendResponse i o) = packRpcResponse i o
+  toJSON (MultiOpResponse i o) = packRpcResponse i o
+  toJSON (ViewingKeyResponse i k) = packRpcResponse i k
 
 instance FromJSON ZenithResponse where
   parseJSON =
@@ -298,6 +326,9 @@ instance FromJSON ZenithResponse where
                                               k5 <- parseJSON r1
                                               pure $ NoteListResponse i k5
                                             Nothing -> fail "Unknown object"
+                            String s -> do
+                              k7 <- parseJSON r1
+                              pure $ MultiOpResponse i k7
                             _anyOther -> fail "Malformed JSON"
                     Number k -> do
                       case floatingOrInteger k of
@@ -305,7 +336,7 @@ instance FromJSON ZenithResponse where
                         Right k' -> pure $ NewItemResponse i k'
                     String s -> do
                       case U.fromText s of
-                        Nothing -> fail "Unknown value"
+                        Nothing -> pure $ ViewingKeyResponse i s
                         Just u -> pure $ SendResponse i u
                     _anyOther -> fail "Malformed JSON"
             Just e1 -> pure $ ErrorResponse i (ecode e1) (emessage e1)
@@ -489,6 +520,47 @@ instance FromJSON RpcCall where
                     _anyOther -> pure $ RpcCall v i SendMany BadParams
                 else pure $ RpcCall v i SendMany BadParams
             _anyOther -> pure $ RpcCall v i SendMany BadParams
+        ShieldNotes -> do
+          p <- obj .: "params"
+          case p of
+            Array a ->
+              if V.length a == 1
+                then do
+                  x <- parseJSON $ a V.! 0
+                  pure $ RpcCall v i ShieldNotes (ShieldNotesParams x)
+                else pure $ RpcCall v i ShieldNotes BadParams
+            _anyOther -> pure $ RpcCall v i ShieldNotes BadParams
+        DeshieldFunds -> do
+          p <- obj .: "params"
+          case p of
+            Array a ->
+              if V.length a == 2
+                then do
+                  x <- parseJSON $ a V.! 0
+                  y <- parseJSON $ a V.! 1
+                  pure $ RpcCall v i DeshieldFunds (DeshieldParams x y)
+                else pure $ RpcCall v i DeshieldFunds BadParams
+            _anyOther -> pure $ RpcCall v i DeshieldFunds BadParams
+        GetFVK -> do
+          p <- obj .: "params"
+          case p of
+            Array a ->
+              if V.length a == 1
+                then do
+                  x <- parseJSON $ a V.! 0
+                  pure $ RpcCall v i GetFVK (ViewingKeyParams x)
+                else pure $ RpcCall v i GetFVK BadParams
+            _anyOther -> pure $ RpcCall v i GetFVK BadParams
+        GetIVK -> do
+          p <- obj .: "params"
+          case p of
+            Array a ->
+              if V.length a == 1
+                then do
+                  x <- parseJSON $ a V.! 0
+                  pure $ RpcCall v i GetIVK (ViewingKeyParams x)
+                else pure $ RpcCall v i GetIVK BadParams
+            _anyOther -> pure $ RpcCall v i GetIVK BadParams
 
 type ZenithRPC
   = "status" :> Get '[ JSON] Value :<|> BasicAuth "zenith-realm" Bool :> ReqBody
@@ -511,7 +583,7 @@ zenithServer state = getinfo :<|> handleRPC
     getinfo =
       return $
       object
-        [ "version" .= ("0.7.0.0-beta" :: String)
+        [ "version" .= ("0.8.0.0-beta" :: String)
         , "network" .= ("testnet" :: String)
         ]
     handleRPC :: Bool -> RpcCall -> Handler ZenithResponse
@@ -587,7 +659,7 @@ zenithServer state = getinfo :<|> handleRPC
               return $
               InfoResponse
                 (callId req)
-                (ZenithInfo "0.7.0.0-beta" (w_network state) (w_build state))
+                (ZenithInfo "0.8.0.0-beta" (w_network state) (w_build state))
             _anyOtherParams ->
               return $ ErrorResponse (callId req) (-32602) "Invalid params"
         ListReceived ->
@@ -871,6 +943,193 @@ zenithServer state = getinfo :<|> handleRPC
                             "Account does not exist."
             _anyOtherParams ->
               return $ ErrorResponse (callId req) (-32602) "Invalid params"
+        ShieldNotes -> do
+          case parameters req of
+            ShieldNotesParams i -> do
+              let dbPath = w_dbPath state
+              let net = w_network state
+              let zHost = w_host state
+              let zPort = w_port state
+              pool <- liftIO $ runNoLoggingT $ initPool dbPath
+              syncChk <- liftIO $ isSyncing pool
+              if syncChk
+                then return $
+                     ErrorResponse
+                       (callId req)
+                       (-32012)
+                       "The Zenith server is syncing, please try again later."
+                else do
+                  acc <-
+                    liftIO $ getAccountById pool $ toSqlKey $ fromIntegral i
+                  case acc of
+                    Just acc' -> do
+                      bl <-
+                        liftIO $
+                        getLastSyncBlock
+                          pool
+                          (zcashAccountWalletId $ entityVal acc')
+                      opids <-
+                        liftIO $
+                        runNoLoggingT $
+                        shieldTransparentNotes
+                          pool
+                          zHost
+                          zPort
+                          net
+                          (entityKey acc')
+                          bl
+                      let ops =
+                            map
+                              (\case
+                                 Left e -> T.pack $ show e
+                                 Right op -> U.toText op)
+                              opids
+                      return $ MultiOpResponse (callId req) ops
+                    Nothing ->
+                      return $
+                      ErrorResponse
+                        (callId req)
+                        (-32006)
+                        "Account does not exist."
+            _anyOtherParams ->
+              return $ ErrorResponse (callId req) (-32602) "Invalid params"
+        DeshieldFunds -> do
+          case parameters req of
+            DeshieldParams i k -> do
+              let dbPath = w_dbPath state
+              let net = w_network state
+              let zHost = w_host state
+              let zPort = w_port state
+              pool <- liftIO $ runNoLoggingT $ initPool dbPath
+              syncChk <- liftIO $ isSyncing pool
+              if syncChk
+                then return $
+                     ErrorResponse
+                       (callId req)
+                       (-32012)
+                       "The Zenith server is syncing, please try again later."
+                else do
+                  opid <- liftIO nextRandom
+                  startTime <- liftIO getCurrentTime
+                  opkey <-
+                    liftIO $
+                    saveOperation pool $
+                    Operation
+                      (ZenithUuid opid)
+                      startTime
+                      Nothing
+                      Processing
+                      Nothing
+                  case opkey of
+                    Nothing ->
+                      return $
+                      ErrorResponse (callId req) (-32010) "Internal Error"
+                    Just opkey' -> do
+                      acc <-
+                        liftIO $ getAccountById pool $ toSqlKey $ fromIntegral i
+                      case acc of
+                        Just acc' -> do
+                          bl <-
+                            liftIO $
+                            getLastSyncBlock
+                              pool
+                              (zcashAccountWalletId $ entityVal acc')
+                          _ <-
+                            liftIO $
+                            forkIO $ do
+                              res <-
+                                runNoLoggingT $
+                                deshieldNotes
+                                  pool
+                                  zHost
+                                  zPort
+                                  net
+                                  (entityKey acc')
+                                  bl
+                                  k
+                              case res of
+                                Left e ->
+                                  finalizeOperation pool opkey' Failed $
+                                  T.pack $ show e
+                                Right rawTx -> do
+                                  zebraRes <-
+                                    makeZebraCall
+                                      zHost
+                                      zPort
+                                      "sendrawtransaction"
+                                      [Data.Aeson.String $ H.toText rawTx]
+                                  case zebraRes of
+                                    Left e1 ->
+                                      finalizeOperation pool opkey' Failed $
+                                      T.pack $ show e1
+                                    Right txId ->
+                                      finalizeOperation pool opkey' Successful $
+                                      "Tx ID: " <> H.toText txId
+                          return $ SendResponse (callId req) opid
+                        Nothing ->
+                          return $
+                          ErrorResponse
+                            (callId req)
+                            (-32006)
+                            "Account does not exist."
+            _anyOtherParams ->
+              return $ ErrorResponse (callId req) (-32602) "Invalid params"
+        GetFVK -> do
+          case parameters req of
+            ViewingKeyParams aid -> do
+              let dbPath = w_dbPath state
+              let net = w_network state
+              pool <- liftIO $ runNoLoggingT $ initPool dbPath
+              acc <- liftIO $ getAccountById pool $ toSqlKey $ fromIntegral aid
+              case acc of
+                Just acc' -> do
+                  fvk <-
+                    liftIO $
+                    try
+                      (deriveUfvk
+                         net
+                         (getOrchSK $ zcashAccountOrchSpendKey $ entityVal acc')
+                         (getSapSK $ zcashAccountSapSpendKey $ entityVal acc')
+                         (getTranSK $ zcashAccountTPrivateKey $ entityVal acc')) :: Handler
+                      (Either SomeException T.Text)
+                  case fvk of
+                    Left _ ->
+                      return $
+                      ErrorResponse (callId req) (-32010) "Internal Error"
+                    Right fvk' -> return $ ViewingKeyResponse (callId req) fvk'
+                Nothing ->
+                  return $
+                  ErrorResponse (callId req) (-32006) "Account does not exist."
+            _anyOtherParams ->
+              return $ ErrorResponse (callId req) (-32602) "Invalid params"
+        GetIVK -> do
+          case parameters req of
+            ViewingKeyParams aid -> do
+              let dbPath = w_dbPath state
+              let net = w_network state
+              pool <- liftIO $ runNoLoggingT $ initPool dbPath
+              acc <- liftIO $ getAccountById pool $ toSqlKey $ fromIntegral aid
+              case acc of
+                Just acc' -> do
+                  ivk <-
+                    liftIO $
+                    try
+                      (deriveUivk
+                         net
+                         (getOrchSK $ zcashAccountOrchSpendKey $ entityVal acc')
+                         (getSapSK $ zcashAccountSapSpendKey $ entityVal acc')
+                         (getTranSK $ zcashAccountTPrivateKey $ entityVal acc')) :: Handler
+                      (Either SomeException T.Text)
+                  case ivk of
+                    Left _ ->
+                      return $
+                      ErrorResponse (callId req) (-32010) "Internal Error"
+                    Right ivk' -> return $ ViewingKeyResponse (callId req) ivk'
+                Nothing ->
+                  return $
+                  ErrorResponse (callId req) (-32006) "Account does not exist."
+            _anyOtherParams ->
+              return $ ErrorResponse (callId req) (-32602) "Invalid params"
 
 authenticate :: Config -> BasicAuthCheck Bool
 authenticate config = BasicAuthCheck check

src/Zenith/Utils.hs

@@ -235,7 +235,7 @@ isValidString c = do
 
 padWithZero :: Int -> String -> String
 padWithZero n s
-  | (length s) >= n = s
+  | length s >= n = s
   | otherwise = padWithZero n ("0" ++ s)
 
 isEmpty :: [a] -> Bool
@@ -248,3 +248,6 @@ getChainTip zHost zPort = do
   case r of
     Left e1 -> pure 0
     Right i -> pure i
+
+getTransparentFromUA :: UnifiedAddress -> Maybe TransparentAddress
+getTransparentFromUA ua = TransparentAddress (ua_net ua) <$> t_rec ua

test/ServerSpec.hs

@@ -86,7 +86,7 @@ main = do
               Left e -> assertFailure e
               Right r ->
                 r `shouldBe`
-                InfoResponse "zh" (ZenithInfo "0.7.0.0-beta" TestNet "v1.9.0")
+                InfoResponse "zh" (ZenithInfo "0.8.0.0-beta" TestNet "v2.1.0")
         describe "Wallets" $ do
           describe "listwallet" $ do
             it "bad credentials" $ do
@@ -676,6 +676,153 @@ main = do
                 case res of
                   Left e -> assertFailure e
                   Right (SendResponse i o) -> o `shouldNotBe` U.nil
+        describe "Shield notes" $ do
+          it "bad credentials" $ do
+            res <-
+              makeZenithCall
+                "127.0.0.1"
+                nodePort
+                "baduser"
+                "idontknow"
+                ShieldNotes
+                BlankParams
+            res `shouldBe` Left "Invalid credentials"
+          describe "correct credentials" $ do
+            it "no parameters" $ do
+              res <-
+                makeZenithCall
+                  "127.0.0.1"
+                  nodePort
+                  nodeUser
+                  nodePwd
+                  ShieldNotes
+                  BlankParams
+              case res of
+                Left e -> assertFailure e
+                Right (ErrorResponse i c m) -> c `shouldBe` (-32602)
+            it "invalid account" $ do
+              res <-
+                makeZenithCall
+                  "127.0.0.1"
+                  nodePort
+                  nodeUser
+                  nodePwd
+                  ShieldNotes
+                  (ShieldNotesParams 27)
+              case res of
+                Left e -> assertFailure e
+                Right (ErrorResponse i c m) -> c `shouldBe` (-32006)
+            it "valid account" $ do
+              res <-
+                makeZenithCall
+                  "127.0.0.1"
+                  nodePort
+                  nodeUser
+                  nodePwd
+                  ShieldNotes
+                  (ShieldNotesParams 1)
+              case res of
+                Left e -> assertFailure e
+                Right (MultiOpResponse i c) -> c `shouldNotBe` []
+        describe "Viewing Keys" $ do
+          describe "Full" $ do
+            it "bad credentials" $ do
+              res <-
+                makeZenithCall
+                  "127.0.0.1"
+                  nodePort
+                  "baduser"
+                  "idontknow"
+                  GetFVK
+                  BlankParams
+              res `shouldBe` Left "Invalid credentials"
+            describe "correct credentials" $ do
+              it "no parameters" $ do
+                res <-
+                  makeZenithCall
+                    "127.0.0.1"
+                    nodePort
+                    nodeUser
+                    nodePwd
+                    GetFVK
+                    BlankParams
+                case res of
+                  Left e -> assertFailure e
+                  Right (ErrorResponse i c m) -> c `shouldBe` (-32602)
+              it "invalid account" $ do
+                res <-
+                  makeZenithCall
+                    "127.0.0.1"
+                    nodePort
+                    nodeUser
+                    nodePwd
+                    GetFVK
+                    (ViewingKeyParams 27)
+                case res of
+                  Left e -> assertFailure e
+                  Right (ErrorResponse i c m) -> c `shouldBe` (-32006)
+              it "valid account" $ do
+                res <-
+                  makeZenithCall
+                    "127.0.0.1"
+                    nodePort
+                    nodeUser
+                    nodePwd
+                    GetFVK
+                    (ViewingKeyParams 1)
+                case res of
+                  Left e -> assertFailure e
+                  Right (ViewingKeyResponse i c) -> c `shouldNotBe` ""
+                  Right x -> assertFailure $ show x
+          describe "Incoming" $ do
+            it "bad credentials" $ do
+              res <-
+                makeZenithCall
+                  "127.0.0.1"
+                  nodePort
+                  "baduser"
+                  "idontknow"
+                  GetIVK
+                  BlankParams
+              res `shouldBe` Left "Invalid credentials"
+            describe "correct credentials" $ do
+              it "no parameters" $ do
+                res <-
+                  makeZenithCall
+                    "127.0.0.1"
+                    nodePort
+                    nodeUser
+                    nodePwd
+                    GetIVK
+                    BlankParams
+                case res of
+                  Left e -> assertFailure e
+                  Right (ErrorResponse i c m) -> c `shouldBe` (-32602)
+              it "invalid account" $ do
+                res <-
+                  makeZenithCall
+                    "127.0.0.1"
+                    nodePort
+                    nodeUser
+                    nodePwd
+                    GetIVK
+                    (ViewingKeyParams 27)
+                case res of
+                  Left e -> assertFailure e
+                  Right (ErrorResponse i c m) -> c `shouldBe` (-32006)
+              it "valid account" $ do
+                res <-
+                  makeZenithCall
+                    "127.0.0.1"
+                    nodePort
+                    nodeUser
+                    nodePwd
+                    GetIVK
+                    (ViewingKeyParams 1)
+                case res of
+                  Left e -> assertFailure e
+                  Right (ViewingKeyResponse i c) -> c `shouldNotBe` ""
+                  Right x -> assertFailure $ show x
 
 startAPI :: Config -> IO ()
 startAPI config = do

test/Spec.hs

@@ -643,8 +643,7 @@ main = do
               case ix of
                 Nothing -> assertFailure "couldn't find index at block"
                 Just i -> do
-                  updatedTree <-
-                    runFileLoggingT "test.log" $ truncateTree oTree i
+                  updatedTree <- runNoLoggingT $ truncateTree oTree i
                   let finalAnchor =
                         getOrchardTreeAnchor $
                         OrchardCommitmentTree $ ztiOrchard zebraTreesIn
@@ -737,7 +736,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -763,7 +762,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -787,7 +786,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -815,7 +814,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -847,7 +846,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -873,7 +872,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -897,7 +896,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -926,7 +925,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -957,7 +956,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -983,7 +982,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -1007,7 +1006,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -1034,7 +1033,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -1061,7 +1060,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"
@@ -1086,7 +1085,7 @@ main = do
             Just ua -> do
               pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
               tx <-
-                runFileLoggingT "zenith.log" $
+                runNoLoggingT $
                 prepareTxV2
                   pool
                   "localhost"

zenith-openrpc.json

@@ -1,7 +1,7 @@
 {
   "openrpc": "1.0.0-rc1",
   "info": {
-    "version": "0.7.0.0-beta",
+    "version": "0.8.0.0-beta",
     "title": "Zenith RPC",
     "description": "The RPC methods to interact with the Zenith Zcash wallet",
     "license": {
@@ -605,10 +605,9 @@
       ],
       "paramStructure": "by-position",
       "result": {
-        "name": "Operation ID(s)",
+        "name": "Operation ID",
         "schema": {
-          "type": "array",
-          "items": { "$ref": "#/components/contentDescriptors/OperationId"}
+          "$ref": "#/components/contentDescriptors/OperationId"
         }
       },
       "examples": [
@@ -620,7 +619,7 @@
             {
               "name": "Account index", 
               "summary": "The index for the account to use",
-              "value": "1"
+              "value": 1
             },
             {
               "name": "Privacy Policy",
@@ -641,9 +640,8 @@
           ],
           "result": {
             "name": "SendMany result",
-            "value": [
-              "3cc31c07-07cf-4a6e-9190-156c4b8c4088"
-            ]
+            "value": "3cc31c07-07cf-4a6e-9190-156c4b8c4088"
+            
           }
         }
       ],
@@ -669,6 +667,204 @@
       "errors": [
         { "$ref": "#/components/errors/OpNotFound" }
       ]
+    },
+    {
+      "name": "shieldnotes",
+      "summary": "Shield all transparent notes into the Orchard pool for the given account",
+      "description": "Creates one or more transactions, grouping all the unspent transparent notes for the given account by their transparent address to avoid associating different transparent addresses. These notes are sent to the given account's internal change address as shielded Orchard notes.",
+      "tags": [],
+      "params": [
+        { "$ref": "#/components/contentDescriptors/AccountId"}
+      ],
+      "paramStructure": "by-position",
+      "result": {
+        "name": "Operation ID(s)",
+        "schema": {
+          "type": "array",
+          "items": { "$ref": "#/components/contentDescriptors/OperationId"}
+        }
+      },
+      "examples": [
+        {
+          "name": "Shield transparent notes",
+          "summary": "Shield transparent notes",
+          "description": "Shield the transparent notes in a given account",
+          "params": [
+            {
+              "name": "Account index", 
+              "summary": "The index for the account to use",
+              "value": "3"
+            }
+          ],
+          "result": {
+            "name": "ShieldNotes result",
+            "value": [
+              "ab350df0-9f57-44c0-9e0d-f7b8af1f4231",
+              "8c6f2656-22ef-4f9d-b465-80ddd13fc485"
+            ]
+          }
+        },
+        {
+          "name": "No transparent funds",
+          "summary": "Shield transparent notes with no transparent funds",
+          "description": "Attempt to shield the transparent notes in a given account, when account has none",
+          "params": [
+            {
+              "name": "Account index", 
+              "summary": "The index for the account to use",
+              "value": "3"
+            }
+          ],
+          "result": {
+            "name": "ShieldNotes result",
+            "value": [
+              "InsufficientFunds"
+            ]
+          }
+        }
+      ],
+      "errors": [
+        { "$ref": "#/components/errors/ZebraNotAvailable" },
+        { "$ref": "#/components/errors/ZenithBusy" },
+        { "$ref": "#/components/errors/InvalidAccount" }
+      ]
+    },
+    {
+      "name": "deshieldfunds",
+      "summary": "De-shield the given amount of ZEC from the given account",
+      "description": "Creates a new internal transaction with the requested amount of ZEC to the transparent pool. The fee is not included in the given amount.",
+      "tags": [],
+      "params": [
+        { "$ref": "#/components/contentDescriptors/AccountId"},
+        { "$ref": "#/components/contentDescriptors/Amount"}
+      ],
+      "paramStructure": "by-position",
+      "result": {
+        "name": "Operation ID",
+        "schema": {
+          "$ref": "#/components/contentDescriptors/OperationId"
+        }
+      },
+      "examples": [
+        {
+          "name": "De-Shield funds",
+          "summary": "De-shield funds",
+          "description": "Move the given amount of ZEC for the given acount from the shielded pool to the transparent pool",
+          "params": [
+            {
+              "name": "Account index", 
+              "summary": "The index for the account to use",
+              "value": "3"
+            },
+            {
+              "name": "Amount",
+              "summary": "The amount of ZEC to use",
+              "value": 1.23
+            }
+          ],
+          "result": {
+            "name": "Deshield funds result",
+            "value": "ab350df0-9f57-44c0-9e0d-f7b8af1f4231"
+          }
+        },
+        {
+          "name": "No transparent funds",
+          "summary": "Shield transparent notes with no transparent funds",
+          "description": "Attempt to shield the transparent notes in a given account, when account has none",
+          "params": [
+            {
+              "name": "Account index", 
+              "summary": "The index for the account to use",
+              "value": "3"
+            }
+          ],
+          "result": {
+            "name": "ShieldNotes result",
+            "value": [
+              "InsufficientFunds"
+            ]
+          }
+        }
+      ],
+      "errors": [
+        { "$ref": "#/components/errors/ZebraNotAvailable" },
+        { "$ref": "#/components/errors/ZenithBusy" },
+        { "$ref": "#/components/errors/InvalidAccount" }
+      ]
+    },
+    {
+      "name": "getfullvk",
+      "summary": "Derive the full viewing key for the given account.",
+      "description": "Derive the full viewing key for the given account, encoded per ZIP-316.",
+      "tags": [],
+      "params": [
+        { "$ref": "#/components/contentDescriptors/AccountId"}
+      ],
+      "paramStructure": "by-position",
+      "result": {
+        "name": "Full viewing key",
+        "schema": {
+          "$ref": "#/components/schemas/ViewingKey"
+        }
+      },
+      "examples": [
+        {
+          "name": "Get full viewing key",
+          "summary": "Get the full viewing key",
+          "description": "Get the full viewing key for the give account, encoded per ZIP-316",
+          "params": [
+            {
+              "name": "Account index", 
+              "summary": "The index for the account to use",
+              "value": 1
+            }
+          ],
+          "result": {
+            "name": "Full Viewing key",
+            "value": "uview16qdhd9e283s4y53gmw72ag7adzdrj9f9v96dw89ggv9el0yrf7vkappau69j8luq7uf540sr78ncslnqk6kwpc4qeqgfg5vn4xcmllynyfr32cgq6nx5ptku44kfxtsj99px2g9yp7kyc32quun0elakgltqmqflprwmryuelcfwwt58vqap065as7qwljg02l6mkutsh2y9aefd284dsrj0246fd2n4hra3r03uftsh4njh3w590z78tpnfqhjvvwhgus476zrw3fd69qekru709ghr0zr7h8majy9aclwg7uhakt24lmuec8dd7t270kamcs99rz8jasj3jl6m9y77dvkdn23e2kwuc6kyagpstzrdjnlzdldmgsu4k056v80ucajcjvl99pcf2znjg37vztdp4zr5qrphxs4y7wppxmankmdwwgjxhlmyrjd68z80q0n0t2cyqge6mlc7pd5wre4392pjtdaqvtyeg0denh4ekynnjxnm"
+          }
+        }
+      ],
+      "errors": [
+        { "$ref": "#/components/errors/InvalidAccount" }
+      ]
+    },
+    {
+      "name": "getincomingvk",
+      "summary": "Get the incoming viewing key for the given account.",
+      "description": "Derives the incoming viewing key for the given account per ZIP-316.",
+      "tags": [],
+      "params": [
+        { "$ref": "#/components/contentDescriptors/AccountId"}
+      ],
+      "paramStructure": "by-position",
+      "result": {
+        "name": "Incoming viewing key",
+        "schema": {
+          "$ref": "#/components/schemas/ViewingKey"
+        }
+      },
+      "examples": [
+        {
+          "name": "Get incoming viewing key",
+          "summary": "Get the incoming viewing key",
+          "description": "Get the incoming viewing key for the give account, encoded per ZIP-316",
+          "params": [
+            {
+              "name": "Account index", 
+              "summary": "The index for the account to use",
+              "value": 1
+            }
+          ],
+          "result": {
+            "name": "Incoming Viewing key",
+            "value": "uivk199qcjxrj73n7fapg79a2ltah6f3j83haljcux5t5kvn5unn7rpfmvglttdt9g6na3llkefnd3pn0x9ky6lh8s42trj0vfg5wtv0nrerq0wsq5v4q7lt5j4l9svppspr6h7407ztgsuvkfk977c3tj408nx5phxap8fn3ecdmdrah9spp76md9tel89tuqz6m0xplqp83wj33qf7s3hwfe79t04rq49g24nr3emlpm298wpqla2dvh4rr584kwdtxc9ahse5x0drcjr95tt4k0hxr32l6yturje7dptlgjnr4cm6uk29ysu9l5xwgz40p6alyedzzqltqf5nswy48ekru4ahapw"
+          }
+        }
+      ],
+      "errors": [
+        { "$ref": "#/components/errors/InvalidAccount" }
+      ]
     }
   ],
   "components": {
@@ -700,6 +896,15 @@
           "type": "string"
         }
       },
+      "Amount": {
+        "name": "A numeric amount",
+        "summary": "A numeric amount",
+        "description": "A number that represents an amount to be used by a function as an input",
+        "required": true,
+        "schema": {
+          "type": "number"
+        }
+      },
       "Name": {
         "name": "Name",
         "summary": "A user-friendly name",
@@ -835,6 +1040,10 @@
           "amount": { "type": "number", "description": "The amount to send in ZEC"},
           "memo": { "type": "string", "description": "The shielded memo to include, if applicable"}
         }
+      },
+      "ViewingKey": {
+        "type": "string",
+        "description": "The viewing key, encoded per ZIP-316"
       }
     },
 	  "examples": {},

zenith.cabal

@@ -1,6 +1,6 @@
 cabal-version:    3.0
 name:             zenith
-version:          0.7.2.0-beta
+version:          0.8.0.0-beta
 license:          MIT
 license-file:     LICENSE
 author:           Rene Vergara