Merge pull request #22 from ubiq/release/5.1-LegacyNetworkID

Set NetworkId to 8 and handle legacy NetworkId 88

Author: iquidus

eth/ethconfig/config.go

@@ -65,7 +65,7 @@ var Defaults = Config{
 		DatasetsOnDisk:   2,
 		DatasetsLockMmap: false,
 	},
-	NetworkId:               88,
+	NetworkId:               8,
 	TxLookupLimit:           2350000,
 	LightPeers:              100, // TODO - iquidus
 	UltraLightFraction:      75,

eth/protocols/eth/handshake.go

@@ -30,6 +30,8 @@ const (
 	// handshakeTimeout is the maximum allowed time for the `eth` handshake to
 	// complete before dropping the connection.= as malicious.
 	handshakeTimeout = 5 * time.Second
+
+	legacyNetworkID = 88
 )
 
 // Handshake executes the eth protocol handshake, negotiating version number,
@@ -41,14 +43,26 @@ func (p *Peer) Handshake(network uint64, td *big.Int, head common.Hash, genesis
 	var status StatusPacket // safe to read after two values have been received from errc
 
 	go func() {
-		errc <- p2p.Send(p.rw, StatusMsg, &StatusPacket{
-			ProtocolVersion: uint32(p.version),
-			NetworkID:       network,
-			TD:              td,
-			Head:            head,
-			Genesis:         genesis,
-			ForkID:          forkID,
-		})
+		switch {
+		case p.version == ETH65:
+			errc <- p2p.Send(p.rw, StatusMsg, &StatusPacket{
+				ProtocolVersion: uint32(p.version),
+				NetworkID:       legacyNetworkID,
+				TD:              td,
+				Head:            head,
+				Genesis:         genesis,
+				ForkID:          forkID,
+			})
+		default:
+			errc <- p2p.Send(p.rw, StatusMsg, &StatusPacket{
+				ProtocolVersion: uint32(p.version),
+				NetworkID:       network,
+				TD:              td,
+				Head:            head,
+				Genesis:         genesis,
+				ForkID:          forkID,
+			})
+		}
 	}()
 	go func() {
 		errc <- p.readStatus(network, &status, genesis, forkFilter)
@@ -91,7 +105,7 @@ func (p *Peer) readStatus(network uint64, status *StatusPacket, genesis common.H
 	if err := msg.Decode(&status); err != nil {
 		return fmt.Errorf("%w: message %v: %v", errDecode, msg, err)
 	}
-	if status.NetworkID != network {
+	if status.NetworkID != network && status.NetworkID != legacyNetworkID {
 		return fmt.Errorf("%w: %d (!= %d)", errNetworkIDMismatch, status.NetworkID, network)
 	}
 	if uint(status.ProtocolVersion) != p.version {

params/bootnodes.go

@@ -25,11 +25,12 @@ var MainnetBootnodes = []string{
 	"enode://e68e5e6e1a27c1191c09ca3b05fe4e391cfb9648e00c6d085ba4b48931345636bc76117282c2155838d98f63d03994bb88ea9e8b8ecc254da8077398af1c6710@104.156.230.85:30388",
 	"enode://f0862b1210672c50f32ec7827159aedd16c8790f64083a5830662e853abb04771ff79d88b2165da8741908aff7ded653e4419f0959f52be607c15b76b318f562@45.76.112.217:30388",
 	"enode://3c50be8974756f304ac0195a2a11f9b5ba826354c8617d4b58da21a36102928ddecd96395c7227e9dd1409110ec1414d25b1cfe7f9e4b40732c507d605a7b2b9@45.32.179.15:30388",
-	"enode://b920d3f9d2a3333dba7d2df8c655974ade36e435bca315ca8b9b307b0f4b4b8aae1004759755e8fc63d4b4d0e5a5452137896de9c141fdb244a65800c26d9df5@104.207.131.9:30388",
-	"enode://2b9e41dc5a86f398111cb6b51d81005dece8b0f67c2560adae4bc3e2c54c3dab0db259300a4224b6862fae4a6aa38ad56df7cd0363e396697fdbe3ea4e3ea0c5@45.32.253.23:30388",
 	"enode://966f1895b085bf7fdad648afed684b79de9e030a7303c1ebd2acae436e69d754e8d5d35238a08112fd049066c0d310d71ca61e94c16ec0dda4336c065674604c@45.32.117.58:30388",
 	"enode://7435d85612144c7777f3eaf14dd754c35cbb97caad364add8c4eeb9bba00bd9ce15fe256ec8c674b3975f87c23ee7a48472c79d19e1d0feb432f3aceb35ab0cf@107.191.104.192:30388",
 	"enode://b902a1538d5bbd6c676676c139e9470fcd942e0d299f5db8bd8ea690af9035f696fe3d88118fece4f74949beb4cf2ba9c3437a002f9a9d08e2b4bfc58fac490f@107.191.104.97:30388",
+	"enode://7b40de3623783f6608978a929297fccd9ec5df467eee105b432e8c9b486a5b5ea3bd559854175a1f7663c3bb4f815d93e9ba9db9925c45ac6a53fdb49277742a@149.28.222.52:30388",
+	"enode://ee14a9f7200b72a0818efe517779f0bbebdff15b5ae113dd7ef08962d22631f3b95da3509d9b077ec5dbbb10fd287c79958f54bf980493c4f0946cfbaf48c722@140.82.48.169:30388",
+	"enode://9fdf5e5dc0b27f582178e0dc28c956459ce2849e455bbab0e17b85f6b598402a9abcd56f3897fb059254d7849e078e774472c80ef67a82fb0992ce3089c9566f@149.28.205.32:30388",
 }
 
 // RinkebyBootnodes are the enode URLs of the P2P bootstrap nodes running on the