Skip to content

Commit eb66a54

Browse files
bolt12Jimbo4350cootdisassembler
authored and
newhoggy
committed
Update ouroboros-consensus and update to cardano-api-8.8.0.0 and cardano-cli-8.3.0.0
Set initial block forging Moved UseLedger type to avoid circular imports - The moving of UseLedger was needed in order to import `Cardano.Node.Protocol (ProtocolInstantiationError)` - Added new constructors to Startup Tracer Update block forging configuration on SIGHUP Block Forging can be enabled/disabled through SIGHUP signal. Sending such a signal will trigger the node to read the block forging credential files. Since the credential files are passed via CLI flags one can not remove them without restarting the node. For this effect, in order for one to be able to disable block forging, moving/renaming/deleting the file at the specified path (for the credential flags) and then sending the SIGHUP signal is what needs to be done. The code will detect that the specified files do not exist and it will disable block forging, while tracing the appropriate log messages. In case one wants to start a block producing node (i.e. passing the credentials in the respective flags) but doesn't want it to actually behave as a BP, there's a new `--start-as-non-producing-node` flag that will run the node with credentials as a normal node. However on SIGHUP it will read the credential files and start forging. Refactor code to accomodate the changes Added EnabledBlockForging type Fix Shutdown test for new exit codes Co-authored-by: Armando Santos <armandoifsantos@gmail.com> Co-authored-by: Jordan Millar <jordan.millar@iohk.io> Co-authored-by: Marcin Szamotulski <coot@coot.me> Co-authored-by: Samuel Leathers <samuel.leathers@iohk.io>
1 parent d5b8b72 commit eb66a54

File tree

50 files changed

+984
-639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+984
-639
lines changed

‎.github/workflows/github-page.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
env:
2424
# Modify this value to "invalidate" the cabal cache.
25-
CABAL_CACHE_VERSION: "2023-06-20"
25+
CABAL_CACHE_VERSION: "2023-07-11"
2626

2727
# Modify this value to "invalidate" the secp cache.
2828
SECP_CACHE_VERSION: "2022-12-30"

‎.github/workflows/haskell-linux.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
env:
3333
# Modify this value to "invalidate" the cabal cache.
34-
CABAL_CACHE_VERSION: "2023-06-20"
34+
CABAL_CACHE_VERSION: "2023-07-11"
3535

3636
# Modify this value to "invalidate" the secp cache.
3737
SECP_CACHE_VERSION: "2022-12-30"

‎.github/workflows/haskell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131

3232
env:
3333
# Modify this value to "invalidate" the cabal cache.
34-
CABAL_CACHE_VERSION: "2023-06-20"
34+
CABAL_CACHE_VERSION: "2023-07-11"
3535

3636
# Modify this value to "invalidate" the secp cache.
3737
SECP_CACHE_VERSION: "2022-12-30"

‎.github/workflows/stylish-haskell.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727

2828
env:
2929
# Modify this value to "invalidate" the cabal cache.
30-
CABAL_CACHE_VERSION: "2023-06-20"
30+
CABAL_CACHE_VERSION: "2023-07-11"
3131

3232
STYLISH_HASKELL_VERSION: "0.14.4.0"
3333

‎bench/cardano-topology/cardano-topology.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ executable cardano-topology
3737
, bytestring
3838
, containers
3939
, graphviz
40-
, optparse-applicative-fork
40+
, optparse-applicative-fork ^>= 0.16.1
4141
, split
4242
, text

‎bench/locli/locli.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ library
116116
, ghc
117117
, gnuplot
118118
, iohk-monitoring
119-
, optparse-applicative-fork
119+
, optparse-applicative-fork ^>= 0.16.1
120120
, optparse-generic
121121
, ouroboros-consensus
122122
-- for Data.SOP.Strict:
@@ -155,7 +155,7 @@ executable locli
155155
build-depends: aeson
156156
, cardano-prelude
157157
, locli
158-
, optparse-applicative-fork
158+
, optparse-applicative-fork ^>= 0.16.1
159159
, text
160160
, text-short
161161
, transformers
@@ -172,7 +172,7 @@ test-suite test-locli
172172
build-depends: cardano-prelude
173173
, containers
174174
, hedgehog
175-
, hedgehog-extras ^>= 0.4
175+
, hedgehog-extras ^>= 0.4.7.0
176176
, locli
177177
, text
178178

