Compare commits

..

No commits in common. "debug" and "master" have entirely different histories.

View file

@ -1994,7 +1994,6 @@ scanTxNative config pipe = do
txList <- mapM (getTxData nodeUser nodePwd) txIdList txList <- mapM (getTxData nodeUser nodePwd) txIdList
print "filtering txs..." print "filtering txs..."
let filteredTxList = map fromJust $ filter filterTx txList let filteredTxList = map fromJust $ filter filterTx txList
print $ show filteredTxList
print "checking txs against keys..." print "checking txs against keys..."
mapM_ (checkTx filteredTxList) ownerList mapM_ (checkTx filteredTxList) ownerList
access pipe master (c_dbName config) $ access pipe master (c_dbName config) $
@ -2029,8 +2028,8 @@ scanTxNative config pipe = do
if isValidSaplingViewingKey (E.encodeUtf8 $ oviewkey k) if isValidSaplingViewingKey (E.encodeUtf8 $ oviewkey k)
then do then do
print "decoding Sapling tx" 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 mapM_ (recordPayment pipe (c_dbName config) (oaddress k)) zList
else do else do
let vk = decodeUfvk $ E.encodeUtf8 $ oviewkey k let vk = decodeUfvk $ E.encodeUtf8 $ oviewkey k
@ -2044,10 +2043,8 @@ scanTxNative config pipe = do
let decodedOrchList = concatMap (decodeUnifiedOrchardTx v) txList' let decodedOrchList = concatMap (decodeUnifiedOrchardTx v) txList'
let oList = catMaybes decodedOrchList let oList = catMaybes decodedOrchList
mapM_ (recordPayment pipe (c_dbName config) (oaddress k)) oList 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)
return $
map map
(buildZcashTx t . (buildZcashTx t .
decodeSaplingOutput (bytes (decodeBech32 $ E.encodeUtf8 k))) decodeSaplingOutput (bytes (decodeBech32 $ E.encodeUtf8 k)))