LiskArchive · shuse2 · Apr 29, 2019 · Feb 28, 2019 · Feb 28, 2019 · Feb 28, 2019
diff --git a/commander/test/tsconfig.json b/commander/test/tsconfig.json
@@ -3,7 +3,12 @@
 	"compilerOptions": {
 		"baseUrl": ".",
 		"noEmit": true,
-		"typeRoots": ["../../types", "../types", "../node_modules/@types", "../../node_modules/@types"]
+		"typeRoots": [
+			"../../types",
+			"../types",
+			"../node_modules/@types",
+			"../../node_modules/@types"
+		]
 	},
 	"references": [{ "path": ".." }],
 	"include": ["./**/*", "../../types/**/*", "../types/**/*", "../src/**/*"]

diff --git a/elements/lisk-p2p/src/disconnect_status_codes.ts b/elements/lisk-p2p/src/disconnect_status_codes.ts
@@ -6,6 +6,9 @@ export const INVALID_CONNECTION_QUERY_CODE = 4502;
 export const INVALID_CONNECTION_QUERY_REASON =
 	'Peer did not provide valid query parameters as part of the WebSocket connection';
 
+export const INVALID_CONNECTION_SELF_CODE = 4101;
+export const INVALID_CONNECTION_SELF_REASON = 'Peer cannot connect to itself';
+
 export const INCOMPATIBLE_NETWORK_CODE = 4102;
 export const INCOMPATIBLE_NETWORK_REASON = 'Peer nethash did not match our own';
 

diff --git a/elements/lisk-p2p/src/errors.ts b/elements/lisk-p2p/src/errors.ts
@@ -34,6 +34,19 @@ export class PeerInboundHandshakeError extends VError {
 	}
 }
 
