Skip to content

Commit f42b13a

Browse files
disassemblerdisassembler
committed
cardano-cli: bump to 8.5.0.0
1 parent c650f2b commit f42b13a

File tree

7 files changed

+19
-40
lines changed

7 files changed

+19
-40
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.10
75+
, cardano-api ^>= 8.12
7676
, plutus-ledger-api >=1.0.0
7777
, plutus-tx >=1.0.0
7878
, plutus-tx-plugin >=1.0.0

‎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.10
100+
, cardano-api ^>= 8.12
101101
, cardano-binary
102-
, cardano-cli ^>= 8.4
102+
, cardano-cli ^>= 8.5
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.10
197-
, cardano-cli ^>= 8.4
196+
, cardano-api ^>= 8.12
197+
, cardano-cli ^>= 8.5
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.10
213-
, cardano-cli ^>= 8.4
212+
, cardano-api ^>= 8.12
213+
, cardano-cli ^>= 8.5
214214
, cardano-node
215215
, transformers
216216
, transformers-except

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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.4
91+
, cardano-cli:cardano-cli ^>= 8.5
9292
, cardano-node-chairman:cardano-node-chairman

‎cardano-node/cardano-node.cabal‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ library
137137
, async
138138
, base16-bytestring
139139
, bytestring
140-
, cardano-api ^>= 8.10
140+
, cardano-api ^>= 8.12
141141
, cardano-crypto-class
142142
, cardano-crypto-wrapper
143143
, cardano-git-rev
@@ -235,7 +235,7 @@ test-suite cardano-node-test
235235
, aeson >= 1.5.6.0
236236
, bytestring
237237
, cardano-crypto-class
238-
, cardano-api ^>= 8.10
238+
, cardano-api ^>= 8.12
239239
, cardano-ledger-core
240240
, cardano-node
241241
, cardano-slotting >= 0.1

‎cardano-node/src/Cardano/Tracing/OrphanInstances/Common.hs‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,9 @@ module Cardano.Tracing.OrphanInstances.Common
4040
) where
4141

4242
import Data.Aeson hiding (Value)
43-
import qualified Data.ByteString.Base16 as B16
44-
import qualified Data.ByteString.Short as SBS
4543
import Data.Scientific (coefficient)
4644
import Data.Text (Text)
4745
import qualified Data.Text as Text
48-
import qualified Data.Text.Encoding as Text
4946
import Data.Void (Void)
5047
import Network.Socket (PortNumber)
5148
import Text.Read (readMaybe)
@@ -59,9 +56,6 @@ import Cardano.BM.Tracing (HasPrivacyAnnotation (..), HasSeverityAnnot
5956
Severity (..), ToObject (..), Tracer (..), TracingVerbosity (..),
6057
Transformable (..))
6158
import Cardano.Node.Handlers.Shutdown ()
62-
import Ouroboros.Consensus.Byron.Ledger.Block (ByronHash (..))
63-
import Ouroboros.Consensus.HardFork.Combinator (OneEraHash (..))
64-
import Ouroboros.Network.Block (HeaderHash, Tip (..))
6559
-- | A bit of a weird one, but needed because some of the very general
6660
-- consensus interfaces are sometimes instantiated to 'Void', when there are
6761
-- no cases needed.
@@ -88,21 +82,6 @@ instance FromJSON PortNumber where
8882
parseJSON invalid = fail $ "Parsing of port number failed due to type mismatch. "
8983
<> "Encountered: " <> show invalid
9084

91-
instance ToJSON (HeaderHash blk) => ToJSON (Tip blk) where
92-
toJSON TipGenesis = object [ "genesis" .= True ]
93-
toJSON (Tip slotNo headerHash blockNo) =
94-
object
95-
[ "slotNo" .= slotNo
96-
, "headerHash" .= headerHash
97-
, "blockNo" .= blockNo
98-
]
99-
100-
instance ToJSON (OneEraHash xs) where
101-
toJSON (OneEraHash bs) =
102-
toJSON . Text.decodeLatin1 . B16.encode . SBS.fromShort $ bs
103-
104-
deriving newtype instance ToJSON ByronHash
105-
10685
instance HasPrivacyAnnotation ResourceStats
10786
instance HasSeverityAnnotation ResourceStats where
10887
getSeverityAnnotation _ = Info

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ library
3939
, aeson
4040
, async
4141
, bytestring
42-
, cardano-api ^>= 8.10
42+
, cardano-api ^>= 8.12
4343
, cardano-binary
44-
, cardano-cli ^>= 8.4
44+
, cardano-cli ^>= 8.5
4545
, cardano-crypto-class ^>= 2.1
4646
, cardano-ledger-byron ^>= 1.0
4747
, formatting
@@ -86,7 +86,7 @@ executable cardano-submit-api
8686
ghc-options: -threaded -rtsopts "-with-rtsopts=-T -I0"
8787
build-depends: base
8888
, optparse-applicative-fork
89-
, cardano-cli ^>= 8.4
89+
, cardano-cli ^>= 8.5
9090
, cardano-crypto-class ^>= 2.1
9191
, cardano-submit-api
9292

‎cardano-testnet/cardano-testnet.cabal‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ library
3434
build-depends: aeson
3535
, ansi-terminal
3636
, bytestring
37-
, cardano-api ^>= 8.10
38-
, cardano-cli ^>= 8.4
37+
, cardano-api ^>= 8.12
38+
, cardano-cli ^>= 8.5
3939
, cardano-crypto-class
4040
, cardano-crypto-wrapper
4141
, cardano-ledger-alonzo
@@ -150,7 +150,7 @@ test-suite cardano-testnet-golden
150150
ghc-options: -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T
151151

152152
build-tool-depends: cardano-node:cardano-node
153-
, cardano-cli:cardano-cli ^>= 8.4
153+
, cardano-cli:cardano-cli ^>= 8.5
154154
, cardano-submit-api:cardano-submit-api
155155
, cardano-testnet:cardano-testnet
156156

@@ -176,8 +176,8 @@ test-suite cardano-testnet-test
176176
build-depends: aeson
177177
, async
178178
, bytestring
179-
, cardano-api ^>= 8.10
180-
, cardano-cli ^>= 8.4
179+
, cardano-api ^>= 8.12
180+
, cardano-cli ^>= 8.5
181181
, cardano-crypto-class
182182
, cardano-testnet
183183
, containers
@@ -194,6 +194,6 @@ test-suite cardano-testnet-test
194194
ghc-options: -threaded -rtsopts -with-rtsopts=-N -with-rtsopts=-T
195195

196196
build-tool-depends: cardano-node:cardano-node
197-
, cardano-cli:cardano-cli ^>= 8.4
197+
, cardano-cli:cardano-cli ^>= 8.5
198198
, cardano-submit-api:cardano-submit-api
199199
, cardano-testnet:cardano-testnet

0 commit comments

Comments
 (0)