CHANGELOG.md

@@ -22,8 +22,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 	- `getoperationstatus` RPC method
 	- `sendmany` RPC method
 - Function `prepareTxV2` implementing `PrivacyPolicy`
-- Functionality to shield transparent balance
-- Functionality to de-shield shielded notes
 
 ### Changed
 

src/Zenith/CLI.hs

@@ -75,7 +75,6 @@ import Control.Monad.Logger
 import Data.Aeson
 import Data.HexString (HexString(..), toText)
 import Data.Maybe
-import Data.Scientific (Scientific, scientific)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
@@ -120,10 +119,10 @@ import Zenith.Types
 import Zenith.Utils
   ( displayTaz
   , displayZec
-  , getChainTip
   , isRecipientValid
   , isRecipientValidGUI
   , jsonNumber
+  , parseAddressUA
   , showAddress
   , validBarValue
   )
@@ -160,7 +159,7 @@ makeLenses ''DialogInput
 
 data SendInput = SendInput
   { _sendTo :: !T.Text
-  , _sendAmt :: !Scientific
+  , _sendAmt :: !Float
   , _sendMemo :: !T.Text
   , _policyField :: !PrivacyPolicy
   } deriving (Show)
@@ -175,7 +174,7 @@ data AdrBookEntry = AdrBookEntry
 makeLenses ''AdrBookEntry
 
 newtype ShDshEntry = ShDshEntry
-  { _shAmt :: Scientific
+  { _shAmt :: Float
   } deriving (Show)
 
 makeLenses ''ShDshEntry
@@ -702,8 +701,8 @@ mkSendForm bal =
     , label "Memo:   " @@= editTextField sendMemo MemoField (Just 1)
     ]
   where
-    isAmountValid :: Integer -> Scientific -> Bool
-    isAmountValid b i = fromIntegral b >= (i * scientific 1 8)
+    isAmountValid :: Integer -> Float -> Bool
+    isAmountValid b i = (fromIntegral b / 100000000.0) >= i
     label s w =
       padBottom (Pad 1) $ vLimit 1 (hLimit 15 $ str s <+> fill ' ') <+> w
 
@@ -714,8 +713,8 @@ mkDeshieldForm tbal =
       editShowableFieldWithValidate shAmt AmtField (isAmountValid tbal)
     ]
   where
-    isAmountValid :: Integer -> Scientific -> Bool
-    isAmountValid b i = fromIntegral b >= (i * scientific 1 8)
+    isAmountValid :: Integer -> Float -> Bool
+    isAmountValid b i = (fromIntegral b / 100000000.0) >= i
     label s w =
       padBottom (Pad 1) $ vLimit 1 (hLimit 15 $ str s <+> fill ' ') <+> w
 
@@ -832,7 +831,7 @@ scanZebra dbP zHost zPort b eChan znet = do
   bStatus <- liftIO $ checkBlockChain zHost zPort
   pool <- liftIO $ runNoLoggingT $ initPool dbP
   dbBlock <- liftIO $ getMaxBlock pool $ ZcashNetDB znet
-  chkBlock <- liftIO $ checkIntegrity dbP zHost zPort znet dbBlock 1
+  chkBlock <- liftIO $ checkIntegrity dbP zHost zPort dbBlock 1
   syncChk <- liftIO $ isSyncing pool
   if syncChk
     then liftIO $ BC.writeBChan eChan $ TickMsg "Sync alread in progress"
@@ -840,12 +839,11 @@ scanZebra dbP zHost zPort b eChan znet = do
       logDebugN $
         "dbBlock: " <>
         T.pack (show dbBlock) <> " chkBlock: " <> T.pack (show chkBlock)
+      when (chkBlock /= dbBlock) $ rewindWalletData pool chkBlock
       let sb =
             if chkBlock == dbBlock
               then max dbBlock b
               else max chkBlock b
-      when (chkBlock /= dbBlock && chkBlock /= 1) $
-        rewindWalletData pool sb $ ZcashNetDB znet
       if sb > zgb_blocks bStatus || sb < 1
         then do
           liftIO $
@@ -1203,8 +1201,7 @@ appEvent (BT.VtyEvent e) = do
                                     Just (_k, w) -> return w
                              fs1 <- BT.zoom txForm $ BT.gets formState
                              bl <-
-                               liftIO $
-                               getChainTip (s ^. zebraHost) (s ^. zebraPort)
+                               liftIO $ getLastSyncBlock pool $ entityKey selWal
                              _ <-
                                liftIO $
                                forkIO $
@@ -1215,7 +1212,7 @@ appEvent (BT.VtyEvent e) = do
                                  (s ^. zebraPort)
                                  (s ^. network)
                                  (entityKey selAcc)
-                                 (bl + 5)
+                                 bl
                                  (fs1 ^. sendAmt)
                                  (fs1 ^. sendTo)
                                  (fs1 ^. sendMemo)
