src/ZGoBackend.hs

@@ -1994,7 +1994,6 @@ scanTxNative config pipe = do
             txList <- mapM (getTxData nodeUser nodePwd) txIdList
             print "filtering txs..."
             let filteredTxList = map fromJust $ filter filterTx txList
-            print $ show filteredTxList
             print "checking txs against keys..."
             mapM_ (checkTx filteredTxList) ownerList
             access pipe master (c_dbName config) $
@@ -2029,8 +2028,8 @@ scanTxNative config pipe = do
       if isValidSaplingViewingKey (E.encodeUtf8 $ oviewkey k)
         then do
           print "decoding Sapling tx"
-          decodedSapList' <- mapM (decodeSaplingTx $ oviewkey k) txList'
+          let decodedSapList' = concatMap (decodeSaplingTx $ oviewkey k) txList'
-          let zList = concatMap catMaybes decodedSapList'
+          let zList = catMaybes decodedSapList'
           mapM_ (recordPayment pipe (c_dbName config) (oaddress k)) zList
         else do
           let vk = decodeUfvk $ E.encodeUtf8 $ oviewkey k
@@ -2044,14 +2043,12 @@ scanTxNative config pipe = do
               let decodedOrchList = concatMap (decodeUnifiedOrchardTx v) txList'
               let oList = catMaybes decodedOrchList
               mapM_ (recordPayment pipe (c_dbName config) (oaddress k)) oList
-    decodeSaplingTx :: T.Text -> RawTxResponse -> IO [Maybe ZcashTx]
+    decodeSaplingTx :: T.Text -> RawTxResponse -> [Maybe ZcashTx]
-    decodeSaplingTx k t = do
+    decodeSaplingTx k t =
-      print (show t)
+      map
-      return $
+        (buildZcashTx t .
-        map
+         decodeSaplingOutput (bytes (decodeBech32 $ E.encodeUtf8 k)))
-          (buildZcashTx t .
+        (rt_shieldedOutputs t)
-           decodeSaplingOutput (bytes (decodeBech32 $ E.encodeUtf8 k)))
-          (rt_shieldedOutputs t)
     decodeUnifiedSaplingTx :: BS.ByteString -> RawTxResponse -> [Maybe ZcashTx]
     decodeUnifiedSaplingTx k t =
       map (buildZcashTx t . decodeSaplingOutput k) (rt_shieldedOutputs t)