Redefine p2p communication and update nodeInfo - Closes #5419 & #5472 #5514

ishantiw · 2020-07-03T10:55:19Z

What was the problem?

This PR resolves #5419 and #5472

How was it solved?

Update node Info to have these properties,

 {
	readonly networkId: string,
	readonly networkVersion: string,
	readonly nonce: string,
        readonly advertiseAddress: boolean,
        options?: [key: string]: unknown,
}

Apply nodeInfo to only update options field
Prepare query object handling clientSocketOptions to have limited fields from above NodeInfo
Only allow sharing of ipAddress and port of a peer when sharing peerList
Update network_setup and utils for tests
Update all the tests
Make setup for custom schema for custom nodeInfo related tests

How was it tested?

Run following tests under elements/lisk-p2p,

npm run test:unit
npm run test:integration
npm run test:functional

elements/lisk-p2p/src/peer/outbound.ts

elements/lisk-p2p/src/p2p.ts

elements/lisk-p2p/src/peer_server/peer_server.ts

...ework/test/unit/specs/application/node/synchronizer/block_synchronization_mechanism/peers.ts

framework/src/application/network/network.ts

framework/src/application/network/schema.ts

mitsuaki-u

LGTM besides @shuse2 comments and a question about custom peers

elements/lisk-p2p/src/p2p.ts

elements/lisk-p2p/src/peer/base.ts

elements/lisk-p2p/src/peer_server/peer_server.ts

elements/lisk-p2p/src/utils/validate.ts

shuse2

LGTM in general

elements/lisk-p2p/src/peer/base.ts

ishantiw self-assigned this Jul 3, 2020

ishantiw added 21 commits July 3, 2020 12:56

Remove dynamic fields in ProtocolPeerInfo

0f6c028

Use updated ProtocolPeerInfo everywhere

4d56950

Fix tests related to ProtocolPeerInfo

2ff106e

Rename wsPort -> port

67229cf

Rename protocolVersion -> networkVersion

5d8d187

Update P2PNodeInfo type and move port to config

a5c7b68

Use port from config everywhere

9fc1181

Update schema for p2p

5421a9c

Update construct peerInfo for incoming connections

9183b85

Send options as stringified when making a client socket

f6f931b

Remove commonIPs based on reputation instead of height

2838fb1

Add hostPort to peerPool and base peer config

5fdec82

Add custom to options properties

617598b

Update custom schema for utils

62524fc

Update tests to accept port from config

6dda3c5

Fix all the unit tests

1057281

Only allow options to be updated on post node info event

1a48325

Update network_setup to handle nodeInfo and port

264ef63

Remove unnecessary fields from nodeInfo in tests

4224a81

Fix tests related to custom nodeInfo and peerInfo

340f130

Add height to custom schema in network

36622d8

ishantiw force-pushed the 5419_redefine_p2p_communication branch from f9dc9b3 to 36622d8 Compare July 3, 2020 10:59

ishantiw changed the title ~~Redefine p2p communication and update nodeInfo - Closes #5419~~ Redefine p2p communication and update nodeInfo - Closes #5419 & #5472 Jul 3, 2020

ishantiw added 6 commits July 3, 2020 13:15

Update network module wsPort->port usage

07c6da6

Update block_synchronization_mechanism to use options for peer props

03f8f70

Add lastBlockId in peer/nodeInfo schema

8e61ae6

Fix nodeInfo construction in network

bd626a7

Fix lint errors

f5abf6f

Fix block_sync unit tests

432b157

ishantiw force-pushed the 5419_redefine_p2p_communication branch 6 times, most recently from 71ab461 to d57e8c9 Compare July 6, 2020 02:01

Use peerInfoSchema for RPC communication that allows custom

249e341

ishantiw force-pushed the 5419_redefine_p2p_communication branch from d57e8c9 to 249e341 Compare July 6, 2020 11:20

Merge branch 'development' into 5419_redefine_p2p_communication

d71c0fe

shuse2 requested review from mitsuaki-u and shuse2 July 6, 2020 11:41

shuse2 suggested changes Jul 6, 2020

View reviewed changes

wsPort -> port in utils/peers

26ddfcc

mitsuaki-u suggested changes Jul 7, 2020

View reviewed changes

ishantiw added 4 commits July 7, 2020 15:50

Remove custom peerinfo option

e383a1d

Remove peerInfoSchema from framework/network

21c1922

Use _handleUpdateNodeInfo to handle update status

f3083f4

Remove queryOptions as custom fields are not allowed in handshake

f65536f

ishantiw requested review from shuse2 and mitsuaki-u July 7, 2020 14:22

Fix probe for functional tests

08a4cb0

shuse2 suggested changes Jul 7, 2020

View reviewed changes

elements/lisk-p2p/src/peer/base.ts Outdated Show resolved Hide resolved

ishantiw added 2 commits July 8, 2020 00:46

Validate received nodeInfo before decoding

7ddabec

Merge branch 'development' into 5419_redefine_p2p_communication

f1910de

ishantiw requested a review from shuse2 July 7, 2020 23:02

shuse2 approved these changes Jul 8, 2020

View reviewed changes

mitsuaki-u approved these changes Jul 8, 2020

View reviewed changes

Merge branch 'development' into 5419_redefine_p2p_communication

3593239

shuse2 merged commit 0c2209c into development Jul 8, 2020

shuse2 deleted the 5419_redefine_p2p_communication branch July 8, 2020 09:05

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Redefine p2p communication and update nodeInfo - Closes #5419 & #5472 #5514

Redefine p2p communication and update nodeInfo - Closes #5419 & #5472 #5514

ishantiw commented Jul 3, 2020 •

edited

Loading

mitsuaki-u left a comment

shuse2 left a comment

Redefine p2p communication and update nodeInfo - Closes #5419 & #5472 #5514

Redefine p2p communication and update nodeInfo - Closes #5419 & #5472 #5514

Conversation

ishantiw commented Jul 3, 2020 • edited Loading

What was the problem?

How was it solved?

How was it tested?

mitsuaki-u left a comment

Choose a reason for hiding this comment

shuse2 left a comment

Choose a reason for hiding this comment

ishantiw commented Jul 3, 2020 •

edited

Loading