@@ -1295,8 +1292,7 @@ appEvent (BT.VtyEvent e) = do
                                       getUA . walletAddressUAddress)
                                        (entityVal selAddr)))
                              bl <-
-                               liftIO $
-                               getChainTip (s ^. zebraHost) (s ^. zebraPort)
+                               liftIO $ getLastSyncBlock pool $ entityKey selWal
                              case tAddrMaybe of
                                Nothing -> do
                                  BT.modify $
@@ -1998,7 +1994,7 @@ sendTransaction ::
   -> ZcashNet
   -> ZcashAccountId
   -> Int
-  -> Scientific
+  -> Float
   -> T.Text
   -> T.Text
   -> PrivacyPolicy
@@ -2009,7 +2005,7 @@ sendTransaction pool chan zHost zPort znet accId bl amt ua memo policy = do
     Nothing -> BC.writeBChan chan $ TickMsg "Incorrect address"
     Just outUA -> do
       res <-
-        runStderrLoggingT $
+        runNoLoggingT $
         prepareTxV2
           pool
           zHost
@@ -2025,10 +2021,10 @@ sendTransaction pool chan zHost zPort znet accId bl amt ua memo policy = do
                  else Just memo)
           ]
           policy
+      BC.writeBChan chan $ TickMsg "Transaction ready, sending to Zebra..."
       case res of
         Left e -> BC.writeBChan chan $ TickMsg $ show e
         Right rawTx -> do
-          BC.writeBChan chan $ TickMsg "Transaction ready, sending to Zebra..."
           resp <-
             makeZebraCall
               zHost
@@ -2077,7 +2073,7 @@ deshieldTransaction ::
   -> IO ()
 deshieldTransaction pool chan zHost zPort znet accId bl pnote = do
   BC.writeBChan chan $ TickMsg "Deshielding funds..."
-  res <- runStderrLoggingT $ deshieldNotes pool zHost zPort znet accId bl pnote
+  res <- runNoLoggingT $ deshieldNotes pool zHost zPort znet accId bl pnote
   case res of
     Left e -> BC.writeBChan chan $ TickMsg $ show e
     Right rawTx -> do

src/Zenith/DB.hs

@@ -698,42 +698,22 @@ saveAddress pool w =
   runNoLoggingT $
   PS.retryOnBusy $ flip PS.runSqlPool pool $ insertUniqueEntity w
 
--- * Block
 -- | Save a block to the database
 saveBlock :: ConnectionPool -> ZcashBlock -> IO (Key ZcashBlock)
 saveBlock pool b =
   runNoLoggingT $ PS.retryOnBusy $ flip PS.runSqlPool pool $ do insert b
 
 -- | Read a block by height
-getBlock ::
-     ConnectionPool -> Int -> ZcashNetDB -> IO (Maybe (Entity ZcashBlock))
-getBlock pool b znet =
+getBlock :: ConnectionPool -> Int -> IO (Maybe (Entity ZcashBlock))
+getBlock pool b =
   runNoLoggingT $
   PS.retryOnBusy $
   flip PS.runSqlPool pool $ do
     selectOne $ do
       bl <- from $ table @ZcashBlock
-      where_ $
-        bl ^. ZcashBlockHeight ==. val b &&. bl ^. ZcashBlockNetwork ==.
-        val znet
+      where_ $ bl ^. ZcashBlockHeight ==. val b
       pure bl
 
-getBlockHash :: ConnectionPool -> Int -> ZcashNetDB -> IO (Maybe HexString)
-getBlockHash pool b znet = do
-  r <-
-    runNoLoggingT $
-    PS.retryOnBusy $
-    flip PS.runSqlPool pool $ do
-      selectOne $ do
-        bl <- from $ table @ZcashBlock
-        where_ $
-          bl ^. ZcashBlockHeight ==. val b &&. bl ^. ZcashBlockNetwork ==.
-          val znet
-        pure $ bl ^. ZcashBlockHash
-  case r of
-    Nothing -> return Nothing
-    Just (Value h) -> return $ Just $ getHex h
-
 -- | Save a transaction to the data model
 saveTransaction ::
      ConnectionPool -- ^ the database path
@@ -1796,16 +1776,12 @@ getUnspentSapNotes pool = do
         where_ (n ^. WalletSapNoteSpent ==. val False)
         pure n
 
-getSaplingCmus ::
-     ConnectionPool
-  -> ShieldOutputId
-  -> ShieldOutputId
-  -> IO [Value HexStringDB]
-getSaplingCmus pool zt m = do
+getSaplingCmus :: Pool SqlBackend -> ShieldOutputId -> IO [Value HexStringDB]
+getSaplingCmus pool zt = do
   PS.runSqlPool
     (select $ do
        n <- from $ table @ShieldOutput
-       where_ (n ^. ShieldOutputId >. val zt &&. n ^. ShieldOutputId <=. val m)
+       where_ (n ^. ShieldOutputId >. val zt)
        orderBy [asc $ n ^. ShieldOutputId]
        pure $ n ^. ShieldOutputCmu)
     pool
