Leanpocket V0

.gitignore

@@ -13,12 +13,19 @@
 
 # Ignore vendor folder: every environment needs to build their own based on package management.
 vendor/
+pocket
 
 # Log files should be ignored
 *.log
 logs/Logs
 *.idea/
 
+main
+
+
+app/cmd/rpc/data/pocket_evidence.db
+app/cmd/rpc/data/session.db
+
 tests/unit/*.log
 tests/unit/*.json
 

CONTRIBUTING.md

@@ -6,7 +6,7 @@ This Contribution Guide aims to guide contributors through the process of propos
 
 #### Communicating proposals
 
-The first step towards contribution is to effectively propose your change by opening up a new issue using the **Contribution Proposal** issue template. Communicating your proposal effectively will be of the upmost importance throughout the lifecycle of your contribution, so make sure your description is clear and concise.
+The first step towards contribution is to effectively propose your change by opening up a new issue using the **Contribution Proposal** issue template. Communicating your proposal effectively will be of the upmost importance throughout the lifecycle of your contribution, so make sure your description is clear and concise. Feel free to also use the `#core-research` channel in our [Official Discord server](https://bit.ly/POKTARCADEdscrd) to ask any questions regarding the proposal you want to make to the repository.
 
 #### Consensus-breaking changes
 
@@ -65,7 +65,6 @@ And you will build a `pocket` binary in the root folder which can now be run.
 
 - Code must adhere to the official Go formatting guidelines (i.e. uses [gofmt](https://golang.org/cmd/gofmt)).
 - Code must be documented adhering to the official Go commentary guidelines.
-- Pull requests need to be based on and opened against the `staging` branch.
 
 ### Quality Assurance
 
@@ -81,13 +80,31 @@ The Regression Testing suite of Pocket Core is a series of scenarios that need t
 
 ### The Pull Request Process
 
-#### Submitting a PR
+#### Submitting a PR to a Release Window
 
-Open a PR against the `staging` branch in the official repository: `https://github.com/pokt-network/pocket-core`. To learn how to open a PR in Github please follow this [guide](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork).
+Every PR will target an upcoming Release Window for the Pocket Core repository, these windows will be listed as Github Projects in the repository and will be listed in the repository [Projects Page](https://github.com/pokt-network/pocket-core/projects?type=classic). Every project in this page will represent a Release Window which contains the following:
+
+- A PR Cut-out date by which PR's must be approved to be included in the release.
+- An integration branch to submit PR's to for this release.
+
+Open a PR against the **integration branch** in the official repository: `https://github.com/pokt-network/pocket-core`. To learn how to open a PR in Github please follow this [guide](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork).
 
 #### The PR review process
 
-Every Pull Request will require at least 1 reviewer from the Core team. Every proposal is different in scope and complexity, so the following points will increase the likelihood of you submitting a successful Pull Request:
+Every Pull Request will require at least 2 reviewers from the Core team. The reviews will be done in a 2 phase approach:
+
+1. A functional PR review where the code will be extensively reviewed by a Core Team member and feedback will be provided until the code quality meets the functional requirements of the intended Proposal.
+2. An Integration approval, every friday the Core Team will be evaluating PR's ready to be included, and selecting those into QA builds that will be tested as part of the Regression testing performed before each released is launched.
+
+#### The PR Success Criteria
+
+The Core Team will be requiring the following before merging a Pull Request:
+
+- It has a linked Contribution Proposal issue specifying the functionality implemented in the PR.
+- There is an associated pull request to the [Pocket Core Functional Tests repository](https://github.com/pokt-network/pocket-core-func-tests) with the appropiate QA scenarios associated with the functionality or fix contained in the PR.
+- Enough evidence (either automated or manual) of testing of these new scenarios included in the PR. This evidence must be presented in the format template contained [here](https://github.com/pokt-network/pocket-core/tree/staging/doc/qa/regression).
+
+Every proposal is different in scope and complexity, so the following points will increase the likelihood of you submitting a successful Pull Request:
 
 - Your proposal issue is clear, concise and informative.
 - Your PR is within the scope of the proposal.

app/cmd/cli/accounts.go

@@ -40,6 +40,8 @@ func init() {
 	accountsCmd.AddCommand(signNexMS)
 	accountsCmd.AddCommand(buildMultisig)
 	accountsCmd.AddCommand(unsafeDeleteCmd)
+	accountsCmd.AddCommand(getNodesLean)
+	accountsCmd.AddCommand(setValidatorsLean)
 }
 
 // accountsCmd represents the accounts namespace command
@@ -104,6 +106,29 @@ Will prompt the user for a passphrase to encrypt the generated keypair.`,
 	},
 }
 
+var getNodesLean = &cobra.Command{
+	Use:   "get-validators",
+	Short: "Retrieves all nodes set by set-validators",
+	Long:  `Retrieves all nodes set by set-validators`,
+	Run: func(cmd *cobra.Command, args []string) {
+		app.InitConfig(datadir, tmNode, persistentPeers, seeds, remoteCLIURL)
+		config := app.GlobalConfig
+		if !config.PocketConfig.LeanPocket {
+			fmt.Println("Lean pocket is not enabled")
+			return
+		}
+
+		keys, err := app.LoadFilePVKeysFromFileLean(config.PocketConfig.DataDir + app.FS + config.TendermintConfig.PrivValidatorKey)
+		if err != nil {
+			fmt.Println("Failed to read set validators")
+			return
+		}
+		for _, value := range keys {
+			fmt.Printf("Node Address: %s\n", strings.ToLower(value.Address.String()))
+		}
+	},
+}
+
 var getValidator = &cobra.Command{
 	Use:   "get-validator",
 	Short: "Retrieves the main validator from the priv_val file",
@@ -120,6 +145,33 @@ var getValidator = &cobra.Command{
 	},
 }
 
+var setValidatorsLean = &cobra.Command{
+	Use:   `set-validators <path to keyfile>`,
+	Short: "Sets the main validator accounts for tendermint; NOTE: keyfile should be a json string array of private keys",
+	Long:  `Sets the main validator accounts that will be used across all Tendermint functions; NOTE: keyfile should be a json string array of private keys`,
+	Args:  cobra.MinimumNArgs(1),
+	Run: func(cmd *cobra.Command, args []string) {
+		app.InitConfig(datadir, tmNode, persistentPeers, seeds, remoteCLIURL)
+
+		if !app.GlobalConfig.PocketConfig.LeanPocket {
+			fmt.Println("Lean pocket is not enabled")
+			return
+		}
+
+		keys, err := app.ReadValidatorPrivateKeyFileLean(args[0])
+		if err != nil {
+			fmt.Println("Failed to read validators json file ", err)
+			os.Exit(1)
+		}
+		err = app.SetValidatorsFilesLean(keys)
+		if err != nil {
+			fmt.Println("Failed to set validators", err)
+			os.Exit(1)
+			return
+		}
+	},
+}
+
 var setValidator = &cobra.Command{
 	Use:   "set-validator <address>",
 	Short: "Sets the main validator account for tendermint",

app/cmd/cli/queryUtil.go

@@ -42,7 +42,8 @@ var (
 	GetAllParamsPath,
 	GetParamPath,
 	GetStopPath,
-	GetQueryChains string
+	GetQueryChains,
+	QueryAccounts string
 )
 
 func init() {
@@ -63,6 +64,8 @@ func init() {
 			GetHeightPath = route.Path
 		case "QueryAccount":
 			GetAccountPath = route.Path
+		case "QueryAccounts":
+			GetAccountPath = route.Path
 		case "QueryApp":
 			GetAppPath = route.Path
 		case "QueryTX":

app/cmd/cli/root.go

@@ -14,18 +14,20 @@ import (
 )
 
 var (
-	datadir         string
-	tmNode          string
-	remoteCLIURL    string
-	persistentPeers string
-	seeds           string
-	simulateRelay   bool
-	keybase         bool
-	mainnet         bool
-	allBlockTxs     bool
-	testnet         bool
-	profileApp      bool
-	useCache        bool
+	datadir                string
+	tmNode                 string
+	remoteCLIURL           string
+	persistentPeers        string
+	seeds                  string
+	simulateRelay          bool
+	keybase                bool
+	mainnet                bool
+	allBlockTxs            bool
+	testnet                bool
+	profileApp             bool
+	useCache               bool
+	forceSetValidatorsLean bool
+	useLean                bool
 )
 
 var CLIVersion = app.AppVersion
@@ -58,6 +60,7 @@ func init() {
 	startCmd.Flags().BoolVar(&testnet, "testnet", false, "run with testnet genesis")
 	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")
 	rootCmd.AddCommand(startCmd)
 	rootCmd.AddCommand(resetCmd)
 	rootCmd.AddCommand(version)
@@ -92,7 +95,7 @@ func start(cmd *cobra.Command, args []string) {
 	if testnet {
 		genesisType = app.TestnetGenesisType
 	}
-	tmNode := app.InitApp(datadir, tmNode, persistentPeers, seeds, remoteCLIURL, keybase, genesisType, useCache)
+	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)
 	// trap kill signals (2,3,15,9)
 	signalChannel := make(chan os.Signal, 1)

app/cmd/rpc/common_test.go

@@ -78,8 +78,7 @@ func NewInMemoryTendermintNode(t *testing.T, genesisState []byte) (tendermintNod
 		if err != nil {
 			panic(err)
 		}
-		pocketTypes.ClearEvidence()
-		pocketTypes.ClearSessionCache()
+		pocketTypes.CleanPocketNodes()
 		inMemKB = nil
 		//err = os.RemoveAll(tendermintNode.Config().DBPath)
 		if err != nil {
@@ -166,11 +165,12 @@ func inMemTendermintNode(genesisState []byte) (*node.Node, keys.Keybase) {
 	}
 	db := dbm.NewMemDB()
 	nodeKey := p2p.NodeKey{PrivKey: pk}
-	privVal := privval.GenFilePV(c.TmConfig.PrivValidatorKey, c.TmConfig.PrivValidatorState)
-	privVal.Key.PrivKey = pk
-	privVal.Key.PubKey = pk.PubKey()
-	privVal.Key.Address = pk.PubKey().Address()
-	pocketTypes.InitPVKeyFile(privVal.Key)
+	privVal := privval.GenFilePVLean(c.TmConfig.PrivValidatorKey, c.TmConfig.PrivValidatorState)
+	privVal.Keys[0].PrivKey = pk
+	privVal.Keys[0].PubKey = pk.PubKey()
+	privVal.Keys[0].Address = pk.PubKey().Address()
+	pocketTypes.CleanPocketNodes()
+	pocketTypes.AddPocketNodeByFilePVKey(privVal.Keys[0], c.Logger)
 
 	creator := func(logger log.Logger, db dbm.DB, _ io.Writer) *app.PocketCoreApp {
 		m := map[string]pocketTypes.HostedBlockchain{sdk.PlaceholderHash: {

app/cmd/rpc/query.go

@@ -4,8 +4,10 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	types4 "github.com/pokt-network/pocket-core/app/cmd/rpc/types"
 	sdk "github.com/pokt-network/pocket-core/types"
 	types2 "github.com/pokt-network/pocket-core/x/auth/types"
+	types3 "github.com/pokt-network/pocket-core/x/pocketcore/types"
 	abci "github.com/tendermint/tendermint/abci/types"
 	"github.com/tendermint/tendermint/libs/bytes"
 	"github.com/tendermint/tendermint/types"
@@ -24,6 +26,31 @@ func Version(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 	WriteResponse(w, APIVersion, r.URL.Path, r.Host)
 }
 
+func LocalNodes(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+	value := r.URL.Query().Get("authtoken")
+	if value != app.AuthToken.Value {
+		WriteErrorResponse(w, 401, "wrong authtoken "+value)
+		return
+	}
+	var localNodes []types4.PublicPocketNode
+	for _, node := range types3.GlobalPocketNodes {
+		if node == nil {
+			continue
+		}
+		localNodes = append(localNodes, types4.PublicPocketNode{Address: node.GetAddress().String()})
+	}
+	j, err := json.Marshal(localNodes)
+	if err != nil {
+		WriteErrorResponse(w, 400, err.Error())
+		return
+	}
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	_, err = w.Write(j)
+	if err != nil {
+		WriteErrorResponse(w, 400, err.Error())
+	}
+}
+
 type HeightParams struct {
 	Height int64 `json:"height"`
 }
@@ -364,6 +391,28 @@ func Account(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	WriteJSONResponse(w, string(s), r.URL.Path, r.Host)
 }
 
+func Accounts(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	var params = PaginatedHeightParams{Height: 0}
+	if err := PopModel(w, r, ps, &params); err != nil {
+		WriteErrorResponse(w, 400, err.Error())
+		return
+	}
+	if params.Height == 0 {
+		params.Height = app.PCA.BaseApp.LastBlockHeight()
+	}
+	res, err := app.PCA.QueryAccounts(params.Height, params.Page, params.PerPage)
+	if err != nil {
+		WriteErrorResponse(w, 400, err.Error())
+		return
+	}
+	s, err := json.Marshal(res)
+	if err != nil {
+		WriteErrorResponse(w, 400, err.Error())
+		return
+	}
+	WriteJSONResponse(w, string(s), r.URL.Path, r.Host)
+}
+
 func Nodes(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	var params = HeightAndValidatorOptsParams{}
 	if err := PopModel(w, r, ps, &params); err != nil {

app/cmd/rpc/rpc_test.go

@@ -311,6 +311,28 @@ func TestRPC_QueryAccount(t *testing.T) {
 	stopCli()
 }
 
+func TestRPC_QueryAccounts(t *testing.T) {
+	codec.UpgradeHeight = 7000
+	_, _, cleanup := NewInMemoryTendermintNode(t, oneValTwoNodeGenesisState())
+	_, stopCli, evtChan := subscribeTo(t, tmTypes.EventNewBlock)
+	<-evtChan
+	kb := getInMemoryKeybase()
+	cb, err := kb.GetCoinbase()
+	assert.Nil(t, err)
+	var params = PaginatedHeightParams{
+		Height: 0,
+	}
+	address := cb.GetAddress().String()
+	q := newQueryRequest("accounts", newBody(params))
+	rec := httptest.NewRecorder()
+	Accounts(rec, q, httprouter.Params{})
+	body := rec.Body.String()
+	assert.True(t, strings.Contains(body, address))
+
+	cleanup()
+	stopCli()
+}
+
 func TestRPC_QueryNodes(t *testing.T) {
 	codec.UpgradeHeight = 7000
 	_, _, cleanup := NewInMemoryTendermintNode(t, oneValTwoNodeGenesisState())

app/cmd/rpc/server.go

@@ -96,6 +96,7 @@ func GetRoutes() Routes {
 		Route{Name: "Stop", Method: "POST", Path: "/v1/private/stop", HandlerFunc: Stop},
 		Route{Name: "ServiceCORS", Method: "OPTIONS", Path: "/v1/client/relay", HandlerFunc: Relay},
 		Route{Name: "QueryAccount", Method: "POST", Path: "/v1/query/account", HandlerFunc: Account},
+		Route{Name: "QueryAccounts", Method: "POST", Path: "/v1/query/accounts", HandlerFunc: Accounts},
 		Route{Name: "QueryAccountTxs", Method: "POST", Path: "/v1/query/accounttxs", HandlerFunc: AccountTxs},
 		Route{Name: "QueryACL", Method: "POST", Path: "/v1/query/acl", HandlerFunc: ACL},
 		Route{Name: "QueryAllParams", Method: "POST", Path: "/v1/query/allparams", HandlerFunc: AllParams},
@@ -120,6 +121,7 @@ func GetRoutes() Routes {
 		Route{Name: "QueryTX", Method: "POST", Path: "/v1/query/tx", HandlerFunc: Tx},
 		Route{Name: "QueryUpgrade", Method: "POST", Path: "/v1/query/upgrade", HandlerFunc: Upgrade},
 		Route{Name: "QuerySigningInfo", Method: "POST", Path: "/v1/query/signinginfo", HandlerFunc: SigningInfo},
+		Route{Name: "LocalNodes", Method: "POST", Path: "/v1/private/nodes", HandlerFunc: LocalNodes},
 		Route{Name: "QueryChains", Method: "POST", Path: "/v1/private/chains", HandlerFunc: Chains},
 	}
 	return routes

app/cmd/rpc/types/public_pocket_node.go

@@ -0,0 +1,5 @@
+package types
+
+type PublicPocketNode struct {
+	Address string `json:"address"`
+}