Merge remote-tracking branch 'origin/master' into statesync-reactor-lifecycle

.github/mergify.yml

@@ -6,7 +6,7 @@ pull_request_rules:
     actions:
       merge:
         method: squash
-        strict: true
+        strict: smart+fasttrack
         commit_message: title+body
   - name: backport patches to v0.34.x branch
     conditions:

test/e2e/runner/evidence.go

@@ -35,7 +35,7 @@ func InjectEvidence(ctx context.Context, testnet *e2e.Testnet, amount int) error
 	for _, idx := range rand.Perm(len(testnet.Nodes)) {
 		targetNode = testnet.Nodes[idx]
 
-		if targetNode.Mode == e2e.ModeSeed {
+		if targetNode.Mode == e2e.ModeSeed || targetNode.Mode == e2e.ModeLight {
 			targetNode = nil
 			continue
 		}

test/e2e/tests/app_test.go

@@ -44,17 +44,15 @@ func TestApp_Hash(t *testing.T) {
 		require.NoError(t, err)
 		require.NotEmpty(t, info.Response.LastBlockAppHash, "expected app to return app hash")
 
-		status, err := client.Status(ctx)
-		require.NoError(t, err)
-		if info.Response.LastBlockHeight == status.SyncInfo.LatestBlockHeight {
-			require.EqualValues(t, info.Response.LastBlockAppHash, status.SyncInfo.LatestAppHash,
-				"app hash does not match node status")
-		}
-
 		block, err := client.Block(ctx, &info.Response.LastBlockHeight)
 		require.NoError(t, err)
 		require.EqualValues(t, info.Response.LastBlockAppHash, block.Block.AppHash.Bytes(),
 			"app hash does not match last block's app hash")
+
+		status, err := client.Status(ctx)
+		require.NoError(t, err)
+		require.True(t, status.SyncInfo.LatestBlockHeight >= info.Response.LastBlockHeight,
+			"status out of sync with application")
 	})
 }