Skip to content

Commit fc10f16

Browse files
iohk-bors[bot]nc6
andauthored
Merge #3439
3439: WIP Bump to latest ledger. r=nc6 a=JaredCorduan This should give decent speedups. Co-authored-by: Nicholas Clarke <[email protected]>
2 parents 90f1a01 + 6d4f85e commit fc10f16

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

cabal.project

+4-2
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ source-repository-package
173173
source-repository-package
174174
type: git
175175
location: https://github.com/input-output-hk/cardano-ledger
176-
tag: 4595b73a693d0a78f05ecbcbf631caa568dde5d8
177-
--sha256: 022yarx7bqys5fdbnm3wkzrsc3g9hn7pghf53p8bx3xbwx86n47f
176+
tag: 1a9ec4ae9e0b09d54e49b2a40c4ead37edadcce5
177+
--sha256: 0avzyiqq0m8njd41ck9kpn992yq676b1az9xs77977h7cf85y4wm
178178
subdir:
179179
eras/alonzo/impl
180180
eras/alonzo/test-suite
@@ -191,7 +191,9 @@ source-repository-package
191191
libs/cardano-ledger-core
192192
libs/cardano-ledger-pretty
193193
libs/cardano-protocol-tpraos
194+
libs/cardano-data
194195
libs/compact-map
196+
libs/set-algebra
195197
libs/small-steps
196198
libs/small-steps-test
197199
libs/non-integral

cardano-api/cardano-api.cabal

+2
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ library
107107
, cardano-crypto
108108
, cardano-crypto-class
109109
, cardano-crypto-wrapper
110+
, cardano-data
110111
, cardano-ledger-alonzo
111112
, cardano-ledger-byron
112113
, cardano-ledger-core
@@ -139,6 +140,7 @@ library
139140
, scientific
140141
, small-steps
141142
, cardano-ledger-shelley
143+
, set-algebra
142144
, small-steps
143145
, stm
144146
, strict-containers

cardano-api/src/Cardano/Api/Orphans.hs

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@ import Prelude
2020
import Data.Aeson (FromJSON (..), ToJSON (..), object, (.!=), (.:), (.:?), (.=))
2121
import qualified Data.Aeson as Aeson
2222
import Data.Aeson.Types (FromJSONKey (..), ToJSONKey (..), toJSONKeyText)
23+
import Data.BiMap (BiMap (..), Bimap)
2324
import qualified Data.ByteString.Base16 as B16
24-
import Data.Compact.VMap (VMap, VB, VP)
25+
import Data.Compact.VMap (VB, VMap, VP)
2526
import qualified Data.Compact.VMap as VMap
2627
import qualified Data.Map.Strict as Map
2728
import Data.Text (Text)
@@ -30,12 +31,11 @@ import qualified Data.Text.Encoding as Text
3031
import Data.Word (Word64)
3132

3233
import Control.Applicative
33-
import Control.Iterate.BiMap (BiMap (..), Bimap)
3434

3535
import Cardano.Api.Json
3636
import Cardano.Ledger.BaseTypes (StrictMaybe (..), strictMaybeToMaybe)
3737
import qualified Cardano.Ledger.BaseTypes as Ledger
38-
import Cardano.Ledger.Compactible (Compactible(fromCompact))
38+
import Cardano.Ledger.Compactible (Compactible (fromCompact))
3939
import Cardano.Ledger.Crypto (StandardCrypto)
4040
import Cardano.Slotting.Slot (SlotNo (..))
4141
import Cardano.Slotting.Time (SystemStart (..))

cardano-cli/cardano-cli.cabal

+1
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ library
134134
, parsec
135135
, prettyprinter
136136
, cardano-ledger-shelley
137+
, set-algebra
137138
, small-steps
138139
, split
139140
, strict-containers

0 commit comments

Comments
 (0)