feat(snap): add extra checks; update snap discovery

rskj-core/src/main/java/co/rsk/RskContext.java

@@ -180,7 +180,9 @@ public class RskContext implements NodeContext, NodeBootstrapper {
     private ProofOfWorkRule proofOfWorkRule;
     private ForkDetectionDataRule forkDetectionDataRule;
     private BlockParentDependantValidationRule blockParentDependantValidationRule;
+    private BlockParentDependantValidationRule snapBlockParentDependantValidationRule;
     private BlockValidationRule blockValidationRule;
+    private BlockValidationRule snapBlockValidationRule;
     private BlockValidationRule minerServerBlockValidationRule;
     private BlockValidator blockValidator;
     private BlockValidator blockHeaderValidator;
@@ -1133,6 +1135,33 @@ public synchronized BlockValidationRule getBlockValidationRule() {
         return blockValidationRule;
     }
 
+    public synchronized BlockValidationRule getSnapBlockValidationRule() {
+        checkIfNotClosed();
+
+        if (snapBlockValidationRule == null) {
+            final RskSystemProperties rskSystemProperties = getRskSystemProperties();
+            final Constants commonConstants = rskSystemProperties.getNetworkConstants();
+            final BlockTimeStampValidationRule blockTimeStampValidationRule = new BlockTimeStampValidationRule(
+                    commonConstants.getNewBlockMaxSecondsInTheFuture(),
+                    rskSystemProperties.getActivationConfig(),
+                    rskSystemProperties.getNetworkConstants()
+            );
+            snapBlockValidationRule = new BlockCompositeRule(
+                    new TxsMinGasPriceRule(),
+                    new BlockTxsMaxGasPriceRule(rskSystemProperties.getActivationConfig()),
+                    new BlockRootValidationRule(rskSystemProperties.getActivationConfig()),
+                    getProofOfWorkRule(),
+                    new RemascValidationRule(),
+                    blockTimeStampValidationRule,
+                    new GasLimitRule(commonConstants.getMinGasLimit()),
+                    new ExtraDataRule(commonConstants.getMaximumExtraDataSize()),
+                    new ValidTxExecutionSublistsEdgesRule(getRskSystemProperties().getActivationConfig())
+            );
+        }
+
+        return snapBlockValidationRule;
+    }
+
     public synchronized BlockParentDependantValidationRule getBlockParentDependantValidationRule() {
         checkIfNotClosed();
 
@@ -1151,6 +1180,23 @@ public synchronized BlockParentDependantValidationRule getBlockParentDependantVa
         return blockParentDependantValidationRule;
     }
 
+    public synchronized BlockParentDependantValidationRule getSnapBlockParentDependantValidationRule() {
+        checkIfNotClosed();
+
+        if (snapBlockParentDependantValidationRule == null) {
+            Constants commonConstants = getRskSystemProperties().getNetworkConstants();
+            snapBlockParentDependantValidationRule = new BlockParentCompositeRule(
+                    new BlockTxsFieldsValidationRule(getBlockTxSignatureCache()),
+                    new PrevMinGasPriceRule(),
+                    new BlockParentNumberRule(),
+                    new BlockDifficultyRule(getDifficultyCalculator()),
+                    new BlockParentGasLimitRule(commonConstants.getGasLimitBoundDivisor())
+            );
+        }
+
+        return snapBlockParentDependantValidationRule;
+    }
+
     public synchronized org.ethereum.db.BlockStore buildBlockStore(String databaseDir) {
         checkIfNotClosed();
 
@@ -2010,12 +2056,34 @@ private SyncPool getSyncPool() {
 
     private SnapshotProcessor getSnapshotProcessor() {
         if (snapshotProcessor == null) {
+            final RskSystemProperties rskSystemProperties = getRskSystemProperties();
+            final Constants commonConstants = rskSystemProperties.getNetworkConstants();
+            final BlockTimeStampValidationRule blockTimeStampValidationRule = new BlockTimeStampValidationRule(
+                    commonConstants.getNewBlockMaxSecondsInTheFuture(),
+                    rskSystemProperties.getActivationConfig(),
+                    rskSystemProperties.getNetworkConstants()
+            );
+
             snapshotProcessor = new SnapshotProcessor(
                     getBlockchain(),
                     getTrieStore(),
                     getPeersInformation(),
                     getBlockStore(),
                     getTransactionPool(),
+                    getSnapBlockParentDependantValidationRule(),
+                    getSnapBlockValidationRule(),
+                    new BlockHeaderParentCompositeRule(
+                            new PrevMinGasPriceRule(),
+                            new BlockParentNumberRule(),
+                            blockTimeStampValidationRule,
+                            new BlockDifficultyRule(getDifficultyCalculator()),
+                            new BlockParentGasLimitRule(commonConstants.getGasLimitBoundDivisor())
+                    ),
+                    new BlockHeaderCompositeRule(
+                            getProofOfWorkRule(),
+                            blockTimeStampValidationRule,
+                            new ValidGasUsedRule()
+                    ),
                     getRskSystemProperties().getSnapshotChunkSize(),
                     getRskSystemProperties().isSnapshotParallelEnabled()
             );

rskj-core/src/main/java/co/rsk/config/RskSystemProperties.java

@@ -430,17 +430,6 @@ public int getLongSyncLimit() {
     public boolean isServerSnapshotSyncEnabled() { return configFromFiles.getBoolean("sync.snapshot.server.enabled");}
     public boolean isClientSnapshotSyncEnabled() { return configFromFiles.getBoolean(PROPERTY_SNAP_CLIENT_ENABLED);}
 
-    @Override
-    public List<String> peerCapabilities() {
-        List<String> capabilities = super.peerCapabilities();
-
-        if (isSnapshotSyncEnabled()) {
-            capabilities.add(Capability.SNAP);
-        }
-
-        return capabilities;
-    }
-
     public int getSnapshotChunkTimeout() {
         return configFromFiles.getInt("sync.snapshot.client.chunkRequestTimeout");
     }
@@ -570,10 +559,6 @@ public GasPriceCalculator.GasCalculatorType getGasCalculatorType() {
         return gasCalculatorType;
     }
 
-    public boolean isSnapshotSyncEnabled(){
-        return isServerSnapshotSyncEnabled() || isClientSnapshotSyncEnabled();
-    }
-
     private void fetchMethodTimeout(Config configElement, Map<String, Long> methodTimeoutMap) {
         configElement.getObject("methods.timeout")
                 .unwrapped()

rskj-core/src/main/java/co/rsk/core/bc/BlockValidatorImpl.java

@@ -35,11 +35,11 @@ public class BlockValidatorImpl implements BlockValidator {
 
     private static final Logger logger = LoggerFactory.getLogger("blocksyncservice");
 
-    private BlockStore blockStore;
+    private final BlockStore blockStore;
 
-    private BlockParentDependantValidationRule blockParentValidator;
+    private final BlockParentDependantValidationRule blockParentValidator;
 
-    private BlockValidationRule blockValidator;
+    private final BlockValidationRule blockValidator;
 
     public BlockValidatorImpl(BlockStore blockStore, BlockParentDependantValidationRule blockParentValidator, BlockValidationRule blockValidator) {
         this.blockStore = blockStore;