diff --git a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/Genesis.hs b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/Genesis.hs index 44811e30f37..76a1bc2f80e 100644 --- a/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/Genesis.hs +++ b/bench/tx-generator/src/Cardano/Benchmarking/GeneratorTx/Genesis.hs @@ -8,7 +8,7 @@ module Cardano.Benchmarking.GeneratorTx.Genesis where import Cardano.Prelude hiding (TypeError, filter) -import qualified Data.Map.Strict as Map +import qualified Data.ListMap as ListMap import Prelude (error, filter) import Cardano.Api @@ -25,7 +25,7 @@ genesisFunds :: forall era. IsShelleyBasedEra era => NetworkId -> ShelleyGenesis StandardShelley -> [(AddressInEra era, Lovelace)] genesisFunds networkId g = map (castAddr *** fromShelleyLovelace) - $ Map.toList + $ ListMap.toList $ sgInitialFunds g where castAddr (Addr _ pcr stref) diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index 7b7c2e41710..11e20769f04 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/bench/tx-generator/tx-generator.cabal @@ -73,6 +73,7 @@ library , cardano-cli , cardano-crypto-class , cardano-crypto-wrapper + , cardano-data , cardano-git-rev , cardano-ledger-alonzo , cardano-ledger-byron diff --git a/cabal.project b/cabal.project index adc5846baa7..511a1cbce25 100644 --- a/cabal.project +++ b/cabal.project @@ -197,8 +197,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/cardano-ledger - tag: ce3057e0863304ccb3f79d78c77136219dc786c6 - --sha256: 19ijcy1sl1iqa7diy5nsydnjsn3281kp75i2i42qv0fpn58238s9 + tag: 0913292b13963ae4b60136eddb8d18b137f96a21 + --sha256: 19rrnvvplvg8v989bcv6vpjwvblfa0m65izxkcp8dclf0a914qq3 subdir: eras/alonzo/impl eras/alonzo/test-suite @@ -263,8 +263,8 @@ source-repository-package source-repository-package type: git location: https://github.com/input-output-hk/ouroboros-network - tag: a65c29b6a85e90d430c7f58d362b7eb097fd4949 - --sha256: 1fmab5hmi1y8lss97xh6hhikmyhsx9x31yhvg6zpr2kcq7kc6qkf + tag: 69b748ea07ffbaf9c7868645f9f8ca9b58f658b5 + --sha256: 0yfici9p5gbj7gzpbk19izwsksagzc8fjls3cax291128jyvpi7w subdir: monoidal-synchronisation network-mux diff --git a/cardano-api/cardano-api.cabal b/cardano-api/cardano-api.cabal index 0a4ded35905..ea75b491a92 100644 --- a/cardano-api/cardano-api.cabal +++ b/cardano-api/cardano-api.cabal @@ -199,6 +199,7 @@ test-suite cardano-api-test , cardano-api , cardano-api:gen , cardano-binary + , cardano-data , cardano-crypto , cardano-crypto-class , cardano-crypto-test diff --git a/cardano-api/src/Cardano/Api/Shelley/Genesis.hs b/cardano-api/src/Cardano/Api/Shelley/Genesis.hs index 4c2e6b5e037..74b4a62d330 100644 --- a/cardano-api/src/Cardano/Api/Shelley/Genesis.hs +++ b/cardano-api/src/Cardano/Api/Shelley/Genesis.hs @@ -8,6 +8,7 @@ module Cardano.Api.Shelley.Genesis import Prelude +import qualified Data.ListMap as ListMap import qualified Data.Map.Strict as Map import Data.Maybe (fromMaybe) import qualified Data.Time as Time @@ -65,7 +66,7 @@ shelleyGenesisDefaults = -- genesis keys and initial funds , sgGenDelegs = Map.empty , sgStaking = emptyGenesisStaking - , sgInitialFunds = Map.empty + , sgInitialFunds = ListMap.empty , sgMaxLovelaceSupply = 0 } where diff --git a/cardano-api/src/Cardano/Api/TxBody.hs b/cardano-api/src/Cardano/Api/TxBody.hs index d2c80ccf2ef..0cab7712481 100644 --- a/cardano-api/src/Cardano/Api/TxBody.hs +++ b/cardano-api/src/Cardano/Api/TxBody.hs @@ -3521,7 +3521,6 @@ toAllegraAuxiliaryData :: forall era ledgerera. ShelleyLedgerEra era ~ ledgerera => Ledger.AuxiliaryData ledgerera ~ Allegra.AuxiliaryData ledgerera => Ledger.AnnotatedData (Ledger.Script ledgerera) - => Ord (Ledger.Script ledgerera) => Map Word64 TxMetadataValue -> [ScriptInEra era] -> Ledger.AuxiliaryData ledgerera diff --git a/cardano-api/test/Test/Cardano/Api/Genesis.hs b/cardano-api/test/Test/Cardano/Api/Genesis.hs index fc7d0f436c5..036f4549d1a 100644 --- a/cardano-api/test/Test/Cardano/Api/Genesis.hs +++ b/cardano-api/test/Test/Cardano/Api/Genesis.hs @@ -11,6 +11,7 @@ import Cardano.Prelude import Cardano.Api.Shelley (ShelleyGenesis (..)) +import Data.ListMap (ListMap(ListMap)) import qualified Data.Map.Strict as Map import Data.Time.Clock.POSIX (posixSecondsToUTCTime) @@ -53,7 +54,7 @@ exampleShelleyGenesis = [( genesisVerKeyHash , GenDelegPair delegVerKeyHash delegVrfKeyHash) ] - , sgInitialFunds = Map.fromList [(initialFundedAddress,initialFunds)] + , sgInitialFunds = ListMap [(initialFundedAddress,initialFunds)] , sgStaking = emptyGenesisStaking } where diff --git a/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs b/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs index cd3e4239b30..9b0befc1114 100644 --- a/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs +++ b/cardano-cli/src/Cardano/CLI/Shelley/Run/Genesis.hs @@ -28,6 +28,8 @@ import qualified Data.ByteString.Lazy.Char8 as LBS import Data.Coerce (coerce) import qualified Data.List as List import qualified Data.List.Split as List +import Data.ListMap (ListMap(ListMap)) +import qualified Data.ListMap as ListMap import qualified Data.Map.Strict as Map import qualified Data.Sequence.Strict as Seq @@ -1012,7 +1014,7 @@ updateTemplate (SystemStart start) { sgSystemStart = start , sgMaxLovelaceSupply = fromIntegral $ nonDelegCoin + delegCoin , sgGenDelegs = shelleyDelKeys - , sgInitialFunds = Map.fromList + , sgInitialFunds = ListMap [ (toShelleyAddr addr, toShelleyLovelace v) | (addr, v) <- distribute (nonDelegCoin - subtractForTreasury) utxoAddrsNonDeleg ++ @@ -1020,10 +1022,10 @@ updateTemplate (SystemStart start) mkStuffedUtxo stuffedUtxoAddrs ] , sgStaking = ShelleyGenesisStaking - { sgsPools = Map.fromList + { sgsPools = ListMap [ (Ledger._poolId poolParams, poolParams) | poolParams <- Map.elems poolSpecs ] - , sgsStake = Ledger._poolId <$> poolSpecs + , sgsStake = ListMap.fromMap $ Ledger._poolId <$> poolSpecs } , sgProtocolParams = pparamsFromTemplate } diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs index 0ae22624bc5..6c329644cd2 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/P2P.hs @@ -755,7 +755,6 @@ namesForConnectionManager TrConnectionManagerCounters {} = ["ConnectionManagerCo namesForConnectionManager TrState {} = ["State"] namesForConnectionManager ConnectionManager.TrUnexpectedlyFalseAssertion {} = ["UnexpectedlyFalseAssertion"] -namesForConnectionManager TrUnknownConnection {} = ["UnknownConnection"] severityConnectionManager :: ConnectionManagerTrace addr @@ -790,7 +789,6 @@ severityConnectionManager TrConnectionManagerCounters {} = Info severityConnectionManager TrState {} = Info severityConnectionManager ConnectionManager.TrUnexpectedlyFalseAssertion {} = Error -severityConnectionManager TrUnknownConnection {} = Debug instance (Show addr, Show versionNumber, Show agreedOptions, LogFormatting addr, ToJSON addr, ToJSON versionNumber, ToJSON agreedOptions) @@ -927,11 +925,6 @@ instance (Show addr, Show versionNumber, Show agreedOptions, LogFormatting addr, [ "kind" .= String "UnexpectedlyFalseAssertion" , "info" .= String (pack . show $ info) ] - forMachine _dtal (TrUnknownConnection info) = - mconcat - [ "kind" .= String "UnknownConnection" - , "info" .= String (pack . show $ info) - ] forHuman = pack . show asMetrics (TrConnectionManagerCounters ConnectionManagerCounters {..}) = [ IntM diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs index c5bbb1e0177..579163af215 100644 --- a/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs +++ b/cardano-node/src/Cardano/Tracing/OrphanInstances/Network.hs @@ -459,7 +459,6 @@ instance HasSeverityAnnotation (ConnectionManagerTrace addr (ConnectionHandlerTr TrConnectionManagerCounters {} -> Info TrState {} -> Info ConnMgr.TrUnexpectedlyFalseAssertion {} -> Error - TrUnknownConnection {} -> Debug instance HasPrivacyAnnotation (ConnMgr.AbstractTransitionTrace addr) instance HasSeverityAnnotation (ConnMgr.AbstractTransitionTrace addr) where @@ -1917,10 +1916,6 @@ instance (Show addr, Show versionNumber, Show agreedOptions, ToObject addr, [ "kind" .= String "UnexpectedlyFalseAssertion" , "info" .= String (pack . show $ info) ] - TrUnknownConnection {} -> - mconcat - [ "kind" .= String "UnknownConnection" - ] instance ToJSON state => ToJSON (ConnMgr.MaybeUnknown state) where toJSON (ConnMgr.Known st) =