Automated drep (Scenario 1) #5815

palas · 2024-04-29T16:15:43Z

Description

This PR aims to address this issue: #5600
With that aim, it adds two scenarios for automated DReps. This PR contains the first scenario:

Scenario 1

Create default testnet with 3 DReps and 3 stake holders delegated, one to each DRep.
Do some proposal and vote yes with the first DRep only.
Check that proposal does NOT pass.
Take the last two stake delegators and delegate them to "Abstain".
Do some other proposal and vote yes with first DRep only.
Check the new proposal passes now.

Checklist

Commit sequence broadly makes sense and commits have useful messages
New tests are added if needed and existing tests are updated. These may include:
- golden tests
- property tests
- roundtrip tests
- integration tests
  See Runnings tests for more details
Any changes are noted in the CHANGELOG.md for affected package
The version bounds in .cabal files are updated
CI passes. See note on CI. The following CI checks are required:
- Code is linted with hlint. See .github/workflows/check-hlint.yml to get the hlint version
- Code is formatted with stylish-haskell. See .github/workflows/stylish-haskell.yml to get the stylish-haskell version
- Code builds on Linux, MacOS and Windows for ghc-8.10.7 and ghc-9.2.7
Self-reviewed the diff

Jimbo4350

Nice job on separating the PRs. We are lacking in comments however.

cardano-testnet/src/Testnet/Defaults.hs

...net/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/PredefinedAbstainDRep.hs

Jimbo4350

Looking good, I just have a comment about waitAndCheckNewEpochState the rest are minor. Will approve after the comment about waitAndCheckNewEpochState.

cardano-testnet/src/Testnet/Components/Query.hs

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/DRepActivity.hs

...net/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/PredefinedAbstainDRep.hs

cardano-testnet/src/Testnet/Components/Query.hs

…it tests

…ate`

Co-authored-by: Mateusz Galazyn <[email protected]>

…chStateView`

Already addressed

Automated drep (Scenario 1)

Jimbo4350 · 2024-05-17T12:40:02Z

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Cli/Conway/Plutus.hs

@@ -187,4 +184,11 @@ hprop_plutus_v3 = integrationWorkspace "all-plutus-script-purposes" $ \tempAbsBa
    ]
  H.success

+waitForJustM :: (H.MonadTest m, MonadIO m) => m (Maybe a) -> m a


findLargestUtxoWithAddress should be modified to recurse if no UTxOs are found and terminate at a specified termination epoch.

Jimbo4350 · 2024-05-17T12:45:05Z

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs

                                    "failingProposal" wallet2 [(1, "yes")] secondTargetDRepActivity
                                    minEpochsToWaitIfNotChanging (Just firstTargetDRepActivity)
                                    maxEpochsToWaitAfterProposal

+  kickWatchdog watchdog


An indication that we are testing too much and this test needs to be further decomposed.

Jimbo4350 · 2024-05-17T12:45:20Z

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs

                                    "failingProposal" wallet2 [(1, "yes")] secondTargetDRepActivity
                                    minEpochsToWaitIfNotChanging (Just firstTargetDRepActivity)
                                    maxEpochsToWaitAfterProposal

+  kickWatchdog watchdog
+
  -- We now send a bunch of proposals to make sure that the 2 new DReps expire.


This should be a separate property. Drep Expiry.

Jimbo4350 · 2024-05-17T12:45:37Z

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs

@@ -122,17 +124,19 @@ hprop_check_drep_activity = integrationWorkspace "test-activity" $ \tempAbsBaseP
  -- This proposal should fail because there is 2 DReps that don't vote (out of 3)


This can be a separate property. Voting threshold not reached.

Jimbo4350 · 2024-05-17T12:47:16Z

cardano-testnet/test/cardano-testnet-test/Cardano/Testnet/Test/Gov/DRepActivity.hs

@@ -145,7 +149,7 @@ hprop_check_drep_activity = integrationWorkspace "test-activity" $ \tempAbsBaseP
  -- Last proposal (set activity to something else again and it should pass, because of inactivity)


This can be a separate property. Update DRep activity.

Automated drep (Scenario 1)

palas added the cardano-testnet label Apr 29, 2024

palas self-assigned this Apr 29, 2024

palas requested a review from a team as a code owner April 29, 2024 16:15

palas force-pushed the automated-drep-scenario1 branch from 2258014 to e3e536a Compare April 29, 2024 16:30

Jimbo4350 requested changes Apr 30, 2024

View reviewed changes

palas requested a review from Jimbo4350 April 30, 2024 19:53

carbolymer approved these changes May 1, 2024

View reviewed changes

palas force-pushed the automated-drep-scenario1 branch 3 times, most recently from 172d84e to e4f6e9d Compare May 2, 2024 22:39

carbolymer reviewed May 3, 2024

View reviewed changes

...net/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/PredefinedAbstainDRep.hs Outdated Show resolved Hide resolved

carbolymer reviewed May 3, 2024

View reviewed changes

