diff --git a/cabal.project b/cabal.project index 8c52a6fbce..4b47549119 100644 --- a/cabal.project +++ b/cabal.project @@ -14,9 +14,9 @@ repository cardano-haskell-packages -- update either of these. index-state: -- Bump this if you need newer packages from Hackage - , hackage.haskell.org 2024-03-26T06:28:59Z + , hackage.haskell.org 2024-06-13T08:49:27Z -- Bump this if you need newer packages from CHaP - , cardano-haskell-packages 2024-05-13T13:19:15Z + , cardano-haskell-packages 2024-06-12T11:52:25Z packages: ouroboros-consensus @@ -39,9 +39,33 @@ if(os(windows)) source-repository-package type: git - location: https://github.com/IntersectMBO/ouroboros-network - tag: 431bb599940d2947b2cb99d3ae29b7f2c4cdd36d - --sha256: 1a62hqddpnc0j5r7nl54q79nrxyw77dphpsgp68hxij210dkpvca + location: https://github.com/IntersectMBO/cardano-ledger + tag: 24ea3f8546a81fad8acc74f06ef005a2b9f22215 + --sha256: sha256-rUp1QfhpWCdz8l00b31kEiTHdUyJAlk5eYX/o1MN1SA= subdir: - ouroboros-network-api - ouroboros-network-protocols + eras/alonzo/impl + eras/alonzo/test-suite + eras/allegra/impl + eras/babbage/impl + eras/babbage/test-suite + eras/byron/chain/executable-spec + eras/byron/crypto + eras/byron/crypto/test + eras/byron/ledger/executable-spec + eras/byron/ledger/impl + eras/byron/ledger/impl/test + eras/conway/impl + eras/conway/test-suite + eras/mary/impl + eras/shelley-ma/test-suite + eras/shelley/impl + eras/shelley/test-suite + libs/cardano-data + libs/cardano-ledger-api + libs/cardano-ledger-binary + libs/cardano-ledger-core + libs/cardano-protocol-tpraos + libs/non-integral + libs/set-algebra + libs/small-steps + libs/vector-map diff --git a/flake.lock b/flake.lock index 5b4a0a346c..7de9381114 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1715619218, - "narHash": "sha256-58wEsjSTPfiiwhsNUg35Rpdbh5kGxze9Ah4SjhS2jBM=", + "lastModified": 1718200515, + "narHash": "sha256-LhZDhH/Ii4X7r+bo7LGC+Q//OiUJ8uRwCJ5ULNpbj00=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "09e678bc2be4bc64304225c4906d2bb6973f28ae", + "rev": "b731179078dc9960d68c3d0297d1c26f69e33614", "type": "github" }, "original": { @@ -258,11 +258,11 @@ "hackageNix": { "flake": false, "locked": { - "lastModified": 1717115116, - "narHash": "sha256-V41ZuxYDAaN+H9kuREzeL/Pet00MRuHwxYOxs3ti2os=", + "lastModified": 1717634229, + "narHash": "sha256-abhqF6hO86Mh8B57994sMUpm88Iez6G7NgZUXyIA+YQ=", "owner": "input-output-hk", "repo": "hackage.nix", - "rev": "724171a4419f1f91dae5febfd2606ef440a3f9ae", + "rev": "b8f5acedd1d963ba04c282fc742c7557057b7f26", "type": "github" }, "original": { diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Allegra_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Allegra_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Allegra_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Alonzo_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Alonzo_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Alonzo_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Mary_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Mary_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Mary_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Shelley_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Shelley_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion1/CardanoNodeToClientVersion7/Result_Shelley_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Allegra_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Allegra_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Allegra_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Alonzo_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Alonzo_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Alonzo_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Babbage_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Babbage_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Babbage_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Babbage_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Mary_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Mary_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Mary_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Shelley_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Shelley_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion10/Result_Shelley_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Allegra_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Alonzo_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Babbage_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Mary_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion11/Result_Shelley_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/ApplyTxErr_Conway b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/ApplyTxErr_Conway index 6b75a8ce1b..7e36ce4445 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/ApplyTxErr_Conway and b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/ApplyTxErr_Conway differ diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Allegra_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Allegra_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Allegra_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Alonzo_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Alonzo_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Alonzo_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Babbage_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Babbage_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Babbage_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Babbage_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Conway_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Conway_StakeDistribution index 967baf0b47..4f8aa309f9 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Conway_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Conway_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Mary_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Mary_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Mary_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Shelley_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Shelley_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion12/Result_Shelley_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Allegra_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Allegra_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Allegra_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Alonzo_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Alonzo_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Alonzo_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Mary_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Mary_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Mary_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Shelley_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Shelley_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion7/Result_Shelley_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Allegra_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Allegra_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Allegra_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Alonzo_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Alonzo_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Alonzo_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Mary_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Mary_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Mary_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Shelley_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Shelley_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion8/Result_Shelley_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Allegra_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Allegra_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Allegra_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Allegra_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Alonzo_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Alonzo_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Alonzo_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Alonzo_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Babbage_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Babbage_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Babbage_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Babbage_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Mary_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Mary_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Mary_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Mary_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Shelley_StakeDistribution b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Shelley_StakeDistribution index 968f15663d..016c85886a 100644 --- a/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Shelley_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/cardano/QueryVersion2/CardanoNodeToClientVersion9/Result_Shelley_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Allegra b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Allegra index 96db43e09a..5e1e93ee16 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Allegra and b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Allegra differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Alonzo b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Alonzo index 88c1938b82..9b3b8222d2 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Alonzo and b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Alonzo differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Babbage b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Babbage index a067fd47b4..6c112a7bdf 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Babbage and b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Babbage differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Conway b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Conway index f64a5f6769..25ee104e81 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Conway and b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Conway differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Mary b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Mary index 0932d79413..9299407584 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Mary and b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Mary differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Shelley b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Shelley index f73ded9153..11e3467145 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Shelley and b/ouroboros-consensus-cardano/golden/cardano/disk/ExtLedgerState_Shelley differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Allegra b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Allegra index a0e4d91ee7..144b068fcf 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Allegra and b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Allegra differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Alonzo b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Alonzo index a3e3fe6b2b..48ed5a3479 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Alonzo and b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Alonzo differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Babbage b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Babbage index 76707c4e30..9e6ab5a053 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Babbage and b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Babbage differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Conway b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Conway index a163e169ee..5960577b8c 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Conway and b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Conway differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Mary b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Mary index 243ff6660c..a1a8d8fe2b 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Mary and b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Mary differ diff --git a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Shelley b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Shelley index 44878cf599..f313d047f6 100644 Binary files a/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Shelley and b/ouroboros-consensus-cardano/golden/cardano/disk/LedgerState_Shelley differ diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion1/ShelleyNodeToClientVersion5/Result_StakeDistribution b/ouroboros-consensus-cardano/golden/shelley/QueryVersion1/ShelleyNodeToClientVersion5/Result_StakeDistribution index 12f9add46f..e57082c051 100644 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion1/ShelleyNodeToClientVersion5/Result_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/shelley/QueryVersion1/ShelleyNodeToClientVersion5/Result_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion5/Result_StakeDistribution b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion5/Result_StakeDistribution index 12f9add46f..e57082c051 100644 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion5/Result_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion5/Result_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion6/Result_StakeDistribution b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion6/Result_StakeDistribution index 12f9add46f..e57082c051 100644 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion6/Result_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion6/Result_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion7/Result_StakeDistribution b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion7/Result_StakeDistribution index 12f9add46f..e57082c051 100644 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion7/Result_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion7/Result_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion8/Result_StakeDistribution b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion8/Result_StakeDistribution index 12f9add46f..e57082c051 100644 --- a/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion8/Result_StakeDistribution +++ b/ouroboros-consensus-cardano/golden/shelley/QueryVersion2/ShelleyNodeToClientVersion8/Result_StakeDistribution @@ -1 +1 @@ -X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file +X1s]k?ժP[{%AX -ò^46R>Žb{L \ No newline at end of file diff --git a/ouroboros-consensus-cardano/golden/shelley/disk/ExtLedgerState b/ouroboros-consensus-cardano/golden/shelley/disk/ExtLedgerState index 1bdc5f58eb..958e4b0f9d 100644 Binary files a/ouroboros-consensus-cardano/golden/shelley/disk/ExtLedgerState and b/ouroboros-consensus-cardano/golden/shelley/disk/ExtLedgerState differ diff --git a/ouroboros-consensus-cardano/golden/shelley/disk/LedgerState b/ouroboros-consensus-cardano/golden/shelley/disk/LedgerState index 8ba33878f7..1f49b6d718 100644 Binary files a/ouroboros-consensus-cardano/golden/shelley/disk/LedgerState and b/ouroboros-consensus-cardano/golden/shelley/disk/LedgerState differ diff --git a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal index 03997ad8fd..3a47c4fc99 100644 --- a/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal +++ b/ouroboros-consensus-cardano/ouroboros-consensus-cardano.cabal @@ -133,16 +133,16 @@ library cardano-crypto, cardano-crypto-class, cardano-crypto-wrapper, - cardano-ledger-allegra ^>=1.4, - cardano-ledger-alonzo ^>=1.8, - cardano-ledger-api ^>=1.9, - cardano-ledger-babbage ^>=1.8, - cardano-ledger-binary ^>=1.3, - cardano-ledger-byron ^>=1.0, - cardano-ledger-conway ^>=1.14, - cardano-ledger-core ^>=1.12, - cardano-ledger-mary ^>=1.6, - cardano-ledger-shelley ^>=1.11, + cardano-ledger-allegra ^>=1.5.0.0, + cardano-ledger-alonzo ^>=1.8.1.0, + cardano-ledger-api ^>=1.9.2.0, + cardano-ledger-babbage ^>=1.8.1.0, + cardano-ledger-binary ^>=1.3.3.0, + cardano-ledger-byron ^>=1.0.1.0, + cardano-ledger-conway ^>=1.15.0.0, + cardano-ledger-core ^>=1.13.0.0, + cardano-ledger-mary ^>=1.6.1.0, + cardano-ledger-shelley ^>=1.12.0.0, cardano-prelude, cardano-protocol-tpraos ^>=1.2, cardano-slotting, @@ -158,7 +158,7 @@ library nothunks, ouroboros-consensus ^>=0.18, ouroboros-consensus-protocol ^>=0.9, - ouroboros-network-api ^>=0.7, + ouroboros-network-api ^>=0.7.3, serialise ^>=0.2, small-steps, sop-core ^>=0.5, @@ -538,7 +538,7 @@ library unstable-cardano-tools contra-tracer, directory, filepath, - fs-api ^>=0.2, + fs-api ^>=0.2.0.1, githash, microlens, mtl, @@ -550,7 +550,7 @@ library unstable-cardano-tools ouroboros-consensus-protocol ^>=0.9, ouroboros-network, ouroboros-network-api, - ouroboros-network-framework, + ouroboros-network-framework ^>=0.13.2, ouroboros-network-protocols, serialise ^>=0.2, sop-core, diff --git a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal index 26c461887c..e6d9c22950 100644 --- a/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal +++ b/ouroboros-consensus-diffusion/ouroboros-consensus-diffusion.cabal @@ -84,20 +84,21 @@ library contra-tracer, deepseq, filepath, - fs-api ^>=0.2, + fs-api ^>=0.2.0.1, hashable, - io-classes ^>=1.4.1, + io-classes ^>=1.5, + io-classes ^>=1.5, mtl, ouroboros-consensus ^>=0.18, ouroboros-network ^>=0.16, - ouroboros-network-api ^>=0.7.2, - ouroboros-network-framework ^>=0.13, - ouroboros-network-protocols ^>=0.8.1, + ouroboros-network-api ^>=0.7.3, + ouroboros-network-framework ^>=0.13.2, + ouroboros-network-protocols ^>=0.9, random, safe-wild-cards ^>=1.0, serialise ^>=0.2, - si-timers ^>=1.4, - strict-stm ^>=1.4, + si-timers ^>=1.5, + strict-stm ^>=1.5, text, time, transformers, @@ -133,7 +134,7 @@ library unstable-diffusion-testlib containers, contra-tracer, fgl, - fs-sim ^>=0.2, + fs-sim ^>=0.2.1.1, graphviz >=2999.20.1.0, io-classes, io-sim, @@ -278,8 +279,8 @@ test-suite consensus-test containers, contra-tracer, directory, - fs-api ^>=0.2, - fs-sim ^>=0.2, + fs-api ^>=0.2.0.1, + fs-sim ^>=0.2.1.1, hashable, io-classes, io-sim, diff --git a/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos.hs b/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos.hs index 7679f81398..6d44d49fc6 100644 --- a/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos.hs +++ b/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/Praos.hs @@ -524,7 +524,7 @@ meetsLeaderThreshold r (praosLeaderF praosParams) where - SL.PoolDistr poolDistr = lvPoolDistr + SL.PoolDistr poolDistr _totalActiveStake = lvPoolDistr r = maybe 0 SL.individualPoolStake $ Map.lookup keyHash poolDistr @@ -538,10 +538,10 @@ validateVRFSignature :: ActiveSlotCoeff -> Views.HeaderView c -> Except (PraosValidationErr c) () -validateVRFSignature eta0 (Views.lvPoolDistr -> SL.PoolDistr pd) f b = do +validateVRFSignature eta0 (Views.lvPoolDistr -> SL.PoolDistr pd _) f b = do case Map.lookup hk pd of Nothing -> throwError $ VRFKeyUnknown hk - Just (IndividualPoolStake sigma vrfHK) -> do + Just (IndividualPoolStake sigma _totalPoolStake vrfHK) -> do vrfHK == hashVerKeyVRF vrfK ?! VRFKeyWrongVRFKey hk vrfHK (hashVerKeyVRF vrfK) VRF.verifyCertified @@ -710,14 +710,13 @@ instance } where coercePoolDistr :: SL.PoolDistr c1 -> SL.PoolDistr c2 - coercePoolDistr (SL.PoolDistr m) = + coercePoolDistr (SL.PoolDistr m totalActiveStake) = SL.PoolDistr - . Map.mapKeysMonotonic coerce - . Map.map coerceIndividualPoolStake - $ m + (Map.mapKeysMonotonic coerce (Map.map coerceIndividualPoolStake m)) + totalActiveStake coerceIndividualPoolStake :: SL.IndividualPoolStake c1 -> SL.IndividualPoolStake c2 - coerceIndividualPoolStake (SL.IndividualPoolStake stake vrf) = - SL.IndividualPoolStake stake $ coerce vrf + coerceIndividualPoolStake (SL.IndividualPoolStake stake totalStake vrf) = + SL.IndividualPoolStake stake totalStake (coerce vrf) translateChainDepState _ tpState = PraosState diff --git a/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/TPraos.hs b/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/TPraos.hs index 80b52af5af..aafbf71175 100644 --- a/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/TPraos.hs +++ b/ouroboros-consensus-protocol/src/ouroboros-consensus-protocol/Ouroboros/Consensus/Protocol/TPraos.hs @@ -422,7 +422,7 @@ meetsLeaderThreshold TPraosConfig { tpraosParams } r (tpraosLeaderF tpraosParams) where - SL.PoolDistr poolDistr = lvPoolDistr + SL.PoolDistr poolDistr _totalActiveStake = lvPoolDistr r = maybe 0 SL.individualPoolStake $ Map.lookup keyHash poolDistr diff --git a/ouroboros-consensus/ouroboros-consensus.cabal b/ouroboros-consensus/ouroboros-consensus.cabal index 93a5b01352..7e993c9b37 100644 --- a/ouroboros-consensus/ouroboros-consensus.cabal +++ b/ouroboros-consensus/ouroboros-consensus.cabal @@ -284,28 +284,29 @@ library contra-tracer, deepseq, filelock, - fs-api ^>=0.2, + fs-api ^>=0.2.0.1, hashable, - io-classes ^>=1.4.1, + io-classes ^>=1.5, + io-classes ^>=1.5, measures, mtl, nothunks ^>=0.1.5, - ouroboros-network-api ^>=0.7, + ouroboros-network-api ^>=0.7.3, ouroboros-network-mock ^>=0.1, - ouroboros-network-protocols ^>=0.8, + ouroboros-network-protocols ^>=0.9, primitive, psqueues ^>=0.2.3, quiet ^>=0.2, reflection, semialign >=1.1, serialise ^>=0.2, - si-timers ^>=1.4, + si-timers ^>=1.5, sop-core ^>=0.5, sop-extras ^>=0.2, streaming, strict-checked-vars ^>=0.2, strict-sop-core ^>=0.1, - strict-stm ^>=1.4, + strict-stm ^>=1.5, text, these ^>=1.2, time, @@ -394,8 +395,8 @@ library unstable-consensus-testlib directory, file-embed, filepath, - fs-api ^>=0.2, - fs-sim ^>=0.2, + fs-api ^>=0.2.0.1, + fs-sim ^>=0.2.1.1, generics-sop, io-classes, io-sim, @@ -540,7 +541,7 @@ test-suite consensus-test containers, contra-tracer, deepseq, - fs-api ^>=0.2, + fs-api ^>=0.2.0.1, generics-sop, hashable, io-classes, @@ -645,8 +646,8 @@ test-suite storage-test cborg, containers, contra-tracer, - fs-api ^>=0.2, - fs-sim ^>=0.2, + fs-api ^>=0.2.0.1, + fs-sim ^>=0.2.1.1, generics-sop, hashable, io-classes, diff --git a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Util/EarlyExit.hs b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Util/EarlyExit.hs index c9901b2e0b..a36d1600df 100644 --- a/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Util/EarlyExit.hs +++ b/ouroboros-consensus/src/ouroboros-consensus/Ouroboros/Consensus/Util/EarlyExit.hs @@ -119,6 +119,7 @@ instance MonadSTM m => MonadSTM (WithEarlyExit m) where putTMVar = lift .: putTMVar tryPutTMVar = lift .: tryPutTMVar readTMVar = lift . readTMVar + writeTMVar = lift .: writeTMVar tryReadTMVar = lift . tryReadTMVar swapTMVar = lift .: swapTMVar isEmptyTMVar = lift . isEmptyTMVar diff --git a/ouroboros-consensus/test/consensus-test/Test/Consensus/BlockchainTime/Simple.hs b/ouroboros-consensus/test/consensus-test/Test/Consensus/BlockchainTime/Simple.hs index fdbf484583..4fc780abc3 100644 --- a/ouroboros-consensus/test/consensus-test/Test/Consensus/BlockchainTime/Simple.hs +++ b/ouroboros-consensus/test/consensus-test/Test/Consensus/BlockchainTime/Simple.hs @@ -475,6 +475,7 @@ instance MonadSTM m => MonadSTM (OverrideDelay m) where putTMVar v = OverrideDelaySTM . lift . LazySTM.putTMVar v tryPutTMVar v = OverrideDelaySTM . lift . LazySTM.tryPutTMVar v readTMVar = OverrideDelaySTM . lift . LazySTM.readTMVar + writeTMVar v = OverrideDelaySTM . lift . LazySTM.writeTMVar v tryReadTMVar = OverrideDelaySTM . lift . LazySTM.tryReadTMVar swapTMVar v = OverrideDelaySTM . lift . LazySTM.swapTMVar v isEmptyTMVar = OverrideDelaySTM . lift . LazySTM.isEmptyTMVar