feat: transpile to Gno 0.9 (latest interrealm spec) with @cross

.github/golangci.yml

@@ -90,4 +90,4 @@ issues:
       linters:
         - errorlint # Disabled linting of error comparisons, because of lacking std lib support
     - path: gnovm/pkg/gnolang
-      text: "string `(cross|.no realm.|crossing)` has (\\d+) occurrences, make it a constant"
+      text: "string `(realm|cross|.no realm.|crossing)` has (\\d+) occurrences, make it a constant"

contribs/gnodev/cmd/gnodev/setup_loader.go

@@ -88,12 +88,11 @@ func setupPackagesResolver(logger *slog.Logger, cfg *AppConfig, dirs ...string)
 }
 
 func guessPathGnoMod(dir string) (path string, ok bool) {
-	modfile, err := gnomod.ParseAt(dir)
-	if err == nil {
-		return modfile.Module.Mod.Path, true
+	modfile, err := gnomod.ParseDir(dir)
+	if err != nil {
+		return "", false
 	}
-
-	return "", false
+	return modfile.Module.Mod.Path, true
 }
 
 var reInvalidChar = regexp.MustCompile(`[^\w_-]`)

contribs/gnodev/pkg/packages/package.go

@@ -1,11 +1,11 @@
 package packages
 
 import (
+	"errors"
 	"fmt"
 	"go/parser"
 	"go/token"
 	"os"
-	"path/filepath"
 
 	"github.com/gnolang/gno/gnovm/pkg/gnolang"
 	"github.com/gnolang/gno/gnovm/pkg/gnomod"
@@ -27,19 +27,19 @@ type Package struct {
 }
 
 func ReadPackageFromDir(fset *token.FileSet, path, dir string) (*Package, error) {
-	modpath := filepath.Join(dir, "gno.mod")
-	if _, err := os.Stat(modpath); err == nil {
-		draft, err := isDraftFile(modpath)
-		if err != nil {
-			return nil, err
-		}
-
-		// Skip draft package
-		// XXX: We could potentially do that in a middleware, but doing this
-		// here avoid to potentially parse broken files
-		if draft {
+	mod, err := gnomod.ParseDir(dir)
+	switch {
+	case err == nil:
+		if mod.Draft {
+			// Skip draft package
+			// XXX: We could potentially do that in a middleware, but doing this
+			// here avoid to potentially parse broken files
 			return nil, ErrResolverPackageSkip
 		}
+	case errors.Is(err, os.ErrNotExist), errors.Is(err, gnomod.ErrGnoModNotFound):
+		// gno.mod is not present, continue anyway
+	default:
+		return nil, err
 	}
 
 	mempkg, err := gnolang.ReadMemPackage(dir, path)
@@ -63,7 +63,7 @@ func ReadPackageFromDir(fset *token.FileSet, path, dir string) (*Package, error)
 }
 
 func validateMemPackage(fset *token.FileSet, mempkg *std.MemPackage) error {
-	if mempkg.IsEmpty() {
+	if isMemPackageEmpty(mempkg) {
 		return fmt.Errorf("empty package: %w", ErrResolverPackageSkip)
 	}
 
@@ -87,16 +87,16 @@ func validateMemPackage(fset *token.FileSet, mempkg *std.MemPackage) error {
 	return nil
 }
 
-func isDraftFile(modpath string) (bool, error) {
-	modfile, err := os.ReadFile(modpath)
-	if err != nil {
-		return false, fmt.Errorf("unable to read file %q: %w", modpath, err)
+func isMemPackageEmpty(mempkg *std.MemPackage) bool {
+	if mempkg.IsEmpty() {
+		return true
 	}
 
-	mod, err := gnomod.Parse(modpath, modfile)
-	if err != nil {
-		return false, fmt.Errorf("unable to parse `gno.mod`: %w", err)
+	for _, file := range mempkg.Files {
+		if isGnoFile(file.Name) || file.Name == "gno.mod" {
+			return false
+		}
 	}
 
-	return mod.Draft, nil
+	return true
 }

contribs/gnodev/pkg/packages/resolver.go

@@ -199,10 +199,6 @@ func PackageCheckerMiddleware(logger *slog.Logger) MiddlewareHandler {
 			return nil, err
 		}
 
-		if err := pkg.Validate(); err != nil {
-			return nil, fmt.Errorf("invalid package %q: %w", path, err)
-		}
-
 		// Post-process each file in the package.
 		for _, file := range pkg.Files {
 			fname := file.Name

examples/Makefile

@@ -44,6 +44,10 @@ test.fast:
 lint:
 	go run ../gnovm/cmd/gno lint -v .
 
+.PHONY: fix
+fix:
+	go run ../gnovm/cmd/gno fix -v .
+
 .PHONY: test.sync
 test.sync:
 	go run ../gnovm/cmd/gno test -v --update-golden-tests ./...

examples/gno.land/p/demo/grc/grc20/token_test.gno

@@ -95,9 +95,8 @@ func TestMintOverflow(t *testing.T) {
 
 func TestTransferFromAtomicity(t *testing.T) {
 	var (
-		owner     = testutils.TestAddress("owner")
-		spender   = testutils.TestAddress("spender")
-		recipient = testutils.TestAddress("recipient")
+		owner   = testutils.TestAddress("owner")
+		spender = testutils.TestAddress("spender")
 
 		invalidRecipient = std.Address("")
 	)

examples/gno.land/p/moul/collection/collection_test.gno

@@ -131,7 +131,7 @@ func TestUpdates(t *testing.T) {
 	p2 := &Person{Name: "Bob", Username: "bob456"}
 
 	id1 := c.Set(p1)
-	id2 := c.Set(p2)
+	c.Set(p2)
 
 	tests := []struct {
 		name      string
@@ -254,7 +254,7 @@ func TestEdgeCases(t *testing.T) {
 				if entry == nil {
 					return false
 				}
-				id, err := seqid.FromString(entry.ID)
+				_, err := seqid.FromString(entry.ID)
 				if err != nil {
 					return false
 				}
@@ -330,7 +330,7 @@ func TestIndexOptions(t *testing.T) {
 					return v.(*Person).Username
 				}, UniqueIndex)
 
-				id1 := c.Set(&Person{Username: "Alice"})
+				c.Set(&Person{Username: "Alice"})
 				return c.Set(&Person{Username: "Alice"}) // Should fail
 			},
 			wantID: false,
@@ -342,7 +342,7 @@ func TestIndexOptions(t *testing.T) {
 					return v.(*Person).Email
 				}, UniqueIndex|CaseInsensitiveIndex)
 
-				id1 := c.Set(&Person{Email: "[email protected]"})
+				c.Set(&Person{Email: "[email protected]"})
 				return c.Set(&Person{Email: "[email protected]"}) // Should fail
 			},
 			wantID: false,
@@ -372,7 +372,7 @@ func TestIndexOptions(t *testing.T) {
 					return v.(*Person).Name
 				}, UniqueIndex|CaseInsensitiveIndex|SparseIndex)
 
-				id1 := c.Set(&Person{Name: "Alice"})
+				c.Set(&Person{Name: "Alice"})
 				return c.Set(&Person{Name: "ALICE"}) // Should fail
 			},
 			wantID: false,

examples/gno.land/p/moul/helplink/helplink.gno

@@ -51,13 +51,13 @@ func (r Realm) prefix() string {
 	}
 
 	// local realm -> /realm
-	realm := string(r)
-	if strings.HasPrefix(realm, chainDomain) {
-		return strings.TrimPrefix(realm, chainDomain)
+	rlmstr := string(r)
+	if strings.HasPrefix(rlmstr, chainDomain) {
+		return strings.TrimPrefix(rlmstr, chainDomain)
 	}
 
 	// remote realm -> https://remote.land/realm
-	return "https://" + string(r)
+	return "https://" + rlmstr
 }
 
 // Func returns a markdown link for the specified function with optional

examples/gno.land/p/moul/txlink/txlink.gno

@@ -134,9 +134,9 @@ func (r Realm) prefix() string {
 	}
 
 	// local realm -> /realm
-	realm := string(r)
-	if strings.HasPrefix(realm, chainDomain) {
-		return strings.TrimPrefix(realm, chainDomain)
+	rlm := string(r)
+	if strings.HasPrefix(rlm, chainDomain) {
+		return strings.TrimPrefix(rlm, chainDomain)
 	}
 
 	// remote realm -> https://remote.land/realm

examples/gno.land/r/demo/atomicswap/atomicswap_test.gno

@@ -370,7 +370,6 @@ func TestNewGRC20Swap_Refund(t *testing.T) {
 	rlm := std.DerivePkgAddr("gno.land/r/demo/atomicswap")
 	hashlock := sha256.Sum256([]byte("secret"))
 	hashlockHex := hex.EncodeToString(hashlock[:])
-	timelock := time.Now().Add(defaultTimelockDuration)
 
 	test20.PrivateLedger.Mint(sender, 100_000)
 	test20.PrivateLedger.Approve(sender, rlm, 70_000)

examples/gno.land/r/demo/boards/z_5_filetest.gno

@@ -23,12 +23,12 @@ func init() {
 	bid = cross(boards.CreateBoard)("test_board")
 	cross(boards.CreateThread)(bid, "First Post (title)", "Body of the first post. (body)")
 	pid = cross(boards.CreateThread)(bid, "Second Post (title)", "Body of the second post. (body)")
-	rid := cross(boards.CreateReply)(bid, pid, pid, "Reply of the second post")
+	_ = cross(boards.CreateReply)(bid, pid, pid, "Reply of the second post")
 }
 
 func main() {
 	testing.SetRealm(std.NewUserRealm(std.Address("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm")))
-	rid2 := cross(boards.CreateReply)(bid, pid, pid, "Second reply of the second post\n")
+	_ = cross(boards.CreateReply)(bid, pid, pid, "Second reply of the second post\n")
 	println(boards.Render("test_board/" + strconv.Itoa(int(pid))))
 }
 

examples/gno.land/r/demo/tests/z2_filetest.gno

@@ -12,8 +12,8 @@ import (
 // When 2 or more realms in the frames, PreviousRealm returns the second to last
 func main() {
 	var (
-		eoa        = testutils.TestAddress("someone")
-		rTestsAddr = std.DerivePkgAddr("gno.land/r/demo/tests")
+		eoa = testutils.TestAddress("someone")
+		_   = std.DerivePkgAddr("gno.land/r/demo/tests")
 	)
 	testing.SetOriginCaller(eoa)
 	println("tests.GetPreviousRealm().Address(): ", cross(tests.GetPreviousRealm)().Address())

examples/gno.land/r/gnoland/faucet/z3_filetest.gno

@@ -21,7 +21,7 @@ func main() {
 		controlleraddr1 = testutils.TestAddress("controller1")
 		controlleraddr2 = testutils.TestAddress("controller2")
 		testaddr1       = testutils.TestAddress("test1")
-		testaddr2       = testutils.TestAddress("test2")
+		_               = testutils.TestAddress("test2")
 	)
 	testing.SetRealm(std.NewUserRealm(adminaddr))
 	err := cross(faucet.AdminAddController)(controlleraddr1)

examples/gno.land/r/gnoland/monit/monit_test.gno

@@ -78,7 +78,6 @@ func TestReset(t *testing.T) {
 	// Initial state check
 	initialCounter := counter
 	initialLastUpdate := lastUpdate
-	initialLastCaller := lastCaller
 	initialStatus := wd.Status()
 
 	// Call Incr to change the state

examples/gno.land/r/gnoland/users/v1/z_0_prop1_filetest.gno

@@ -9,15 +9,15 @@ import (
 	"gno.land/p/demo/testutils"
 	users "gno.land/r/gnoland/users/v1"
 	"gno.land/r/gov/dao"
-	"gno.land/r/gov/dao/v3/init"
+	daov3init "gno.land/r/gov/dao/v3/init"
 	susers "gno.land/r/sys/users"
 )
 
 // Test updating a name via GovDAO
 var c std.Address = std.OriginCaller()
 
 func init() {
-	init.InitWithUsers(c)
+	daov3init.InitWithUsers(c)
 
 	alice := testutils.TestAddress("alice")
 

examples/gno.land/r/gnoland/users/v1/z_1_prop2_filetest.gno

@@ -9,7 +9,7 @@ import (
 	"gno.land/p/demo/testutils"
 	users "gno.land/r/gnoland/users/v1"
 	"gno.land/r/gov/dao"
-	"gno.land/r/gov/dao/v3/init"
+	daov3init "gno.land/r/gov/dao/v3/init"
 	susers "gno.land/r/sys/users"
 )
 
@@ -18,7 +18,7 @@ import (
 var c std.Address = std.OriginCaller()
 
 func init() {
-	init.InitWithUsers(c)
+	daov3init.InitWithUsers(c)
 
 	alice := testutils.TestAddress("alice")
 

examples/gno.land/r/gnoland/users/z_0_filetest.gno

@@ -7,7 +7,7 @@ import (
 	"gno.land/p/demo/testutils"
 	"gno.land/r/gnoland/users"
 	"gno.land/r/gov/dao"
-	"gno.land/r/gov/dao/v3/init"
+	ini "gno.land/r/gov/dao/v3/init"
 )
 
 var (
@@ -17,7 +17,7 @@ var (
 func init() {
 	testing.SetRealm(std.NewUserRealm(alice))
 	c := std.OriginCaller()
-	init.InitWithUsers(c)
+	ini.InitWithUsers(c)
 
 	pReq := users.ProposeNewRelease("gno.land/r/gnoland/users/v2", "This is a note!")
 

examples/gno.land/r/gnoland/valopers_proposal/proposal_test.gno

@@ -42,10 +42,8 @@ func TestValopers_ProposeNewValidator(t *testing.T) {
 			cross(valopers.UpdateKeepRunning)(g1user, false)
 		})
 
-		var valoper valopers.Valoper
-
 		urequire.NotPanics(t, func() {
-			valoper = valopers.GetByAddr(g1user)
+			valopers.GetByAddr(g1user)
 		})
 
 		// Send coins to be able to make a proposal
@@ -79,7 +77,7 @@ func TestValopers_ProposeNewValidator(t *testing.T) {
 		urequire.NotPanics(t, func() {
 			pr := NewValidatorProposalRequest(g1user)
 
-			pid := cross(dao.MustCreateProposal)(pr)
+			pid = cross(dao.MustCreateProposal)(pr)
 		})
 
 		proposal, err := cross(dao.GetProposal)(pid) // index starts from 0
@@ -99,10 +97,8 @@ func TestValopers_ProposeNewValidator(t *testing.T) {
 		// Send coins to be able to register a valoper
 		testing.SetOriginSend(std.Coins{std.NewCoin("ugnot", registerMinFee)})
 
-		var valoper valopers.Valoper
-
 		urequire.NotPanics(t, func() {
-			valoper = valopers.GetByAddr(g1user)
+			valopers.GetByAddr(g1user)
 		})
 
 		urequire.NotPanics(t, func() {

examples/gno.land/r/gov/dao/v3/memberstore/memberstore.gno

@@ -122,9 +122,9 @@ func Render(string) string {
 
 // Get gets the Members store
 func Get() MembersByTier {
-	realm := std.CurrentRealm().PkgPath()
-	if !dao.InAllowedDAOs(realm) {
-		panic("this Realm is not allowed to get the Members data: " + realm)
+	currealm := std.CurrentRealm().PkgPath()
+	if !dao.InAllowedDAOs(currealm) {
+		panic("this Realm is not allowed to get the Members data: " + currealm)
 	}
 
 	return members

examples/gno.land/r/gov/dao/v3/memberstore/memberstore_test.gno

@@ -5,7 +5,6 @@ import (
 	"strconv"
 	"testing"
 
-	"gno.land/p/demo/avl"
 	"gno.land/p/demo/urequire"
 )
 
@@ -115,7 +114,7 @@ func TestCreateMembers(t *testing.T) {
 }
 
 func addMembers(ms MembersByTier, c int, tier string) {
-	mt := avl.NewTree()
+	// mt := avl.NewTree() XXX
 	ms.SetTier(tier)
 	for i := 0; i < c; i++ {
 		addr := std.Address(strconv.Itoa(i) + tier)

examples/gno.land/r/leon/hor/datasource_test.gno

@@ -155,7 +155,7 @@ func TestItemRecord(t *testing.T) {
 	wantContent := `### [Test Realm](/r/demo/test)
 This is a test realm in the Hall of Fame
 
-by demo
+by [@demo](/r/gnoland/users/v1:demo)
 
 Submitted at Block #42