Fix backward compatibility issues

src/main/java/bisq/core/app/BisqSetup.java

@@ -606,10 +606,12 @@ public void onBalanceChanged(Coin balance, Transaction tx) {
 
         feeService.onAllServicesInitialized();
 
-        daoSetup.onAllServicesInitialized(errorMessage -> {
-            if (daoSetupErrorHandler != null)
-                daoSetupErrorHandler.accept(errorMessage);
-        });
+        if (DevEnv.isDaoActivated()) {
+            daoSetup.onAllServicesInitialized(errorMessage -> {
+                if (daoSetupErrorHandler != null)
+                    daoSetupErrorHandler.accept(errorMessage);
+            });
+        }
 
         tradeStatisticsManager.onAllServicesInitialized();
 

src/main/java/bisq/core/dao/node/full/FullNode.java

@@ -149,7 +149,7 @@ private void addBlockHandler() {
     private void onNewBlock(Block block) {
         jsonBlockChainExporter.maybeExport();
 
-        if (p2pNetworkReady)
+        if (p2pNetworkReady && parseBlockchainComplete)
             fullNodeNetworkService.publishNewBlock(block);
     }
 

src/main/java/bisq/core/dao/node/full/network/FullNodeNetworkService.java

@@ -98,7 +98,7 @@ public void shutDown() {
     public void publishNewBlock(Block block) {
         log.info("Publish new block at height={} and block hash={}", block.getHeight(), block.getHash());
         RawBlock rawBlock = RawBlock.fromBlock(block);
-        final NewBlockBroadcastMessage newBlockBroadcastMessage = new NewBlockBroadcastMessage(rawBlock);
+        NewBlockBroadcastMessage newBlockBroadcastMessage = new NewBlockBroadcastMessage(rawBlock);
         broadcaster.broadcast(newBlockBroadcastMessage, networkNode.getNodeAddress(), null, true);
     }
 

src/main/java/bisq/core/dao/node/messages/NewBlockBroadcastMessage.java

@@ -20,20 +20,26 @@
 import bisq.core.dao.state.blockchain.RawBlock;
 
 import bisq.network.p2p.storage.messages.BroadcastMessage;
+import bisq.network.p2p.storage.payload.CapabilityRequiringPayload;
 
+import bisq.common.app.Capabilities;
 import bisq.common.app.Version;
 import bisq.common.proto.network.NetworkEnvelope;
 
 import io.bisq.generated.protobuffer.PB;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 
 // TODO CapabilityRequiringPayload does only cover add data messages. We need a tool to avoid disconnections to old
 // nodes when they receive the NewBlockBroadcastMessage!
 @EqualsAndHashCode(callSuper = true)
 @Getter
-public final class NewBlockBroadcastMessage extends BroadcastMessage {
+public final class NewBlockBroadcastMessage extends BroadcastMessage implements CapabilityRequiringPayload {
     private final RawBlock block;
 
     public NewBlockBroadcastMessage(RawBlock block) {
@@ -62,4 +68,11 @@ public static NetworkEnvelope fromProto(PB.NewBlockBroadcastMessage proto, int m
         return new NewBlockBroadcastMessage(RawBlock.fromProto(proto.getRawBlock()),
                 messageVersion);
     }
+
+    @Override
+    public List<Integer> getRequiredCapabilities() {
+        return new ArrayList<>(Collections.singletonList(
+                Capabilities.Capability.BSQ_BLOCK.ordinal()
+        ));
+    }
 }

src/main/java/bisq/core/setup/CoreNetworkCapabilities.java

@@ -37,6 +37,7 @@ public static void setSupportedCapabilities(BisqEnvironment bisqEnvironment) {
         if (bisqEnvironment.getProperty(DaoOptionKeys.DAO_ACTIVATED, Boolean.class, false)) {
             supportedCapabilities.add(Capabilities.Capability.PROPOSAL.ordinal());
             supportedCapabilities.add(Capabilities.Capability.BLIND_VOTE.ordinal());
+            supportedCapabilities.add(Capabilities.Capability.BSQ_BLOCK.ordinal());
 
             if (bisqEnvironment.getProperty(DaoOptionKeys.FULL_DAO_NODE, Boolean.class, false))
                 supportedCapabilities.add(Capabilities.Capability.DAO_FULL_NODE.ordinal());