fix(sdk/vm): coerce MsgRun pkgpath to gno.land/r/$addr/run

gno.land/pkg/gnoclient/client_txs.go

@@ -144,7 +144,7 @@
 		return nil, errors.Wrap(err, "precompile and check")
 	}
 	memPkg.Name = "main"
-	memPkg.Path = "gno.land/r/" + caller.String() + "/run"
+	memPkg.Path = ""
 
 	// Construct message & transaction and marshal.
 	msg := vm.MsgRun{

gno.land/pkg/keyscli/run.go

@@ -114,7 +114,8 @@ func execMakeRun(cfg *MakeRunCfg, args []string, cmdio commands.IO) error {
 		panic(err)
 	}
 	memPkg.Name = "main"
-	memPkg.Path = "gno.land/r/" + caller.String() + "/run"
+	// Set to empty; this will be automatically set by the VM keeper.
+	memPkg.Path = ""
 
 	// construct msg & tx and marshal.
 	msg := vm.MsgRun{

gno.land/pkg/sdk/vm/keeper.go

@@ -131,7 +131,7 @@ func (vm *VMKeeper) getGnoStore(ctx sdk.Context) gno.Store {
 	}
 }
 
-var reReservedPath = regexp.MustCompile(`gno\.land/r/g[a-z0-9]+/run`)
+var reRunPath = regexp.MustCompile(`gno\.land/r/g[a-z0-9]+/run`)
 
 // AddPackage adds a package with given fileset.
 func (vm *VMKeeper) AddPackage(ctx sdk.Context, msg MsgAddPackage) error {
@@ -156,7 +156,7 @@ func (vm *VMKeeper) AddPackage(ctx sdk.Context, msg MsgAddPackage) error {
 		return ErrInvalidPkgPath("package already exists: " + pkgPath)
 	}
 
-	if reReservedPath.MatchString(pkgPath) {
+	if reRunPath.MatchString(pkgPath) {
 		return ErrInvalidPkgPath("reserved package name: " + pkgPath)
 	}
 
@@ -303,6 +303,11 @@ func (vm *VMKeeper) Run(ctx sdk.Context, msg MsgRun) (res string, err error) {
 	send := msg.Send
 	memPkg := msg.Package
 
+	// coerce path to right one.
+	// the path in the message must be "" or the following path.
+	// this is already checked in MsgRun.ValidateBasic
+	memPkg.Path = "gno.land/r/" + msg.Caller.String() + "/run"
+
 	// Validate arguments.
 	callerAcc := vm.acck.GetAccount(ctx, caller)
 	if callerAcc == nil {

gno.land/pkg/sdk/vm/msgs.go

@@ -1,6 +1,7 @@
 package vm
 
 import (
+	"fmt"
 	"strings"
 
 	gno "github.com/gnolang/gno/gnovm/pkg/gnolang"
@@ -162,7 +163,7 @@
 		Send:   send,
 		Package: &std.MemPackage{
 			Name:  "main",
-			Path:  "gno.land/r/" + caller.String() + "/run",
+			Path:  "", // auto set by the handler
 			Files: files,
 		},
 	}
@@ -179,9 +180,13 @@
 	if msg.Caller.IsZero() {
 		return std.ErrInvalidAddress("missing caller address")
 	}
-	if msg.Package.Path == "" { // XXX
-		return ErrInvalidPkgPath("missing package path")
+
+	// Force memPkg path to the reserved run path.
+	wantPath := "gno.land/r/" + msg.Caller.String() + "/run"
+	if path := msg.Package.Path; path != "" && path != wantPath {
+		return ErrInvalidPkgPath(fmt.Sprintf("invalid pkgpath for MsgRun: %q", path))
 	}
+
 	return nil
 }