Use evidence period when pruning (backport #9505)

[mergify]

This is an automatic backport of pull request #9505 done by Mergify.
Cherry-pick of abbeb91 has failed:

On branch mergify/bp/v0.37.x/pr-9505
Your branch is up to date with 'origin/v0.37.x'.

You are currently cherry-picking commit abbeb919d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   consensus/replay_test.go
	modified:   evidence/verify.go
	modified:   state/mocks/block_store.go
	modified:   state/mocks/store.go
	modified:   state/services.go
	modified:   state/store.go
	modified:   state/store_test.go
	modified:   store/store.go
	modified:   store/store_test.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG_PENDING.md
	both modified:   go.sum
	both modified:   state/execution.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

---

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

• @Mergifyio refresh will re-evaluate the rules
• @Mergifyio rebase will rebase this PR on its base branch
• @Mergifyio update will merge the base branch into this PR
• @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

• look at your merge queues
• generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

[sergio-mena]

I understood this as an improvement to current behavior.
Is this PR really needed on past branches?

[cmwaters]

Is this PR really needed on past branches?

v0.37 isn't exactly a past branch. Perhaps we can still add it there but drop the backport to v0.34?

[sergio-mena]

v0.37 isn't exactly a past branch. Perhaps we can still add it there but drop the backport to v0.34?

I would agree with this approach. However, after creating the backport PR to v0.37.x, please hold it until we're done with the first release. Reason is that we are not planning to redo the 200-node test, so we need a QA-tested v0.37.x. release to fall back to

[cmwaters]

Yup agree

[sergio-mena]

Thanks. In the end, my understanding is that we decided in today's meeting that we'll create a feature branch from v0.37.x where we can merge all these backports until we cut v0.37.0, and then immediately after merge back the branch

[cmwaters]

This is set for v0.37.1 (i.e. do not merge until after v0.37.0)

[github-actions]

This pull request has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

[thanethomson]

@Mergifyio rebase

[mergify]

rebase

❌ Base branch update has failed

Git reported the following error:

Rebasing (1/1)
error: could not apply 840dccdc... Use evidence period when pruning (#9505)
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 840dccdc... Use evidence period when pruning (#9505)
Auto-merging store/store_test.go
Auto-merging store/store.go
Auto-merging state/services.go
Auto-merging state/mocks/block_store.go
Auto-merging state/execution.go
Auto-merging go.sum
Auto-merging consensus/replay_test.go
Auto-merging CHANGELOG_PENDING.md
CONFLICT (content): Merge conflict in CHANGELOG_PENDING.md

err-code: E7A9A

[thanethomson]

It doesn't seem like this can be backported directly because it relies on changes from #9443, which are Go API-breaking changes.