Merge remote-tracking branch 'pokt/main' into docs/create-factory

* pokt/main:
  [E2E] adds in-cluster config for E2E tests (#689)
  [Makefile] fixes the localnet_db_cli target (#700)
  Update devlog6.md
  [CLI] Remove logging for end user focused messages (#698)
  [Testing (DUP)] Add /internal/testutil pkg & refactor mockdns test code (#696)
  [Infra] Adapt pocket helm chart for DevNets (#682)
  Update changelog-verify.yml (#691)

Author: bryanchriswhite

.githooks/pre-commit

@@ -30,7 +30,7 @@ then
 fi
 
 # Initialise arrays and script wide variables
-IGNORE_DIRS=(".github" ".githooks" "docs" "bin")
+IGNORE_DIRS=(".github" ".githooks" "docs" "bin" "internal")
 MODULES_EDITED=() # Modules are considered top-level directories directly under root
 MODULES_MISSING_CHANGELOG=()
 CHANGELOG_FILES=() # Full paths to CHANGELOG.md files

.githooks/pre-receive

@@ -4,7 +4,7 @@
 BRANCH_CHANGED_FILES=($@)
 
 # Initialise arrays and script wide variables
-IGNORE_DIRS=(".github" ".githooks" "docs" "bin")
+IGNORE_DIRS=(".github" ".githooks" "docs" "bin" "internal")
 MODULES_EDITED=() # Modules are considered top-level directories directly under root
 MODULES_MISSING_CHANGELOG=()
 CHANGELOG_FILES=() # Full paths to CHANGELOG.md files

.github/workflows/changelog-verify.yml

@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     # require the validate job to have ran
     needs: validate
-    if: always()
+    if: ${{ contains(github.event.pull_request.labels.*.name, 'cl validate') }}
     steps:
       - name: Verify changelogs Failed - Create review comment
         if: ${{ contains(needs.validate.outputs.all, 'failed') }}

.github/workflows/main.yml

@@ -102,7 +102,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' || contains(github.event.pull_request.labels.*.name, 'push-image')
+    if: github.ref == 'refs/heads/main' || contains(github.event.pull_request.labels.*.name, 'push-image') || contains(github.event.pull_request.labels.*.name, 'e2e-devnet-test')
     strategy:
       matrix:
         # Build dev & prod images
@@ -117,6 +117,8 @@ jobs:
       - name: Docker Metadata action
         id: meta
         uses: docker/metadata-action@v4
+        env:
+          DOCKER_METADATA_PR_HEAD_SHA: "true"
         with:
           images: |
             ghcr.io/pokt-network/pocket-v1
@@ -128,6 +130,7 @@ jobs:
             type=ref,event=branch${{ matrix.imageType == 'dev' && ',suffix=-dev' || '' }}
             type=ref,event=pr${{ matrix.imageType == 'dev' && ',suffix=-dev' || '' }}
             type=sha${{ matrix.imageType == 'dev' && ',suffix=-dev' || '' }}
+            type=sha,format=long${{ matrix.imageType == 'dev' && ',suffix=-dev' || '' }}
             type=raw,value=latest,enable={{is_default_branch}}${{ matrix.imageType == 'dev' && ',suffix=-dev' || '' }}
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v2
@@ -142,7 +145,7 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           # NB: Uncomment below if arm64 build is needed; arm64 builds are off by default because build times are significant.
-          platforms: linux/amd64 #,linux/arm64 
+          platforms: linux/amd64 #,linux/arm64
           file: build/Dockerfile.${{ matrix.osType }}.${{ matrix.imageType }}
           cache-from: type=gha
           cache-to: type=gha,mode=max

Makefile

@@ -506,20 +506,20 @@ localnet_shell: ## Opens a shell in the pod that has the `client` cli available.
 
 .PHONY: localnet_logs_validators
 localnet_logs_validators: ## Outputs logs from all validators
-	kubectl logs -l v1-purpose=validator --all-containers=true --tail=-1
+	kubectl logs -l "pokt.network/purpose=validator" --all-containers=true --tail=-1
 
 .PHONY: localnet_logs_validators_follow
 localnet_logs_validators_follow: ## Outputs logs from all validators and follows them (i.e. tail)
-	kubectl logs -l v1-purpose=validator --all-containers=true --max-log-requests=1000 --tail=-1 -f
+	kubectl logs -l "pokt.network/purpose=validator" --all-containers=true --max-log-requests=1000 --tail=-1 -f
 
 .PHONY: localnet_down
 localnet_down: ## Stops LocalNet and cleans up dependencies (tl;dr `tilt down`)
 	tilt down --file=build/localnet/Tiltfile
 
 .PHONY: localnet_db_cli
-localnet_db_cli: ## Open a CLI to the local containerized postgres instancedb_cli:
+localnet_db_cli: ## Open a CLI to the local containerized postgres instance of validator 001:
 	echo "View schema by running 'SELECT schema_name FROM information_schema.schemata;'"
-	kubectl exec -it services/dependencies-postgresql -- bash -c "psql postgresql://postgres:LocalNetPassword@localhost"
+	kubectl exec -it validator-001-postgresql-0 -- bash -c "psql postgresql://postgres:LocalNetPassword@localhost"
 
 .PHONY: check_cross_module_imports
 check_cross_module_imports: ## Lists cross-module imports

app/client/cli/cmd.go

@@ -18,6 +18,7 @@ var (
 	dataDir        string
 	configPath     string
 	nonInteractive bool
+	verbose        bool
 	cfg            *configs.Config
 )
 
@@ -31,6 +32,11 @@ func init() {
 	if err := viper.BindPFlag("root_directory", rootCmd.PersistentFlags().Lookup("data_dir")); err != nil {
 		panic(err)
 	}
+
+	rootCmd.PersistentFlags().BoolVar(&verbose, "verbose", false, "Show verbose output")
+	if err := viper.BindPFlag("verbose", rootCmd.PersistentFlags().Lookup("verbose")); err != nil {
+		panic(err)
+	}
 }
 
 var rootCmd = &cobra.Command{

app/client/cli/keys.go

@@ -7,7 +7,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/pokt-network/pocket/logger"
 	"github.com/pokt-network/pocket/shared/codec"
 	coreTypes "github.com/pokt-network/pocket/shared/core/types"
 	"github.com/pokt-network/pocket/shared/crypto"
@@ -81,7 +80,7 @@ func keysCreateCommands() []*cobra.Command {
 					return err
 				}
 
-				logger.Global.Info().Str("address", kp.GetAddressString()).Msg("New Key Created")
+				fmt.Printf("New key created 🔐: %s\n", kp.GetAddressString())
 
 				return nil
 			},
@@ -129,7 +128,7 @@ func keysUpdateCommands() []*cobra.Command {
 					return err
 				}
 
-				logger.Global.Info().Str("address", addrHex).Msg("Key updated")
+				fmt.Printf("Key updated 🔐: %s\n", addrHex)
 
 				return nil
 			},
@@ -176,7 +175,7 @@ func keysDeleteCommands() []*cobra.Command {
 					return err
 				}
 
-				logger.Global.Info().Str("address", addrHex).Msg("Key deleted")
+				fmt.Printf("Key deleted ❌: %s\n", addrHex)
 
 				return nil
 			},
@@ -215,7 +214,10 @@ func keysGetCommands() []*cobra.Command {
 					return err
 				}
 
-				logger.Global.Info().Strs("addresses", addresses).Msg("Get all keys")
+				fmt.Println("All keys 🔑")
+				for _, addr := range addresses {
+					fmt.Println(addr)
+				}
 
 				return nil
 			},
@@ -244,7 +246,8 @@ func keysGetCommands() []*cobra.Command {
 					return err
 				}
 
-				logger.Global.Info().Str("address", addrHex).Str("public_key", kp.GetPublicKey().String()).Msg("Found key")
+				fmt.Println("Key details 🕵️")
+				fmt.Printf("Address: %s\nPublic Key: %s\n", addrHex, kp.GetPublicKey().String())
 
 				return nil
 			},
@@ -301,11 +304,11 @@ func keysExportCommands() []*cobra.Command {
 
 				// Write to stdout or file
 				if outputFile == "" {
-					logger.Global.Info().Str("private_key", exportString).Msg("Key exported")
+					fmt.Printf("Private Key 🔒: %s\n", exportString)
 					return nil
 				}
 
-				logger.Global.Info().Str("output_file", outputFile).Msg("Exporting private key string to file...")
+				fmt.Println("Writing private key to file ⏳")
 
 				return utils.WriteOutput(exportString, outputFile)
 			},
@@ -380,7 +383,7 @@ func keysImportCommands() []*cobra.Command {
 					return err
 				}
 
-				logger.Global.Info().Str("address", kp.GetAddressString()).Msg("Key imported")
+				fmt.Printf("Key imported 📥: %s\n", kp.GetAddressString())
 
 				return nil
 			},
@@ -436,7 +439,7 @@ func keysSignMsgCommands() []*cobra.Command {
 
 				sigHex := hex.EncodeToString(sigBz)
 
-				logger.Global.Info().Str("signature", sigHex).Str("address", addrHex).Msg("Message signed")
+				fmt.Printf("Message signed 🔏\nSignature: %s\n", sigHex)
 
 				return nil
 			},
@@ -475,7 +478,12 @@ func keysSignMsgCommands() []*cobra.Command {
 					return err
 				}
 
-				logger.Global.Info().Str("address", addrHex).Bool("valid", valid).Msg("Signature checked")
+				if !valid {
+					fmt.Println("Signature is not valid ❌")
+					return nil
+				}
+
+				fmt.Println("Signature is valid ✅")
 
 				return nil
 			},