+export class PeerOutboundConnectionError extends VError {
+	public statusCode?: number;
+
+	public constructor(
+		message: string,
+		statusCode?: number,
+	) {
+		super(message);
+		this.name = 'PeerOutboundConnectError';
+		this.statusCode = statusCode;
+	}
+}
+
 export class NotEnoughPeersError extends VError {
 	public constructor(message: string) {
 		super(message);

diff --git a/elements/lisk-p2p/src/p2p.ts b/elements/lisk-p2p/src/p2p.ts
@@ -35,6 +35,8 @@ import {
 	INCOMPATIBLE_PEER_UNKNOWN_REASON,
 	INVALID_CONNECTION_QUERY_CODE,
 	INVALID_CONNECTION_QUERY_REASON,
+	INVALID_CONNECTION_SELF_CODE,
+	INVALID_CONNECTION_SELF_REASON,
 	INVALID_CONNECTION_URL_CODE,
 	INVALID_CONNECTION_URL_REASON,
 } from './disconnect_status_codes';
@@ -248,7 +250,7 @@ export class P2P extends EventEmitter {
 		this._bindHandlersToPeerPool(this._peerPool);
 
 		this._nodeInfo = config.nodeInfo;
-		this._peerPool.applyNodeInfo(this._nodeInfo);
+		this.applyNodeInfo(this._nodeInfo);
 
 		this._discoveryInterval = config.discoveryInterval
 			? config.discoveryInterval
@@ -275,7 +277,6 @@ export class P2P extends EventEmitter {
 		this._nodeInfo = {
 			...nodeInfo,
 		};
-
 		this._peerPool.applyNodeInfo(this._nodeInfo);
 	}
 
@@ -338,6 +339,16 @@ export class P2P extends EventEmitter {
 				}
 				const queryObject = url.parse(socket.request.url, true).query;
 
+				if (queryObject.nonce === this._nodeInfo.nonce) {
+					this._disconnectSocketDueToFailedHandshake(
+						socket,
+						INVALID_CONNECTION_SELF_CODE,
+						INVALID_CONNECTION_SELF_REASON,
+					);
+
+					return;
+				}
+
 				if (
 					typeof queryObject.wsPort !== 'string' ||
 					typeof queryObject.version !== 'string' ||

diff --git a/elements/lisk-p2p/src/peer.ts b/elements/lisk-p2p/src/peer.ts
@@ -15,7 +15,11 @@
 
 import { EventEmitter } from 'events';
 import * as querystring from 'querystring';
-import { FetchPeerStatusError, RPCResponseError } from './errors';
+import {
+	FetchPeerStatusError,
+	PeerOutboundConnectionError,
+	RPCResponseError,
+} from './errors';
 
 import {
 	P2PDiscoveredPeerInfo,
@@ -264,7 +268,11 @@ export class Peer extends EventEmitter {
 	}
 
 	public set outboundSocket(scClientSocket: SCClientSocket) {
+		if (this._outboundSocket) {
+			this._unbindHandlersFromOutboundSocket(this._outboundSocket);
+		}
 		this._outboundSocket = scClientSocket;
+		this._bindHandlersToOutboundSocket(this._outboundSocket);
 	}
 
 	public updatePeerInfo(newPeerInfo: P2PDiscoveredPeerInfo): void {
@@ -633,6 +641,20 @@ export const connectAndRequest = async (
 			};
 
 			const outboundSocket = socketClusterClient.create(clientOptions);
+			// Bind an error handler immediately after creating the socket; otherwise errors may crash the process
+			// tslint:disable-next-line no-empty
+			outboundSocket.on('error', () => {});
+
+			// tslint:disable-next-line no-let
+			let disconnectStatusCode: number;
+			// tslint:disable-next-line no-let
+			let disconnectReason: string;
+			const closeHandler = (statusCode: number, reason: string) => {
+				disconnectStatusCode = statusCode;
+				disconnectReason = reason;
+			};
+			outboundSocket.once('close', closeHandler);
+
 			// Attaching handlers for various events that could be used future for logging or any other application
 			outboundSocket.emit(
 				REMOTE_EVENT_RPC_REQUEST,
@@ -641,8 +663,17 @@ export const connectAndRequest = async (
 					procedure: requestPacket.procedure,
 				},
 				(err: Error | undefined, responseData: unknown) => {
+					outboundSocket.off('close', closeHandler);
 					if (err) {
-						reject(err);
+						const isFailedConnection =
+							disconnectReason &&
+							(err.name === 'TimeoutError' ||
+								err.name === 'BadConnectionError');
+						const connectionError = new PeerOutboundConnectionError(
+							isFailedConnection ? disconnectReason : err.message,
+							disconnectStatusCode,
+						);
+						reject(connectionError);
 
 						return;
 					}

diff --git a/elements/lisk-p2p/test/integration/p2p.ts b/elements/lisk-p2p/test/integration/p2p.ts
@@ -40,7 +40,7 @@ describe('Integration tests for P2P library', () => {
 						height: 0,
 						broadhash:
 							'2768b267ae621a9ed3b3034e2e8a1bed40895c621bbb1bbd613d92b9d24e54b5',
-						nonce: 'O2wTkjqplHII5wPv',
+						nonce: `O2wTkjqplHII${nodePort}`,
 					},
 				});
 			});
@@ -91,6 +91,8 @@ describe('Integration tests for P2P library', () => {
 					},
 				];
 
+				const nodePort = NETWORK_START_PORT + index;
+
 				return new P2P({
 					blacklistedPeers: [],
 					seedPeers,
@@ -101,7 +103,7 @@ describe('Integration tests for P2P library', () => {
 					// Set a different discoveryInterval for each node; that way they don't keep trying to discover each other at the same time.
 					discoveryInterval: DISCOVERY_INTERVAL + index * 11,
 					nodeInfo: {
-						wsPort: NETWORK_START_PORT + index,
+						wsPort: nodePort,
 						nethash:
 							'da3ed6a45429278bac2666961289ca17ad86595d33b31037615d4b8e8f158bba',
 						minVersion: '1.0.1',
@@ -111,7 +113,7 @@ describe('Integration tests for P2P library', () => {
 						height: 0,
 						broadhash:
 							'2768b267ae621a9ed3b3034e2e8a1bed40895c621bbb1bbd613d92b9d24e54b5',
-						nonce: 'O2wTkjqplHII5wPv',
+						nonce: `O2wTkjqplHII${nodePort}`,
 					},
 				});
 			});
@@ -142,7 +144,8 @@ describe('Integration tests for P2P library', () => {
 					const peerPorts = connectedPeers
 						.map(peerInfo => peerInfo.wsPort)
 						.sort();
-					const expectedPeerPorts = ALL_NODE_PORTS;
+					const expectedPeerPorts = ALL_NODE_PORTS
+						.filter(peerPort => peerPort !== p2p.nodeInfo.wsPort);
 
 					expect(peerPorts).to.be.eql(expectedPeerPorts);
 				});
@@ -329,14 +332,16 @@ describe('Integration tests for P2P library', () => {
 								},
 						  ];
 
+				const nodePort = NETWORK_START_PORT + index;
+
 				return new P2P({
 					blacklistedPeers: [],
 					connectTimeout: 5000,
 					ackTimeout: 5000,
 					seedPeers,
 					wsEngine: 'ws',
 					nodeInfo: {
-						wsPort: NETWORK_START_PORT + index,
+						wsPort: nodePort,
 						nethash:
 							'da3ed6a45429278bac2666961289ca17ad86595d33b31037615d4b8e8f158bba',
 						version: '1.0.1',
@@ -346,7 +351,7 @@ describe('Integration tests for P2P library', () => {
 						height: 0,
 						broadhash:
 							'2768b267ae621a9ed3b3034e2e8a1bed40895c621bbb1bbd613d92b9d24e54b5',
-						nonce: 'O2wTkjqplHII5wPv',
+						nonce: `O2wTkjqplHII${nodePort}`,
 					},
 				});
 			});
@@ -377,18 +382,12 @@ describe('Integration tests for P2P library', () => {
 						.map(peerInfo => peerInfo.wsPort)
 						.sort();
 
-					// Right now we do not care whether the node includes itself in its own peer list.
-					// TODO later: Formalize the correct approach and assert it here.
-					const peerPortsExcludingSelf = peerPorts.filter(
-						wsPort => wsPort !== p2p.nodeInfo.wsPort,
-					);
-
 					// The current node should not be in its own peer list.
 					const expectedPeerPorts = ALL_NODE_PORTS.filter(port => {
 						return port !== p2p.nodeInfo.wsPort;
 					});
 
-					expect(peerPortsExcludingSelf).to.be.eql(expectedPeerPorts);
+					expect(peerPorts).to.be.eql(expectedPeerPorts);
 				});
 			});
 
@@ -408,18 +407,13 @@ describe('Integration tests for P2P library', () => {
 					const { triedPeers } = p2p.getNetworkStatus();
 
 					const peerPorts = triedPeers.map(peerInfo => peerInfo.wsPort).sort();
-					// Right now we do not care whether the node includes itself in its own peer list.
-					// TODO later: Formalize the correct approach and assert it here.
-					const peerPortsExcludingSelf = peerPorts.filter(
-						wsPort => wsPort !== p2p.nodeInfo.wsPort,
-					);
 
 					// The current node should not be in its own peer list.
 					const expectedPeerPorts = ALL_NODE_PORTS.filter(port => {
 						return port !== p2p.nodeInfo.wsPort;
 					});
 
-					expect(peerPortsExcludingSelf).to.be.eql(expectedPeerPorts);
+					expect(peerPorts).to.be.eql(expectedPeerPorts);
 				});
 			});
 		});
@@ -743,6 +737,8 @@ describe('Integration tests for P2P library', () => {
 								},
 						  ];
 
+				const nodePort = NETWORK_START_PORT + index;
+
 				return new P2P({
 					blacklistedPeers: [],
 					connectTimeout: 5000,
@@ -753,7 +749,7 @@ describe('Integration tests for P2P library', () => {
 					seedPeers,
 					wsEngine: 'ws',
 					nodeInfo: {
-						wsPort: NETWORK_START_PORT + index,
+						wsPort: nodePort,
 						nethash:
 							'da3ed6a45429278bac2666961289ca17ad86595d33b31037615d4b8e8f158bba',
 						version: '1.0.1',
@@ -762,7 +758,8 @@ describe('Integration tests for P2P library', () => {
 						height: 1000 + index,
 						broadhash:
 							'2768b267ae621a9ed3b3034e2e8a1bed40895c621bbb1bbd613d92b9d24e54b5',
-						nonce: 'O2wTkjqplHII5wPv',
+						nonce: `O2wTkjqplHII${nodePort}`,
+
 						modules: index % 2 === 0 ? ['fileTransfer'] : ['socialSite'],
 					},
 				});
@@ -901,6 +898,8 @@ describe('Integration tests for P2P library', () => {
 					},
 				];
 
+				const nodePort = NETWORK_START_PORT + index;
+
 				return new P2P({
 					blacklistedPeers: [],
 					seedPeers,
@@ -911,7 +910,7 @@ describe('Integration tests for P2P library', () => {
 					// Set a different discoveryInterval for each node; that way they don't keep trying to discover each other at the same time.
 					discoveryInterval: DISCOVERY_INTERVAL + index * 11,
 					nodeInfo: {
-						wsPort: NETWORK_START_PORT + index,
+						wsPort: nodePort,
 						nethash:
 							'da3ed6a45429278bac2666961289ca17ad86595d33b31037615d4b8e8f158bba',
 						version: '1.0.1',
@@ -921,7 +920,7 @@ describe('Integration tests for P2P library', () => {
 						height: 0,
 						broadhash:
 							'2768b267ae621a9ed3b3034e2e8a1bed40895c621bbb1bbd613d92b9d24e54b5',
-						nonce: 'O2wTkjqplHII5wPv',
+						nonce: `O2wTkjqplHII${nodePort}`,
 						modules: {
 							names: ['test', 'crypto'],
 							active: true,

diff --git a/framework/package.json b/framework/package.json
@@ -48,6 +48,7 @@
 	},
 	"dependencies": {
 		"@liskhq/lisk-cryptography": "2.1.0-alpha.0",
+		"@liskhq/lisk-p2p": "0.1.0-alpha.4",
 		"@liskhq/lisk-transaction-pool": "0.1.0-alpha.1",
 		"@liskhq/lisk-transactions": "2.1.0-alpha.4",
 		"ajv": "6.7.0",

diff --git a/framework/src/controller/application.js b/framework/src/controller/application.js
@@ -18,6 +18,7 @@ const { createLoggerComponent } = require('../components/logger');
 
 const ChainModule = require('../modules/chain');
 const HttpAPIModule = require('../modules/http_api');
+const NetworkModule = require('../modules/network');
 
 // Private __private used because private keyword is restricted
 const __private = {
@@ -152,6 +153,7 @@ class Application {
 			registeredTransactions: this.getTransactions(),
 		});
 		this.registerModule(HttpAPIModule);
+		this.registerModule(NetworkModule);
 		this.overrideModuleOptions(HttpAPIModule.alias, {
 			loadAsChildProcess: true,
 		});
@@ -348,7 +350,7 @@ class Application {
 			protocolVersion: this.config.app.protocolVersion,
 			nonce: this.config.app.nonce,
 			nethash: this.config.app.nethash,
-			wsPort: this.config.modules.chain.network.wsPort,
+			wsPort: this.config.modules.network.wsPort,
 			httpPort: this.config.modules.http_api.httpPort,
 		};
 

diff --git a/framework/src/controller/bus.js b/framework/src/controller/bus.js
@@ -182,7 +182,6 @@ class Bus extends EventEmitter2 {
 		if (!this.getEvents().includes(eventName)) {
 			throw new Error(`Event ${eventName} is not registered to bus.`);
 		}
-
 		// Communicate through event emitter
 		this.emit(eventName, eventValue);
 

diff --git a/framework/src/controller/default_configurator.js b/framework/src/controller/default_configurator.js
@@ -1,6 +1,7 @@
 const yargs = require('yargs');
 const chainModule = require('../modules/chain');
 const APIModule = require('../modules/http_api');
+const NetworkModule = require('../modules/network');
 const { config: loggerConfig } = require('../components/logger/defaults');
 const { config: storageConfig } = require('../components/storage/defaults');
 const { config: cacheConfig } = require('../components/cache/defaults');
@@ -13,6 +14,7 @@ configurator.registerSchema(storageConfig, 'components.storage');
 configurator.registerSchema(cacheConfig, 'components.cache');
 configurator.registerModule(chainModule);
 configurator.registerModule(APIModule);
+configurator.registerModule(NetworkModule);
 
 yargs.command(
 	'usage',

diff --git a/framework/src/modules/chain/api/index.js b/framework/src/modules/chain/api/index.js