Skip to content

fix(store): Properly prune extended commits (backport #5276)#5313

Merged
aljo242 merged 5 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-5276
Sep 1, 2025
Merged

fix(store): Properly prune extended commits (backport #5276)#5313
aljo242 merged 5 commits intov0.38.xfrom
mergify/bp/v0.38.x/pr-5276

Conversation

@mergify
Copy link
Copy Markdown
Contributor

@mergify mergify bot commented Aug 29, 2025

Closes #5275

This should be back ported all the way to 0.38. Note that in v1 and 0.38 there is no blockCommitCache so that part should be left out. 

PR checklist

  • Tests written/updated
  • [ x] Changelog entry added in .changelog (we use unclog to manage our changelog)
  • Updated relevant documentation (docs/ or spec/) and code comments

This is an automatic backport of pull request #5276 done by [Mergify](https://mergify.com).

Closes #5275

This should be back ported all the way to 0.38. Note that in v1 and 0.38
there is no blockCommitCache so that part should be left out.
---

#### PR checklist

- [ ] Tests written/updated
- [ x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments

---------

Co-authored-by: jmalicevic <jasmina@informal.systems>
(cherry picked from commit ca44468)

# Conflicts:
#	store/store.go
#	store/store_test.go
@mergify mergify bot requested a review from a team as a code owner August 29, 2025 20:09
@mergify mergify bot added the conflicts label Aug 29, 2025
@mergify mergify bot requested a review from a team as a code owner August 29, 2025 20:09
@mergify
Copy link
Copy Markdown
Contributor Author

mergify bot commented Aug 29, 2025

Cherry-pick of ca44468 has failed:

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

You are currently cherry-picking commit ca44468c.
  (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:
	new file:   .changelog/unreleased/bug-fixes/5275-pruning-ext-commit-fix.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   store/store.go
	both modified:   store/store_test.go

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

@aljo242 aljo242 merged commit 9806733 into v0.38.x Sep 1, 2025
26 of 30 checks passed
@aljo242 aljo242 deleted the mergify/bp/v0.38.x/pr-5276 branch September 1, 2025 17:20
tqin7 pushed a commit to dydxprotocol/cometbft that referenced this pull request Oct 14, 2025
…ometbft#5313)

Closes cometbft#5275 


This should be back ported all the way to 0.38. Note that in v1 and 0.38
there is no blockCommitCache so that part should be left out.
---

#### PR checklist

- [ ] Tests written/updated
- [ x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
<hr>This is an automatic backport of pull request cometbft#5276 done by
[Mergify](https://mergify.com).

---------

Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
Co-authored-by: aljo242 <alex@cosmoslabs.io>
beer-1 pushed a commit to initia-labs/cometbft that referenced this pull request Oct 15, 2025
…ometbft#5313)

Closes cometbft#5275 


This should be back ported all the way to 0.38. Note that in v1 and 0.38
there is no blockCommitCache so that part should be left out.
---

#### PR checklist

- [ ] Tests written/updated
- [ x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments
<hr>This is an automatic backport of pull request cometbft#5276 done by
[Mergify](https://mergify.com).

---------

Co-authored-by: Jasmina Malicevic <jasmina.dustinac@gmail.com>
Co-authored-by: aljo242 <alex@cosmoslabs.io>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants