feat: update dependencies in sync with node v9.1.0

Related to #326.
geniusyield · Jul 30, 2024 · 8016109 · 8016109
1 parent 17bd9f7
commit 8016109
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/GeniusYield/CardanoApi/Query.hs b/src/GeniusYield/CardanoApi/Query.hs
@@ -16,7 +16,8 @@ module GeniusYield.CardanoApi.Query (
     CardanoQueryException (..),
 ) where
 
-import           Control.Exception                               (Exception, throwIO)
+import           Control.Exception                               (Exception,
+                                                                  throwIO)
 
 import qualified Cardano.Api                                     as Api
 import qualified Cardano.Api.Shelley                             as Api.S
@@ -38,7 +39,7 @@ newtype CardanoQueryException = CardanoQueryException String
 
 queryCardanoMode :: Api.LocalNodeConnectInfo -> Api.QueryInMode a -> IO a
 queryCardanoMode info q = do
-    e <- Api.queryNodeLocalState info Ouroboros.VolatileTip q
+    e <- Api.runExceptT $ Api.queryNodeLocalState info Ouroboros.VolatileTip q
     case e of
         Left err -> throwIO $ CardanoQueryException $ show err
         Right x  -> return x

diff --git a/src/GeniusYield/Providers/Node.hs b/src/GeniusYield/Providers/Node.hs
@@ -20,6 +20,7 @@ module GeniusYield.Providers.Node
 
 import qualified Cardano.Api                                       as Api
 import qualified Cardano.Api.Shelley                               as Api.S
+import qualified Cardano.Ledger.Coin                               as Ledger
 import           Cardano.Slotting.Time                             (SystemStart)
 import           Control.Exception                                 (throwIO)
 import qualified Data.Map.Strict                                   as Map
@@ -89,7 +90,7 @@ stakePools GYBabbage info = queryBabbageEra info Api.QueryStakePools
 nodeStakeAddressInfo :: Api.LocalNodeConnectInfo -> GYStakeAddress -> IO (Maybe GYStakeAddressInfo)
 nodeStakeAddressInfo info saddr = resolveStakeAddressInfoFromApi saddr <$> queryBabbageEra info (Api.QueryStakeAddresses (Set.singleton $ stakeCredentialToApi $ stakeAddressToCredential saddr) (Api.localNodeNetworkId info))
 
-resolveStakeAddressInfoFromApi :: GYStakeAddress -> (Map.Map Api.StakeAddress Api.Lovelace, Map.Map Api.StakeAddress Api.S.PoolId) -> Maybe GYStakeAddressInfo
+resolveStakeAddressInfoFromApi :: GYStakeAddress -> (Map.Map Api.StakeAddress Ledger.Coin, Map.Map Api.StakeAddress Api.S.PoolId) -> Maybe GYStakeAddressInfo
 resolveStakeAddressInfoFromApi (stakeAddressToApi -> stakeAddr) (rewards, delegations) =
     if Map.member stakeAddr rewards
     then Just $ GYStakeAddressInfo

diff --git a/src/GeniusYield/Test/Privnet/Setup.hs b/src/GeniusYield/Test/Privnet/Setup.hs
@@ -23,12 +23,14 @@ module GeniusYield.Test.Privnet.Setup (
     NodeConfigurationYaml (..)
 ) where
 
-import           Control.Concurrent                   (ThreadId, threadDelay, killThread)
+import           Control.Concurrent                   (ThreadId, killThread,
+                                                       threadDelay)
 import qualified Control.Concurrent.STM               as STM
 import           Control.Exception                    (finally)
 import           Control.Monad                        (forever)
 import           Control.Monad.IO.Class               (liftIO)
-import           Control.Monad.Trans.Resource         (resourceForkIO, MonadResource (liftResourceT))
+import           Control.Monad.Trans.Resource         (MonadResource (liftResourceT),
+                                                       resourceForkIO)
 import qualified Data.Text                            as Txt
 import qualified Data.Vector                          as V
 
@@ -39,8 +41,8 @@ import           Test.Tasty.HUnit                     (testCaseSteps)
 
 import qualified Cardano.Api                          as Api
 import           Cardano.Testnet
+import           Testnet.Property.Util
 import           Testnet.Runtime
-import           Testnet.Property.Utils
 
 
 import qualified GeniusYield.Api.TestTokens           as GY.TestTokens
@@ -54,6 +56,7 @@ import           GeniusYield.Test.Privnet.Utils
 import           GeniusYield.Test.Utils
 import           GeniusYield.TxBuilder
 import           GeniusYield.Types
+import           Testnet.Types
 
 
 -------------------------------------------------------------------------------
@@ -191,7 +194,7 @@ withPrivnet testnetOpts setupUser = do
                 debug $ printf "userF = %s\n" (show idx)
                 userAddr <- addressFromBech32 <$> urlPieceFromText paymentKeyInfoAddr
                 debug $ printf "userF addr = %s\n" userAddr
-                userPaymentSKey' <- readPaymentSigningKey $ paymentSKey paymentKeyInfoPair
+                userPaymentSKey' <- readPaymentSigningKey $ Api.unFile $ signingKey paymentKeyInfoPair
                 debug $ printf "userF skey = %s\n" userPaymentSKey'
                 pure User' {userPaymentSKey', userStakeSKey'=Nothing, userAddr}