[P2P, Runtime] Update P2P & base config (part 2) (#535)

## Description This is another of a series of PRs split out from #500. Here we update the base and P2P configs in preparation for the addition of the libp2p module. ## Issue #347 ## Type of change Please mark the relevant option(s): - [x] New feature, functionality or library - [ ] Bug fix - [ ] Code health or cleanup - [ ] Major breaking change - [ ] Documentation - [ ] Other  ## List of changes - Replace `consensus_port` with `port` in P2P config. - Update default P2P config `port` to from `8080` to `42069`. - Add `use_libp2p` field to base config. - Add `hostname` field to P2P config. - Update state hash test after modifying genesis (updated port numbers). ## Testing - [x] `make develop_test` - [x] [LocalNet](https://github.com/pokt-network/pocket/blob/main/docs/development/README.md) w/ all of the steps outlined in the `README` ## Required Checklist - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have tested my changes using the available tooling - [x] I have updated the corresponding CHANGELOG ### If Applicable Checklist - [ ] I have updated the corresponding README(s); local and/or global - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] I have added, or updated, [mermaid.js](https://mermaid-js.github.io) diagrams in the corresponding README(s) - [ ] I have added, or updated, documentation and [mermaid.js](https://mermaid-js.github.io) diagrams in `shared/docs/*` if I updated `shared/*`README(s)
pokt-network · Mar 1, 2023 · d09cd8d · d09cd8d
1 parent 56ea777
commit d09cd8d
Show file tree

Hide file tree

Showing 25 changed files with 107 additions and 63 deletions.
diff --git a/build/config/config1.json b/build/config/config1.json
@@ -1,6 +1,7 @@
 {
   "root_directory": "/go/src/github.com/pocket-network",
   "private_key": "0ca1a40ddecdab4f5b04fa0bfed1d235beaa2b8082e7554425607516f0862075dfe357de55649e6d2ce889acf15eb77e94ab3c5756fe46d3c7538d37f27f115e",
+  "use_lib_p2p": false,
   "consensus": {
     "max_mempool_bytes": 500000000,
     "pacemaker_config": {
@@ -28,7 +29,8 @@
     "health_check_period": "5m"
   },
   "p2p": {
-    "consensus_port": 8080,
+    "hostname": "node1.consensus",
+    "port": 42069,
     "use_rain_tree": true,
     "is_empty_connection_type": false,
     "private_key": "0ca1a40ddecdab4f5b04fa0bfed1d235beaa2b8082e7554425607516f0862075dfe357de55649e6d2ce889acf15eb77e94ab3c5756fe46d3c7538d37f27f115e",

diff --git a/build/config/config2.json b/build/config/config2.json
@@ -1,6 +1,7 @@
 {
   "root_directory": "/go/src/github.com/pocket-network",
   "private_key": "ba81e6e56d293895b299bc495ae75d490644429a5e0028fabeb5e1871c1098e7eb2c78364525a210d994a83e02d18b4287ab81f6670cf4510ab6c9f51e296d91",
+  "use_lib_p2p": false,
   "consensus": {
     "max_mempool_bytes": 500000000,
     "pacemaker_config": {
@@ -28,7 +29,8 @@
     "health_check_period": "5m"
   },
   "p2p": {
-    "consensus_port": 8080,
+    "hostname": "node2.consensus",
+    "port": 42069,
     "use_rain_tree": true,
     "is_empty_connection_type": false,
     "private_key": "ba81e6e56d293895b299bc495ae75d490644429a5e0028fabeb5e1871c1098e7eb2c78364525a210d994a83e02d18b4287ab81f6670cf4510ab6c9f51e296d91",

diff --git a/build/config/config3.json b/build/config/config3.json
@@ -1,6 +1,7 @@
 {
   "root_directory": "/go/src/github.com/pocket-network",
   "private_key": "25b385b367a827eaafcdb1003bd17a25f2ecc0d10d41f138846f52ae1015aa941041a9c76539791fef9bee5b4fcd5bf4a1a489e0790c44cbdfa776b901e13b50",
+  "use_lib_p2p": false,
   "consensus": {
     "max_mempool_bytes": 500000000,
     "pacemaker_config": {
@@ -28,7 +29,8 @@
     "health_check_period": "5m"
   },
   "p2p": {
-    "consensus_port": 8080,
+    "hostname": "node3.consensus",
+    "port": 42069,
     "use_rain_tree": true,
     "is_empty_connection_type": false,
     "private_key": "25b385b367a827eaafcdb1003bd17a25f2ecc0d10d41f138846f52ae1015aa941041a9c76539791fef9bee5b4fcd5bf4a1a489e0790c44cbdfa776b901e13b50",

diff --git a/build/config/config4.json b/build/config/config4.json
@@ -1,6 +1,7 @@
 {
   "root_directory": "/go/src/github.com/pocket-network",
   "private_key": "4ff3292ff14213149446f8208942b35439cb4b2c5e819f41fb612e880b5614bdd6cea8706f6ee6672c1e013e667ec8c46231e0e7abcf97ba35d89fceb8edae45",
+  "use_lib_p2p": false,
   "consensus": {
     "max_mempool_bytes": 500000000,
     "pacemaker_config": {
@@ -28,7 +29,8 @@
     "health_check_period": "5m"
   },
   "p2p": {
-    "consensus_port": 8080,
+    "hostname": "node4.consensus",
+    "port": 42069,
     "use_rain_tree": true,
     "is_empty_connection_type": false,
     "private_key": "4ff3292ff14213149446f8208942b35439cb4b2c5e819f41fb612e880b5614bdd6cea8706f6ee6672c1e013e667ec8c46231e0e7abcf97ba35d89fceb8edae45",

diff --git a/build/config/genesis.json b/build/config/genesis.json
@@ -4040,7 +4040,7 @@
       "address": "00104055c00bed7c983a48aac7dc6335d7c607a7",
       "public_key": "dfe357de55649e6d2ce889acf15eb77e94ab3c5756fe46d3c7538d37f27f115e",
       "chains": null,
-      "service_url": "node1.consensus:8080",
+      "service_url": "node1.consensus:42069",
       "staked_amount": "1000000000000",
       "paused_height": -1,
       "unstaking_height": -1,
@@ -4051,7 +4051,7 @@
       "address": "00204737d2a165ebe4be3a7d5b0af905b0ea91d8",
       "public_key": "eb2c78364525a210d994a83e02d18b4287ab81f6670cf4510ab6c9f51e296d91",
       "chains": null,
-      "service_url": "node2.consensus:8080",
+      "service_url": "node2.consensus:42069",
       "staked_amount": "1000000000000",
       "paused_height": -1,
       "unstaking_height": -1,
@@ -4062,7 +4062,7 @@
       "address": "00304d0101847b37fd62e7bebfbdddecdbb7133e",
       "public_key": "1041a9c76539791fef9bee5b4fcd5bf4a1a489e0790c44cbdfa776b901e13b50",
       "chains": null,
-      "service_url": "node3.consensus:8080",
+      "service_url": "node3.consensus:42069",
       "staked_amount": "1000000000000",
       "paused_height": -1,
       "unstaking_height": -1,
@@ -4073,7 +4073,7 @@
       "address": "00404a570febd061274f72b50d0a37f611dfe339",
       "public_key": "d6cea8706f6ee6672c1e013e667ec8c46231e0e7abcf97ba35d89fceb8edae45",
       "chains": null,
-      "service_url": "node4.consensus:8080",
+      "service_url": "node4.consensus:42069",
       "staked_amount": "1000000000000",
       "paused_height": -1,
       "unstaking_height": -1,
@@ -4098,7 +4098,7 @@
       "address": "43d9ea9d9ad9c58bb96ec41340f83cb2cabb6496",
       "public_key": "16cd0a304c38d76271f74dd3c90325144425d904ef1b9a6fbab9b201d75a998b",
       "chains": ["0001"],
-      "service_url": "node1.consensus:8080",
+      "service_url": "node1.consensus:42069",
       "staked_amount": "1000000000000",
       "paused_height": -1,
       "unstaking_height": -1,
@@ -4111,7 +4111,7 @@
       "address": "9ba047197ec043665ad3f81278ab1f5d3eaf6b8b",
       "public_key": "68efd26af01692fcd77dc135ca1de69ede464e8243e6832bd6c37f282db8c9cb",
       "chains": ["0001"],
-      "service_url": "node1.consensus:8080",
+      "service_url": "node1.consensus:42069",
       "staked_amount": "1000000000000",
       "paused_height": -1,
       "unstaking_height": -1,

diff --git a/build/deployments/.env.example b/build/deployments/.env.example
@@ -1,18 +1,18 @@
 # docker compose stuff
 # override with your own values if the default host port mappings in docker-compose do not suit you
 # NODE1_PORT_7081=127.0.0.1:7081
-# NODE1_PORT_8081=127.0.0.1:8081
 # NODE1_PORT_9081=127.0.0.1:9081
+# NODE1_PORT_42070=127.0.0.1:42070
 # NODE1_PORT_50832=127.0.0.1:50832
 # NODE2_PORT_7081=127.0.0.1:7082
-# NODE2_PORT_8081=127.0.0.1:8082
 # NODE2_PORT_9081=127.0.0.1:9082
+# NODE2_PORT_42070=127.0.0.1:42071
 # NODE2_PORT_50832=127.0.0.1:50833
 # NODE3_PORT_7081=127.0.0.1:7083
-# NODE3_PORT_8081=127.0.0.1:8083
 # NODE3_PORT_9081=127.0.0.1:9083
+# NODE3_PORT_42070=127.0.0.1:42072
 # NODE3_PORT_50832=127.0.0.1:50834
 # NODE4_PORT_7081=127.0.0.1:7084
-# NODE4_PORT_8081=127.0.0.1:8084
 # NODE4_PORT_9081=127.0.0.1:9084
+# NODE4_PORT_42070=127.0.0.1:42073
 # NODE4_PORT_50832=127.0.0.1:50835
diff --git a/build/deployments/docker-compose.yaml b/build/deployments/docker-compose.yaml
@@ -37,14 +37,14 @@ services:
       dockerfile: ./build/Dockerfile.localdev
     expose:
       - "7080" # dlv debug
-      - "8080"
       - "9080"
       - "9000"
+      - "42069"
       - "50832"
     ports:
       - "${NODE1_PORT_7081:-0.0.0.0:7081}:7081"
-      - "${NODE1_PORT_8081:-0.0.0.0:8081}:8080"
       - "${NODE1_PORT_9081:-0.0.0.0:9081}:9080"
+      - "${NODE1_PORT_42070:-0.0.0.0:42070}:42069"
       - "${NODE1_PORT_50832:-0.0.0.0:50832}:50832"
     volumes:
       - ${PWD}:/go/src/github.com/pocket-network
@@ -68,14 +68,14 @@ services:
       dockerfile: ./build/Dockerfile.localdev
     expose:
       - "7082" # dlv debug
-      - "8080"
+      - "42069"
       - "9080"
       - "9000"
       - "50832"
     ports:
       - "${NODE2_PORT_7081:-0.0.0.0:7082}:7081"
-      - "${NODE2_PORT_8081:-0.0.0.0:8082}:8080"
       - "${NODE2_PORT_9081:-0.0.0.0:9082}:9080"
+      - "${NODE2_PORT_42070:-0.0.0.0:42071}:42069"
       - "${NODE2_PORT_50832:-0.0.0.0:50833}:50832"
     volumes:
       - ${PWD}:/go/src/github.com/pocket-network
@@ -96,14 +96,14 @@ services:
       dockerfile: ./build/Dockerfile.localdev
     expose:
       - "7083" # dlv debug
-      - "8080"
+      - "42069"
       - "9080"
       - "9000"
       - "50832"
     ports:
       - "${NODE3_PORT_7081:-0.0.0.0:7083}:7081"
-      - "${NODE3_PORT_8081:-0.0.0.0:8083}:8080"
       - "${NODE3_PORT_9081:-0.0.0.0:9083}:9080"
+      - "${NODE3_PORT_42070:-0.0.0.0:42072}:42069"
       - "${NODE3_PORT_50832:-0.0.0.0:50834}:50832"
     volumes:
       - ${PWD}:/go/src/github.com/pocket-network
@@ -124,14 +124,14 @@ services:
       dockerfile: ./build/Dockerfile.localdev
     expose:
       - "7084" # dlv debug
-      - "8080"
+      - "42069"
       - "9080"
       - "9000"
       - "50832"
     ports:
       - "${NODE4_PORT_7081:-0.0.0.0:7084}:7081"
-      - "${NODE4_PORT_8081:-0.0.0.0:8084}:8080"
       - "${NODE4_PORT_9081:-0.0.0.0:9084}:9080"
+      - "${NODE4_PORT_42070:-0.0.0.0:42073}:42069"
       - "${NODE4_PORT_50832:-0.0.0.0:50835}:50832"
     volumes:
       - ${PWD}:/go/src/github.com/pocket-network

diff --git a/build/docs/CHANGELOG.md b/build/docs/CHANGELOG.md
@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.0.20] - 2023-03-01
+
+- replace `consensus_port` with `port` in P2P config
+- update default P2P config `port` to from `8080` to `42069`
+- add `use_libp2p` field to base config
+- add `hostname` field to P2P config
+
 ## [0.0.0.19] - 2023-02-28
 
 - Renamed `generic_param` to `service_url` in the config files

diff --git a/build/localnet/cluster-manager/main.go b/build/localnet/cluster-manager/main.go
@@ -67,7 +67,8 @@ func main() {
 		case watch.Added:
 			logger.Info().Str("validator", service.Name).Msg("Validator added to the cluster")
 			// TODO: consolidate args into constants
-			if err := stakeValidator(privateKey, "150000000001", []string{"0001"}, fmt.Sprintf("v1-validator%s:8080", validatorId)); err != nil {
+			validatorServiceUrl := fmt.Sprintf("v1-validator%s:%d", validatorId, defaults.DefaultP2PPort)
+			if err := stakeValidator(privateKey, "150000000001", []string{"0001"}, validatorServiceUrl); err != nil {
 				logger.Err(err).Msg("Error staking validator")
 			}
 		case watch.Deleted:

diff --git a/build/localnet/manifests/cli-client.yaml b/build/localnet/manifests/cli-client.yaml
@@ -23,7 +23,7 @@ spec:
             [
               "sh",
               "-c",
-              "until nc -z v1-validator001 8080; do echo waiting for v1-validator001...; sleep 2; done;",
+              "until nc -z v1-validator001 42069; do echo waiting for v1-validator001...; sleep 2; done;",
             ]
       containers:
         - name: pocket

diff --git a/build/localnet/manifests/cluster-manager.yaml b/build/localnet/manifests/cluster-manager.yaml
@@ -10,7 +10,7 @@ spec:
         [
           "sh",
           "-c",
-          "until nc -z v1-validator001 8080; do echo waiting for v1-validator001...; sleep 2; done;",
+          "until nc -z v1-validator001 42069; do echo waiting for v1-validator001...; sleep 2; done;",
         ]
   containers:
     - name: cluster-manager

diff --git a/build/localnet/manifests/configs.yaml b/build/localnet/manifests/configs.yaml
@@ -8,6 +8,7 @@ data:
     {
       "root_directory": "/go/src/github.com/pocket-network",
       "private_key": "",
+      "use_libp2p": false,
       "consensus": {
         "max_mempool_bytes": 500000000,
         "pacemaker_config": {
@@ -34,7 +35,7 @@ data:
         "health_check_period": "5m"
       },
       "p2p": {
-        "consensus_port": 8080,
+        "port": 42069,
         "use_rain_tree": true,
         "is_empty_connection_type": false,
         "private_key": "0ca1a40ddecdab4f5b04fa0bfed1d235beaa2b8082e7554425607516f0862075dfe357de55649e6d2ce889acf15eb77e94ab3c5756fe46d3c7538d37f27f115e",
@@ -4102,7 +4103,7 @@ data:
           "address": "00104055c00bed7c983a48aac7dc6335d7c607a7",
           "public_key": "dfe357de55649e6d2ce889acf15eb77e94ab3c5756fe46d3c7538d37f27f115e",
           "chains": null,
-          "service_url": "v1-validator001:8080",
+          "service_url": "v1-validator001:42069",
           "staked_amount": "1000000000000",
           "paused_height": -1,
           "unstaking_height": -1,
@@ -4113,7 +4114,7 @@ data:
           "address": "00204737d2a165ebe4be3a7d5b0af905b0ea91d8",
           "public_key": "eb2c78364525a210d994a83e02d18b4287ab81f6670cf4510ab6c9f51e296d91",
           "chains": null,
-          "service_url": "v1-validator002:8080",
+          "service_url": "v1-validator002:42069",
           "staked_amount": "1000000000000",
           "paused_height": -1,
           "unstaking_height": -1,
@@ -4124,7 +4125,7 @@ data:
           "address": "00304d0101847b37fd62e7bebfbdddecdbb7133e",
           "public_key": "1041a9c76539791fef9bee5b4fcd5bf4a1a489e0790c44cbdfa776b901e13b50",
           "chains": null,
-          "service_url": "v1-validator003:8080",
+          "service_url": "v1-validator003:42069",
           "staked_amount": "1000000000000",
           "paused_height": -1,
           "unstaking_height": -1,
@@ -4135,7 +4136,7 @@ data:
           "address": "00404a570febd061274f72b50d0a37f611dfe339",
           "public_key": "d6cea8706f6ee6672c1e013e667ec8c46231e0e7abcf97ba35d89fceb8edae45",
           "chains": null,
-          "service_url": "v1-validator004:8080",
+          "service_url": "v1-validator004:42069",
           "staked_amount": "1000000000000",
           "paused_height": -1,
           "unstaking_height": -1,
@@ -4160,7 +4161,7 @@ data:
           "address": "43d9ea9d9ad9c58bb96ec41340f83cb2cabb6496",
           "public_key": "16cd0a304c38d76271f74dd3c90325144425d904ef1b9a6fbab9b201d75a998b",
           "chains": ["0001"],
-          "service_url": "v1-validator001:8080",
+          "service_url": "v1-validator001:42069",
           "staked_amount": "1000000000000",
           "paused_height": -1,
           "unstaking_height": -1,
@@ -4173,7 +4174,7 @@ data:
           "address": "9ba047197ec043665ad3f81278ab1f5d3eaf6b8b",
           "public_key": "68efd26af01692fcd77dc135ca1de69ede464e8243e6832bd6c37f282db8c9cb",
           "chains": ["0001"],
-          "service_url": "v1-validator001:8080",
+          "service_url": "v1-validator001:42069",
           "staked_amount": "1000000000000",
           "paused_height": -1,
           "unstaking_height": -1,

diff --git a/build/localnet/templates/v1-validator-template.yaml.tpl b/build/localnet/templates/v1-validator-template.yaml.tpl
@@ -29,7 +29,7 @@ spec:
             - -config=/configs/config.json
             - -genesis=/genesis.json
           ports:
-            - containerPort: 8080
+            - containerPort: 42069
               name: consensus
             - containerPort: 50832
               name: rpc
@@ -63,6 +63,8 @@ spec:
               value: "postgres://$(POSTGRES_USER):$(POSTGRES_PASSWORD)@$(POSTGRES_HOST):$(POSTGRES_PORT)/$(POSTGRES_DB)"
             - name: POCKET_PERSISTENCE_NODE_SCHEMA
               value: validator${VALIDATOR_NUMBER}
+            - name: POCKET_P2P_HOSTNAME
+              value: "v1-validator${VALIDATOR_NUMBER}"
           volumeMounts:
             - name: config-volume
               mountPath: /configs
@@ -106,7 +108,7 @@ metadata:
     v1-purpose: validator
 spec:
   ports:
-    - port: 8080
+    - port: 42069
       name: consensus
     - port: 50832
       name: rpc

diff --git a/p2p/CHANGELOG.md b/p2p/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.0.31] - 2023-03-01
+
+- replace `consensus_port` with `port` in P2P config
+- update default P2P config `port` to from `8080` to `42069`
+
 ## [0.0.0.30] - 2023-02-28
 
 - Renamed package names and parameters to reflect changes in the rest of the codebase
@@ -64,7 +69,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.0.0.19] - 2023-01-19
 
 - Rewrite `interface{}` to `any`
-
 ## [0.0.0.18] - 2023-01-11
 
 - Add a lock to the mempool to avoid parallel messages which has caused the node to crash in the past

diff --git a/p2p/module_test.go b/p2p/module_test.go
@@ -83,7 +83,7 @@ func Test_Create_configureBootstrapNodes(t *testing.T) {
 		{
 			name: "negative port number yields an error and empty list of bootstrap nodes",
 			args: args{
-				initialBootstrapNodesCsv: "udp://somenode:-8080",
+				initialBootstrapNodesCsv: "udp://somenode:-42069",
 			},
 			wantBootstrapNodes: []string(nil),
 			wantErr:            true,

diff --git a/p2p/transport/transport.go b/p2p/transport/transport.go
@@ -45,7 +45,7 @@ type tcpConn struct {
 }
 
 func createTCPListener(cfg *configs.P2PConfig) (*tcpConn, error) {
-	addr, err := net.ResolveTCPAddr(TCPNetworkLayerProtocol, fmt.Sprintf(":%d", cfg.ConsensusPort))
+	addr, err := net.ResolveTCPAddr(TCPNetworkLayerProtocol, fmt.Sprintf(":%d", cfg.Port))
 	if err != nil {
 		return nil, err
 	}