Merge pull request #1316 from input-output-hk/lc/cardano-api-8.39

cardano-api: 8.39
cardano-scaling · Mar 5, 2024 · 6fcc456 · 6fcc456
2 parents ab45d09 + ffb0faf
commit 6fcc456
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 11 deletions.
diff --git a/cabal.project b/cabal.project
@@ -12,8 +12,8 @@ repository cardano-haskell-packages
 
 -- See CONTRIBUTING.md for information about when and how to update these.
 index-state:
-  , hackage.haskell.org 2024-02-07T15:07:04Z
-  , cardano-haskell-packages 2024-02-07T19:04:02Z
+  , hackage.haskell.org 2024-02-22T15:07:04Z
+  , cardano-haskell-packages 2024-02-22T19:04:02Z
 
 packages:
   hydra-prelude

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,7 +9,7 @@
       inputs.nixpkgs.follows = "haskellNix/nixpkgs";
     };
     CHaP = {
-      url = "github:intersectmbo/cardano-haskell-packages?ref=repo";
+      url = "github:IntersectMBO/cardano-haskell-packages?ref=repo";
       flake = false;
     };
     # Use a patched 2.6.0.0 as we are also affected by

diff --git a/hydra-cardano-api/hydra-cardano-api.cabal b/hydra-cardano-api/hydra-cardano-api.cabal
@@ -88,7 +88,7 @@ library
     , base                    >=4.16
     , base16-bytestring
     , bytestring
-    , cardano-api             >=8.38.0 && <8.39
+    , cardano-api             >=8.39.0 && <8.40
     , cardano-binary          >=1.7.0  && <1.8
     , cardano-crypto-class    >=2.1.1  && <2.2
     , cardano-ledger-allegra  >=1.3    && <1.4

diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api.hs b/hydra-cardano-api/src/Hydra/Cardano/Api.hs
@@ -65,19 +65,23 @@ import Cardano.Api as X hiding (
   TxValidityUpperBound (..),
   UTxO (..),
   Witness (..),
+  blue,
   createAndValidateTransactionBody,
   defaultTxBodyContent,
   fromLedgerValue,
+  green,
   makeShelleyKeyWitness,
   policyId,
   queryEraHistory,
   queryProtocolParameters,
   queryStakePools,
   querySystemStart,
+  red,
   scriptLanguageSupportedInEra,
   signShelleyTransaction,
   toLedgerUTxO,
   toLedgerValue,
+  (<+>),
  )
 import Cardano.Api.Byron as X (
   Address (..),

diff --git a/hydra-cardano-api/src/Hydra/Cardano/Api/ScriptData.hs b/hydra-cardano-api/src/Hydra/Cardano/Api/ScriptData.hs
@@ -2,7 +2,7 @@
 
 module Hydra.Cardano.Api.ScriptData where
 
-import Hydra.Cardano.Api.Prelude
+import Hydra.Cardano.Api.Prelude hiding (left)
 
 import Cardano.Ledger.Alonzo.TxWits qualified as Ledger
 import Cardano.Ledger.Era qualified as Ledger

diff --git a/hydra-plutus/exe/inspect-script/Main.hs b/hydra-plutus/exe/inspect-script/Main.hs
@@ -18,7 +18,7 @@ import Hydra.Contract.Initial as Initial
 import PlutusLedgerApi.V2 (Data, SerialisedScript, toData)
 import PlutusTx (getPlc)
 import PlutusTx.Code (CompiledCode)
-import Prettyprinter (defaultLayoutOptions, layoutPretty, pretty)
+import Prettyprinter (defaultLayoutOptions, layoutPretty)
 import Prettyprinter.Render.Text (renderStrict)
 
 -- | Serialise Hydra scripts to files for submission through cardano-cli.