diff --git a/.github/workflows/haskell.yml b/.github/workflows/haskell.yml index 135ed515ee3..dfc46b30bf9 100644 --- a/.github/workflows/haskell.yml +++ b/.github/workflows/haskell.yml @@ -36,7 +36,9 @@ jobs: fail-fast: false matrix: # If you edit these versions, make sure the version in the lonely macos-latest job below is updated accordingly - ghc: ["9.6", "9.8"] + # TODO add 9.8 again to the versions list when GHC-9.8 gets released with stm > 2.5.2, + # see https://github.com/haskell/stm/issues/76 + ghc: ["9.6"] cabal: ["3.12"] sys: - { os: windows-latest, shell: 'C:/msys64/usr/bin/bash.exe -e {0}' } diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal index cccabc3057b..1adb404e90e 100644 --- a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal +++ b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal @@ -80,10 +80,10 @@ library -- IOG dependencies -------------------------- build-depends: - , cardano-api ^>=9.1 - , plutus-ledger-api ^>=1.30 - , plutus-tx ^>=1.30 - , plutus-tx-plugin ^>=1.30 + , cardano-api ^>=9.2 + , plutus-ledger-api ^>=1.31 + , plutus-tx ^>=1.31 + , plutus-tx-plugin ^>=1.31 ------------------------ -- Non-IOG dependencies diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index c77174b61b0..0fa2a7bf2eb 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/bench/tx-generator/tx-generator.cabal @@ -106,9 +106,9 @@ library , attoparsec-aeson , base16-bytestring , bytestring - , cardano-api ^>= 9.1 + , cardano-api ^>= 9.2 , cardano-binary - , cardano-cli ^>= 9.2.1 + , cardano-cli ^>= 9.3 , cardano-crypto-class , cardano-crypto-wrapper , cardano-data diff --git a/cabal.project b/cabal.project index 475eccc8c47..4ef9b565812 100644 --- 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-06-23T23:01:13Z - , cardano-haskell-packages 2024-07-24T14:16:32Z + , hackage.haskell.org 2024-08-15T08:53:32Z + , cardano-haskell-packages 2024-08-15T10:40:33Z packages: cardano-node @@ -60,7 +60,8 @@ package plutus-scripts-bench constraints: wai-extra < 3.1.15, -allow-newer: katip:Win32 +allow-newer: + katip:Win32 -- IMPORTANT -- Do NOT add more source-repository-package stanzas here unless they are strictly diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal index d1f9daecb0a..4150ad6e125 100644 --- a/cardano-node-chairman/cardano-node-chairman.cabal +++ b/cardano-node-chairman/cardano-node-chairman.cabal @@ -43,7 +43,7 @@ executable cardano-node-chairman "-with-rtsopts=-T" build-depends: cardano-api , cardano-crypto-class - , cardano-git-rev ^>=0.2.2 + , cardano-git-rev ^>= 0.2.2 , cardano-node ^>= 9.1 , cardano-prelude , containers @@ -88,5 +88,5 @@ test-suite chairman-tests ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T" build-tool-depends: cardano-node:cardano-node - , cardano-cli:cardano-cli ^>= 9.2.1 + , cardano-cli:cardano-cli ^>= 9.3 , cardano-node-chairman:cardano-node-chairman diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 9eea3235821..58ec0c06fe3 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -145,7 +145,7 @@ library , async , base16-bytestring , bytestring - , cardano-api ^>= 9.1 + , cardano-api ^>= 9.2 , cardano-crypto-class , cardano-crypto-wrapper , cardano-git-rev ^>=0.2.2 @@ -201,7 +201,8 @@ library , scientific , si-timers , sop-core - , stm + -- avoid stm-2.5.2 https://github.com/haskell/stm/issues/76 + , stm <2.5.2 || >=2.5.3 , strict-sop-core , strict-stm , time diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index 71e7df4298e..8d35969d7fd 100644 --- 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 ^>= 9.1 + , cardano-api ^>= 9.2 , cardano-binary - , cardano-cli ^>= 9.2.1 + , cardano-cli ^>= 9.3 , cardano-crypto-class ^>= 2.1.2 , http-media , iohk-monitoring diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index e9e3741f40d..dedf46255c9 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -35,8 +35,8 @@ library , aeson-pretty , ansi-terminal , bytestring - , cardano-api ^>= 9.1 - , cardano-cli ^>= 9.2.1 + , cardano-api ^>= 9.2 + , cardano-cli ^>= 9.3 , cardano-crypto-class , cardano-crypto-wrapper , cardano-git-rev ^>= 0.2.2 diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs index 432620c2db8..1aa5217510c 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs @@ -40,10 +40,10 @@ import qualified Data.Aeson.Encode.Pretty as Aeson import qualified Data.Aeson.Key as Aeson import qualified Data.Aeson.KeyMap as Aeson import Data.Bifunctor (bimap) +import qualified Data.ByteString.Lazy as LBS import Data.Data (type (:~:) (Refl)) import qualified Data.Map as Map import Data.String -import qualified Data.ByteString.Lazy as LBS import Data.Text (Text) import qualified Data.Text as T import qualified Data.Text.Lazy as TL @@ -56,11 +56,11 @@ import Lens.Micro ((^.)) import System.Directory (makeAbsolute) import System.FilePath (()) -import Testnet.Components.Query (checkDRepsNumber, getEpochStateView, - watchEpochStateUpdate, EpochStateView) +import Testnet.Components.Query (EpochStateView, checkDRepsNumber, getEpochStateView, + watchEpochStateUpdate) import qualified Testnet.Defaults as Defaults import Testnet.Process.Cli.Transaction (TxOutAddress (ReferenceScriptAddress), - retrieveTransactionId, signTx, mkSimpleSpendOutputsOnlyTx, mkSpendOutputsOnlyTx, + mkSimpleSpendOutputsOnlyTx, mkSpendOutputsOnlyTx, retrieveTransactionId, signTx, submitTx) import Testnet.Process.Run (execCli', execCliStdoutToJson, mkExecConfig) import Testnet.Property.Assert (assertErasEqual) @@ -71,7 +71,7 @@ import Testnet.Types import Hedgehog import qualified Hedgehog as H -import Hedgehog.Extras (readJsonFile, MonadAssertion) +import Hedgehog.Extras (MonadAssertion, readJsonFile) import qualified Hedgehog.Extras as H import qualified Hedgehog.Extras.Test.Golden as H @@ -362,6 +362,9 @@ hprop_cli_queries = integrationWorkspace "cli-queries" $ \tempAbsBasePath' -> H. -- treasury H.noteM_ $ execCli' execConfig [ eraName, "query", "treasury" ] + TestQuerySPOStakeDistributionCmd -> do + pure () -- FIXME: https://github.com/IntersectMBO/cardano-node/pull/5932 + where -- | Wait for the part of the epoch when futurePParams are known waitForFuturePParamsToStabilise diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs index bd340d32e45..1a3e53b825c 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs @@ -17,8 +17,8 @@ import Cardano.Testnet import Prelude -import Control.Monad.Catch (MonadCatch) import Control.Monad (unless, void) +import Control.Monad.Catch (MonadCatch) import qualified Data.Text as Text import GHC.Stack (HasCallStack) import System.Exit @@ -95,7 +95,7 @@ doTreasuryDonation :: () -> Int -- ^ The amount to donate -> m () doTreasuryDonation sbe execConfig work epochStateView wallet0 idx currentTreasury' treasuryDonation = do - currentTreasury <- + currentTreasury <- case currentTreasury' of Nothing -> do v <- unCoin <$> getTreasuryValue epochStateView @@ -133,24 +133,24 @@ doTreasuryDonation sbe execConfig work epochStateView wallet0 idx currentTreasur -- greater or equal to zero. ct >= 0 && td >= 0 H.noteM_ $ execCli' execConfig - [ "conway", "transaction", "view" , "--tx-file", txBodyFp + [ "debug", "transaction", "view" , "--tx-file", txBodyFp , "--output-json", "--out-file", txViewFp] - + H.noteM_ $ execCli' execConfig [ "conway", "transaction", "sign" , "--tx-body-file", txBodyFp , "--signing-key-file", signingKeyFp $ paymentKeyInfoPair wallet0 , "--out-file", signedTxFp ] - + H.noteM_ $ execCli' execConfig - [ "conway", "transaction", "view" , "--tx-file", signedTxFp ] - + [ "debug", "transaction", "view" , "--tx-file", signedTxFp ] + H.noteM_ $ execCli' execConfig [ "conway", "transaction", "submit" , "--tx-file", signedTxFp ] - + void $ waitForEpochs epochStateView (EpochInterval 3) - + L.Coin finalTreasury <- getTreasuryValue epochStateView H.note_ $ "finalTreasury: " <> show finalTreasury finalTreasury H.=== (currentTreasury + toInteger treasuryDonation) diff --git a/flake.lock b/flake.lock index ac2e81adeba..116f013cd02 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1721831314, - "narHash": "sha256-I1j5HPSbbh3l1D0C9oP/59YB4e+64K9NDRl7ueD1c/Y=", + "lastModified": 1723719216, + "narHash": "sha256-0RCMUZu1YthjOJUT6JHCfwxLZVobhTzx17nK7U745/I=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "8815ee7598bc39a02db8896b788f69accf892790", + "rev": "e4cfce4c4612111b0b51567cb4445a7740303f0e", "type": "github" }, "original": { @@ -544,11 +544,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1719794527, - "narHash": "sha256-qHo/KumtwAzPkfLWODu/6EFY/LeK+C7iPJyAUdT8tGA=", + "lastModified": 1723681836, + "narHash": "sha256-xM2vL6GdCRnBvxUbQrDjTfCbFKrtX+b/Uy0Eg3Z+XHg=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "da2a3bc9bd1b3dd41bb147279529c471c615fd3e", + "rev": "227179361e9c1b2738aebab640fdf91e8846590b", "type": "github" }, "original": { diff --git a/nix/pkgs.nix b/nix/pkgs.nix index dd35d6b5999..7605f1312b9 100644 --- a/nix/pkgs.nix +++ b/nix/pkgs.nix @@ -111,6 +111,9 @@ in with final; }; cabal-plan = haskell-nix.tool compiler-nix-name "cabal-plan" { + cabalProjectLocal = '' + flags: +exe + ''; }; cardanolib-py = callPackage ./cardanolib-py { };