Skip to content

Commit c1a09fd

Browse files
committed
Updates for crypton/memory/ram changes
The package `crypton < 1.1` depends on `memory` and `>= 1.1` depends on `ram`. This does not affect `consensus` directly, but has a huge impact on the whole stack, `ledger`, `consensus` and `node` all need to be changed/fixed at once.
1 parent 28f235a commit c1a09fd

2 files changed

Lines changed: 32 additions & 1 deletion

File tree

cabal.project

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,23 @@ index-state:
2020

2121
packages: .
2222

23+
-- TEMPORARY: none of these packages touch `memory`/`crypton` directly, they
24+
-- just haven't widened their cardano-crypto-class upper bound past <2.6 yet,
25+
-- so relaxing the bound against their already-published code is safe (unlike
26+
-- the cardano-ledger-* packages, which would drag in an unreleased, version-
27+
-- skewed slice of that monorepo if done via a source-repository-package
28+
-- instead). Remove alongside the source-repository-package at the bottom
29+
-- of this file once upstream catches up.
30+
allow-newer:
31+
cardano-ledger-mary:cardano-crypto-class,
32+
cardano-ledger-shelley:cardano-crypto-class,
33+
cardano-ledger-binary:cardano-crypto-class,
34+
cardano-ledger-core:cardano-crypto-class,
35+
cardano-protocol:cardano-crypto-class,
36+
cardano-protocol-tpraos:cardano-crypto-class,
37+
kes-agent:cardano-crypto-class,
38+
kes-agent-crypto:cardano-crypto-class,
39+
2340
-- We want to always build the test-suites and benchmarks
2441
tests: true
2542
benchmarks: true
@@ -42,3 +59,17 @@ if os (windows)
4259

4360
constraints:
4461
tasty <1.5.4,
62+
63+
-- TEMPORARY: pulls in cardano-ledger PR #5999 (erikd/ram, not yet merged)
64+
-- https://github.com/IntersectMBO/cardano-ledger/pull/5999
65+
-- which switches cardano-crypto-wrapper from `memory` to `ram` (crypton
66+
-- >=1.1's replacement for `memory`), so it builds against crypton >=1.1.
67+
-- This is the only package in the chain that needs an actual source
68+
-- change; the allow-newer entries above cover everything else, which just
69+
-- has an overly conservative cardano-crypto-class upper bound. Remove once
70+
-- this PR (or an equivalent fix) is released.
71+
source-repository-package
72+
type: git
73+
location: https://github.com/IntersectMBO/cardano-ledger
74+
tag: 6def84b5ae0033053feda72f32b1dac41c812e0e
75+
subdir: eras/byron/crypto

ouroboros-consensus.cabal

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ library
357357
binary >=0.8 && <0.11,
358358
bytestring >=0.10 && <0.13,
359359
cardano-binary,
360-
cardano-crypto-class ^>=2.5,
360+
cardano-crypto-class ^>=2.5 || ^>=2.6,
361361
cardano-diffusion:api,
362362
cardano-ledger-binary ^>=1.9,
363363
cardano-ledger-core ^>=1.21,

0 commit comments

Comments
 (0)