diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 63b97970f0..7df2d66334 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -295,7 +295,7 @@ var ( ListenPortFlag = cli.IntFlag{ Name: "port", Usage: "Network listening port", - Value: 60606, + Value: 42786, } BootnodesFlag = cli.StringFlag{ Name: "bootnodes", diff --git a/docker/Dockerfile b/docker/Dockerfile index 861d82a602..10329944d5 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -34,7 +34,7 @@ RUN apt-get install -q -y supervisor ADD supervisord.conf supervisord.conf EXPOSE 9656 -EXPOSE 60606 +EXPOSE 42786 CMD ["-n", "-c", "/supervisord.conf"] ENTRYPOINT ["/usr/bin/supervisord"] diff --git a/exp/backend.go b/exp/backend.go index b6fef908f1..503729f457 100644 --- a/exp/backend.go +++ b/exp/backend.go @@ -61,10 +61,10 @@ var ( defaultBootNodes = []*discover.Node{ // ETH/DEV Go Bootnodes - discover.MustParseNode("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:60606"), - discover.MustParseNode("enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:60606"), + discover.MustParseNode("enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:42786"), + discover.MustParseNode("enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:42786"), // ETH/DEV cpp-expanse (poc-9.ethdev.com) - discover.MustParseNode("enode://487611428e6c99a11a9795a6abe7b529e81315ca6aad66e2a2fc76e3adf263faba0d35466c2f8f68d561dbefa8878d4df5f1f2ddb1fbeab7f42ffb8cd328bd4a@5.1.83.226:60606"), + discover.MustParseNode("enode://487611428e6c99a11a9795a6abe7b529e81315ca6aad66e2a2fc76e3adf263faba0d35466c2f8f68d561dbefa8878d4df5f1f2ddb1fbeab7f42ffb8cd328bd4a@5.1.83.226:42786"), } staticNodes = "static-nodes.json" // Path within to search for the static node list diff --git a/p2p/discover/database_test.go b/p2p/discover/database_test.go index ed1b29a591..9be85bd667 100644 --- a/p2p/discover/database_test.go +++ b/p2p/discover/database_test.go @@ -105,8 +105,8 @@ func TestNodeDBFetchStore(t *testing.T) { node := newNode( MustHexID("0x1dd9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"), net.IP{192, 168, 0, 1}, - 60606, - 60606, + 42786, + 42786, ) inst := time.Now() num := 314 @@ -166,8 +166,8 @@ var nodeDBSeedQueryNodes = []struct { node: newNode( MustHexID("0x01d9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"), net.IP{127, 0, 0, 1}, - 60606, - 60606, + 42786, + 42786, ), pong: time.Now().Add(-2 * time.Second), }, @@ -175,8 +175,8 @@ var nodeDBSeedQueryNodes = []struct { node: newNode( MustHexID("0x02d9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"), net.IP{127, 0, 0, 2}, - 60606, - 60606, + 42786, + 42786, ), pong: time.Now().Add(-3 * time.Second), }, @@ -184,8 +184,8 @@ var nodeDBSeedQueryNodes = []struct { node: newNode( MustHexID("0x03d9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"), net.IP{127, 0, 0, 3}, - 60606, - 60606, + 42786, + 42786, ), pong: time.Now().Add(-1 * time.Second), }, @@ -335,8 +335,8 @@ var nodeDBExpirationNodes = []struct { node: newNode( MustHexID("0x01d9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"), net.IP{127, 0, 0, 1}, - 60606, - 60606, + 42786, + 42786, ), pong: time.Now().Add(-nodeDBNodeExpiration + time.Minute), exp: false, @@ -344,8 +344,8 @@ var nodeDBExpirationNodes = []struct { node: newNode( MustHexID("0x02d9d65c4552b5eb43d5ad55a2ee3f56c6cbc1c64a5c8d659f51fcd51bace24351232b8d7821617d2b29b54b81cdefb9b3e9c37d7fd5f63270bcc9e1a6f6a439"), net.IP{127, 0, 0, 2}, - 60606, - 60606, + 42786, + 42786, ), pong: time.Now().Add(-nodeDBNodeExpiration - time.Minute), exp: true, diff --git a/p2p/discover/node.go b/p2p/discover/node.go index 279b48b4a2..8f93232686 100644 --- a/p2p/discover/node.go +++ b/p2p/discover/node.go @@ -98,10 +98,10 @@ func (n *Node) String() string { // parameter "discport". // // In the following example, the node URL describes -// a node with IP address 10.3.58.6, TCP listening port 60606 +// a node with IP address 10.3.58.6, TCP listening port 42786 // and UDP discovery port 30301. // -// enode://@10.3.58.6:60606?discport=30301 +// enode://@10.3.58.6:42786?discport=30301 func ParseNode(rawurl string) (*Node, error) { var ( id NodeID diff --git a/p2p/discover/udp_test.go b/p2p/discover/udp_test.go index f9181d5b4f..1dc9d83b2c 100644 --- a/p2p/discover/udp_test.go +++ b/p2p/discover/udp_test.go @@ -67,7 +67,7 @@ func newUDPTest(t *testing.T) *udpTest { pipe: newpipe(), localkey: newkey(), remotekey: newkey(), - remoteaddr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 60606}, + remoteaddr: &net.UDPAddr{IP: net.IP{1, 2, 3, 4}, Port: 42786}, } test.table, test.udp = newUDP(test.localkey, test.pipe, nil, "") return test @@ -296,10 +296,10 @@ func TestUDP_findnodeMultiReply(t *testing.T) { // send the reply as two packets. list := []*Node{ - MustParseNode("enode://ba85011c70bcc5c04d8607d3a0ed29aa6179c092cbdda10d5d32684fb33ed01bd94f588ca8f91ac48318087dcb02eaf36773a7a453f0eedd6742af668097b29c@10.0.1.16:60606?discport=30304"), - MustParseNode("enode://81fa361d25f157cd421c60dcc28d8dac5ef6a89476633339c5df30287474520caca09627da18543d9079b5b288698b542d56167aa5c09111e55acdbbdf2ef799@10.0.1.16:60606"), + MustParseNode("enode://ba85011c70bcc5c04d8607d3a0ed29aa6179c092cbdda10d5d32684fb33ed01bd94f588ca8f91ac48318087dcb02eaf36773a7a453f0eedd6742af668097b29c@10.0.1.16:42786?discport=30304"), + MustParseNode("enode://81fa361d25f157cd421c60dcc28d8dac5ef6a89476633339c5df30287474520caca09627da18543d9079b5b288698b542d56167aa5c09111e55acdbbdf2ef799@10.0.1.16:42786"), MustParseNode("enode://9bffefd833d53fac8e652415f4973bee289e8b1a5c6c4cbe70abf817ce8a64cee11b823b66a987f51aaa9fba0d6a91b3e6bf0d5a5d1042de8e9eeea057b217f8@10.0.1.36:30301?discport=17"), - MustParseNode("enode://1b5b4aa662d7cb44a7221bfba67302590b643028197a7d5214790f3bac7aaa4a3241be9e83c09cf1f6c69d007c634faae3dc1b1221793e8446c0b3a09de65960@10.0.1.16:60606"), + MustParseNode("enode://1b5b4aa662d7cb44a7221bfba67302590b643028197a7d5214790f3bac7aaa4a3241be9e83c09cf1f6c69d007c634faae3dc1b1221793e8446c0b3a09de65960@10.0.1.16:42786"), } rpclist := make([]rpcNode, len(list)) for i := range list { diff --git a/tests/files/ansible/test-files/docker-python/Dockerfile b/tests/files/ansible/test-files/docker-python/Dockerfile index c8e0427f63..fd3c8fe5b5 100755 --- a/tests/files/ansible/test-files/docker-python/Dockerfile +++ b/tests/files/ansible/test-files/docker-python/Dockerfile @@ -16,7 +16,7 @@ RUN cd pyethereum && curl https://bootstrap.pypa.io/bootstrap-buildout.py | pyth RUN cd pyethereum && bin/buildout #default port for incoming requests -EXPOSE 60606 +EXPOSE 42786 WORKDIR /pyethereum