Fix version number to valid semver.Fix rejection on invalid semver peers

RiseVision · Sep 10, 2018 · b91c16f · b91c16f
1 parent c1b7d43
commit b91c16f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/etc/testnet/config.json b/etc/testnet/config.json
@@ -1,7 +1,7 @@
 {
     "port": 5566,
     "address": "0.0.0.0",
-    "version": "1.2.0t",
+    "version": "1.2.0-t",
     "fileLogLevel": "info",
     "logFileName": "logs/rise-testnet.log",
     "consoleLogLevel": "info",

diff --git a/src/apis/requests/BaseRequest.ts b/src/apis/requests/BaseRequest.ts
@@ -77,7 +77,7 @@ export abstract class BaseRequest<Out, In> implements IAPIRequest<Out, In> {
   }
 
   protected peerSupportsProtoBuf(peer: IPeerLogic) {
-    return typeof(peer.version) !== 'undefined' && semver.gte(peer.version, '1.2.0');
+    return typeof(peer.version) !== 'undefined' && semver.valid(peer.version) && semver.gte(peer.version, '1.2.0');
   }
 
   protected getQueryString(): string {

diff --git a/src/modules/system.ts b/src/modules/system.ts
@@ -8,7 +8,7 @@ import { Symbols } from '../ioc/symbols';
 import { BlocksModel } from '../models';
 import { AppConfig, PeerHeaders } from '../types/genericTypes';
 
-const rcRegExp = /[a-z]+$/;
+const rcRegExp = /-?[a-z]+$/;
 
 @injectable()
 export class SystemModule implements ISystemModule {