Unified Address support #8

Merged
pitmutt merged 61 commits from dev18 into master 2023-10-28 12:24:28 +00:00
Showing only changes of commit af22c0d71f - Show all commits

View file

@ -1875,19 +1875,11 @@ scanTxNative pipe db nodeUser nodePwd = do
print $ err content print $ err content
return Nothing return Nothing
checkTx :: [RawTxResponse] -> T.Text -> IO () checkTx :: [RawTxResponse] -> T.Text -> IO ()
checkTx txList k = do checkTx txList' k = do
if isValidSaplingViewingKey (E.encodeUtf8 k) if isValidSaplingViewingKey (E.encodeUtf8 k)
then do then do
print "decoding Sapling tx" print "decoding Sapling tx"
let rawKey = decodeBech32 $ E.encodeUtf8 k print txList'
print rawKey
let i = concatMap rt_shieldedOutputs txList
print i
let decodedTxList =
map
(decodeSaplingOutput $ bytes rawKey)
(concatMap rt_shieldedOutputs txList)
print decodedTxList
else do else do
let vk = decodeUfvk $ E.encodeUtf8 k let vk = decodeUfvk $ E.encodeUtf8 k
case vk of case vk of
@ -1896,12 +1888,12 @@ scanTxNative pipe db nodeUser nodePwd = do
let decodedSapList = let decodedSapList =
map map
(decodeSaplingOutput (s_key v)) (decodeSaplingOutput (s_key v))
(concatMap rt_shieldedOutputs txList) (concatMap rt_shieldedOutputs txList')
print decodedSapList print decodedSapList
let decodedOrchList = let decodedOrchList =
map map
(decryptOrchardAction v) (decryptOrchardAction v)
(concatMap rt_orchardActions txList) (concatMap rt_orchardActions txList')
print decodedOrchList print decodedOrchList
debug = flip trace debug = flip trace