Merge branch 'master' into feat/added-args

.github/CODEOWNERS

@@ -64,9 +64,9 @@
 # GnoVM/Gnolang.
 /gnovm/                       @jaekwon @moul @piux2 @thehowl
 /gnovm/stdlibs/               @thehowl
-/gnovm/tests/                 @jaekwon @deelawn @thehowl @mvertes
+/gnovm/tests/                 @jaekwon @thehowl @mvertes
 /gnovm/cmd/gno/               @moul @thehowl
-/gnovm/pkg/gnolang/           @jaekwon @moul @piux2 @deelawn
+/gnovm/pkg/gnolang/           @jaekwon @moul @piux2
 /gnovm/pkg/doc/               @thehowl
 /gnovm/pkg/repl/              @mvertes @ajnavarro
 /gnovm/pkg/gnomod/            @thehowl

.github/pull_request_template.md

@@ -8,5 +8,4 @@
 - [ ] No breaking changes were made, or a `BREAKING CHANGE: xxx` message was included in the description
 - [ ] Added references to related issues and PRs
 - [ ] Provided any useful hints for running manual tests
-- [ ] Added new benchmarks to [generated graphs](https://gnoland.github.io/benchmarks), if any. More info [here](https://github.com/gnolang/gno/blob/master/.benchmarks/README.md).
 </details>

docs/gno-tooling/cli/gnokey/working-with-key-pairs.md

@@ -38,6 +38,7 @@ gno.land keychain & client
 SUBCOMMANDS
   add        adds key to the keybase
   delete     deletes a key from the keybase
+  rotate     rotate the password of a key in the keybase to a new password
   generate   generates a bip39 mnemonic
   export     exports private key armor
   import     imports encrypted private key armor
@@ -161,6 +162,18 @@ you can recover it using the key's mnemonic, or by importing it if it was export
 at a previous point in time.
 :::
 
+
+## Rotating the password of a private key to a new password
+To rotate the password of a private key from the `gnokey` keystore to a new password, we need to know the name or
+address of the key to remove.
+After we have this information, we can run the following command:
+
+```bash
+gnokey rotate MyKey
+```
+
+After entering the current key decryption password and the new password, the password of the key will be updated in the keystore.
+
 ## Exporting a private key
 Private keys stored in the `gnokey` keystore can be exported to a desired place
 on the user's filesystem.

examples/gno.land/p/demo/uassert/uassert.gno

@@ -266,7 +266,7 @@ func NotEqual(t TestingT, expected, actual interface{}, msgs ...string) bool {
 		if av, ok := actual.(string); ok {
 			notEqual = ev != av
 			ok_ = true
-			es, as = ev, as
+			es, as = ev, av
 		}
 	case std.Address:
 		if av, ok := actual.(std.Address); ok {

examples/gno.land/r/leon/config/config.gno

@@ -8,6 +8,9 @@ import (
 var (
 	main   std.Address // leon's main address
 	backup std.Address // backup address
+
+	ErrInvalidAddr  = errors.New("leon's config: invalid address")
+	ErrUnauthorized = errors.New("leon's config: unauthorized")
 )
 
 func init() {
@@ -24,7 +27,7 @@ func Backup() std.Address {
 
 func SetAddress(a std.Address) error {
 	if !a.IsValid() {
-		return errors.New("config: invalid address")
+		return ErrInvalidAddr
 	}
 
 	if err := checkAuthorized(); err != nil {
@@ -37,7 +40,7 @@ func SetAddress(a std.Address) error {
 
 func SetBackup(a std.Address) error {
 	if !a.IsValid() {
-		return errors.New("config: invalid address")
+		return ErrInvalidAddr
 	}
 
 	if err := checkAuthorized(); err != nil {
@@ -50,16 +53,11 @@ func SetBackup(a std.Address) error {
 
 func checkAuthorized() error {
 	caller := std.PrevRealm().Addr()
-	if caller != main || caller != backup {
-		return errors.New("config: unauthorized")
+	isAuthorized := caller == main || caller == backup
+
+	if !isAuthorized {
+		return ErrUnauthorized
 	}
 
 	return nil
 }
-
-func AssertAuthorized() {
-	caller := std.PrevRealm().Addr()
-	if caller != main || caller != backup {
-		panic("config: unauthorized")
-	}
-}

examples/gno.land/r/leon/home/home.gno

@@ -34,13 +34,19 @@ TODO import r/gh
 }
 
 func UpdatePFP(url, caption string) {
-	config.AssertAuthorized()
+	if !isAuthorized(std.PrevRealm().Addr()) {
+		panic(config.ErrUnauthorized)
+	}
+
 	pfp = url
 	pfpCaption = caption
 }
 
 func UpdateAboutMe(col1, col2 string) {
-	config.AssertAuthorized()
+	if !isAuthorized(std.PrevRealm().Addr()) {
+		panic(config.ErrUnauthorized)
+	}
+
 	abtMe[0] = col1
 	abtMe[1] = col2
 }
@@ -119,3 +125,7 @@ func renderMillipede() string {
 
 	return out
 }
+
+func isAuthorized(addr std.Address) bool {
+	return addr == config.Address() || addr == config.Backup()
+}

gno.land/pkg/gnoweb/gnoweb.go

@@ -476,7 +476,7 @@ func handleNotFound(logger *slog.Logger, app gotuna.App, cfg *Config, path strin
 	// decode path for non-ascii characters
 	decodedPath, err := url.PathUnescape(path)
 	if err != nil {
-		logger.Error("failed to decode path", err)
+		logger.Error("failed to decode path", "error", err)
 		decodedPath = path
 	}
 	w.WriteHeader(http.StatusNotFound)
@@ -491,7 +491,7 @@ func writeError(logger *slog.Logger, w http.ResponseWriter, err error) {
 	if details := errors.Unwrap(err); details != nil {
 		logger.Error("handler", "error", err, "details", details)
 	} else {
-		logger.Error("handler", "error:", err)
+		logger.Error("handler", "error", err)
 	}
 
 	// XXX: writeError should return an error page template.

gno.land/pkg/keyscli/root.go

@@ -30,6 +30,7 @@ func NewRootCmd(io commands.IO, base client.BaseOptions) *commands.Command {
 	cmd.AddSubCommands(
 		client.NewAddCmd(cfg, io),
 		client.NewDeleteCmd(cfg, io),
+		client.NewRotateCmd(cfg, io),
 		client.NewGenerateCmd(cfg, io),
 		client.NewExportCmd(cfg, io),
 		client.NewImportCmd(cfg, io),

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

@@ -42,15 +42,15 @@ func (bnk *SDKBanker) TotalCoin(denom string) int64 {
 
 func (bnk *SDKBanker) IssueCoin(b32addr crypto.Bech32Address, denom string, amount int64) {
 	addr := crypto.MustAddressFromString(string(b32addr))
-	_, err := bnk.vmk.bank.AddCoins(bnk.ctx, addr, std.Coins{std.Coin{denom, amount}})
+	_, err := bnk.vmk.bank.AddCoins(bnk.ctx, addr, std.Coins{std.Coin{Denom: denom, Amount: amount}})
 	if err != nil {
 		panic(err)
 	}
 }
 
 func (bnk *SDKBanker) RemoveCoin(b32addr crypto.Bech32Address, denom string, amount int64) {
 	addr := crypto.MustAddressFromString(string(b32addr))
-	_, err := bnk.vmk.bank.SubtractCoins(bnk.ctx, addr, std.Coins{std.Coin{denom, amount}})
+	_, err := bnk.vmk.bank.SubtractCoins(bnk.ctx, addr, std.Coins{std.Coin{Denom: denom, Amount: amount}})
 	if err != nil {
 		panic(err)
 	}

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

@@ -81,7 +81,7 @@ func TestVMKeeperOrigSend1(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.gno", `
+		{Name: "init.gno", Body: `
 package test
 
 import "std"
@@ -126,7 +126,7 @@ func TestVMKeeperOrigSend2(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.gno", `
+		{Name: "init.gno", Body: `
 package test
 
 import "std"
@@ -180,7 +180,7 @@ func TestVMKeeperOrigSend3(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.gno", `
+		{Name: "init.gno", Body: `
 package test
 
 import "std"
@@ -224,7 +224,7 @@ func TestVMKeeperRealmSend1(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.gno", `
+		{Name: "init.gno", Body: `
 package test
 
 import "std"
@@ -268,7 +268,7 @@ func TestVMKeeperRealmSend2(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.gno", `
+		{Name: "init.gno", Body: `
 package test
 
 import "std"
@@ -312,7 +312,7 @@ func TestVMKeeperOrigCallerInit(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.gno", `
+		{Name: "init.gno", Body: `
 package test
 
 import "std"
@@ -363,7 +363,7 @@ func TestVMKeeperRunSimple(t *testing.T) {
 	env.acck.SetAccount(ctx, acc)
 
 	files := []*std.MemFile{
-		{"script.gno", `
+		{Name: "script.gno", Body: `
 package main
 
 func main() {
@@ -402,7 +402,7 @@ func testVMKeeperRunImportStdlibs(t *testing.T, env testEnv) {
 	env.acck.SetAccount(ctx, acc)
 
 	files := []*std.MemFile{
-		{"script.gno", `
+		{Name: "script.gno", Body: `
 package main
 
 import "std"
@@ -474,7 +474,7 @@ func TestVMKeeperReinitialize(t *testing.T) {
 
 	// Create test package.
 	files := []*std.MemFile{
-		{"init.gno", `
+		{Name: "init.gno", Body: `
 package test
 
 func Echo(msg string) string {

gnovm/pkg/gnolang/eval_test.go

@@ -40,8 +40,8 @@ func TestEvalFiles(t *testing.T) {
 			if wantStacktrace != "" && !strings.Contains(stacktrace, wantStacktrace) {
 				t.Fatalf("unexpected stacktrace\nWant: %s\n Got: %s", wantStacktrace, stacktrace)
 			}
-			if wantOut != "" && out != wantOut {
-				t.Fatalf("unexpected output\nWant: %s\n Got: %s", wantOut, out)
+			if wantOut != "" && strings.TrimSpace(out) != strings.TrimSpace(wantOut) {
+				t.Fatalf("unexpected output\nWant: \"%s\"\n Got: \"%s\"", wantOut, out)
 			}
 		})
 

gnovm/pkg/gnolang/nodes.go

@@ -2119,6 +2119,7 @@ const (
 	ATTR_IOTA         GnoAttribute = "ATTR_IOTA"
 	ATTR_LOCATIONED   GnoAttribute = "ATTR_LOCATIONED"
 	ATTR_INJECTED     GnoAttribute = "ATTR_INJECTED"
+	ATTR_SHIFT_RHS    GnoAttribute = "ATTR_SHIFT_RHS"
 )
 
 var rePkgName = regexp.MustCompile(`^[a-z][a-z0-9_]+$`)

gnovm/pkg/gnolang/op_binary.go

@@ -1097,6 +1097,7 @@ func xorAssign(lv, rv *TypedValue) {
 
 // for doOpShl and doOpShlAssign.
 func shlAssign(lv, rv *TypedValue) {
+	rv.AssertNonNegative("runtime error: negative shift amount")
 	// set the result in lv.
 	// NOTE: baseOf(rv.T) is always UintType.
 	switch baseOf(lv.T) {
@@ -1136,6 +1137,7 @@ func shlAssign(lv, rv *TypedValue) {
 
 // for doOpShr and doOpShrAssign.
 func shrAssign(lv, rv *TypedValue) {
+	rv.AssertNonNegative("runtime error: negative shift amount")
 	// set the result in lv.
 	// NOTE: baseOf(rv.T) is always UintType.
 	switch baseOf(lv.T) {

gnovm/pkg/gnolang/op_call.go

@@ -27,6 +27,11 @@ func (m *Machine) doOpPrecall() {
 	case TypeValue:
 		// Do not pop type yet.
 		// No need for frames.
+		xv := m.PeekValue(1)
+		if cx.GetAttribute(ATTR_SHIFT_RHS) == true {
+			xv.AssertNonNegative("runtime error: negative shift amount")
+		}
+
 		m.PushOp(OpConvert)
 		if debug {
 			if len(cx.Args) != 1 {