From 7b0417dd91b0f1c260e5a2b0c4226bc066ef7112 Mon Sep 17 00:00:00 2001 From: Ana Pantilie Date: Mon, 16 Jun 2025 14:56:29 +0300 Subject: [PATCH 1/5] Add SRPs --- cabal.project | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/cabal.project b/cabal.project index de98dab224..def9d38bfb 100644 --- a/cabal.project +++ b/cabal.project @@ -10,6 +10,48 @@ repository cardano-haskell-packages c00aae8461a256275598500ea0e187588c35a5d5d7454fb57eac18d9edb86a56 d4a35cd3121aa00d18544bb0ac01c3e1691d618f462c46129271bccf39f7e8ee +source-repository-package + type: git + location: https://github.com/IntersectMBO/ouroboros-network + tag: 3e8d3b4b8c87ead794876c62d7fe25f32efb5142 + --sha256: sha256-uKrxpHhcNGzKUSeA4zIdkslfDFIJjkCsHUg+FUef1yE= + subdir: + ouroboros-network-api + +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-ledger + tag: 651e1dd0a43422f01ca43e5ae0ead587e748ccf5 + --sha256: sha256-5cIcFcsvbMwpNQBrothZQC4j+rWjMK3vqPC4lntZ+4c= + subdir: + eras/allegra/impl + eras/alonzo/impl + eras/alonzo/test-suite + eras/babbage/impl + eras/babbage/test-suite + eras/byron/chain/executable-spec + eras/byron/crypto + eras/byron/ledger/executable-spec + eras/byron/ledger/impl + eras/conway/impl + eras/conway/test-suite + eras/dijkstra + eras/mary/impl + eras/shelley/impl + eras/shelley-ma/test-suite + eras/shelley/test-suite + libs/cardano-data + libs/cardano-ledger-api + libs/cardano-ledger-binary + libs/cardano-ledger-core + libs/cardano-ledger-test + libs/cardano-protocol-tpraos + libs/constrained-generators + libs/non-integral + libs/set-algebra + libs/small-steps + libs/vector-map + -- See CONTRIBUTING for some Nix commands you will need to run if you -- update either of these. index-state: @@ -96,4 +138,4 @@ source-repository-package libs/non-integral libs/set-algebra libs/small-steps - libs/vector-map + libs/vector-map \ No newline at end of file From 398af892bbabde8b9e6688114922f9ecc7d98032 Mon Sep 17 00:00:00 2001 From: Ana Pantilie Date: Mon, 16 Jun 2025 17:03:29 +0300 Subject: [PATCH 2/5] Fix SRPs --- cabal.project | 1 - 1 file changed, 1 deletion(-) diff --git a/cabal.project b/cabal.project index def9d38bfb..9f36f9e551 100644 --- a/cabal.project +++ b/cabal.project @@ -35,7 +35,6 @@ source-repository-package eras/byron/ledger/impl eras/conway/impl eras/conway/test-suite - eras/dijkstra eras/mary/impl eras/shelley/impl eras/shelley-ma/test-suite From 9ba395def1747d570355a57cc255d23847c92124 Mon Sep 17 00:00:00 2001 From: Ana Pantilie Date: Mon, 16 Jun 2025 17:52:55 +0300 Subject: [PATCH 3/5] Bugfix: remove incorrect additional SRP --- cabal.project | 44 ++------------------------------------------ 1 file changed, 2 insertions(+), 42 deletions(-) diff --git a/cabal.project b/cabal.project index 9f36f9e551..c849919108 100644 --- a/cabal.project +++ b/cabal.project @@ -35,6 +35,7 @@ source-repository-package eras/byron/ledger/impl eras/conway/impl eras/conway/test-suite + eras/dijkstra eras/mary/impl eras/shelley/impl eras/shelley-ma/test-suite @@ -96,45 +97,4 @@ if impl (ghc >= 9.12) , ouroboros-network:base -- https://github.com/kapralVV/Unique/issues/11 - , Unique:hashable - -source-repository-package - type: git - location: https://github.com/IntersectMBO/ouroboros-network - tag: 3e8d3b4b8c87ead794876c62d7fe25f32efb5142 - --sha256: 08fpkx3iagj83nn413h9a865zjcj3lrf7017a756qd2wg2jg3amq - subdir: - ouroboros-network-api - -source-repository-package - type: git - location: https://github.com/IntersectMBO/cardano-ledger - tag: b44ce911475794a15f908ad27a6f497d6a27e8ba - --sha256: sha256-MXaVKKH9siUsmOnJmYyL6if48dx11zugux7AWGPABfA= - subdir: - eras/allegra/impl - eras/alonzo/impl - eras/alonzo/test-suite - eras/babbage/impl - eras/babbage/test-suite - eras/byron/chain/executable-spec - eras/byron/crypto - eras/byron/ledger/executable-spec - eras/byron/ledger/impl - eras/conway/impl - eras/conway/test-suite - eras/mary/impl - eras/shelley/impl - eras/shelley-ma/test-suite - eras/shelley/test-suite - libs/cardano-data - libs/cardano-ledger-api - libs/cardano-ledger-binary - libs/cardano-ledger-core - libs/cardano-ledger-test - libs/cardano-protocol-tpraos - libs/constrained-generators - libs/non-integral - libs/set-algebra - libs/small-steps - libs/vector-map \ No newline at end of file + , Unique:hashable \ No newline at end of file From 3eb8e6566e75f49409009048d545ef93a07a732e Mon Sep 17 00:00:00 2001 From: Ana Pantilie Date: Mon, 16 Jun 2025 18:38:47 +0300 Subject: [PATCH 4/5] Fix compile errors, add type sigs --- .../Ouroboros/Consensus/Cardano/Node.hs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs index 33b8a12dde..07772d650c 100644 --- a/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs +++ b/ouroboros-consensus-cardano/src/ouroboros-consensus-cardano/Ouroboros/Consensus/Cardano/Node.hs @@ -562,12 +562,20 @@ protocolInfoCardano paramsCardano , shelleyBasedLeaderCredentials = credssShelleyBased } = shelleyBasedProtocolParams + transitionConfigShelley :: L.TransitionConfig ShelleyEra transitionConfigShelley = transitionConfigAllegra ^. L.tcPreviousEraConfigL + transitionConfigAllegra :: L.TransitionConfig AllegraEra transitionConfigAllegra = transitionConfigMary ^. L.tcPreviousEraConfigL + transitionConfigMary :: L.TransitionConfig MaryEra transitionConfigMary = transitionConfigAlonzo ^. L.tcPreviousEraConfigL + transitionConfigAlonzo :: L.TransitionConfig AlonzoEra transitionConfigAlonzo = transitionConfigBabbage ^. L.tcPreviousEraConfigL + transitionConfigBabbage :: L.TransitionConfig BabbageEra transitionConfigBabbage = transitionConfigConway ^. L.tcPreviousEraConfigL - transitionConfigConway = cardanoLedgerTransitionConfig + transitionConfigConway :: L.TransitionConfig ConwayEra + transitionConfigConway = transitionConfigDijkstra ^. L.tcPreviousEraConfigL + transitionConfigDijkstra :: L.TransitionConfig L.DijkstraEra + transitionConfigDijkstra = cardanoLedgerTransitionConfig -- The major protocol version of the last era is the maximum major protocol -- version we support. From c982eb9ef4d2fb561f1c17fbefacb2bcaef0646d Mon Sep 17 00:00:00 2001 From: Ana Pantilie Date: Mon, 16 Jun 2025 19:04:49 +0300 Subject: [PATCH 5/5] Regenerate golden files --- .../Result_Allegra_MaxMajorProtocolVersion | 2 +- .../Result_Alonzo_MaxMajorProtocolVersion | 2 +- .../Result_Babbage_MaxMajorProtocolVersion | 2 +- .../Result_Conway_MaxMajorProtocolVersion | 2 +- .../Result_Mary_MaxMajorProtocolVersion | 2 +- .../Result_Shelley_MaxMajorProtocolVersion | 2 +- .../ShelleyNodeToClientVersion13/Result_MaxMajorProtocolVersion | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_MaxMajorProtocolVersion b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_MaxMajorProtocolVersion index 9d8dfa9eaf..faa05863ba 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_MaxMajorProtocolVersion +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Allegra_MaxMajorProtocolVersion @@ -1 +1 @@ -� \ No newline at end of file +� \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_MaxMajorProtocolVersion b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_MaxMajorProtocolVersion index 9d8dfa9eaf..faa05863ba 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_MaxMajorProtocolVersion +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Alonzo_MaxMajorProtocolVersion @@ -1 +1 @@ -� \ No newline at end of file +� \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_MaxMajorProtocolVersion b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_MaxMajorProtocolVersion index 9d8dfa9eaf..faa05863ba 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_MaxMajorProtocolVersion +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Babbage_MaxMajorProtocolVersion @@ -1 +1 @@ -� \ No newline at end of file +� \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_MaxMajorProtocolVersion b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_MaxMajorProtocolVersion index 9d8dfa9eaf..faa05863ba 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_MaxMajorProtocolVersion +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Conway_MaxMajorProtocolVersion @@ -1 +1 @@ -� \ No newline at end of file +� \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_MaxMajorProtocolVersion b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_MaxMajorProtocolVersion index 9d8dfa9eaf..faa05863ba 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_MaxMajorProtocolVersion +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Mary_MaxMajorProtocolVersion @@ -1 +1 @@ -� \ No newline at end of file +� \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_MaxMajorProtocolVersion b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_MaxMajorProtocolVersion index 9d8dfa9eaf..faa05863ba 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_MaxMajorProtocolVersion +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion3/CardanoNodeToClientVersion17/Result_Shelley_MaxMajorProtocolVersion @@ -1 +1 @@ -� \ No newline at end of file +� \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion3/ShelleyNodeToClientVersion13/Result_MaxMajorProtocolVersion b/ouroboros-consensus-cardano/golden/shelley/QueryVersion3/ShelleyNodeToClientVersion13/Result_MaxMajorProtocolVersion index 8214d0ee07..67c3297611 100644 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion3/ShelleyNodeToClientVersion13/Result_MaxMajorProtocolVersion +++ b/ouroboros-consensus-cardano/golden/shelley/QueryVersion3/ShelleyNodeToClientVersion13/Result_MaxMajorProtocolVersion @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file