feat(txtar): add loadpkg command (#1598)

gno.land/cmd/gnoland/testdata/addpkg.txtar

@@ -20,4 +20,4 @@ package bar
 
 func Render(path string) string {
  	return "hello from foo"
-}
+}

gno.land/cmd/gnoland/testdata/append.txtar

@@ -1,3 +1,5 @@
+loadpkg gno.land/p/demo/ufmt
+
 # start a new node
 gnoland start
 

gno.land/cmd/gnoland/testdata/grc20-registry.txtar

@@ -1,11 +1,10 @@
 # example for contract-contract interaction with ownership
+# add registry
+loadpkg gno.land/r/registry $WORK/registry
 
 ## start a new node
 gnoland start
 
-# add registry
-gnokey maketx addpkg -pkgdir $WORK/registry -pkgpath gno.land/r/registry -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1
-
 # we call Transfer with foo20, before it's registered
 gnokey maketx call -pkgpath gno.land/r/registry -func TransferByName -args 'foo20' -args 'g123456789' -args '42' -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1
 stdout 'not found'

gno.land/cmd/gnoland/testdata/issue-1167.txtar

@@ -1,4 +1,5 @@
 # Reproducible Test for https://github.com/gnolang/gno/issues/1167
+loadpkg gno.land/p/demo/avl
 
 gnoland start
 

gno.land/cmd/gnoland/testdata/run.txtar

@@ -1,9 +1,8 @@
+loadpkg gno.land/r/foobar/bar $WORK/bar
+
 ## start a new node
 gnoland start
 
-## add bar.gno package located in $WORK directory as gno.land/r/foobar/bar
-gnokey maketx addpkg -pkgdir $WORK/bar -pkgpath gno.land/r/foobar/bar -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1
-
 ## execute Render
 gnokey maketx run -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1 $WORK/script/script.gno
 

gno.land/cmd/gnoland/testdata/wugnot.txtar

@@ -1,3 +1,5 @@
+loadpkg gno.land/r/demo/wugnot
+
 gnoland start
 
 gnokey maketx call -pkgpath gno.land/r/demo/wugnot -func Render -gas-fee 1000000ugnot -gas-wanted 2000000 -args '' -broadcast -chainid=tendermint_test test1

gno.land/pkg/gnoland/genesis.go

