From 06d15f4d60da8f871a88740f77245c335bcbd239 Mon Sep 17 00:00:00 2001 From: Gregory Gerasev Date: Tue, 12 Mar 2024 22:56:59 +0700 Subject: [PATCH] Adapt to cardano-api breaking changes --- cem-script.cabal | 3 ++- src/Cardano/CEM/Monads/L1.hs | 15 +++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/cem-script.cabal b/cem-script.cabal index 92b49ee..37ed66d 100644 --- a/cem-script.cabal +++ b/cem-script.cabal @@ -122,6 +122,7 @@ common common-offchain , retry , cardano-api -- , cardano-cli + , ouroboros-network-protocols , cardano-ledger-core , cardano-ledger-babbage , cardano-ledger-alonzo @@ -174,13 +175,13 @@ library Cardano.CEM.Examples.Voting Cardano.CEM.Monads Cardano.CEM.Monads.L1 + Cardano.CEM.Monads.CLB Cardano.CEM.OnChain build-depends: cem-script:data-spine, cem-script:cardano-extras, dependent-map, singletons-th, - -- plutarch, test-suite cem-sdk-test import: diff --git a/src/Cardano/CEM/Monads/L1.hs b/src/Cardano/CEM/Monads/L1.hs index b7d09aa..538f3a5 100644 --- a/src/Cardano/CEM/Monads/L1.hs +++ b/src/Cardano/CEM/Monads/L1.hs @@ -12,14 +12,12 @@ import Data.Set qualified as Set import Unsafe.Coerce (unsafeCoerce) import Data.Aeson +import Data.Aeson.KeyMap ((!?)) -- Cardano imports --- import Cardano.Ledger.Chain (PredicateFailure) --- import Cardano.Ledger.Shelley.API () --- import Ouroboros.Consensus.Shelley.Ledger (ApplyTxError (..)) --- import Cardano.Ledger.Alonzo.TxInfo (ExtendedUTxO, TranslationError) import Cardano.Api hiding (queryUtxo) -import Cardano.Api.Shelley (LedgerProtocolParameters (..)) +import Cardano.Api.Shelley (LedgerProtocolParameters (..), ) +import Ouroboros.Network.Protocol.LocalStateQuery.Type (Target (..)) -- CEM imports @@ -73,7 +71,7 @@ queryCardanoNode :: QueryInShelleyBasedEra Era b -> L1Runner b queryCardanoNode query = do node <- localNode <$> ask - result <- liftIO $ queryNodeLocalState node Nothing cardanoQuery + result <- liftIO $ queryNodeLocalState node VolatileTip cardanoQuery return $ case result of -- TODO: better handling of wrong-era exceptions Right (Right x) -> x @@ -142,9 +140,6 @@ instance MonadSubmitTx L1Runner where mainAddress <- fromPlutusAddressInMonad mainAddress' utxo <- queryUtxo $ ByTxIns $ map fst txIns - -- liftIO $ pPrint preBody - -- liftIO $ pPrint utxo - body <- either (\x -> fail $ "Autobalance error: " <> show x) return =<< callBodyAutoBalance @@ -190,7 +185,7 @@ callBodyAutoBalance :: TxBodyContent BuildTx Era -> UTxO Era -> AddressInEra Era -> - m (Either TxBodyErrorAutoBalance (TxBody Era)) + m (Either (TxBodyErrorAutoBalance Era) (TxBody Era)) callBodyAutoBalance preBody utxo