Skip to content

Commit 6691afc

Browse files
committed
Update to LSM
1 parent a4e098a commit 6691afc

File tree

2 files changed

+71
-7
lines changed

2 files changed

+71
-7
lines changed

cabal.project

Lines changed: 67 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,73 @@ semaphore: True
5858
-- Always write GHC env files, because they are needed for ghci.
5959
write-ghc-environment-files: always
6060

61-
if impl (ghc >= 9.12)
62-
allow-newer:
63-
-- https://github.com/kapralVV/Unique/issues/11
64-
, Unique:hashable
65-
6661
-- IMPORTANT
6762
-- Do NOT add more source-repository-package stanzas here unless they are strictly
6863
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.
64+
65+
source-repository-package
66+
type: git
67+
location: https://github.com/IntersectMBO/cardano-api
68+
tag: 58941c7b1e71be38a3ba63a1b815ac386574287e
69+
--sha256: sha256-D/+yB+jclri/K5XPrM+ygBrN5bUizamX+zNeE5AqWpI=
70+
subdir:
71+
cardano-api
72+
73+
source-repository-package
74+
type: git
75+
location: https://github.com/IntersectMBO/ouroboros-consensus
76+
tag: 41f32e52644aa168c4f4d4ef645ed6c3ec2ecfd6
77+
--sha256: sha256-4ukkuRURJ24nXN+sfbFrDr0aYc1SPFvQO0XCVJuQris=
78+
subdir:
79+
ouroboros-consensus
80+
ouroboros-consensus-cardano
81+
ouroboros-consensus-diffusion
82+
83+
source-repository-package
84+
type: git
85+
location: https://github.com/IntersectMBO/cardano-ledger
86+
tag: fb09078fa55015c881303a2ddb609c024cec258f
87+
--sha256: sha256-9Y9CRiyMn0AWD+C4aNVMaJgrj3FDAYfCX4VrLvtoMaI=
88+
subdir:
89+
eras/allegra/impl
90+
eras/alonzo/impl
91+
eras/alonzo/test-suite
92+
eras/babbage/impl
93+
eras/conway/impl
94+
eras/dijkstra/impl
95+
eras/mary/impl
96+
eras/shelley/impl
97+
eras/shelley/test-suite
98+
eras/shelley-ma/test-suite
99+
libs/cardano-ledger-api
100+
libs/cardano-ledger-core
101+
libs/cardano-ledger-binary
102+
libs/cardano-protocol-tpraos
103+
libs/non-integral
104+
libs/small-steps
105+
libs/cardano-data
106+
libs/set-algebra
107+
libs/vector-map
108+
eras/byron/chain/executable-spec
109+
eras/byron/ledger/executable-spec
110+
eras/byron/ledger/impl
111+
eras/byron/crypto
112+
113+
-- Backported version of https://github.com/IntersectMBO/ouroboros-network/pull/5161
114+
source-repository-package
115+
type: git
116+
location: https://github.com/IntersectMBO/ouroboros-network
117+
tag: dfcb1f9c578ec8cd5114fea9696e7be6c9001323
118+
--sha256: sha256-omXPdi/T/f3gq9rOH20zX+x3WvaxlB704g07RF/13Nk=
119+
subdir:
120+
ouroboros-network-api
121+
ouroboros-network
122+
123+
source-repository-package
124+
type: git
125+
location: https://github.com/IntersectMBO/lsm-tree
126+
tag: 3c51ea5ac6400f32a7bdf17260325d4d0a360a98
127+
--sha256: sha256-44SHqtAciPhoI6ysLt8RdNvlVvN91GWHMnr68vOU2gQ=
128+
subdir:
129+
lsm-tree
130+
blockio

cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import Cardano.CLI.Orphan ()
2626
import Cardano.CLI.Read
2727
import Cardano.CLI.Type.Common (CertificateFile)
2828
import Cardano.Ledger.Core qualified as L
29+
import Cardano.Ledger.Dijkstra.Scripts qualified as Dijkstra
2930
import Cardano.Ledger.Plutus.Language qualified as L
3031
import Cardano.Ledger.Plutus.Language qualified as Plutus
3132

@@ -125,8 +126,9 @@ convertTotimelock
125126
-> Api.Script Api.SimpleScript'
126127
-> SimpleScript (LedgerEra era)
127128
convertTotimelock era (Api.SimpleScript s) =
128-
let native :: L.NativeScript (LedgerEra era) = obtainCommonConstraints era $ Api.toAllegraTimelock s
129-
in obtainCommonConstraints era $ SimpleScript native
129+
obtainCommonConstraints era $ case era of
130+
ConwayEra -> SimpleScript $ Api.toAllegraTimelock @(LedgerEra ConwayEra) s
131+
DijkstraEra -> SimpleScript $ Dijkstra.upgradeTimelock $ Api.toAllegraTimelock @(LedgerEra ConwayEra) s
130132

131133
readCertificateScriptWitnesses
132134
:: IsEra era

0 commit comments

Comments
 (0)