change default ports (#961)

Dockerfile

@@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y \
 
 COPY --from=build /src/dist/bee /usr/local/bin/bee
 
-EXPOSE 6060 7070 8080
+EXPOSE 1633 1634 1635
 USER bee
 WORKDIR /home/bee
 

cmd/bee-file/main.go

@@ -253,7 +253,7 @@ If --output-dir is set, the retrieved file will be written to the speficied dire
 	c.Flags().BoolVarP(&outFileForce, "force", "f", false, "overwrite existing output file")
 	c.Flags().StringVarP(&outDir, "output-dir", "d", "", "save directory")
 	c.Flags().StringVar(&host, "host", "127.0.0.1", "api host")
-	c.Flags().IntVar(&port, "port", 8080, "api port")
+	c.Flags().IntVar(&port, "port", 1633, "api port")
 	c.Flags().BoolVar(&ssl, "ssl", false, "use ssl")
 	c.Flags().BoolVarP(&retrieve, "retrieve", "r", false, "retrieve file from referenced entry")
 	c.Flags().BoolVar(&useHttp, "http", false, "save entry to bee http api")

cmd/bee-join/main.go

@@ -104,7 +104,7 @@ Will output retrieved data to stdout.`,
 	c.Flags().StringVarP(&outFilePath, "output-file", "o", "", "file to write output to")
 	c.Flags().BoolVarP(&outFileForce, "force", "f", false, "overwrite existing output file")
 	c.Flags().StringVar(&host, "host", "127.0.0.1", "api host")
-	c.Flags().IntVar(&port, "port", 8080, "api port")
+	c.Flags().IntVar(&port, "port", 1633, "api port")
 	c.Flags().BoolVar(&ssl, "ssl", false, "use ssl")
 	c.Flags().StringVarP(&indir, "input-dir", "i", "", "retrieve chunks from directory")
 	c.Flags().StringVar(&verbosity, "info", "0", "log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace")

cmd/bee-split/main.go

@@ -128,7 +128,7 @@ Chunks are saved in individual files, and the file names will be the hex address
 	c.Flags().StringVarP(&outdir, "output-dir", "d", "", "saves chunks to given directory")
 	c.Flags().Int64VarP(&inputLength, "count", "c", 0, "read at most this many bytes")
 	c.Flags().StringVar(&host, "host", "127.0.0.1", "api host")
-	c.Flags().IntVar(&port, "port", 8080, "api port")
+	c.Flags().IntVar(&port, "port", 1633, "api port")
 	c.Flags().BoolVar(&ssl, "ssl", false, "use ssl")
 	c.Flags().BoolVar(&useHttp, "http", false, "save chunks to bee http api")
 	c.Flags().StringVar(&verbosity, "info", "0", "log verbosity level 0=silent, 1=error, 2=warn, 3=info, 4=debug, 5=trace")

cmd/bee/cmd/cmd.go

@@ -176,14 +176,14 @@ func (c *command) setAllFlags(cmd *cobra.Command) {
 	cmd.Flags().Uint64(optionNameDBCapacity, 5000000, fmt.Sprintf("db capacity in chunks, multiply by %d to get approximate capacity in bytes", swarm.ChunkSize))
 	cmd.Flags().String(optionNamePassword, "", "password for decrypting keys")
 	cmd.Flags().String(optionNamePasswordFile, "", "path to a file that contains password for decrypting keys")
-	cmd.Flags().String(optionNameAPIAddr, ":8080", "HTTP API listen address")
-	cmd.Flags().String(optionNameP2PAddr, ":7070", "P2P listen address")
+	cmd.Flags().String(optionNameAPIAddr, ":1633", "HTTP API listen address")
+	cmd.Flags().String(optionNameP2PAddr, ":1634", "P2P listen address")
 	cmd.Flags().String(optionNameNATAddr, "", "NAT exposed address")
 	cmd.Flags().Bool(optionNameP2PWSEnable, false, "enable P2P WebSocket transport")
 	cmd.Flags().Bool(optionNameP2PQUICEnable, false, "enable P2P QUIC transport")
 	cmd.Flags().StringSlice(optionNameBootnodes, []string{"/dnsaddr/bootnode.ethswarm.org"}, "initial nodes to connect to")
 	cmd.Flags().Bool(optionNameDebugAPIEnable, false, "enable debug HTTP API")
-	cmd.Flags().String(optionNameDebugAPIAddr, ":6060", "debug HTTP API listen address")
+	cmd.Flags().String(optionNameDebugAPIAddr, ":1635", "debug HTTP API listen address")
 	cmd.Flags().Uint64(optionNameNetworkID, 1, "ID of the Swarm network")
 	cmd.Flags().StringSlice(optionCORSAllowedOrigins, []string{}, "origins with CORS headers enabled")
 	cmd.Flags().Bool(optionNameStandalone, false, "whether we want the node to start with no listen addresses for p2p")

openapi/Swarm.yaml

@@ -19,7 +19,7 @@ servers:
         default: 'localhost'
         description: Base address of the local bee node main API
       port:
-        default: 8080
+        default: 1633
         description: Service port provided in bee node config
 
   - url: 'http://{apiRoot}:{port}'
@@ -28,7 +28,7 @@ servers:
         default: 'localhost'
         description: Base address of the local bee node main API
       port:
-        default: 8080
+        default: 1633
         description: Service port provided in bee node config
 
 paths:

openapi/SwarmCommon.yaml

@@ -189,7 +189,7 @@ components:
 
     P2PUnderlay:
       type: string
-      example: "/ip4/127.0.0.1/tcp/7070/p2p/16Uiu2HAmTm17toLDaPYzRyjKn27iCB76yjKnJ5DjQXneFmifFvaX"
+      example: "/ip4/127.0.0.1/tcp/1634/p2p/16Uiu2HAmTm17toLDaPYzRyjKn27iCB76yjKnJ5DjQXneFmifFvaX"
 
     Peers:
       type: object

openapi/SwarmDebug.yaml

@@ -19,7 +19,7 @@ servers:
         default: 'localhost'
         description: Base address of the local bee node debug API
       port:
-        default: 6060
+        default: 1635
         description: Service port provided in bee node config
 
 paths:

pkg/bzz/address_test.go

@@ -14,7 +14,7 @@ import (
 )
 
 func TestBzzAddress(t *testing.T) {
-	node1ma, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/7070/p2p/16Uiu2HAkx8ULY8cTXhdVAcMmLcH9AsTKz6uBQ7DPLKRjMLgBVYkA")
+	node1ma, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/1634/p2p/16Uiu2HAkx8ULY8cTXhdVAcMmLcH9AsTKz6uBQ7DPLKRjMLgBVYkA")
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/debugapi/peer_test.go

@@ -22,8 +22,8 @@ import (
 )
 
 func TestConnect(t *testing.T) {
-	underlay := "/ip4/127.0.0.1/tcp/7070/p2p/16Uiu2HAkx8ULY8cTXhdVAcMmLcH9AsTKz6uBQ7DPLKRjMLgBVYkS"
-	errorUnderlay := "/ip4/127.0.0.1/tcp/7070/p2p/16Uiu2HAkw88cjH2orYrB6fDui4eUNdmgkwnDM8W681UbfsPgM9QY"
+	underlay := "/ip4/127.0.0.1/tcp/1634/p2p/16Uiu2HAkx8ULY8cTXhdVAcMmLcH9AsTKz6uBQ7DPLKRjMLgBVYkS"
+	errorUnderlay := "/ip4/127.0.0.1/tcp/1634/p2p/16Uiu2HAkw88cjH2orYrB6fDui4eUNdmgkwnDM8W681UbfsPgM9QY"
 	testErr := errors.New("test error")
 
 	privateKey, err := crypto.GenerateSecp256k1Key()

pkg/kademlia/kademlia_test.go

@@ -782,7 +782,7 @@ func removeOne(k *kademlia.Kad, peer swarm.Address) {
 	k.Disconnected(p2p.Peer{Address: peer})
 }
 
-const underlayBase = "/ip4/127.0.0.1/tcp/7070/dns/"
+const underlayBase = "/ip4/127.0.0.1/tcp/1634/dns/"
 
 func connectOne(t *testing.T, signer beeCrypto.Signer, k *kademlia.Kad, ab addressbook.Putter, peer swarm.Address) {
 	t.Helper()

pkg/p2p/libp2p/internal/handshake/handshake_test.go

@@ -32,11 +32,11 @@ func TestHandshake(t *testing.T) {
 	logger := logging.New(ioutil.Discard, 0)
 	networkID := uint64(3)
 
-	node1ma, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/7070/p2p/16Uiu2HAkx8ULY8cTXhdVAcMmLcH9AsTKz6uBQ7DPLKRjMLgBVYkA")
+	node1ma, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/1634/p2p/16Uiu2HAkx8ULY8cTXhdVAcMmLcH9AsTKz6uBQ7DPLKRjMLgBVYkA")
 	if err != nil {
 		t.Fatal(err)
 	}
-	node2ma, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/7070/p2p/16Uiu2HAkx8ULY8cTXhdVAcMmLcH9AsTKz6uBQ7DPLKRjMLgBVYkS")
+	node2ma, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/1634/p2p/16Uiu2HAkx8ULY8cTXhdVAcMmLcH9AsTKz6uBQ7DPLKRjMLgBVYkS")
 	if err != nil {
 		t.Fatal(err)
 	}

pkg/topology/full/full_test.go

@@ -28,7 +28,7 @@ import (
 
 func TestAddPeers(t *testing.T) {
 	logger := logging.New(ioutil.Discard, 0)
-	underlay, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/7070/p2p/16Uiu2HAkx8ULY8cTXhdVAcMmLcH9AsTKz6uBQ7DPLKRjMLgBVYkS")
+	underlay, err := ma.NewMultiaddr("/ip4/127.0.0.1/tcp/1634/p2p/16Uiu2HAkx8ULY8cTXhdVAcMmLcH9AsTKz6uBQ7DPLKRjMLgBVYkS")
 	if err != nil {
 		t.Fatal(err)
 	}