@@ -1864,13 +1840,12 @@ getUnspentOrchNotes pool = do
         where_ (n ^. WalletOrchNoteSpent ==. val False)
         pure n
 
-getOrchardCmxs ::
-     ConnectionPool -> OrchActionId -> OrchActionId -> IO [Value HexStringDB]
-getOrchardCmxs pool zt m = do
+getOrchardCmxs :: Pool SqlBackend -> OrchActionId -> IO [Value HexStringDB]
+getOrchardCmxs pool zt = do
   PS.runSqlPool
     (select $ do
        n <- from $ table @OrchAction
-       where_ (n ^. OrchActionId >. val zt &&. n ^. OrchActionId <=. val m)
+       where_ (n ^. OrchActionId >. val zt)
        orderBy [asc $ n ^. OrchActionId]
        pure $ n ^. OrchActionCmx)
     pool
@@ -2364,7 +2339,7 @@ selectUnspentNotes pool za amt = do
 selectUnspentNotesV2 ::
      ConnectionPool
   -> ZcashAccountId
-  -> Int64
+  -> Integer
   -> [Int]
   -> PrivacyPolicy
   -> IO
@@ -2668,8 +2643,8 @@ completeSync pool st = do
   return ()
 
 -- | Rewind the data store to a given block height
-rewindWalletData :: ConnectionPool -> Int -> ZcashNetDB -> LoggingT IO ()
-rewindWalletData pool b net = do
+rewindWalletData :: ConnectionPool -> Int -> LoggingT IO ()
+rewindWalletData pool b = do
   logDebugN "Starting transaction rewind"
   liftIO $ clearWalletTransactions pool
   logDebugN "Completed transaction rewind"
@@ -2681,9 +2656,7 @@ rewindWalletData pool b net = do
       oldBlocks <-
         select $ do
           blk <- from $ table @ZcashBlock
-          where_
-            (blk ^. ZcashBlockHeight >. val b &&. blk ^. ZcashBlockNetwork ==.
-             val net)
+          where_ $ blk ^. ZcashBlockHeight >. val b
           pure blk
       let oldBlkKeys = map entityKey oldBlocks
       oldTxs <-
@@ -2703,9 +2676,7 @@ rewindWalletData pool b net = do
       oldBlocks <-
         select $ do
           blk <- from $ table @ZcashBlock
-          where_
-            (blk ^. ZcashBlockHeight >. val b &&. blk ^. ZcashBlockNetwork ==.
-             val net)
+          where_ $ blk ^. ZcashBlockHeight >. val b
           pure blk
       let oldBlkKeys = map entityKey oldBlocks
       oldTxs <-
@@ -2725,9 +2696,7 @@ rewindWalletData pool b net = do
       oldBlocks <-
         select $ do
           blk <- from $ table @ZcashBlock
-          where_
-            (blk ^. ZcashBlockHeight >. val b &&. blk ^. ZcashBlockNetwork ==.
-             val net)
+          where_ $ blk ^. ZcashBlockHeight >. val b
           pure blk
       let oldBlkKeys = map entityKey oldBlocks
       oldTxs <-
@@ -2747,9 +2716,7 @@ rewindWalletData pool b net = do
       oldBlocks <-
         select $ do
           blk <- from $ table @ZcashBlock
-          where_
-            (blk ^. ZcashBlockHeight >. val b &&. blk ^. ZcashBlockNetwork ==.
-             val net)
+          where_ $ blk ^. ZcashBlockHeight >. val b
           pure blk
       let oldBlkKeys = map entityKey oldBlocks
       oldTxs <-
@@ -2769,9 +2736,7 @@ rewindWalletData pool b net = do
       oldBlocks <-
         select $ do
           blk <- from $ table @ZcashBlock
-          where_
-            (blk ^. ZcashBlockHeight >. val b &&. blk ^. ZcashBlockNetwork ==.
-             val net)
+          where_ $ blk ^. ZcashBlockHeight >. val b
           pure blk
       let oldBlkKeys = map entityKey oldBlocks
       oldTxs <-
@@ -2791,9 +2756,7 @@ rewindWalletData pool b net = do
       oldBlocks <-
         select $ do
           blk <- from $ table @ZcashBlock
-          where_
-            (blk ^. ZcashBlockHeight >. val b &&. blk ^. ZcashBlockNetwork ==.
-             val net)
+          where_ $ blk ^. ZcashBlockHeight >. val b
           pure blk
       let oldBlkKeys = map entityKey oldBlocks
       oldTxs <-
@@ -2812,7 +2775,5 @@ rewindWalletData pool b net = do
     flip PS.runSqlPool pool $ do
       delete $ do
         blk <- from $ table @ZcashBlock
-        where_
-          (blk ^. ZcashBlockHeight >. val b &&. blk ^. ZcashBlockNetwork ==.
-           val net)
+        where_ $ blk ^. ZcashBlockHeight >. val b
   logDebugN "Completed data store rewind"

