Skip to content

Commit cf78673

Browse files
disassemblerdisassembler
authored
Merge pull request #6019 from IntersectMBO/sl/drep-hotfix
cardano-node 10.1.0 release
2 parents cdb45dd + 8fd9b7f commit cf78673

File tree

11 files changed

+21
-20
lines changed

11 files changed

+21
-20
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ library
8080
-- IOG dependencies
8181
--------------------------
8282
build-depends:
83-
, cardano-api ^>=10.0
83+
, cardano-api ^>=10.1
8484
, plutus-ledger-api ^>=1.36
8585
, plutus-tx ^>=1.36
8686
, plutus-tx-plugin ^>=1.36

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ library
106106
, attoparsec-aeson
107107
, base16-bytestring
108108
, bytestring
109-
, cardano-api ^>= 10.0
109+
, cardano-api ^>= 10.1
110110
, cardano-binary
111-
, cardano-cli ^>= 10.0
111+
, cardano-cli ^>= 10.1
112112
, cardano-crypto-class
113113
, cardano-crypto-wrapper
114114
, cardano-data

‎cabal.project‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ repository cardano-haskell-packages
1414
-- you need to run if you change them
1515
index-state:
1616
, hackage.haskell.org 2024-10-10T00:52:24Z
17-
, cardano-haskell-packages 2024-10-17T12:07:57Z
17+
, cardano-haskell-packages 2024-10-22T13:53:49Z
1818

1919
packages:
2020
cardano-node

‎cardano-node-chairman/cardano-node-chairman.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ executable cardano-node-chairman
4444
build-depends: cardano-api
4545
, cardano-crypto-class
4646
, cardano-git-rev ^>= 0.2.2
47-
, cardano-node ^>= 10.0
47+
, cardano-node ^>= 10.1
4848
, cardano-prelude
4949
, containers
5050
, contra-tracer
@@ -89,5 +89,5 @@ test-suite chairman-tests
8989
ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T"
9090

9191
build-tool-depends: cardano-node:cardano-node
92-
, cardano-cli:cardano-cli ^>= 10.0
92+
, cardano-cli:cardano-cli ^>= 10.1
9393
, cardano-node-chairman:cardano-node-chairman

‎cardano-node/cardano-node.cabal‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: cardano-node
4-
version: 10.0
4+
version: 10.1.0
55
synopsis: The cardano full node
66
description: The cardano full node.
77
category: Cardano,
@@ -145,7 +145,7 @@ library
145145
, async
146146
, base16-bytestring
147147
, bytestring
148-
, cardano-api ^>= 10.0
148+
, cardano-api ^>= 10.1
149149
, cardano-crypto-class
150150
, cardano-crypto-wrapper
151151
, cardano-git-rev ^>=0.2.2
@@ -155,7 +155,8 @@ library
155155
, cardano-ledger-babbage
156156
, cardano-ledger-binary
157157
, cardano-ledger-byron
158-
, cardano-ledger-conway
158+
-- TODO: remove constraint at next ledger bump
159+
, cardano-ledger-conway ^>= 1.17.1
159160
, cardano-ledger-core
160161
, cardano-ledger-shelley
161162
, cardano-prelude

‎cardano-submit-api/cardano-submit-api.cabal‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cabal-version: 3.0
22

33
name: cardano-submit-api
4-
version: 10.0
4+
version: 10.1.0
55
synopsis: A web server that allows transactions to be POSTed to the cardano chain
66
description: A web server that allows transactions to be POSTed to the cardano chain.
77
homepage: https://github.com/intersectmbo/cardano-node
@@ -39,9 +39,9 @@ library
3939
, aeson
4040
, async
4141
, bytestring
42-
, cardano-api ^>= 10.0
42+
, cardano-api ^>= 10.1
4343
, cardano-binary
44-
, cardano-cli ^>= 10.0
44+
, cardano-cli ^>= 10.1
4545
, cardano-crypto-class ^>= 2.1.2
4646
, http-media
4747
, iohk-monitoring

‎cardano-testnet/cardano-testnet.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ library
3535
, aeson-pretty
3636
, ansi-terminal
3737
, bytestring
38-
, cardano-api ^>= 10.0
39-
, cardano-cli ^>= 10.0
38+
, cardano-api ^>= 10.1
39+
, cardano-cli ^>= 10.1
4040
, cardano-crypto-class
4141
, cardano-crypto-wrapper
4242
, cardano-git-rev ^>= 0.2.2

‎cardano-testnet/src/Testnet/Defaults.hs‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import qualified Cardano.Api.Shelley as Api
4444
import Cardano.Ledger.Alonzo.Core (PParams (..))
4545
import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis)
4646
import qualified Cardano.Ledger.Alonzo.Genesis as Ledger
47+
import qualified Cardano.Ledger.Api as L
4748
import Cardano.Ledger.BaseTypes
4849
import qualified Cardano.Ledger.BaseTypes as Ledger
4950
import Cardano.Ledger.Binary.Version ()
@@ -387,7 +388,8 @@ defaultShelleyGenesis asbe startTime maxSupply options = do
387388
-- TODO: find out why this actually degrates network stability - turned off for now
388389
-- securityParam = ceiling $ fromIntegral epochLength * cardanoActiveSlotsCoeff / 10
389390
pVer = eraToProtocolVersion asbe
390-
protocolParams = Api.sgProtocolParams Api.shelleyGenesisDefaults
391+
-- TODO: Remove after merging https://github.com/IntersectMBO/cardano-node/pull/6017
392+
protocolParams = Api.sgProtocolParams Api.shelleyGenesisDefaults & L.ppKeyDepositL .~ 0
391393
protocolParamsWithPVer = protocolParams & ppProtocolVersionL' .~ pVer
392394
Api.shelleyGenesisDefaults
393395
{ Api.sgActiveSlotsCoeff = unsafeBoundedRational activeSlotsCoeff

‎cardano-testnet/src/Testnet/EpochStateProcessing.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import Cardano.Api.Ledger (EpochInterval (..), GovActionId (..))
1212
import qualified Cardano.Api.Ledger as L
1313

1414
import qualified Cardano.Ledger.Conway.Governance as L
15-
import qualified Cardano.Ledger.Shelley.API as L
1615
import Cardano.Ledger.Shelley.LedgerState (newEpochStateGovStateL)
1716
import qualified Cardano.Ledger.Shelley.LedgerState as L
1817

‎cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ import qualified Cardano.Ledger.BaseTypes as L
2828
import Cardano.Ledger.Core (valueTxOutL)
2929
import Cardano.Ledger.Shelley.LedgerState (esLStateL, lsUTxOStateL, nesEpochStateL,
3030
utxosUtxoL)
31-
import qualified Cardano.Ledger.TxIn as L
3231
import qualified Cardano.Ledger.UTxO as L
3332
import Cardano.Testnet
3433

0 commit comments

Comments
 (0)