...net/test/cardano-testnet-test/Cardano/Testnet/Test/LedgerEvents/Gov/PredefinedAbstainDRep.hs Outdated Show resolved Hide resolved

Jimbo4350 reviewed May 3, 2024

View reviewed changes

palas force-pushed the automated-drep-scenario1 branch 3 times, most recently from 2d3c9e6 to 5b72c6c Compare May 3, 2024 18:45

palas requested a review from Jimbo4350 May 3, 2024 19:03

Jimbo4350 previously requested changes May 6, 2024

View reviewed changes

cardano-testnet/src/Testnet/Components/Query.hs Outdated Show resolved Hide resolved

palas requested a review from Jimbo4350 May 7, 2024 15:11

Jimbo4350 mentioned this pull request May 9, 2024

Address issues with flakiness of DRep Activity test #5830

Merged

9 tasks

palas force-pushed the automated-drep-scenario1 branch 7 times, most recently from ef4d1db to a2537b8 Compare May 15, 2024 20:10

palas added 3 commits May 16, 2024 19:38

Create scafolding for "Predefined Abstain DRep" test

3bea234

Test predefined always abstain DRep

1c6e476

Add comment to hprop_check_predefined_abstain_drep explaining what …

a855a05

…it tests

palas and others added 15 commits May 16, 2024 21:03

Added comments to the new waitAndCheckNewEpochState function

55c368d

Modify desiredPoolNumberProposalTest to use `waitAndCheckNewEpochSt…

e63437c

…ate`

Apply watchdog

4fc4523

Co-authored-by: Mateusz Galazyn <[email protected]>

Remove startLedgerNewEpochStateLogging

935c809

Improve comment in hprop_check_predefined_abstain_drep

0bd7d6c

Fix typos in getDesiredPoolNumberValue

23b9a30

Abstract out era in delegateToAlwaysAbstain

b7107f4

Remove waiting bit from waitAndCheckNewEpochState and use `watchEpo…

ed50065

…chStateView`

Modify waitForEpochs to use watchEpochStateView

b17f09a

Replace some usages of waitUntilEpoch with waitForEpochs

76866df

Kick watchdog in middle of DRep Activity test

c53a5a1

Remove findCondition function

aa05e61

Fix issue with vote counting

7e32694

Adjust cardanoEpochLength to avoid flakiness

d401f36

Disable tests that don't work

5b62ae6

palas force-pushed the automated-drep-scenario1 branch from a2537b8 to 5b62ae6 Compare May 16, 2024 21:44

palas added 3 commits May 17, 2024 00:43

Fix delay in PlutusV3 test

342c405

Remove unnecessary "$"

1d715dc

Increase polling frequency

5b16cd1

palas requested review from a team as code owners May 16, 2024 23:42

palas force-pushed the automated-drep-scenario1 branch from 5de639b to 5b16cd1 Compare May 17, 2024 00:18

palas added this pull request to the merge queue May 17, 2024

github-merge-queue bot pushed a commit that referenced this pull request May 17, 2024

Merge pull request #5815 from IntersectMBO/automated-drep-scenario1

3f41819

Automated drep (Scenario 1)

Merged via the queue into master with commit 662abc7 May 17, 2024
39 of 40 checks passed

palas deleted the automated-drep-scenario1 branch May 17, 2024 03:07

Jimbo4350 reviewed May 17, 2024

View reviewed changes

nfrisby pushed a commit that referenced this pull request May 29, 2024

Merge pull request #5815 from IntersectMBO/automated-drep-scenario1

4b29bb6

Automated drep (Scenario 1)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Automated drep (Scenario 1) #5815

Automated drep (Scenario 1) #5815

palas commented Apr 29, 2024

Jimbo4350 left a comment

Jimbo4350 left a comment

Jimbo4350 May 17, 2024

Jimbo4350 May 17, 2024

Jimbo4350 May 17, 2024

Jimbo4350 May 17, 2024

Jimbo4350 May 17, 2024

		@@ -122,17 +124,19 @@ hprop_check_drep_activity = integrationWorkspace "test-activity" $ \tempAbsBaseP
		-- This proposal should fail because there is 2 DReps that don't vote (out of 3)

		@@ -145,7 +149,7 @@ hprop_check_drep_activity = integrationWorkspace "test-activity" $ \tempAbsBaseP
		-- Last proposal (set activity to something else again and it should pass, because of inactivity)

Automated drep (Scenario 1) #5815

Automated drep (Scenario 1) #5815

Conversation

palas commented Apr 29, 2024

Description

Scenario 1

Checklist

Jimbo4350 left a comment

Choose a reason for hiding this comment

Jimbo4350 left a comment

Choose a reason for hiding this comment

Jimbo4350 May 17, 2024

Choose a reason for hiding this comment

Jimbo4350 May 17, 2024

Choose a reason for hiding this comment

Jimbo4350 May 17, 2024

Choose a reason for hiding this comment

Jimbo4350 May 17, 2024

Choose a reason for hiding this comment

Jimbo4350 May 17, 2024

Choose a reason for hiding this comment