src/Zenith/GUI.hs

@@ -17,7 +17,6 @@ import Data.Aeson
 import qualified Data.ByteString as BS
 import Data.HexString (toText)
 import Data.Maybe (fromMaybe, isJust, isNothing)
-import Data.Scientific (Scientific, fromFloatDigits)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
 import Data.Time.Clock.POSIX (posixSecondsToUTCTime)
@@ -1245,7 +1244,7 @@ handleEvent wenv node model evt =
                   (model ^. network)
                   (entityKey acc)
                   (zcashWalletLastSync $ entityVal wal)
-                  (fromFloatDigits $ model ^. sendAmount)
+                  (model ^. sendAmount)
                   (model ^. sendRecipient)
                   (model ^. sendMemo)
                   (model ^. privacyChoice)
@@ -1627,17 +1626,17 @@ scanZebra dbPath zHost zPort net sendMsg = do
   pool <- runNoLoggingT $ initPool dbPath
   b <- liftIO $ getMinBirthdayHeight pool
   dbBlock <- getMaxBlock pool $ ZcashNetDB net
-  chkBlock <- checkIntegrity dbPath zHost zPort net dbBlock 1
+  chkBlock <- checkIntegrity dbPath zHost zPort dbBlock 1
   syncChk <- isSyncing pool
   if syncChk
     then sendMsg (ShowError "Sync already in progress")
     else do
+      unless (chkBlock == dbBlock) $
+        runStderrLoggingT $ rewindWalletData pool chkBlock
       let sb =
             if chkBlock == dbBlock
               then max dbBlock b
               else max chkBlock b
-      unless (chkBlock == dbBlock || chkBlock == 1) $
-        runStderrLoggingT $ rewindWalletData pool sb $ ZcashNetDB net
       if sb > zgb_blocks bStatus || sb < 1
         then sendMsg (ShowError "Invalid starting block for scan")
         else do
@@ -1702,7 +1701,7 @@ sendTransaction ::
   -> ZcashNet
   -> ZcashAccountId
   -> Int
-  -> Scientific
+  -> Float
   -> T.Text
   -> T.Text
   -> PrivacyPolicy
@@ -1718,7 +1717,7 @@ sendTransaction config znet accId bl amt ua memo policy sendMsg = do
       let zPort = c_zebraPort config
       pool <- runNoLoggingT $ initPool dbPath
       res <-
-        runStderrLoggingT $
+        runNoLoggingT $
         prepareTxV2
           pool
           zHost

src/Zenith/RPC.hs

@@ -833,7 +833,7 @@ zenithServer state = getinfo :<|> handleRPC
                             forkIO $ do
                               res <-
                                 liftIO $
-                                runStderrLoggingT $
+                                runNoLoggingT $
                                 prepareTxV2
                                   pool
                                   zHost
@@ -889,15 +889,15 @@ scanZebra dbPath zHost zPort net = do
   pool <- runNoLoggingT $ initPool dbPath
   b <- getMinBirthdayHeight pool
   dbBlock <- getMaxBlock pool $ ZcashNetDB net
-  chkBlock <- checkIntegrity dbPath zHost zPort net dbBlock 1
+  chkBlock <- checkIntegrity dbPath zHost zPort dbBlock 1
   syncChk <- isSyncing pool
   unless syncChk $ do
+    unless (chkBlock == dbBlock) $
+      runStderrLoggingT $ rewindWalletData pool chkBlock
     let sb =
           if chkBlock == dbBlock
             then max dbBlock b
             else max chkBlock b
-    unless (chkBlock == dbBlock || chkBlock == 1) $
-      runStderrLoggingT $ rewindWalletData pool sb $ ZcashNetDB net
     unless (sb > zgb_blocks bStatus || sb < 1) $ do
       let bList = [(sb + 1) .. (zgb_blocks bStatus)]
       unless (null bList) $ do

src/Zenith/Scanner.hs

@@ -246,11 +246,10 @@ checkIntegrity ::
      T.Text -- ^ Database path
   -> T.Text -- ^ Zebra host
   -> Int -- ^ Zebra port
-  -> ZcashNet -- ^ the network to scan
   -> Int -- ^ The block to start the check
   -> Int -- ^ depth
   -> IO Int
-checkIntegrity dbP zHost zPort znet b d =
+checkIntegrity dbP zHost zPort b d =
   if b < 1
     then return 1
     else do
@@ -264,10 +263,10 @@ checkIntegrity dbP zHost zPort znet b d =
         Left e -> throwIO $ userError e
         Right blk -> do
           pool <- runNoLoggingT $ initPool dbP
-          dbBlk <- getBlock pool b $ ZcashNetDB znet
+          dbBlk <- getBlock pool b
           case dbBlk of
