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

app/client/cli/doc/CHANGELOG.md

@@ -7,7 +7,11 @@ 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] - 2022-12-28
+
+- Updated to use `coreTypes` instead of utility types for `Actor` and `ActorType`
+
+## [0.0.0.2] - 2022-11-02
 
 ### Added
 
@@ -16,13 +20,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
 

build/config/config1.json

@@ -25,8 +25,7 @@
     "consensus_port": 8080,
     "use_rain_tree": true,
     "is_empty_connection_type": false,
-    "private_key": "6fd0bc54cc2dd205eaf226eebdb0451629b321f11d279013ce6fdd5a33059256b2eda2232ffb2750bf761141f70f75a03a025f65b2b2b417c7f8b3c9ca91e8e4",
-    "max_mempool_count": 1000000
+    "private_key": "6fd0bc54cc2dd205eaf226eebdb0451629b321f11d279013ce6fdd5a33059256b2eda2232ffb2750bf761141f70f75a03a025f65b2b2b417c7f8b3c9ca91e8e4"
   },
   "telemetry": {
     "enabled": true,

build/docs/CHANGELOG.md

@@ -0,0 +1,17 @@
+# Changelog
+
+All notable changes to this module will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.0.0.1] - 2022-12-28
+
+- Removed `BaseConfig` from `configs`
+- Centralized `PersistenceGenesisState` and `ConsensusGenesisState` into `GenesisState`
+
+## [0.0.0.0] - 2022-12-22
+
+- Introduced this `CHANGELOG.md`

consensus/doc/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.0.15] - 2022-12-28
+
+- ValidatorMap uses `Actor` references now
+
 ## [0.0.0.14] - 2022-12-21
 
 - Updated do use the new centralized config and genesis

docs/demos/iteration_3_end_to_end_tx.md

