Update Mesh's Pocket-Core to RC-0.11.1

.github/workflows/build-images.yaml

@@ -6,10 +6,10 @@ name: Build and push images
 on:
   workflow_dispatch:
   push:
-    branches: [staging]
+    branches: [geo-mesh]
     tags: ['*']
   pull_request:
-    branches: [staging]
+    branches: [geo-mesh]
 
 jobs:
   build-images:
@@ -27,20 +27,19 @@ jobs:
           DOCKER_METADATA_PR_HEAD_SHA: "true"
         with:
           images: |
-            ghcr.io/pokt-network/pocket-v0
+            poktscan/pocket-core
           tags: |
             type=schedule
             type=ref,event=tag
             type=ref,event=branch
             type=ref,event=pr
             type=sha
             type=sha,format=long
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
+      - name: Login to Dockerhub
+        uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push Docker image
         uses: docker/build-push-action@v3
         with:

.github/workflows/entrypoint.sh

@@ -1,20 +1,20 @@
 #!/usr/bin/expect
 
+# Command to run
+set command $argv
+set timeout -1
+
 # Send `pocket stop` when interrupted to prevent corruption
 proc graceful_exit {} {
     send_user "Gracefully exiting Pocket...\n"
     spawn sh -c "pocket stop"
 }
 
-trap graceful_exit {SIGINT SIGTERM}
-
-# Command to run
-set command $argv
-set timeout -1
+proc graceful_mesh_exit {pid} {
+    send_user "Gracefully exiting Pocket...\n"
+    exec kill -SIGTERM $pid
+}
 
-# Create work dir
-spawn sh -c "mkdir -p /home/app/.pocket/config"
-expect eof
 
 # Pull variables from env if set
 set genesis ""
@@ -26,6 +26,12 @@ catch {set chains $env(POCKET_CORE_CHAINS)}
 set config ""
 catch {set config $env(POCKET_CORE_CONFIG)}
 
