Milestone 3: RPC server, ZIP-320 #104
2 changed files with 1 additions and 35 deletions
|
@ -537,19 +537,6 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do
|
||||||
return $ Left ZHError
|
return $ Left ZHError
|
||||||
Just acc -> do
|
Just acc -> do
|
||||||
logDebugN $ T.pack $ show acc
|
logDebugN $ T.pack $ show acc
|
||||||
spParams <- liftIO $ BS.readFile "sapling-spend.params"
|
|
||||||
outParams <- liftIO $ BS.readFile "sapling-output.params"
|
|
||||||
if show (md5 $ LBS.fromStrict spParams) /=
|
|
||||||
"0f44c12ef115ae019decf18ade583b20"
|
|
||||||
then logErrorN "Can't validate sapling parameters"
|
|
||||||
else logInfoN "Valid Sapling spend params"
|
|
||||||
if show (md5 $ LBS.fromStrict outParams) /=
|
|
||||||
"924daf81b87a81bbbb9c7d18562046c8"
|
|
||||||
then logErrorN "Can't validate sapling parameters"
|
|
||||||
else logInfoN "Valid Sapling output params"
|
|
||||||
--print $ BS.length spParams
|
|
||||||
--print $ BS.length outParams
|
|
||||||
logDebugN "Read Sapling params"
|
|
||||||
let zats = fromIntegral $ floorFloatInteger $ amt * (10 ^ 8)
|
let zats = fromIntegral $ floorFloatInteger $ amt * (10 ^ 8)
|
||||||
logDebugN $ T.pack $ show zats
|
logDebugN $ T.pack $ show zats
|
||||||
{-firstPass <- liftIO $ selectUnspentNotes pool za zats-}
|
{-firstPass <- liftIO $ selectUnspentNotes pool za zats-}
|
||||||
|
@ -584,8 +571,6 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do
|
||||||
sSpends
|
sSpends
|
||||||
oSpends
|
oSpends
|
||||||
dummy
|
dummy
|
||||||
(SaplingSpendParams spParams)
|
|
||||||
(SaplingOutputParams outParams)
|
|
||||||
zn
|
zn
|
||||||
(bh + 3)
|
(bh + 3)
|
||||||
False
|
False
|
||||||
|
@ -611,8 +596,6 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do
|
||||||
sSpends
|
sSpends
|
||||||
oSpends
|
oSpends
|
||||||
outgoing
|
outgoing
|
||||||
(SaplingSpendParams spParams)
|
|
||||||
(SaplingOutputParams outParams)
|
|
||||||
zn
|
zn
|
||||||
(bh + 3)
|
(bh + 3)
|
||||||
True
|
True
|
||||||
|
@ -784,19 +767,6 @@ prepareTxV2 pool zebraHost zebraPort zn za bh amt va memo policy = do
|
||||||
return $ Left ZHError
|
return $ Left ZHError
|
||||||
Just acc -> do
|
Just acc -> do
|
||||||
logDebugN $ T.pack $ show acc
|
logDebugN $ T.pack $ show acc
|
||||||
spParams <- liftIO $ BS.readFile "sapling-spend.params"
|
|
||||||
outParams <- liftIO $ BS.readFile "sapling-output.params"
|
|
||||||
if show (md5 $ LBS.fromStrict spParams) /=
|
|
||||||
"0f44c12ef115ae019decf18ade583b20"
|
|
||||||
then logErrorN "Can't validate sapling parameters"
|
|
||||||
else logInfoN "Valid Sapling spend params"
|
|
||||||
if show (md5 $ LBS.fromStrict outParams) /=
|
|
||||||
"924daf81b87a81bbbb9c7d18562046c8"
|
|
||||||
then logErrorN "Can't validate sapling parameters"
|
|
||||||
else logInfoN "Valid Sapling output params"
|
|
||||||
--print $ BS.length spParams
|
|
||||||
--print $ BS.length outParams
|
|
||||||
logDebugN "Read Sapling params"
|
|
||||||
let zats = fromIntegral $ floorFloatInteger $ amt * (10 ^ 8)
|
let zats = fromIntegral $ floorFloatInteger $ amt * (10 ^ 8)
|
||||||
logDebugN $ T.pack $ show zats
|
logDebugN $ T.pack $ show zats
|
||||||
{-firstPass <- liftIO $ selectUnspentNotes pool za zats-}
|
{-firstPass <- liftIO $ selectUnspentNotes pool za zats-}
|
||||||
|
@ -831,8 +801,6 @@ prepareTxV2 pool zebraHost zebraPort zn za bh amt va memo policy = do
|
||||||
sSpends
|
sSpends
|
||||||
oSpends
|
oSpends
|
||||||
dummy
|
dummy
|
||||||
(SaplingSpendParams spParams)
|
|
||||||
(SaplingOutputParams outParams)
|
|
||||||
zn
|
zn
|
||||||
(bh + 3)
|
(bh + 3)
|
||||||
False
|
False
|
||||||
|
@ -858,8 +826,6 @@ prepareTxV2 pool zebraHost zebraPort zn za bh amt va memo policy = do
|
||||||
sSpends
|
sSpends
|
||||||
oSpends
|
oSpends
|
||||||
outgoing
|
outgoing
|
||||||
(SaplingSpendParams spParams)
|
|
||||||
(SaplingOutputParams outParams)
|
|
||||||
zn
|
zn
|
||||||
(bh + 3)
|
(bh + 3)
|
||||||
True
|
True
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit ce19e174cc636f1e9fce9114875ab0cb1df10213
|
Subproject commit 7965dc38c48da348f503a52ee10042fffc43f32c
|
Loading…
Reference in a new issue