feat: Embed genesis files.

gno.land/cmd/gnoland/start.go

@@ -5,10 +5,13 @@ import (
 	"errors"
 	"flag"
 	"fmt"
+	"log/slog"
 	"path/filepath"
 	"strings"
 	"time"
 
+	"go.uber.org/zap/zapcore"
+
 	"github.com/gnolang/gno/gno.land/pkg/gnoland"
 	"github.com/gnolang/gno/gno.land/pkg/log"
 	"github.com/gnolang/gno/gnovm/pkg/gnoenv"
@@ -25,7 +28,6 @@ import (
 	osm "github.com/gnolang/gno/tm2/pkg/os"
 	"github.com/gnolang/gno/tm2/pkg/std"
 	"github.com/gnolang/gno/tm2/pkg/telemetry"
-	"go.uber.org/zap/zapcore"
 )
 
 var startGraphic = strings.ReplaceAll(`
@@ -75,8 +77,6 @@ func newStartCmd(io commands.IO) *commands.Command {
 
 func (c *startCfg) RegisterFlags(fs *flag.FlagSet) {
 	gnoroot := gnoenv.RootDir()
-	defaultGenesisBalancesFile := filepath.Join(gnoroot, "gno.land", "genesis", "genesis_balances.txt")
-	defaultGenesisTxsFile := filepath.Join(gnoroot, "gno.land", "genesis", "genesis_txs.jsonl")
 
 	fs.BoolVar(
 		&c.skipFailingGenesisTxs,
@@ -95,14 +95,14 @@ func (c *startCfg) RegisterFlags(fs *flag.FlagSet) {
 	fs.StringVar(
 		&c.genesisBalancesFile,
 		"genesis-balances-file",
-		defaultGenesisBalancesFile,
+		"",
 		"initial distribution file",
 	)
 
 	fs.StringVar(
 		&c.genesisTxsFile,
 		"genesis-txs-file",
-		defaultGenesisTxsFile,
+		"",
 		"initial txs to replay",
 	)
 
@@ -241,12 +241,18 @@ func execStart(c *startCfg, io commands.IO) error {
 	// Initialize the log format
 	logFormat := log.Format(strings.ToLower(c.logFormat))
 
+	if logFormat != log.JSONFormat {
+		io.Println(startGraphic)
+	}
+
 	// Initialize the zap logger
 	zapLogger := log.GetZapLoggerFn(logFormat)(io.Out(), logLevel)
 
 	// Wrap the zap logger
 	logger := log.ZapLoggerToSlog(zapLogger)
 
+	slog.SetDefault(logger)
+
 	// Initialize telemetry
 	telemetry.Init(*cfg.Telemetry)
 
@@ -281,17 +287,13 @@ func execStart(c *startCfg, io commands.IO) error {
 	}
 	cfg.LocalApp = gnoApp
 
-	if logFormat != log.JSONFormat {
-		io.Println(startGraphic)
-	}
-
 	gnoNode, err := node.DefaultNewNode(cfg, genesisPath, logger)
 	if err != nil {
 		return fmt.Errorf("error in creating node: %w", err)
 	}
 
 	if c.skipStart {
-		io.ErrPrintln("'--skip-start' is set. Exiting.")
+		io.ErrPrintln("'-skip-start' is set. Exiting.")
 		return nil
 	}
 

gno.land/genesis/embed.go

@@ -0,0 +1,9 @@
+package genesis
+
+import _ "embed"
+
+//go:embed genesis_balances.txt
+var DefaultGenesisBalances []byte
+
+//go:embed genesis_txs.jsonl
+var DefaultGenesisTxs []byte

gno.land/pkg/gnoland/genesis.go

@@ -3,8 +3,10 @@ package gnoland
 import (
 	"errors"
 	"fmt"
+	"log/slog"
 	"strings"
 
+	"github.com/gnolang/gno/gno.land/genesis"
 	vmm "github.com/gnolang/gno/gno.land/pkg/sdk/vm"
 	gno "github.com/gnolang/gno/gnovm/pkg/gnolang"
 	"github.com/gnolang/gno/gnovm/pkg/gnomod"
@@ -17,8 +19,20 @@ import (
 
 // LoadGenesisBalancesFile loads genesis balances from the provided file path.
 func LoadGenesisBalancesFile(path string) ([]Balance, error) {
+	var content []byte
+	var err error
+	if path == "" {
+		slog.Warn("genesis file not specified, using embedded defaults")
+		content = genesis.DefaultGenesisBalances
+	} else {
+		content, err = osm.ReadFile(path)
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
 	// each balance is in the form: g1xxxxxxxxxxxxxxxx=100000ugnot
-	content := osm.MustReadFile(path)
 	lines := strings.Split(string(content), "\n")
 
 	balances := make([]Balance, 0, len(lines))
@@ -61,9 +75,22 @@ func LoadGenesisBalancesFile(path string) ([]Balance, error) {
 // LoadGenesisTxsFile loads genesis transactions from the provided file path.
 // XXX: Improve the way we generate and load this file
 func LoadGenesisTxsFile(path string, chainID string, genesisRemote string) ([]std.Tx, error) {
-	txs := []std.Tx{}
-	txsBz := osm.MustReadFile(path)
+	var txsBz []byte
+	var err error
+	if path == "" {
+		slog.Warn("genesis transactions file not specified, using embedded defaults")
+		txsBz = genesis.DefaultGenesisTxs
+	} else {
+		txsBz, err = osm.ReadFile(path)
+	}
+
+	if err != nil {
+		return nil, err
+	}
+
 	txsLines := strings.Split(string(txsBz), "\n")
+
+	txs := []std.Tx{}
 	for _, txLine := range txsLines {
 		if txLine == "" {
 			continue // Skip empty line.

gno.land/pkg/gnoland/genesis_test.go

@@ -0,0 +1,25 @@
+package gnoland
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestBalances(t *testing.T) {
+	b, err := LoadGenesisBalancesFile("")
+	require.NoError(t, err)
+	require.Len(t, b, 56)
+
+	_, err = LoadGenesisBalancesFile("DOES_NOT_EXIST")
+	require.Error(t, err)
+}
+
+func TestTransactions(t *testing.T) {
+	b, err := LoadGenesisTxsFile("", "id", "remote")
+	require.NoError(t, err)
+	require.Len(t, b, 17)
+
+	_, err = LoadGenesisTxsFile("DOES_NOT_EXIST", "id", "remote")
+	require.Error(t, err)
+}

gno.land/pkg/integration/testing_node.go

@@ -5,14 +5,15 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/stretchr/testify/require"
+
 	"github.com/gnolang/gno/gno.land/pkg/gnoland"
 	abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types"
 	tmcfg "github.com/gnolang/gno/tm2/pkg/bft/config"
 	"github.com/gnolang/gno/tm2/pkg/bft/node"
 	bft "github.com/gnolang/gno/tm2/pkg/bft/types"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	"github.com/gnolang/gno/tm2/pkg/std"
-	"github.com/stretchr/testify/require"
 )
 
 const (
@@ -123,9 +124,7 @@ func LoadDefaultPackages(t TestingTS, creator bft.Address, gnoroot string) []std
 
 // LoadDefaultGenesisBalanceFile loads the default genesis balance file for testing.
 func LoadDefaultGenesisBalanceFile(t TestingTS, gnoroot string) []gnoland.Balance {
-	balanceFile := filepath.Join(gnoroot, "gno.land", "genesis", "genesis_balances.txt")
-
-	genesisBalances, err := gnoland.LoadGenesisBalancesFile(balanceFile)
+	genesisBalances, err := gnoland.LoadGenesisBalancesFile("")
 	require.NoError(t, err)
 
 	return genesisBalances