From eb7f015f64d904a855ad8ccd394d0b2d1b436bcd Mon Sep 17 00:00:00 2001 From: Damian Nadales Date: Thu, 28 Mar 2024 14:43:54 +0100 Subject: [PATCH] Release Node 8.10 --- bench/locli/src/Cardano/Analysis/API/Types.hs | 4 +- bench/locli/src/Cardano/Analysis/MachPerf.hs | 2 +- .../plutus-scripts-bench.cabal | 4 +- .../src/Cardano/TxGenerator/Fund.hs | 7 +- .../src/Cardano/TxGenerator/PureExample.hs | 2 +- .../src/Cardano/TxGenerator/Tx.hs | 8 +- bench/tx-generator/tx-generator.cabal | 4 +- cabal.project | 2 +- .../cardano-node-chairman.cabal | 4 +- cardano-node/cardano-node.cabal | 12 +- .../src/Cardano/Node/Protocol/Cardano.hs | 3 + .../src/Cardano/Node/Tracing/Era/Shelley.hs | 47 +- .../src/Cardano/Node/Tracing/StateRep.hs | 2 +- .../Cardano/Node/Tracing/Tracers/ChainDB.hs | 62 ++- .../Cardano/Node/Tracing/Tracers/Consensus.hs | 296 +++++++---- .../Tracing/OrphanInstances/Consensus.hs | 66 ++- .../Tracing/OrphanInstances/Shelley.hs | 68 ++- cardano-submit-api/cardano-submit-api.cabal | 6 +- cardano-testnet/cardano-testnet.cabal | 5 +- .../data/conway/genesis.conway.spec.json | 3 +- cardano-testnet/src/Testnet/Defaults.hs | 108 +--- .../Testnet/Test/Cli/Babbage/Transaction.hs | 3 +- .../Cardano/Testnet/Test/Cli/KesPeriodInfo.hs | 3 +- .../Testnet/Test/Cli/QuerySlotNumber.hs | 3 +- .../Gov/ProposeNewConstitutionSPO.hs | 2 +- .../Test/LedgerEvents/TreasuryGrowth.hs | 2 +- .../queries/protocolParametersFileOut.json | 12 +- .../golden/queries/protocolParametersOut.txt | 14 +- .../cardano/mainnet-config-new-tracing.json | 2 +- configuration/cardano/mainnet-config.json | 2 +- configuration/cardano/mainnet-config.yaml | 2 +- .../cardano/mainnet-conway-genesis.json | 39 +- .../cardano/shelley_qa-alonzo-genesis.json | 364 +++++++------ .../cardano/shelley_qa-byron-genesis.json | 121 +++-- configuration/cardano/shelley_qa-config.json | 27 +- .../cardano/shelley_qa-conway-genesis.json | 39 +- .../cardano/shelley_qa-shelley-genesis.json | 100 ++-- .../cardano/shelley_qa-topology.json | 24 +- .../cardano/testnet-alonzo-genesis.json | 196 ------- .../cardano/testnet-byron-genesis.json | 481 ------------------ configuration/cardano/testnet-config.json | 99 ---- .../cardano/testnet-shelley-genesis.json | 68 --- configuration/cardano/testnet-topology.json | 9 - configuration/cardano/update-config-files.sh | 8 + flake.lock | 58 +-- flake.nix | 2 +- .../mainnet/genesis/genesis.conway.json | 3 +- .../babbage/conway-babbage-test-genesis.json | 3 +- trace-forward/trace-forward.cabal | 2 +- 49 files changed, 908 insertions(+), 1495 deletions(-) delete mode 100644 configuration/cardano/testnet-alonzo-genesis.json delete mode 100644 configuration/cardano/testnet-byron-genesis.json delete mode 100644 configuration/cardano/testnet-config.json delete mode 100644 configuration/cardano/testnet-shelley-genesis.json delete mode 100644 configuration/cardano/testnet-topology.json diff --git a/bench/locli/src/Cardano/Analysis/API/Types.hs b/bench/locli/src/Cardano/Analysis/API/Types.hs index e7f5f90a31d..5cbcf31ea9c 100644 --- a/bench/locli/src/Cardano/Analysis/API/Types.hs +++ b/bench/locli/src/Cardano/Analysis/API/Types.hs @@ -443,8 +443,8 @@ testSlotStats :: Genesis -> SlotStats a -> SlotCond -> Bool testSlotStats g SlotStats{..} = \case SlotGEq s -> slSlot >= s SlotLEq s -> slSlot <= s - EpochGEq s -> fromIntegral (unEpochNo slEpoch) >= s - EpochLEq s -> fromIntegral (unEpochNo slEpoch) <= s + EpochGEq s -> slEpoch >= s + EpochLEq s -> slEpoch <= s SlotHasLeaders -> slCountLeads > 0 EpochSafeIntGEq i -> slEpochSafeInt >= i EpochSafeIntLEq i -> slEpochSafeInt <= i diff --git a/bench/locli/src/Cardano/Analysis/MachPerf.hs b/bench/locli/src/Cardano/Analysis/MachPerf.hs index c7b0b6be15d..f0d78fdb8db 100644 --- a/bench/locli/src/Cardano/Analysis/MachPerf.hs +++ b/bench/locli/src/Cardano/Analysis/MachPerf.hs @@ -74,7 +74,7 @@ timelineFromLogObjects run@Run{genesis} (f, xs') = zeroSlotStats = SlotStats { slSlot = impliedSlot genesis firstRelevantLogObjectTime - , slEpoch = 0 + , slEpoch = EpochNo 0 , slEpochSlot = 0 , slEpochSafeInt = 0 , slStart = SlotStart firstRelevantLogObjectTime diff --git a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal index b6d386028e0..ceaaf73e73a 100644 --- a/bench/plutus-scripts-bench/plutus-scripts-bench.cabal +++ b/bench/plutus-scripts-bench/plutus-scripts-bench.cabal @@ -73,10 +73,10 @@ library -- IOG dependencies -------------------------- build-depends: - , cardano-api ^>= 8.42.0.0 + , cardano-api ^>= 8.44 , plutus-ledger-api >=1.0.0 , plutus-tx >=1.0.0 - , plutus-tx-plugin ^>=1.21 + , plutus-tx-plugin ^>=1.23 ------------------------ -- Non-IOG dependencies diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Fund.hs b/bench/tx-generator/src/Cardano/TxGenerator/Fund.hs index af226dee800..a2235ac3b5a 100644 --- a/bench/tx-generator/src/Cardano/TxGenerator/Fund.hs +++ b/bench/tx-generator/src/Cardano/TxGenerator/Fund.hs @@ -15,7 +15,7 @@ module Cardano.TxGenerator.Fund -- $Accessors , getFundTxIn , getFundKey - , getFundLovelace + , getFundCoin , getFundWitness ) where @@ -68,9 +68,8 @@ getFundTxIn (Fund (InAnyCardanoEra _ a)) = _fundTxIn a getFundKey :: Fund -> Maybe (SigningKey PaymentKey) getFundKey (Fund (InAnyCardanoEra _ a)) = _fundSigningKey a --- | Converting a `TxOutValue` to `Lovelace` requires case analysis. -getFundLovelace :: Fund -> L.Coin -getFundLovelace (Fund (InAnyCardanoEra _ a)) = case _fundVal a of +getFundCoin :: Fund -> L.Coin +getFundCoin (Fund (InAnyCardanoEra _ a)) = case _fundVal a of TxOutValueByron l -> l TxOutValueShelleyBased era v -> selectLovelace $ Api.fromLedgerValue era v diff --git a/bench/tx-generator/src/Cardano/TxGenerator/PureExample.hs b/bench/tx-generator/src/Cardano/TxGenerator/PureExample.hs index af1ef036ed4..19c21a5508b 100644 --- a/bench/tx-generator/src/Cardano/TxGenerator/PureExample.hs +++ b/bench/tx-generator/src/Cardano/TxGenerator/PureExample.hs @@ -164,7 +164,7 @@ generateTxPure TxEnvironment{..} inQueue collateralFunds :: (TxInsCollateral BabbageEra, [Fund]) collateralFunds = (TxInsCollateralNone, []) - outValues = computeOutputValues $ map getFundLovelace inputs + outValues = computeOutputValues $ map getFundCoin inputs (outputs, toFunds) = makeToUTxOList (repeat computeUTxO) outValues computeOutputValues :: [L.Coin] -> [L.Coin] diff --git a/bench/tx-generator/src/Cardano/TxGenerator/Tx.hs b/bench/tx-generator/src/Cardano/TxGenerator/Tx.hs index 128397a36ef..0effcfdf4fa 100644 --- a/bench/tx-generator/src/Cardano/TxGenerator/Tx.hs +++ b/bench/tx-generator/src/Cardano/TxGenerator/Tx.hs @@ -66,10 +66,10 @@ sourceToStoreTransaction txGenerator fundSource inToOut mkTxOut fundToStore = where go inputFunds = do let - -- 'getFundLovelace' unwraps the 'TxOutValue' in a fund field + -- 'getFundCoin' unwraps the 'TxOutValue' in a fund field -- so it's all just 'Lovelace' instead of a coproduct -- maintaining distinctions. - outValues = inToOut $ map getFundLovelace inputFunds + outValues = inToOut $ map getFundCoin inputFunds (outputs, toFunds) = mkTxOut outValues case txGenerator inputFunds outputs of Left err -> return $ Left err @@ -102,7 +102,7 @@ sourceToStoreTransactionNew txGenerator fundSource valueSplitter toStore = where go inputFunds = do let - split = valueSplitter $ map getFundLovelace inputFunds + split = valueSplitter $ map getFundCoin inputFunds (outputs, storeAction) = toStore split case txGenerator inputFunds outputs of Left err -> return $ Left err @@ -144,7 +144,7 @@ sourceTransactionPreview txGenerator inputFunds valueSplitter toStore = second fst $ txGenerator inputFunds outputs where - split = valueSplitter $ map getFundLovelace inputFunds + split = valueSplitter $ map getFundCoin inputFunds (outputs, _) = toStore split -- | 'genTx' seems to mostly be a wrapper for diff --git a/bench/tx-generator/tx-generator.cabal b/bench/tx-generator/tx-generator.cabal index 3fd75c4fa34..ce0fe6c9b63 100644 --- a/bench/tx-generator/tx-generator.cabal +++ b/bench/tx-generator/tx-generator.cabal @@ -100,9 +100,9 @@ library , attoparsec-aeson , base16-bytestring , bytestring - , cardano-api ^>= 8.42.0.0 + , cardano-api ^>= 8.44 , cardano-binary - , cardano-cli ^>= 8.21.0.0 + , cardano-cli ^>= 8.22 , cardano-crypto-class , cardano-crypto-wrapper , cardano-data diff --git a/cabal.project b/cabal.project index 855ad8121e4..d2b5da9025e 100644 --- a/cabal.project +++ b/cabal.project @@ -14,7 +14,7 @@ repository cardano-haskell-packages -- you need to run if you change them index-state: , hackage.haskell.org 2024-03-26T06:28:59Z - , cardano-haskell-packages 2024-03-25T11:11:00Z + , cardano-haskell-packages 2024-04-05T07:51:28Z packages: cardano-node diff --git a/cardano-node-chairman/cardano-node-chairman.cabal b/cardano-node-chairman/cardano-node-chairman.cabal index 68d2fe8390e..97bc4eb4c07 100644 --- a/cardano-node-chairman/cardano-node-chairman.cabal +++ b/cardano-node-chairman/cardano-node-chairman.cabal @@ -44,7 +44,7 @@ executable cardano-node-chairman build-depends: cardano-api , cardano-crypto-class , cardano-git-rev ^>=0.2.2 - , cardano-node ^>= 8.9 + , cardano-node ^>= 8.10 , cardano-prelude , containers , contra-tracer @@ -88,5 +88,5 @@ test-suite chairman-tests ghc-options: -threaded -rtsopts "-with-rtsopts=-N -T" build-tool-depends: cardano-node:cardano-node - , cardano-cli:cardano-cli ^>= 8.21.0.0 + , cardano-cli:cardano-cli ^>= 8.22.0.0 , cardano-node-chairman:cardano-node-chairman diff --git a/cardano-node/cardano-node.cabal b/cardano-node/cardano-node.cabal index 539c545dd00..cf13912db27 100644 --- a/cardano-node/cardano-node.cabal +++ b/cardano-node/cardano-node.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: cardano-node -version: 8.9.0 +version: 8.10.0 synopsis: The cardano full node description: The cardano full node. category: Cardano, @@ -144,7 +144,7 @@ library , async , base16-bytestring , bytestring - , cardano-api ^>= 8.42.0.0 + , cardano-api ^>= 8.44 , cardano-crypto-class , cardano-crypto-wrapper , cardano-git-rev ^>=0.2.2 @@ -158,7 +158,7 @@ library , cardano-ledger-shelley , cardano-prelude , cardano-protocol-tpraos >= 1.0.2 - , cardano-slotting >= 0.1.1 + , cardano-slotting >= 0.2 , cborg ^>= 0.2.4 , containers , contra-tracer @@ -183,9 +183,9 @@ library , network-mux >= 0.4 , nothunks , optparse-applicative-fork >= 0.18.1 - , ouroboros-consensus ^>= 0.16 - , ouroboros-consensus-cardano ^>= 0.14 - , ouroboros-consensus-diffusion ^>= 0.12 + , ouroboros-consensus ^>= 0.17 + , ouroboros-consensus-cardano ^>= 0.15 + , ouroboros-consensus-diffusion ^>= 0.13 , ouroboros-consensus-protocol , ouroboros-network-api ^>= 0.7.1 , ouroboros-network ^>= 0.13 diff --git a/cardano-node/src/Cardano/Node/Protocol/Cardano.hs b/cardano-node/src/Cardano/Node/Protocol/Cardano.hs index 8db1094b55e..54e973b3c67 100644 --- a/cardano-node/src/Cardano/Node/Protocol/Cardano.hs +++ b/cardano-node/src/Cardano/Node/Protocol/Cardano.hs @@ -33,6 +33,7 @@ import Ouroboros.Consensus.Cardano import qualified Ouroboros.Consensus.Cardano as Consensus import qualified Ouroboros.Consensus.Cardano.CanHardFork as Consensus import Ouroboros.Consensus.Cardano.Condense () +import Ouroboros.Consensus.Config (emptyCheckpointsMap) import Ouroboros.Consensus.HardFork.Combinator.Condense () import qualified Ouroboros.Consensus.Mempool.Capacity as TxLimits import qualified Ouroboros.Consensus.Shelley.Node.Praos as Praos @@ -305,6 +306,8 @@ mkSomeConsensusProtocolCardano NodeByronProtocolConfiguration { (maybe 9 fromIntegral npcTestConwayHardForkAtVersion) Just epochNo -> Consensus.TriggerHardForkAtEpoch epochNo } + -- TODO: once https://github.com/IntersectMBO/cardano-node/issues/5730 is implemented 'emptyCheckpointsMap' needs to be replaced with the checkpoints map read from a configuration file. + , checkpoints = emptyCheckpointsMap } ---------------------------------------------------------------------- diff --git a/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs b/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs index d0a574148c0..13e14fe457f 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Era/Shelley.hs @@ -136,6 +136,13 @@ instance LogFormatting (Conway.ConwayGovCertPredFailure era) where , "credential" .= String (textShow kHash) , "error" .= String "Committee has resigned" ] + Conway.ConwayDRepIncorrectRefund givenRefund expectedRefund -> + [ "kind" .= String "ConwayDRepIncorrectRefund" + , "givenRefund" .= givenRefund + , "expectedRefund" .= expectedRefund + , "error" .= String "Refunds mismatch" + ] + instance LogFormatting (Conway.ConwayDelegPredFailure era) where @@ -184,7 +191,7 @@ instance , LogFormatting (PredicateFailure (Ledger.EraRule "LEDGER" era)) ) => LogFormatting (ApplyTxError era) where forMachine dtal (ApplyTxError predicateFailures) = - mconcat $ map (forMachine dtal) predicateFailures + mconcat $ NonEmpty.toList $ fmap (forMachine dtal) predicateFailures instance ( Ledger.Crypto era @@ -211,7 +218,7 @@ instance ) => LogFormatting (ShelleyLedgerError era) where forMachine dtal (BBodyError (BlockTransitionError fs)) = mconcat [ "kind" .= String "BBodyError" - , "failures" .= map (forMachine dtal) fs + , "failures" .= fmap (forMachine dtal) fs ] instance @@ -254,7 +261,7 @@ instance ) => LogFormatting (ChainTransitionError crypto) where forMachine dtal (ChainTransitionError fs) = mconcat [ "kind" .= String "ChainTransitionError" - , "failures" .= map (forMachine dtal) fs + , "failures" .= fmap (forMachine dtal) fs ] instance LogFormatting ChainPredicateFailure where @@ -345,7 +352,7 @@ instance , Api.IsShelleyBasedEra era , Consensus.ShelleyBasedEra ledgerera , Ledger.EraCrypto ledgerera ~ StandardCrypto - , LogFormatting (PPUPPredFailure ledgerera) + , LogFormatting (Ledger.EraRuleFailure "PPUP" ledgerera) , LogFormatting (PredicateFailure (Ledger.EraRule "UTXO" ledgerera)) ) => LogFormatting (AlonzoUtxowPredFailure ledgerera) where forMachine dtal (ShelleyInAlonzoUtxowPredFailure utxoPredFail) = @@ -441,7 +448,7 @@ instance instance ( Consensus.ShelleyBasedEra era - , LogFormatting (PPUPPredFailure era) + , LogFormatting (Ledger.EraRuleFailure "PPUP" era) ) => LogFormatting (ShelleyUtxoPredFailure era) where forMachine _dtal (BadInputsUTxO badInputs) = mconcat [ "kind" .= String "BadInputsUTxO" @@ -500,7 +507,7 @@ instance instance ( Consensus.ShelleyBasedEra era , ToJSON Allegra.ValidityInterval - , LogFormatting (PPUPPredFailure era) + , LogFormatting (Ledger.EraRuleFailure "PPUP" era) ) => LogFormatting (AllegraUtxoPredFailure era) where forMachine _dtal (Allegra.BadInputsUTxO badInputs) = mconcat [ "kind" .= String "BadInputsUTxO" @@ -1013,7 +1020,7 @@ instance instance ( ToJSON (Alonzo.CollectError ledgerera) - , LogFormatting (PPUPPredFailure ledgerera) + , LogFormatting (Ledger.EraRuleFailure "PPUP" ledgerera) ) => LogFormatting (AlonzoUtxosPredFailure ledgerera) where forMachine _ (Alonzo.ValidationTagMismatch isValidating reason) = mconcat [ "kind" .= String "ValidationTagMismatch" @@ -1060,13 +1067,18 @@ instance , "outputs" .= outputs ] + Babbage.BabbageNonDisjointRefInputs nonDisjointInputs -> + mconcat [ "kind" .= String "BabbageNonDisjointRefInputs" + , "outputs" .= nonDisjointInputs + ] + instance ( Api.ShelleyLedgerEra era ~ ledgerera , Api.IsShelleyBasedEra era , Ledger.Era ledgerera , Ledger.EraCrypto ledgerera ~ StandardCrypto , ShelleyBasedEra ledgerera - , LogFormatting (PPUPPredFailure ledgerera) + , LogFormatting (Ledger.EraRuleFailure "PPUP" ledgerera) , LogFormatting (ShelleyUtxowPredFailure ledgerera) , LogFormatting (PredicateFailure (Ledger.EraRule "UTXO" ledgerera)) ) => LogFormatting (BabbageUtxowPredFailure ledgerera) where @@ -1290,6 +1302,25 @@ instance Ledger.Crypto c => LogFormatting (PraosChainSelectView c) where where renderVRF = Text.decodeUtf8 . B16.encode . Crypto.getOutputVRFBytes +instance + ( ToJSON (Alonzo.CollectError ledgerera) + ) => LogFormatting (Conway.ConwayUtxosPredFailure ledgerera) where + forMachine _ (Conway.ValidationTagMismatch isValidating reason) = + mconcat [ "kind" .= String "ValidationTagMismatch" + , "isvalidating" .= isValidating + , "reason" .= reason + ] + forMachine _ (Conway.CollectErrors errors) = + mconcat [ "kind" .= String "CollectErrors" + , "errors" .= errors + ] + +-- We define this bogus instance as it is required by some of the +-- 'LogFormatting' instances in this module +instance LogFormatting (Ledger.VoidEraRule rule era) where + -- NOTE: There are no values of type 'Ledger.VoidEraRule rule era' + forMachine _ = \case + -------------------------------------------------------------------------------- -- Helper functions -------------------------------------------------------------------------------- diff --git a/cardano-node/src/Cardano/Node/Tracing/StateRep.hs b/cardano-node/src/Cardano/Node/Tracing/StateRep.hs index a36fb72d4ff..688edd8e6b2 100644 --- a/cardano-node/src/Cardano/Node/Tracing/StateRep.hs +++ b/cardano-node/src/Cardano/Node/Tracing/StateRep.hs @@ -227,7 +227,7 @@ traceNodeStateChainDB _scp tr ev = case ev' of ChainDB.StartedInitChainSelection -> traceWith tr $ NodeInitChainSelection InitChainStartedSelection - ChainDB.InitalChainSelected -> + ChainDB.InitialChainSelected -> traceWith tr $ NodeInitChainSelection InitChainSelected _ -> return () ChainDB.TraceAddBlockEvent ev' -> diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs index 66944e99d24..1e795b2e1ac 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/ChainDB.hs @@ -39,7 +39,7 @@ import Ouroboros.Consensus.Util.Condense (condense) import Ouroboros.Consensus.Util.Enclose import qualified Ouroboros.Network.AnchoredFragment as AF -import Data.Aeson (Value (String), toJSON, (.=)) +import Data.Aeson (Value (String), object, toJSON, (.=)) import Data.Int (Int64) import Data.Text (Text) import qualified Data.Text as Text @@ -418,6 +418,12 @@ instance ( LogFormatting (Header blk) forHuman (ChainDB.ChainSelectionForFutureBlock pt) = "Chain selection run for block previously from future: " <> renderRealPointAsPhrase pt forHuman (ChainDB.PipeliningEvent ev') = forHumanOrMachine ev' + forHuman ChainDB.AddedReprocessLoEBlocksToQueue = + "Added request to queue to reprocess blocks postponed by LoE." + forHuman ChainDB.PoppedReprocessLoEBlocksFromQueue = + "Poppped request from queue to reprocess blocks postponed by LoE." + forHuman (ChainDB.ChainSelectionLoEDebug {}) = + "ChainDB LoE debug event" forMachine dtal (ChainDB.IgnoreBlockOlderThanK pt) = mconcat [ "kind" .= String "IgnoreBlockOlderThanK" , "block" .= forMachine dtal pt ] @@ -493,6 +499,21 @@ instance ( LogFormatting (Header blk) , "block" .= forMachine dtal pt ] forMachine dtal (ChainDB.PipeliningEvent ev') = forMachine dtal ev' + forMachine _dtal ChainDB.AddedReprocessLoEBlocksToQueue = + mconcat [ "kind" .= String "AddedReprocessLoEBlocksToQueue" ] + forMachine _dtal ChainDB.PoppedReprocessLoEBlocksFromQueue = + mconcat [ "kind" .= String "PoppedReprocessLoEBlocksFromQueue" ] + forMachine dtal (ChainDB.ChainSelectionLoEDebug curChain loeFrag) = + mconcat [ "kind" .= String "ChainSelectionLoEDebug" + , "curChain" .= headAndAnchor curChain + , "loeFrag" .= headAndAnchor loeFrag + ] + where + headAndAnchor frag = object + [ "anchor" .= forMachine dtal (AF.anchorPoint frag) + , "head" .= forMachine dtal (AF.headPoint frag) + ] + asMetrics (ChainDB.SwitchedToAFork _warnings selChangedInfo _oldChain newChain) = let ChainInformation { slots, blocks, density, epoch, slotInEpoch } = @@ -548,6 +569,12 @@ instance MetaTrace (ChainDB.TraceAddBlockEvent blk) where Namespace [] ["ChainSelectionForFutureBlock"] namespaceFor (ChainDB.PipeliningEvent ev') = nsPrependInner "PipeliningEvent" (namespaceFor ev') + namespaceFor ChainDB.AddedReprocessLoEBlocksToQueue = + Namespace [] ["AddedReprocessLoEBlocksToQueue"] + namespaceFor ChainDB.PoppedReprocessLoEBlocksFromQueue = + Namespace [] ["PoppedReprocessLoEBlocksFromQueue"] + namespaceFor ChainDB.ChainSelectionLoEDebug {} = + Namespace [] ["ChainSelectionLoEDebug"] severityFor (Namespace _ ["IgnoreBlockOlderThanK"]) _ = Just Info severityFor (Namespace _ ["IgnoreBlockAlreadyInVolatileDB"]) _ = Just Info @@ -578,6 +605,9 @@ instance MetaTrace (ChainDB.TraceAddBlockEvent blk) where severityFor (Namespace out tl) (Just ev') severityFor (Namespace out ("PipeliningEvent" : tl)) Nothing = severityFor (Namespace out tl :: Namespace (ChainDB.TracePipeliningEvent blk)) Nothing + severityFor (Namespace _ ["AddedReprocessLoEBlocksToQueue"]) _ = Just Debug + severityFor (Namespace _ ["PoppedReprocessLoEBlocksFromQueue"]) _ = Just Debug + severityFor (Namespace _ ["ChainSelectionLoEDebug"]) _ = Just Debug severityFor _ _ = Nothing privacyFor (Namespace out ("AddBlockEvent" : tl)) (Just (ChainDB.AddBlockValidation ev')) = @@ -721,6 +751,9 @@ instance MetaTrace (ChainDB.TraceAddBlockEvent blk) where , Namespace [] ["AddedToCurrentChain"] , Namespace [] ["SwitchedToAFork"] , Namespace [] ["ChainSelectionForFutureBlock"] + , Namespace [] ["AddedReprocessLoEBlocksToQueue"] + , Namespace [] ["PoppedReprocessLoEBlocksFromQueue"] + , Namespace [] ["ChainSelectionLoEDebug"] ] ++ map (nsPrependInner "PipeliningEvent") (allNamespaces :: [Namespace (ChainDB.TracePipeliningEvent blk)]) @@ -950,30 +983,30 @@ instance MetaTrace (ChainDB.TraceGCEvent blk) where instance (ConvertRawHash blk, LedgerSupportsProtocol blk) => LogFormatting (ChainDB.TraceInitChainSelEvent blk) where forHuman (ChainDB.InitChainSelValidation v) = forHumanOrMachine v - forHuman ChainDB.InitalChainSelected{} = + forHuman ChainDB.InitialChainSelected{} = "Initial chain selected" forHuman ChainDB.StartedInitChainSelection {} = "Started initial chain selection" forMachine dtal (ChainDB.InitChainSelValidation v) = forMachine dtal v - forMachine _dtal ChainDB.InitalChainSelected = - mconcat ["kind" .= String "Follower.InitalChainSelected"] + forMachine _dtal ChainDB.InitialChainSelected = + mconcat ["kind" .= String "Follower.InitialChainSelected"] forMachine _dtal ChainDB.StartedInitChainSelection = mconcat ["kind" .= String "Follower.StartedInitChainSelection"] asMetrics (ChainDB.InitChainSelValidation v) = asMetrics v - asMetrics ChainDB.InitalChainSelected = [] + asMetrics ChainDB.InitialChainSelected = [] asMetrics ChainDB.StartedInitChainSelection = [] instance MetaTrace (ChainDB.TraceInitChainSelEvent blk) where - namespaceFor ChainDB.InitalChainSelected {} = - Namespace [] ["InitalChainSelected"] + namespaceFor ChainDB.InitialChainSelected {} = + Namespace [] ["InitialChainSelected"] namespaceFor ChainDB.StartedInitChainSelection {} = Namespace [] ["StartedInitChainSelection"] namespaceFor (ChainDB.InitChainSelValidation ev') = nsPrependInner "Validation" (namespaceFor ev') - severityFor (Namespace _ ["InitalChainSelected"]) _ = Just Info + severityFor (Namespace _ ["InitialChainSelected"]) _ = Just Info severityFor (Namespace _ ["StartedInitChainSelection"]) _ = Just Info severityFor (Namespace out ("Validation" : tl)) (Just (ChainDB.InitChainSelValidation ev')) = @@ -1003,7 +1036,7 @@ instance MetaTrace (ChainDB.TraceInitChainSelEvent blk) where metricsDocFor (Namespace out tl :: Namespace (ChainDB.TraceValidationEvent blk)) metricsDocFor _ = [] - documentFor (Namespace _ ["InitalChainSelected"]) = Just + documentFor (Namespace _ ["InitialChainSelected"]) = Just "A garbage collection for the given 'SlotNo' was performed." documentFor (Namespace _ ["StartedInitChainSelection"]) = Just $ mconcat [ "A garbage collection for the given 'SlotNo' was scheduled to happen" @@ -1014,7 +1047,7 @@ instance MetaTrace (ChainDB.TraceInitChainSelEvent blk) where documentFor _ = Nothing allNamespaces = - [ Namespace [] ["InitalChainSelected"] + [ Namespace [] ["InitialChainSelected"] , Namespace [] ["StartedInitChainSelection"] ] ++ map (nsPrependInner "Validation") @@ -2107,6 +2140,15 @@ instance ( StandardHash blk , "expected" .= String (Text.pack $ show expect) , "actual" .= String (Text.pack $ show act) ] + + forMachine _dtal (CheckpointMismatch blockNumber hdrHashExpected hdrHashActual) = + mconcat + [ "kind" .= String "CheckpointMismatch" + , "blockNo" .= String (Text.pack $ show blockNumber) + , "expected" .= String (Text.pack $ show hdrHashExpected) + , "actual" .= String (Text.pack $ show hdrHashActual) + ] + forMachine dtal (OtherHeaderEnvelopeError err) = forMachine dtal err diff --git a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs index 0e2bfeb48f3..aa8b86bb793 100644 --- a/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs +++ b/cardano-node/src/Cardano/Node/Tracing/Tracers/Consensus.hs @@ -154,39 +154,90 @@ instance (LogFormatting (LedgerUpdate blk), LogFormatting (LedgerWarning blk)) instance (ConvertRawHash blk, LedgerSupportsProtocol blk) => LogFormatting (TraceChainSyncClientEvent blk) where - forHuman (TraceDownloadedHeader pt) = mconcat - [ "While following a candidate chain, we rolled forward by downloading a" - , " header. " - , showT (headerPoint pt) - ] - forHuman (TraceRolledBack tip) = - "While following a candidate chain, we rolled back to the given point: " - <> showT tip - forHuman (TraceException exc) = - "An exception was thrown by the Chain Sync Client. " - <> showT exc - forHuman TraceFoundIntersection {} = mconcat - [ "We found an intersection between our chain fragment and the" - , " candidate's chain." - ] - forHuman (TraceTermination res) = + forHuman = \case + TraceDownloadedHeader pt -> + mconcat + [ "While following a candidate chain, we rolled forward by downloading a" + , " header. " + , showT (headerPoint pt) + ] + TraceRolledBack tip -> + "While following a candidate chain, we rolled back to the given point: " <> showT tip + TraceException exc -> + "An exception was thrown by the Chain Sync Client. " <> showT exc + TraceFoundIntersection {} -> + mconcat + [ "We found an intersection between our chain fragment and the" + , " candidate's chain." + ] + TraceTermination res -> "The client has terminated. " <> showT res + TraceValidatedHeader header -> + "The header has been validated" <> showT (headerHash header) + TraceWaitingBeyondForecastHorizon slotNo -> + mconcat + [ "The slot number " <> showT slotNo <> " is beyond the forecast horizon, the ChainSync client" + , " cannot yet validate a header in this slot and therefore is waiting" + ] + TraceAccessingForecastHorizon slotNo -> + mconcat + [ "The slot number " <> showT slotNo <> ", which was previously beyond the forecast horizon, has now" + , " entered it, and we can resume processing." + ] + TraceGaveLoPToken {} -> + mconcat + [ "Whether we added a token to the LoP bucket of the peer. Also carries" + , "the considered header and the best block number known prior to this" + , "header" + ] - forMachine _dtal (TraceDownloadedHeader h) = - mconcat [ "kind" .= String "DownloadedHeader" - , tipToObject (tipFromHeader h) - ] - forMachine dtal (TraceRolledBack tip) = - mconcat [ "kind" .= String "RolledBack" - , "tip" .= forMachine dtal tip ] - forMachine _dtal (TraceException exc) = - mconcat [ "kind" .= String "Exception" - , "exception" .= String (Text.pack $ show exc) ] - forMachine _dtal TraceFoundIntersection {} = - mconcat [ "kind" .= String "FoundIntersection" ] - forMachine _dtal (TraceTermination reason) = - mconcat [ "kind" .= String "Termination" - , "reason" .= String (Text.pack $ show reason) ] + forMachine dtal = \case + TraceDownloadedHeader h -> + mconcat + [ "kind" .= String "DownloadedHeader" + , tipToObject (tipFromHeader h) + ] + TraceRolledBack tip -> + mconcat + [ "kind" .= String "RolledBack" + , "tip" .= forMachine dtal tip + ] + TraceException exc -> + mconcat + [ "kind" .= String "Exception" + , "exception" .= String (Text.pack $ show exc) + ] + TraceFoundIntersection {} -> + mconcat + [ "kind" .= String "FoundIntersection" + ] + TraceTermination reason -> + mconcat + [ "kind" .= String "Termination" + , "reason" .= String (Text.pack $ show reason) + ] + TraceValidatedHeader header -> + mconcat + [ "kind" .= String "ValidatedHeader" + , "headerHash" .= showT (headerHash header) + ] + TraceWaitingBeyondForecastHorizon slotNo -> + mconcat + [ "kind" .= String "WaitingBeyondForecastHorizon" + , "slotNo" .= slotNo + ] + TraceAccessingForecastHorizon slotNo -> + mconcat + [ "kind" .= String "AccessingForecastHorizon" + , "slotNo" .= slotNo + ] + TraceGaveLoPToken tokenAdded header aBlockNo -> + mconcat + [ "kind" .= String "TraceGaveLoPToken" + , "tokenAdded" .= tokenAdded + , "headerHash" .= showT (headerHash header) + , "blockNo" .= aBlockNo + ] tipToObject :: forall blk. ConvertRawHash blk => Tip blk -> Aeson.Object tipToObject = \case @@ -202,42 +253,88 @@ tipToObject = \case ] instance MetaTrace (TraceChainSyncClientEvent blk) where - namespaceFor TraceDownloadedHeader {} = Namespace [] ["DownloadedHeader"] - namespaceFor TraceRolledBack {} = Namespace [] ["RolledBack"] - namespaceFor TraceException {} = Namespace [] ["Exception"] - namespaceFor TraceFoundIntersection {} = Namespace [] ["FoundIntersection"] - namespaceFor TraceTermination {} = Namespace [] ["Termination"] - - severityFor (Namespace _ ["DownloadedHeader"]) _ = Just Info - severityFor (Namespace _ ["RolledBack"]) _ = Just Notice - severityFor (Namespace _ ["Exception"]) _ = Just Warning - severityFor (Namespace _ ["FoundIntersection"]) _ = Just Info - severityFor (Namespace _ ["Termination"]) _ = Just Notice - severityFor _ _ = Nothing + namespaceFor = \case + TraceDownloadedHeader {} -> + Namespace [] ["DownloadedHeader"] + TraceRolledBack {} -> + Namespace [] ["RolledBack"] + TraceException {} -> + Namespace [] ["Exception"] + TraceFoundIntersection {} -> + Namespace [] ["FoundIntersection"] + TraceTermination {} -> + Namespace [] ["Termination"] + TraceValidatedHeader {} -> + Namespace [] ["ValidatedHeader"] + TraceWaitingBeyondForecastHorizon {} -> + Namespace [] ["WaitingBeyondForecastHorizon"] + TraceAccessingForecastHorizon {} -> + Namespace [] ["AccessingForecastHorizon"] + TraceGaveLoPToken {} -> + Namespace [] ["GaveLoPToken"] + + severityFor ns _ = + case ns of + Namespace _ ["DownloadedHeader"] -> + Just Info + Namespace _ ["RolledBack"] -> + Just Notice + Namespace _ ["Exception"] -> + Just Warning + Namespace _ ["FoundIntersection"] -> + Just Info + Namespace _ ["Termination"] -> + Just Notice + Namespace _ ["ValidatedHeader"] -> + Just Debug + Namespace _ ["WaitingBeyondForecastHorizon"] -> + Just Debug + Namespace _ ["AccessingForecastHorizon"] -> + Just Debug + Namespace _ ["GaveLoPToken"] -> + Just Debug + _ -> + Nothing - documentFor (Namespace _ ["DownloadedHeader"]) = Just $ mconcat - [ "While following a candidate chain, we rolled forward by downloading a" - , " header." - ] - documentFor (Namespace _ ["RolledBack"]) = Just - "While following a candidate chain, we rolled back to the given point." - documentFor (Namespace _ ["Exception"]) = Just - "An exception was thrown by the Chain Sync Client." - documentFor (Namespace _ ["FoundIntersection"]) = Just $ mconcat - [ "We found an intersection between our chain fragment and the" - , " candidate's chain." - ] - documentFor (Namespace _ ["Termination"]) = Just - "The client has terminated." - documentFor _ = Nothing + documentFor ns = + case ns of + Namespace _ ["DownloadedHeader"] -> + Just $ mconcat + [ "While following a candidate chain, we rolled forward by downloading a" + , " header." + ] + Namespace _ ["RolledBack"] -> + Just "While following a candidate chain, we rolled back to the given point." + Namespace _ ["Exception"] -> + Just "An exception was thrown by the Chain Sync Client." + Namespace _ ["FoundIntersection"] -> + Just $ mconcat + [ "We found an intersection between our chain fragment and the" + , " candidate's chain." + ] + Namespace _ ["Termination"] -> + Just "The client has terminated." + Namespace _ ["ValidatedHeader"] -> + Just "The header has been validated" + Namespace _ ["WaitingBeyondForecastHorizon"] -> + Just "The slot number is beyond the forecast horizon" + Namespace _ ["AccessingForecastHorizon"] -> + Just "The slot number, which was previously beyond the forecast horizon, has now entered it" + Namespace _ ["GaveLoPToken"] -> + Just "May have added atoken to the LoP bucket of the peer" + _ -> + Nothing allNamespaces = - [ - Namespace [] ["DownloadedHeader"] + [ Namespace [] ["DownloadedHeader"] , Namespace [] ["RolledBack"] , Namespace [] ["Exception"] , Namespace [] ["FoundIntersection"] , Namespace [] ["Termination"] + , Namespace [] ["ValidatedHeader"] + , Namespace [] ["WaitingBeyondForecastHorizon"] + , Namespace [] ["AccessingForecastHorizon"] + , Namespace [] ["GaveLoPToken"] ] -------------------------------------------------------------------------------- @@ -1742,39 +1839,66 @@ instance MetaTrace (TraceKeepAliveClient remotePeer) where instance ( LogFormatting selection , Show selection ) => LogFormatting (TraceGsmEvent selection) where - forMachine dtal (GsmEventEnterCaughtUp i s) = - mconcat - [ "kind" .= String "GsmEventEnterCaughtUp" - , "peerNumber" .= i - , "currentSelection" .= forMachine dtal s - ] - forMachine dtal (GsmEventLeaveCaughtUp s a) = - mconcat - [ "kind" .= String "GsmEventLeaveCaughtUp" - , "currentSelection" .= forMachine dtal s - , "age" .= toJSON (show a) - ] + forMachine dtal = + \case + GsmEventEnterCaughtUp i s -> + mconcat + [ "kind" .= String "GsmEventEnterCaughtUp" + , "peerNumber" .= i + , "currentSelection" .= forMachine dtal s + ] + GsmEventLeaveCaughtUp s a -> + mconcat + [ "kind" .= String "GsmEventLeaveCaughtUp" + , "currentSelection" .= forMachine dtal s + , "age" .= toJSON (show a) + ] + GsmEventPreSyncingToSyncing -> + mconcat + [ "kind" .= String "GsmEventPreSyncingToSyncing" + ] + GsmEventSyncingToPreSyncing -> + mconcat + [ "kind" .= String "GsmEventSyncingToPreSyncing" + ] forHuman = showT instance MetaTrace (TraceGsmEvent selection) where - namespaceFor GsmEventEnterCaughtUp {} = Namespace [] ["EnterCaughtUp"] - namespaceFor GsmEventLeaveCaughtUp {} = Namespace [] ["LeaveCaughtUp"] - - severityFor (Namespace _ ["EnterCaughtUp"]) _ = Just Info - severityFor (Namespace _ ["LeaveCaughtUp"]) _ = Just Info - severityFor (Namespace _ _ ) _ = Nothing - - documentFor (Namespace _ ["EnterCaughtUp"]) = Just - "Node is caught up" - documentFor (Namespace _ ["LeaveCaughtUp"]) = Just - "Node is not caught up" - documentFor (Namespace _ _) = Nothing + namespaceFor = + \case + GsmEventEnterCaughtUp {} -> Namespace [] ["EnterCaughtUp"] + GsmEventLeaveCaughtUp {} -> Namespace [] ["LeaveCaughtUp"] + GsmEventPreSyncingToSyncing {} -> Namespace [] ["GsmEventPreSyncingToSyncing"] + GsmEventSyncingToPreSyncing {} -> Namespace [] ["GsmEventSyncingToPreSyncing"] + + severityFor ns _ = + case ns of + Namespace _ ["EnterCaughtUp"] -> Just Info + Namespace _ ["LeaveCaughtUp"] -> Just Info + Namespace _ ["GsmEventPreSyncingToSyncing"] -> Just Info + Namespace _ ["GsmEventSyncingToPreSyncing"] -> Just Info + Namespace _ _ -> Nothing + + documentFor = \case + Namespace _ ["EnterCaughtUp"] -> + Just "Node is caught up" + Namespace _ ["LeaveCaughtUp"] -> + Just "Node is not caught up" + + Namespace _ ["GsmEventPreSyncingToSyncing"] -> + Just "The Honest Availability Assumption is now satisfied" + Namespace _ ["GsmEventSyncingToPreSyncing"] -> + Just "The Honest Availability Assumption is no longer satisfied" + + Namespace _ _ -> + Nothing allNamespaces = - [ - Namespace [] ["EnterCaughtUp"] + [ Namespace [] ["EnterCaughtUp"] , Namespace [] ["LeaveCaughtUp"] + , Namespace [] ["GsmEventPreSyncingToSyncing"] + , Namespace [] ["GsmEventSyncingToPreSyncing"] ] instance ( StandardHash blk diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs index ef2c3d373b4..d20a0065f2c 100644 --- a/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs +++ b/cardano-node/src/Cardano/Tracing/OrphanInstances/Consensus.hs @@ -140,6 +140,10 @@ instance HasSeverityAnnotation (ChainDB.TraceEvent blk) where ChainDB.UpdateLedgerDbTraceEvent {} -> Debug ChainDB.ChainSelectionForFutureBlock{} -> Debug ChainDB.PipeliningEvent {} -> Debug + ChainDB.AddedReprocessLoEBlocksToQueue -> Debug + ChainDB.PoppedReprocessLoEBlocksFromQueue -> Debug + ChainDB.ChainSelectionLoEDebug _ _ -> Debug + getSeverityAnnotation (ChainDB.TraceLedgerReplayEvent ev) = case ev of LedgerDB.ReplayFromGenesis {} -> Info @@ -177,7 +181,7 @@ instance HasSeverityAnnotation (ChainDB.TraceEvent blk) where ChainDB.FollowerNewImmIterator {} -> Debug getSeverityAnnotation (ChainDB.TraceInitChainSelEvent ev) = case ev of ChainDB.StartedInitChainSelection{} -> Info - ChainDB.InitalChainSelected{} -> Info + ChainDB.InitialChainSelected{} -> Info ChainDB.InitChainSelValidation ev' -> case ev' of ChainDB.InvalidBlock{} -> Debug ChainDB.ValidCandidate {} -> Info @@ -236,6 +240,10 @@ instance HasSeverityAnnotation (TraceChainSyncClientEvent blk) where getSeverityAnnotation (TraceRolledBack _) = Notice getSeverityAnnotation (TraceException _) = Warning getSeverityAnnotation (TraceTermination _) = Notice + getSeverityAnnotation (TraceValidatedHeader _) = Debug + getSeverityAnnotation (TraceWaitingBeyondForecastHorizon _) = Debug + getSeverityAnnotation (TraceAccessingForecastHorizon _) = Debug + getSeverityAnnotation (TraceGaveLoPToken _ _ _) = Debug instance HasPrivacyAnnotation (TraceChainSyncServerEvent blk) @@ -487,6 +495,13 @@ instance ( ConvertRawHash blk "About to add block to queue: " <> renderRealPointAsPhrase pt FallingEdgeWith sz -> "Block added to queue: " <> renderRealPointAsPhrase pt <> " queue size " <> condenseT sz + ChainDB.AddedReprocessLoEBlocksToQueue -> + "Added request to queue to reprocess blocks postponed by LoE." + ChainDB.PoppedReprocessLoEBlocksFromQueue -> + "Poppped request from queue to reprocess blocks postponed by LoE." + ChainDB.ChainSelectionLoEDebug {} -> + "ChainDB LoE debug event" + ChainDB.PoppedBlockFromQueue edgePt -> case edgePt of RisingEdge -> @@ -604,7 +619,7 @@ instance ( ConvertRawHash blk ChainDB.FollowerNewImmIterator _ _ -> "FollowerNewImmIterator" ChainDB.TraceInitChainSelEvent ev -> case ev of ChainDB.StartedInitChainSelection -> "Started initial chain selection" - ChainDB.InitalChainSelected -> "Initial chain selected" + ChainDB.InitialChainSelected -> "Initial chain selected" ChainDB.InitChainSelValidation e -> case e of ChainDB.InvalidBlock _err _pt -> "Invalid block found during Initial chain selection, truncating the candidate and retrying to select a best candidate." ChainDB.ValidCandidate af -> "Valid candidate at tip " <> renderPointAsPhrase (AF.lastPoint af) @@ -764,6 +779,13 @@ instance ( StandardHash blk , "expected" .= String (pack $ show expect) , "actual" .= String (pack $ show act) ] + toObject _verb (CheckpointMismatch blockNumber hdrHashExpected hdrHashActual) = + mconcat + [ "kind" .= String "CheckpointMismatch" + , "blockNo" .= String (pack $ show blockNumber) + , "expected" .= String (pack $ show hdrHashExpected) + , "actual" .= String (pack $ show hdrHashActual) + ] toObject verb (OtherHeaderEnvelopeError err) = toObject verb err @@ -973,6 +995,20 @@ instance ( ConvertRawHash blk mconcat [ "kind" .= String "TraceAddBlockEvent.PipeliningEvent.OutdatedTentativeHeader" , "block" .= renderPointForVerbosity verb (blockPoint hdr) ] + ChainDB.AddedReprocessLoEBlocksToQueue -> + mconcat [ "kind" .= String "AddedReprocessLoEBlocksToQueue" ] + ChainDB.PoppedReprocessLoEBlocksFromQueue -> + mconcat [ "kind" .= String "PoppedReprocessLoEBlocksFromQueue" ] + ChainDB.ChainSelectionLoEDebug curChain loeFrag -> + mconcat [ "kind" .= String "ChainSelectionLoEDebug" + , "curChain" .= headAndAnchor curChain + , "loeFrag" .= headAndAnchor loeFrag + ] + where + headAndAnchor frag = Aeson.object + [ "anchor" .= renderPointForVerbosity verb (AF.anchorPoint frag) + , "head" .= renderPointForVerbosity verb (AF.headPoint frag) + ] where addedHdrsNewChain @@ -1066,8 +1102,8 @@ instance ( ConvertRawHash blk ChainDB.FollowerNewImmIterator _ _ -> mconcat [ "kind" .= String "TraceFollowerEvent.FollowerNewImmIterator" ] toObject verb (ChainDB.TraceInitChainSelEvent ev) = case ev of - ChainDB.InitalChainSelected -> - mconcat ["kind" .= String "TraceFollowerEvent.InitalChainSelected"] + ChainDB.InitialChainSelected -> + mconcat ["kind" .= String "TraceFollowerEvent.InitialChainSelected"] ChainDB.StartedInitChainSelection -> mconcat ["kind" .= String "TraceFollowerEvent.StartedInitChainSelection"] ChainDB.InitChainSelValidation ev' -> case ev' of @@ -1296,6 +1332,20 @@ instance (ConvertRawHash blk, LedgerSupportsProtocol blk) TraceTermination reason -> mconcat [ "kind" .= String "ChainSyncClientEvent.TraceTermination" , "reason" .= String (pack $ show reason) ] + TraceValidatedHeader h -> + mconcat [ "kind" .= String "ChainSyncClientEvent.TraceValidatedHeader" + , tipToObject (tipFromHeader h) ] + TraceWaitingBeyondForecastHorizon slotNo -> + mconcat [ "kind" .= String "ChainSyncClientEvent.TraceWaitingBeyondForecastHorizon" + , "slot" .= condense slotNo ] + TraceAccessingForecastHorizon slotNo -> + mconcat [ "kind" .= String "ChainSyncClientEvent.TraceAccessingForecastHorizon" + , "slot" .= condense slotNo ] + TraceGaveLoPToken tokenGiven h bestBlockNumberPriorToH -> + mconcat [ "kind" .= String "ChainSyncClientEvent.TraceGaveLoPToken" + , "given" .= tokenGiven + , tipToObject (tipFromHeader h) + , "blockNo" .= bestBlockNumberPriorToH ] instance ConvertRawHash blk => ToObject (TraceChainSyncServerEvent blk) where @@ -1530,6 +1580,14 @@ instance ToObject selection => ToObject (TraceGsmEvent selection) where , "currentSelection" .= toObject verb s , "age" .= toJSON (show a) ] + toObject _verb GsmEventPreSyncingToSyncing = + mconcat + [ "kind" .= String "GsmEventPreSyncingToSyncing" + ] + toObject _verb GsmEventSyncingToPreSyncing = + mconcat + [ "kind" .= String "GsmEventSyncingToPreSyncing" + ] instance ConvertRawHash blk => ToObject (Tip blk) where toObject _verb TipGenesis = diff --git a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs index 361a256724e..4c91ab5695f 100644 --- a/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs +++ b/cardano-node/src/Cardano/Tracing/OrphanInstances/Shelley.hs @@ -40,7 +40,7 @@ import qualified Cardano.Ledger.Babbage.Rules as Babbage import Cardano.Ledger.BaseTypes (activeSlotLog, strictMaybeToMaybe) import Cardano.Ledger.Chain import Cardano.Ledger.Conway.Governance (govActionIdToText) -import Cardano.Ledger.Conway.Rules () +import Cardano.Ledger.Conway.Rules (ConwayUtxosPredFailure) import qualified Cardano.Ledger.Conway.Rules as Conway import qualified Cardano.Ledger.Core as Core import qualified Cardano.Ledger.Core as Ledger @@ -116,7 +116,7 @@ instance ( ToObject (PredicateFailure (Core.EraRule "LEDGER" ledgerera)) ) => ToObject (ApplyTxError ledgerera) where toObject verb (ApplyTxError predicateFailures) = - mconcat $ map (toObject verb) predicateFailures + mconcat $ NonEmpty.toList $ fmap (toObject verb) predicateFailures instance Core.Crypto crypto => ToObject (TPraosCannotForge crypto) where toObject _verb (TPraosCannotForgeKeyNotUsableYet wallClockPeriod keyStartPeriod) = @@ -137,7 +137,7 @@ instance ) => ToObject (ShelleyLedgerError ledgerera) where toObject verb (BBodyError (BlockTransitionError fs)) = mconcat [ "kind" .= String "BBodyError" - , "failures" .= map (toObject verb) fs + , "failures" .= fmap (toObject verb) fs ] instance @@ -184,6 +184,13 @@ instance ToObject (Conway.ConwayGovCertPredFailure era) where , "credential" .= String (textShow kHash) , "error" .= String "Committee has resigned" ] + Conway.ConwayDRepIncorrectRefund givenRefund expectedRefund -> + [ "kind" .= String "ConwayDRepIncorrectRefund" + , "givenRefund" .= String (textShow givenRefund) + , "expectedRefund" .= String (textShow expectedRefund) + , "error" .= String "Refund given does not match the expected one" + ] + instance ToObject (Conway.ConwayDelegPredFailure era) where toObject _verb = mconcat . \case @@ -245,7 +252,7 @@ instance Core.Crypto crypto => ToObject (UpdateState crypto) where instance Core.Crypto crypto => ToObject (ChainTransitionError crypto) where toObject verb (ChainTransitionError fs) = mconcat [ "kind" .= String "ChainTransitionError" - , "failures" .= map (toObject verb) fs + , "failures" .= fmap (toObject verb) fs ] instance ToObject ChainPredicateFailure where @@ -307,17 +314,13 @@ instance instance - ( ToObject (PredicateFailure (ShelleyUTXO ledgerera)) - , ToObject (PredicateFailure (ShelleyUTXOW ledgerera)) - , ToObject (PredicateFailure (Core.EraRule "LEDGER" ledgerera)) + ( ToObject (PredicateFailure (Core.EraRule "LEDGER" ledgerera)) ) => ToObject (ShelleyLedgersPredFailure ledgerera) where toObject verb (LedgerFailure f) = toObject verb f instance - ( ToObject (PredicateFailure (ShelleyUTXO ledgerera)) - , ToObject (PredicateFailure (ShelleyUTXOW ledgerera)) - , ToObject (PredicateFailure (Core.EraRule "DELEGS" ledgerera)) + ( ToObject (PredicateFailure (Core.EraRule "DELEGS" ledgerera)) , ToObject (PredicateFailure (Core.EraRule "UTXOW" ledgerera)) ) => ToObject (ShelleyLedgerPredFailure ledgerera) where toObject verb (UtxowFailure f) = toObject verb f @@ -411,7 +414,7 @@ instance instance ( Api.ShelleyLedgerEra era ~ ledgerera , Api.IsShelleyBasedEra era - , ToObject (PPUPPredFailure ledgerera) + , ToObject (Ledger.EraRuleFailure "PPUP" ledgerera) , ToObject (PredicateFailure (Ledger.EraRule "UTXO" ledgerera)) , Ledger.EraCrypto ledgerera ~ StandardCrypto , Show (Ledger.Value ledgerera) @@ -461,8 +464,7 @@ instance (Api.shelleyBasedEra :: Api.ShelleyBasedEra era) instance - ( ToObject (PredicateFailure (ShelleyUTXO ledgerera)) - , ToObject (PredicateFailure (Core.EraRule "UTXO" ledgerera)) + ( ToObject (PredicateFailure (Core.EraRule "UTXO" ledgerera)) , Ledger.EraCrypto ledgerera ~ StandardCrypto , Core.Crypto (Ledger.EraCrypto ledgerera) ) => ToObject (ShelleyUtxowPredFailure ledgerera) where @@ -509,7 +511,7 @@ instance ] instance - ( ToObject (PPUPPredFailure ledgerera) + ( ToObject (Ledger.EraRuleFailure "PPUP" ledgerera) , Show (Ledger.Value ledgerera) , ToJSON (Ledger.Value ledgerera) , ToJSON (Ledger.TxOut ledgerera) @@ -580,7 +582,7 @@ instance ToJSON Allegra.ValidityInterval where mbfield (SJust x) = [x] instance - ( ToObject (PPUPPredFailure ledgerera) + ( ToObject (Ledger.EraRuleFailure "PPUP" ledgerera) , ToJSON (Ledger.TxOut ledgerera) , Show (Ledger.Value ledgerera) , ToJSON (Ledger.Value ledgerera) @@ -1030,7 +1032,7 @@ instance ToObject (ShelleyUpecPredFailure era) where instance ( Ledger.Era ledgerera , ToObject (PredicateFailure (Ledger.EraRule "UTXOS" ledgerera)) - , ToObject (PPUPPredFailure ledgerera) + , ToObject (Ledger.EraRuleFailure "PPUP" ledgerera) , ToJSON (Ledger.TxOut ledgerera) , Show (Ledger.Value ledgerera) , ToJSON (Ledger.Value ledgerera) @@ -1134,7 +1136,7 @@ instance instance ( ToJSON (Alonzo.CollectError ledgerera) - , ToObject (PPUPPredFailure ledgerera) + , ToObject (Ledger.EraRuleFailure "PPUP" ledgerera) ) => ToObject (AlonzoUtxosPredFailure ledgerera) where toObject _ (Alonzo.ValidationTagMismatch isValidating reason) = mconcat [ "kind" .= String "ValidationTagMismatch" @@ -1190,7 +1192,7 @@ instance ( Ledger.Era ledgerera , ToObject (ShelleyUtxowPredFailure ledgerera) , ToObject (PredicateFailure (Ledger.EraRule "UTXOS" ledgerera)) - , ToObject (PPUPPredFailure ledgerera) + , ToObject (Ledger.EraRuleFailure "PPUP" ledgerera) , ToJSON (Ledger.TxOut ledgerera) , Show (Ledger.Value ledgerera) , ToJSON (Ledger.Value ledgerera) @@ -1210,13 +1212,18 @@ instance , "outputs" .= outputs ] + Babbage.BabbageNonDisjointRefInputs nonDisjointInputs -> + mconcat [ "kind" .= String "BabbageNonDisjointRefInputs" + , "outputs" .= nonDisjointInputs + ] + instance ( Api.ShelleyLedgerEra era ~ ledgerera , Api.IsShelleyBasedEra era , Ledger.Era ledgerera , Ledger.EraCrypto ledgerera ~ StandardCrypto , Show (Ledger.Value ledgerera) - , ToObject (PPUPPredFailure ledgerera) + , ToObject (Ledger.EraRuleFailure "PPUP" ledgerera) , ToObject (PredicateFailure (Ledger.EraRule "UTXO" ledgerera)) , ToJSON (Ledger.Value ledgerera) , ToJSON (Ledger.TxOut ledgerera) @@ -1358,6 +1365,29 @@ instance Ledger.Crypto c => ToObject (PraosChainSelectView c) where where renderVRF = Text.decodeUtf8 . B16.encode . Crypto.getOutputVRFBytes +-------------------------------------------------------------------------------- +-- Conway related +-------------------------------------------------------------------------------- + +instance + ( ToJSON (Alonzo.CollectError ledgerera) + ) => ToObject (ConwayUtxosPredFailure ledgerera) where + toObject _ (Conway.ValidationTagMismatch isValidating reason) = + mconcat [ "kind" .= String "ValidationTagMismatch" + , "isvalidating" .= isValidating + , "reason" .= reason + ] + toObject _ (Conway.CollectErrors errors) = + mconcat [ "kind" .= String "CollectErrors" + , "errors" .= errors + ] + +-- We define this bogus instance as it is required by some of the +-- 'ToObject' instances in this module +instance ToObject (Ledger.VoidEraRule rule era) where + -- NOTE: There are no values of type 'Ledger.VoidEraRule rule era' + toObject _ = \case + -------------------------------------------------------------------------------- -- Helper functions -------------------------------------------------------------------------------- diff --git a/cardano-submit-api/cardano-submit-api.cabal b/cardano-submit-api/cardano-submit-api.cabal index f1fb46b0463..c9619845d2b 100644 --- a/cardano-submit-api/cardano-submit-api.cabal +++ b/cardano-submit-api/cardano-submit-api.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: cardano-submit-api -version: 3.2.2 +version: 8.10.0 synopsis: A web server that allows transactions to be POSTed to the cardano chain description: A web server that allows transactions to be POSTed to the cardano chain. homepage: https://github.com/intersectmbo/cardano-node @@ -39,9 +39,9 @@ library , aeson , async , bytestring - , cardano-api ^>= 8.42.0.0 + , cardano-api ^>= 8.44 , cardano-binary - , cardano-cli ^>= 8.21.0.0 + , cardano-cli ^>= 8.22 , cardano-crypto-class ^>= 2.1.2 , http-media , iohk-monitoring diff --git a/cardano-testnet/cardano-testnet.cabal b/cardano-testnet/cardano-testnet.cabal index f547ac94094..f2f754acc52 100644 --- a/cardano-testnet/cardano-testnet.cabal +++ b/cardano-testnet/cardano-testnet.cabal @@ -35,8 +35,8 @@ library , aeson-pretty , ansi-terminal , bytestring - , cardano-api ^>= 8.42.0.0 - , cardano-cli ^>= 8.21.0.0 + , cardano-api ^>= 8.44 + , cardano-cli ^>= 8.22 , cardano-crypto-class , cardano-crypto-wrapper , cardano-git-rev ^>= 0.2.2 @@ -204,6 +204,7 @@ test-suite cardano-testnet-test , cardano-ledger-core , cardano-ledger-shelley , cardano-node + , cardano-slotting , cardano-strict-containers ^>= 0.1 , cardano-testnet , containers diff --git a/cardano-testnet/files/data/conway/genesis.conway.spec.json b/cardano-testnet/files/data/conway/genesis.conway.spec.json index 6141e96d004..59c636fec60 100644 --- a/cardano-testnet/files/data/conway/genesis.conway.spec.json +++ b/cardano-testnet/files/data/conway/genesis.conway.spec.json @@ -24,6 +24,7 @@ "govActionDeposit": 1000000000, "dRepDeposit": 2000000, "dRepActivity": 20, + "minFeeRefScriptCostPerByte": 0, "constitution": { "anchor": { "url": "", @@ -32,6 +33,6 @@ }, "committee": { "members": {}, - "quorum": 0 + "threshold": 0 } } diff --git a/cardano-testnet/src/Testnet/Defaults.hs b/cardano-testnet/src/Testnet/Defaults.hs index fa479c3f9c6..c84dda1a17e 100644 --- a/cardano-testnet/src/Testnet/Defaults.hs +++ b/cardano-testnet/src/Testnet/Defaults.hs @@ -27,9 +27,9 @@ module Testnet.Defaults import Cardano.Api (AnyCardanoEra (..), CardanoEra (..), pshow) import qualified Cardano.Api.Shelley as Api -import Cardano.Ledger.Alonzo.Core (CoinPerWord (..), PParams (..)) -import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis (..)) -import Cardano.Ledger.Alonzo.Scripts +import Cardano.Ledger.Alonzo.Core (PParams (..)) +import Cardano.Ledger.Alonzo.Genesis (AlonzoGenesis) +import qualified Cardano.Ledger.Alonzo.Genesis as Ledger import Cardano.Ledger.BaseTypes import qualified Cardano.Ledger.BaseTypes as Ledger import Cardano.Ledger.Binary.Version () @@ -38,6 +38,7 @@ import Cardano.Ledger.Conway.Genesis import Cardano.Ledger.Conway.PParams import qualified Cardano.Ledger.Core as Ledger import Cardano.Ledger.Crypto (StandardCrypto) +import qualified Cardano.Ledger.Plutus as Ledger import qualified Cardano.Ledger.Shelley as Ledger import Cardano.Ledger.Shelley.Genesis import Cardano.Node.Configuration.Topology @@ -45,13 +46,14 @@ 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 Data.Bifunctor 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 @@ -62,7 +64,6 @@ import qualified Data.Text as Text import Data.Time (UTCTime) import Data.Typeable import qualified Data.Vector as Vector -import Data.Word import GHC.Stack import Lens.Micro import Numeric.Natural @@ -81,96 +82,32 @@ instance Api.Error AlonzoGenesisError where data AlonzoGenesisError = AlonzoGenErrTooMuchPrecision Rational - | AlonzoGenErrCostModels Api.ProtocolParametersConversionError + | AlonzoGenErrCostModels (Map Ledger.Language Ledger.CostModelError) deriving Show defaultAlonzoGenesis :: Either AlonzoGenesisError AlonzoGenesis defaultAlonzoGenesis = do - es <- checkBoundedRational priceExecStepsRat - ms <- checkBoundedRational priceMemStepsRat - let execPrices = Prices ms es - costModels <- first AlonzoGenErrCostModels - $ Api.toAlonzoCostModels apiCostModels - return $ AlonzoGenesis - { agCoinsPerUTxOWord = CoinPerWord $ Coin 34482 - , agCostModels = costModels - , agPrices = execPrices - , agMaxTxExUnits = maxTxExUnits - , agMaxBlockExUnits = maxBlockExUnits - , agMaxValSize = 5000 - , agCollateralPercentage = 150 - , agMaxCollateralInputs = 3 - } - where + 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 - priceExecStepsRat = promoteRatio $ 721 % (10000000 :: Word64) - priceMemStepsRat = promoteRatio $ 577 % (10000 :: Word64) + -- 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 - checkBoundedRational r = + pure genesis + where + checkBoundedRational :: BoundedRational a => a -> Either AlonzoGenesisError a + checkBoundedRational v = do + let r = unboundRational v case boundRational r of Nothing -> Left $ AlonzoGenErrTooMuchPrecision r Just s -> return s - maxTxExUnits = Api.toAlonzoExUnits - $ Api.ExecutionUnits - { Api.executionSteps = 10000000000 - , Api.executionMemory = 140000000 - } - maxBlockExUnits = Api.toAlonzoExUnits - $ Api.ExecutionUnits - { Api.executionSteps = 20000000000 - , Api.executionMemory = 62000000 - } - apiCostModels = - let pv1 = Api.AnyPlutusScriptVersion Api.PlutusScriptV1 - pv2 = Api.AnyPlutusScriptVersion Api.PlutusScriptV2 - pv3 = Api.AnyPlutusScriptVersion Api.PlutusScriptV3 - in mconcat [ Map.singleton pv1 defaultV1CostModel - , Map.singleton pv2 defaultV2CostModel - , Map.singleton pv3 defaultV3CostModel - ] - defaultV1CostModel = Api.CostModel - [ 205665, 812, 1, 1, 1000, 571, 0, 1, 1000, 24177, 4, 1, 1000, 32, 117366, 10475, 4 - , 23000, 100, 23000, 100, 23000, 100, 23000, 100, 23000, 100, 23000, 100, 100, 100 - , 23000, 100, 19537, 32, 175354, 32, 46417, 4, 221973, 511, 0, 1, 89141, 32, 497525 - , 14068, 4, 2, 196500, 453240, 220, 0, 1, 1, 1000, 28662, 4, 2, 245000, 216773, 62 - , 1, 1060367, 12586, 1, 208512, 421, 1, 187000, 1000, 52998, 1, 80436, 32, 43249, 32 - , 1000, 32, 80556, 1, 57667, 4, 1000, 10, 197145, 156, 1, 197145, 156, 1, 204924, 473 - , 1, 208896, 511, 1, 52467, 32, 64832, 32, 65493, 32, 22558, 32, 16563, 32, 76511, 32 - , 196500, 453240, 220, 0, 1, 1, 69522, 11687, 0, 1, 60091, 32, 196500, 453240, 220, 0 - , 1, 1, 196500, 453240, 220, 0, 1, 1, 806990, 30482, 4, 1927926, 82523, 4, 265318, 0 - , 4, 0, 85931, 32, 205665, 812, 1, 1, 41182, 32, 212342, 32, 31220, 32, 32696, 32, 43357 - , 32, 32247, 32, 38314, 32, 57996947, 18975, 10 - ] - defaultV2CostModel = Api.CostModel - [ 205665, 812, 1, 1, 1000, 571, 0, 1, 1000, 24177, 4, 1, 1000, 32, 117366, 10475, 4 - , 23000, 100, 23000, 100, 23000, 100, 23000, 100, 23000, 100, 23000, 100, 100, 100 - , 23000, 100, 19537, 32, 175354, 32, 46417, 4, 221973, 511, 0, 1, 89141, 32, 497525 - , 14068, 4, 2, 196500, 453240, 220, 0, 1, 1, 1000, 28662, 4, 2, 245000, 216773, 62 - , 1, 1060367, 12586, 1, 208512, 421, 1, 187000, 1000, 52998, 1, 80436, 32, 43249, 32 - , 1000, 32, 80556, 1, 57667, 4, 1000, 10, 197145, 156, 1, 197145, 156, 1, 204924, 473 - , 1, 208896, 511, 1, 52467, 32, 64832, 32, 65493, 32, 22558, 32, 16563, 32, 76511, 32 - , 196500, 453240, 220, 0, 1, 1, 69522, 11687, 0, 1, 60091, 32, 196500, 453240, 220, 0 - , 1, 1, 196500, 453240, 220, 0, 1, 1, 1159724, 392670, 0, 2, 806990, 30482, 4, 1927926 - , 82523, 4, 265318, 0, 4, 0, 85931, 32, 205665, 812, 1, 1, 41182, 32, 212342, 32, 31220 - , 32, 32696, 32, 43357, 32, 32247, 32, 38314, 32, 35892428, 10, 9462713, 1021, 10, 38887044 - , 32947, 10 - ] - defaultV3CostModel = Api.CostModel - [ 205665, 812, 1, 1, 1000, 571, 0, 1, 1000, 24177, 4, 1, 1000, 32, 117366, 10475, 4, 117366, 10475, 4, 832808, 18 - , 3209094, 6, 331451, 1, 65990684, 23097, 18, 114242, 18, 94393407 - , 87060, 18, 16420089, 18, 2145798, 36, 3795345, 12, 889023, 1, 204237282, 23271, 36, 129165, 36, 189977790 - , 85902, 36, 33012864, 36, 388443360, 1, 401885761, 72, 2331379, 72, 23000, 100, 23000, 100, 23000, 100, 23000, 100, 23000 - , 100, 23000, 100, 23000, 100, 23000, 100, 100, 100, 23000, 100 - , 19537, 32, 175354, 32, 46417, 4, 221973, 511, 0, 1, 89141, 32, 497525, 14068, 4, 2, 196500, 453240, 220, 0, 1, 1, 1000, 28662 - , 4, 2, 245000, 216773, 62, 1, 1060367, 12586, 1, 208512, 421, 1, 187000, 1000, 52998, 1, 80436, 32 - , 43249, 1000, 32, 32, 80556, 1, 57667, 4, 1927926, 82523, 4, 1000, 10, 197145, 156, 1, 197145, 156, 1, 204924, 473, 1, 208896 - , 511, 1, 52467, 32, 64832, 32, 65493, 32, 22558, 32, 16563, 32, 76511, 32, 196500, 453240, 220, 0 - , 1, 1, 69522, 11687, 0, 1, 60091, 32, 196500, 453240, 220, 0, 1, 1, 196500, 453240, 220, 0, 1, 1, 1159724, 392670, 0, 2, 806990 - , 30482, 4, 1927926, 82523, 4, 265318, 0, 4, 0, 85931, 32, 205665, 812, 1, 1, 41182 - , 32, 212342, 32, 31220, 32, 32696, 32, 43357, 32, 32247, 32, 38314, 32, 35190005, 10, 57996947, 18975, 10, 39121781, 32260, 10 - ] - defaultConwayGenesis :: ConwayGenesis StandardCrypto defaultConwayGenesis = let upPParams :: UpgradeConwayPParams Identity @@ -183,6 +120,7 @@ defaultConwayGenesis = , ucppGovActionDeposit = Coin 1_000_000 , ucppDRepDeposit = Coin 1_000_000 , ucppDRepActivity = EpochInterval 100 + , ucppMinFeeRefScriptCostPerByte = 0 %! 1 -- FIXME GARBAGE VALUE } drepVotingThresholds = DRepVotingThresholds { dvtMotionNoConfidence = 0 %! 1 diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs index 7120ba5996e..e6cc3b57c5f 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Babbage/Transaction.hs @@ -93,7 +93,8 @@ hprop_transaction = H.integrationRetryWorkspace 0 "babbage-transaction" $ \tempA -- This is the current calculated fee. -- It's a sanity check to see if anything has -- changed regarding fee calculation. - 228 H.=== txFee + -- 8.10 changed fee from 228 -> 330 + 330 H.=== txFee void $ execCli' execConfig [ "babbage", "transaction", "sign" diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/KesPeriodInfo.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/KesPeriodInfo.hs index e6af99a04d1..d90570dcf9a 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/KesPeriodInfo.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/KesPeriodInfo.hs @@ -23,6 +23,7 @@ import Prelude import Control.Monad import qualified Data.Aeson as Aeson import qualified Data.Aeson as J +import Data.Function import qualified Data.Map.Strict as Map import qualified Data.Text as Text import GHC.Stack (callStack) @@ -291,7 +292,7 @@ hprop_kes_period_info = H.integrationRetryWorkspace 2 "kes-period-info" $ \tempA H.failMessage callStack "cardano-cli query tip returned Nothing for EpochNo" Just currEpoch -> return currEpoch - let nodeHasMintedEpoch = currEpoch + 3 + let nodeHasMintedEpoch = currEpoch & succ & succ & succ currentEpoch <- waitUntilEpoch (Api.File configurationFile) (Api.File $ sprocketSystemName node1sprocket) diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/QuerySlotNumber.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/QuerySlotNumber.hs index 67702dcab84..0f05e087907 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/QuerySlotNumber.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/QuerySlotNumber.hs @@ -14,6 +14,7 @@ module Cardano.Testnet.Test.Cli.QuerySlotNumber import Cardano.Api +import Cardano.Slotting.Slot import Cardano.Testnet import Prelude @@ -58,7 +59,7 @@ hprop_querySlotNumber = H.integrationRetryWorkspace 2 "query-slot-number" $ \tem -- how many slots can the checked value differ from -- we have 1s precision for UTC timestamp CLI argument, so this value tells how many slots in 1s can be slotPrecision = round $ 1 / slotLength - epochSize = fromIntegral sgEpochLength :: Int + epochSize = fromIntegral (unEpochSize sgEpochLength) :: Int poolNode1 <- H.headM poolNodes poolSprocket1 <- H.noteShow $ nodeSprocket $ poolRuntime poolNode1 diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitutionSPO.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitutionSPO.hs index 2b5353212ab..c8d2fe034bc 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitutionSPO.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/ProposeNewConstitutionSPO.hs @@ -242,7 +242,7 @@ getConstitutionProposal nodeConfigFile socketPath maxEpoch = do . L.esLStateL . L.lsUTxOStateL . L.utxosGovStateL - . L.cgProposalsL + . L.cgsProposalsL govActions = Map.toList $ L.proposalsActionsMap proposals case map (second L.gasAction) govActions of (govActionId, L.NewConstitution _ _) : _ -> do diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/TreasuryGrowth.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/TreasuryGrowth.hs index 1f48d3c8eef..d4cd5ae18bd 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/TreasuryGrowth.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/TreasuryGrowth.hs @@ -53,7 +53,7 @@ prop_check_if_treasury_is_growing = H.integrationRetryWorkspace 0 "growing-treas H.noteIO (IO.canonicalizePath $ tempAbsPath' socketPath') (_condition, treasuryValues) <- H.leftFailM . runExceptT $ - Api.foldEpochState (File configurationFile) (Api.File socketPathAbs) Api.QuickValidation 10 M.empty handler + Api.foldEpochState (File configurationFile) (Api.File socketPathAbs) Api.QuickValidation (EpochNo 10) M.empty handler H.note_ $ "treasury for last 5 epochs: " <> show treasuryValues let treasuriesSortedByEpoch = diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json index 54898a20c81..8b55f872892 100644 --- a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json +++ b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersFileOut.json @@ -569,7 +569,17 @@ 10, 39121781, 32260, - 10 + 10, + 1292075, + 24469, + 74, + 0, + 1, + 936157, + 49601, + 237, + 0, + 1 ] }, "decentralization": null, diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt index d175ebb8b82..8b55f872892 100644 --- a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt +++ b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/protocolParametersOut.txt @@ -569,7 +569,17 @@ 10, 39121781, 32260, - 10 + 10, + 1292075, + 24469, + 74, + 0, + 1, + 936157, + 49601, + 237, + 0, + 1 ] }, "decentralization": null, @@ -607,4 +617,4 @@ "txFeeFixed": 0, "txFeePerByte": 1, "utxoCostPerByte": 4310 -} +} \ No newline at end of file diff --git a/configuration/cardano/mainnet-config-new-tracing.json b/configuration/cardano/mainnet-config-new-tracing.json index ded1956de71..da3f5775723 100644 --- a/configuration/cardano/mainnet-config-new-tracing.json +++ b/configuration/cardano/mainnet-config-new-tracing.json @@ -4,7 +4,7 @@ "ByronGenesisFile": "mainnet-byron-genesis.json", "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb", "ConwayGenesisFile": "mainnet-conway-genesis.json", - "ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e", + "ConwayGenesisHash": "49ef010ff0d13b090893a919bbc22022038a8b782faa0b1561a256b781672174", "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 3, "LastKnownBlockVersion-Minor": 0, diff --git a/configuration/cardano/mainnet-config.json b/configuration/cardano/mainnet-config.json index 66ea0712376..1db3fbca64f 100644 --- a/configuration/cardano/mainnet-config.json +++ b/configuration/cardano/mainnet-config.json @@ -4,7 +4,7 @@ "ByronGenesisFile": "mainnet-byron-genesis.json", "ByronGenesisHash": "5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb", "ConwayGenesisFile": "mainnet-conway-genesis.json", - "ConwayGenesisHash": "de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e", + "ConwayGenesisHash": "49ef010ff0d13b090893a919bbc22022038a8b782faa0b1561a256b781672174", "EnableP2P": true, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 3, diff --git a/configuration/cardano/mainnet-config.yaml b/configuration/cardano/mainnet-config.yaml index 00aab68e15d..1d6a2d3d9de 100644 --- a/configuration/cardano/mainnet-config.yaml +++ b/configuration/cardano/mainnet-config.yaml @@ -8,7 +8,7 @@ AlonzoGenesisHash: 7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed ByronGenesisFile: mainnet-byron-genesis.json ByronGenesisHash: 5f20df933584822601f9e3f8c024eb5eb252fe8cefb24d1317dc3d432e940ebb ConwayGenesisFile: mainnet-conway-genesis.json -ConwayGenesisHash: de609b281cb3d8ae91a9d63a00c87092975612d603aa54c0f1c6a781e33d6e1e +ConwayGenesisHash: 49ef010ff0d13b090893a919bbc22022038a8b782faa0b1561a256b781672174 ShelleyGenesisFile: mainnet-shelley-genesis.json ShelleyGenesisHash: 1a3be38bcbb7911969283716ad7aa550250226b76a61fc51cc9a9a35d9276d81 diff --git a/configuration/cardano/mainnet-conway-genesis.json b/configuration/cardano/mainnet-conway-genesis.json index 5f1de84e6eb..87c9bb30f57 100644 --- a/configuration/cardano/mainnet-conway-genesis.json +++ b/configuration/cardano/mainnet-conway-genesis.json @@ -1,29 +1,30 @@ { "poolVotingThresholds": { - "committeeNormal": 0.51, + "committeeNormal": 0.60, "committeeNoConfidence": 0.51, "hardForkInitiation": 0.51, - "motionNoConfidence": 0.51, - "ppSecurityGroup": 0.51 + "motionNoConfidence": 0.60, + "ppSecurityGroup": 0.60 }, "dRepVotingThresholds": { - "motionNoConfidence": 0.51, - "committeeNormal": 0.51, - "committeeNoConfidence": 0.51, - "updateToConstitution": 0.51, - "hardForkInitiation": 0.51, - "ppNetworkGroup": 0.51, - "ppEconomicGroup": 0.51, - "ppTechnicalGroup": 0.51, - "ppGovGroup": 0.51, - "treasuryWithdrawal": 0.51 + "motionNoConfidence": 0.67, + "committeeNormal": 0.67, + "committeeNoConfidence": 0.60, + "updateToConstitution": 0.75, + "hardForkInitiation": 0.60, + "ppNetworkGroup": 0.67, + "ppEconomicGroup": 0.67, + "ppTechnicalGroup": 0.67, + "ppGovGroup": 0.75, + "treasuryWithdrawal": 0.67 }, - "committeeMinSize": 0, - "committeeMaxTermLength": 200, - "govActionLifetime": 10, - "govActionDeposit": 1000000000, - "dRepDeposit": 2000000, + "committeeMinSize": 7, + "committeeMaxTermLength": 73, + "govActionLifetime": 6, + "govActionDeposit": 50000000000, + "dRepDeposit": 500000000, "dRepActivity": 20, + "minFeeRefScriptCostPerByte": 44, "constitution": { "anchor": { "url": "", @@ -33,6 +34,6 @@ "committee": { "members": { }, - "quorum": 0 + "threshold": 0.67 } } diff --git a/configuration/cardano/shelley_qa-alonzo-genesis.json b/configuration/cardano/shelley_qa-alonzo-genesis.json index cf8e5ef324e..de05d3d9e46 100644 --- a/configuration/cardano/shelley_qa-alonzo-genesis.json +++ b/configuration/cardano/shelley_qa-alonzo-genesis.json @@ -1,194 +1,188 @@ { - "lovelacePerUTxOWord": 34482, - "executionPrices": { - "prSteps": { - "numerator": 721, - "denominator": 10000000 - }, - "prMem": { - "numerator": 577, - "denominator": 10000 - } + "collateralPercentage": 150, + "costModels": { + "PlutusV1": [ + 197209, + 0, + 1, + 1, + 396231, + 621, + 0, + 1, + 150000, + 1000, + 0, + 1, + 150000, + 32, + 2477736, + 29175, + 4, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 29773, + 100, + 100, + 100, + 29773, + 100, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 1000, + 0, + 1, + 150000, + 32, + 150000, + 1000, + 0, + 8, + 148000, + 425507, + 118, + 0, + 1, + 1, + 150000, + 1000, + 0, + 8, + 150000, + 112536, + 247, + 1, + 150000, + 10000, + 1, + 136542, + 1326, + 1, + 1000, + 150000, + 1000, + 1, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 1, + 1, + 150000, + 1, + 150000, + 4, + 103599, + 248, + 1, + 103599, + 248, + 1, + 145276, + 1366, + 1, + 179690, + 497, + 1, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 148000, + 425507, + 118, + 0, + 1, + 1, + 61516, + 11218, + 0, + 1, + 150000, + 32, + 148000, + 425507, + 118, + 0, + 1, + 1, + 148000, + 425507, + 118, + 0, + 1, + 1, + 2477736, + 29175, + 4, + 0, + 82363, + 4, + 150000, + 5000, + 0, + 1, + 150000, + 32, + 197209, + 0, + 1, + 1, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 150000, + 32, + 3345831, + 1, + 1 + ] }, - "maxTxExUnits": { - "exUnitsMem": 10000000, - "exUnitsSteps": 10000000000 + "executionPrices": { + "prMem": 5.77e-2, + "prSteps": 7.21e-5 }, + "lovelacePerUTxOWord": 34482, "maxBlockExUnits": { "exUnitsMem": 50000000, "exUnitsSteps": 40000000000 }, - "maxValueSize": 5000, - "collateralPercentage": 150, "maxCollateralInputs": 3, - "costModels": { - "PlutusV1": { - "sha2_256-memory-arguments": 4, - "equalsString-cpu-arguments-constant": 1000, - "cekDelayCost-exBudgetMemory": 100, - "lessThanEqualsByteString-cpu-arguments-intercept": 103599, - "divideInteger-memory-arguments-minimum": 1, - "appendByteString-cpu-arguments-slope": 621, - "blake2b-cpu-arguments-slope": 29175, - "iData-cpu-arguments": 150000, - "encodeUtf8-cpu-arguments-slope": 1000, - "unBData-cpu-arguments": 150000, - "multiplyInteger-cpu-arguments-intercept": 61516, - "cekConstCost-exBudgetMemory": 100, - "nullList-cpu-arguments": 150000, - "equalsString-cpu-arguments-intercept": 150000, - "trace-cpu-arguments": 150000, - "mkNilData-memory-arguments": 32, - "lengthOfByteString-cpu-arguments": 150000, - "cekBuiltinCost-exBudgetCPU": 29773, - "bData-cpu-arguments": 150000, - "subtractInteger-cpu-arguments-slope": 0, - "unIData-cpu-arguments": 150000, - "consByteString-memory-arguments-intercept": 0, - "divideInteger-memory-arguments-slope": 1, - "divideInteger-cpu-arguments-model-arguments-slope": 118, - "listData-cpu-arguments": 150000, - "headList-cpu-arguments": 150000, - "chooseData-memory-arguments": 32, - "equalsInteger-cpu-arguments-intercept": 136542, - "sha3_256-cpu-arguments-slope": 82363, - "sliceByteString-cpu-arguments-slope": 5000, - "unMapData-cpu-arguments": 150000, - "lessThanInteger-cpu-arguments-intercept": 179690, - "mkCons-cpu-arguments": 150000, - "appendString-memory-arguments-intercept": 0, - "modInteger-cpu-arguments-model-arguments-slope": 118, - "ifThenElse-cpu-arguments": 1, - "mkNilPairData-cpu-arguments": 150000, - "lessThanEqualsInteger-cpu-arguments-intercept": 145276, - "addInteger-memory-arguments-slope": 1, - "chooseList-memory-arguments": 32, - "constrData-memory-arguments": 32, - "decodeUtf8-cpu-arguments-intercept": 150000, - "equalsData-memory-arguments": 1, - "subtractInteger-memory-arguments-slope": 1, - "appendByteString-memory-arguments-intercept": 0, - "lengthOfByteString-memory-arguments": 4, - "headList-memory-arguments": 32, - "listData-memory-arguments": 32, - "consByteString-cpu-arguments-intercept": 150000, - "unIData-memory-arguments": 32, - "remainderInteger-memory-arguments-minimum": 1, - "bData-memory-arguments": 32, - "lessThanByteString-cpu-arguments-slope": 248, - "encodeUtf8-memory-arguments-intercept": 0, - "cekStartupCost-exBudgetCPU": 100, - "multiplyInteger-memory-arguments-intercept": 0, - "unListData-memory-arguments": 32, - "remainderInteger-cpu-arguments-model-arguments-slope": 118, - "cekVarCost-exBudgetCPU": 29773, - "remainderInteger-memory-arguments-slope": 1, - "cekForceCost-exBudgetCPU": 29773, - "sha2_256-cpu-arguments-slope": 29175, - "equalsInteger-memory-arguments": 1, - "indexByteString-memory-arguments": 1, - "addInteger-memory-arguments-intercept": 1, - "chooseUnit-cpu-arguments": 150000, - "sndPair-cpu-arguments": 150000, - "cekLamCost-exBudgetCPU": 29773, - "fstPair-cpu-arguments": 150000, - "quotientInteger-memory-arguments-minimum": 1, - "decodeUtf8-cpu-arguments-slope": 1000, - "lessThanInteger-memory-arguments": 1, - "lessThanEqualsInteger-cpu-arguments-slope": 1366, - "fstPair-memory-arguments": 32, - "modInteger-memory-arguments-intercept": 0, - "unConstrData-cpu-arguments": 150000, - "lessThanEqualsInteger-memory-arguments": 1, - "chooseUnit-memory-arguments": 32, - "sndPair-memory-arguments": 32, - "addInteger-cpu-arguments-intercept": 197209, - "decodeUtf8-memory-arguments-slope": 8, - "equalsData-cpu-arguments-intercept": 150000, - "mapData-cpu-arguments": 150000, - "mkPairData-cpu-arguments": 150000, - "quotientInteger-cpu-arguments-constant": 148000, - "consByteString-memory-arguments-slope": 1, - "cekVarCost-exBudgetMemory": 100, - "indexByteString-cpu-arguments": 150000, - "unListData-cpu-arguments": 150000, - "equalsInteger-cpu-arguments-slope": 1326, - "cekStartupCost-exBudgetMemory": 100, - "subtractInteger-cpu-arguments-intercept": 197209, - "divideInteger-cpu-arguments-model-arguments-intercept": 425507, - "divideInteger-memory-arguments-intercept": 0, - "cekForceCost-exBudgetMemory": 100, - "blake2b-cpu-arguments-intercept": 2477736, - "remainderInteger-cpu-arguments-constant": 148000, - "tailList-cpu-arguments": 150000, - "encodeUtf8-cpu-arguments-intercept": 150000, - "equalsString-cpu-arguments-slope": 1000, - "lessThanByteString-memory-arguments": 1, - "multiplyInteger-cpu-arguments-slope": 11218, - "appendByteString-cpu-arguments-intercept": 396231, - "lessThanEqualsByteString-cpu-arguments-slope": 248, - "modInteger-memory-arguments-slope": 1, - "addInteger-cpu-arguments-slope": 0, - "equalsData-cpu-arguments-slope": 10000, - "decodeUtf8-memory-arguments-intercept": 0, - "chooseList-cpu-arguments": 150000, - "constrData-cpu-arguments": 150000, - "equalsByteString-memory-arguments": 1, - "cekApplyCost-exBudgetCPU": 29773, - "quotientInteger-memory-arguments-slope": 1, - "verifySignature-cpu-arguments-intercept": 3345831, - "unMapData-memory-arguments": 32, - "mkCons-memory-arguments": 32, - "sliceByteString-memory-arguments-slope": 1, - "sha3_256-memory-arguments": 4, - "ifThenElse-memory-arguments": 1, - "mkNilPairData-memory-arguments": 32, - "equalsByteString-cpu-arguments-slope": 247, - "appendString-cpu-arguments-intercept": 150000, - "quotientInteger-cpu-arguments-model-arguments-slope": 118, - "cekApplyCost-exBudgetMemory": 100, - "equalsString-memory-arguments": 1, - "multiplyInteger-memory-arguments-slope": 1, - "cekBuiltinCost-exBudgetMemory": 100, - "remainderInteger-memory-arguments-intercept": 0, - "sha2_256-cpu-arguments-intercept": 2477736, - "remainderInteger-cpu-arguments-model-arguments-intercept": 425507, - "lessThanEqualsByteString-memory-arguments": 1, - "tailList-memory-arguments": 32, - "mkNilData-cpu-arguments": 150000, - "chooseData-cpu-arguments": 150000, - "unBData-memory-arguments": 32, - "blake2b-memory-arguments": 4, - "iData-memory-arguments": 32, - "nullList-memory-arguments": 32, - "cekDelayCost-exBudgetCPU": 29773, - "subtractInteger-memory-arguments-intercept": 1, - "lessThanByteString-cpu-arguments-intercept": 103599, - "consByteString-cpu-arguments-slope": 1000, - "appendByteString-memory-arguments-slope": 1, - "trace-memory-arguments": 32, - "divideInteger-cpu-arguments-constant": 148000, - "cekConstCost-exBudgetCPU": 29773, - "encodeUtf8-memory-arguments-slope": 8, - "quotientInteger-cpu-arguments-model-arguments-intercept": 425507, - "mapData-memory-arguments": 32, - "appendString-cpu-arguments-slope": 1000, - "modInteger-cpu-arguments-constant": 148000, - "verifySignature-cpu-arguments-slope": 1, - "unConstrData-memory-arguments": 32, - "quotientInteger-memory-arguments-intercept": 0, - "equalsByteString-cpu-arguments-constant": 150000, - "sliceByteString-memory-arguments-intercept": 0, - "mkPairData-memory-arguments": 32, - "equalsByteString-cpu-arguments-intercept": 112536, - "appendString-memory-arguments-slope": 1, - "lessThanInteger-cpu-arguments-slope": 497, - "modInteger-cpu-arguments-model-arguments-intercept": 425507, - "modInteger-memory-arguments-minimum": 1, - "sha3_256-cpu-arguments-intercept": 0, - "verifySignature-memory-arguments": 1, - "cekLamCost-exBudgetMemory": 100, - "sliceByteString-cpu-arguments-intercept": 150000 - } - } + "maxTxExUnits": { + "exUnitsMem": 10000000, + "exUnitsSteps": 10000000000 + }, + "maxValueSize": 5000 } \ No newline at end of file diff --git a/configuration/cardano/shelley_qa-byron-genesis.json b/configuration/cardano/shelley_qa-byron-genesis.json index 8d0b1618d4b..869d3c89467 100644 --- a/configuration/cardano/shelley_qa-byron-genesis.json +++ b/configuration/cardano/shelley_qa-byron-genesis.json @@ -1,63 +1,62 @@ -{ "bootStakeholders": - { "94925aaf75acbd13570d247f5fd3edecdac5c78e867301807e7e6286": 1 - , "bf86466912514980741f69f9c3114d7fe9f3d8878ad269a70a33bd3d": 1 - , "ecc2f5fef133c93afe12187a309dc26033f45f3974b6e372053867d9": 1 +{ + "avvmDistr": {}, + "blockVersionData": { + "heavyDelThd": "300000000000", + "maxBlockSize": "2000000", + "maxHeaderSize": "2000000", + "maxProposalSize": "700", + "maxTxSize": "4096", + "mpcThd": "20000000000000", + "scriptVersion": 0, + "slotDuration": "20000", + "softforkRule": { + "initThd": "900000000000000", + "minThd": "600000000000000", + "thdDecrement": "50000000000000" + }, + "txFeePolicy": { + "multiplier": "43946000000", + "summand": "155381000000000" + }, + "unlockStakeEpoch": "18446744073709551615", + "updateImplicit": "10000", + "updateProposalThd": "100000000000000", + "updateVoteThd": "1000000000000" + }, + "bootStakeholders": { + "50edbd4a0f6f58387fcb1643457ec100b22b312a74a995a67c52003b": 1, + "79ee950420bb30d0460f4c468b6a638267b40ecbd17cdd4b009d0de5": 1, + "f9519425faad1097d31f34bd16f8e9bf22308d66da0556df22174625": 1 + }, + "heavyDelegation": { + "50edbd4a0f6f58387fcb1643457ec100b22b312a74a995a67c52003b": { + "cert": "3f117cc145405bf95919af619efd92cfb360435911c66421e48e1a0f1ac0accd87c25e9cd31579dadab44051a6d504e3c4bd91be2e8fdf468d946d81cd154809", + "delegatePk": "n3ZSsfCwTs5u1wf2dc6FbgijVbNsMeYhDsL56Q9ixm/mmlAM6baH/xTZKQ56cOS2AXF4Hu4pv0lWP0ojk8E5+w==", + "issuerPk": "Vtg7ptYWEoY8+2HmqA7QhB3UfmfeGWZHAy9LThmNMyzVS76vQw1jz7vNaDJX10OmDMFkiL3UweyddKQZZ+j6gg==", + "omega": 0 + }, + "79ee950420bb30d0460f4c468b6a638267b40ecbd17cdd4b009d0de5": { + "cert": "b8d74865d1837857803c9b618be8253897bc10e50b45b3993c0f5c13c0b1173835bf3e96fbf04cccbc94a12c5786023ede287ba825f9c193d84a8151f0911f09", + "delegatePk": "g+h1Ncr8O11CqVYNEuRcHk+ExC7DFJmwYwR8MdVFZP3aLFCLzuR/Q5WdueQaHhlQnLFH11uxrWlUfFf+2zLKGg==", + "issuerPk": "j/a0OEzGIazhtHfxrjLsCqeiX22SPoXunjyxPVXQod9hxJJ4Z+st9nzwnIaNlHZKIDj/h5KfgS8vG6il9EEdqg==", + "omega": 0 + }, + "f9519425faad1097d31f34bd16f8e9bf22308d66da0556df22174625": { + "cert": "3202b810145c291035318729207ef279ce520bbb5190bf406757a215613cad780f6534fa2ff2e48269915ee39397912579a026ff8741319c1bd70696834b9505", + "delegatePk": "Av1BL28n7Cw7VjC5YfYICAAfpDLownzsV2eKurrYh3XgB51yqqzfNr1rxkH6gcn6b3t0NcU1KvyCZFPN1Arvtg==", + "issuerPk": "ri35xUj10Jn+ZwwEa1vx9f9L+7i6leIno4dxssO1ECovrRtEynU//8eFRoPlz1wR4ZCMSfBiskQDtZqUpTaZ6w==", + "omega": 0 } -, "heavyDelegation": - { "94925aaf75acbd13570d247f5fd3edecdac5c78e867301807e7e6286": - { "omega": 0 - , "issuerPk": - "RVkON0ydikaw8TQEQ3bK4HN9GZXR81kwaLBgbik1iJvZ2GCUyXclZQQSdJ/Tgfta3AJ7RWpo7YOoRhHkG1q9FQ==" - , "delegatePk": - "Gy33Zcfi6SwTMqjKu/vuckTXtsDO5xIr7jpGwBSQxn/trNtYHr0aBWPSv0678AXj5T/gAuz8Tj2tl7pD9e4pYw==" - , "cert": - "c34020289919e1125489ed27d6b11ba93d47a87e8ee232f069916df457cde3f32648903e50570984d214a2cf7b58f3042c505c5f4484c393e3eade330f79a106" - } - , "bf86466912514980741f69f9c3114d7fe9f3d8878ad269a70a33bd3d": - { "omega": 0 - , "issuerPk": - "fJraV7nbk29dT6L0Wf6X8S8zgp3b3sGymDd0TX41xbRE+mU96ZZ6oLwSLa+2TRgCa6e71GOCtNeZGu+eNdQpfw==" - , "delegatePk": - "TV9Ru0NeVRT4hQmtAr5CBV5iWlhLCeu/DB6aPFPPthu020gwnJS7VhIIzn26Bfdg4HYq2W0UHXL4XN+0n9Xn8A==" - , "cert": - "53396a8dcd8ef896b5d49dceed13c11ee2f245658b8c68236402c5443de438232632b0eefab638a3f52bd686740e4355b20e844745d2ab6e456a726d77896404" - } - , "ecc2f5fef133c93afe12187a309dc26033f45f3974b6e372053867d9": - { "omega": 0 - , "issuerPk": - "yaQHEpeerdGNabatj5UJkCnHOApgcF7ZbskM/K7L0dqZXQz7VbomW/nasdxmER/b99r8NzpwW+iULxNEbv7yqA==" - , "delegatePk": - "AyoyRn/q6P4l6IkuyrHhDRlM/QfDgCCdRCHmsG53cafeanRIcX320GbWXuX17fQLbf5ZzxAc/svTR3cHIqHilw==" - , "cert": - "19734d0d61c97fe7b9f63cf5b0a1dc62e8fd4ef943b3312986d693a8ee4f2b1f75105c60eed99c4ff4f681629ea7a50e6963359cd2f904111dab4730d168330b" - } - } -, "startTime": 1597669200 -, "nonAvvmBalances": - { "FHnt4NL7yPXuxDkiWXYeRaYGtuLXGuFSazA2okS5s1UbRJin8xr8ySEAuZ6mcEY": - "15000000000000000" - } -, "blockVersionData": - { "scriptVersion": 0 - , "slotDuration": "20000" - , "maxBlockSize": "2000000" - , "maxHeaderSize": "2000000" - , "maxTxSize": "4096" - , "maxProposalSize": "700" - , "mpcThd": "20000000000000" - , "heavyDelThd": "300000000000" - , "updateVoteThd": "1000000000000" - , "updateProposalThd": "100000000000000" - , "updateImplicit": "10000" - , "softforkRule": - { "initThd": "900000000000000" - , "minThd": "600000000000000" - , "thdDecrement": "50000000000000" - } - , "txFeePolicy": - { "summand": "155381000000000" , "multiplier": "43946000000" } - , "unlockStakeEpoch": "18446744073709551615" - } -, "protocolConsts": { "k": 36, "protocolMagic": 3 } -, "avvmDistr": {} + }, + "nonAvvmBalances": { + "FHnt4NL7yPXvkoejcLdesSW6e7XQUC5yyVnfW8FYW4QTH2VHtmU3FRMHonLHmPj": "0", + "FHnt4NL7yPY3yKGAzSFJJCxJBbZaRQmDb34LRDvLkjRSeRsBnF6BLNfGd1evRCB": "0", + "FHnt4NL7yPYA4GPM9yrmzdtMdrmqyAgqhKT9GWzpMEeeAXM4F6uikvsY8dzHp8o": "30000000000000000", + "FHnt4NL7yPYCoPxaPPLdxR7ybBnuEASwZjqjj8qpkDZUDSCMXi3265EygJeT5VC": "0" + }, + "protocolConsts": { + "k": 36, + "protocolMagic": 3 + }, + "startTime": 1689206400 } diff --git a/configuration/cardano/shelley_qa-config.json b/configuration/cardano/shelley_qa-config.json index 89cde2156e2..1ea7035890a 100644 --- a/configuration/cardano/shelley_qa-config.json +++ b/configuration/cardano/shelley_qa-config.json @@ -1,18 +1,28 @@ { "AlonzoGenesisFile": "shelley_qa-alonzo-genesis.json", - "AlonzoGenesisHash": "fd77bbad445e6c438e2755d5e939a818d5d231316f882c7725988ebfac8442f8", + "AlonzoGenesisHash": "8bedcaea62107d8a79ed5293b0027b3f8706a4bc2422f33380cb1fd01c6fa6ec", "ByronGenesisFile": "shelley_qa-byron-genesis.json", - "ByronGenesisHash": "9325495d3ac7554d4bfaf2392cc3c74676d5add873d6ef8862d7562e660940bf", + "ByronGenesisHash": "273cd12237b98d02f108c9c50063d29a8d1d7f32e9a75ade7cd48e08b3070258", + "ConwayGenesisFile": "shelley_qa-conway-genesis.json", + "ConwayGenesisHash": "49ef010ff0d13b090893a919bbc22022038a8b782faa0b1561a256b781672174", + "EnableP2P": true, + "ExperimentalHardForksEnabled": true, + "ExperimentalProtocolsEnabled": true, "LastKnownBlockVersion-Alt": 0, "LastKnownBlockVersion-Major": 3, "LastKnownBlockVersion-Minor": 1, - "MaxKnownMajorProtocolVersion": 2, - "PBftSignatureThreshold": 0.9, "Protocol": "Cardano", "RequiresNetworkMagic": "RequiresMagic", "ShelleyGenesisFile": "shelley_qa-shelley-genesis.json", - "ShelleyGenesisHash": "85d1783750753deaa6560158eb85fcb30078ea32a36e12dd8af39168bc053d09", - "TestShelleyHardForkAtEpoch": 2, + "ShelleyGenesisHash": "73a9f6bdb0aa97f5e63190a6f14a702bd64a21f2bec831cbfc28f6037128b952", + "TargetNumberOfActivePeers": 20, + "TargetNumberOfEstablishedPeers": 50, + "TargetNumberOfKnownPeers": 100, + "TargetNumberOfRootPeers": 100, + "TestAllegraHardForkAtEpoch": 0, + "TestAlonzoHardForkAtEpoch": 0, + "TestMaryHardForkAtEpoch": 0, + "TestShelleyHardForkAtEpoch": 0, "TraceAcceptPolicy": true, "TraceBlockFetchClient": false, "TraceBlockFetchDecisions": false, @@ -30,13 +40,14 @@ "TraceDiffusionInitialization": true, "TraceErrorPolicy": true, "TraceForge": true, - "TraceHandshake": false, + "TraceHandshake": true, "TraceInboundGovernor": true, "TraceIpSubscription": true, "TraceLedgerPeers": true, "TraceLocalChainSyncProtocol": false, + "TraceLocalConnectionManager": true, "TraceLocalErrorPolicy": true, - "TraceLocalHandshake": false, + "TraceLocalHandshake": true, "TraceLocalRootPeers": true, "TraceLocalTxSubmissionProtocol": false, "TraceLocalTxSubmissionServer": false, diff --git a/configuration/cardano/shelley_qa-conway-genesis.json b/configuration/cardano/shelley_qa-conway-genesis.json index 5f1de84e6eb..87c9bb30f57 100644 --- a/configuration/cardano/shelley_qa-conway-genesis.json +++ b/configuration/cardano/shelley_qa-conway-genesis.json @@ -1,29 +1,30 @@ { "poolVotingThresholds": { - "committeeNormal": 0.51, + "committeeNormal": 0.60, "committeeNoConfidence": 0.51, "hardForkInitiation": 0.51, - "motionNoConfidence": 0.51, - "ppSecurityGroup": 0.51 + "motionNoConfidence": 0.60, + "ppSecurityGroup": 0.60 }, "dRepVotingThresholds": { - "motionNoConfidence": 0.51, - "committeeNormal": 0.51, - "committeeNoConfidence": 0.51, - "updateToConstitution": 0.51, - "hardForkInitiation": 0.51, - "ppNetworkGroup": 0.51, - "ppEconomicGroup": 0.51, - "ppTechnicalGroup": 0.51, - "ppGovGroup": 0.51, - "treasuryWithdrawal": 0.51 + "motionNoConfidence": 0.67, + "committeeNormal": 0.67, + "committeeNoConfidence": 0.60, + "updateToConstitution": 0.75, + "hardForkInitiation": 0.60, + "ppNetworkGroup": 0.67, + "ppEconomicGroup": 0.67, + "ppTechnicalGroup": 0.67, + "ppGovGroup": 0.75, + "treasuryWithdrawal": 0.67 }, - "committeeMinSize": 0, - "committeeMaxTermLength": 200, - "govActionLifetime": 10, - "govActionDeposit": 1000000000, - "dRepDeposit": 2000000, + "committeeMinSize": 7, + "committeeMaxTermLength": 73, + "govActionLifetime": 6, + "govActionDeposit": 50000000000, + "dRepDeposit": 500000000, "dRepActivity": 20, + "minFeeRefScriptCostPerByte": 44, "constitution": { "anchor": { "url": "", @@ -33,6 +34,6 @@ "committee": { "members": { }, - "quorum": 0 + "threshold": 0.67 } } diff --git a/configuration/cardano/shelley_qa-shelley-genesis.json b/configuration/cardano/shelley_qa-shelley-genesis.json index d50a4e04291..e6aa88db9bc 100644 --- a/configuration/cardano/shelley_qa-shelley-genesis.json +++ b/configuration/cardano/shelley_qa-shelley-genesis.json @@ -1,52 +1,56 @@ { - "activeSlotsCoeff": 5.0e-2, - "protocolParams": { - "protocolVersion": { - "minor": 0, - "major": 2 + "activeSlotsCoeff": 5.0e-2, + "epochLength": 7200, + "genDelegs": { + "3ed8dd8d9637c5fb64ef950add70d5482c19c52cac82bdd17a7ae42e": { + "delegate": "451bbcfe22dc9c5b8cc4ad21c7b2815e021a2df52a1e43e7d77a9420", + "vrf": "7db2d5fdd3ccdae264bb087bbd8f5bb3393e9fe9c3d61070072ca873bf6c9f86" + }, + "4db37fb1de328572e88c4be152afd49ad68d192725391a56c19f37a9": { + "delegate": "2452a6adf035ca226e332aedc3af7a9cddec3b121223a9b7c26c471c", + "vrf": "cd974709ece7fc6ef0a939f0c21a5c4ab49a82c74b8c0af301edabeea453d703" + }, + "7d5a43fd31277b955c75d381383c49fca5629649305175578341b4d6": { + "delegate": "eac211a2828841be37031438fe2444a95374a1a6f3f59f040336e0f9", + "vrf": "11c1c8427e2af2c71f8e43207a57a8890b4a2ad67b64d771ca251e499e5e36bc" + } }, - "decentralisationParam": 1, - "eMax": 18, - "extraEntropy": { - "tag": "NeutralNonce" + "initialFunds": {}, + "maxKESEvolutions": 62, + "maxLovelaceSupply": 45000000000000000, + "networkId": "Testnet", + "networkMagic": 3, + "protocolParams": { + "a0": 0.3, + "decentralisationParam": 1.0, + "eMax": 18, + "extraEntropy": { + "tag": "NeutralNonce" + }, + "keyDeposit": 2000000, + "maxBlockBodySize": 65536, + "maxBlockHeaderSize": 1100, + "maxTxSize": 16384, + "minFeeA": 44, + "minFeeB": 155381, + "minPoolCost": 340000000, + "minUTxOValue": 1000000, + "nOpt": 150, + "poolDeposit": 500000000, + "protocolVersion": { + "major": 6, + "minor": 0 + }, + "rho": 3.0e-3, + "tau": 0.2 }, - "maxTxSize": 16384, - "maxBlockBodySize": 65536, - "maxBlockHeaderSize": 1100, - "minFeeA": 44, - "minFeeB": 155381, - "minUTxOValue": 1000000, - "poolDeposit": 500000000, - "minPoolCost": 340000000, - "keyDeposit": 2000000, - "nOpt": 150, - "rho": 0.003, - "tau": 0.20, - "a0": 0.3 - }, - "genDelegs": { - "489c900ca42a9e690678f777552f70cabcb49e28ad4126a902e1fbfa": { - "delegate": "a38dcd095ad126eac1f64d99ec64c3de63b14e90009f5e4b4e451b86", - "vrf": "df85ffa44aed49ef1e9dda28dab48592143668ac0fb1f1df1a8ec6b771223b53" + "securityParam": 36, + "slotLength": 1, + "slotsPerKESPeriod": 129600, + "staking": { + "pools": {}, + "stake": {} }, - "fe4a70e2858afa3487ac582eb7f8a9fb2538d186e71263beb497d017": { - "delegate": "399752c39cdc628950ec4a62c09482b6ba8d65f79bcd41d7ff620273", - "vrf": "64f241c7929da8e8fb5af2b4f7779fbb18e06e6240276fb54efdddda5b7d427b" - }, - "a5f87e4f6eac5fcfcaf18beadf14f4142e7bd26bac9e4951b2918811": { - "delegate": "ea6a83bfaba85ebf3dcf4fe9a701c991fabc2e229217734fea6ec5e2", - "vrf": "524fb631fd92ae561f09f7631a1c6239dc40f242b5f7bcc3a7840aac6b403643" - } - }, - "updateQuorum": 3, - "networkId": "Testnet", - "initialFunds": {}, - "maxLovelaceSupply": 45000000000000000, - "networkMagic": 3, - "epochLength": 7200, - "systemStart": "2020-08-17T13:00:00Z", - "slotsPerKESPeriod": 129600, - "slotLength": 1, - "maxKESEvolutions": 62, - "securityParam": 36 -} + "systemStart": "2023-07-13T00:00:00Z", + "updateQuorum": 3 +} \ No newline at end of file diff --git a/configuration/cardano/shelley_qa-topology.json b/configuration/cardano/shelley_qa-topology.json index d764c2eb033..124990d88e3 100644 --- a/configuration/cardano/shelley_qa-topology.json +++ b/configuration/cardano/shelley_qa-topology.json @@ -1,9 +1,23 @@ { - "Producers": [ + "bootstrapPeers": [ { - "addr": "relays-new.shelley-qa.dev.cardano.org", - "port": 3001, - "valency": 2 + "address": "shelley-qa-node.play.dev.cardano.org", + "port": 3001 } - ] + ], + "localRoots": [ + { + "accessPoints": [], + "advertise": false, + "trustable": false, + "valency": 1 + } + ], + "publicRoots": [ + { + "accessPoints": [], + "advertise": false + } + ], + "useLedgerAfterSlot": 19252750 } diff --git a/configuration/cardano/testnet-alonzo-genesis.json b/configuration/cardano/testnet-alonzo-genesis.json deleted file mode 100644 index 0fd90deeb7b..00000000000 --- a/configuration/cardano/testnet-alonzo-genesis.json +++ /dev/null @@ -1,196 +0,0 @@ -{ - "lovelacePerUTxOWord": 34482, - "executionPrices": { - "prSteps": - { - "numerator" : 721, - "denominator" : 10000000 - }, - "prMem": - { - "numerator" : 577, - "denominator" : 10000 - } - }, - "maxTxExUnits": { - "exUnitsMem": 10000000, - "exUnitsSteps": 10000000000 - }, - "maxBlockExUnits": { - "exUnitsMem": 50000000, - "exUnitsSteps": 40000000000 - }, - "maxValueSize": 5000, - "collateralPercentage": 150, - "maxCollateralInputs": 3, - "costModels": { - "PlutusV1": { - "sha2_256-memory-arguments": 4, - "equalsString-cpu-arguments-constant": 1000, - "cekDelayCost-exBudgetMemory": 100, - "lessThanEqualsByteString-cpu-arguments-intercept": 103599, - "divideInteger-memory-arguments-minimum": 1, - "appendByteString-cpu-arguments-slope": 621, - "blake2b-cpu-arguments-slope": 29175, - "iData-cpu-arguments": 150000, - "encodeUtf8-cpu-arguments-slope": 1000, - "unBData-cpu-arguments": 150000, - "multiplyInteger-cpu-arguments-intercept": 61516, - "cekConstCost-exBudgetMemory": 100, - "nullList-cpu-arguments": 150000, - "equalsString-cpu-arguments-intercept": 150000, - "trace-cpu-arguments": 150000, - "mkNilData-memory-arguments": 32, - "lengthOfByteString-cpu-arguments": 150000, - "cekBuiltinCost-exBudgetCPU": 29773, - "bData-cpu-arguments": 150000, - "subtractInteger-cpu-arguments-slope": 0, - "unIData-cpu-arguments": 150000, - "consByteString-memory-arguments-intercept": 0, - "divideInteger-memory-arguments-slope": 1, - "divideInteger-cpu-arguments-model-arguments-slope": 118, - "listData-cpu-arguments": 150000, - "headList-cpu-arguments": 150000, - "chooseData-memory-arguments": 32, - "equalsInteger-cpu-arguments-intercept": 136542, - "sha3_256-cpu-arguments-slope": 82363, - "sliceByteString-cpu-arguments-slope": 5000, - "unMapData-cpu-arguments": 150000, - "lessThanInteger-cpu-arguments-intercept": 179690, - "mkCons-cpu-arguments": 150000, - "appendString-memory-arguments-intercept": 0, - "modInteger-cpu-arguments-model-arguments-slope": 118, - "ifThenElse-cpu-arguments": 1, - "mkNilPairData-cpu-arguments": 150000, - "lessThanEqualsInteger-cpu-arguments-intercept": 145276, - "addInteger-memory-arguments-slope": 1, - "chooseList-memory-arguments": 32, - "constrData-memory-arguments": 32, - "decodeUtf8-cpu-arguments-intercept": 150000, - "equalsData-memory-arguments": 1, - "subtractInteger-memory-arguments-slope": 1, - "appendByteString-memory-arguments-intercept": 0, - "lengthOfByteString-memory-arguments": 4, - "headList-memory-arguments": 32, - "listData-memory-arguments": 32, - "consByteString-cpu-arguments-intercept": 150000, - "unIData-memory-arguments": 32, - "remainderInteger-memory-arguments-minimum": 1, - "bData-memory-arguments": 32, - "lessThanByteString-cpu-arguments-slope": 248, - "encodeUtf8-memory-arguments-intercept": 0, - "cekStartupCost-exBudgetCPU": 100, - "multiplyInteger-memory-arguments-intercept": 0, - "unListData-memory-arguments": 32, - "remainderInteger-cpu-arguments-model-arguments-slope": 118, - "cekVarCost-exBudgetCPU": 29773, - "remainderInteger-memory-arguments-slope": 1, - "cekForceCost-exBudgetCPU": 29773, - "sha2_256-cpu-arguments-slope": 29175, - "equalsInteger-memory-arguments": 1, - "indexByteString-memory-arguments": 1, - "addInteger-memory-arguments-intercept": 1, - "chooseUnit-cpu-arguments": 150000, - "sndPair-cpu-arguments": 150000, - "cekLamCost-exBudgetCPU": 29773, - "fstPair-cpu-arguments": 150000, - "quotientInteger-memory-arguments-minimum": 1, - "decodeUtf8-cpu-arguments-slope": 1000, - "lessThanInteger-memory-arguments": 1, - "lessThanEqualsInteger-cpu-arguments-slope": 1366, - "fstPair-memory-arguments": 32, - "modInteger-memory-arguments-intercept": 0, - "unConstrData-cpu-arguments": 150000, - "lessThanEqualsInteger-memory-arguments": 1, - "chooseUnit-memory-arguments": 32, - "sndPair-memory-arguments": 32, - "addInteger-cpu-arguments-intercept": 197209, - "decodeUtf8-memory-arguments-slope": 8, - "equalsData-cpu-arguments-intercept": 150000, - "mapData-cpu-arguments": 150000, - "mkPairData-cpu-arguments": 150000, - "quotientInteger-cpu-arguments-constant": 148000, - "consByteString-memory-arguments-slope": 1, - "cekVarCost-exBudgetMemory": 100, - "indexByteString-cpu-arguments": 150000, - "unListData-cpu-arguments": 150000, - "equalsInteger-cpu-arguments-slope": 1326, - "cekStartupCost-exBudgetMemory": 100, - "subtractInteger-cpu-arguments-intercept": 197209, - "divideInteger-cpu-arguments-model-arguments-intercept": 425507, - "divideInteger-memory-arguments-intercept": 0, - "cekForceCost-exBudgetMemory": 100, - "blake2b-cpu-arguments-intercept": 2477736, - "remainderInteger-cpu-arguments-constant": 148000, - "tailList-cpu-arguments": 150000, - "encodeUtf8-cpu-arguments-intercept": 150000, - "equalsString-cpu-arguments-slope": 1000, - "lessThanByteString-memory-arguments": 1, - "multiplyInteger-cpu-arguments-slope": 11218, - "appendByteString-cpu-arguments-intercept": 396231, - "lessThanEqualsByteString-cpu-arguments-slope": 248, - "modInteger-memory-arguments-slope": 1, - "addInteger-cpu-arguments-slope": 0, - "equalsData-cpu-arguments-slope": 10000, - "decodeUtf8-memory-arguments-intercept": 0, - "chooseList-cpu-arguments": 150000, - "constrData-cpu-arguments": 150000, - "equalsByteString-memory-arguments": 1, - "cekApplyCost-exBudgetCPU": 29773, - "quotientInteger-memory-arguments-slope": 1, - "verifySignature-cpu-arguments-intercept": 3345831, - "unMapData-memory-arguments": 32, - "mkCons-memory-arguments": 32, - "sliceByteString-memory-arguments-slope": 1, - "sha3_256-memory-arguments": 4, - "ifThenElse-memory-arguments": 1, - "mkNilPairData-memory-arguments": 32, - "equalsByteString-cpu-arguments-slope": 247, - "appendString-cpu-arguments-intercept": 150000, - "quotientInteger-cpu-arguments-model-arguments-slope": 118, - "cekApplyCost-exBudgetMemory": 100, - "equalsString-memory-arguments": 1, - "multiplyInteger-memory-arguments-slope": 1, - "cekBuiltinCost-exBudgetMemory": 100, - "remainderInteger-memory-arguments-intercept": 0, - "sha2_256-cpu-arguments-intercept": 2477736, - "remainderInteger-cpu-arguments-model-arguments-intercept": 425507, - "lessThanEqualsByteString-memory-arguments": 1, - "tailList-memory-arguments": 32, - "mkNilData-cpu-arguments": 150000, - "chooseData-cpu-arguments": 150000, - "unBData-memory-arguments": 32, - "blake2b-memory-arguments": 4, - "iData-memory-arguments": 32, - "nullList-memory-arguments": 32, - "cekDelayCost-exBudgetCPU": 29773, - "subtractInteger-memory-arguments-intercept": 1, - "lessThanByteString-cpu-arguments-intercept": 103599, - "consByteString-cpu-arguments-slope": 1000, - "appendByteString-memory-arguments-slope": 1, - "trace-memory-arguments": 32, - "divideInteger-cpu-arguments-constant": 148000, - "cekConstCost-exBudgetCPU": 29773, - "encodeUtf8-memory-arguments-slope": 8, - "quotientInteger-cpu-arguments-model-arguments-intercept": 425507, - "mapData-memory-arguments": 32, - "appendString-cpu-arguments-slope": 1000, - "modInteger-cpu-arguments-constant": 148000, - "verifySignature-cpu-arguments-slope": 1, - "unConstrData-memory-arguments": 32, - "quotientInteger-memory-arguments-intercept": 0, - "equalsByteString-cpu-arguments-constant": 150000, - "sliceByteString-memory-arguments-intercept": 0, - "mkPairData-memory-arguments": 32, - "equalsByteString-cpu-arguments-intercept": 112536, - "appendString-memory-arguments-slope": 1, - "lessThanInteger-cpu-arguments-slope": 497, - "modInteger-cpu-arguments-model-arguments-intercept": 425507, - "modInteger-memory-arguments-minimum": 1, - "sha3_256-cpu-arguments-intercept": 0, - "verifySignature-memory-arguments": 1, - "cekLamCost-exBudgetMemory": 100, - "sliceByteString-cpu-arguments-intercept": 150000 - } - } -} diff --git a/configuration/cardano/testnet-byron-genesis.json b/configuration/cardano/testnet-byron-genesis.json deleted file mode 100644 index 79fde9c2019..00000000000 --- a/configuration/cardano/testnet-byron-genesis.json +++ /dev/null @@ -1,481 +0,0 @@ -{ "bootStakeholders": - { "182822494f30b89a5cb9a6d845d9733a1831eb4e5ebc8faca89becc4": 1 - , "37ec19ad6c732dea93f8b39e0dcbef7d45044983d99195eb7034901c": 1 - , "3c1c3b43032f1f7a346cb8070c75474715ec8f1d301411a69def9ab2": 1 - , "6275f793595cae0761f13ecd054a0f01d0f57726ade0933e88a05749": 1 - , "9a804607ce670b2d5e60e9b4fdc54b99acf6d66837132e6bdc621ba5": 1 - , "9bfb38ba283fb3c8e552b440c17d0ef32725c39219565e9190454a57": 1 - , "e471e138c71dfff3d326b75548a1c518e694d13e85a3b0ae91df9941": 1 - } -, "heavyDelegation": - { "9bfb38ba283fb3c8e552b440c17d0ef32725c39219565e9190454a57": - { "omega": 0 - , "issuerPk": - "y1HSmrlOUNmhRNT0JlZM7HAN7k2ehXqs+R07aJN02B90KkUoGM8kicFt/Bhvbpx2t99AhFt8RQeF8C2ICXZ1dQ==" - , "delegatePk": - "fsJJ2JDQqvmoEgeWDBY64tasXnFcprltWGDlDZ8rKyodVo+qh8nMi/1DOjIkqW7F0QG0tunbAI24hX9JuuKUsg==" - , "cert": - "a304bf45b44fbccc78f54b9014a6b2d4354631ebff235aebb2e71a15bdd582be3794384c1ba713b99ef05766e92b8f438b2fc5af349f2bb16e85e3780aa84c07" - } - , "37ec19ad6c732dea93f8b39e0dcbef7d45044983d99195eb7034901c": - { "omega": 0 - , "issuerPk": - "nw+fw9f3biUiBZVS6H4G2vlAtFgaF5rsd/OQVmKkGGWv2lr820QVemFc7G/xmtOZ2bAyjcgrx/NRPUCRC3+TSg==" - , "delegatePk": - "MqlUtSHAsZUUQIllgx72g5Y33noaYWi8+EVcUEupO5yFNJi9rgYKb8mUXXIxrgjRMXq7szMGyTRl5e8RjuvHGA==" - , "cert": - "3fbff2edf71960355b30d89b946d4732c88e66dfb859bb143d2cd368b923cdf7d9bd22c4901cb47bade479a7c0eda08470cc9f3a2cb20c92b3a20974fc066900" - } - , "9a804607ce670b2d5e60e9b4fdc54b99acf6d66837132e6bdc621ba5": - { "omega": 0 - , "issuerPk": - "KedfHXp2SA8aETBEmrXZoOAUwJiFDKFSA3gq3rdWGoG7Mid0F0kSWzK3C6Y8QDIvRnao1lfZpXmghht8L0wCcg==" - , "delegatePk": - "52SwNA17NT9fdFiRAzd05L6raqFFilT/KaEyTAW7mHa1dM9ZKg+G/dH7+vvt3p4izpUiWy8RhRYpOszYygswFg==" - , "cert": - "06682af4df67b2037337187f9397bb8042e37308da1429ec9063e42480f9da60379d929f705140f05f1d014f19c668071824c0d86b616794e544d935e379c80e" - } - , "182822494f30b89a5cb9a6d845d9733a1831eb4e5ebc8faca89becc4": - { "omega": 0 - , "issuerPk": - "U6JXlR27xStIbWOjpfzqVVy5rp73La1i5znqNsI94+xYpOzGmlOVYiYF88N5OZ82wDBtl1UB9A+bWXNa0oCapg==" - , "delegatePk": - "5bwhqDYWvMz+ND7Da53EwGyQ6RPfHYoLBGAIZR9CyqlKrob7/cRYbavVR6fpLQdwLjMrzJ5911MjncgNAzxZwg==" - , "cert": - "d173106bfaab665a30e71633719754e0416927cfdadd6fbf7013590ddc9843083e18efcd08e4c7c366f4c4fff257177c87a502913f35bb1a07e45607c5d1fa0a" - } - , "e471e138c71dfff3d326b75548a1c518e694d13e85a3b0ae91df9941": - { "omega": 0 - , "issuerPk": - "HISQWQHTy1IdXEM7sTpZDNIQO0alFI++YFE6sAD5lN1BNDzTDSzDfUeaoAVWBvT/L5LcHdRzsjRgnPcOOm28gg==" - , "delegatePk": - "T011I+QeBYpsve+1U4ZU/8KlNBan9buZ9+rGmdQtXB8TdXbpwo6fFLPG4IIS8jjYbW4BrPJpf3teR9qWOSZeMQ==" - , "cert": - "018a7ee167602da08bf7d6903c37d2524ebe2a5daad83f9bf25f6011622932e72fc7c48027b9d4efaef521c911ec9eebaa38ddf88e6ae27c9bb823770fcd2600" - } - , "3c1c3b43032f1f7a346cb8070c75474715ec8f1d301411a69def9ab2": - { "omega": 0 - , "issuerPk": - "276WEVFXba36w7tXnsKxwUfACqTO4Dx+vvSVoOo4KUCqBgPahpnaCca9yjIPzWhVC6iyrHkZ570z7VjF2drNRA==" - , "delegatePk": - "c65B7KK+N/wVxVpQ1mjIZH4QvyIhcsLVir+m6TEOWWI/jyb47cHOj2mL1dyf6qMay8Nkv/b7gdND/zgm692NVQ==" - , "cert": - "b2c8e6ff8fc380c4a4c4e16f909803e786ccfbf4267e5016e24a34a843093b4d81736939500fb6fdd358d2be2b255858ea1abc35f62d381d6c62d111d1f0c80d" - } - , "6275f793595cae0761f13ecd054a0f01d0f57726ade0933e88a05749": - { "omega": 0 - , "issuerPk": - "bO9W1q+IRfMXlJvN/5I1jxOU/hG0XAKyjh1YVMD6E/jgeWRN/FBBr7D8vR9H7HzgZPN7fsXAcMeEpWGeuuKqYA==" - , "delegatePk": - "37YVphVo1oZ/RahcMiJ/JwJRgNc4qKPX/TySn2JNcjkpgBs0NkHxSAh7EX6H6WlfIV28+DD/DVigZmgsdgP2QQ==" - , "cert": - "a9c6e4abf95755084a86625a98e185de75d4d33d557284d3aa67ecff3dcfd8e77994fc8b3fc4c2762879ca0c15458ade936db0977ae10dd01291cf3241b9530e" - } - } -, "startTime": 1563999616 -, "vssCerts": - { "60214fff2df8faabc7da2dc99c07d2e3ade761b6bfe6a5a94b44c3dc": - { "vssKey": "WCECGkF8Ipu3QuaaTiSnA/wmf//wmVhFM2rIVUupnP9fdGM=" - , "expiryEpoch": 3 - , "signature": - "ff0972de56a180ae5a452680f7c6c464d07cd539804930b1d2f815b9a9bcc652c8d7adf875e4435ee116b16d194e35acfc752cc14c2e9c46bd00f74ec363a502" - , "signingKey": - "fsJJ2JDQqvmoEgeWDBY64tasXnFcprltWGDlDZ8rKyodVo+qh8nMi/1DOjIkqW7F0QG0tunbAI24hX9JuuKUsg==" - } - , "e0c9e75ffe8065e50563f9ec256c2b442a121d602c495cd305fb3cc4": - { "vssKey": "WCEDBRKTUNRUx1VFORWuoqqMSwPYKXgkeO2e+LTbc8jxm7U=" - , "expiryEpoch": 4 - , "signature": - "4d0aa42d1a15decec74c117b9b3e76178155c58ec373d2535005b4a3b0fae0ca4dd1c089b5272036f642aea27dc835e91de73d12fc25c027a8ef73991c139407" - , "signingKey": - "5bwhqDYWvMz+ND7Da53EwGyQ6RPfHYoLBGAIZR9CyqlKrob7/cRYbavVR6fpLQdwLjMrzJ5911MjncgNAzxZwg==" - } - , "fe299fde9afe6467393772f49e1f8d646d6788400c0acffdfb5eea24": - { "vssKey": "WCEDT9Z69y24Jbc4x/MlaC33mB/yaZ4ljIMNAfl9l7njWFE=" - , "expiryEpoch": 1 - , "signature": - "0efc47d2ed049a72896a4db314a3b00b31b849c753eaa2e3172337a8439a9160eba6bc164f57819df6580140fe3c7f52cec98161596c452d7ced3b0881638a09" - , "signingKey": - "MqlUtSHAsZUUQIllgx72g5Y33noaYWi8+EVcUEupO5yFNJi9rgYKb8mUXXIxrgjRMXq7szMGyTRl5e8RjuvHGA==" - } - , "837bd45aa9cdb656f538a4e46236ba9eb4c89890bc9191df096e30ba": - { "vssKey": "WCEDKi5sm8Wu7tUrjSehtCBsEMXSpX+h87zNRJcE4Mx/Nj4=" - , "expiryEpoch": 1 - , "signature": - "991e11c37f235c8c8d4aa846a564da38027f739f34ab97087ab436cce84d9297b2951455d5a8e2a562ab11db6a321c36d7498de3a1f776ad8eeb4dc5293b2b0f" - , "signingKey": - "52SwNA17NT9fdFiRAzd05L6raqFFilT/KaEyTAW7mHa1dM9ZKg+G/dH7+vvt3p4izpUiWy8RhRYpOszYygswFg==" - } - , "304889400de0859e03daea8bcf42779a14540b7c067f42f04ee1284e": - { "vssKey": "WCEDOgMx00aA40zA9oi0rN61TB6OxUcTvYq+8CyJjrObO3s=" - , "expiryEpoch": 5 - , "signature": - "10eca6d26d44eb52ed11ae633c410866bd6e01411ad64068331c7b8f92da9c8b9a7bed1772b6bf00910d322e659e23f2f867c4cf4e757cdbfbfb1fc97ba5a004" - , "signingKey": - "c65B7KK+N/wVxVpQ1mjIZH4QvyIhcsLVir+m6TEOWWI/jyb47cHOj2mL1dyf6qMay8Nkv/b7gdND/zgm692NVQ==" - } - , "73c89ad521f5786011201377e1ec8305e82aa985998f40307fa927d1": - { "vssKey": "WCEDLPG8x46r/wCR3hoHLeS+h/1Bu5x0MWXHDoJhM++fEfw=" - , "expiryEpoch": 2 - , "signature": - "98b48773afad287dbcd25915ee6b297b09d1204feb3a5793e91e438a1cce31a226f28b0c5b5ccdcde6a11f64665cbd867213cadbc57ec722c242def811f6e806" - , "signingKey": - "37YVphVo1oZ/RahcMiJ/JwJRgNc4qKPX/TySn2JNcjkpgBs0NkHxSAh7EX6H6WlfIV28+DD/DVigZmgsdgP2QQ==" - } - , "06216081b85063b2c7e33172b87663511fb7be35b23bc383881d60bc": - { "vssKey": "WCEDExIpntsz081SiKqeAg2o9W+wLy6lmD0dfp1sesQMj/E=" - , "expiryEpoch": 5 - , "signature": - "2b7fb3aab3a23d72cac699c4ef97d7f90ca4dd0b06c2413962b6430583b9814b6549806e90ecfd44da05819b655ff975797a6df23dde2aa1c625ab5079825f03" - , "signingKey": - "T011I+QeBYpsve+1U4ZU/8KlNBan9buZ9+rGmdQtXB8TdXbpwo6fFLPG4IIS8jjYbW4BrPJpf3teR9qWOSZeMQ==" - } - } -, "nonAvvmBalances": - { "2cWKMJemoBajGgvgVVziaKmUFa4LwJnAHffmuaSJBMDqethwJVQsyBsTSfFhp5jFpkVQM": - "5428571428571429" - , "37btjrVyb4KEg6anTcJ9E4EAvYtNV9xXL6LNpA15YLhgvm9zJ1D2jwme574HikZ36rKdTwaUmpEicCoL1bDw4CtH5PNcFnTRGQNaFd5ai6Wvo6CZsi": - "19999999999999" - , "37btjrVyb4KCRtni6YrG77RLPosnDqtEYoAD5xLdKYkWgnLqGa8yuXDUQd3psHrfxqaRcvNTsAW4ngUe6bzstbzSUJtwoaKbYaL8zjFAJJsZkQ42ti": - "19999999999999" - , "37btjrVyb4KGDMix4Uj5opvbMDgjZYUjeARAqTEFEbgLUH3qyju9gkBpcm2fVWgkcNgK3xFsQgWm1w8zxqvm9P6xJj9mHqLeMJPwDMUKUGPcDyUaDS": - "19999999999999" - , "37btjrVyb4KEkSeCVx985rXc38DCud2AW4LdasNmyoPLbtDGcDCyYVdf8BzxvDnzPehv4kyVBkzThjVEkSpGTv8PGQs4yRUgiCaKa7PTtBY4ohNGqR": - "19999999999999" - , "37btjrVyb4KFGS7upvgJHtmp7y7EFB67utzaHf7PM8y8U4tNkpmARNwiD7seN4NSAceHmj64KLGgh9qn1BpYF49NyWxocBHn1N533qBUYfhQar9ceu": - "19999999999999" - , "37btjrVyb4KCfir7GrvC6Y5kBNjeakZNd5po62AzQQ85SGkBB4QfXibC4fSNK5YvNeVgmPc8WbEeSUHRjoiqhJ4HDtinK2deBHSdCH6Cw8k2u92rdh": - "19999999999999" - , "37btjrVyb4KGAExHTQjLUHJBksSXGTomjgNsw8a4KepCgQYk4gxacKb84vGpPSv9Pjt3gdgMjA1nB67Pq3XyJpTDk8kLcXpJawCe6SCJf5jUowvAz8": - "19999999999999" - , "37btjrVyb4KCE1qeEoUh9b8CpcZcJ794Di14AxAELGoppJNVdB79nnuKcgRut566MdDkxTqravFaDSD9iwAvDByUHi59xocCY3ButEjmCQeLTLZXQ7": - "19999999999999" - , "37btjrVyb4KGGSGD8KgQD6qUBaSjxy5JRtsmMSHEGGAZqA29ULGwci8TcM16vBhywuBw54izQtpAqXeyUnbjh56hCgoqGZp9tHTMLLkEgLzwxVCZ4N": - "19999999999999" - , "37btjrVyb4KG5ZZfwwiQuhAGWiNJ2FhXP3oAuiq75qknCz4CZWNMVY4B9BmiHRHnWfhUbkLHUqfabCYASUk2V1qGuDw97x1gdf871aFY7Lpz3N1NvT": - "19999999999999" - , "37btjrVyb4KFtDHT2vDtMvQbLBgfH5hnpyVTTqqpPsieykukuxrDShHNccAEEj7M87UuV2GJ5pPA7YJ4JPjSokA99XaDgLmeaAumhZPHMwzg2Laspr": - "19999999999999" - , "37btjrVyb4KDHFyvvKb29RD53ebt6N8kpbL41J4VxWpiFC4FnxxybP33M9tBbdqfMXvSvyTQpv4dULXf5B838kEWXSJ24bpHtFgcbRkiHQwqWFQ5du": - "19999999999999" - , "37btjrVyb4KFh7jhHCtWxW942ceq7Xhxay8FZ7GkEBezGyFm3wJcVBGy1YYJDZ4Z7GbrFZmHLSe47zFs8Rjxk8rveoRpo1s43HXrMrhd4ijim4jJVP": - "19999999999999" - , "37btjrVyb4KFhYgC9Lr4Se7C1gL39d5WBVADyUyQZz2BfG4BZxczyW827JRQR5enyWaoj6NnA5NyKsheV6Eb7WvQtbN8D6116HTknHhEb5jh1yUU6Z": - "19999999999999" - , "37btjrVyb4KDLtM8HUJsBwergjZUj4DcMfkFmbV4bXUFGJk815o9nowX9ndPPVAeSNjAFYqJeFwTiMa9Ka8LqBnqFZgPpacyx9LrQLoXVMjvvLB7DK": - "19999999999999" - , "37btjrVyb4KDec7E64byKc4XjmmCRDaTGQYgHJTPDijZVr7NwZSP8g7ienzTLx5Z1quaQRhJqqAyV8Z2QdkzXvjTTRiVDCqps78uGp3uuth4wEJKP9": - "19999999999999" - , "37btjrVyb4KF5R1LEsaQgjWFWXwbgJ51naDEaCRG23KiAN3UtGzaT5PvUANtFBgjmcCtPLMBYMTGL4S8px4HyQMLAyF4fakYoFAJC3PkxCWMUatGWD": - "19999999999999" - , "37btjrVyb4KFB5Tmw1wsLmuv17Q6y8i6HGpVxbW8k4bevmob3DcdbH6jzrAtUrBpKgfTGgPMpLAbJcpaByGGJErkXQWFwrNMW35S79hxFvAN2GTXVQ": - "19999999999999" - , "37btjrVyb4KDEX2XToMQoi1No3YdREgZWzrf1xQPbfhbZTZnprFwDsRMiBxqUrA7p4BwjxXHDyqAccPwyX8iWWquz2CrLazJMR4s8AMz2US1D1ffJL": - "19999999999999" - , "37btjrVyb4KFTKCoqtZBdbh7LtJ9mRR1nbkX7ggP6a7AwvkSDxUN6U5GJWfuRXnL3a5x5e16uQwyjC6PoPVQ7VLdJXr8Kd3eFknLu6NDf2ey4AaJo2": - "19999999999999" - , "37btjrVyb4KCHCpiGd1J2GtVjP4KxEWP7RE6K6yxHzE97cbDgFD63fUFygbni8jKw1N37nGsT43KBvBn5w9ee8sVegr6Tg8fAr52mUkhdvTZYJV52T": - "19999999999999" - , "37btjrVyb4KGLRpX3uQfSeLovpMTcWfVZSM5RCufYvy2tyCMwrLXyHKCM9VqQh8dCQA6WcTrViaxqpvBSeKreHFL4CftfJU1z7CjHAze236NLesbL8": - "19999999999999" - , "37btjrVyb4KEdwV1MS3Pjek1HjLN2CSq3SJZGFBbZctkGLz569i9RWN15bAvCcZ8R5dgEi8iYjpmMVKioufoGv3issZQvVtzPz38pWHBViyRK2how5": - "19999999999999" - , "37btjrVyb4KD1x4cqHfGxrvBubZ8pSM8Jmw15UiHpy77eMsqpMewGND2GdvAwTBZhf4KA4uypBJnuUPbPYFovpRVJ92BUaMBHfQnAD3i15DAzD8EvL": - "19999999999999" - , "2cWKMJemoBait15xg1M73WAvWafoieg2GrcykbRk6J1QC2jMUXn7LpXf4mk5RUeu8qYeG": - "5428571428571429" - , "37btjrVyb4KC3HyNR82Bj2Sr9o6CF9o3J5hBNycGb9JwrHggTYUHfivi87akkYDv8ayepMkM4mNvxTKvoVdMHFkMnZZgrk5qobwPKM8idSnYYmvTRU": - "19999999999999" - , "37btjrVyb4KCmCLYttFEWLNQc1MRbV1NyhhssRioZ5CgkqHgYUTT1pPSr2hrfevSe8bSwLiPsLnaCbsxJQc5SWgWYEJDPWuUA1s4AotQxERNbT9ReA": - "19999999999999" - , "2cWKMJemoBahLnFCQ8wrTuZ3sMyiCeEkUZDYLNucPiVTJr8UU3BgADsKtqosDYNFXzeiw": - "5428571428571429" - , "37btjrVyb4KDHDPBVenqrh8tUTVNYX5ZGwjd4r3svqdnwWicGnMZZV1E7nBJVQsDY69co936H9onHpmA3PYSabYH4ibbULphL1CitDgArH9KknBARc": - "19999999999999" - , "37btjrVyb4KD9Z53z9qD7gTWMHr22e8jDcpCHgJFQaGQsvnNkycRehAaxLAnufNRjhLzQ57XVGJnR6mcsk6MorapLpADT77tyTaX9xfUSZyTA32ZAy": - "19999999999999" - , "37btjrVyb4KCsozLcUUHR8GyVG7erY6j9zehKTADn3e5xpRJtu1YgfJzSmAyERBHUXa5LGWY2aR2KqcssnRjwugh1bGjxc6U6ZrePJnALYTw2TR3yh": - "19999999999999" - , "37btjrVyb4KEDBSAmNtUBy6pfXesvTvtrDZQsSYcyo7SUwjLkhoSaPDCsNqMmoGbqzFQyEe9DNwK59BMudtdkzFPBpbgiEWx5SZr6vVMbpe86qsQJV": - "19999999999999" - , "37btjrVyb4KFf5NQ1DuNoAP4phRomqdEUmtFb6sWcDHkizGj56dwn54LfKrfWa6Er5sxDXYrzpWwS56PKmKaBjJtn1JqN67K3CihFXXospn8B2TDz2": - "19999999999999" - , "37btjrVyb4KBPHxFJqCekpPztGnLgbVsUA46Q8Lj2LKbFJL5Nqk5LgP2u28eBJAxkkU2r118ARdXW7fXLPQgctwK22L4N3zc6XeoDqkadGmTd4s8a1": - "19999999999999" - , "37btjrVyb4KBYe4RSCngNCgVMAeMJkRQqoJs8t6t9e9BHcNvvT6awv4CruMWH2FyiudxcGfZHmjghDvqk39iFrmCt4XE2XDuYzyo97BxwS6MngfeWp": - "19999999999999" - , "37btjrVyb4KF3MxxJBeJqCPFgHyUsSDkrDqoctSSVi9h7F4Wj9zFKcPVuVju76KYhdp7nJhy44512Wjhw7WH4sed3MMSh1HYnKUfjZXGkoZXMajaye": - "19999999999999" - , "37btjrVyb4KDsi9fc3RfExWLumjkp2YrcMjZpew19Z92kZnjPy5Xa84KY2WZw6xmjJA7AXFJCBWtrF9RFw1BjCewEqK77CVYj2s7bk9aAA7yyZARRz": - "19999999999999" - , "2cWKMJemoBaj34AMeqLspGBgX1PVc7z6VkALK3rtVd8iFgCtMUenNoHhVRnjeGfYVQJM1": - "5428571428571429" - , "37btjrVyb4KDpppzxzoaPgnstPejNxGaSZ3Vh22Qd2DWGrwfLJ2tizs33Y5Yjya1U6TXPzVX2PT5g1PXMy4jR4aWZRGZqYJk4Uw9p1h6BhEa189eiN": - "19999999999999" - , "37btjrVyb4KEXaPVoMuKpnVEKKLMFuGSvYL7YMAD529yxeK8Y1zqnbh5FQ8GMYpJwARugWmzaXdJ1gopgsxziC4e5wgjf3zkp7RH41KTJ73xLyfrFP": - "19999999999999" - , "37btjrVyb4KBrhG1yaBVY3X1ZoTCjUH7gbiA4qSFsMGgtLUBgwHiMZPiAJ3kQrRiboPV3s7eYXZD9fnd27qRb1cCEMc4oU57aPn2cYcEdAEJHrsyLB": - "19999999999999" - , "37btjrVyb4KEC4vC63KNqRBD7RX1KBwWDdPDE6oXGxP8x5aKrbVTALaq4XBdak8F47Kt9VcsQvVsKZfAit8vBtZpG2mc6VKUXCFv8pTYWwQMnABckB": - "19999999999999" - , "37btjrVyb4KFPbetkmdvqD8nLRFsUVL4HsVUYmgaZhAmBXcr78M3XoZkptjuszd2T1FNr1fGZApkZFZXikGtyhCc7jH5JYD1q8csTNSWQn4Us3nzX9": - "19999999999999" - , "37btjrVyb4KDfwNJcNMYsyEDVHWrGrNAPBwF9FGEnm5j2XFs4BeGdiSPqPtqCjWCvcRYBfY5EoDjRBhjsTrr2HjB1jw8XZ9Hy8wd9gz4KkCbMugSgf": - "19999999999999" - , "37btjrVyb4KEgvmzjLT7R9xHg1vNob6vCf999UFuG4qfTpHGZufdhbkUogSFJXtQXnCcJDHJ6xuZt92H6VgxGdhSLQ9gmWZy4zCJEVu8Nj8NashVQY": - "19999999999999" - , "37btjrVyb4KAtY8hCobTmAB36dzosSo644ZrzATKQhP1AsnM6BAVfTWwMX5BGXhigxLm5hk4beodymyjivxrH7ZY6BZjMu3AtafB5guvagxEZM7vJq": - "19999999999999" - , "37btjrVyb4KCRMJDqQ3iK4M19XhWGWpFbCoxjgeDB7ZqUhgW7jSYLEk5oVL4okVPVx5rXCgoK2ND9kAWnNU5QncJp1qvuCngRdJaLrvFwp4boE56VR": - "19999999999999" - , "37btjrVyb4KBTRHUnz17FQNFzHR8PpoGGwuNQZauAUxmvTb1o7Ragv9Zvyiv6Cb3rnrmYY1PGtVFTmom3TGg4mK5XpkRyf7PnnCG5EQM69i7MViLpU": - "19999999999999" - , "2cWKMJemoBam1WPtZrz3Fi4EMUDao74k9Xn4fhyVYLqK4o1VRzoxPFU91QBRToLbVyrjX": - "5428571428571429" - , "37btjrVyb4KBUH8nDpwtt3sSc6rJ7AkYjmnqvt1tJ4J8ZKCuqPrEuEioJJZXeD9aohveoB9zhRWru6oM5zyBcgMtkA26HLtTDKsSVwzoqugfftbiPu": - "19999999999999" - , "37btjrVyb4KCgWqZ8sJW46mQGdZS9wKW2TEQesyCoRScUxvisbdvEkfsxYLR49i6wE6uP1BBgPX9eg8cxKHPuNyKpStwf5UVmRCXD2ahotjamotMwV": - "19999999999999" - , "37btjrVyb4KCR9vZcXetWv4QdP4jPSH4msGeXs8DUBUMVYJHgD62etfv2jiD7gmLbLezCAiGTQu9JvrHd9Wfu74wguKgkX1vCUQkzcWsn4rVWsKCyt": - "19999999999999" - , "37btjrVyb4KFV3TiBqtLDN3oHQr5NrA8ouAAqasFU4ZuB9W13xgcgWsSy5fUtbNL4imCruQz19hjzBzykxGxCAarrviCUBh3sxWbvvTTHdvpyWGgXc": - "19999999999999" - , "37btjrVyb4KGM5rFFreGtZAs4PFB2Drb37uXRHebh8rCeVWFkW8De8XAbYqvfQrAqVthfJp9Qy2YzbzNhWSiUGY3D7yJkRkChyMveKCWT8qUTNEu6e": - "19999999999999" - , "2cWKMJemoBahEJS9xuB3R1ofSgtG621enmfpxfx9Unpo2K26wJPioaA4tizZrNMACNoQb": - "5428571428571429" - , "37btjrVyb4KFGV8HUDv7S5E8CSBV3pQLgGFt5HXa2jb9ofbAo3gTxcaQ4So84mHsNk9mhAybq6miH2VZU3iz7cqCd74gPMyn3zdUsrF1u2rib7HSXq": - "19999999999999" - , "37btjrVyb4KCF4JTyyC27XuFmcrn9Nxj1DmM4G5BKnf8F8F8BSpvn3PnsLRNH2RZJoajmg4yqHnwMXpUnbb7sFSuthjXv6YUenX8EWsApQUzAm77Dm": - "19999999999999" - , "37btjrVyb4KD5zMmtnD3jWpX3TSJnZJ8jMzCFQHYa3HcHNXxdAnK5A88SiWncRpJQxesMDrYgzPHk7SnFNag5teaFELV6hE9opnJpJzMGpVicDDRX4": - "19999999999999" - , "37btjrVyb4KDTABtj2RScLVCLVyFhxcURYUZNVta8CghbH5Edz32XSP79NHc28QTkKLMNUBupRnJXs4zcZt8C2fiPFGZfgSBMqMGMidWc2zo9piRb4": - "19999999999999" - , "37btjrVyb4KCGn7x5G6obn9NPNoTuv25LrBcqK9wHCm3XbrhxqycSQrbPfsDxgDp2M8pqTjCk8cVEG2fRxWrTjfG4q71MtyMo6nt8WG11kJzdQQSNL": - "19999999999999" - , "37btjrVyb4KEhnv3cCqP8jzRBbwE5v6ymPkBjTexHCcCgYJarjHHaxipJvz4aaXc5Xmp5KXxnC3SoE1oqR8sdGHobyfsAqJy7DwejZWpkkoYD7LJsS": - "19999999999999" - , "37btjrVyb4KDvKgSbCTx1gwwZFGe5DZaXyGwTYGGnJNCQ9C61XP4n1pKFQtNbYEowGeRoKHCGUvuU8Ebz2vQwN7YhcJ9bSb5oNpAoCe8UxX5KK5C3e": - "19999999999999" - , "37btjrVyb4KB6yr5YozXGqSKemHyZfsgiRQFX3VdJBKx7waoSaScNWc2dNvhNp6HSnXMxUwDtBvicXDWdpoJ7cKLWAwqEYki5azdt1qDP4sHXh8XhJ": - "19999999999999" - , "37btjrVyb4KCqRLQRj8svdZGGLQDZGdXztzeC15Vvt6uZWg23QAdfL1dMc52dpc8jqKquWNj6xjyLnLciVnRxzEq1kiq54ssmc6h7V5xK1cqqKJWBT": - "19999999999999" - , "37btjrVyb4KEW3PG2LAJNwmok2H6i149HetvT6fYrPsqPGpUkucNkA4b5TQmv896EF44UmcCAXDycfxFB7GcVefBCgk9cZffVUdX3kri3i5TEqSjKm": - "19999999999999" - , "37btjrVyb4KDdgCo1a7URfpQVFoTJEUcn4LqWpAtCeLaW7NeGMJtecsahTJM7886BjLcnhU2CboLSUojCPcab3WNTmXFDrRMHMHdmWefCAyYA7QaaL": - "19999999999999" - , "37btjrVyb4KG5vwKTPpCSQ14a7Cv4TESosSVoFVRHsw1vHj7Tpb7N4j1U5dtFcY7L3MWsH9BJqQjU9NxwaHpbHCJAhmsLi2mC2BE8k8Rj7zcjiiVhR": - "19999999999999" - , "37btjrVyb4KAr171Hd3fu65bbtKxqwktHGwY9kNanPYGXQcFKA8d9Hp1RgLrxzU1AdJCJbJDByTnHdDmtA7pm985tKK8hr5JdHPXFfSvkkYZn3kb9G": - "19999999999999" - , "37btjrVyb4KEZWqFxGYhFuLE23i92B8BiLRwwFUdnjmM24KHCNuWik5dc6MJqz7GxupgKGK5zzbYSXJyA8DQVDszyFmJuoxgzPn2GSnfBoREZ82ZdF": - "19999999999999" - , "37btjrVyb4KDB6sZamEoJWYBLoDWucRdDtRXCuQvLCoVoHPNjrywJKDz8PQg65ZtLvYvREwAK9oLzGGb6UcdAf9zwQcFaKRRHhLzCZxwTsRDVyPkSy": - "19999999999999" - , "37btjrVyb4KDJc8Af5dfJY2jcFbtkofFL6qXBxWnk2kHzCE63qAQR9Ynnk1XkfUrcnBrN7EEyvxmUDEFdNFfZHzXKhmkSQht3b6Y5rHHmuFYYoKdZz": - "19999999999999" - , "37btjrVyb4KDjPpuxBuJM1Ma5NGBqriSEAcozZMqYkWEkoJ3GgR8MAy3Zeb8q5BvtsWGEpSFQ69znPuaX4kVCcnEiEMDp91A6EL8A5YM12cpYYogLm": - "19999999999999" - , "37btjrVyb4KDmCmpc6FutA3PbQmWxcsbzZsFEdMKhHxrJVtGkmaiWd18dKmiaRA6o4Y2sAjDwjFozKzNzQg3dp8CXVSPpWgDLAXaozoRyPanW7UM8B": - "19999999999999" - , "37btjrVyb4KCLfSBFhCBdrb72YBNJkKcDCqpdxf3k7iwJTj7M3txxiq3fcam7Nyi8sLcJNSfgnUrh8C7RKEMN5wWpku7HLdZqZVuPRjeihhgXmEpCe": - "19999999999999" - , "37btjrVyb4KF3ZQhHTvVH3L7jNYoZ3XWK6SWpqZKiu9AGz6qNtxoxhAmmJpenFMA6fedYDT3Lt7cihgc1q4pE2GJXvPuknAkjvESmPxhhzkBzuiRis": - "19999999999999" - , "37btjrVyb4KF9xNLdS47pRBLB8e8bQLuvrBiGJbnHPNCbKU4wrMerJztEtYJdHayvaoUEmJ1vc3aiq9Z3UgP83Y1b4rpiyrGeYjzQhhDgB6DW8sWJm": - "19999999999999" - , "37btjrVyb4KC4LdZLvrexUgAntpySomDAPVwdMEnz1cP9pZxsxZqVYzM6zPPWAhc7byfwsLdgW8GEMTuTUagYFAKEmYgaDmYxK7cHxtWJG3hiMHxVU": - "19999999999999" - , "37btjrVyb4KFfXPG5GDEc4tLyVUSepKD9GGXZcSuP1xtLLRQnQr4wSXawT62bSJsiPzS25kdADKh94V3iDksm9nq5fhV4jixCnpNjsn7k2hSkwrAUa": - "19999999999999" - , "37btjrVyb4KC1L9MsZ8htPomWp4FV4hULeBVT6jf3GGqmDcw3k9tPn6pnfqGTWowQDvqVr7BqtQ5rcQ7gc5z41qh9vyBV7Ds83bRsndDbTAwkEUJ21": - "19999999999999" - , "37btjrVyb4KBtLs3NwnoLkyVx9ZxSoQ7mQx2ZvzanG7PGWWdMA9ksXqZxakLxdj9MAPKw7eQoZJWHxJJCsd7MeWj7ujfXtPsthGhcURT3Hste4Kr4n": - "19999999999999" - , "37btjrVyb4KCaYYFDdnbHEdBzpDPcL5iH98AGF8J5avuweDHwKChDq9mBvLKVJS6F4YTuAVDigPjMnAcuYUJ2UUbvDPePFZBhLhBrFUKeauoKC8X5z": - "19999999999999" - , "37btjrVyb4KFfnmiGpxNSGQVMfmFpAFrEAEhZwGPQDutSHnZqQXPhcXxDNcbdoKiztyQHpTA3jSmVowZCxcaJMS1k1wu8U6nXTzejgh7wYZjycamU6": - "19999999999999" - , "37btjrVyb4KCTVE8b2UitH791rYrkSrHG9u449h6JHKotuPWRsdVZQfP1jXrs4ygSxAnG1rM5mGFM6cmUqA44e9fenjbVC1QFYyn3R4CaptVZypKgW": - "19999999999999" - , "37btjrVyb4KDaKs8A6CU8Lrzxpr3WNM1kDdd4CPe66TqSP2ehHexrAuZ3ykMmhkaUZEHUEiq78ELQx5vpSFGHXFKbyGgrWa8rokqamCV8bSKiqsqVt": - "19999999999999" - , "37btjrVyb4KCdPziHrv1QgXL5zMy3KYxr7zPqoRd96iz3LNrkWbobRmPswTpRKgCQEkZcEnipiNJ5UoULAc33mbR44MchdHT5vLNYT9sPxwzpgNUWj": - "19999999999999" - , "37btjrVyb4KGAZJWCpicgRkb9ijP3Jnv6y9EYvnpMqkPdBZ2d6fdnCa9C97HUmfHLWF846AKjViPvnY7MbSM8mTM3VDx5RazBFxA7C7mZ9CyM48AW9": - "19999999999999" - , "37btjrVyb4KFfgfRyETGNXNXm6gAxNpTQSxr6bM7T6yZE1ibiZBovxG52PioVmLRnPYxs4wYddAfgTH4mbmtLFnwuZYSBh2eNsdLdc6vWb4AdJNNym": - "19999999999999" - , "37btjrVyb4KBsV28Wce4x44WsTVoXa5s4zaBKALWXxMQ2MtfVgB8LJJW34QFpvjrxKmheLtpcLyVqaeu36oB6ZcgQPppFN4oqhdueoKBEpn8dfQUVF": - "19999999999999" - , "37btjrVyb4KBEKzyCGqao8GmErVER19oBH3L8xVNCSZs8tCVd53iV5FXZAZ7bNCT67bKoasGeiYZxEoDzGBsKxb4uJxStU1e9wkaPo6BxUEErZG7LD": - "19999999999999" - , "37btjrVyb4KCi8WRzrkFiE1AVYbSiXBzMRTuTLv8DAchfg4tPaDgHRuDN6m4dq4VkA17pkWwCoa2NmvNb5sGeU1ZkjcqFuYrWPK2C5a3TLBfx64uLs": - "19999999999999" - , "37btjrVyb4KDz8QGqk9LJ9kSsSd1zKgqfTuiTKbL92b4aDSXmRPyrFZp3VPEwhMyEmwCiSkpd7KQztirmU6CGwiphhiHoXbbZjkbfiHN5Mq1y7fmJM": - "19999999999999" - , "37btjrVyb4KEcCa8yc1d8Zrne1hRtedHQQGPbkRJcvHak2ygcCndPfSqWwb2L59ERxhtqsMJLdS1fPQPs2vcJcQCvB52tCm4rGCDwUmRG51PUzjSVh": - "19999999999999" - , "37btjrVyb4KEhvykuoQZKWdNKFgTrugRUSV66yr8GCXREuaX2PfVQJeuXS4h1bNP8SeUxHAG2J6RfK35YnsZj5qkWQCWV7tVYMVokU5bw9y8CcmqPy": - "19999999999999" - , "37btjrVyb4KDsFS7rbQjZQGX6Fz53u76NF2hF9iqRhfbx8ePmjJKCsv5rZV1hhtP6DHdKwLAf5zkVH9FE51xYuCvJzNppSn1tgExVQJpuTwKmyTekT": - "19999999999999" - , "37btjrVyb4KFtfVixJcJdD27YZfXfRM5diZFj4TEazkCAhF8KyztTbe67zQpBc1RTjruHNvefdJ9Jtr7u5rebR71tGrGtKioSSGKy2hMKd6GUVFkEg": - "19999999999999" - , "2cWKMJemoBaiXc4dYCHfDyvy3LcqPebJ8zfRJsZZoHDqik2SzK9Be73YQ5W9u5jEiMPXa": - "5428571428571429" - , "37btjrVyb4KFNpxUYvzqFKsRfRYJKHjEuFfgy6rpoGq29dcMrNhbKTvqNr719U282rp9PcnFonAENkUdv2nE36wZmyNkj8JVQJL1TLu25SKjGFNzVs": - "19999999999999" - , "37btjrVyb4KFYnqsKFfMwj4S3PcCxwxutoiUubHazLfw4wJc5bfrQgpNEpRnGCS2UUfzvMWRRV2vy4wzPKE7tshLS2YEW219R6QfAenXzktMoXCmuU": - "19999999999999" - , "37btjrVyb4KEbo96SLroMfZB11rEvztPswgdqC5ESkHXc4EaFdAhsDQ24vJK23XsjTJzpPS3ZcDWiHiFVtmp5wkJrcnRcMe74s88eTy8YLvLL7EBRj": - "19999999999999" - , "37btjrVyb4KBcyGa22cYKz3Xo9UnB2kzZg4nqVX863JCAvUd54ehdg94DWwnBasCv6sUdbKdh9t4tf48oaXokeoms1HDNuegsmRjVntHBX3Z2hnrV7": - "19999999999999" - , "37btjrVyb4KDHmdZ8ewhythkmGaUzLCwME5pGtWR7nPhE9nCjLMcKstQFyKq1vTSagA2BXtiopfGwtLq2e1jhUVKsw1Z8Me6XTmLm5C9MzRYCZCd3n": - "19999999999999" - , "37btjrVyb4KBGJtifVyePJjSHTno1XNBeTcqmSqEhyUznts9KGQTsvCd9Hq6zM2w29njvmJYCtWmNkUXvayfqyv7epN1awWkKK1WUFQKJsjtevSKz7": - "19999999999999" - , "37btjrVyb4KEwqVLa1yaRPdDUctf525DovPsxoXZfqNp26eXQnmTSFwY3Q3rgPsjRfTKHKtjFpxPy6XYvjzscccsZYfXSaL9MmgrKAaeQgQhCtoXih": - "19999999999999" - , "37btjrVyb4KDxRyqtP9nWyEd7sfzdB8Xgh2egCATJAVtvxM2LhKLp1ALCE714vMCsbQZ5SwvVgiAvmieJTkae865ycwU39JN4pgt27pqEuB8uvi947": - "19999999999999" - , "37btjrVyb4KDA9F68PUv9efaoQHTvacu98Dk6Zx3784ADx4SDnwMfDt3uRfJwqBELeVuis5UEqsf9u4zAD9YC82s6YNmQu43avWDqrQq9Z4hHkEVrL": - "19999999999999" - , "37btjrVyb4KCjschbSccsYGDJo1rVBjdVrpH27iRtc5h1q4XRqpQJTma1NA9t9t8PrTsJjFE7WzNCczJHQR1RGXW1jDNEiEqNa6xctAZ4ZBtXKHVtp": - "19999999999999" - } -, "blockVersionData": - { "scriptVersion": 0 - , "slotDuration": "20000" - , "maxBlockSize": "2000000" - , "maxHeaderSize": "2000" - , "maxTxSize": "65536" - , "maxProposalSize": "70000" - , "mpcThd": "20000000000000" - , "heavyDelThd": "300000000000" - , "updateVoteThd": "1000000000000" - , "updateProposalThd": "100000000000000" - , "updateImplicit": "10000" - , "softforkRule": - { "initThd": "900000000000000" - , "minThd": "600000000000000" - , "thdDecrement": "50000000000000" - } - , "txFeePolicy": - { "summand": "155381000000000" , "multiplier": "43946000000" } - , "unlockStakeEpoch": "18446744073709551615" - } -, "protocolConsts": - { "k": 2160 - , "protocolMagic": 1097911063 - , "vssMaxTTL": 6 - , "vssMinTTL": 2 - } -, "avvmDistr": - { "CWJf8Kl8Gp-DhcWKuhNRUU9P0_CVI2LmpR1MIMxVgGQ=": "20000000000000" - , "h48-GEVDKf_0_vGKzmGOuAOhhIm2uc0OEDSNwFayV28=": "20000000000000" - , "PO1Kz9bpAowfWD8u9Ial2OkmxDiw6bK_ICDPvuHshJM=": "20000000000000" - , "mqJXwreGLRzV9a--egcVvKN4hzIcNUULsXqcPWe3YXI=": "20000000000000" - , "ENoYC3dNAtKL-lvjCTZDVhQYmfyWVtI0GNbz4QKqVdY=": "20000000000000" - , "o0O4s8YkitBZPeZLVyjn8pjtpBoncr-H9mbtAJS_KfE=": "20000000000000" - , "1XEVfDyaheIAeQICkHlwmvEuY9A7E50hA1v_E_QB3Fg=": "20000000000000" - , "OKVfmKrrzY0-10uxl9IxlYA6CFWwOU1dN-NyUI0bobU=": "20000000000000" - , "LYOSBM00cdDToqHepveoat2SN6vdPntA0nSFXRch83Q=": "20000000000000" - , "3Z-Z3rLCxLt0C3KgagBq3wOXrfm68_zh2st5Bi6Covs=": "20000000000000" - , "VTx9H6wpJNMC-H-pThklJ9uCllwqXaU0WXHcVTEFAIU=": "20000000000000" - , "beyF5mz8icvrBvM-mvQzLfbnHCmxOOg8Z7kJs7nySZs=": "20000000000000" - , "rs_VPO7SNO2YlSY2N881xHFeBnW_Sn2o4uSfuGpq9cc=": "20000000000000" - , "5RZPTI9FoSvLmiXjKYtUdkrqoMg99tIw8k4enSB1qlQ=": "20000000000000" - , "QRBLXNJdJCVDjbwPvQmg_liOcYIWfvoKf7Ns5w_RDvU=": "20000000000000" - , "YG9mVGb_MAvTSdFgOUV8JbRBxnj3sPELZxQNVup_X18=": "20000000000000" - , "7dEmv0hdv1a7imviD3q3p9pFBFMC77Byx9oinyGwdIQ=": "20000000000000" - , "H_Qs3m89FGw8QxVTUGuPjdbOPQyP8vzcD8I37BkRAXY=": "20000000000000" - , "pa6NZ1j_bs8kezg23cUQiba3UyLxLiGDQfDXMQmuPSE=": "20000000000000" - , "Qi5VCXOUdP-U-Pd--boAii_-gwMpB0IRfibzxWEN53s=": "20000000000000" - , "cLJrI380JOISi9A14PYTRmClcxPNQS3_GIZdqcXC1JQ=": "20000000000000" - , "BVY8wsqEPXPQ7DPTvnvat7GRiwxFPHC4jY1x3ZvY1PE=": "20000000000000" - , "FBlBD9ykcwuFmoogsVjRCUag9xpkwCAgbYDNazT1oY4=": "20000000000000" - , "KHwUZRYdwRs5UYIhOO9ycjucY8WvTzpkZgZ4PSbDDPI=": "20000000000000" - , "ED2RmO7Wfad2p4gxyzhr4gqlhavksgHEg1acZiKMQF4=": "20000000000000" - , "BOjqPWCmGewTKqKekH0HSgpnOEYT8g0qV4t4t6Nj7-c=": "20000000000000" - , "b-8mgbBV-r9bqufItyyPp2WLitNhBjaMAajl3GfteeE=": "20000000000000" - , "JW_kuEdd0TkJEUA35YUbf_K9C4OlpZd83iTUqrD0q0g=": "20000000000000" - , "IF7PMOFaXdwztrj1j_yx_YBafdZpb3pc5EF6y822KgI=": "20000000000000" - , "r9HNGwms9l0cMBuT8CznPoadXKbzLPceo4-vDydXUwE=": "20000000000000" - , "rM0RFpsVm738CCDdzBhrEz8Q0CLIqiBKMl5rtdFlWmA=": "20000000000000" - , "jFyHtgHVcd70V1SZ7O55mo8yvYw5KsijV6fMQEWkJaE=": "20000000000000" - , "qWmtDqvA3KZyySJLRPFPO2TiOZh3Dpv1FCJTdEilJvc=": "20000000000000" - , "5YYkqAleNp8VXGYiD7WsXvWZQwybkqAUR9xMf5lLvzs=": "20000000000000" - , "bi2YeYdi2W2r7IDYToq_N0RR1k3z4GYsRo2xddi2Y7I=": "20000000000000" - , "vENWfzLRm1wwHYWTUIOznVCXC3ISPt8J6n3gYFrwfpg=": "20000000000000" - , "G71fGc7_2IoExvY8VctjxMCd7lJsTWgvWzg__lF4qcY=": "20000000000000" - , "pFzX1lvX3LPolGCv8TQXfWAZupMZEjVlMWmT7nUV70I=": "20000000000000" - , "pE7umM4kIaTYqKOviWvgTb34xky-kpbN7VvSzhOT8wo=": "20000000000000" - , "P6J7kBAlCPD4wxAnzuzlqTBWMyqI1zVkqVWM5kKoCwg=": "20000000000000" - , "CmwjLeSIEKfLzd5ks16QoGCtYNc--wiGsgWWM4OKsco=": "20000000000000" - , "-RTrh8sxu9mOYYpcfmyod8-v1Z0nqxMunwK-_NFDzYQ=": "20000000000000" - , "EnoSKFBfSJ_l7RXMglXTSolDt6VeNRMay4soxkUmk0E=": "20000000000000" - , "VzxlTAQWmOH7ALIXviuXH2pjjYmtW77r9ypeEZlg4mc=": "20000000000000" - , "93QRpWUE-Yqthy85Y8poB_WeWdG8A_9nnq4HJiMfJQc=": "20000000000000" - , "H7YIN-FF0kUawzVnhQpCoMLuOJkLzYAtZ2xof7vhtPs=": "20000000000000" - , "a9_Q5Pzte2G7wXujwVBaAzLcMki6_UjKrxvWzayJ3gY=": "20000000000000" - , "O4h-7y-2Izq3ojxailZAbMd0VCq78-kIMv8gIcaA6cA=": "20000000000000" - , "mlzqpS0hE6s7apMGRQP4Cx5Fc380yt9gQX7XVcVrmQQ=": "20000000000000" - , "aK-WCeAwKHQE9H02zvRLRdoMPIsZWiOfKkbA6yTyMxs=": "20000000000000" - , "b3fq65eebunM4fM3AQubawjF6Mt9v9jyEXF5f3hewbo=": "20000000000000" - , "ZbZ7v6OcrjZ3vqPFVzaHOK2A5UzRYy-wm0C-ngebU_s=": "20000000000000" - , "zXza46kY7Gs5cJEoN2TUwAaXth5W7uUKQfNiaPyWDSc=": "20000000000000" - , "5q5RzTcpFFUne5AKkua3DJO1IFQEOGyb2jQvV4DmDT8=": "20000000000000" - , "5CzeQFC__uUi8TRPuWVgsUeJauYR3i1f3rvD0CrC34o=": "20000000000000" - , "KOp96-E17RXmCf0_vEOcecpTmY8W0wpbpBwFuPwFbKM=": "20000000000000" - , "EFK3F4mO823aCcko3QmFJ3Klm7glGs8a0f_f6WVIwdg=": "20000000000000" - , "e4TOcy9Qp5BQ8tXkEXaWpuHRmAVcJRfPEV3sVCOKZsQ=": "20000000000000" - , "w-2bM_wksghmtHp4ZB2ZOQ-V9Dw1ZivS7RwxgY-DsB4=": "20000000000000" - , "9pKGBzQJLoqY6vcOM_OqHRgq9KIdO3ovCBp1mBEFKek=": "20000000000000" - , "TMFEEMjP7q64-Liae7CEG0ELKtEC2e2vDuCpMItyfzU=": "20000000000000" - , "nrRREQUC1zKTpQRRNDzO-NiQh6DJahitvTk0SWLkc8g=": "20000000000000" - , "9xnVxPVNI9fdN5zGa5Fa3HcIwof5T-2lMbdLh3_Nbpk=": "20000000000000" - , "NqOaYkD2B5yTFQ1dHMY7X2LmV0Q9tZI6KYR1-dFW_z8=": "20000000000000" - , "zhXX6D5r4CDjlLLQiC87LZZL2zWUIYaXhxbcgq_Ww3w=": "20000000000000" - , "CXMg_ROxPjiJAyxUpBlUepLDhcdhMffR89izVr9vcRU=": "20000000000000" - , "vfTTtqpmg_3jQ7zWV3XhNfmtbtn32Z0fcfNc6_Cx-4E=": "20000000000000" - , "3UAwyThFcR1vKSBpktCSkJg3NpMQhL1z4l46NHpfJkY=": "20000000000000" - , "K4m8Vu1qtFRavgx0jrctVErZf6VbKDfBnigjQef6k-o=": "20000000000000" - , "rmyqI_SuwRsbR4rG1Uk6bUlSJRvo004w5SeejGQERT4=": "20000000000000" - , "oo8sxwl7TO2JP-QfW3_aQbE9zZCLBogFPnwEMPUBuYs=": "20000000000000" - , "lif3znin9EWfZBoYZ9Ta1c69eINSJNmaqkKJVpFuF2U=": "20000000000000" - , "kMAvVvgk0sEf3kHXyfb8gQ6H4gWaFBDSUwms4IFs2jo=": "20000000000000" - , "8CMex0Km9bk2J1r4FaSD_FSwlGRgh1e8C1-7fCGUAJE=": "20000000000000" - , "pUliJY_tq41pTdo5VJISdWbGGBnL_82pupm4AjZF-y0=": "20000000000000" - , "E7dg9_nI8tY9CXli9OyIHtx0FUsq0QZKLBVx9Cr8Daw=": "20000000000000" - , "cpO_GBP5qVwOCGxws6oGvgZszu7jy_LwbKZj_f2pg8o=": "20000000000000" - , "n8MZ16U_jB4Vg4BPZHGorDzVO7dC9qOfAdYhAluKD4Y=": "20000000000000" - , "hqzkwiRusxDSgY-MyqmCyTC0VxELSFdJKJVpzBGOdQM=": "20000000000000" - , "QCiQStlI-PWCbwclsM8ZvfrmP49kql7lAwJjgzZ_OvI=": "20000000000000" - , "7prDyNFRXierLX1UE26h-TSO0fmfC2lFHQoelogU3hg=": "20000000000000" - , "32mL1n7cF_xLIjWAGTC6vISGcafcJe0EgXaxaQNtrzQ=": "20000000000000" - , "H94Fk3T5fiEXPd1eGYfpwPP4_y9FVQWsi2bhIAf9hFE=": "20000000000000" - , "YLQqBDTjfVrQJcqCzgn0js4ScjJpbh3_dGRmg_wQ9WM=": "20000000000000" - , "Ctfg-00LO1JetbfqwOOIwrm56xdZSzzZRccGW52eCps=": "20000000000000" - , "GCkRs5Iqi5jyzRhF-Z5B4-EzgCRAb55pJK8a3kmrbwU=": "20000000000000" - , "975KNlfAi1B-u2Q0X0qBZpuZNLCUNnKnX-jvBzah3pE=": "20000000000000" - , "SrxXeNRxF0accD3dsKoj8ymSQeJoUVs78Llsy-4ZIO0=": "20000000000000" - , "m5zF99P2vG3cqGrG17VvRti7d2XRi3fuUHfec-jM6tQ=": "20000000000000" - , "A-w4r_kJIZpI8TqDAY-F44cR0lhZtnB25UhT0NXM6Zc=": "20000000000000" - , "7mglsAKSgUEkAyA6C5Ni-v_1xoGNPCN_cj7ctQZGZqg=": "20000000000000" - , "x3DrzZ_Yp8df2EGsGlwNAnclV2Tv3lcdqnI3Lk_0bF4=": "20000000000000" - , "GWoauU1tVb37fjs6mPrxXiBoy9HarPqyGI8zj1mc7cw=": "20000000000000" - , "op9p-7Xy9fBmzrjLbMD1jEuW1QVXTOsXSIwgaFN3sDk=": "20000000000000" - , "KC7yE_m_JSiWGVP9cpcfYTLF77taAPTgveRKEiIPg1A=": "20000000000000" - , "6V6sxoH3dMLw8vWcH0NQF2SZNPDzmtULTX4vxkeCQd4=": "20000000000000" - , "y0DLZDhvfU-M5MvdhoyxEFp811PWFfrAdIfDVhYCMzE=": "20000000000000" - , "wCHhA7PS7wdfEuMpzrOJfdGyF2uIChR2LnnAcQE3hHI=": "20000000000000" - , "s4iYnscFXdEK56b7o4ZvKpgN0YoKchpR-U9MZEqbGb8=": "20000000000000" - , "WkMPzKKtocKcbc7_fsFND1oln6gAfWJspg9REi75pMw=": "20000000000000" - } -, "ftsSeed": - "76617361206f7061736120736b6f766f726f64612047677572646120626f726f64612070726f766f6461" -} \ No newline at end of file diff --git a/configuration/cardano/testnet-config.json b/configuration/cardano/testnet-config.json deleted file mode 100644 index eeaca6480d5..00000000000 --- a/configuration/cardano/testnet-config.json +++ /dev/null @@ -1,99 +0,0 @@ -{ - "AlonzoGenesisFile": "testnet-alonzo-genesis.json", - "AlonzoGenesisHash": "7e94a15f55d1e82d10f09203fa1d40f8eede58fd8066542cf6566008068ed874", - "ByronGenesisFile": "testnet-byron-genesis.json", - "ByronGenesisHash": "96fceff972c2c06bd3bb5243c39215333be6d56aaf4823073dca31afe5038471", - "LastKnownBlockVersion-Alt": 0, - "LastKnownBlockVersion-Major": 3, - "LastKnownBlockVersion-Minor": 0, - "MaxKnownMajorProtocolVersion": 2, - "Protocol": "Cardano", - "RequiresNetworkMagic": "RequiresMagic", - "ShelleyGenesisFile": "testnet-shelley-genesis.json", - "ShelleyGenesisHash": "849a1764f152e1b09c89c0dfdbcbdd38d711d1fec2db5dfa0f87cf2737a0eaf4", - "TraceAcceptPolicy": true, - "TraceBlockFetchClient": false, - "TraceBlockFetchDecisions": false, - "TraceBlockFetchProtocol": false, - "TraceBlockFetchProtocolSerialised": false, - "TraceBlockFetchServer": false, - "TraceChainDb": true, - "TraceChainSyncBlockServer": false, - "TraceChainSyncClient": false, - "TraceChainSyncHeaderServer": false, - "TraceChainSyncProtocol": false, - "TraceConnectionManager": true, - "TraceDNSResolver": true, - "TraceDNSSubscription": true, - "TraceDiffusionInitialization": true, - "TraceErrorPolicy": true, - "TraceForge": true, - "TraceHandshake": false, - "TraceInboundGovernor": true, - "TraceIpSubscription": true, - "TraceLedgerPeers": true, - "TraceLocalChainSyncProtocol": false, - "TraceLocalErrorPolicy": true, - "TraceLocalHandshake": false, - "TraceLocalRootPeers": true, - "TraceLocalTxSubmissionProtocol": false, - "TraceLocalTxSubmissionServer": false, - "TraceMempool": true, - "TraceMux": false, - "TracePeerSelection": true, - "TracePeerSelectionActions": true, - "TracePublicRootPeers": true, - "TraceServer": true, - "TraceTxInbound": false, - "TraceTxOutbound": false, - "TraceTxSubmissionProtocol": false, - "TracingVerbosity": "NormalVerbosity", - "TurnOnLogMetrics": true, - "TurnOnLogging": true, - "defaultBackends": [ - "KatipBK" - ], - "defaultScribes": [ - [ - "StdoutSK", - "stdout" - ] - ], - "hasEKG": 12788, - "hasPrometheus": [ - "127.0.0.1", - 12798 - ], - "minSeverity": "Info", - "options": { - "mapBackends": { - "cardano.node.metrics": [ - "EKGViewBK" - ], - "cardano.node.resources": [ - "EKGViewBK" - ] - }, - "mapSubtrace": { - "cardano.node.metrics": { - "subtrace": "Neutral" - } - } - }, - "rotation": { - "rpKeepFilesNum": 10, - "rpLogLimitBytes": 5000000, - "rpMaxAgeHours": 24 - }, - "setupBackends": [ - "KatipBK" - ], - "setupScribes": [ - { - "scFormat": "ScText", - "scKind": "StdoutSK", - "scName": "stdout", - "scRotation": null - } - ] -} diff --git a/configuration/cardano/testnet-shelley-genesis.json b/configuration/cardano/testnet-shelley-genesis.json deleted file mode 100644 index 34fca9c1312..00000000000 --- a/configuration/cardano/testnet-shelley-genesis.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "activeSlotsCoeff": 0.05, - "protocolParams": { - "protocolVersion": { - "minor": 0, - "major": 2 - }, - "decentralisationParam": 1, - "eMax": 18, - "extraEntropy": { - "tag": "NeutralNonce" - }, - "maxTxSize": 16384, - "maxBlockBodySize": 65536, - "maxBlockHeaderSize": 1100, - "minFeeA": 44, - "minFeeB": 155381, - "minUTxOValue": 1000000, - "poolDeposit": 500000000, - "minPoolCost": 340000000, - "keyDeposit": 2000000, - "nOpt": 150, - "rho": 0.003, - "tau": 0.20, - "a0": 0.3 - }, - "genDelegs": { - "2f56e87d67b8e5216582cfeb95dbdc9083110a3ef68faaa51bef3a80": { - "delegate": "bd5933d3c5417f17a64c7214711a26abc3bc03e2c90dc1bb38e0c39f", - "vrf": "9a0b0f537874d089cedfa9e250150405e47ea29acee87c40a223ae0a175d26f8" - }, - "514e81afb082fce01678809eebd90eda4f7918354ec7d0433ad16274": { - "delegate": "eff1b5b26e65b791d6f236c7c0264012bd1696759d22bdb4dd0f6f56", - "vrf": "e6f70fb10c7523aa76648e20d17e65fd9b2ed53960fbd20b308f223b703f2e23" - }, - "2fca486b4d8f1a0432f5bf18ef473ee4294c795a1a32e3132bc6b90f": { - "delegate": "de665a71064706f946030505eae950583f08c316f0f58997961092b1", - "vrf": "c3fde629add60e30142cd7ef3c680610975208b08aee42203a5c40ad5992e8f6" - }, - "4ee98623920698b77c1c7f77288cbdac5f9011ff8970b1f507567d0d": { - "delegate": "bf07107c6f632de95e34af7e009d2aafa19916c7ba89b944fbedcd72", - "vrf": "9d7d12e3d6b02835be3e76cfc6ae93d937035ee0e006d04a0eef9dea19754e21" - }, - "0d06d2547ed371fdf95fb5c4c735eecdd53e6a5bb831561bd0fcfd3d": { - "delegate": "6df3e1b4b8a84c63c805076a85e5aa00924997a4eae85fddf0aee3ca", - "vrf": "0774e5810fe02a014ec97ef424797172f2b8c5dcfb6e4cfc98b411c31d5096d8" - }, - "581e23030b6038bae716e5d64b9e053db10541b12e6b0b4eff485454": { - "delegate": "b0dca078b823cde627da136200d6618c49ad712b77972a1c5e135763", - "vrf": "16a4e883b72ddbd09a4f8a1170fc346ab11e4202f814faa73e9d2433ee03e7b0" - }, - "e5f27655371b54aed91cc916b2569060978be80056768fee2cc5ce1b": { - "delegate": "b3873a254459f506e47b9a252ee7912e538b364447f31576a170db65", - "vrf": "cc5c897fdf5db0017326656fe35aeb20c72b175540793f9b9b8dc9ade001bbc4" - } - }, - "updateQuorum": 5, - "networkId": "Testnet", - "initialFunds": {}, - "maxLovelaceSupply": 45000000000000000, - "networkMagic": 1097911063, - "epochLength": 432000, - "systemStart": "2019-07-24T20:20:16Z", - "slotsPerKESPeriod": 129600, - "slotLength": 1, - "maxKESEvolutions": 62, - "securityParam": 2160 -} diff --git a/configuration/cardano/testnet-topology.json b/configuration/cardano/testnet-topology.json deleted file mode 100644 index 0174fd58422..00000000000 --- a/configuration/cardano/testnet-topology.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "Producers": [ - { - "addr": "relays-new.cardano-testnet.iohkdev.io", - "port": 3001, - "valency": 2 - } - ] -} diff --git a/configuration/cardano/update-config-files.sh b/configuration/cardano/update-config-files.sh index 2abb8b920a9..24cd62e105d 100755 --- a/configuration/cardano/update-config-files.sh +++ b/configuration/cardano/update-config-files.sh @@ -16,8 +16,16 @@ echo "#################" echo "# Copying files #" echo "#################" +copyFile "mainnet-conway-genesis.json" copyFile "mainnet-alonzo-genesis.json" copyFile "mainnet-byron-genesis.json" copyFile "mainnet-config.json" copyFile "mainnet-shelley-genesis.json" copyFile "mainnet-topology.json" + +copyFile "shelley_qa-conway-genesis.json" +copyFile "shelley_qa-alonzo-genesis.json" +copyFile "shelley_qa-byron-genesis.json" +copyFile "shelley_qa-config.json" +copyFile "shelley_qa-shelley-genesis.json" +copyFile "shelley_qa-topology.json" diff --git a/flake.lock b/flake.lock index 0bba46c01a3..032543bed90 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "CHaP": { "flake": false, "locked": { - "lastModified": 1711365846, - "narHash": "sha256-sM0Z4WL/Xu+WCuxoM3rSt/lX+tgS/0fKLsiuYXePaJo=", + "lastModified": 1712304473, + "narHash": "sha256-AXf+FiTVt4Jte0lQ1rb1tvUNfl+xgvJHbE4zktu3bbQ=", "owner": "intersectmbo", "repo": "cardano-haskell-packages", - "rev": "ba421ee9ce54533f5953a9468cdcf5ab33c36599", + "rev": "465a71bd629a80522fed1fd643f8bf4dd5f9ab6f", "type": "github" }, "original": { @@ -568,11 +568,11 @@ "ghc910X": { "flake": false, "locked": { - "lastModified": 1709693152, - "narHash": "sha256-j7K/oZLy1ZZIpOsjq101IF7cz/i/UxY1ofIeNUfuuXc=", + "lastModified": 1711543129, + "narHash": "sha256-MUI07CxYOng7ZwHnMCw0ugY3HmWo2p/f4r07CGV7OAM=", "ref": "ghc-9.10", - "rev": "21e3f3250e88640087a1a60bee2cc113bf04509f", - "revCount": 62524, + "rev": "6ecd5f2ff97af53c7334f2d8581651203a2c6b7d", + "revCount": 62607, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -587,11 +587,11 @@ "ghc911": { "flake": false, "locked": { - "lastModified": 1710286031, - "narHash": "sha256-fz71zsU/ZukFMUsRNk2Ro3xTNMKsNrpvQtRtPqRI60c=", + "lastModified": 1711538967, + "narHash": "sha256-KSdOJ8seP3g30FaC2du8QjU9vumMnmzPR5wfkVRXQMk=", "ref": "refs/heads/master", - "rev": "e6bfb85c842edca36754bb8914e725fbaa1a83a6", - "revCount": 62586, + "rev": "0acfe391583d77a72051d505f05fab0ada056c49", + "revCount": 62632, "submodules": true, "type": "git", "url": "https://gitlab.haskell.org/ghc/ghc" @@ -661,7 +661,6 @@ "hpc-coveralls": "hpc-coveralls", "hydra": "hydra", "iserv-proxy": "iserv-proxy", - "nix-tools-static": "nix-tools-static", "nixpkgs": [ "nixpkgs" ], @@ -677,11 +676,11 @@ "stackage": "stackage" }, "locked": { - "lastModified": 1711327801, - "narHash": "sha256-u1c7y+ksx0Er8C1s5tnoHDhhkG9eXskVOnKtzHUqQIw=", + "lastModified": 1712278203, + "narHash": "sha256-L4eFUxnID2EYYtONE3fmZxPQdgPlB6XbAfIjlZi4c+U=", "owner": "input-output-hk", "repo": "haskell.nix", - "rev": "11337f2fb85cd606630929f8fce485160d343cdc", + "rev": "57938c23a4d40e5a746f05f2b71af11a7273a133", "type": "github" }, "original": { @@ -922,11 +921,11 @@ "sodium": "sodium" }, "locked": { - "lastModified": 1709083850, - "narHash": "sha256-6DQ89ktt8rRVV1pXEyX2JwPjaqS0mQkelkmJmka04rg=", + "lastModified": 1712333583, + "narHash": "sha256-jVIJWfPvsdpS9hsyWoI7BjkxpXVACiPfqmMu35kZz58=", "owner": "input-output-hk", "repo": "iohk-nix", - "rev": "1c793a53ac0bd99b795c2180eb23d37e8389a74b", + "rev": "839040612c0d13687059b5cfaaa3f58c354989c6", "type": "github" }, "original": { @@ -1078,23 +1077,6 @@ "type": "github" } }, - "nix-tools-static": { - "flake": false, - "locked": { - "lastModified": 1706266250, - "narHash": "sha256-9t+GRk3eO9muCtKdNAwBtNBZ5dH1xHcnS17WaQyftwA=", - "owner": "input-output-hk", - "repo": "haskell-nix-example", - "rev": "580cb6db546a7777dad3b9c0fa487a366c045c4e", - "type": "github" - }, - "original": { - "owner": "input-output-hk", - "ref": "nix", - "repo": "haskell-nix-example", - "type": "github" - } - }, "nix2container": { "inputs": { "flake-utils": "flake-utils_2", @@ -1810,11 +1792,11 @@ "stackage": { "flake": false, "locked": { - "lastModified": 1711325399, - "narHash": "sha256-Tx+/n9tBfnTgXj1TbBxgbceqB1TKdYY94BRNF6qSwJY=", + "lastModified": 1712276009, + "narHash": "sha256-KlRJ+CGXRueyz2VRLDwra5JBNaI2GkltNJAjHa7fowE=", "owner": "input-output-hk", "repo": "stackage.nix", - "rev": "81b2725cbf27a23d7e292448072dc1bff976351a", + "rev": "758035379a5ac4390879e4cd5164abe0c96fcea7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0804d9ff3ec..5f9bac94f86 100644 --- a/flake.nix +++ b/flake.nix @@ -247,7 +247,7 @@ (mkFlakeAttrs (pkgs.extend (prev: final: { cardanoNodeProject = p; }))).ciJobs ) project.projectVariants; ciJobs = { - cardano-deployment = pkgs.cardanoLib.mkConfigHtml { inherit (pkgs.cardanoLib.environments) mainnet preview preprod; }; + cardano-deployment = pkgs.cardanoLib.mkConfigHtml { inherit (pkgs.cardanoLib.environments) mainnet preview preprod shelley_qa; }; } // optionalAttrs (system == "x86_64-linux") { native = packages // { shells = devShells; diff --git a/nix/workbench/profile/presets/mainnet/genesis/genesis.conway.json b/nix/workbench/profile/presets/mainnet/genesis/genesis.conway.json index 6141e96d004..59c636fec60 100644 --- a/nix/workbench/profile/presets/mainnet/genesis/genesis.conway.json +++ b/nix/workbench/profile/presets/mainnet/genesis/genesis.conway.json @@ -24,6 +24,7 @@ "govActionDeposit": 1000000000, "dRepDeposit": 2000000, "dRepActivity": 20, + "minFeeRefScriptCostPerByte": 0, "constitution": { "anchor": { "url": "", @@ -32,6 +33,6 @@ }, "committee": { "members": {}, - "quorum": 0 + "threshold": 0 } } diff --git a/scripts/babbage/conway-babbage-test-genesis.json b/scripts/babbage/conway-babbage-test-genesis.json index 6141e96d004..59c636fec60 100644 --- a/scripts/babbage/conway-babbage-test-genesis.json +++ b/scripts/babbage/conway-babbage-test-genesis.json @@ -24,6 +24,7 @@ "govActionDeposit": 1000000000, "dRepDeposit": 2000000, "dRepActivity": 20, + "minFeeRefScriptCostPerByte": 0, "constitution": { "anchor": { "url": "", @@ -32,6 +33,6 @@ }, "committee": { "members": {}, - "quorum": 0 + "threshold": 0 } } diff --git a/trace-forward/trace-forward.cabal b/trace-forward/trace-forward.cabal index 7228768676b..0281d079ee4 100644 --- a/trace-forward/trace-forward.cabal +++ b/trace-forward/trace-forward.cabal @@ -1,7 +1,7 @@ cabal-version: 3.0 name: trace-forward -version: 2.2.3 +version: 2.2.4 synopsis: The forwarding protocols library for cardano node. description: The library providing typed protocols for forwarding different information from the cardano node to an external application.