@@ -563,7 +571,7 @@ func keysSignTxCommands() []*cobra.Command {
 					return err
 				}
 
-				logger.Global.Info().Str("signed_transaction_file", outputFile).Str("address", addrHex).Msg("Message signed")
+				fmt.Printf("Message signed 🔏\nKey Address: %s\nSignature file: %s\n", addrHex, outputFile)
 
 				return nil
 			},
@@ -627,7 +635,12 @@ func keysSignTxCommands() []*cobra.Command {
 					return err
 				}
 
-				logger.Global.Info().Str("address", addrHex).Bool("valid", valid).Msg("Signature checked")
+				if !valid {
+					fmt.Println("Signature is not valid ❌")
+					return nil
+				}
+
+				fmt.Println("Signature is valid ✅")
 
 				return nil
 			},
@@ -679,7 +692,10 @@ func keysSlipCommands() []*cobra.Command {
 					return err
 				}
 
-				logger.Global.Info().Str("address", kp.GetAddressString()).Str("parent", parentAddr).Uint32("index", index).Bool("stored", storeChild).Msg("Child key derived")
+				fmt.Printf("Child key created 🚸\nChild Address: %s\nParent Address: %s\n", kp.GetAddressString(), parentAddr)
+				if storeChild {
+					fmt.Println("Child key stored in the Keybase 🔐")
+				}
 
 				return nil
 			},

app/client/cli/query.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"io"
 	"net/http"
+	"os"
 
-	"github.com/pokt-network/pocket/logger"
 	"github.com/pokt-network/pocket/rpc"
 	"github.com/spf13/cobra"
 )
@@ -47,7 +47,7 @@ func queryCommands() []*cobra.Command {
 				statusCode := response.StatusCode
 				body, err := io.ReadAll(response.Body)
 				if err != nil {
-					logger.Global.Error().Err(err).Msg("Error reading response body")
+					fmt.Fprintf(os.Stderr, "❌ Error reading response body: %s\n", err.Error())
 					return err
 				}
 				if statusCode == http.StatusOK {

build/Dockerfile.debian.dev

@@ -13,7 +13,7 @@ ENV PATH $PATH:$HOME/.local/bin
 ### Install dependencies
 # Debian packages
 RUN apt-get update -qq && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential zip wget ca-certificates curl net-tools dnsutils && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential zip wget ca-certificates curl net-tools dnsutils kubernetes-client && \
     rm -rf /var/lib/apt/lists/* /var/cache/apt
 
 # protoc