+set core_key ""
+catch {set core_key $env(POCKET_CORE_KEY)}
+
+set core_passphrase ""
+catch {set core_passphrase $env(POCKET_CORE_PASSPHRASE)}
+
 # Create dynamic config files
 if {$genesis != ""} {
     set genesis_file [open /home/app/.pocket/config/genesis.json w]
@@ -46,26 +52,36 @@ if {$config != ""} {
     send_user "CONFIG loaded from env\n"
 }
 
-# If key isn't passed in, start the node
-if { $env(POCKET_CORE_KEY) eq "" }  {
+# if not --keybase=false
+# e.g. "pocket start --keybase=false --mainnet --datadir=/home/app/.pocket/"
+if {[regexp -nocase "keybase=false" $command]} {
+	spawn sh -c "$command"
+} elseif { $core_key eq "" }  {
+	  # If key isn't passed in, start the node
     log_user 0
     spawn sh -c "$command"
-    send -- "$env(POCKET_CORE_PASSPHRASE)\n"
+    send -- "$core_passphrase\n"
     log_user 1
 } else {
-# If key is passed in, load it into the local accounts
+    # If key is passed in, load it into the local accounts
     log_user 0
-    spawn pocket accounts import-raw $env(POCKET_CORE_KEY)
+    spawn pocket accounts import-raw $core_key
     sleep 1
-    send -- "$env(POCKET_CORE_PASSPHRASE)\n"
+    send -- "$core_passphrase\n"
     expect eof
     spawn sh -c "pocket accounts set-validator `pocket accounts list | cut -d' ' -f2- `"
     sleep 1
-    send -- "$env(POCKET_CORE_PASSPHRASE)\n"
+    send -- "$core_passphrase\n"
     expect eof
     log_user 1
     spawn sh -c "$command"
 }
 
+set pid [exp_pid]
+if {![regexp -nocase "start-mesh" $command]} {
+  trap graceful_exit {SIGINT SIGTERM}
+} else {
+  trap "graceful_mesh_exit $pid" {SIGINT SIGTERM}
+}
 expect eof
 exit

README.md

@@ -44,7 +44,7 @@ The Pocket Core application will allow anyone to spin up a Pocket Network full n
 - [Charts \& Analytics](#charts--analytics)
 - [Running the tests](#running-the-tests)
 - [Contributing](#contributing)
-- [MainNet Seeds](#mainnet-seeds)
+- [Seeds (MainNet \& TestNet)](#seeds-mainnet--testnet)
 - [Docker Image](#docker-image)
 - [Support \& Contact](#support--contact)
   - [GPokT](#gpokt)
@@ -131,9 +131,11 @@ To run the Pocket Core unit tests, `go test -short -v -p 1 ./...`
 
 Please read [CONTRIBUTING.md](CONTRIBUTING.md) for details on contributions and the process of submitting pull requests.
 
-## MainNet Seeds
+## Seeds (MainNet & TestNet)
 
-MainNet seeds are being maintained by [NodeFleet](https://nodefleet.org/) and more details can be found at [docs.pokt.network/node/seeds/](https://docs.pokt.network/node/seeds/).
+Seeds are maintained by [NodeFleet](https://nodefleet.org/).
+
+You can find all the details at [pokt-network/pocket-seeds](https://github.com/pokt-network/pocket-seeds).
 
 ## Docker Image
 

app/app.go

@@ -27,7 +27,7 @@ import (
 )
 
 const (
-	AppVersion = "BETA-0.11.1"
+	AppVersion = "RC-0.11.1"
 )
 
 // NewPocketCoreApp is a constructor function for PocketCoreApp

app/cmd/cli/root.go

@@ -61,7 +61,9 @@ func init() {
 	startCmd.Flags().BoolVar(&profileApp, "profileApp", false, "expose cpu & memory profiling")
 	startCmd.Flags().BoolVar(&useCache, "useCache", false, "use cache")
 	startCmd.Flags().BoolVar(&forceSetValidatorsLean, "forceSetValidators", false, "reads your lean_pocket_user_key_file (lean_nodes_keys.json) and updates your last signed state/validator files before starting your node")
+	meshCmd.Flags().BoolVar(&simulateRelay, "simulateRelay", false, "would you like to be able to test your relays")
 	rootCmd.AddCommand(startCmd)
+	rootCmd.AddCommand(meshCmd)
 	rootCmd.AddCommand(resetCmd)
 	rootCmd.AddCommand(version)
 	rootCmd.AddCommand(stopCmd)
@@ -96,7 +98,7 @@ func start(cmd *cobra.Command, args []string) {
 		genesisType = app.TestnetGenesisType
 	}
 	tmNode := app.InitApp(datadir, tmNode, persistentPeers, seeds, remoteCLIURL, keybase, genesisType, useCache, forceSetValidatorsLean)
-	go rpc.StartRPC(app.GlobalConfig.PocketConfig.RPCPort, app.GlobalConfig.PocketConfig.RPCTimeout, simulateRelay, profileApp, allBlockTxs, app.GlobalConfig.PocketConfig.ChainsHotReload)
+	go rpc.StartRPC(app.GlobalConfig.PocketConfig.RPCPort, app.GlobalConfig.PocketConfig.RPCTimeout, simulateRelay, profileApp, allBlockTxs, app.GlobalConfig.PocketConfig.ChainsHotReload, app.GlobalConfig.PocketConfig.MeshNode)
 	// trap kill signals (2,3,15,9)
 	signalChannel := make(chan os.Signal, 1)
 	signal.Notify(signalChannel,
@@ -120,6 +122,26 @@ func start(cmd *cobra.Command, args []string) {
 	}()
 }
 
+var meshCmd = &cobra.Command{
+	Use:   "start-mesh",
+	Short: "starts pocket-mesh daemon",
+	Long:  `Starts the Pocket mesh node, picks up the config from the assigned <datadir>`,
+	Run: func(cmd *cobra.Command, args []string) {
+		t := time.Unix(1666886400, 0) // Wed, October 27, 2022 12:00:00 PM GMT-04:00
+		sleepDuration := time.Until(t)
+		if time.Now().Before(t) {
+			fmt.Println("Sleeping for ", sleepDuration)
+			time.Sleep(sleepDuration)
+		}
+		startMesh(cmd, args)
+	},
+}
+
+func startMesh(cmd *cobra.Command, args []string) {
+	app.InitMeshConfig(datadir)
+	rpc.StartMeshRPC(simulateRelay)
+}
+
 // resetCmd represents the reset command
 var resetCmd = &cobra.Command{
 	Use:   "reset",

app/cmd/rpc/client.go

@@ -65,7 +65,7 @@ func Relay(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 		WriteJSONResponseWithCode(w, string(j), r.URL.Path, r.Host, 400)
 		return
 	}
-	res, dispatch, err := app.PCA.HandleRelay(relay)
+	res, dispatch, err := app.PCA.HandleRelay(relay, false)
 	if err != nil {
 		response := RPCRelayErrorResponse{
 			Error:    err,
@@ -191,13 +191,13 @@ func SendRawTx(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	WriteJSONResponse(w, string(j), r.URL.Path, r.Host)
 }
 
-type simRelayParams struct {
+type SimRelayParams struct {
 	RelayNetworkID string        `json:"relay_network_id"` // RelayNetworkID
 	Payload        types.Payload `json:"payload"`          // the data payload of the request
 }
 
 func SimRequest(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
-	var params = simRelayParams{}
+	var params = SimRelayParams{}
 	if err := PopModel(w, r, ps, &params); err != nil {
 		WriteErrorResponse(w, 400, err.Error())
 		return