diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs b/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs index f3074b69166..b32e4688ee8 100644 --- a/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs +++ b/bench/tx-generator/src/Cardano/TxGenerator/Setup/Plutus.hs @@ -16,6 +16,7 @@ module Cardano.TxGenerator.Setup.Plutus import Data.Bifunctor import Data.ByteString.Short (ShortByteString) +import Data.Int (Int64) import Data.Map.Strict as Map (lookup) import Control.Monad.Trans.Except @@ -268,5 +269,5 @@ preExecutePlutusV3 (major, _minor) (PlutusScript _ (PlutusScriptSerialised (scri , PlutusV3.txInfoTreasuryDonation = Nothing } -flattenCostModel :: CostModel -> [Integer] +flattenCostModel :: CostModel -> [Int64] flattenCostModel (CostModel cm) = cm diff --git a/cardano-node/src/Cardano/Node/Run.hs b/cardano-node/src/Cardano/Node/Run.hs index c881a697c35..2ae989006dd 100644 --- a/cardano-node/src/Cardano/Node/Run.hs +++ b/cardano-node/src/Cardano/Node/Run.hs @@ -90,12 +90,13 @@ import Cardano.Tracing.Config (TraceOptions (..), TraceSelection (..)) import qualified Ouroboros.Consensus.Config as Consensus import Ouroboros.Consensus.Config.SupportsNode (ConfigSupportsNode (..)) import Ouroboros.Consensus.Node (DiskPolicyArgs (..), NetworkP2PMode (..), - RunNodeArgs (..), StdRunNodeArgs (..), stdChainSyncTimeout) + RunNodeArgs (..), StdRunNodeArgs (..)) import qualified Ouroboros.Consensus.Node as Node (getChainDB, run) import Ouroboros.Consensus.Node.NetworkProtocolVersion import Ouroboros.Consensus.Node.ProtocolInfo import Ouroboros.Consensus.Util.Orphans () import qualified Ouroboros.Network.Diffusion as Diffusion +import qualified Ouroboros.Network.Diffusion.Configuration as Configuration import qualified Ouroboros.Network.Diffusion.NonP2P as NonP2P import qualified Ouroboros.Network.Diffusion.P2P as P2P import Ouroboros.Network.NodeToClient (LocalAddress (..), LocalSocket (..)) @@ -592,7 +593,7 @@ handleSimpleNode blockType runP p2pMode tracers nc onKernel = do customizeChainSyncTimeout = case ncChainSyncIdleTimeout nc of NoTimeoutOverride -> Nothing TimeoutOverride t -> Just $ do - cst <- stdChainSyncTimeout + cst <- Configuration.defaultChainSyncTimeout pure $ case t of 0 -> cst { idleTimeout = Nothing } diff --git a/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs b/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs index afa155201fa..3d499a4db31 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs @@ -225,36 +225,37 @@ instance ( Consensus.ShelleyBasedEra era , ToJSON (Ledger.PParamsUpdate era) ) => LogFormatting (ShelleyLedgerUpdate era) where - forMachine dtal (ShelleyUpdatedProtocolUpdates updates) = + forMachine _dtal (ShelleyUpdatedPParams updates epochNo) = mconcat [ "kind" .= String "ShelleyUpdatedProtocolUpdates" - , "updates" .= map (forMachine dtal) updates - ] - -instance - ( Ledger.Era era - , ToJSON (Ledger.PParamsUpdate era) - ) => LogFormatting (ProtocolUpdate era) where - forMachine dtal ProtocolUpdate{protocolUpdateProposal, protocolUpdateState} = - mconcat [ "proposal" .= forMachine dtal protocolUpdateProposal - , "state" .= forMachine dtal protocolUpdateState - ] - -instance - ( ToJSON (Ledger.PParamsUpdate era) - ) => LogFormatting (UpdateProposal era) where - forMachine _dtal UpdateProposal{proposalParams, proposalVersion, proposalEpoch} = - mconcat [ "params" .= proposalParams - , "version" .= proposalVersion - , "epoch" .= proposalEpoch - ] - -instance - ( Ledger.Crypto crypto - ) => LogFormatting (UpdateState crypto) where - forMachine _dtal UpdateState{proposalVotes, proposalReachedQuorum} = - mconcat [ "proposal" .= proposalVotes - , "reachedQuorum" .= proposalReachedQuorum - ] + , "updates" .= show updates -- map (forMachine dtal) updates + , "epochNo" .= show epochNo + ] + +-- instance +-- ( Ledger.Era era +-- , ToJSON (Ledger.PParamsUpdate era) +-- ) => LogFormatting (ProtocolUpdate era) where +-- forMachine dtal ProtocolUpdate{protocolUpdateProposal, protocolUpdateState} = +-- mconcat [ "proposal" .= forMachine dtal protocolUpdateProposal +-- , "state" .= forMachine dtal protocolUpdateState +-- ] + +-- instance +-- ( ToJSON (Ledger.PParamsUpdate era) +-- ) => LogFormatting (UpdateProposal era) where +-- forMachine _dtal UpdateProposal{proposalParams, proposalVersion, proposalEpoch} = +-- mconcat [ "params" .= proposalParams +-- , "version" .= proposalVersion +-- , "epoch" .= proposalEpoch +-- ] + +-- instance +-- ( Ledger.Crypto crypto +-- ) => LogFormatting (UpdateState crypto) where +-- forMachine _dtal UpdateState{proposalVotes, proposalReachedQuorum} = +-- mconcat [ "proposal" .= proposalVotes +-- , "reachedQuorum" .= proposalReachedQuorum +-- ] instance ( Ledger.Crypto crypto diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs index 4f2208e83ec..a9358b6a00e 100644 --- a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs +++ b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs @@ -138,11 +138,12 @@ instance instance ( Ledger.Era ledgerera - , ToJSON (Ledger.PParamsUpdate ledgerera) + , Show (Ledger.PParamsHKD Identity ledgerera) ) => ToObject (ShelleyLedgerUpdate ledgerera) where - toObject verb (ShelleyUpdatedProtocolUpdates updates) = - mconcat [ "kind" .= String "ShelleyUpdatedProtocolUpdates" - , "updates" .= map (toObject verb) updates + toObject _verb (ShelleyUpdatedPParams updates epochNo) = + mconcat [ "kind" .= String "ShelleyUpdatedPParams" + , "updates" .= show updates -- map (toObject verb) updates + , "epochNo" .= show epochNo ] instance ( ToObject (PredicateFailure (Ledger.EraRule "DELEG" era)) @@ -222,28 +223,19 @@ instance ToObject (Set (Credential 'Staking StandardCrypto)) where , "stakeCreds" .= map toJSON (Set.toList creds) ] -instance - ( Ledger.Era ledgerera - , ToJSON (Ledger.PParamsUpdate ledgerera) - ) => ToObject (ProtocolUpdate ledgerera) where - toObject verb ProtocolUpdate{protocolUpdateProposal, protocolUpdateState} = - mconcat [ "proposal" .= toObject verb protocolUpdateProposal - , "state" .= toObject verb protocolUpdateState - ] +-- instance ToJSON (Ledger.PParamsUpdate era) +-- => ToObject (UpdateProposal era) where +-- toObject _verb UpdateProposal{proposalParams, proposalVersion, proposalEpoch} = +-- mconcat [ "params" .= proposalParams +-- , "version" .= proposalVersion +-- , "epoch" .= proposalEpoch +-- ] -instance ToJSON (Ledger.PParamsUpdate era) - => ToObject (UpdateProposal era) where - toObject _verb UpdateProposal{proposalParams, proposalVersion, proposalEpoch} = - mconcat [ "params" .= proposalParams - , "version" .= proposalVersion - , "epoch" .= proposalEpoch - ] - -instance Core.Crypto crypto => ToObject (UpdateState crypto) where - toObject _verb UpdateState{proposalVotes, proposalReachedQuorum} = - mconcat [ "proposal" .= proposalVotes - , "reachedQuorum" .= proposalReachedQuorum - ] +-- instance Core.Crypto crypto => ToObject (UpdateState crypto) where +-- toObject _verb UpdateState{proposalVotes, proposalReachedQuorum} = +-- mconcat [ "proposal" .= proposalVotes +-- , "reachedQuorum" .= proposalReachedQuorum +-- ] instance Core.Crypto crypto => ToObject (ChainTransitionError crypto) where toObject verb (ChainTransitionError fs) = diff --git a/cardano-testnet/src/Testnet/Defaults.hs b/cardano-testnet/src/Testnet/Defaults.hs index c80ba4d345b..fec9cd942d0 100644 --- a/cardano-testnet/src/Testnet/Defaults.hs +++ b/cardano-testnet/src/Testnet/Defaults.hs @@ -48,15 +48,12 @@ import Cardano.Tracing.Config import Prelude -import Control.Monad import Control.Monad.Identity (Identity) import Data.Aeson (ToJSON (..), Value, (.=)) import qualified Data.Aeson as Aeson import qualified Data.Aeson.Key as Key import qualified Data.Aeson.KeyMap as KeyMapAeson import qualified Data.Default.Class as DefaultClass -import Data.Map.Strict (Map) -import qualified Data.Map.Strict as Map import Data.Maybe import Data.Proxy import Data.Ratio @@ -73,34 +70,24 @@ import System.FilePath (()) import Test.Cardano.Ledger.Core.Rational import Test.Cardano.Ledger.Plutus (testingCostModelV3) -import Testnet.Runtime (PaymentKeyPair (PaymentKeyPair), PoolNodeKeys (..), - SPOColdKeyPair (..), StakingKeyPair (StakingKeyPair)) import Testnet.Start.Types import Testnet.Types {- HLINT ignore "Use underscore" -} instance Api.Error AlonzoGenesisError where - prettyError (AlonzoGenErrCostModels e) = - "Error in Alonzo genesis cost models: " <> pshow e prettyError (AlonzoGenErrTooMuchPrecision r) = "Too much precision for bounded rational in Alonzo genesis: " <> pshow r -data AlonzoGenesisError +newtype AlonzoGenesisError = AlonzoGenErrTooMuchPrecision Rational - | AlonzoGenErrCostModels (Map Ledger.Language Ledger.CostModelError) deriving Show defaultAlonzoGenesis :: Either AlonzoGenesisError AlonzoGenesis defaultAlonzoGenesis = do let genesis = Api.alonzoGenesisDefaults - costModelsErrors = Ledger.costModelsErrors $ Ledger.agCostModels genesis prices = Ledger.agPrices genesis - -- fail on cost models errors - unless (Map.null costModelsErrors) - . Left $ AlonzoGenErrCostModels costModelsErrors - -- double check that prices have correct values - they're set using unsafeBoundedRational in cardano-api _priceExecSteps <- checkBoundedRational $ Ledger.prSteps prices _priceMemSteps <- checkBoundedRational $ Ledger.prMem prices diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs index f5bc7bd6d6d..684f0d62722 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs @@ -218,15 +218,15 @@ hprop_ledger_events_propose_new_constitution = integrationWorkspace "propose-new length (filter ((== L.Abstain) . snd) votes) === 2 length votes === numVotes - -- We check that constitution was succcessfully ratified - void . H.leftFailM . evalIO . runExceptT $ - foldEpochState - configurationFile - socketPath - FullValidation - (EpochNo 10) - () - (\epochState _ _ -> foldBlocksCheckConstitutionWasRatified constitutionHash constitutionScriptHash epochState) + -- We check that constitution was succcessfully ratified + void . H.leftFailM . evalIO . runExceptT $ + foldEpochState + configurationFile + socketPath + FullValidation + (EpochNo 10) + () + (\epochState _ _ -> foldBlocksCheckConstitutionWasRatified constitutionHash constitutionScriptHash epochState) foldBlocksCheckConstitutionWasRatified :: String -- submitted constitution hash diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json index 85cdc9f1dd1..b9a70468afe 100644 --- a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json +++ b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json @@ -652,6 +652,9 @@ "txFeePerByte": 1, "utxoCostPerByte": 4310 }, + "futurePParams": { + "tag": "NoPParamsUpdate" + }, "nextRatifyState": { "enactedGovActions": [], "expiredGovActions": [],