@@ -103,27 +103,38 @@ func LoadPackagesFromDir(dir string, creator bft.Address, fee std.Fee, deposit s
 	nonDraftPkgs := sortedPkgs.GetNonDraftPkgs()
 	txs := []std.Tx{}
 	for _, pkg := range nonDraftPkgs {
-		// Open files in directory as MemPackage.
-		memPkg := gno.ReadMemPackage(pkg.Dir, pkg.Name)
-		if err := memPkg.Validate(); err != nil {
-			return nil, fmt.Errorf("invalid package: %w", err)
-		}
-
-		// Create transaction
-		tx := std.Tx{
-			Fee: fee,
-			Msgs: []std.Msg{
-				vmm.MsgAddPackage{
-					Creator: creator,
-					Package: memPkg,
-					Deposit: deposit,
-				},
-			},
+		tx, err := LoadPackage(pkg, creator, fee, deposit)
+		if err != nil {
+			return nil, fmt.Errorf("unable to load package %q: %w", pkg.Dir, err)
 		}
 
-		tx.Signatures = make([]std.Signature, len(tx.GetSigners()))
 		txs = append(txs, tx)
 	}
 
 	return txs, nil
 }
+
+// LoadPackage loads a single package into a `std.Tx`
+func LoadPackage(pkg gnomod.Pkg, creator bft.Address, fee std.Fee, deposit std.Coins) (std.Tx, error) {
+	var tx std.Tx
+
+	// Open files in directory as MemPackage.
+	memPkg := gno.ReadMemPackage(pkg.Dir, pkg.Name)
+	err := memPkg.Validate()
+	if err != nil {
+		return tx, fmt.Errorf("invalid package: %w", err)
+	}
+
+	// Create transaction
+	tx.Fee = fee
+	tx.Msgs = []std.Msg{
+		vmm.MsgAddPackage{
+			Creator: creator,
+			Package: memPkg,
+			Deposit: deposit,
+		},
+	}
+	tx.Signatures = make([]std.Signature, len(tx.GetSigners()))
+
+	return tx, nil
+}

gno.land/pkg/integration/doc.go

@@ -18,8 +18,26 @@
 //     communicate with the gnoland node.
 //
 // 3. `adduser`:
+//   - Must be run before `gnoland start`.
 //   - Creates a new user in the default keybase directory.
+//
+// 4. `loadpkg`:
 //   - Must be run before `gnoland start`.
+//   - Loads a specific package from the example folder or from the working ($WORK) directory.
+//   - Can be used to load a single package or all packages within a directory.
+//   - If the target package has a `gno.mod`, all its dependencies (and their respective
+//     dependencies) will also be loaded.
+//   - The command takes either one or two arguments. The first argument is the name of the package(s),
+//     and the second (optional) argument is the path to the package(s).
+//     Examples:
+//     -- # Load a package from the example packages directory:
+//     -- loadpkg gno.land/p/demo/ufmt
+//     -- # Load a package `./bar` from the current testscript's working directory with the name `gno.land/r/foobar/bar`:
+//     -- loadpkg gno.land/r/foobar/bar $WORK/bar
+//   - If the path is not prefixed with the working directory, it is assumed to be relative to the
+//     examples directory.
+//   - It's important to note that the load order is significant when using multiple `loadpkg`
+//     command; packages should be loaded in the order they are dependent upon.
 //
 // Logging:
 //

gno.land/cmd/gnoland/testdata/import.txtar → gno.land/pkg/integration/testdata/import.txtar

@@ -1,11 +1,10 @@
 # test that the example packages directory is loaded and usable.
+loadpkg gno.land/p/demo/ufmt
+loadpkg $WORK
 
 ## start a new node
 gnoland start
 
-gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/importtest -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1
-stdout OK!
-
 ## execute Render
 gnokey maketx call -pkgpath gno.land/r/importtest -func Render -gas-fee 1000000ugnot -gas-wanted 2000000 -args '' -broadcast -chainid=tendermint_test test1
 stdout '("92054" string)'

gno.land/pkg/integration/testdata/loadpkg_example.txtar

@@ -0,0 +1,28 @@
+# load a package from the example packages directory.
+loadpkg gno.land/p/demo/ufmt
+
+## start a new node
+gnoland start
+
+gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/importtest -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1
+stdout OK!
+
+## execute Render
+gnokey maketx call -pkgpath gno.land/r/importtest -func Render -gas-fee 1000000ugnot -gas-wanted 2000000 -args '' -broadcast -chainid=tendermint_test test1
+stdout '("92054" string)'
+stdout OK!
+
+-- gno.mod --
+module gno.land/r/importtest
+
+-- import.gno --
+package importtest
+
+import (
+	"gno.land/p/demo/ufmt"
+)
+
+func Render(_ string) string {
+ 	return ufmt.Sprintf("%d", 92054)
+}
+

gno.land/pkg/integration/testdata/loadpkg_example_and_work.txtar

@@ -0,0 +1,23 @@
+# load a package from the example packages directory.
+loadpkg gno.land/p/demo/ufmt
+loadpkg gno.land/r/importtest $WORK
+
+## start a new node
+gnoland start
+
+## execute Render
+gnokey maketx call -pkgpath gno.land/r/importtest -func Render -gas-fee 1000000ugnot -gas-wanted 2000000 -args '' -broadcast -chainid=tendermint_test test1
+stdout '("92054" string)'
+stdout OK!
+
+-- import.gno --
+package importtest
+
+import (
+	"gno.land/p/demo/ufmt"
+)
+
+func Render(_ string) string {
+ 	return ufmt.Sprintf("%d", 92054)
+}
+

gno.land/pkg/integration/testdata/loadpkg_work.txtar

@@ -0,0 +1,29 @@
+loadpkg gno.land/r/foobar/bar $WORK/bar
+
+## start a new node
+gnoland start
+
+## execute Render
+gnokey maketx run -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1 $WORK/script/script.gno
+
+## compare render
+stdout 'main: --- hello from foo ---'
+stdout 'OK!'
+stdout 'GAS WANTED: 200000'
+stdout 'GAS USED: '
+
+-- bar/bar.gno --
+package bar
+
+func Render(path string) string {
+ 	return "hello from foo"
+}
+
+-- script/script.gno --
+package main
+
+import "gno.land/r/foobar/bar"
+
+func main() {
+	println("main: ---", bar.Render(""), "---")
+}