diff --git a/cabal.project b/cabal.project index b0999ca8c0..d35a4321a4 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 2025-09-24T20:00:55Z - , cardano-haskell-packages 2025-10-23T12:06:55Z + , hackage.haskell.org 2025-10-23T13:39:53Z + , cardano-haskell-packages 2025-10-24T10:49:53Z packages: cardano-cli @@ -58,11 +58,64 @@ semaphore: True -- Always write GHC env files, because they are needed for ghci. write-ghc-environment-files: always -if impl (ghc >= 9.12) - allow-newer: - -- https://github.com/kapralVV/Unique/issues/11 - , Unique:hashable - -- IMPORTANT -- Do NOT add more source-repository-package stanzas here unless they are strictly -- temporary! Please read the section in CONTRIBUTING about updating dependencies. + +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-api + tag: f817a055a5b7076e84404d39e8addd6456aa6fa1 + --sha256: 1rqkyssxs6bcnjk7wai69383m4dwc1kapmm26pda9v1w5xqi76jg + subdir: + cardano-api + +source-repository-package + type: git + location: https://github.com/IntersectMBO/ouroboros-consensus + tag: 513d27d99b2486bf16d44a9f845ddb358244673f + --sha256: 0brlyrvhqxcpya6frx1w5bwbpz5bjjsvxm26951vf2lxah8rx8hp + subdir: + ouroboros-consensus + ouroboros-consensus-cardano + ouroboros-consensus-diffusion + +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-ledger + tag: fb09078fa55015c881303a2ddb609c024cec258f + --sha256: sha256-9Y9CRiyMn0AWD+C4aNVMaJgrj3FDAYfCX4VrLvtoMaI= + subdir: + eras/allegra/impl + eras/alonzo/impl + eras/alonzo/test-suite + eras/babbage/impl + eras/conway/impl + eras/dijkstra/impl + eras/mary/impl + eras/shelley/impl + eras/shelley/test-suite + eras/shelley-ma/test-suite + libs/cardano-ledger-api + libs/cardano-ledger-core + libs/cardano-ledger-binary + libs/cardano-protocol-tpraos + libs/non-integral + libs/small-steps + libs/cardano-data + libs/set-algebra + libs/vector-map + eras/byron/chain/executable-spec + eras/byron/ledger/executable-spec + eras/byron/ledger/impl + eras/byron/crypto + +-- Backported version of https://github.com/IntersectMBO/ouroboros-network/pull/5161 +source-repository-package + type: git + location: https://github.com/IntersectMBO/ouroboros-network + tag: 1385b53cefb81e79553b6b0252537455833ea9c4 + --sha256: sha256-zZ7WsMfRs1fG16bmvI5vIh4fhQ8RGyEvYGLSWlrxpg0= + subdir: + ouroboros-network-api + ouroboros-network diff --git a/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs b/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs index b8061e3391..04dc3e9416 100644 --- a/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs +++ b/cardano-cli/src/Cardano/CLI/EraBased/Script/Certificate/Read.hs @@ -26,6 +26,7 @@ import Cardano.CLI.Orphan () import Cardano.CLI.Read import Cardano.CLI.Type.Common (CertificateFile) import Cardano.Ledger.Core qualified as L +import Cardano.Ledger.Dijkstra.Scripts qualified as Dijkstra import Cardano.Ledger.Plutus.Language qualified as L import Cardano.Ledger.Plutus.Language qualified as Plutus @@ -125,8 +126,9 @@ convertTotimelock -> Api.Script Api.SimpleScript' -> SimpleScript (LedgerEra era) convertTotimelock era (Api.SimpleScript s) = - let native :: L.NativeScript (LedgerEra era) = obtainCommonConstraints era $ Api.toAllegraTimelock s - in obtainCommonConstraints era $ SimpleScript native + obtainCommonConstraints era $ case era of + ConwayEra -> SimpleScript $ Api.toAllegraTimelock @(LedgerEra ConwayEra) s + DijkstraEra -> SimpleScript $ Dijkstra.upgradeTimelock $ Api.toAllegraTimelock @(LedgerEra ConwayEra) s readCertificateScriptWitnesses :: IsEra era diff --git a/flake.lock b/flake.lock index beb5add91b..6ff16b0185 100644 --- a/flake.lock +++ b/flake.lock @@ -189,11 +189,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1761179141, - "narHash": "sha256-2nwS7LnNiJZReuVDqVenRnB3akEvZoYIXOuj5o8pMNU=", + "lastModified": 1761747429, + "narHash": "sha256-IiiJK9IDV176KId+hdcf02pDvQc4thp+1DFIFH64kdw=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "ee35b054b94e945f0528ceb01fedd737b7064e58", + "rev": "58e6659ae6f2ba5c0fc4e7e8a985c65d03eaf7aa", "type": "github" }, "original": {