fix: cherry pick rollback fix

.github/mergify.yml

@@ -4,24 +4,7 @@ defaults:
       assignees:
         - "{{ author }}"
 
-queue_rules:
-  - name: default
-    conditions:
-      - "#approved-reviews-by>=1"
-
 pull_request_rules:
-  - name: Automerge to main
-    conditions:
-      - "#approved-reviews-by>=1"
-      - base=osmo/v0.37.4
-      - label=S:automerge
-    actions:
-      queue:
-        method: squash
-        name: default
-        commit_message_template: |
-          {{ title }} (#{{ number }})
-          {{ body }}
   - name: backport patches to v23 branch
     conditions:
       - base=osmo/v0.37.4
@@ -30,3 +13,11 @@ pull_request_rules:
       backport:
         branches:
           - osmo-v23/v0.37.4
+  - name: backport patches to v24 branch
+    conditions:
+      - base=osmo/v0.37.4
+      - label=S:backport/v24
+    actions:
+      backport:
+        branches:
+          - osmo-v24/v0.37.4

.github/workflows/build.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - v0.37.x
+      - osmo/v0.37.4
 
 jobs:
   build:

.github/workflows/check-generated.yml

@@ -7,7 +7,7 @@ name: Check generated code
 on:
   pull_request:
     branches:
-      - v0.37.x
+      - osmo/v0.37.4
 
 permissions:
   contents: read

.github/workflows/docs-toc.yml

@@ -4,7 +4,7 @@ on:
   pull_request:
     push:
       branches:
-        - v0.37.x
+        - osmo/v0.37.4
 
 jobs:
   check:

.github/workflows/e2e.yml

@@ -6,7 +6,7 @@ on:
   pull_request:
   push:
     branches:
-      - v0.37.x
+      - osmo/v0.37.4
 
 jobs:
   e2e-test:

.github/workflows/govulncheck.yml

@@ -8,7 +8,7 @@ on:
   pull_request:
   push:
     branches:
-      - v0.37.x
+      - osmo/v0.37.4
 
 jobs:
   govulncheck:

.github/workflows/lint.yml

@@ -12,7 +12,7 @@ on:
   pull_request:
   push:
     branches:
-      - v0.37.x
+      - osmo/v0.37.4
 
 jobs:
   golangci:
@@ -23,7 +23,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v4
         with:
-          go-version: '1.21'
+          go-version: "1.21"
       - uses: technote-space/get-diff-action@v6
         with:
           PATTERNS: |

.github/workflows/tests.yml

@@ -5,7 +5,7 @@ on:
     paths:
       - "**.go"
     branches:
-      - v0.37.x
+      - osmo/v0.37.4
 
 jobs:
   tests:

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Unreleased
 
+## v0.37.4-v24-osmo-2
+
+* [#20](https://github.com/osmosis-labs/cometbft/pull/20) Fix the rollback command
+
+## v0.37.4-v24-osmo-1
+
 * [#5](https://github.com/osmosis-labs/cometbft/pull/5) Batch verification
 * [#11](https://github.com/osmosis-labs/cometbft/pull/11) Skip verification of commit sigs
 * [#13](https://github.com/osmosis-labs/cometbft/pull/13) Avoid double-saving ABCI responses

state/rollback.go

@@ -65,10 +65,11 @@ func Rollback(bs BlockStore, ss Store, removeBlock bool) (int64, []byte, error)
 		return -1, nil, err
 	}
 
+	nextHeight := rollbackHeight + 1
 	valChangeHeight := invalidState.LastHeightValidatorsChanged
 	// this can only happen if the validator set changed since the last block
-	if valChangeHeight > rollbackHeight {
-		valChangeHeight = rollbackHeight + 1
+	if valChangeHeight > nextHeight+1 {
+		valChangeHeight = nextHeight + 1
 	}
 
 	paramsChangeHeight := invalidState.LastHeightConsensusParamsChanged

state/rollback_test.go

@@ -262,7 +262,7 @@ func setupStateStore(t *testing.T, height int64) state.Store {
 		LastValidators:                   valSet,
 		Validators:                       valSet.CopyIncrementProposerPriority(1),
 		NextValidators:                   valSet.CopyIncrementProposerPriority(2),
-		LastHeightValidatorsChanged:      height + 1,
+		LastHeightValidatorsChanged:      height + 1 + 1,
 		ConsensusParams:                  *params,
 		LastHeightConsensusParamsChanged: height + 1,
 	}