Merge remote-tracking branch 'upstream/master'

Emurgo · Jan 21, 2024 · 694bf73 · 694bf73
2 parents 28c4b53 + 818b23c
commit 694bf73
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml
@@ -38,7 +38,7 @@ jobs:
 
     env:
       # Modify this value to "invalidate" the cabal cache.
-      CABAL_CACHE_VERSION: "2024-01-09"
+      CABAL_CACHE_VERSION: "2024-01-19"
 
     concurrency:
       group: >

diff --git a/bench/locli/locli.cabal b/bench/locli/locli.cabal
@@ -175,7 +175,7 @@ test-suite test-locli
   build-depends:        cardano-prelude
                       , containers
                       , hedgehog
-                      , hedgehog-extras ^>= 0.5.1.0
+                      , hedgehog-extras ^>= 0.6.0.0
                       , locli
                       , text
 

diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal
@@ -73,7 +73,7 @@ library
   -- IOG dependencies
   --------------------------
   build-depends:
-    , cardano-api ^>= 8.37.0.0
+    , cardano-api             ^>= 8.37.1.0
     , plutus-ledger-api       >=1.0.0
     , plutus-tx               >=1.0.0
     , plutus-tx-plugin        >=1.0.0

diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal
@@ -98,9 +98,9 @@ library
                       , attoparsec-aeson
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 8.37.0.0
+                      , cardano-api ^>= 8.37.1.0
                       , cardano-binary
-                      , cardano-cli ^>= 8.18.0.0
+                      , cardano-cli ^>= 8.19.0.0
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-data

diff --git a/cabal.project b/cabal.project
@@ -13,8 +13,8 @@ repository cardano-haskell-packages
 -- See CONTRIBUTING for information about these, including some Nix commands
 -- you need to run if you change them
 index-state:
-  , hackage.haskell.org 2024-01-04T09:36:23Z
-  , cardano-haskell-packages 2024-01-04T09:36:23Z
+  , hackage.haskell.org 2024-01-16T14:48:13Z
+  , cardano-haskell-packages 2024-01-18T16:26:04Z
 
 packages:
   cardano-git-rev

diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal
@@ -73,7 +73,7 @@ test-suite chairman-tests
                       , cardano-crypto-class ^>= 2.1.2
                       , filepath
                       , hedgehog
-                      , hedgehog-extras ^>= 0.5.1.0
+                      , hedgehog-extras ^>= 0.6.0.0
                       , network
                       , process
                       , random
@@ -89,5 +89,5 @@ test-suite chairman-tests
   ghc-options:          -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T
 
   build-tool-depends:   cardano-node:cardano-node
-                      , cardano-cli:cardano-cli ^>= 8.18.0.0
+                      , cardano-cli:cardano-cli ^>= 8.19.0.0
                       , cardano-node-chairman:cardano-node-chairman
diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal
@@ -144,7 +144,7 @@ library
                       , async
                       , base16-bytestring
                       , bytestring
-                      , cardano-api ^>= 8.37.0.0
+                      , cardano-api ^>= 8.37.1.0
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-git-rev

diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal
@@ -39,9 +39,9 @@ library
                       , aeson
                       , async
                       , bytestring
-                      , cardano-api ^>= 8.37.0.0
+                      , cardano-api ^>= 8.37.1.0
                       , cardano-binary
-                      , cardano-cli ^>= 8.18.0.0
+                      , cardano-cli ^>= 8.19.0.0
                       , cardano-crypto-class ^>= 2.1.2
                       , http-media
                       , iohk-monitoring

diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal
@@ -34,8 +34,8 @@ library
   build-depends:        aeson
                       , ansi-terminal
                       , bytestring
-                      , cardano-api ^>= 8.37.0.0
-                      , cardano-cli ^>= 8.18.0.0
+                      , cardano-api ^>= 8.37.1.0
+                      , cardano-cli ^>= 8.19.0.0
                       , cardano-crypto-class
                       , cardano-crypto-wrapper
                       , cardano-ledger-alonzo
@@ -55,7 +55,7 @@ library
                       , exceptions
                       , filepath
                       , hedgehog
-                      , hedgehog-extras ^>= 0.5.1.0
+                      , hedgehog-extras ^>= 0.6.0.0
                       , microlens
                       , lens-aeson
                       , mtl

diff --git a/...test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitution.hs b/...test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitution.hs
@@ -95,12 +95,12 @@ hprop_ledger_events_propose_new_constitution = H.integrationRetryWorkspace 2 "pr
   H.writeFile consitutionFile "dummy constitution data"
   constitutionHash <- H.execCli' execConfig
     [ "conway", "governance"
-    , "hash", "--file-text", consitutionFile
+    , "hash", "anchor-data", "--file-text", consitutionFile
     ]
 
   proposalAnchorDataHash <- H.execCli' execConfig
     [ "conway", "governance"
-    , "hash", "--file-text", proposalAnchorFile
+    , "hash", "anchor-data", "--file-text", proposalAnchorFile
     ]
 
   let stakeVkeyFp = gov </> "stake.vkey"

diff --git a/flake.lock b/flake.lock