chore: use the legacy prop mechanism to propose the block even if the recovery fails (#2639)

Author: rach-id

consensus/state.go

@@ -169,6 +169,9 @@ type State struct {
 
 	// traceClient is used to trace the state machine.
 	traceClient trace.Tracer
+
+	// gossipDataEnabled controls whether the gossipDataRoutine should run
+	gossipDataEnabled atomic.Bool
 }
 
 // StateOption sets an optional parameter on the State.
@@ -265,6 +268,13 @@ func SetTraceClient(ec trace.Tracer) StateOption {
 	return func(cs *State) { cs.traceClient = ec }
 }
 
+// SetGossipDataEnabled specifies whether the legacy block prop is enabled.
+func SetGossipDataEnabled(enabled bool) StateOption {
+	return func(cs *State) {
+		cs.gossipDataEnabled.Store(enabled)
+	}
+}
+
 // OfflineStateSyncHeight indicates the height at which the node
 // statesync offline - before booting sets the metrics.
 func OfflineStateSyncHeight(height int64) StateOption {
@@ -1391,7 +1401,9 @@ func (cs *State) defaultDecideProposal(height int64, round int32) {
 		err = cs.propagator.ProposeBlock(proposal, blockParts, metaData)
 		if err != nil {
 			cs.Logger.Error("propagation reactor failed to propose the block", "err", err)
-			return
+			if !cs.gossipDataEnabled.Load() {
+				return
+			}
 		}
 
 		// send proposal and block parts on internal msg queue

node/setup.go

@@ -388,6 +388,7 @@ func createConsensusReactor(config *cfg.Config,
 		cs.StateMetrics(csMetrics),
 		cs.OfflineStateSyncHeight(offlineStateSyncHeight),
 		cs.SetTraceClient(traceClient),
+		cs.SetGossipDataEnabled(config.Consensus.EnableLegacyBlockProp),
 	)
 	consensusState.SetLogger(consensusLogger)
 	if privValidator != nil {