‎bench/plutus-scripts-bench/plutus-scripts-bench.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ library
7272
-- IOG dependencies
7373
--------------------------
7474
build-depends:
75-
, cardano-api ^>= 8.2
75+
, cardano-api ^>= 8.8
7676
, plutus-ledger-api >=1.0.0
7777
, plutus-tx >=1.0.0
7878
, plutus-tx-plugin >=1.0.0
@@ -100,5 +100,5 @@ executable gen-plutus
100100
build-depends: base >=4.12 && <5
101101
, bytestring
102102
, filepath
103-
, optparse-applicative
103+
, optparse-applicative >= 0.16.0 && < 0.16.1
104104
, plutus-scripts-bench

‎bench/trace-analyzer/trace-analyzer.cabal‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ executable trace-analyzer
4040
main-is: trace-analyzer.hs
4141

4242
build-depends: aeson
43-
, optparse-applicative
43+
, optparse-applicative >= 0.16.0 && < 0.16.1
4444
, text
4545
, containers
4646
, attoparsec

‎bench/tx-generator/src/Cardano/Benchmarking/OuroborosImports.hs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{- HLINT ignore "Eta reduce" -}
22
{-# LANGUAGE GADTs #-}
33
{-# LANGUAGE NamedFieldPuns #-}
4+
{-# LANGUAGE TypeApplications #-}
45

56
module Cardano.Benchmarking.OuroborosImports
67
(
@@ -44,8 +45,8 @@ import Cardano.Ledger.Shelley.Genesis (ShelleyGenesis)
4445

4546
type CardanoBlock = Consensus.CardanoBlock StandardCrypto
4647

47-
toProtocolInfo :: SomeConsensusProtocol -> ProtocolInfo IO CardanoBlock
48-
toProtocolInfo (SomeConsensusProtocol CardanoBlockType info) = protocolInfo info
48+
toProtocolInfo :: SomeConsensusProtocol -> ProtocolInfo CardanoBlock
49+
toProtocolInfo (SomeConsensusProtocol CardanoBlockType info) = fst $ protocolInfo @IO info
4950
toProtocolInfo _ = error "toProtocolInfo unknown protocol"
5051

5152
protocolToTopLevelConfig :: SomeConsensusProtocol -> TopLevelConfig CardanoBlock

‎bench/tx-generator/tx-generator.cabal‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ library
9797
, attoparsec
9898
, base16-bytestring
9999
, bytestring
100-
, cardano-api ^>= 8.2
100+
, cardano-api ^>= 8.8
101101
, cardano-binary
102-
, cardano-cli ^>= 8.2
102+
, cardano-cli ^>= 8.3
103103
, cardano-crypto-class
104104
, cardano-crypto-wrapper
105105
, cardano-data
@@ -122,10 +122,10 @@ library
122122
, mtl
123123
, network
124124
, network-mux
125-
, optparse-applicative-fork
125+
, optparse-applicative-fork ^>= 0.16.1
126126
, ouroboros-consensus >= 0.6
127127
, ouroboros-consensus-cardano >= 0.5
128-
, ouroboros-consensus-diffusion >= 0.5.1
128+
, ouroboros-consensus-diffusion >= 0.7.0
129129
, ouroboros-network ^>= 0.8.1.0
130130
, ouroboros-network-api
131131
, ouroboros-network-framework
@@ -192,9 +192,9 @@ test-suite tx-generator-apitest
192192
, aeson
193193
, bytestring
194194
, filepath
195-
, optparse-applicative-fork
196-
, cardano-api ^>= 8.2
197-
, cardano-cli ^>= 8.2
195+
, optparse-applicative-fork ^>= 0.16.1
196+
, cardano-api ^>= 8.8
197+
, cardano-cli ^>= 8.3
198198
, cardano-node
199199
, plutus-tx
200200
, transformers
@@ -208,9 +208,9 @@ test-suite tx-generator-apitest
208208
, aeson
209209
, bytestring
210210
, filepath
211-
, optparse-applicative-fork
212-
, cardano-api ^>= 8.2
213-
, cardano-cli ^>= 8.2
211+
, optparse-applicative-fork ^>= 0.16.1
212+
, cardano-api ^>= 8.8
213+
, cardano-cli ^>= 8.3
214214
, cardano-node
215215
, transformers
216216
, transformers-except

0 commit comments

Comments
 (0)