allow gnodev to load txs

contribs/gnodev/cmd/gnodev/main.go

@@ -49,6 +49,7 @@ type devCfg struct {
 	root            string
 	premineAccounts varPremineAccounts
 	balancesFile    string
+	txsFile         string
 
 	// Node Configuration
 	minimal    bool
@@ -136,6 +137,13 @@ func (c *devCfg) RegisterFlags(fs *flag.FlagSet) {
 		"load the provided balance file (refer to the documentation for format)",
 	)
 
+	fs.StringVar(
+		&c.txsFile,
+		"tx-file",
+		defaultDevOptions.txsFile,
+		"load the provided transactions file (refer to the documentation for format)",
+	)
+
 	fs.StringVar(
 		&c.deployKey,
 		"deploy-key",
@@ -233,10 +241,16 @@ func execDev(cfg *devCfg, args []string, io commands.IO) (err error) {
 	}
 	logger.Debug("balances loaded", "list", balances.List())
 
+	// Load transactions.
+	txs, err := loadTxs(cfg.txsFile)
+	if err != nil {
+		return fmt.Errorf("unable to load transactions: %w", err)
+	}
+
 	// Setup Dev Node
 	// XXX: find a good way to export or display node logs
 	nodeLogger := logger.WithGroup(NodeLogName)
-	devNode, err := setupDevNode(ctx, nodeLogger, cfg, emitterServer, balances, pkgpaths)
+	devNode, err := setupDevNode(ctx, nodeLogger, cfg, emitterServer, balances, pkgpaths, txs)
 	if err != nil {
 		return err
 	}

contribs/gnodev/cmd/gnodev/setup_node.go

@@ -10,6 +10,7 @@ import (
 	gnodev "github.com/gnolang/gno/contribs/gnodev/pkg/dev"
 	"github.com/gnolang/gno/contribs/gnodev/pkg/emitter"
 	"github.com/gnolang/gno/gno.land/pkg/gnoland"
+	"github.com/gnolang/gno/tm2/pkg/std"
 )
 
 // setupDevNode initializes and returns a new DevNode.
@@ -20,20 +21,27 @@ func setupDevNode(
 	remitter emitter.Emitter,
 	balances gnoland.Balances,
 	pkgspath []gnodev.PackagePath,
+	txs []std.Tx,
 ) (*gnodev.Node, error) {
-	config := setupDevNodeConfig(cfg, balances, pkgspath)
+	config := setupDevNodeConfig(cfg, balances, pkgspath, txs)
 	return gnodev.NewDevNode(ctx, logger, remitter, config)
 }
 
 // setupDevNodeConfig creates and returns a new dev.NodeConfig.
-func setupDevNodeConfig(cfg *devCfg, balances gnoland.Balances, pkgspath []gnodev.PackagePath) *gnodev.NodeConfig {
+func setupDevNodeConfig(
+	cfg *devCfg,
+	balances gnoland.Balances,
+	pkgspath []gnodev.PackagePath,
+	txs []std.Tx,
+) *gnodev.NodeConfig {
 	config := gnodev.DefaultNodeConfig(cfg.root)
 	config.BalancesList = balances.List()
 	config.PackagesPathList = pkgspath
 	config.TMConfig.RPC.ListenAddress = resolveUnixOrTCPAddr(cfg.nodeRPCListenerAddr)
 	config.NoReplay = cfg.noReplay
 	config.MaxGasPerBlock = cfg.maxGas
 	config.ChainID = cfg.chainId
+	config.Txs = txs
 
 	// other listeners
 	config.TMConfig.P2P.ListenAddress = defaultDevOptions.nodeP2PListenerAddr

contribs/gnodev/cmd/gnodev/txs.go

@@ -0,0 +1,23 @@
+package main
+
+import (
+	"context"
+	"fmt"
+	"os"
+
+	"github.com/gnolang/gno/tm2/pkg/std"
+)
+
+func loadTxs(txFile string) ([]std.Tx, error) {
+	if txFile == "" {
+		return nil, nil
+	}
+
+	file, loadErr := os.Open(txFile)
+	if loadErr != nil {
+		return nil, fmt.Errorf("unable to open tx file %s: %w", txFile, loadErr)
+	}
+	defer file.Close()
+
+	return std.LoadTxs(context.Background(), file)
+}

contribs/gnodev/pkg/dev/node.go

@@ -37,6 +37,7 @@ type NodeConfig struct {
 	NoReplay              bool
 	MaxGasPerBlock        int64
 	ChainID               string
+	Txs                   []std.Tx
 }
 
 func DefaultNodeConfig(rootdir string) *NodeConfig {
@@ -107,6 +108,8 @@ func NewDevNode(ctx context.Context, logger *slog.Logger, emitter emitter.Emitte
 		Txs:      pkgsTxs,
 	}
 
+	genesis.Txs = append(genesis.Txs, cfg.Txs...)
+
 	if err := devnode.rebuildNode(ctx, genesis); err != nil {
 		return nil, fmt.Errorf("unable to initialize the node: %w", err)
 	}

gno.land/cmd/gnoland/genesis_txs_add.go

@@ -1,15 +1,12 @@
 package main
 
 import (
-	"bufio"
 	"context"
 	"errors"
 	"fmt"
-	"io"
 	"os"
 
 	"github.com/gnolang/gno/gno.land/pkg/gnoland"
-	"github.com/gnolang/gno/tm2/pkg/amino"
 	"github.com/gnolang/gno/tm2/pkg/bft/types"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/std"
@@ -18,7 +15,6 @@ import (
 var (
 	errInvalidTxsFile     = errors.New("unable to open transactions file")
 	errNoTxsFileSpecified = errors.New("no txs file specified")
-	errTxsParsingAborted  = errors.New("transaction parsing aborted")
 )
 
 // newTxsAddCmd creates the genesis txs add subcommand
@@ -61,7 +57,7 @@ func execTxsAdd(
 			return fmt.Errorf("%w, %w", errInvalidTxsFile, loadErr)
 		}
 
-		txs, err := getTransactionsFromFile(ctx, file)
+		txs, err := std.LoadTxs(ctx, file)
 		if err != nil {
 			return fmt.Errorf("unable to read file, %w", err)
 		}
@@ -102,40 +98,3 @@ func execTxsAdd(
 
 	return nil
 }
-
-// getTransactionsFromFile fetches the transactions from the
-// specified reader
-func getTransactionsFromFile(ctx context.Context, reader io.Reader) ([]std.Tx, error) {
-	txs := make([]std.Tx, 0)
-
-	scanner := bufio.NewScanner(reader)
-
-	for scanner.Scan() {
-		select {
-		case <-ctx.Done():
-			return nil, errTxsParsingAborted
-		default:
-			// Parse the amino JSON
-			var tx std.Tx
-
-			if err := amino.UnmarshalJSON(scanner.Bytes(), &tx); err != nil {
-				return nil, fmt.Errorf(
-					"unable to unmarshal amino JSON, %w",
-					err,
-				)
-			}
-
-			txs = append(txs, tx)
-		}
-	}
-
-	// Check for scanning errors
-	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf(
-			"error encountered while reading file, %w",
-			err,
-		)
-	}
-
-	return txs, nil
-}

tm2/pkg/std/tx.go

@@ -1,14 +1,22 @@
 package std
 
 import (
+	"bufio"
+	"context"
 	"fmt"
+	"io"
 
 	"github.com/gnolang/gno/tm2/pkg/amino"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	"github.com/gnolang/gno/tm2/pkg/crypto/multisig"
+	"github.com/gnolang/gno/tm2/pkg/errors"
 )
 
-var maxGasWanted = int64((1 << 60) - 1) // something smaller than math.MaxInt64
+var (
+	maxGasWanted = int64((1 << 60) - 1) // something smaller than math.MaxInt64
+
+	ErrTxsLoadingAborted = errors.New("transaction loading aborted")
+)
 
 // Tx is a standard way to wrap a Msg with Fee and Signatures.
 // NOTE: the first signature is the fee payer (Signatures must not be nil).
@@ -136,3 +144,36 @@ func (fee Fee) Bytes() []byte {
 	}
 	return bz
 }
+
+func LoadTxs(ctx context.Context, reader io.Reader) ([]Tx, error) {
+	var txs []Tx
+	scanner := bufio.NewScanner(reader)
+
+	for scanner.Scan() {
+		select {
+		case <-ctx.Done():
+			return nil, ErrTxsLoadingAborted
+		default:
+			// Parse the amino JSON
+			var tx Tx
+			if err := amino.UnmarshalJSON(scanner.Bytes(), &tx); err != nil {
+				return nil, fmt.Errorf(
+					"unable to unmarshal amino JSON, %w",
+					err,
+				)
+			}
+
+			txs = append(txs, tx)
+		}
+	}
+
+	// Check for scanning errors
+	if err := scanner.Err(); err != nil {
+		return nil, fmt.Errorf(
+			"error encountered while reading file, %w",
+			err,
+		)
+	}
+
+	return txs, nil
+}