Merge branch 'master' into wb/issue-8039

.github/workflows/docker.yml

@@ -49,7 +49,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Publish to Docker Hub
-        uses: docker/build-push-action@v2.9.0
+        uses: docker/build-push-action@v2.10.0
         with:
           context: .
           file: ./DOCKER/Dockerfile

.github/workflows/linkchecker.yml

@@ -7,6 +7,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: gaurav-nelson/github-action-markdown-link-check@1.0.13
+      - uses: gaurav-nelson/github-action-markdown-link-check@1.0.14
         with:
           folder-path: "docs"

node/node.go

@@ -223,23 +223,21 @@ func makeNode(
 
 	// Create the handshaker, which calls RequestInfo, sets the AppVersion on the state,
 	// and replays any blocks as necessary to sync tendermint with the app.
-	if !stateSync {
-		if err := consensus.NewHandshaker(
-			logger.With("module", "handshaker"),
-			stateStore, state, blockStore, eventBus, genDoc,
-		).Handshake(ctx, proxyApp); err != nil {
-			return nil, combineCloseError(err, makeCloser(closers))
-		}
+	if err := consensus.NewHandshaker(
+		logger.With("module", "handshaker"),
+		stateStore, state, blockStore, eventBus, genDoc,
+	).Handshake(ctx, proxyApp); err != nil {
+		return nil, combineCloseError(err, makeCloser(closers))
+	}
 
-		// Reload the state. It will have the Version.Consensus.App set by the
-		// Handshake, and may have other modifications as well (ie. depending on
-		// what happened during block replay).
-		state, err = stateStore.Load()
-		if err != nil {
-			return nil, combineCloseError(
-				fmt.Errorf("cannot load state: %w", err),
-				makeCloser(closers))
-		}
+	// Reload the state. It will have the Version.Consensus.App set by the
+	// Handshake, and may have other modifications as well (ie. depending on
+	// what happened during block replay).
+	state, err = stateStore.Load()
+	if err != nil {
+		return nil, combineCloseError(
+			fmt.Errorf("cannot load state: %w", err),
+			makeCloser(closers))
 	}
 
 	logNodeStartupInfo(state, pubKey, logger, cfg.Mode)