feat: add valset injection through r/sys/validators

contribs/gnodev/pkg/dev/node.go

@@ -527,7 +527,7 @@ func buildNode(logger *slog.Logger, emitter emitter.Emitter, cfg *gnoland.InMemo
 func newNodeConfig(tmc *tmcfg.Config, chainid string, appstate gnoland.GnoGenesisState) *gnoland.InMemoryNodeConfig {
 	// Create Mocked Identity
 	pv := gnoland.NewMockedPrivValidator()
-	genesis := gnoland.NewDefaultGenesisConfig(pv.GetPubKey(), chainid)
+	genesis := gnoland.NewDefaultGenesisConfig(chainid)
 	genesis.AppState = appstate
 
 	// Add self as validator

examples/gno.land/r/gov/dao/prop1_filetest.gno

@@ -91,7 +91,7 @@ func main() {
 // Status: succeeded
 // Author: g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm
 // --
-// Valset changes to apply:
-// - g12345678 (10)
-// - g000000000 (10)
-// - g000000000 (0)
+// Valset changes:
+// - #123: g12345678 (10)
+// - #123: g000000000 (10)
+// - #123: g000000000 (0)

examples/gno.land/r/sys/validators/gno.mod

@@ -1,6 +1,7 @@
 module gno.land/r/sys/validators
 
 require (
+	gno.land/p/demo/ufmt v0.0.0-latest
 	gno.land/p/gov/proposal v0.0.0-latest
 	gno.land/p/nt/poa v0.0.0-latest
 	gno.land/p/sys/validators v0.0.0-latest

examples/gno.land/r/sys/validators/gnosdk.gno

@@ -1,16 +1,24 @@
 package validators
 
-import "gno.land/p/sys/validators"
+import (
+	"sort"
 
-// getChanges returns the validator changes stored on the realm.
+	"gno.land/p/sys/validators"
+)
+
+// GetChanges returns the validator changes stored on the realm, since the given block number.
 // This function is unexported and intended to be called by gno.land through the GnoSDK
-func getChanges() []validators.Validator {
-	// Construct the changes
-	valsetChanges := make([]validators.Validator, len(changes))
-	copy(valsetChanges, changes)
+func GetChanges(from int64) []validators.Validator {
+	// Perform binary search to find the starting index
+	idx := sort.Search(len(changes), func(i int) bool {
+		return changes[i].blockNum >= from
+	})
 
-	// Reset the changes set
-	changes = changes[:0]
+	// Construct the changes from the found index
+	valsetChanges := make([]validators.Validator, 0)
+	for i := idx; i < len(changes); i++ {
+		valsetChanges = append(valsetChanges, changes[i].validator)
+	}
 
 	return valsetChanges
 }

examples/gno.land/r/sys/validators/init.gno

@@ -2,13 +2,12 @@ package validators
 
 import (
 	"gno.land/p/nt/poa"
-	"gno.land/p/sys/validators"
 )
 
 func init() {
 	// The default valset protocol is PoA
 	vp = poa.NewPoA()
 
 	// No changes to apply initially
-	changes = make([]validators.Validator, 0)
+	changes = make([]change, 0)
 }

examples/gno.land/r/sys/validators/validators.gno

@@ -2,16 +2,22 @@ package validators
 
 import (
 	"std"
-	"strconv"
 
+	"gno.land/p/demo/ufmt"
 	"gno.land/p/sys/validators"
 )
 
 var (
 	vp      validators.ValsetProtocol // p is the underlying validator set protocol
-	changes []validators.Validator    // changes are the set changes that happened between scrapes
+	changes []change                  // changes holds any valset changes
 )
 
+// change represents a single valset change, tied to a specific block number
+type change struct {
+	blockNum  int64                // the block number associated with the valset change
+	validator validators.Validator // the validator update
+}
+
 // addValidator adds a new validator to the validator set.
 // If the validator is already present, the method errors out
 func addValidator(validator validators.Validator) {
@@ -21,7 +27,10 @@ func addValidator(validator validators.Validator) {
 	}
 
 	// Validator added, note the change
-	changes = append(changes, val)
+	changes = append(changes, change{
+		blockNum:  std.GetHeight(),
+		validator: val,
+	})
 
 	// Emit the validator set change
 	std.Emit(validators.ValidatorAddedEvent)
@@ -36,10 +45,13 @@ func removeValidator(address std.Address) {
 	}
 
 	// Validator removed, note the change
-	changes = append(changes, validators.Validator{
-		Address:     val.Address,
-		PubKey:      val.PubKey,
-		VotingPower: 0, // nullified the voting power indicates removal
+	changes = append(changes, change{
+		blockNum: std.GetHeight(),
+		validator: validators.Validator{
+			Address:     val.Address,
+			PubKey:      val.PubKey,
+			VotingPower: 0, // nullified the voting power indicates removal
+		},
 	})
 
 	// Emit the validator set change
@@ -51,9 +63,14 @@ func Render(_ string) string {
 		return "No valset changes to apply."
 	}
 
-	output := "Valset changes to apply:\n"
+	output := "Valset changes:\n"
 	for _, change := range changes {
-		output += "- " + string(change.Address) + " (" + strconv.FormatUint(change.VotingPower, 10) + ")\n"
+		output += ufmt.Sprintf(
+			"- #%d: %s (%d)\n",
+			change.blockNum,
+			string(change.validator.Address),
+			change.validator.VotingPower,
+		)
 	}
 
 	return output

gno.land/cmd/gnoland/start.go

@@ -23,6 +23,7 @@ import (
 	bft "github.com/gnolang/gno/tm2/pkg/bft/types"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
+	"github.com/gnolang/gno/tm2/pkg/events"
 	osm "github.com/gnolang/gno/tm2/pkg/os"
 	"github.com/gnolang/gno/tm2/pkg/telemetry"
 	"go.uber.org/zap"
@@ -234,8 +235,11 @@ func execStart(ctx context.Context, c *startCfg, io commands.IO) error {
 		return fmt.Errorf("unable to initialize telemetry, %w", err)
 	}
 
+	// Create a top-level shared event switch
+	evsw := events.NewEventSwitch()
+
 	// Create application and node
-	cfg.LocalApp, err = gnoland.NewApp(nodeDir, c.skipFailingGenesisTxs, logger, c.genesisMaxVMCycles)
+	cfg.LocalApp, err = gnoland.NewApp(nodeDir, c.skipFailingGenesisTxs, evsw, logger)
 	if err != nil {
 		return fmt.Errorf("unable to create the Gnoland app, %w", err)
 	}
@@ -246,7 +250,7 @@ func execStart(ctx context.Context, c *startCfg, io commands.IO) error {
 	}
 
 	// Create a default node, with the given setup
-	gnoNode, err := node.DefaultNewNode(cfg, genesisPath, logger)
+	gnoNode, err := node.DefaultNewNode(cfg, genesisPath, evsw, logger)
 	if err != nil {
 		return fmt.Errorf("unable to create the Gnoland node, %w", err)
 	}