address comments

app/cmd/cli/node.go

@@ -118,8 +118,10 @@ Will prompt the user for the <fromAddr> account passphrase.`,
 	},
 }
 
+// stakeNewCmd is an upgraded version of `nodesCmd` that captures newer
+// on-chain functionality in a cleaner way
 var stakeNewCmd = &cobra.Command{
-	Use:   `stakeNew <OperatorPublicKey> <OutputAddress> <SignerAddress> <Stake> <ChainIDs> <ServiceURL> <Delegators> <NetworkID> <Fee> [Memo]`,
+	Use:   "stakeNew <OperatorPublicKey> <OutputAddress> <SignerAddress> <Stake> <ChainIDs> <ServiceURL> <Delegators> <NetworkID> <Fee> [Memo]",
 	Short: "Stake a node in the network",
 	Long: `Stake a node in the network, promoting it to a servicer or a validator.
 
@@ -134,7 +136,20 @@ The command takes the following parameters.
   Delegators        Delegator addresses to share rewards
   NetworkID         Network ID to submit a transaction to e.g. mainnet or testnet
   Fee               Transaction fee in uPOKT
-  Memo              Text to include in the transaction.  No functional effect.
+  Memo              Optional. Text to include in the transaction.  No functional effect.
+
+Example:
+$ pocket nodes stakeNew \
+    e237efc54a93ed61689959e9afa0d4bd49fa11c0b946c35e6bebaccb052ce3fc \
+    fe818527cd743866c1db6bdeb18731d04891df78 \
+    1164b9c95638fc201f35eca2af4c35fe0a81b6cf \
+    8000000000000 \
+    DEAD,BEEF \
+    https://x.com:443 \
+    '{"1000000000000000000000000000000000000000":1,"2000000000000000000000000000000000000000":2}' \
+    mainnet \
+    10000 \
+    "new stake with delegators!"
 `,
 	Args: cobra.MinimumNArgs(9),
 	Run: func(cmd *cobra.Command, args []string) {

app/cmd/rpc/rpc_test.go

@@ -2,11 +2,11 @@ package rpc
 
 import (
 	"bytes"
+	"encoding/base64"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"math/rand"
 	"net/http"
 	"net/http/httptest"
@@ -1471,7 +1471,7 @@ func newQueryRequest(query string, body io.Reader) *http.Request {
 func getResponse(rec *httptest.ResponseRecorder) string {
 	res := rec.Result()
 	defer res.Body.Close()
-	b, err := ioutil.ReadAll(res.Body)
+	b, err := io.ReadAll(res.Body)
 	if err != nil {
 		fmt.Println("could not read response: " + err.Error())
 		return ""
@@ -1491,7 +1491,7 @@ func getResponse(rec *httptest.ResponseRecorder) string {
 func getJSONResponse(rec *httptest.ResponseRecorder) []byte {
 	res := rec.Result()
 	defer res.Body.Close()
-	b, err := ioutil.ReadAll(res.Body)
+	b, err := io.ReadAll(res.Body)
 	if err != nil {
 		panic("could not read response: " + err.Error())
 	}
@@ -1635,8 +1635,52 @@ func NewValidChallengeProof(t *testing.T, privateKeys []crypto.PrivateKey) (chal
 	return proof
 }
 
+func generateTestTx() (string, error) {
+	app.Codec()
+	privKey, err := crypto.NewPrivateKey("5d86a93dee1ef5f950ccfaafd09d9c812f790c3b2c07945501f68b339118aca0e237efc54a93ed61689959e9afa0d4bd49fa11c0b946c35e6bebaccb052ce3fc")
+	if err != nil {
+		return "", err
+	}
+	outputAddr, err := types.AddressFromHex("fe818527cd743866c1db6bdeb18731d04891df78")
+	if err != nil {
+		return "", err
+	}
+	msg := &types2.MsgStake{
+		PublicKey:  privKey.PublicKey(),
+		Chains:     []string{"DEAD", "BEEF"},
+		Value:      types.NewInt(8000000000000),
+		ServiceUrl: "https://x.com:443",
+		Output:     outputAddr,
+		Delegators: map[string]uint32{
+			"1000000000000000000000000000000000000000": 1,
+			"2000000000000000000000000000000000000000": 2,
+		},
+	}
+	builder := authTypes.NewTxBuilder(
+		auth.DefaultTxEncoder(app.Codec()),
+		auth.DefaultTxDecoder(app.Codec()),
+		"mainnet",
+		"memo",
+		types.NewCoins(types.NewCoin(types.DefaultStakeDenom, types.NewInt(10000))),
+	)
+	entropy := int64(42)
+	txBytes, err := builder.BuildAndSignWithEntropyForTesting(privKey, msg, entropy)
+	if err != nil {
+		return "", err
+	}
+	return base64.StdEncoding.EncodeToString(txBytes), nil
+}
+
+// TestMsgStake_Marshaling_BackwardCompatibility verifies MsgStake
+// has backward compatibility before/after the Delegators upgrade,
+// meaning this test passes without the Delegators patch.
 func TestMsgStake_Marshaling_BackwardCompatibility(t *testing.T) {
-	// Tx 3640B15041998FE800C2F61FC033CBF295D9282B5E7045A16F754ED9D8A54AFF in Mainnet
+	// StakeTxBeforeDelegatorsUpgrade is a transaction in Pocket Mainnet.
+	// You can get this with the following command.
+	//
+	// $ curl -s -X POST -H "Content-Type: application/json" \
+	//     -d '{"hash":"3640B15041998FE800C2F61FC033CBF295D9282B5E7045A16F754ED9D8A54AFF"}' \
+	//     <Pocket Mainnet Endpoint>/v1/query/tx  | jq '.tx'
 	StakeTxBeforeDelegatorsUpgrade :=
 		"/wIK4QEKFy94Lm5vZGVzLk1zZ1Byb3RvU3Rha2U4EsUBCiBzfNC5BqUX6Aow9768" +
 			"QTKyYiRdhqrGqeqTIMVSckAe8RIEMDAwMxIEMDAwNBIEMDAwNRIEMDAwORIEMDAy" +
@@ -1647,16 +1691,19 @@ func TestMsgStake_Marshaling_BackwardCompatibility(t *testing.T) {
 			"w68+vl2z9nC+zYz3u4J7Oe3ntBOVP+cYHO5+lLuc8nH0OaG6pujXEPo19F5qW4Zh" +
 			"NBEgtChJp+QhYVgIIiBDdXN0b2RpYWwgdG8gTm9uLUN1c3RvZGlhbCBhZ2FpbijS" +
 			"CQ=="
-
+	// StakeTxBeforeDelegatorsUpgrade is a transaction with the Delegators field.
+	// You can generate this transaction by uncommenting the following two lines.
+	// StakeTxAfterDelegatorsUpgrade, err := generateTestTx()
+	// assert.Nil(t, err)
 	StakeTxAfterDelegatorsUpgrade :=
-		"5wIK3gEKFy94Lm5vZGVzLk1zZ1Byb3RvU3Rha2U4EsIBCiDiN+/FSpPtYWiZWemv" +
-			"oNS9SfoRwLlGw15r66zLBSzj/BIEMDAwMRIEQkVFRhoNODAwMDAwMDAwMDAwMCIR" +
+		"3wIK3gEKFy94Lm5vZGVzLk1zZ1Byb3RvU3Rha2U4EsIBCiDiN+/FSpPtYWiZWemv" +
+			"oNS9SfoRwLlGw15r66zLBSzj/BIEREVBRBIEQkVFRhoNODAwMDAwMDAwMDAwMCIR" +
 			"aHR0cHM6Ly94LmNvbTo0NDMqFP6BhSfNdDhmwdtr3rGHMdBIkd94MiwKKDIwMDAw" +
 			"MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAQAjIsCigxMDAwMDAw" +
 			"MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwEAESDgoFdXBva3QSBTEw" +
-			"MDAwGmQKICMRMWDdwHGZU6kMUecdxLF6UgHw0L1Vcc8lzz8Ynz0ZEkA+A9PANYsP" +
-			"+z7TduPuM7iM6jRILBJsdz0OMiGFrpGgJAsw7YrzXloJE4hyI921HoQ/bRFdw3/N" +
-			"Nea33C6VZqUGIgRtZW1vKKCQ7dyJ3LatFw=="
+			"MDAwGmQKIOI378VKk+1haJlZ6a+g1L1J+hHAuUbDXmvrrMsFLOP8EkDKz4AcELVB" +
+			"8Lyzi0+MVD/KXDIlTqjNLlBvFzOen7kZpR1it6gD79SLJXfWhB0qeu7Bux2VWQyf" +
+			"2wBBckGpIesBIgRtZW1vKCo="
 
 	originalNCUST := codec.UpgradeFeatureMap[codec.NonCustodialUpdateKey]
 	t.Cleanup(func() {
@@ -1670,13 +1717,15 @@ func TestMsgStake_Marshaling_BackwardCompatibility(t *testing.T) {
 	// Initialize app.cdc
 	app.Codec()
 
+	// Validate that an old stake messages DOES NOT have delegators
 	stdTx, err := app.UnmarshalTxStr(StakeTxBeforeDelegatorsUpgrade, heightForProto)
 	assert.Nil(t, err)
 	msgStake, ok := stdTx.Msg.(*types2.MsgStake)
 	assert.True(t, ok)
 	assert.Nil(t, msgStake.Delegators)
 	assert.Nil(t, msgStake.ValidateBasic())
 
+	// Validate that an old stake messages DOES have delegators
 	stdTx, err = app.UnmarshalTxStr(StakeTxAfterDelegatorsUpgrade, heightForProto)
 	assert.Nil(t, err)
 	msgStake, ok = stdTx.Msg.(*types2.MsgStake)

go.mod

@@ -1,6 +1,6 @@
 module github.com/pokt-network/pocket-core
 
-go 1.18
+go 1.21
 
 replace github.com/tendermint/tendermint => github.com/pokt-network/tendermint v0.32.11-0.20230426215212-59310158d3e9
 

go.sum

@@ -38,6 +38,7 @@ github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQ
 github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/VividCortex/gohistogram v1.0.0 h1:6+hBz+qvs0JOrrNhhmR7lFxo5sINxBCGXrdtl/UvroE=
+github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
 github.com/Workiva/go-datastructures v1.0.52 h1:PLSK6pwn8mYdaoaCZEMsXBpBotr4HHn9abU0yMQt0NI=
 github.com/Workiva/go-datastructures v1.0.52/go.mod h1:Z+F2Rca0qCsVYDS8z7bAGm8f3UkzuWYS/oBZz5a7VVA=
 github.com/aead/siphash v1.0.1/go.mod h1:Nywa3cDsYNNK3gaciGTWPwHt0wlpNV15vwmswBAUSII=
@@ -60,6 +61,7 @@ github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13P
 github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA=
 github.com/btcsuite/btcutil v0.0.0-20190425235716-9e5f4b9a998d/go.mod h1:+5NJ2+qvTyV9exUAL/rxXi3DcLg2Ts+ymUAY5y4NvMg=
 github.com/btcsuite/btcutil v1.0.2 h1:9iZ1Terx9fMIOtq1VrwdqfsATL9MC2l8ZrUY6YZ2uts=
+github.com/btcsuite/btcutil v1.0.2/go.mod h1:j9HUFwoQRsZL3V4n+qG+CUnEGHOarIxfC3Le2Yhbcts=
 github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd/go.mod h1:HHNXQzUsZCxOoE+CPiyCTO6x34Zs86zZUiwtpXoGdtg=
 github.com/btcsuite/goleveldb v0.0.0-20160330041536-7834afc9e8cd/go.mod h1:F+uVaaLLH7j4eDXPRvw78tMflu7Ie2bzYOH4Y8rRKBY=
 github.com/btcsuite/snappy-go v0.0.0-20151229074030-0bdef8d06723/go.mod h1:8woku9dyThutzjeg+3xrA5iCpBRH8XEEg3lh6TiUghc=
@@ -112,6 +114,7 @@ github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870 h1:E2s37DuLxFhQD
 github.com/facebookgo/subset v0.0.0-20150612182917-8dac2c3c4870/go.mod h1:5tD+neXqOorC30/tWg0LCSkrqj/AR6gu8yY8/fpw1q0=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw=
+github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=

proto/x/nodes/msg.proto

@@ -23,6 +23,7 @@ message MsgProtoStake {
 		(gogoproto.jsontag) = "output_address,omitempty",
 		(gogoproto.moretags) = "yaml:\"output_address\""
 	];
+	// Mapping from delegated-to addresses to a percentage of rewards.
 	map<string, uint32> Delegators = 6 [
 		(gogoproto.jsontag) = "delegators,omitempty",
 		(gogoproto.moretags) = "yaml:\"delegators\""

proto/x/nodes/nodes.proto

@@ -23,22 +23,6 @@ message ProtoValidator {
 	map<string, uint32> Delegators = 10 [(gogoproto.jsontag) = "delegators,omitempty", (gogoproto.moretags) = "yaml:\"delegators\""];
 }
 
-message ProtoValidatorV8 {
-	option (gogoproto.equal) = true;
-	option (gogoproto.goproto_stringer) = true;
-	option (gogoproto.goproto_getters) = false;
-
-	bytes Address = 1 [(gogoproto.casttype) = "github.com/pokt-network/pocket-core/types.Address", (gogoproto.moretags) = "yaml:\"address\"", (gogoproto.jsontag) = "address"];
-	bytes PublicKey = 2 [(gogoproto.moretags) = "yaml:\"public_key\"", (gogoproto.jsontag) = "public_key"];
-	bool jailed = 3 [(gogoproto.jsontag) = "jailed"];
-	int32 status = 4 [(gogoproto.jsontag) = "status"];
-	repeated string Chains = 5 [(gogoproto.jsontag) = "chains"];
-	string ServiceURL = 6 [(gogoproto.jsontag) = "service_url"];
-	string StakedTokens = 7 [(gogoproto.customtype) = "github.com/pokt-network/pocket-core/types.BigInt", (gogoproto.jsontag) = "tokens", (gogoproto.nullable) = false];
-	google.protobuf.Timestamp UnstakingCompletionTime = 8 [(gogoproto.nullable) = false, (gogoproto.stdtime) = true, (gogoproto.jsontag) = "unstaking_time", (gogoproto.moretags) = "yaml:\"unstaking_time\""];
-	bytes OutputAddress = 9 [(gogoproto.casttype) = "github.com/pokt-network/pocket-core/types.Address", (gogoproto.jsontag) = "output_address,omitempty", (gogoproto.moretags) = "yaml:\"output_address\""];
-}
-
 message LegacyProtoValidator {
 	option (gogoproto.equal) = true;
 	option (gogoproto.goproto_stringer) = true;

types/config.go

@@ -19,38 +19,38 @@ type SDKConfig struct {
 }
 
 type PocketConfig struct {
-	DataDir                         string `json:"data_dir"`
-	GenesisName                     string `json:"genesis_file"`
-	ChainsName                      string `json:"chains_name"`
-	EvidenceDBName                  string `json:"evidence_db_name"`
-	TendermintURI                   string `json:"tendermint_uri"`
-	KeybaseName                     string `json:"keybase_name"`
-	RPCPort                         string `json:"rpc_port"`
-	ClientBlockSyncAllowance        int    `json:"client_block_sync_allowance"`
-	ClientSessionSyncAllowance      int64  `json:"client_session_sync_allowance"`
-	MaxEvidenceCacheEntires         int    `json:"max_evidence_cache_entries"`
-	MaxSessionCacheEntries          int    `json:"max_session_cache_entries"`
-	JSONSortRelayResponses          bool   `json:"json_sort_relay_responses"`
-	RemoteCLIURL                    string `json:"remote_cli_url"`
-	UserAgent                       string `json:"user_agent"`
-	ValidatorCacheSize              int64  `json:"validator_cache_size"`
-	ApplicationCacheSize            int64  `json:"application_cache_size"`
-	RPCTimeout                      int64  `json:"rpc_timeout"`
-	PrometheusAddr                  string `json:"pocket_prometheus_port"`
-	PrometheusMaxOpenfiles          int    `json:"prometheus_max_open_files"`
-	MaxClaimAgeForProofRetry        int    `json:"max_claim_age_for_proof_retry"`
-	ProofPrevalidation              bool   `json:"proof_prevalidation"`
-	CtxCacheSize                    int    `json:"ctx_cache_size"`
-	ABCILogging                     bool   `json:"abci_logging"`
-	RelayErrors                     bool   `json:"show_relay_errors"`
-	DisableTxEvents                 bool   `json:"disable_tx_events"`
-	Cache                           bool   `json:"-"`
-	IavlCacheSize                   int64  `json:"iavl_cache_size"`
-	ChainsHotReload                 bool   `json:"chains_hot_reload"`
-	GenerateTokenOnStart            bool   `json:"generate_token_on_start"`
-	LeanPocket                      bool   `json:"lean_pocket"`
-	LeanPocketUserKeyFileName       string `json:"lean_pocket_user_key_file"`
-	NotClaimPossiblyNegativeRewards bool   `json:"not_claim_possibly_negative_rewards"`
+	DataDir                    string `json:"data_dir"`
+	GenesisName                string `json:"genesis_file"`
+	ChainsName                 string `json:"chains_name"`
+	EvidenceDBName             string `json:"evidence_db_name"`
+	TendermintURI              string `json:"tendermint_uri"`
+	KeybaseName                string `json:"keybase_name"`
+	RPCPort                    string `json:"rpc_port"`
+	ClientBlockSyncAllowance   int    `json:"client_block_sync_allowance"`
+	ClientSessionSyncAllowance int64  `json:"client_session_sync_allowance"`
+	MaxEvidenceCacheEntires    int    `json:"max_evidence_cache_entries"`
+	MaxSessionCacheEntries     int    `json:"max_session_cache_entries"`
+	JSONSortRelayResponses     bool   `json:"json_sort_relay_responses"`
+	RemoteCLIURL               string `json:"remote_cli_url"`
+	UserAgent                  string `json:"user_agent"`
+	ValidatorCacheSize         int64  `json:"validator_cache_size"`
+	ApplicationCacheSize       int64  `json:"application_cache_size"`
+	RPCTimeout                 int64  `json:"rpc_timeout"`
+	PrometheusAddr             string `json:"pocket_prometheus_port"`
+	PrometheusMaxOpenfiles     int    `json:"prometheus_max_open_files"`
+	MaxClaimAgeForProofRetry   int    `json:"max_claim_age_for_proof_retry"`
+	ProofPrevalidation         bool   `json:"proof_prevalidation"`
+	CtxCacheSize               int    `json:"ctx_cache_size"`
+	ABCILogging                bool   `json:"abci_logging"`
+	RelayErrors                bool   `json:"show_relay_errors"`
+	DisableTxEvents            bool   `json:"disable_tx_events"`
+	Cache                      bool   `json:"-"`
+	IavlCacheSize              int64  `json:"iavl_cache_size"`
+	ChainsHotReload            bool   `json:"chains_hot_reload"`
+	GenerateTokenOnStart       bool   `json:"generate_token_on_start"`
+	LeanPocket                 bool   `json:"lean_pocket"`
+	LeanPocketUserKeyFileName  string `json:"lean_pocket_user_key_file"`
+	PreventNegativeRewardClaim bool   `json:"prevent_negative_reward_claim"`
 }
 
 func (c PocketConfig) GetLeanPocketUserKeyFilePath() string {

x/auth/types/txbuilder.go

@@ -3,13 +3,12 @@ package types
 import (
 	"errors"
 	"fmt"
-	"github.com/tendermint/tendermint/libs/rand"
 	"strings"
 
 	"github.com/pokt-network/pocket-core/crypto"
-
 	crkeys "github.com/pokt-network/pocket-core/crypto/keys"
 	sdk "github.com/pokt-network/pocket-core/types"
+	"github.com/tendermint/tendermint/libs/rand"
 )
 
 // TxBuilder implements a transaction context created in SDK modules.
@@ -113,6 +112,32 @@ func (bldr TxBuilder) BuildAndSign(address sdk.Address, privateKey crypto.Privat
 	return bldr.txEncoder(NewTx(msg, bldr.fees, sig, bldr.memo, entropy), -1)
 }
 
+// BuildAndSignWithEntropyForTesting signs a given message with a given
+// private key and entropy.
+// This is for testing use only.  Use BuildAndSign for production use.
+func (bldr TxBuilder) BuildAndSignWithEntropyForTesting(
+	privateKey crypto.PrivateKey,
+	msg sdk.ProtoMsg,
+	entropy int64,
+) ([]byte, error) {
+	if bldr.chainID == "" {
+		return nil, errors.New("cant build and sign transaciton: the chainID is empty")
+	}
+	bytesToSign, err := StdSignBytes(bldr.chainID, entropy, bldr.fees, msg, bldr.memo)
+	if err != nil {
+		return nil, err
+	}
+	sigBytes, err := privateKey.Sign(bytesToSign)
+	if err != nil {
+		return nil, err
+	}
+	sig := StdSignature{
+		Signature: sigBytes,
+		PublicKey: privateKey.PublicKey(),
+	}
+	return bldr.txEncoder(NewTx(msg, bldr.fees, sig, bldr.memo, entropy), -1)
+}
+
 // BuildAndSignWithKeyBase builds a single message to be signed, and signs a transaction
 // with the built message given a address, passphrase, and a set of messages.
 func (bldr TxBuilder) BuildAndSignWithKeyBase(address sdk.Address, passphrase string, msg sdk.ProtoMsg, legacyCodec bool) ([]byte, error) {

x/nodes/handler.go

@@ -60,13 +60,19 @@ func handleStake(ctx sdk.Ctx, msg types.MsgStake, k keeper.Keeper, signer crypto
 		}
 	}
 
-	if !k.Cdc.IsAfterDelegatorUpgrade(ctx.BlockHeight()) &&
-		msg.Delegators != nil {
+	if k.Cdc.IsAfterDelegatorUpgrade(ctx.BlockHeight()) {
+		if err := msg.CheckDelegators(); err != nil {
+			return err.Result()
+		}
+	} else if msg.Delegators != nil {
+		// Ignore the delegators field before the upgrade
 		msg.Delegators = nil
 	}
 
 	validator := types.NewValidatorFromMsg(msg)
-	// StakedTokens is set through StakeValidator.  Resetting to 0 for now.
+	// We used to use NewValidator here to initialize the `validator`, and
+	// it does not set the field StakedTokens.  To keep the same behavior,
+	// we reset this field to 0.  StakedTokens is set through StakeValidator.
 	validator.StakedTokens = sdk.ZeroInt()
 	// check if they can stake
 	if err := k.ValidateValidatorStaking(ctx, validator, msg.Value, sdk.Address(signer.Address())); err != nil {

x/nodes/keeper/params.go

@@ -144,7 +144,7 @@ func (k Keeper) ServicerStakeFloorMultiplierExponent(ctx sdk.Ctx) (res sdk.BigDe
 	return
 }
 
-// Split rewards into node's cut and feeCollector's cut (= DAO + Proposer)
+// Split block rewards into the node's cut and the feeCollector's (DAO + Proposer) cut
 func (k Keeper) splitRewards(
 	ctx sdk.Ctx,
 	reward sdk.BigInt,
@@ -164,7 +164,7 @@ func (k Keeper) splitRewards(
 	return
 }
 
-// Split feeCollector's cut into DAO and Propower
+// Split feeCollector's cut into the DAO's cut and the Proposer's cut
 func (k Keeper) splitFeesCollected(
 	ctx sdk.Ctx,
 	feesCollected sdk.BigInt,
@@ -178,7 +178,7 @@ func (k Keeper) splitFeesCollected(
 	// dao cut calculation truncates int ex: 1.99uPOKT = 1uPOKT
 	daoCut = feesCollected.ToDec().Mul(daoAllocation).TruncateInt()
 
-	// proposer is whatever is left
+	// proposer gets whatever is left after the DAO's truncated rewards are taken out
 	proposerCut = feesCollected.Sub(daoCut)
 	return
 }