Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 4 commits into from
Feb 9, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1881c01
fix(sdk/vm): coerce MsgRun pkgpath to `gno.land/r/$addr/run`
thehowl Feb 8, 2024
b93614c
prefer setting empty value
thehowl Feb 8, 2024
6f0ad2d
place verification in verifybasic
thehowl Feb 8, 2024
f5d502a
correct pkg generated by NewMsgRun
thehowl Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions gno.land/pkg/sdk/vm/keeper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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)
}

Expand Down Expand Up @@ -303,6 +303,9 @@ func (vm *VMKeeper) Run(ctx sdk.Context, msg MsgRun) (res string, err error) {
send := msg.Send
memPkg := msg.Package

// Force memPkg path to the reserved run path.
memPkg.Path = "gno.land/r/" + caller.String() + "/run"

// Validate arguments.
callerAcc := vm.acck.GetAccount(ctx, caller)
if callerAcc == nil {
Expand Down
Loading