[Core] Consolidate all node configurations into a new configs package - (Issue #396)

.gitignore

@@ -63,4 +63,8 @@ rpc/client.gen.go
 build/config/gen*.json
 
 # Ignored generated files by build
-bin/*
+bin/*
+
+# Validator keys used for testing/demoes
+val1.json
+val2.json

Makefile

@@ -243,18 +243,19 @@ protogen_clean: ## Remove all the generated protobufs.
 .PHONY: protogen_local
 protogen_local: go_protoc-go-inject-tag ## Generate go structures for all of the protobufs
 	$(eval proto_dir = ".")
-	protoc --go_opt=paths=source_relative  -I=./shared/messaging/proto    --go_out=./shared/messaging      	./shared/messaging/proto/*.proto    --experimental_allow_proto3_optional
-	protoc --go_opt=paths=source_relative  -I=./shared/codec/proto        --go_out=./shared/codec       	./shared/codec/proto/*.proto        --experimental_allow_proto3_optional
-	protoc --go_opt=paths=source_relative  -I=./persistence/indexer/proto --go_out=./persistence/indexer/   ./persistence/indexer/proto/*.proto --experimental_allow_proto3_optional
-	protoc --go_opt=paths=source_relative  -I=./persistence/proto         --go_out=./persistence/types  	./persistence/proto/*.proto         --experimental_allow_proto3_optional
+# TODO: Use a forloop to avoid all the code duplication and improve readability
+	protoc --go_opt=paths=source_relative  -I=./shared/messaging/proto    				--go_out=./shared/messaging     ./shared/messaging/proto/*.proto    --experimental_allow_proto3_optional
+	protoc --go_opt=paths=source_relative  -I=./shared/codec/proto        				--go_out=./shared/codec       	./shared/codec/proto/*.proto        --experimental_allow_proto3_optional
+	protoc --go_opt=paths=source_relative  -I=./persistence/indexer/proto 				--go_out=./persistence/indexer  ./persistence/indexer/proto/*.proto --experimental_allow_proto3_optional
+	protoc --go_opt=paths=source_relative  -I=./shared/ -I=./persistence/proto         	--go_out=./persistence/types  	./persistence/proto/*.proto         --experimental_allow_proto3_optional
 	protoc-go-inject-tag -input="./persistence/types/*.pb.go"
-	protoc --go_opt=paths=source_relative  -I=./utility/types/proto       --go_out=./utility/types      	./utility/types/proto/*.proto       --experimental_allow_proto3_optional
-	protoc --go_opt=paths=source_relative  -I=./consensus/types/proto     --go_out=./consensus/types    	./consensus/types/proto/*.proto     --experimental_allow_proto3_optional
-	protoc --go_opt=paths=source_relative  -I=./p2p/raintree/types/proto  --go_out=./p2p/types          	./p2p/raintree/types/proto/*.proto  --experimental_allow_proto3_optional
-	protoc --go_opt=paths=source_relative  -I=./p2p/types/proto           --go_out=./p2p/types          	./p2p/types/proto/*.proto           --experimental_allow_proto3_optional
-	protoc --go_opt=paths=source_relative  -I=./telemetry/proto           --go_out=./telemetry          	./telemetry/proto/*.proto           --experimental_allow_proto3_optional
-	protoc --go_opt=paths=source_relative  -I=./logger/proto              --go_out=./logger             	./logger/proto/*.proto              --experimental_allow_proto3_optional
-	protoc --go_opt=paths=source_relative  -I=./rpc/types/proto 		  --go_out=./rpc/types          	./rpc/types/proto/*.proto           --experimental_allow_proto3_optional
+	protoc --go_opt=paths=source_relative  -I=./shared/ -I=./utility/types/proto       				--go_out=./utility/types      	./utility/types/proto/*.proto       --experimental_allow_proto3_optional
+	protoc --go_opt=paths=source_relative  -I=./consensus/types/proto     				--go_out=./consensus/types    	./consensus/types/proto/*.proto     --experimental_allow_proto3_optional
+	protoc --go_opt=paths=source_relative  -I=./p2p/raintree/types/proto  				--go_out=./p2p/types          	./p2p/raintree/types/proto/*.proto  --experimental_allow_proto3_optional
+	protoc --go_opt=paths=source_relative  -I=./runtime/configs/proto     				--go_out=./runtime/configs      ./runtime/configs/proto/*.proto     --experimental_allow_proto3_optional
+	protoc --go_opt=paths=source_relative  -I=./shared/core/types/proto     			--go_out=./shared/core/types    ./shared/core/types/proto/*.proto   --experimental_allow_proto3_optional
+	protoc --go_opt=paths=source_relative  -I=./shared/ -I=./runtime/genesis/proto     	--go_out=./runtime/genesis      ./runtime/genesis/proto/*.proto     --experimental_allow_proto3_optional
+	protoc-go-inject-tag -input="./runtime/genesis/*.pb.go"
 	echo "View generated proto files by running: make protogen_show"
 
 .PHONY: protogen_docker_m1

app/client/cli/actor.go

@@ -6,6 +6,7 @@ import (
 	"regexp"
 	"strings"
 
+	coreTypes "github.com/pokt-network/pocket/shared/core/types"
 	typesUtil "github.com/pokt-network/pocket/utility/types"
 	"github.com/spf13/cobra"
 )
@@ -34,17 +35,17 @@ type (
 	cmdOption   func(*cobra.Command)
 	actorCmdDef struct {
 		Name      string
-		ActorType typesUtil.ActorType
+		ActorType coreTypes.ActorType
 		Options   []cmdOption
 	}
 )
 
 func NewActorCommands(cmdOptions []cmdOption) []*cobra.Command {
 	actorCmdDefs := []actorCmdDef{
-		{"Application", typesUtil.ActorType_App, cmdOptions},
-		{"Node", typesUtil.ActorType_ServiceNode, cmdOptions},
-		{"Fisherman", typesUtil.ActorType_Fisherman, cmdOptions},
-		{"Validator", typesUtil.ActorType_Validator, cmdOptions},
+		{"Application", coreTypes.ActorType_ACTOR_TYPE_APP, cmdOptions},
+		{"Node", coreTypes.ActorType_ACTOR_TYPE_SERVICENODE, cmdOptions},
+		{"Fisherman", coreTypes.ActorType_ACTOR_TYPE_FISH, cmdOptions},
+		{"Validator", coreTypes.ActorType_ACTOR_TYPE_VAL, cmdOptions},
 	}
 
 	cmds := make([]*cobra.Command, len(actorCmdDefs))

app/client/cli/doc/CHANGELOG.md

@@ -7,7 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [0.0.2] - 2022-11-02
+## [0.0.0.3] - 2023-01-03
+
+- Updated to use `coreTypes` instead of utility types for `Actor` and `ActorType`
+- Updated README.md
+
+## [0.0.0.2] - 2022-11-02
 
 ### Added
 
@@ -16,13 +21,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - System commands working end-to-end
 - Added Consensus State commands
 
-## [0.0.1] - 2022-09-09
+## [0.0.0.1] - 2022-09-09
 
 ### Added
 
 - Commands documentation generator
 
-## [0.0.0] - 2022-09-07
+## [0.0.0.0] - 2022-09-07
 
 ### Added
 

app/client/cli/doc/README.md

@@ -24,6 +24,7 @@ Command tree available [here](./commands/client.md)
 │   │   └── main.go          # commands specific documentation generator
 │   ├── gov.go               # Governance subcommand
 │   ├── utils.go             # support functions
+│   ├── system.go            # System subcommand
 │   └── utils_test.go        # tests for the support functions
 └── main.go                  # entrypoint
 ```

build/config/config1.json

@@ -1,8 +1,6 @@
 {
-  "base": {
-    "root_directory": "/go/src/github.com/pocket-network",
-    "private_key": "6fd0bc54cc2dd205eaf226eebdb0451629b321f11d279013ce6fdd5a33059256b2eda2232ffb2750bf761141f70f75a03a025f65b2b2b417c7f8b3c9ca91e8e4"
-  },
+  "root_directory": "/go/src/github.com/pocket-network",
+  "private_key": "6fd0bc54cc2dd205eaf226eebdb0451629b321f11d279013ce6fdd5a33059256b2eda2232ffb2750bf761141f70f75a03a025f65b2b2b417c7f8b3c9ca91e8e4",
   "consensus": {
     "max_mempool_bytes": 500000000,
     "pacemaker_config": {

build/config/config2.json

@@ -1,8 +1,6 @@
 {
-  "base": {
-    "root_directory": "/go/src/github.com/pocket-network",
-    "private_key": "5db3e9d97d04d6d70359de924bb02039c602080d6bf01a692bad31ad5ef93524c16043323c83ffd901a8bf7d73543814b8655aa4695f7bfb49d01926fc161cdb"
-  },
+  "root_directory": "/go/src/github.com/pocket-network",
+  "private_key": "5db3e9d97d04d6d70359de924bb02039c602080d6bf01a692bad31ad5ef93524c16043323c83ffd901a8bf7d73543814b8655aa4695f7bfb49d01926fc161cdb",
   "consensus": {
     "max_mempool_bytes": 500000000,
     "pacemaker_config": {

build/config/config3.json

@@ -1,8 +1,6 @@
 {
-  "base": {
-    "root_directory": "/go/src/github.com/pocket-network",
-    "private_key": "b37d3ba2f232060c41ba1177fea6008d885fcccad6826d64ee7d49f94d1dbc49a8b6be75d7551da093f788f7286c3a9cb885cfc8e52710eac5f1d5e5b4bf19b2"
-  },
+  "root_directory": "/go/src/github.com/pocket-network",
+  "private_key": "b37d3ba2f232060c41ba1177fea6008d885fcccad6826d64ee7d49f94d1dbc49a8b6be75d7551da093f788f7286c3a9cb885cfc8e52710eac5f1d5e5b4bf19b2",
   "consensus": {
     "max_mempool_bytes": 500000000,
     "pacemaker_config": {

build/config/config4.json

@@ -1,8 +1,6 @@
 {
-  "base": {
-    "root_directory": "/go/src/github.com/pocket-network",
-    "private_key": "c6c136d010d07d7f5e9944aa3594a10f9210dd3e26ebc1bc1516a6d957fd0df353ee26c82826694ffe1773d7b60d5f20dd9e91bdf8745544711bec5ff9c6fb4a"
-  },
+  "root_directory": "/go/src/github.com/pocket-network",
+  "private_key": "c6c136d010d07d7f5e9944aa3594a10f9210dd3e26ebc1bc1516a6d957fd0df353ee26c82826694ffe1773d7b60d5f20dd9e91bdf8745544711bec5ff9c6fb4a",
   "consensus": {
     "max_mempool_bytes": 500000000,
     "pacemaker_config": {