Merge branch 'refactor/consolidate-p2p-modules' into feat/basic-tls

* refactor/consolidate-p2p-modules: (72 commits)
  chore: update changelog
  chore: tidy type assertions
  chore: simplify log
  fix: module restart `WithHost` (again)
  chore: improve comments
  chore: add TECHDEBT comment
  fix: test helper & add TECHDEBT comment
  [Shared] `TxResult` consolidation (Merge After #673) (#676)
  [Dependencies] Update deps (#673)
  [Infra] Update reviewpad configuration (#675)
  chore: update changelog
  fix: re-evaluate options on p2p module `#Start()`
  chore: group imports
  chore: `RainTreeConfig#isValid()` returns multierr
  chore: remove `use_libp2p` from k8s config
  test: pass `*testing.T` to `getPeerstore` helper
  chore: improve error log messaging
  chore: remove unnecessary multierror usage
  chore: update/improve comments
  use pod IP for POCKET_P2P_HOSTNAME
  ...

Author: bryanchriswhite

.github/ISSUE_TEMPLATE/issue.md

@@ -70,6 +70,7 @@ assignees: ""
 - [ ] **New tests or benchmarks**: `make ...`
 - [ ] **All tests**: `make test_all`
 - [ ] **LocalNet**: verify a `LocalNet` is still functioning correctly by following the instructions at [docs/development/README.md](https://github.com/pokt-network/pocket/tree/main/docs/development)
+- [ ] ***k8s LocalNet**: verify a `k8s LocalNet` is still functioning correctly by following the instructions [here](https://github.com/pokt-network/pocket/blob/main/build/localnet/README.md)
 
 ---
 

.github/PULL_REQUEST_TEMPLATE.md

@@ -38,8 +38,9 @@ Please mark the relevant option(s):
 
 ## Testing
 
-- [ ] `make develop_test`
-- [ ] [LocalNet](https://github.com/pokt-network/pocket/blob/main/docs/development/README.md) w/ all of the steps outlined in the `README`
+- [ ] `make develop_test`; if any code changes were made
+- [ ] [Docker Compose LocalNet](https://github.com/pokt-network/pocket/blob/main/docs/development/README.md); if any major functionality was changed or introduced
+- [ ] [k8s LocalNet](https://github.com/pokt-network/pocket/blob/main/build/localnet/README.md); if any infrastructure or configuration changes were made
 
 <!-- REMOVE this comment block after following the instructions
  If you added additional tests or infrastructure, describe it here.

.github/workflows/changelog-verify.yml

@@ -85,13 +85,33 @@ jobs:
             const prNumber = context.payload.pull_request.number;
             const uniqueIdentifier = "<!-- validate_changelogs_review -->";
 
+            const perPage = 100;
+            let page = 1;
+            let hasMore = true;
+            const matchingReviews = [];
+
             // List all the reviews on the pull request
-            const { data: reviews } = await github.rest.pulls.listReviews({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              pull_number: prNumber,
-            });
-            const matchingReviews = reviews.filter(review => review.body.includes(uniqueIdentifier) && review.state !== "DISMISSED");
+            while (hasMore) {
+              const { data: reviews } = await github.rest.pulls.listReviews({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                pull_number: prNumber,
+                per_page: perPage,
+                page: page,
+              });
+
+              console.log(`Processing page ${page} with each page having ${perPage} reviews.`);
+              console.log("reviews count", reviews.length);
+              const filteredReviews = reviews.filter(
+                (review) => review.body.includes(uniqueIdentifier) && review.state !== "DISMISSED"
+              );
+              console.log("filteredReviews count", filteredReviews.length);
+              matchingReviews.push(...filteredReviews);
+
+              hasMore = reviews.length === perPage;
+              page += 1;
+            }
+
             console.log(`Found ${matchingReviews.length} reviews.`);
 
             // Dismiss all reviews containing the unique identifier

.github/workflows/cr.yml

@@ -0,0 +1,25 @@
+name: GPT Review
+
+permissions:
+  contents: read
+  pull-requests: write
+
+on:
+  pull_request:
+    types: [opened, reopened, synchronize]
+
+jobs:
+  review:
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'gpt review') }}
+    runs-on: ubuntu-latest
+    name: GPT Review
+    steps:
+      - uses: anc95/ChatGPT-CodeReview@main
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY_OLSHANSKY }}
+          # Optional
+          LANGUAGE: English
+          MODEL: gpt-4
+          # top_p: 1
+          # temperature: 1

.github/workflows/main.yml

@@ -99,7 +99,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: test-multiple-go-versions
     # Until we have developer environments, we don't need the images built on other that main branches.
-    if: github.ref == 'refs/heads/main'
+    if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'push-image')
     strategy:
       matrix:
         # Build dev & prod images
@@ -138,7 +138,8 @@ jobs:
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
-          platforms: linux/amd64,linux/arm64
+          # NB: Uncomment below if arm64 build is needed; arm64 builds are off by default because build times are significant.
+          platforms: linux/amd64 #,linux/arm64 
           file: build/Dockerfile.${{ matrix.osType }}.${{ matrix.imageType }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

.gitignore

@@ -83,4 +83,11 @@ val2.json
 # Generated by Tilt (tilt.dev)
 localnet_config.yaml
 
-.env
+.env
+
+# Local files created during https://github.com/pokt-network/pocket/wiki creation
+tools/wiki
+
+
+# ignore highest precedence config file read by default
+/config.json

Makefile

@@ -34,6 +34,15 @@ docker_check:
 	fi; \
 	}
 
+# Internal helper target - check if kubectl is installed.
+kubectl_check:
+	{ \
+	if ( ! ( command -v kubectl >/dev/null )); then \
+		echo "Seems like you don't have Kubectl installed. Make sure you review docs/development/README.md before continuing"; \
+		exit 1; \
+	fi; \
+	}
+
 .PHONY: prompt_user
 # Internal helper target - prompt the user before continuing
 prompt_user:
@@ -43,6 +52,14 @@ prompt_user:
 warn_destructive: ## Print WARNING to the user
 	@echo "This is a destructive action that will affect docker resources outside the scope of this repo!"
 
+.PHONY: protoc_check
+protoc_check: ## Checks if protoc is installed
+	{ \
+	if ! command -v protoc >/dev/null; then \
+		echo "Follow instructions to install 'protoc': https://grpc.io/docs/protoc-installation/"; \
+	fi; \
+	}
+
 .PHONY: go_vet
 go_vet: ## Run `go vet` on all files in the current project
 	go vet ./...
@@ -57,30 +74,29 @@ go_staticcheck: ## Run `go staticcheck` on all files in the current project
 	fi; \
 	}
 
+GODOC_PORT ?= 6060
 .PHONY: go_doc
-# INCOMPLETE: Generate documentation for the current project using `godo`
-go_doc:
+go_doc: # INCOMPLETE: [WIP] Generate documentation for the current project using `godo`
 	{ \
 	if command -v godoc >/dev/null; then \
-		echo "Visit http://localhost:6060/pkg/github.com/pokt-network/pocket"; \
-		godoc -http=localhost:6060  -goroot=${PWD}/..; \
+		echo "Visit http://localhost:${GODOC_PORT}/pkg/github.com/pokt-network/pocket"; \
+		godoc -http=localhost:${GODOC_PORT}  -goroot=${PWD}/..; \
 	else \
 		echo "Install with 'go install golang.org/x/tools/cmd/godoc@latest'"; \
 	fi; \
 	}
 
 .PHONY: go_protoc-go-inject-tag
-### Checks if protoc-go-inject-tag is installed
-go_protoc-go-inject-tag:
+go_protoc-go-inject-tag: ## Checks if protoc-go-inject-tag is installed
 	{ \
 	if ! command -v protoc-go-inject-tag >/dev/null; then \
 		echo "Install with 'go install github.com/favadi/protoc-go-inject-tag@latest'"; \
 	fi; \
 	}
 
+
 .PHONY: go_oapi-codegen
-### Checks if oapi-codegen is installed
-go_oapi-codegen:
+go_oapi-codegen: ## Checks if oapi-codegen is installed
 	{ \
 	if ! command -v oapi-codegen >/dev/null; then \
 		echo "Install with 'go install github.com/deepmap/oapi-codegen/cmd/[email protected]'"; \
@@ -110,6 +126,7 @@ install_cli_deps: ## Installs `protoc-gen-go`, `mockgen`, 'protoc-go-inject-tag'
 
 .PHONY: develop_start
 develop_start: ## Run all of the make commands necessary to develop on the project
+		make protoc_check && \
 		make docker_loki_check && \
 		make clean_mocks && \
 		make protogen_clean && make protogen_local && \
@@ -272,9 +289,6 @@ protogen_local: go_protoc-go-inject-tag ## Generate go structures for all of the
 	$(PROTOC_SHARED) -I=./runtime/genesis/proto  --go_out=./runtime/genesis ./runtime/genesis/proto/*.proto
 	protoc-go-inject-tag -input="./runtime/genesis/*.pb.go"
 
-	# Persistence
-	$(PROTOC_SHARED) -I=./persistence/indexer/proto 	--go_out=./persistence/indexer ./persistence/indexer/proto/*.proto
-
 	# Utility
 	$(PROTOC_SHARED) -I=./utility/types/proto --go_out=./utility/types ./utility/types/proto/*.proto
 
@@ -326,6 +340,10 @@ generate_node_state_machine_diagram: ## (Re)generates the Node State Machine dia
 test_all: ## Run all go unit tests
 	go test -p 1 -count=1 ./...
 
+.PHONY: test_e2e
+test_e2e: kubectl_check ## Run all E2E tests
+	go test ${VERBOSE_TEST} ./e2e/tests/... -tags=e2e
+
 .PHONY: test_all_with_json_coverage
 test_all_with_json_coverage: generate_rpc_openapi ## Run all go unit tests, output results & coverage into json & coverage files
 	go test -p 1 -json ./... -covermode=count -coverprofile=coverage.out | tee test_results.json | jq
@@ -367,9 +385,13 @@ test_hotstuff: ## Run all go unit tests related to hotstuff consensus
 	go test ${VERBOSE_TEST} ./consensus/e2e_tests -run Hotstuff
 
 .PHONY: test_pacemaker
-test_pacemaker: ## Run all go unit tests related to the hotstuff pacemaker
+test_pacemaker: ## Run all go unit tests related to hotstuff pacemaker
 	go test ${VERBOSE_TEST} ./consensus/e2e_tests -run Pacemaker
 
+.PHONY: test_statesync
+test_statesync: ## Run all go unit tests related to hotstuff statesync
+	go test -v ${VERBOSE_TEST} -count=1  -run StateSync ./consensus/e2e_tests
+
 .PHONY: test_vrf
 test_vrf: ## Run all go unit tests in the VRF library
 	go test ${VERBOSE_TEST} ./consensus/leader_election/vrf
@@ -524,3 +546,7 @@ check_cross_module_imports: ## Lists cross-module imports
 .PHONY: send_local_tx
 send_local_tx: ## A hardcoded send tx to make LocalNet debugging easier
 	go run -tags=debug app/client/*.go Account Send --non_interactive 00104055c00bed7c983a48aac7dc6335d7c607a7 00204737d2a165ebe4be3a7d5b0af905b0ea91d8 1000
+
+.PHONY: query_chain_params
+query_chain_params: ## A hardcoded ChainParams query to make LocalNet debugging easier
+	go run app/client/main.go Query AllChainParams

README.md

@@ -60,6 +60,10 @@ If you'd like to contribute to the Pocket V1 Protocol, start by:
 
 - _Coming Soon: Telemetry Changelog_
 
+### Project Management Resources
+- [V1 Roadmap](https://github.com/pokt-network/pocket/blob/main/docs/roadmap/README.md)
+- [V1 Project Board](https://github.com/orgs/pokt-network/projects/142/views/12)
+
 ## Support & Contact
 
 <div>

app/client/cli/account.go

@@ -2,10 +2,7 @@ package cli
 
 import (
 	"fmt"
-	"path/filepath"
-	"strings"
 
-	"github.com/pokt-network/pocket/app/client/keybase"
 	"github.com/pokt-network/pocket/shared/crypto"
 	"github.com/pokt-network/pocket/utility/types"
 	"github.com/spf13/cobra"
@@ -24,6 +21,7 @@ func NewAccountCommand() *cobra.Command {
 	}
 
 	cmds := accountCommands()
+	applySubcommandOptions(cmds, attachKeybaseFlagsToSubcommands())
 	applySubcommandOptions(cmds, attachPwdFlagToSubcommands())
 	cmd.AddCommand(cmds...)
 
@@ -45,18 +43,14 @@ func accountCommands() []*cobra.Command {
 				toAddr := crypto.AddressFromString(args[1])
 				amount := args[2]
 
-				// Open the keybase at the specified path
-				pocketDir := strings.TrimSuffix(dataDir, "/")
-				keybasePath, err := filepath.Abs(pocketDir + keybaseSuffix)
-				if err != nil {
-					return err
-				}
-				kb, err := keybase.NewKeybase(keybasePath)
+				kb, err := keybaseForCLI()
 				if err != nil {
 					return err
 				}
 
-				pwd = readPassphrase(pwd)
+				if !nonInteractive {
+					pwd = readPassphrase(pwd)
+				}
 
 				pk, err := kb.GetPrivKey(fromAddrHex, pwd)
 				if err != nil {