diff --git a/cabal.project b/cabal.project index 9259d05bdd4..80680ef64bd 100644 --- a/cabal.project +++ b/cabal.project @@ -166,3 +166,28 @@ if impl(ghc >= 9.14) -- Do NOT add more source-repository-package stanzas here unless they are strictly -- temporary! Please read the section in CONTRIBUTING about updating dependencies. +-- TEMPORARY: ouroboros-consensus 4.2.1.0 plus IntersectMBO/ouroboros-consensus#2167 +-- ("Allow hardfork into Dijkstra"), which no 4.x release contains yet. Without it the +-- Conway ledger config uses TriggerHardForkNotDuringThisExecution and the node can never +-- enter the Dijkstra era. On top of that, a fix for the db tools (db-synthesizer and +-- friends) so they accept ExperimentalHardForksEnabled and advertise the Dijkstra +-- protocol versions; without it db-synthesizer forges no blocks on a testnet that +-- starts in Dijkstra. Both changes are already on consensus main (5.0 has them), so +-- this whole stanza goes away with the next consensus bump. +source-repository-package + type: git + location: https://github.com/IntersectMBO/ouroboros-consensus.git + tag: 61cd7cecd8e639a2041e7e100c5ab253fe2f067b + --sha256: sha256-AsWxF+YI6eXdc3FTN0i6M/WwMOWK7TfgKNA8rtdhKqA= + + +-- TEMPORARY: cardano-api 11.7.0.0 plus IntersectMBO/cardano-api#1362 ("Add support +-- for Dijkstra ledger events"), which no release contains yet. Without it, forcing a +-- Dijkstra block's ledger events (foldBlocks / the EpochStateView fold) dies with a +-- non-exhaustive pattern match. Replace with a released version once available. +source-repository-package + type: git + location: https://github.com/IntersectMBO/cardano-api.git + tag: 216c52563381954a986b0de073e10aa392e6a0fc + subdir: cardano-api + --sha256: sha256-5rF1ntF9hHrQzZtYgUwc/Gi9vig7q/qnmU8xCVksdHM= diff --git a/cardano-testnet/src/Testnet/Defaults.hs b/cardano-testnet/src/Testnet/Defaults.hs index e9cfd55d99e..8749cd2044a 100644 --- a/cardano-testnet/src/Testnet/Defaults.hs +++ b/cardano-testnet/src/Testnet/Defaults.hs @@ -197,8 +197,8 @@ defaultConwayGenesis = do -- | The only era supported by cardano-testnet for the moment. -- It's important to keep the era parameterization everywhere, for ease of development -- when new eras roll out. -defaultEra :: ShelleyBasedEra Api.ConwayEra -defaultEra = ShelleyBasedEraConway +defaultEra :: ShelleyBasedEra Api.DijkstraEra +defaultEra = ShelleyBasedEraDijkstra -- | Configuration value that allows you to hardfork to any Cardano era -- at epoch 0. @@ -235,6 +235,10 @@ defaultYamlHardforkViaConfig sbe = hardforkViaConfig sbe' = Aeson.fromList $ ("ExperimentalProtocolsEnabled", Aeson.Bool True) + -- Dijkstra is still experimental. Without this flag the node declares PV11 as its + -- maximum protocol version, so it cannot forge once the ledger is at PV12 (its own + -- blocks are rejected with ObsoleteNode), and it ignores the Dijkstra genesis file. + : ("ExperimentalHardForksEnabled", Aeson.Bool True) : (case sbe' of ShelleyBasedEraShelley -> [ ("TestShelleyHardForkAtEpoch", Aeson.Number 0) ] diff --git a/cardano-testnet/src/Testnet/Start/Types.hs b/cardano-testnet/src/Testnet/Start/Types.hs index 884aa91d18d..c492b649180 100644 --- a/cardano-testnet/src/Testnet/Start/Types.hs +++ b/cardano-testnet/src/Testnet/Start/Types.hs @@ -202,7 +202,7 @@ data TestnetCreationOptions = TestnetCreationOptions instance Default TestnetCreationOptions where def = TestnetCreationOptions { creationNodes = cardanoDefaultTestnetNodesWithOptions - , creationEra = AnyShelleyBasedEra ShelleyBasedEraConway + , creationEra = AnyShelleyBasedEra ShelleyBasedEraDijkstra , creationMaxSupply = 100_000_020_000_000 , creationNumDReps = 3 , creationGenesisOptions = def diff --git a/cardano-testnet/test/cardano-testnet-golden/files/golden/node_default_config.json b/cardano-testnet/test/cardano-testnet-golden/files/golden/node_default_config.json index 9528440b7bc..78b21f4c5f8 100644 --- a/cardano-testnet/test/cardano-testnet-golden/files/golden/node_default_config.json +++ b/cardano-testnet/test/cardano-testnet-golden/files/golden/node_default_config.json @@ -3,9 +3,10 @@ "ByronGenesisFile": "byron-genesis.json", "ConwayGenesisFile": "conway-genesis.json", "DijkstraGenesisFile": "dijkstra-genesis.json", + "ExperimentalHardForksEnabled": true, "ExperimentalProtocolsEnabled": true, "LastKnownBlockVersion-Alt": 0, - "LastKnownBlockVersion-Major": 9, + "LastKnownBlockVersion-Major": 10, "LastKnownBlockVersion-Minor": 0, "MaxConcurrencyBulkSync": 1, "MaxConcurrencyDeadline": 2, @@ -19,6 +20,7 @@ "TestAlonzoHardForkAtEpoch": 0, "TestBabbageHardForkAtEpoch": 0, "TestConwayHardForkAtEpoch": 0, + "TestDijkstraHardForkAtEpoch": 0, "TestMaryHardForkAtEpoch": 0, "TestShelleyHardForkAtEpoch": 0, "TraceOptions": {} diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Api/TxReferenceInputDatum.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Api/TxReferenceInputDatum.hs index 46e023a88b1..989a07c1540 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Api/TxReferenceInputDatum.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Api/TxReferenceInputDatum.hs @@ -59,7 +59,7 @@ hprop_tx_refin_datum = integrationRetryWorkspace 2 "api-tx-refin-dat" $ \tempAbs conf@Conf{tempAbsPath} <- mkConf tempAbsBasePath' let tempAbsPath' = unTmpAbsPath tempAbsPath - let era = Exp.ConwayEra + let era = Exp.DijkstraEra sbe = convert era ceo = convert era beo = convert ceo @@ -122,7 +122,7 @@ hprop_tx_refin_datum = integrationRetryWorkspace 2 "api-tx-refin-dat" $ \tempAbs -- prepare txout let txOutValue = lovelaceToTxOutValue sbe 100_000_000 - txOuts :: [TxOut CtxTx ConwayEra] + txOuts :: [TxOut CtxTx DijkstraEra] txOuts = [ TxOut addr1 txOutValue txDatum1 ReferenceScriptNone , TxOut addr1 txOutValue txDatum2 ReferenceScriptNone @@ -134,7 +134,7 @@ hprop_tx_refin_datum = integrationRetryWorkspace 2 "api-tx-refin-dat" $ \tempAbs -- toCtxUTxOTxOut strips the TxOutSupplementalDatum marker, so we must pass -- supplemental datums explicitly supplementalDatums = Exp.obtainCommonConstraints era $ M.fromList - [ let ledgerData = toAlonzoData @(ShelleyLedgerEra ConwayEra) sd + [ let ledgerData = toAlonzoData @(ShelleyLedgerEra DijkstraEra) sd in (hashData ledgerData, ledgerData) | sd <- [scriptData3] ] @@ -150,7 +150,7 @@ hprop_tx_refin_datum = integrationRetryWorkspace 2 "api-tx-refin-dat" $ \tempAbs (unsignedTx@(Exp.UnsignedTx ledgerTx), _finalContent) <- H.leftFail $ - Exp.makeTransactionBodyAutoBalance @ConwayEra + Exp.makeTransactionBodyAutoBalance @DijkstraEra systemStart epochInfo (unLedgerProtocolParameters pparams) @@ -221,7 +221,7 @@ hprop_tx_refin_datum = integrationRetryWorkspace 2 "api-tx-refin-dat" $ \tempAbs -- add actual datum values for the two reference inputs via supplemental datums ledgerPparams = unLedgerProtocolParameters pparams supplementalDatums = Exp.obtainCommonConstraints era $ M.fromList - [ let ledgerData = toAlonzoData @(ShelleyLedgerEra ConwayEra) sd + [ let ledgerData = toAlonzoData @(ShelleyLedgerEra DijkstraEra) sd in (hashData ledgerData, ledgerData) | sd <- [scriptData1, scriptData3, scriptData4] ] @@ -277,7 +277,7 @@ hprop_tx_refin_datum = integrationRetryWorkspace 2 "api-tx-refin-dat" $ \tempAbs -- add one reference input with datum hash and its datum, and one superfluous datum ledgerPparams3 = unLedgerProtocolParameters pparams supplementalDatums3 = Exp.obtainCommonConstraints era $ M.fromList - [ let ledgerData = toAlonzoData @(ShelleyLedgerEra ConwayEra) sd + [ let ledgerData = toAlonzoData @(ShelleyLedgerEra DijkstraEra) sd in (hashData ledgerData, ledgerData) | sd <- [scriptData1, scriptData3] ] 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 f099ec51312..eea71b39bde 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 @@ -66,7 +66,7 @@ hprop_kes_period_info = integrationRetryWorkspace 2 "kes-period-info" $ \tempAbs <- mkConf tempAbsBasePath' let tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath - ceo = ConwayEraOnwardsConway + ceo = ConwayEraOnwardsDijkstra sbe = convert ceo asbe = AnyShelleyBasedEra sbe eraString = eraToString sbe diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/LeadershipSchedule.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/LeadershipSchedule.hs index 00be5b1a35e..253f9434e15 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/LeadershipSchedule.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/LeadershipSchedule.hs @@ -66,7 +66,7 @@ hprop_leadershipSchedule = integrationRetryWorkspace 2 "leadership-schedule" $ \ H.note_ SYS.os conf@Conf { tempAbsPath=tempAbsPath@(TmpAbsolutePath work) } <- mkConf tempAbsBasePath' let tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath - ceo = ConwayEraOnwardsConway + ceo = ConwayEraOnwardsDijkstra sbe = convert ceo asbe = AnyShelleyBasedEra sbe cTestnetOptions = def diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/BuildRaw.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/BuildRaw.hs index c10d47efc80..dd014338aa6 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/BuildRaw.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/BuildRaw.hs @@ -49,7 +49,7 @@ hprop_build_raw_ref_script_spend = integrationRetryWorkspace 2 "build-raw-ref-sc work <- H.createDirectoryIfMissing $ tempAbsPath' "work" let - sbe = ShelleyBasedEraConway + sbe = ShelleyBasedEraDijkstra era = toCardanoEra sbe cEra = AnyCardanoEra era eraName = eraToString era diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/CostCalculation.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/CostCalculation.hs index 2721030c6f4..02752f04706 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/CostCalculation.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/CostCalculation.hs @@ -62,7 +62,7 @@ hprop_ref_plutus_cost_calculation = integrationRetryWorkspace 2 "ref-plutus-scri work <- H.createDirectoryIfMissing $ tempAbsPath' "work" let - sbe = ShelleyBasedEraConway + sbe = ShelleyBasedEraDijkstra era = toCardanoEra sbe cEra = AnyCardanoEra era eraName = eraToString era @@ -218,7 +218,7 @@ hprop_included_plutus_cost_calculation = integrationRetryWorkspace 2 "included-p work <- H.createDirectoryIfMissing $ tempAbsPath' "work" let - sbe = ShelleyBasedEraConway + sbe = ShelleyBasedEraDijkstra era = toCardanoEra sbe cEra = AnyCardanoEra era eraName = eraToString era @@ -330,7 +330,7 @@ hprop_included_simple_script_cost_calculation = integrationRetryWorkspace 2 "inc work <- H.createDirectoryIfMissing $ tempAbsPath' "work" let - sbe = ShelleyBasedEraConway + sbe = ShelleyBasedEraDijkstra era = toCardanoEra sbe cEra = AnyCardanoEra era eraName = eraToString era diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/MultiAssetReturnCollateral.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/MultiAssetReturnCollateral.hs index f43705214b2..212e8d18de1 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/MultiAssetReturnCollateral.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/MultiAssetReturnCollateral.hs @@ -42,7 +42,7 @@ hprop_collateral_with_tokens = integrationRetryWorkspace 2 "collateral-with-toke let tempBaseAbsPath = makeTmpBaseAbsPath $ TmpAbsolutePath tempAbsPath' - ceo = ConwayEraOnwardsConway + ceo = ConwayEraOnwardsDijkstra sbe = convert ceo era = toCardanoEra sbe anyEra = AnyCardanoEra era diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/Scripts.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/Scripts.hs index 33bef8c9eb1..b7e8185f27b 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/Scripts.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Plutus/Scripts.hs @@ -54,7 +54,7 @@ hprop_plutus_purposes_v3 = integrationRetryWorkspace 2 "all-plutus-script-purpos let tempBaseAbsPath = makeTmpBaseAbsPath $ TmpAbsolutePath tempAbsPath' - ceo = ConwayEraOnwardsConway + ceo = ConwayEraOnwardsDijkstra sbe = convert ceo era = toCardanoEra sbe anyEra = AnyCardanoEra era @@ -204,6 +204,11 @@ hprop_tx_two_script_certs_v2 = integrationRetryWorkspace 2 "tx-2-script-certs" $ let tempBaseAbsPath = makeTmpBaseAbsPath $ TmpAbsolutePath tempAbsPath' + -- This test stays on Conway for now: testnets that start directly in Dijkstra + -- lose the PlutusV2 cost model that the Alonzo genesis provides through + -- extraConfig, because cardano-ledger-dijkstra 0.3's injectIntoTestState misses + -- the alonzoInjectCostModels step. This is fixed in cardano-ledger-dijkstra + -- 0.4.0.0, so this test can move to Dijkstra once the node uses ledger 0.4. ceo = ConwayEraOnwardsConway sbe = convert ceo era = toCardanoEra sbe diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs index beaceff5525..706b1266604 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Query.hs @@ -82,8 +82,8 @@ hprop_cli_queries = integrationRetryWorkspace 2 "cli-queries" $ \tempAbsBasePath <- mkConf tempAbsBasePath' let tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath - let sbe = ShelleyBasedEraConway - ceo = ConwayEraOnwardsConway + let sbe = ShelleyBasedEraDijkstra + ceo = ConwayEraOnwardsDijkstra asbe = AnyShelleyBasedEra sbe era = toCardanoEra sbe cEra = AnyCardanoEra era diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Scripts/Simple/CostCalculation.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Scripts/Simple/CostCalculation.hs index 44d54fd3ff3..7358fce39c6 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Scripts/Simple/CostCalculation.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Scripts/Simple/CostCalculation.hs @@ -47,7 +47,7 @@ hprop_ref_simple_script_mint = integrationRetryWorkspace 2 "ref-simple-script" $ work <- H.createDirectoryIfMissing $ tempAbsPath' "work" let - sbe = ShelleyBasedEraConway + sbe = ShelleyBasedEraDijkstra era = toCardanoEra sbe cEra = AnyCardanoEra era eraName = eraToString era diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Scripts/Simple/Mint.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Scripts/Simple/Mint.hs index 05d49596d23..b66c747cb71 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Scripts/Simple/Mint.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Scripts/Simple/Mint.hs @@ -45,7 +45,7 @@ hprop_simple_script_mint = integrationRetryWorkspace 2 "simple-script-mint" $ \t let tempBaseAbsPath = makeTmpBaseAbsPath $ TmpAbsolutePath tempAbsPath' - ceo = ConwayEraOnwardsConway + ceo = ConwayEraOnwardsDijkstra sbe = convert ceo era = toCardanoEra sbe anyEra = AnyCardanoEra era diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction.hs index 081da7e86bc..1d491d16069 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction.hs @@ -50,7 +50,7 @@ hprop_transaction = integrationRetryWorkspace 2 "simple transaction build" $ \te work <- H.createDirectoryIfMissing $ tempAbsPath' "work" let - sbe = ShelleyBasedEraConway + sbe = ShelleyBasedEraDijkstra era = toCardanoEra sbe cEra = AnyCardanoEra era tempBaseAbsPath = makeTmpBaseAbsPath $ TmpAbsolutePath tempAbsPath' diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/BuildEstimate.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/BuildEstimate.hs index 5e3f2bdec67..e02945e2d8b 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/BuildEstimate.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/BuildEstimate.hs @@ -46,7 +46,7 @@ hprop_tx_build_estimate = integrationRetryWorkspace 2 "transaction-build-estimat work <- H.createDirectoryIfMissing $ tempAbsPath' "work" - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo eraName = eraToString sbe creationOptions = def diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/RegisterDeregisterStakeAddress.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/RegisterDeregisterStakeAddress.hs index 3bcca8af16b..b14947f4ba0 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/RegisterDeregisterStakeAddress.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/RegisterDeregisterStakeAddress.hs @@ -49,7 +49,7 @@ hprop_tx_register_deregister_stake_address = integrationRetryWorkspace 2 "regist work <- H.createDirectoryIfMissing $ tempAbsPath' "work" - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo eraName = eraToString sbe creationOptions = def diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/WithdrawalReward.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/WithdrawalReward.hs index ebc0e0840a0..4a8b21c7af5 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/WithdrawalReward.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Transaction/WithdrawalReward.hs @@ -58,7 +58,7 @@ hprop_tx_withdrawal_reward = integrationRetryWorkspace 2 "tx-withdrawal-reward" work <- H.createDirectoryIfMissing $ tempAbsPath' "work" - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo eraName = eraToString sbe creationOptions = def @@ -133,7 +133,7 @@ hprop_tx_withdrawal_reward_plutus_v3 = integrationRetryWorkspace 2 "tx-withdrawa work <- H.createDirectoryIfMissing $ tempAbsPath' "work" - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo eraName = eraToString sbe creationOptions = def diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldEpochState.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldEpochState.hs index 122117d069f..42a6fd9d008 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldEpochState.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/FoldEpochState.hs @@ -30,7 +30,7 @@ prop_foldEpochState = integrationRetryWorkspace 2 "foldEpochState" $ \tempAbsBas conf <- TN.mkConf tempAbsBasePath' let tempAbsPath' = unTmpAbsPath $ tempAbsPath conf - sbe = ShelleyBasedEraConway + sbe = ShelleyBasedEraDijkstra creationOptions = def { creationEra = AnyShelleyBasedEra sbe } runtime@TestnetRuntime{configurationFile} <- createAndRunTestnet creationOptions def conf diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/CommitteeAddNew.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/CommitteeAddNew.hs index 088570c31f2..9b9356e67b4 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/CommitteeAddNew.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/CommitteeAddNew.hs @@ -75,7 +75,7 @@ hprop_constitutional_committee_add_new = integrationRetryWorkspace 2 "constituti mkVotes votes = zip (concatMap (uncurry replicate) votes) [1..] nDrepVotes = length drepVotes nSpos = fromIntegral $ creationNumPools creationOptions - ceo = ConwayEraOnwardsConway + ceo = ConwayEraOnwardsDijkstra sbe = convert ceo era = toCardanoEra sbe cEra = AnyCardanoEra era diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs index 26860eaa348..a8d4233bf40 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs @@ -60,7 +60,7 @@ hprop_check_drep_activity = integrationRetryWorkspace 2 "test-activity" $ \tempA work <- H.createDirectoryIfMissing $ tempAbsPath' "work" -- Create default testnet with 3 DReps and 3 stake holders delegated, one to each DRep. - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo creationOptions = def { creationEra = AnyShelleyBasedEra sbe diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepDeposit.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepDeposit.hs index 280685eba11..4544814a66a 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepDeposit.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepDeposit.hs @@ -42,7 +42,7 @@ hprop_ledger_events_drep_deposits = integrationRetryWorkspace 2 "drep-deposits" work <- H.createDirectoryIfMissing $ tempAbsPath' "work" - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo era = toCardanoEra sbe cEra = AnyCardanoEra era @@ -88,7 +88,7 @@ hprop_ledger_events_drep_deposits = integrationRetryWorkspace 2 "drep-deposits" drepSignedRegTx1 <- signTx execConfig cEra drepDir1 "signed-reg-tx" drepRegTxBody1 [Some drepKeyPair1, Some $ paymentKeyInfoPair wallet0] - failToSubmitTx execConfig cEra drepSignedRegTx1 "ConwayDRepIncorrectDeposit" + failToSubmitTx execConfig cEra drepSignedRegTx1 "DijkstraDRepIncorrectDeposit" -- DRep 2 (enough deposit) diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepRetirement.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepRetirement.hs index 19053bfb482..43dfcb98c78 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepRetirement.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepRetirement.hs @@ -35,11 +35,11 @@ import qualified Hedgehog as H import qualified Hedgehog.Extras as H -- | The era in which this test runs -sbe :: ShelleyBasedEra ConwayEra -sbe = ShelleyBasedEraConway +sbe :: ShelleyBasedEra DijkstraEra +sbe = ShelleyBasedEraDijkstra -ceo :: ConwayEraOnwards ConwayEra -ceo = ConwayEraOnwardsConway +ceo :: ConwayEraOnwards DijkstraEra +ceo = ConwayEraOnwardsDijkstra -- Execute this test with: -- @DISABLE_RETRIES=1 cabal test cardano-testnet-test --test-options '-p "/DRep Retirement/"'@ @@ -95,14 +95,14 @@ hprop_drep_retirement = integrationRetryWorkspace 2 "drep-retirement" $ \tempAbs let drepRetirementCertFile = gov defaultDRepKeysDir "drep1.retirementcert" H.noteM_ $ execCli' execConfig - [ "conway", "governance", "drep", "retirement-certificate" + [ eraToString sbe, "governance", "drep", "retirement-certificate" , "--drep-verification-key-file", verificationKeyFp $ defaultDRepKeyPair 1 , "--deposit-amt", show @Int 1_000_000 , "--out-file", drepRetirementCertFile ] H.noteM_ $ execCli' execConfig - [ "conway", "query", "utxo" + [ eraToString sbe, "query", "utxo" , "--address", Text.unpack $ paymentKeyInfoAddr wallet0 , "--cardano-mode" , "--out-file", work "utxo-11.json" @@ -114,7 +114,7 @@ hprop_drep_retirement = integrationRetryWorkspace 2 "drep-retirement" $ \tempAbs drepRetirementRegTxSignedFp <- H.note $ work "drep.retirement.tx" H.noteM_ $ execCli' execConfig - [ "conway", "transaction", "build" + [ eraToString sbe, "transaction", "build" , "--tx-in", Text.unpack $ renderTxIn txin2 , "--change-address", Text.unpack $ paymentKeyInfoAddr wallet0 , "--certificate-file", drepRetirementCertFile @@ -123,7 +123,7 @@ hprop_drep_retirement = integrationRetryWorkspace 2 "drep-retirement" $ \tempAbs ] H.noteM_ $ execCli' execConfig - [ "conway", "transaction", "sign" + [ eraToString sbe, "transaction", "sign" , "--tx-body-file", drepRetirementRegTxbodyFp , "--signing-key-file", signingKeyFp $ paymentKeyInfoPair wallet0 , "--signing-key-file", signingKeyFp $ defaultDRepKeyPair 1 @@ -131,7 +131,7 @@ hprop_drep_retirement = integrationRetryWorkspace 2 "drep-retirement" $ \tempAbs ] H.noteM_ $ execCli' execConfig - [ "conway", "transaction", "submit" + [ eraToString sbe, "transaction", "submit" , "--tx-file", drepRetirementRegTxSignedFp ] diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/GovActionTimeout.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/GovActionTimeout.hs index bd72aa94209..be135c18fe7 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/GovActionTimeout.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/GovActionTimeout.hs @@ -49,7 +49,7 @@ hprop_check_gov_action_timeout = integrationRetryWorkspace 2 "gov-action-timeout work <- H.createDirectoryIfMissing $ tempAbsPath' "work" -- Create default testnet - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo eraName = eraToString sbe asbe = AnyShelleyBasedEra sbe diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs index f6064960409..77b48c26161 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/InfoAction.hs @@ -60,7 +60,7 @@ hprop_ledger_events_info_action = integrationRetryWorkspace 2 "info-hash" $ \tem work <- H.createDirectoryIfMissing $ tempAbsPath' "work" - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo asbe = AnyShelleyBasedEra sbe eraName = eraToString sbe diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/NoConfidence.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/NoConfidence.hs index a8ded2569a8..09b8dacd061 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/NoConfidence.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/NoConfidence.hs @@ -63,7 +63,7 @@ hprop_gov_no_confidence = integrationRetryWorkspace 2 "no-confidence" $ \tempAbs work <- H.createDirectoryIfMissing $ tempAbsPath' "work" - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo asbe = AnyShelleyBasedEra sbe era = toCardanoEra sbe diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PParamChangeFailsSPO.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PParamChangeFailsSPO.hs index 5a4661f5429..1dd35c1bc54 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PParamChangeFailsSPO.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PParamChangeFailsSPO.hs @@ -58,7 +58,7 @@ hprop_check_pparam_fails_spo = integrationRetryWorkspace 2 "test-pparam-spo" $ \ work <- H.createDirectoryIfMissing $ tempAbsPath' "work" -- Create default testnet - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo asbe = AnyShelleyBasedEra sbe eraName = eraToString sbe diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PredefinedAbstainDRep.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PredefinedAbstainDRep.hs index 22d6d02397f..0c03a2d14bf 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PredefinedAbstainDRep.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/PredefinedAbstainDRep.hs @@ -72,7 +72,7 @@ hprop_check_predefined_abstain_drep = H.integrationRetryWorkspace 2 "test-activi work <- H.createDirectoryIfMissing $ tempAbsPath' "work" -- Create default testnet with 3 DReps and 3 stake holders delegated, one to each DRep. - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo creationOptions = def { creationEra = AnyShelleyBasedEra sbe @@ -170,7 +170,7 @@ desiredPoolNumberProposalTest :: (HasCallStack, MonadTest m, MonadIO m, H.MonadAssertion m, MonadCatch m, Foldable t) => H.ExecConfig -- ^ Specifies the CLI execution configuration. -> EpochStateView -- ^ Current epoch state view for transaction building. It can be obtained - -> ConwayEraOnwards ConwayEra -- ^ The ConwaysEraOnwards witness for the Conway era + -> ConwayEraOnwards DijkstraEra -- ^ The ConwaysEraOnwards witness for the Conway era -> FilePath -- ^ Base directory path where generated files will be stored. -> String -- ^ Name for the subfolder that will be created under 'work' folder. -> PaymentKeyInfo -- ^ Wallet that will pay for the transaction. @@ -217,7 +217,7 @@ makeDesiredPoolNumberChangeProposal :: (HasCallStack, H.MonadAssertion m, MonadTest m, MonadCatch m, MonadIO m) => H.ExecConfig -- ^ Specifies the CLI execution configuration. -> EpochStateView -- ^ Current epoch state view for transaction building. It can be obtained - -> ConwayEraOnwards ConwayEra -- ^ The conway era onwards witness for the era in which the transaction will be constructed. + -> ConwayEraOnwards DijkstraEra -- ^ The conway era onwards witness for the era in which the transaction will be constructed. -> FilePath -- ^ Base directory path where generated files will be stored. -> String -- ^ Name for the subfolder that will be created under 'work' folder. -> Maybe (String, Word16) -- ^ The transaction identifier and index of the previous passed @@ -255,7 +255,7 @@ makeDesiredPoolNumberChangeProposal execConfig epochStateView ceo work prefix proposalFile <- H.note $ baseDir "sample-proposal-file" void $ H.execCli' execConfig $ - [ "conway", "governance", "action", "create-protocol-parameters-update" + [ eraToString sbe, "governance", "action", "create-protocol-parameters-update" , "--testnet" , "--governance-action-deposit", show @Integer minDRepDeposit , "--deposit-return-stake-verification-key-file", stakeVkeyFp @@ -273,7 +273,7 @@ makeDesiredPoolNumberChangeProposal execConfig epochStateView ceo work prefix txIn <- findLargestUtxoForPaymentKey epochStateView sbe wallet void $ H.execCli' execConfig - [ "conway", "transaction", "build" + [ eraToString sbe, "transaction", "build" , "--change-address", Text.unpack $ paymentKeyInfoAddr wallet , "--tx-in", Text.unpack $ renderTxIn txIn , "--proposal-file", proposalFile @@ -303,7 +303,7 @@ voteChangeProposal :: (MonadTest m, MonadIO m, MonadCatch m, H.MonadAssertion m) => H.ExecConfig -- ^ Specifies the CLI execution configuration. -> EpochStateView -- ^ Current epoch state view for transaction building. It can be obtained -- using the 'getEpochStateView' function. - -> ShelleyBasedEra ConwayEra -- ^ The Shelley-based witness for ConwayEra (i.e: ShelleyBasedEraConway). + -> ShelleyBasedEra DijkstraEra -- ^ The Shelley-based witness for ConwayEra (i.e: ShelleyBasedEraDijkstra). -> FilePath -- ^ Base directory path where the subdirectory with the intermediate files will be created. -> String -- ^ Name for the subdirectory that will be created for storing the intermediate files. -> TxId -- ^ Transaction id of the governance action to vote. diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs index 3aec166bb4a..c92d39c9161 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitution.hs @@ -90,7 +90,7 @@ hprop_ledger_events_propose_new_constitution = integrationRetryWorkspace 2 "prop numVotes = length allVotes annotateShow numVotes - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo era = toCardanoEra sbe cEra = AnyCardanoEra era @@ -231,7 +231,7 @@ hprop_ledger_events_propose_new_constitution = integrationRetryWorkspace 2 "prop let execConfig' = addEnvVarsToConfig execConfig [("IPFS_GATEWAY_URI", "http://localhost:" ++ show port ++ "/")] void $ execCli' execConfig' - [ "conway", "governance", "action", "create-constitution" + [ eraToString sbe, "governance", "action", "create-constitution" , "--testnet" , "--governance-action-deposit", show minDRepDeposit , "--deposit-return-stake-verification-key-file", verificationKeyFp stakeKeys @@ -249,7 +249,7 @@ hprop_ledger_events_propose_new_constitution = integrationRetryWorkspace 2 "prop txin2 <- findLargestUtxoForPaymentKey epochStateView sbe wallet1 void $ execCli' execConfig' - [ "conway", "transaction", "build" + [ eraToString sbe, "transaction", "build" , "--change-address", Text.unpack $ paymentKeyInfoAddr wallet1 , "--tx-in", Text.unpack $ renderTxIn txin2 , "--tx-out", Text.unpack (paymentKeyInfoAddr wallet0) <> "+" <> show @Int 5_000_000 diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitutionSPO.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitutionSPO.hs index 82cf467e17a..a8880e70c14 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitutionSPO.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/ProposeNewConstitutionSPO.hs @@ -54,7 +54,7 @@ hprop_ledger_events_propose_new_constitution_spo = integrationRetryWorkspace 2 " <- mkConf tempAbsBasePath' let tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo era = toCardanoEra sbe cEra = AnyCardanoEra era @@ -123,7 +123,7 @@ hprop_ledger_events_propose_new_constitution_spo = integrationRetryWorkspace 2 " -- Create constitution proposal H.noteM_ $ execCli' execConfig - [ "conway", "governance", "action", "create-constitution" + [ eraToString sbe, "governance", "action", "create-constitution" , "--testnet" , "--governance-action-deposit", show minDRepDeposit , "--deposit-return-stake-verification-key-file", stakeVkeyFp @@ -139,7 +139,7 @@ hprop_ledger_events_propose_new_constitution_spo = integrationRetryWorkspace 2 " txIn1 <- findLargestUtxoForPaymentKey epochStateView sbe wallet0 H.noteM_ $ execCli' execConfig - [ "conway", "transaction", "build" + [ eraToString sbe, "transaction", "build" , "--tx-in", Text.unpack $ renderTxIn txIn1 , "--change-address", Text.unpack $ paymentKeyInfoAddr wallet0 , "--proposal-file", constitutionActionFp diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/Transaction/HashMismatch.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/Transaction/HashMismatch.hs index d14caa497b1..de390f59f5f 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/Transaction/HashMismatch.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/Transaction/HashMismatch.hs @@ -47,7 +47,7 @@ hprop_transaction_build_wrong_hash = integrationRetryWorkspace 2 "wrong-hash" $ work <- H.createDirectoryIfMissing $ tempAbsPath' "work" - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo asbe = AnyShelleyBasedEra sbe eraName = eraToString sbe diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs index c982be1152b..f9e0b07f6d7 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryDonation.hs @@ -45,7 +45,7 @@ hprop_ledger_events_treasury_donation = integrationRetryWorkspace 2 "treasury-do <- mkConf tempAbsBasePath' let tempBaseAbsPath = makeTmpBaseAbsPath tempAbsPath - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo creationOptions = def { creationEra = AnyShelleyBasedEra sbe @@ -110,7 +110,7 @@ doTreasuryDonation sbe execConfig work epochStateView wallet0 idx currentTreasur txIn0 <- findLargestUtxoForPaymentKey epochStateView sbe wallet0 (exitCode, stdout, stderr) <- execCliAny execConfig - [ "conway", "transaction", "build" + [ eraToString sbe, "transaction", "build" , "--tx-in", Text.unpack $ renderTxIn txIn0 , "--change-address", Text.unpack $ paymentKeyInfoAddr wallet0 , "--treasury-donation", show treasuryDonation @@ -137,7 +137,7 @@ doTreasuryDonation sbe execConfig work epochStateView wallet0 idx currentTreasur , "--output-json", "--out-file", txViewFp] H.noteM_ $ execCli' execConfig - [ "conway", "transaction", "sign" + [ eraToString sbe, "transaction", "sign" , "--tx-body-file", txBodyFp , "--signing-key-file", signingKeyFp $ paymentKeyInfoPair wallet0 , "--out-file", signedTxFp @@ -147,7 +147,7 @@ doTreasuryDonation sbe execConfig work epochStateView wallet0 idx currentTreasur [ "debug", "transaction", "view" , "--tx-file", signedTxFp ] H.noteM_ $ execCli' execConfig - [ "conway", "transaction", "submit" , "--tx-file", signedTxFp ] + [ eraToString sbe, "transaction", "submit" , "--tx-file", signedTxFp ] let expectedTreasury = L.Coin $ currentTreasury + toInteger treasuryDonation void $ retryUntilM epochStateView (WaitForEpochs $ EpochInterval 10) diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryGrowth.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryGrowth.hs index 73526132f9a..12e60822340 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryGrowth.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryGrowth.hs @@ -42,7 +42,7 @@ prop_check_if_treasury_is_growing = integrationRetryWorkspace 2 "growing-treasur let tempBaseAbsPath = makeTmpBaseAbsPath $ tempAbsPath conf let era = ConwayEra - sbe = ShelleyBasedEraConway + sbe = ShelleyBasedEraDijkstra creationOptions = def { creationEra = AnyShelleyBasedEra sbe -- TODO: We should only support the latest era and the upcoming era , creationGenesisOptions = def { genesisEpochLength = 100 diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryWithdrawal.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryWithdrawal.hs index 882d20b9314..f58aad5d43f 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryWithdrawal.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/TreasuryWithdrawal.hs @@ -63,7 +63,7 @@ hprop_ledger_events_treasury_withdrawal = integrationRetryWorkspace 2 "treasury work <- H.createDirectoryIfMissing $ tempAbsPath' "work" - let ceo = ConwayEraOnwardsConway + let ceo = ConwayEraOnwardsDijkstra sbe = convert ceo era = toCardanoEra sbe eraName = eraToString era diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Rpc/FetchBlock.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Rpc/FetchBlock.hs index b79eb497308..65294daadfb 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Rpc/FetchBlock.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Rpc/FetchBlock.hs @@ -61,7 +61,7 @@ hprop_rpc_fetch_block = integrationRetryWorkspace 2 "rpc-fetch-block" $ \tempAbs conf@Conf{tempAbsPath} <- mkConf tempAbsBasePath' let tempAbsPath' = unTmpAbsPath tempAbsPath - let era = Exp.ConwayEra + let era = Exp.DijkstraEra sbe = convert era eraName = eraToString sbe creationOptions = def{creationEra = AnyShelleyBasedEra sbe} @@ -306,9 +306,9 @@ hprop_rpc_fetch_block = integrationRetryWorkspace 2 "rpc-fetch-block" $ \tempAbs witnessSet ^. U5c.redeemers H.=== [] -- An "anyone can mint" policy: a native script requiring an empty set of conditions - let mintScript :: Exp.SimpleScript (Exp.LedgerEra Exp.ConwayEra) + let mintScript :: Exp.SimpleScript (Exp.LedgerEra DijkstraEra) mintScript = Exp.SimpleScript $ Shelley.RequireAllOf mempty - mintPolicyId = PolicyId . fromShelleyScriptHash $ Exp.hashSimpleScript @Exp.ConwayEra mintScript + mintPolicyId = PolicyId . fromShelleyScriptHash $ Exp.hashSimpleScript @DijkstraEra mintScript mintAssetName = UnsafeAssetName "RpcTestToken" mintQuantity = 1000 diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json index ec713c7fd2a..90907efdbca 100644 --- a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json +++ b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/govStateOut.json @@ -182,183 +182,6 @@ 18975, 10 ], - "PlutusV2": [ - 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 - ], "PlutusV3": [ 100788, 420, @@ -640,6 +463,8 @@ }, "maxBlockHeaderSize": 1100, "maxCollateralInputs": 3, + "maxRefScriptSizePerBlock": 1048576, + "maxRefScriptSizePerTx": 204800, "maxTxExecutionUnits": { "memory": 140000000, "steps": 10000000000 @@ -659,9 +484,11 @@ "ppSecurityGroup": 0.5 }, "protocolVersion": { - "major": 10, + "major": 12, "minor": 0 }, + "refScriptCostMultiplier": 1.2, + "refScriptCostStride": 25600, "stakeAddressDeposit": 400000, "stakePoolDeposit": 0, "stakePoolTargetNum": 100, @@ -860,271 +687,94 @@ 18975, 10 ], - "PlutusV2": [ - 205665, - 812, + "PlutusV3": [ + 100788, + 420, 1, 1, 1000, - 571, + 173, 0, 1, 1000, - 24177, + 59957, 4, 1, - 1000, + 11183, 32, - 117366, - 10475, + 201305, + 8356, 4, - 23000, + 16000, 100, - 23000, + 16000, 100, - 23000, + 16000, 100, - 23000, + 16000, 100, - 23000, + 16000, 100, - 23000, + 16000, 100, 100, 100, - 23000, + 16000, 100, - 19537, + 94375, 32, - 175354, + 132994, 32, - 46417, + 61462, 4, - 221973, - 511, + 72010, + 178, 0, 1, - 89141, + 22151, 32, - 497525, - 14068, + 91189, + 769, 4, 2, - 196500, - 453240, - 220, + 85848, + 123203, + 7305, + -900, + 1716, + 960, + 57, + 85848, 0, 1, 1, 1000, - 28662, + 42921, 4, 2, - 245000, - 216773, - 62, + 30623, + 28755, + 75, 1, - 1060367, - 12586, + 898148, + 27279, 1, - 208512, - 421, + 51775, + 558, 1, - 187000, + 39184, 1000, - 52998, + 60594, 1, - 80436, + 141895, 32, - 43249, + 83150, 32, - 1000, + 15299, 32, - 80556, + 76049, 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 - ], - "PlutusV3": [ - 100788, - 420, - 1, - 1, - 1000, - 173, - 0, - 1, - 1000, - 59957, - 4, - 1, - 11183, - 32, - 201305, - 8356, - 4, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 16000, - 100, - 100, - 100, - 16000, - 100, - 94375, - 32, - 132994, - 32, - 61462, - 4, - 72010, - 178, - 0, - 1, - 22151, - 32, - 91189, - 769, - 4, - 2, - 85848, - 123203, - 7305, - -900, - 1716, - 960, - 57, - 85848, - 0, - 1, - 1, - 1000, - 42921, - 4, - 2, - 30623, - 28755, - 75, - 1, - 898148, - 27279, - 1, - 51775, - 558, - 1, - 39184, - 1000, - 60594, - 1, - 141895, - 32, - 83150, - 32, - 15299, - 32, - 76049, - 1, - 13169, + 13169, 4, 22100, 10, @@ -1278,256 +928,92 @@ 4, 207616, 8310, - 4, - 1293828, - 28716, - 63, - 0, - 1, - 1006041, - 43623, - 251, - 0, - 1 - ] - }, - "dRepActivity": 100, - "dRepDeposit": 1000000, - "dRepVotingThresholds": { - "committeeNoConfidence": 0, - "committeeNormal": 0.5, - "hardForkInitiation": 0.5, - "motionNoConfidence": 0, - "ppEconomicGroup": 0.5, - "ppGovGroup": 0.5, - "ppNetworkGroup": 0.5, - "ppTechnicalGroup": 0.5, - "treasuryWithdrawal": 0.5, - "updateToConstitution": 0 - }, - "executionUnitPrices": { - "priceMemory": 5.77e-2, - "priceSteps": 7.21e-5 - }, - "govActionDeposit": 1000000, - "govActionLifetime": 1, - "maxBlockBodySize": 65536, - "maxBlockExecutionUnits": { - "memory": 62000000, - "steps": 20000000000 - }, - "maxBlockHeaderSize": 1100, - "maxCollateralInputs": 3, - "maxTxExecutionUnits": { - "memory": 140000000, - "steps": 10000000000 - }, - "maxTxSize": 16384, - "maxValueSize": 5000, - "minFeeRefScriptCostPerByte": 15, - "minPoolCost": 0, - "monetaryExpansion": 0.1, - "poolPledgeInfluence": 0, - "poolRetireMaxEpoch": 18, - "poolVotingThresholds": { - "committeeNoConfidence": 0.5, - "committeeNormal": 0.5, - "hardForkInitiation": 0.5, - "motionNoConfidence": 0.5, - "ppSecurityGroup": 0.5 - }, - "protocolVersion": { - "major": 10, - "minor": 0 - }, - "stakeAddressDeposit": 400000, - "stakePoolDeposit": 0, - "stakePoolTargetNum": 100, - "treasuryCut": 0.1, - "txFeeFixed": 0, - "txFeePerByte": 1, - "utxoCostPerByte": 4310 - }, - "prevGovActionIds": { - "Committee": null, - "Constitution": null, - "HardFork": null, - "PParamUpdate": null - }, - "prevPParams": { - "collateralPercentage": 150, - "committeeMaxTermLength": 200, - "committeeMinSize": 0, - "costModels": { - "PlutusV1": [ - 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 - ], - "PlutusV2": [ + 4, + 1293828, + 28716, + 63, + 0, + 1, + 1006041, + 43623, + 251, + 0, + 1 + ] + }, + "dRepActivity": 100, + "dRepDeposit": 1000000, + "dRepVotingThresholds": { + "committeeNoConfidence": 0, + "committeeNormal": 0.5, + "hardForkInitiation": 0.5, + "motionNoConfidence": 0, + "ppEconomicGroup": 0.5, + "ppGovGroup": 0.5, + "ppNetworkGroup": 0.5, + "ppTechnicalGroup": 0.5, + "treasuryWithdrawal": 0.5, + "updateToConstitution": 0 + }, + "executionUnitPrices": { + "priceMemory": 5.77e-2, + "priceSteps": 7.21e-5 + }, + "govActionDeposit": 1000000, + "govActionLifetime": 1, + "maxBlockBodySize": 65536, + "maxBlockExecutionUnits": { + "memory": 62000000, + "steps": 20000000000 + }, + "maxBlockHeaderSize": 1100, + "maxCollateralInputs": 3, + "maxRefScriptSizePerBlock": 1048576, + "maxRefScriptSizePerTx": 204800, + "maxTxExecutionUnits": { + "memory": 140000000, + "steps": 10000000000 + }, + "maxTxSize": 16384, + "maxValueSize": 5000, + "minFeeRefScriptCostPerByte": 15, + "minPoolCost": 0, + "monetaryExpansion": 0.1, + "poolPledgeInfluence": 0, + "poolRetireMaxEpoch": 18, + "poolVotingThresholds": { + "committeeNoConfidence": 0.5, + "committeeNormal": 0.5, + "hardForkInitiation": 0.5, + "motionNoConfidence": 0.5, + "ppSecurityGroup": 0.5 + }, + "protocolVersion": { + "major": 12, + "minor": 0 + }, + "refScriptCostMultiplier": 1.2, + "refScriptCostStride": 25600, + "stakeAddressDeposit": 400000, + "stakePoolDeposit": 0, + "stakePoolTargetNum": 100, + "treasuryCut": 0.1, + "txFeeFixed": 0, + "txFeePerByte": 1, + "utxoCostPerByte": 4310 + }, + "prevGovActionIds": { + "Committee": null, + "Constitution": null, + "HardFork": null, + "PParamUpdate": null + }, + "prevPParams": { + "collateralPercentage": 150, + "committeeMaxTermLength": 200, + "committeeMinSize": 0, + "costModels": { + "PlutusV1": [ 205665, 812, 1, @@ -1661,10 +1147,6 @@ 0, 1, 1, - 1159724, - 392670, - 0, - 2, 806990, 30482, 4, @@ -1695,13 +1177,8 @@ 32, 38314, 32, - 35892428, - 10, - 9462713, - 1021, - 10, - 38887044, - 32947, + 57996947, + 18975, 10 ], "PlutusV3": [ @@ -1985,6 +1462,8 @@ }, "maxBlockHeaderSize": 1100, "maxCollateralInputs": 3, + "maxRefScriptSizePerBlock": 1048576, + "maxRefScriptSizePerTx": 204800, "maxTxExecutionUnits": { "memory": 140000000, "steps": 10000000000 @@ -2004,9 +1483,11 @@ "ppSecurityGroup": 0.5 }, "protocolVersion": { - "major": 10, + "major": 12, "minor": 0 }, + "refScriptCostMultiplier": 1.2, + "refScriptCostStride": 25600, "stakeAddressDeposit": 400000, "stakePoolDeposit": 0, "stakePoolTargetNum": 100, @@ -2191,183 +1672,6 @@ 18975, 10 ], - "PlutusV2": [ - 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 - ], "PlutusV3": [ 100788, 420, @@ -2649,6 +1953,8 @@ }, "maxBlockHeaderSize": 1100, "maxCollateralInputs": 3, + "maxRefScriptSizePerBlock": 1048576, + "maxRefScriptSizePerTx": 204800, "maxTxExecutionUnits": { "memory": 140000000, "steps": 10000000000 @@ -2668,9 +1974,11 @@ "ppSecurityGroup": 0.5 }, "protocolVersion": { - "major": 10, + "major": 12, "minor": 0 }, + "refScriptCostMultiplier": 1.2, + "refScriptCostStride": 25600, "stakeAddressDeposit": 400000, "stakePoolDeposit": 0, "stakePoolTargetNum": 100, 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 e96183cc046..d490ab171ba 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 @@ -171,183 +171,6 @@ 18975, 10 ], - "PlutusV2": [ - 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 - ], "PlutusV3": [ 100788, 420, @@ -629,6 +452,8 @@ }, "maxBlockHeaderSize": 1100, "maxCollateralInputs": 3, + "maxRefScriptSizePerBlock": 1048576, + "maxRefScriptSizePerTx": 204800, "maxTxExecutionUnits": { "memory": 140000000, "steps": 10000000000 @@ -648,9 +473,11 @@ "ppSecurityGroup": 0.5 }, "protocolVersion": { - "major": 10, + "major": 12, "minor": 0 }, + "refScriptCostMultiplier": 1.2, + "refScriptCostStride": 25600, "stakeAddressDeposit": 400000, "stakePoolDeposit": 0, "stakePoolTargetNum": 100, 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 e96183cc046..d490ab171ba 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 @@ -171,183 +171,6 @@ 18975, 10 ], - "PlutusV2": [ - 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 - ], "PlutusV3": [ 100788, 420, @@ -629,6 +452,8 @@ }, "maxBlockHeaderSize": 1100, "maxCollateralInputs": 3, + "maxRefScriptSizePerBlock": 1048576, + "maxRefScriptSizePerTx": 204800, "maxTxExecutionUnits": { "memory": 140000000, "steps": 10000000000 @@ -648,9 +473,11 @@ "ppSecurityGroup": 0.5 }, "protocolVersion": { - "major": 10, + "major": 12, "minor": 0 }, + "refScriptCostMultiplier": 1.2, + "refScriptCostStride": 25600, "stakeAddressDeposit": 400000, "stakePoolDeposit": 0, "stakePoolTargetNum": 100, diff --git a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/tipOut.json b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/tipOut.json index 4dba53ee005..0c7d7ad13f9 100644 --- a/cardano-testnet/test/cardano-testnet-test/files/golden/queries/tipOut.json +++ b/cardano-testnet/test/cardano-testnet-test/files/golden/queries/tipOut.json @@ -1,7 +1,7 @@ { "block": "", "epoch": "", - "era": "Conway", + "era": "Dijkstra", "hash": "", "slot": "", "slotInEpoch": "",