@@ -10,6 +10,7 @@
 - [Shell #4: Inspect the data in the database for node3](#shell-4-inspect-the-data-in-the-database-for-node3)
 - [Shell #5: Trigger a send transaction from the CLI](#shell-5-trigger-a-send-transaction-from-the-cli)
   - [Available Commands](#available-commands)
+    - [Accounts setup](#accounts-setup)
   - [First Transaction](#first-transaction)
   - [Second Transaction](#second-transaction)
 - [\[Optional\] Shell #6: See Swagger UI](#optional-shell-6-see-swagger-ui)
@@ -96,12 +97,32 @@ Show all the commands available in the CLI:
 go run app/client/*.go
 ```
 
+#### Accounts setup
+
+Since our Keybase is under development, currently we have to manually inject the private keys of the accounts we want to use in the CLI.
+
+For the following steps you'll need to use the accounts of the first two validators, therefore you have some options:
+
+1) You can just:
+   ```bash
+   echo '"6fd0bc54cc2dd205eaf226eebdb0451629b321f11d279013ce6fdd5a33059256b2eda2232ffb2750bf761141f70f75a03a025f65b2b2b417c7f8b3c9ca91e8e4"' > val1.json
+   echo '"5db3e9d97d04d6d70359de924bb02039c602080d6bf01a692bad31ad5ef93524c16043323c83ffd901a8bf7d73543814b8655aa4695f7bfb49d01926fc161cdb"' > val2.json
+   ```
+
+2) You can use `jq` and run these commands:
+    ```bash
+    cat ./build/config/config1.json | jq '.private_key' > val1.json
+    cat ./build/config/config2.json | jq '.private_key' > val2.json
+    ```
+
+3) You can manually copy-paste the private keys from the config files into the `val1.json` and `val2.json` files. Remember to keep the double quotes around the private keys ("private_key" field in the JSON).
+
 ### First Transaction
 
 Trigger a send transaction from validator 1 to validator 2.
 
 ```bash
-go run app/client/*.go --path_to_private_key_file=/Users/olshansky/workspace/pocket/pocket/build/pkeys/val1.json Account Send 6f66574e1f50f0ef72dff748c3f11b9e0e89d32a 67eb3f0a50ae459fecf666be0e93176e92441317 1000
+go run app/client/*.go --path_to_private_key_file=./val1.json Account Send 6f66574e1f50f0ef72dff748c3f11b9e0e89d32a 67eb3f0a50ae459fecf666be0e93176e92441317 1000
 ```
 
 1. Use shell #2 to `TriggerNextView` and confirm height increased via `PrintNodeState`
@@ -120,7 +141,7 @@ go run app/client/*.go --path_to_private_key_file=/Users/olshansky/workspace/poc
 Trigger a send transaction from validator 2 to validator 1.
 
 ```bash
-go run app/client/*.go --path_to_private_key_file=/Users/olshansky/workspace/pocket/pocket/build/pkeys/val2.json Account Send 67eb3f0a50ae459fecf666be0e93176e92441317 6f66574e1f50f0ef72dff748c3f11b9e0e89d32a 1000
+go run app/client/*.go --path_to_private_key_file=./val2.json Account Send 67eb3f0a50ae459fecf666be0e93176e92441317 6f66574e1f50f0ef72dff748c3f11b9e0e89d32a 1000
 ```
 
 1. Use shell #2 to `TriggerNextView` (one or more times) and confirm height increased via `PrintNodeState`

logger/docs/CHANGELOG.md

@@ -0,0 +1,16 @@
+# Changelog
+
+All notable changes to this module will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.0.0.1] - 2022-12-28
+
+- Refactored configs into `configs` package
+
+## [0.0.0.0] - 2022-12-28
+
+- Introduced this `CHANGELOG.md`

p2p/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.0.0.14] - 2022-12-28
+
+- `ActorsToAddrBook` now skips actors that are not validators since they don't have a serviceUrl generic parameter
+
 ## [0.0.0.13] - 2022-12-21
 
 - Updated to use the new centralized config and genesis handling

p2p/addrbook_provider/persistence.go

@@ -74,6 +74,10 @@ func (pabp *persistenceAddrBookProvider) GetStakedAddrBookAtHeight(height uint64
 func (pabp *persistenceAddrBookProvider) ActorsToAddrBook(actors map[string]coreTypes.Actor) (typesP2P.AddrBook, error) {
 	book := make(typesP2P.AddrBook, 0)
 	for _, v := range actors {
+		// only add validator actors since they are the only ones having a service url in their generic param at the moment
+		if v.ActorType != coreTypes.ActorType_ACTOR_TYPE_VAL {
+			continue
+		}
 		networkPeer, err := pabp.ActorToNetworkPeer(v)
 		if err != nil {
 			log.Println("[WARN] Error connecting to validator: ", err)

p2p/utils_test.go

@@ -143,6 +143,7 @@ func createMockGenesisState(t *testing.T, valKeys []cryptoPocket.PrivateKey) *ge
 	for i, valKey := range valKeys {
 		addr := valKey.Address().String()
 		mockActor := &coreTypes.Actor{
+			ActorType: coreTypes.ActorType_ACTOR_TYPE_VAL,
 			Address:         addr,
 			PublicKey:       valKey.PublicKey().String(),
 			GenericParam:    validatorId(i + 1),

persistence/actor.go

@@ -24,6 +24,7 @@ func (p PostgresContext) GetAllApps(height int64) (apps []*coreTypes.Actor, err
 		if err != nil {
 			return
 		}
+		actor.ActorType = coreTypes.ActorType_ACTOR_TYPE_APP
 		actors = append(actors, actor)
 	}
 	rows.Close()
@@ -53,6 +54,7 @@ func (p PostgresContext) GetAllValidators(height int64) (vals []*coreTypes.Actor
 		if err != nil {
 			return
 		}
+		actor.ActorType = coreTypes.ActorType_ACTOR_TYPE_VAL
 		actors = append(actors, actor)
 	}
 	rows.Close()
@@ -82,6 +84,7 @@ func (p PostgresContext) GetAllServiceNodes(height int64) (sn []*coreTypes.Actor
 		if err != nil {
 			return
 		}
+		actor.ActorType = coreTypes.ActorType_ACTOR_TYPE_SERVICENODE
 		actors = append(actors, actor)
 	}
 	rows.Close()
@@ -111,6 +114,7 @@ func (p PostgresContext) GetAllFishermen(height int64) (f []*coreTypes.Actor, er
 		if err != nil {
 			return
 		}
+		actor.ActorType = coreTypes.ActorType_ACTOR_TYPE_FISH
 		actors = append(actors, actor)
 	}
 	rows.Close()