From cc79ef6a67d3a21166b77788a2d48963461aed2c Mon Sep 17 00:00:00 2001 From: Jordan Millar Date: Mon, 20 May 2024 12:22:20 -0400 Subject: [PATCH] Remove guardrail script --- cardano-testnet/src/Testnet/Defaults.hs | 4 ++-- .../Cardano/Testnet/Test/Gov/UpdatePParam.hs | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cardano-testnet/src/Testnet/Defaults.hs b/cardano-testnet/src/Testnet/Defaults.hs index 74f063773ac..72be8a674ec 100644 --- a/cardano-testnet/src/Testnet/Defaults.hs +++ b/cardano-testnet/src/Testnet/Defaults.hs @@ -192,7 +192,7 @@ defaultConwayGenesis = , ucppDRepVotingThresholds = drepVotingThresholds , ucppCommitteeMinSize = 0 , ucppCommitteeMaxTermLength = EpochInterval 200 - , ucppGovActionLifetime = EpochInterval 1 -- One Epoch + , ucppGovActionLifetime = EpochInterval 2 -- One Epoch , ucppGovActionDeposit = Coin 2_000_000 , ucppDRepDeposit = Coin 1_000_000 , ucppDRepActivity = EpochInterval 100 @@ -208,7 +208,7 @@ defaultConwayGenesis = , dvtPPNetworkGroup = 1 %! 2 , dvtPPEconomicGroup = 1 %! 2 , dvtPPTechnicalGroup = 1 %! 2 - , dvtPPGovGroup = 1 %! 2 + , dvtPPGovGroup = 1 %! 3 , dvtTreasuryWithdrawal = 1 %! 2 } poolVotingThresholds = PoolVotingThresholds diff --git a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/UpdatePParam.hs b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/UpdatePParam.hs index 88d97783dc5..0953c63c62a 100644 --- a/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/UpdatePParam.hs +++ b/cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/UpdatePParam.hs @@ -163,7 +163,7 @@ hprop_update_pparam = H.integrationWorkspace "pparam-update" $ \tempAbsBasePath' $ BSC.pack comKeyHash1Str let comKeyCred1 = L.KeyHashObj comKeyHash1 - committeeThreshold = unsafeBoundedRational 0 + committeeThreshold = unsafeBoundedRational 0.4 committee = L.Committee (Map.fromList [(comKeyCred1, EpochNo 100)]) committeeThreshold @@ -174,9 +174,9 @@ hprop_update_pparam = H.integrationWorkspace "pparam-update" $ \tempAbsBasePath' , cardanoNodeEra = cEra , cardanoNumDReps = numVotes } - anchor = createAnchor url proposalAnchorDataBS + anchor = createAnchor url $ BSC.concat [proposalAnchorDataBS, BSC.pack "more"] ScriptHash cScriptHash = fromString constitutionScriptHash - constitution = L.Constitution anchor $ L.SJust cScriptHash + constitution = L.Constitution anchor L.SNothing -- $ L.SJust cScriptHash alonzoGenesis <- evalEither $ first prettyError defaultAlonzoGenesis (startTime, shelleyGenesis') <- getDefaultShelleyGenesis fastTestnetOptions @@ -226,7 +226,7 @@ hprop_update_pparam = H.integrationWorkspace "pparam-update" $ \tempAbsBasePath' , "--deposit-return-stake-verification-key-file", stakeVkeyFp , "--anchor-url", "https://tinyurl.com/3wrwb2as" , "--anchor-data-hash", proposalAnchorDataHash - , "--constitution-script-hash", constitutionScriptHash + -- , "--constitution-script-hash", constitutionScriptHash , "--committee-term-length", show @Word32 newCommitteeTermLength , "--out-file", pparamsUpdateFp ] @@ -265,9 +265,9 @@ hprop_update_pparam = H.integrationWorkspace "pparam-update" $ \tempAbsBasePath' , "--tx-in-collateral", Text.unpack $ renderTxIn txin4 , "--tx-out", Text.unpack (paymentKeyInfoAddr wallet0) <> "+" <> show @Int 3_000_001 , "--proposal-file", pparamsUpdateFp - , "--proposal-script-file", guardRailScript - , "--proposal-redeemer-value", "0" - , "--proposal-execution-units", "(2000000,20000000)" + -- , "--proposal-script-file", guardRailScript + -- , "--proposal-redeemer-value", "0" + -- , "--proposal-execution-units", "(2000000,20000000)" , "--certificate-file", committeeAuthCert1Fp , "--out-file", updateProposalTxBody ]