From 95d3907e44a059b7ee1dd27610f168637b754bd4 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Thu, 31 Oct 2024 16:31:40 +1100 Subject: [PATCH] Switch from cryptonite to crypton The former is deprecated in favor of the latter which is is drop in replacement. This change also requires a bump in the major version of `cardano-crypto-class` and related packages from `2.1.*` to `2.2.*`. No changes are required in Plutus for this change, but `cardano-ledger` does not currently support `2.2.*`. --- cabal.project | 28 ++++++++++++++----- doc/notes/model/UTxO.hsproj/UTxO.cabal | 2 +- plutus-benchmark/plutus-benchmark.cabal | 2 +- .../changelog.d/20241023_153400_cryptonite.md | 3 ++ plutus-core/plutus-core.cabal | 4 +-- .../changelog.d/20241023_153400_cryptonite.md | 3 ++ plutus-metatheory/plutus-metatheory.cabal | 2 +- 7 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 plutus-core/changelog.d/20241023_153400_cryptonite.md create mode 100644 plutus-metatheory/changelog.d/20241023_153400_cryptonite.md diff --git a/cabal.project b/cabal.project index 166f9349957..b18d1312ee1 100644 --- a/cabal.project +++ b/cabal.project @@ -14,9 +14,9 @@ repository cardano-haskell-packages -- update either of these. index-state: -- Bump both the following dates if you need newer packages from Hackage - , hackage.haskell.org 2024-10-16T00:00:00Z + , hackage.haskell.org 2024-10-20T22:07:04Z -- Bump this if you need newer packages from CHaP - , cardano-haskell-packages 2024-10-16T00:00:00Z + , cardano-haskell-packages 2024-10-10T04:22:19Z packages: cardano-constitution plutus-benchmark @@ -99,9 +99,23 @@ allow-newer: -- allow-older: *:nothunks -- ------------------------------------------------------------------------------------------------- --- Following currently required for building with ghc-9.10. +-- The following two SRPs do two things: +-- * switch from cryptonite package (deprecated) to crypton (drop in replacement) +-- * New major version of cardano-crypto-class which is incompatible with current +-- cardano-ledger@master -constraints: - -- The API has changed for version 2.2, ledger depends on the old version and ledger will not - -- be updated until after the Conway release. - , cardano-crypto-class ^>= 2.1 +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-crypto + tag: 790a3027a210ed3684ea9ffa1da504873d96b7de + --sha256: 1wlyvqgaf4gwzp80gpf334dwpcq2vbgywv2r31mk0iy469n1slbi + +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-base + tag: 843454149d7b18f145fb168176274e659df27caf + --sha256: 18p7ylrhq0p59189fh4aby2gjl812n74inwydqvkhpdj46dzf8zs + subdir: + cardano-crypto-class + cardano-crypto-tests + cardano-mempool diff --git a/doc/notes/model/UTxO.hsproj/UTxO.cabal b/doc/notes/model/UTxO.hsproj/UTxO.cabal index 688ad93633c..2fd16637825 100644 --- a/doc/notes/model/UTxO.hsproj/UTxO.cabal +++ b/doc/notes/model/UTxO.hsproj/UTxO.cabal @@ -21,7 +21,7 @@ executable UTxO , bytestring , containers , cryptohash - , cryptonite + , crypton , hashable , memory , template-haskell diff --git a/plutus-benchmark/plutus-benchmark.cabal b/plutus-benchmark/plutus-benchmark.cabal index 668f5858a06..2a460d1b022 100644 --- a/plutus-benchmark/plutus-benchmark.cabal +++ b/plutus-benchmark/plutus-benchmark.cabal @@ -482,7 +482,7 @@ library marlowe-internal build-depends: , base , bytestring - , cardano-crypto-class >=2.1.5 && <2.3 + , cardano-crypto-class , directory , filepath , mtl diff --git a/plutus-core/changelog.d/20241023_153400_cryptonite.md b/plutus-core/changelog.d/20241023_153400_cryptonite.md new file mode 100644 index 00000000000..198168e9cc8 --- /dev/null +++ b/plutus-core/changelog.d/20241023_153400_cryptonite.md @@ -0,0 +1,3 @@ +### Added + +- Switch from `cryptonite` library to `crypton` (a drop in replacement). diff --git a/plutus-core/plutus-core.cabal b/plutus-core/plutus-core.cabal index 8469b892f22..508054c4a81 100644 --- a/plutus-core/plutus-core.cabal +++ b/plutus-core/plutus-core.cabal @@ -293,12 +293,12 @@ library , bytestring , bytestring-strict-builder , cardano-crypto - , cardano-crypto-class ^>=2.1.5 + , cardano-crypto-class ^>=2.2 , cassava , cborg , composition-prelude >=1.1.0.1 , containers - , cryptonite + , crypton , data-default-class , deepseq , dependent-sum >=0.7.1.0 diff --git a/plutus-metatheory/changelog.d/20241023_153400_cryptonite.md b/plutus-metatheory/changelog.d/20241023_153400_cryptonite.md new file mode 100644 index 00000000000..198168e9cc8 --- /dev/null +++ b/plutus-metatheory/changelog.d/20241023_153400_cryptonite.md @@ -0,0 +1,3 @@ +### Added + +- Switch from `cryptonite` library to `crypton` (a drop in replacement). diff --git a/plutus-metatheory/plutus-metatheory.cabal b/plutus-metatheory/plutus-metatheory.cabal index be0c4f437d9..b4bb2c93e2e 100644 --- a/plutus-metatheory/plutus-metatheory.cabal +++ b/plutus-metatheory/plutus-metatheory.cabal @@ -59,7 +59,7 @@ library , base , bytestring , composition-prelude - , cryptonite + , crypton , extra , filepath , ghc-prim