From 7189ddcb2ad0ec242ed31de287073a59e55974e8 Mon Sep 17 00:00:00 2001 From: Rene Vergara Date: Tue, 17 Sep 2024 14:23:35 -0500 Subject: [PATCH] feat: update to use new `createTransaction` --- src/Zenith/Core.hs | 34 ---------------------------------- zcash-haskell | 2 +- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/src/Zenith/Core.hs b/src/Zenith/Core.hs index 4e27207..abf064b 100644 --- a/src/Zenith/Core.hs +++ b/src/Zenith/Core.hs @@ -537,19 +537,6 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do return $ Left ZHError Just acc -> do 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) logDebugN $ T.pack $ show zats {-firstPass <- liftIO $ selectUnspentNotes pool za zats-} @@ -584,8 +571,6 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do sSpends oSpends dummy - (SaplingSpendParams spParams) - (SaplingOutputParams outParams) zn (bh + 3) False @@ -611,8 +596,6 @@ prepareTx pool zebraHost zebraPort zn za bh amt ua memo = do sSpends oSpends outgoing - (SaplingSpendParams spParams) - (SaplingOutputParams outParams) zn (bh + 3) True @@ -784,19 +767,6 @@ prepareTxV2 pool zebraHost zebraPort zn za bh amt va memo policy = do return $ Left ZHError Just acc -> do 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) logDebugN $ T.pack $ show zats {-firstPass <- liftIO $ selectUnspentNotes pool za zats-} @@ -831,8 +801,6 @@ prepareTxV2 pool zebraHost zebraPort zn za bh amt va memo policy = do sSpends oSpends dummy - (SaplingSpendParams spParams) - (SaplingOutputParams outParams) zn (bh + 3) False @@ -858,8 +826,6 @@ prepareTxV2 pool zebraHost zebraPort zn za bh amt va memo policy = do sSpends oSpends outgoing - (SaplingSpendParams spParams) - (SaplingOutputParams outParams) zn (bh + 3) True diff --git a/zcash-haskell b/zcash-haskell index ce19e17..7965dc3 160000 --- a/zcash-haskell +++ b/zcash-haskell @@ -1 +1 @@ -Subproject commit ce19e174cc636f1e9fce9114875ab0cb1df10213 +Subproject commit 7965dc38c48da348f503a52ee10042fffc43f32c