cardano-api integration for node 9.3

IntersectMBO · Oct 15, 2024 · 59af959 · 59af959
1 parent 746a580
commit 59af959
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 13 deletions.
diff --git a/cardano-cli/cardano-cli.cabal b/cardano-cli/cardano-cli.cabal
@@ -196,7 +196,7 @@ library
     binary,
     bytestring,
     canonical-json,
-    cardano-api ^>=9.3,
+    cardano-api ^>=9.4,
     cardano-binary,
     cardano-crypto,
     cardano-crypto-class ^>=2.1.2,
@@ -208,7 +208,7 @@ library
     cardano-ledger-byron >=1.0.1.0,
     cardano-ledger-core,
     cardano-ledger-shelley,
-    cardano-ping ^>=0.4,
+    cardano-ping ^>=0.5,
     cardano-prelude,
     cardano-slotting ^>=0.2.0.0,
     cardano-strict-containers ^>=0.1,
@@ -231,10 +231,10 @@ library
     network,
     network-uri,
     optparse-applicative-fork,
-    ouroboros-consensus ^>=0.20,
-    ouroboros-consensus-cardano ^>=0.19,
-    ouroboros-consensus-protocol ^>=0.9.0.1,
-    ouroboros-network-api ^>=0.9,
+    ouroboros-consensus ^>=0.21,
+    ouroboros-consensus-cardano ^>=0.20,
+    ouroboros-consensus-protocol ^>=0.9.0.2,
+    ouroboros-network-api ^>=0.10,
     ouroboros-network-protocols,
     parsec,
     prettyprinter,

diff --git a/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs b/cardano-cli/src/Cardano/CLI/Byron/Parsers.hs
@@ -24,7 +24,7 @@ module Cardano.CLI.Byron.Parsers
   )
 where
 
-import           Cardano.Api hiding (GenesisParameters, UpdateProposal, parseFilePath)
+import           Cardano.Api hiding (GenesisParameters, UpdateProposal)
 import           Cardano.Api.Byron (Address (..), ByronProtocolParametersUpdate (..),
                    toByronLovelace)
 import qualified Cardano.Api.Ledger as L

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Common.hs
@@ -12,9 +12,9 @@
 
 module Cardano.CLI.EraBased.Options.Common where
 
-import           Cardano.Api hiding (bounded, parseFilePath)
+import           Cardano.Api
 import qualified Cardano.Api.Ledger as L
-import           Cardano.Api.Shelley hiding (bounded, parseFilePath)
+import           Cardano.Api.Shelley
 
 import           Cardano.CLI.Environment (EnvCli (..), envCliAnyEon)
 import           Cardano.CLI.Parser

diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs b/cardano-cli/src/Cardano/CLI/EraBased/Options/Genesis.hs
@@ -9,7 +9,7 @@ module Cardano.CLI.EraBased.Options.Genesis
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..), parseFilePath)
+import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
 import           Cardano.Api.Ledger (Coin (..))
 
 import           Cardano.Chain.Common (BlockCount (BlockCount))

diff --git a/cardano-cli/src/Cardano/CLI/Json/Friendly.hs b/cardano-cli/src/Cardano/CLI/Json/Friendly.hs
@@ -217,6 +217,7 @@ friendlyTxBodyImpl
             txValidityUpperBound
             txMetadata
             txAuxScripts
+            _txSupplementalData
             txExtraKeyWits
             _txProtocolParams
             txWithdrawals

diff --git a/cardano-cli/src/Cardano/CLI/Legacy/Options.hs b/cardano-cli/src/Cardano/CLI/Legacy/Options.hs
@@ -18,7 +18,7 @@ module Cardano.CLI.Legacy.Options
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..), parseFilePath)
+import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
 import           Cardano.Api.Ledger (Coin (..))
 
 import           Cardano.Chain.Common (BlockCount (BlockCount))

diff --git a/cardano-cli/src/Cardano/CLI/Options/Debug.hs b/cardano-cli/src/Cardano/CLI/Options/Debug.hs
@@ -11,7 +11,7 @@ module Cardano.CLI.Options.Debug
   )
 where
 
-import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..), parseFilePath)
+import           Cardano.Api.Shelley hiding (QueryInShelleyBasedEra (..))
 
 import           Cardano.CLI.Commands.Debug
 import           Cardano.CLI.Commands.Debug.LogEpochState

diff --git a/cardano-cli/src/Cardano/CLI/Options/Key.hs b/cardano-cli/src/Cardano/CLI/Options/Key.hs
@@ -8,7 +8,7 @@ module Cardano.CLI.Options.Key
   )
 where
 
-import           Cardano.Api hiding (QueryInShelleyBasedEra (..), parseFilePath)
+import           Cardano.Api hiding (QueryInShelleyBasedEra (..))
 
 import           Cardano.CLI.Commands.Key
 import           Cardano.CLI.EraBased.Options.Common