-            Nothing -> return 1
+            Nothing -> throwIO $ userError "Block mismatch, rescan needed"
             Just dbBlk' ->
               if bl_hash blk == getHex (zcashBlockHash $ entityVal dbBlk')
                 then return b
-                else checkIntegrity dbP zHost zPort znet (b - 5 * d) (d + 1)
+                else checkIntegrity dbP zHost zPort (b - 5 * d) (d + 1)

src/Zenith/Types.hs

@@ -17,7 +17,6 @@ import qualified Data.ByteString.Char8 as C
 import Data.HexString
 import Data.Int (Int64)
 import Data.Maybe (fromMaybe)
-import Data.Scientific (Scientific)
 import qualified Data.Text as T
 import qualified Data.Text.Encoding as E
 import Data.Text.Encoding.Error (lenientDecode)
@@ -242,7 +241,7 @@ instance ToJSON ValidAddressAPI where
 
 data ProposedNote = ProposedNote
   { pn_addr :: !ValidAddressAPI
-  , pn_amt :: !Scientific
+  , pn_amt :: !Float
   , pn_memo :: !(Maybe T.Text)
   } deriving (Eq, Prelude.Show)
 

src/Zenith/Utils.hs

@@ -13,31 +13,26 @@ import qualified Data.Text.Encoding as E
 import System.Directory
 import System.Process (createProcess_, shell)
 import Text.Regex.Posix
-import ZcashHaskell.Orchard
-  ( encodeUnifiedAddress
-  , isValidUnifiedAddress
-  , parseAddress
-  )
+import ZcashHaskell.Orchard (encodeUnifiedAddress, isValidUnifiedAddress, parseAddress)
 import ZcashHaskell.Sapling (decodeSaplingAddress, isValidShieldedAddress)
 import ZcashHaskell.Transparent
   ( decodeExchangeAddress
   , decodeTransparentAddress
   )
 import ZcashHaskell.Types
-  ( ExchangeAddress(..)
-  , SaplingAddress(..)
+  ( SaplingAddress(..)
   , TransparentAddress(..)
   , UnifiedAddress(..)
-  , ValidAddress(..)
   , ZcashNet(..)
+  , ValidAddress(..)
+  , ExchangeAddress(..)
   )
-import ZcashHaskell.Utils (makeZebraCall)
 import Zenith.Types
   ( AddressGroup(..)
-  , PrivacyPolicy(..)
   , UnifiedAddressDB(..)
   , ZcashAddress(..)
   , ZcashPool(..)
+  , PrivacyPolicy(..)
   )
 
 -- | Helper function to convert numbers into JSON
@@ -132,9 +127,9 @@ isRecipientValid a = do
 
 isUnifiedAddressValid :: T.Text -> Bool
 isUnifiedAddressValid ua =
-  case isValidUnifiedAddress (E.encodeUtf8 ua) of
-    Just _a1 -> True
-    Nothing -> False
+    case isValidUnifiedAddress (E.encodeUtf8 ua)  of
+            Just _a1 -> True
+            Nothing -> False
 
 isSaplingAddressValid :: T.Text -> Bool
 isSaplingAddressValid sa = isValidShieldedAddress (E.encodeUtf8 sa)
@@ -142,8 +137,8 @@ isSaplingAddressValid sa = isValidShieldedAddress (E.encodeUtf8 sa)
 isTransparentAddressValid :: T.Text -> Bool
 isTransparentAddressValid ta =
   case decodeTransparentAddress (E.encodeUtf8 ta) of
-    Just _a3 -> True
-    Nothing -> False
+         Just _a3 -> True
+         Nothing -> False
 
 isExchangeAddressValid :: T.Text -> Bool
 isExchangeAddressValid xa =
@@ -152,44 +147,40 @@ isExchangeAddressValid xa =
     Nothing -> False
 
 isRecipientValidGUI :: PrivacyPolicy -> T.Text -> Bool
-isRecipientValidGUI p a = do
+isRecipientValidGUI p a  = do
   let adr = parseAddress (E.encodeUtf8 a)
-  case p of
-    Full ->
-      case adr of
-        Just a ->
-          case a of
-            Unified ua -> True
-            Sapling sa -> True
-            _ -> False
-        Nothing -> False
-    Medium ->
-      case adr of
-        Just a ->
-          case a of
-            Unified ua -> True
-            Sapling sa -> True
-            _ -> False
-        Nothing -> False
-    Low ->
-      case adr of
-        Just a ->
-          case a of
-            Unified ua -> True
-            Sapling sa -> True
-            Transparent ta -> True
-            _ -> False
-        Nothing -> False
-    None ->
-      case adr of
-        Just a ->
-          case a of
-            Transparent ta -> True
-            Exchange ea -> True
-            _ -> False
-        Nothing -> False
+  case p of 
+    Full -> case adr of  
+              Just a -> 
+                case a of  
+                    Unified ua -> True
+                    Sapling sa -> True
+                    _ -> False
+              Nothing -> False
+    Medium -> case adr of 
+                Just a -> 
+                  case a of  
+                      Unified ua -> True
+                      Sapling sa -> True
+                      _ -> False
+                Nothing -> False
+    Low -> case adr of  
+              Just a -> 
+                case a of  
+                    Unified ua -> True
+                    Sapling sa -> True
+                    Transparent ta -> True
+                    _ -> False
+              Nothing -> False
+    None -> case adr of  
+              Just a -> 
+                case a of  
+                    Transparent ta -> True
+                    Exchange ea -> True
+                    _ -> False
+              Nothing -> False
 
-isZecAddressValid :: T.Text -> Bool
+isZecAddressValid ::  T.Text -> Bool
 isZecAddressValid a = do
   case isValidUnifiedAddress (E.encodeUtf8 a) of
     Just _a1 -> True
@@ -241,10 +232,3 @@ padWithZero n s
 isEmpty :: [a] -> Bool
 isEmpty [] = True
 isEmpty _ = False
-
-getChainTip :: T.Text -> Int -> IO Int
-getChainTip zHost zPort = do
-  r <- makeZebraCall zHost zPort "getblockcount" []
-  case r of
-    Left e1 -> pure 0
-    Right i -> pure i

test/Spec.hs

@@ -2,7 +2,6 @@
 
 import Control.Monad (when)
 import Control.Monad.Logger (runFileLoggingT, runNoLoggingT)
-import Data.Aeson
 import Data.HexString
 import Data.Maybe (fromJust)
 import qualified Data.Text.Encoding as E
@@ -34,10 +33,8 @@ import ZcashHaskell.Types
   , Scope(..)
   , ShieldedOutput(..)
   , TxError(..)
-  , ValidAddress(..)
   , ZcashNet(..)
   )
-import ZcashHaskell.Utils (f4Jumble, makeZebraCall, readZebraTransaction)
 import Zenith.Core
 import Zenith.DB
 import Zenith.Types
@@ -185,12 +182,6 @@ main = do
           a `shouldBe`
             Just
               "ztestsapling1tgjr4zppwk4ne8xy6gdq4z2gwq7dmf5jq8z2ctpn8nlmtse0a74fa5z0m8z383gmpgqz6q6duu4"
-      describe "Witnesses" $ do
-        describe "Sapling" $ do
-          it "max output id" $ do
-            pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-            sId <- getMaxSaplingNote pool
-            sId `shouldBe` toSqlKey 0
       describe "Notes" $ do
         xit "Check Orchard notes" $ do
           pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
@@ -204,380 +195,381 @@ main = do
           pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
           oNotes <- getWalletUnspentTrNotes pool (toSqlKey 1)
           oNotes `shouldBe` []
-    describe "Creating Tx" $ do
-      describe "Full" $ do
-        it "To Orchard" $ do
-          let uaRead =
-                parseAddress
-                  "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 3)
-                  3026170
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      (Just "Sending memo to orchard")
-                  ]
-                  Full
-              case tx of
-                Left e -> assertFailure $ show e
-                Right h -> h `shouldNotBe` hexString "deadbeef"
-        it "To Sapling" $ do
-          let uaRead =
-                parseAddress
-                  "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 4)
-                  3001331
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      (Just "Sending memo to sapling")
-                  ]
-                  Full
-              case tx of
-                Left e -> assertFailure $ show e
-                Right h -> h `shouldNotBe` hexString "deadbeef"
-        it "To Transparent" $ do
-          let uaRead = parseAddress "tmAmSa4AauSFuJieeanRBjkfnah45ysGtgZ"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 4)
-                  3001331
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      Nothing
-                  ]
-                  Full
-              tx `shouldBe`
-                Left (PrivacyPolicyError "Receiver not capable of Full privacy")
-        it "To mixed shielded receivers" $ do
-          let uaRead =
-                parseAddress
-                  "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
-          let uaRead2 =
-                parseAddress
-                  "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 1)
-                  3001331
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      (Just "Sending memo to orchard")
-                  , ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead2)
-                      0.004
-                      Nothing
-                  ]
-                  Full
-              tx `shouldBe`
-                Left
-                  (PrivacyPolicyError
-                     "Combination of receivers not allowed for Full privacy")
-      describe "Medium" $ do
-        it "To Orchard" $ do
-          let uaRead =
-                parseAddress
-                  "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 1)
-                  3001372
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      (Just "Sending memo to orchard")
-                  ]
-                  Medium
-              case tx of
-                Left e -> assertFailure $ show e
-                Right h -> h `shouldNotBe` hexString "deadbeef"
-        it "To Sapling" $ do
-          let uaRead =
-                parseAddress
-                  "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 1)
-                  3001372
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      (Just "Sending memo to sapling")
-                  ]
-                  Medium
-              case tx of
-                Left e -> assertFailure $ show e
-                Right h -> h `shouldNotBe` (hexString "00")
-        it "To Transparent" $ do
-          let uaRead = parseAddress "tmAmSa4AauSFuJieeanRBjkfnah45ysGtgZ"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 4)
-                  3001331
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      Nothing
-                  ]
-                  Medium
-              tx `shouldBe`
-                Left
-                  (PrivacyPolicyError "Receiver not capable of Medium privacy")
-        it "To mixed shielded receivers" $ do
-          let uaRead =
-                parseAddress
-                  "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
-          let uaRead2 =
-                parseAddress
-                  "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 1)
-                  3001331
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      (Just "Sending memo to orchard")
-                  , ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead2)
-                      0.004
-                      Nothing
-                  ]
-                  Medium
-              case tx of
-                Left e -> assertFailure $ show e
-                Right h -> h `shouldNotBe` (hexString "deadbeef")
-      describe "Low" $ do
-        it "To Orchard" $ do
-          let uaRead =
-                parseAddress
-                  "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 1)
-                  3001372
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      Nothing
-                  ]
-                  Low
-              case tx of
-                Left e -> assertFailure $ show e
-                Right h -> h `shouldNotBe` (hexString "deadbeef")
-        it "To Sapling" $ do
-          let uaRead =
-                parseAddress
-                  "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 1)
-                  3001372
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      Nothing
-                  ]
-                  Low
-              case tx of
-                Left e -> assertFailure $ show e
-                Right h -> h `shouldNotBe` (hexString "deadbeef")
-        it "To Transparent" $ do
-          let uaRead = parseAddress "tmAmSa4AauSFuJieeanRBjkfnah45ysGtgZ"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 1)
-                  3001372
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      Nothing
-                  ]
-                  Low
-              case tx of
-                Left e -> assertFailure $ show e
-                Right h -> h `shouldNotBe` (hexString "deadbeef")
-      describe "None" $ do
-        it "To Orchard" $ do
-          let uaRead =
-                parseAddress
-                  "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 1)
-                  3001372
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      Nothing
-                  ]
-                  None
-              tx `shouldBe`
-                Left
-                  (PrivacyPolicyError
-                     "Shielded recipients not compatible with privacy policy.")
-        it "To Sapling" $ do
-          let uaRead =
-                parseAddress
-                  "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 1)
-                  3001372
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      Nothing
-                  ]
-                  None
-              tx `shouldBe`
-                Left
-                  (PrivacyPolicyError
-                     "Shielded recipients not compatible with privacy policy.")
-        it "To Transparent" $ do
-          let uaRead = parseAddress "tmAmSa4AauSFuJieeanRBjkfnah45ysGtgZ"
-          case uaRead of
-            Nothing -> assertFailure "wrong address"
-            Just ua -> do
-              pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
-              tx <-
-                runFileLoggingT "zenith.log" $
-                prepareTxV2
-                  pool
-                  "localhost"
-                  18232
-                  TestNet
-                  (toSqlKey 1)
-                  3001372
-                  [ ProposedNote
-                      (ValidAddressAPI $ fromJust uaRead)
-                      0.005
-                      Nothing
-                  ]
-                  None
-              case tx of
-                Left e -> assertFailure $ show e
-                Right h -> h `shouldNotBe` hexString "deadbeef"
+      describe "Creating Tx" $ do
+        describe "Full" $ do
+          it "To Orchard" $ do
+            let uaRead =
+                  parseAddress
+                    "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 3)
+                    3026170
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        (Just "Sending memo to orchard")
+                    ]
+                    Full
+                case tx of
+                  Left e -> assertFailure $ show e
+                  Right h -> h `shouldBe` (hexString "deadbeef")
+          it "To Sapling" $ do
+            let uaRead =
+                  parseAddress
+                    "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 4)
+                    3001331
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        (Just "Sending memo to sapling")
+                    ]
+                    Full
+                case tx of
+                  Left e -> assertFailure $ show e
+                  Right h -> h `shouldNotBe` (hexString "deadbeef")
+          it "To Transparent" $ do
+            let uaRead = parseAddress "tmAmSa4AauSFuJieeanRBjkfnah45ysGtgZ"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 4)
+                    3001331
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        Nothing
+                    ]
+                    Full
+                tx `shouldBe`
+                  Left
+                    (PrivacyPolicyError "Receiver not capable of Full privacy")
+          it "To mixed shielded receivers" $ do
+            let uaRead =
+                  parseAddress
+                    "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
+            let uaRead2 =
+                  parseAddress
+                    "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 1)
+                    3001331
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        (Just "Sending memo to orchard")
+                    , ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead2)
+                        0.004
+                        Nothing
+                    ]
+                    Full
+                tx `shouldBe`
+                  Left
+                    (PrivacyPolicyError
+                       "Combination of receivers not allowed for Full privacy")
+        describe "Medium" $ do
+          it "To Orchard" $ do
+            let uaRead =
+                  parseAddress
+                    "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 1)
+                    3001372
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        (Just "Sending memo to orchard")
+                    ]
+                    Medium
+                case tx of
+                  Left e -> assertFailure $ show e
+                  Right h -> h `shouldNotBe` (hexString "deadbeef")
+          it "To Sapling" $ do
+            let uaRead =
+                  parseAddress
+                    "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 1)
+                    3001372
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        (Just "Sending memo to sapling")
+                    ]
+                    Medium
+                case tx of
+                  Left e -> assertFailure $ show e
+                  Right h -> h `shouldNotBe` (hexString "deadbeef")
+          it "To Transparent" $ do
+            let uaRead = parseAddress "tmAmSa4AauSFuJieeanRBjkfnah45ysGtgZ"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 4)
+                    3001331
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        Nothing
+                    ]
+                    Medium
+                tx `shouldBe`
+                  Left
+                    (PrivacyPolicyError "Receiver not capable of Medium privacy")
+          it "To mixed shielded receivers" $ do
+            let uaRead =
+                  parseAddress
+                    "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
+            let uaRead2 =
+                  parseAddress
+                    "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 1)
+                    3001331
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        (Just "Sending memo to orchard")
+                    , ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead2)
+                        0.004
+                        Nothing
+                    ]
+                    Medium
+                case tx of
+                  Left e -> assertFailure $ show e
+                  Right h -> h `shouldNotBe` (hexString "deadbeef")
+        describe "Low" $ do
+          it "To Orchard" $ do
+            let uaRead =
+                  parseAddress
+                    "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 1)
+                    3001372
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        Nothing
+                    ]
+                    Low
+                case tx of
+                  Left e -> assertFailure $ show e
+                  Right h -> h `shouldNotBe` (hexString "deadbeef")
+          it "To Sapling" $ do
+            let uaRead =
+                  parseAddress
+                    "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 1)
+                    3001372
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        Nothing
+                    ]
+                    Low
+                case tx of
+                  Left e -> assertFailure $ show e
+                  Right h -> h `shouldNotBe` (hexString "deadbeef")
+          it "To Transparent" $ do
+            let uaRead = parseAddress "tmAmSa4AauSFuJieeanRBjkfnah45ysGtgZ"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 1)
+                    3001372
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        Nothing
+                    ]
+                    Low
+                case tx of
+                  Left e -> assertFailure $ show e
+                  Right h -> h `shouldNotBe` (hexString "deadbeef")
+        describe "None" $ do
+          it "To Orchard" $ do
+            let uaRead =
+                  parseAddress
+                    "utest1dl54utt6prjj5e0dnlknwumnxq9hycdjpkfr0sy6e6h522remqee8axe9zax0wsjrwpj76v555pdhvj9rnargpfyycs0vpkapq98xcdhem99gc4wchzn0ggepq3y6nz3a9sscwgqxgsh9vzhcad402y3x9szfregck5gslkya3c79d86xx0l33tpk8gnn7ew9vw37w43zh22u8dgdax"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 1)
+                    3001372
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        Nothing
+                    ]
+                    None
+                tx `shouldBe`
+                  Left
+                    (PrivacyPolicyError
+                       "Shielded recipients not compatible with privacy policy.")
+          it "To Sapling" $ do
+            let uaRead =
+                  parseAddress
+                    "ztestsapling136jp8z89v2jh6kqd5rs4dtvlxym90m43svzdwzxaplyvc5ttzppytpvx80ncllcsqzpmukxjl3y"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 1)
+                    3001372
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        Nothing
+                    ]
+                    None
+                tx `shouldBe`
+                  Left
+                    (PrivacyPolicyError
+                       "Shielded recipients not compatible with privacy policy.")
+          it "To Transparent" $ do
+            let uaRead = parseAddress "tmAmSa4AauSFuJieeanRBjkfnah45ysGtgZ"
+            case uaRead of
+              Nothing -> assertFailure "wrong address"
+              Just ua -> do
+                pool <- runNoLoggingT $ initPool "/home/rav/Zenith/zenith.db"
+                tx <-
+                  runFileLoggingT "zenith.log" $
+                  prepareTxV2
+                    pool
+                    "localhost"
+                    18232
+                    TestNet
+                    (toSqlKey 1)
+                    3001372
+                    [ ProposedNote
+                        (ValidAddressAPI $ fromJust uaRead)
+                        0.005
+                        Nothing
+                    ]
+                    None
+                case tx of
+                  Left e -> assertFailure $ show e
+                  Right h -> h `shouldNotBe` (hexString "deadbeef")

zcash-haskell

@@ -1 +1 @@
-Subproject commit 6d4b6840d30fe1631902acd0388bef0040fee9e8
+Subproject commit 662a0d1148d3f52e2683157a4c9280bb8e81b0cb

zenith.cabal

@@ -141,7 +141,6 @@ test-suite zenith-tests
   build-depends:
       base >=4.12 && <5
     , bytestring
-    , aeson
     , configurator
     , monad-logger
     , data-default