Skip to content

Commit b52f2c3

Browse files
nfrisbycarbolymer
authored andcommitted
Release 8.3.0-pre
1 parent 3f50047 commit b52f2c3

File tree

36 files changed

+370
-199
lines changed

36 files changed

+370
-199
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ library
7272
-- IOG dependencies
7373
--------------------------
7474
build-depends:
75-
, cardano-api ^>= 8.12
75+
, cardano-api >= 8.16.3 && < 8.17
7676
, plutus-ledger-api >=1.0.0
7777
, plutus-tx >=1.0.0
7878
, plutus-tx-plugin >=1.0.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import Cardano.Node.Configuration.Logging (LoggingLayer)
3636
import Cardano.Node.Protocol.Types (SomeConsensusProtocol (..))
3737

3838
import Cardano.Api.Shelley (CardanoMode)
39-
import Cardano.CLI.Types.Legacy (SigningKeyFile)
39+
import Cardano.CLI.Types.Common (SigningKeyFile)
4040

4141
import Cardano.Api (BlockType (..), ConsensusModeParams (..), EpochSlots (..),
4242
LocalNodeConnectInfo (..), NetworkId (..), PaymentKey, SigningKey, SocketPath,

bench/tx-generator/src/Cardano/TxGenerator/Setup/NixService.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import Data.List.NonEmpty (NonEmpty)
2020
import Data.Maybe (fromMaybe)
2121
import GHC.Generics (Generic)
2222

23-
import Cardano.CLI.Types.Legacy (FileDirection (..), SigningKeyFile)
23+
import Cardano.CLI.Types.Common (FileDirection (..), SigningKeyFile)
2424
import Cardano.Node.Configuration.NodeAddress (NodeIPv4Address)
2525
import Cardano.Node.Types (AdjustFilePaths (..))
2626

bench/tx-generator/src/Cardano/TxGenerator/Setup/NodeConfig.hs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import Control.Monad.Trans.Except (runExceptT)
1212
import Data.Bifunctor (first)
1313
import Data.Monoid
1414

15-
import Ouroboros.Consensus.Cardano (ProtocolParamsShelleyBased (..))
15+
import qualified Ouroboros.Consensus.Cardano as Consensus
1616

1717
import Cardano.Api (BlockType (..), ProtocolInfoArgs (..))
1818
import Cardano.Node.Configuration.POM
@@ -32,10 +32,12 @@ getGenesis :: SomeConsensusProtocol -> ShelleyGenesis
3232
getGenesis (SomeConsensusProtocol CardanoBlockType proto)
3333
= genesis
3434
where
35-
ProtocolInfoArgsCardano
36-
_
37-
ProtocolParamsShelleyBased{shelleyBasedGenesis = genesis}
38-
_ _ _ _ _ _ _ _ _ _ _ _ = proto
35+
ProtocolInfoArgsCardano Consensus.CardanoProtocolParams
36+
{ Consensus.paramsShelleyBased =
37+
Consensus.ProtocolParamsShelleyBased
38+
{ Consensus.shelleyBasedGenesis = genesis
39+
}
40+
} = proto
3941

4042
-- | extract the path to genesis file from a NodeConfiguration for Cardano protocol
4143
getGenesisPath :: NodeConfiguration -> Maybe GenesisFile

bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import Control.Monad.Trans.Except
1818
import Control.Monad.Trans.Except.Extra
1919
import Control.Monad.Writer (runWriter)
2020

21-
import Cardano.CLI.Run.Legacy.Read (readFileScriptInAnyLang)
21+
import Cardano.CLI.Read (readFileScriptInAnyLang)
2222

2323
import Cardano.Api
2424
import Cardano.Api.Shelley (PlutusScript (..), ProtocolParameters (..), fromAlonzoExUnits,

bench/tx-generator/src/Cardano/TxGenerator/Setup/SigningKey.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import qualified Data.ByteString as BS (ByteString)
1616
import Data.ByteString.Base16 as Base16 (decode)
1717

1818
import Cardano.Api
19-
import Cardano.CLI.Types.Legacy (SigningKeyFile)
19+
import Cardano.CLI.Types.Common (SigningKeyFile)
2020

2121
import Cardano.TxGenerator.Types (TxGenError (..))
2222

bench/tx-generator/tx-generator.cabal

Lines changed: 6 additions & 6 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.12
100+
, cardano-api >= 8.16.3 && < 8.17
101101
, cardano-binary
102-
, cardano-cli ^>= 8.5
102+
, cardano-cli ^>= 8.6.1
103103
, cardano-crypto-class
104104
, cardano-crypto-wrapper
105105
, cardano-data
@@ -193,8 +193,8 @@ test-suite tx-generator-apitest
193193
, bytestring
194194
, filepath
195195
, optparse-applicative-fork
196-
, cardano-api ^>= 8.12
197-
, cardano-cli ^>= 8.5
196+
, cardano-api >= 8.16.3 && < 8.17
197+
, cardano-cli ^>= 8.6.1
198198
, cardano-node
199199
, plutus-tx
200200
, transformers
@@ -209,8 +209,8 @@ test-suite tx-generator-apitest
209209
, bytestring
210210
, filepath
211211
, optparse-applicative-fork
212-
, cardano-api ^>= 8.12
213-
, cardano-cli ^>= 8.5
212+
, cardano-api >= 8.16.3 && < 8.17
213+
, cardano-cli ^>= 8.6.1
214214
, cardano-node
215215
, transformers
216216
, transformers-except

cabal.project

Lines changed: 5 additions & 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 2023-08-09T22:19:16Z
17-
, cardano-haskell-packages 2023-08-09T14:21:51Z
17+
, cardano-haskell-packages 2023-09-01T20:45:06Z
1818

1919
packages:
2020
cardano-git-rev
@@ -99,3 +99,7 @@ write-ghc-environment-files: always
9999

100100
package snap-server
101101
flags: +openssl
102+
103+
-- IMPORTANT
104+
-- Do NOT add more source-repository-package stanzas here unless they are strictly
105+
-- temporary! Please read the section in CONTRIBUTING about updating dependencies.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ executable cardano-node-chairman
4242
-rtsopts
4343
"-with-rtsopts=-T"
4444
build-depends: cardano-api
45-
, cardano-crypto-class ^>= 2.1
45+
, cardano-crypto-class ^>= 2.1.2
4646
, cardano-git-rev
4747
, cardano-node
4848
, cardano-prelude
@@ -69,7 +69,7 @@ test-suite chairman-tests
6969
type: exitcode-stdio-1.0
7070

7171
build-depends: cardano-testnet
72-
, cardano-crypto-class ^>= 2.1
72+
, cardano-crypto-class ^>= 2.1.2
7373
, filepath
7474
, hedgehog
7575
, hedgehog-extras ^>= 0.4.7.0
@@ -88,5 +88,5 @@ test-suite chairman-tests
8888
ghc-options: -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T
8989

9090
build-tool-depends: cardano-node:cardano-node
91-
, cardano-cli:cardano-cli ^>= 8.5
91+
, cardano-cli:cardano-cli ^>= 8.6.1
9292
, cardano-node-chairman:cardano-node-chairman

cardano-node-chairman/test/Main.hs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import qualified Test.Tasty as T
1313
import qualified Test.Tasty.Hedgehog as H
1414
import qualified Test.Tasty.Ingredients as T
1515

16-
import qualified Spec.Chairman.Cardano
16+
-- import qualified Spec.Chairman.Cardano
1717
import qualified Spec.Network
1818

1919
import qualified Cardano.Crypto.Init as Crypto
@@ -22,12 +22,13 @@ tests :: IO T.TestTree
2222
tests = do
2323
let t0 = H.testPropertyNamed "isPortOpen False" (fromString "isPortOpen False") Spec.Network.hprop_isPortOpen_False
2424
let t1 = H.testPropertyNamed "isPortOpen True" (fromString "isPortOpen True" ) Spec.Network.hprop_isPortOpen_True
25-
let t2 = H.testPropertyNamed "chairman" (fromString "chairman" ) Spec.Chairman.Cardano.hprop_chairman
25+
-- TODO: Conway broken in conway
26+
-- let t2 = H.testPropertyNamed "chairman" (fromString "chairman" ) Spec.Chairman.Cardano.hprop_chairman
2627

2728
pure $ T.testGroup "test/Spec.hs"
2829
[ T.testGroup "Spec"
2930
[ T.testGroup "Chairman"
30-
[ T.testGroup "Cardano" [t2]
31+
[ T.testGroup "Cardano" [] -- [t2]
3132
]
3233
, T.testGroup "Network" [t0, t1]
3334
]

0 commit comments

Comments
 (0)