From 07e3c4914ff9569ac765e0cb9ad19a7cc45fdfd5 Mon Sep 17 00:00:00 2001
From: Morgan <morgan@morganbaz.com>
Date: Tue, 11 Feb 2025 15:46:37 +0100
Subject: [PATCH 01/47] refactor(gnovm): remove TRANS_BREAK from transcriber
 (#3626)

was unused until now, and it looks redundant if we have TRANS_SKIP
anyway.
---
 gnovm/pkg/gnolang/string_methods.go |   7 +-
 gnovm/pkg/gnolang/transcribe.go     | 110 +++++++---------------------
 2 files changed, 28 insertions(+), 89 deletions(-)

diff --git a/gnovm/pkg/gnolang/string_methods.go b/gnovm/pkg/gnolang/string_methods.go
index 460e308fa9b..565b5860708 100644
--- a/gnovm/pkg/gnolang/string_methods.go
+++ b/gnovm/pkg/gnolang/string_methods.go
@@ -229,13 +229,12 @@ func _() {
 	var x [1]struct{}
 	_ = x[TRANS_CONTINUE-0]
 	_ = x[TRANS_SKIP-1]
-	_ = x[TRANS_BREAK-2]
-	_ = x[TRANS_EXIT-3]
+	_ = x[TRANS_EXIT-2]
 }
 
-const _TransCtrl_name = "TRANS_CONTINUETRANS_SKIPTRANS_BREAKTRANS_EXIT"
+const _TransCtrl_name = "TRANS_CONTINUETRANS_SKIPTRANS_EXIT"
 
-var _TransCtrl_index = [...]uint8{0, 14, 24, 35, 45}
+var _TransCtrl_index = [...]uint8{0, 14, 24, 34}
 
 func (i TransCtrl) String() string {
 	if i >= TransCtrl(len(_TransCtrl_index)-1) {
diff --git a/gnovm/pkg/gnolang/transcribe.go b/gnovm/pkg/gnolang/transcribe.go
index dab539a8707..572810e9668 100644
--- a/gnovm/pkg/gnolang/transcribe.go
+++ b/gnovm/pkg/gnolang/transcribe.go
@@ -14,7 +14,6 @@ type (
 const (
 	TRANS_CONTINUE TransCtrl = iota
 	TRANS_SKIP
-	TRANS_BREAK
 	TRANS_EXIT
 )
 
@@ -101,7 +100,7 @@ const (
 	TRANS_IMPORT_PATH
 	TRANS_CONST_TYPE
 	TRANS_CONST_VALUE
-	TRANS_VAR_NAME // XXX stringer
+	TRANS_VAR_NAME
 	TRANS_VAR_TYPE
 	TRANS_VAR_VALUE
 	TRANS_TYPE_TYPE
@@ -113,8 +112,6 @@ const (
 //   - TRANS_SKIP to break out of the
 //     ENTER,CHILDS1,[BLOCK,CHILDS2]?,LEAVE sequence for that node,
 //     i.e. skipping (the rest of) it;
-//   - TRANS_BREAK to break out of looping in CHILDS1 or CHILDS2,
-//     but still perform TRANS_LEAVE.
 //   - TRANS_EXIT to stop traversing altogether.
 //
 // Do not mutate ns.
@@ -168,9 +165,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		}
 		for idx := range cnn.Args {
 			cnn.Args[idx] = transcribe(t, nns, TRANS_CALL_ARG, idx, cnn.Args[idx], &c).(Expr)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -248,16 +243,12 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 			k, v := kvx.Key, kvx.Value
 			if k != nil {
 				k = transcribe(t, nns, TRANS_COMPOSITE_KEY, idx, k, &c).(Expr)
-				if isBreak(c) {
-					break
-				} else if isStopOrSkip(nc, c) {
+				if isStopOrSkip(nc, c) {
 					return
 				}
 			}
 			v = transcribe(t, nns, TRANS_COMPOSITE_VALUE, idx, v, &c).(Expr)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 			cnn.Elts[idx] = KeyValueExpr{Key: k, Value: v}
@@ -269,9 +260,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		}
 		for idx := range cnn.HeapCaptures {
 			cnn.HeapCaptures[idx] = *(transcribe(t, nns, TRANS_FUNCLIT_HEAP_CAPTURE, idx, &cnn.HeapCaptures[idx], &c).(*NameExpr))
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -285,9 +274,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		// iterate over Body; its length can change if a statement is decomposed.
 		for idx := 0; idx < len(cnn.Body); idx++ {
 			cnn.Body[idx] = transcribe(t, nns, TRANS_FUNCLIT_BODY, idx, cnn.Body[idx], &c).(Stmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -321,9 +308,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 	case *InterfaceTypeExpr:
 		for idx := range cnn.Methods {
 			cnn.Methods[idx] = *transcribe(t, nns, TRANS_INTERFACETYPE_METHOD, idx, &cnn.Methods[idx], &c).(*FieldTypeExpr)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -341,9 +326,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		}
 		for idx := range cnn.Results {
 			cnn.Results[idx] = *transcribe(t, nns, TRANS_FUNCTYPE_RESULT, idx, &cnn.Results[idx], &c).(*FieldTypeExpr)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -359,9 +342,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 	case *StructTypeExpr:
 		for idx := range cnn.Fields {
 			cnn.Fields[idx] = *transcribe(t, nns, TRANS_STRUCTTYPE_FIELD, idx, &cnn.Fields[idx], &c).(*FieldTypeExpr)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -373,17 +354,13 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 	case *AssignStmt:
 		for idx := range cnn.Lhs {
 			cnn.Lhs[idx] = transcribe(t, nns, TRANS_ASSIGN_LHS, idx, cnn.Lhs[idx], &c).(Expr)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
 		for idx := range cnn.Rhs {
 			cnn.Rhs[idx] = transcribe(t, nns, TRANS_ASSIGN_RHS, idx, cnn.Rhs[idx], &c).(Expr)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -398,9 +375,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		// iterate over Body; its length can change if a statement is decomposed.
 		for idx := 0; idx < len(cnn.Body); idx++ {
 			cnn.Body[idx] = transcribe(t, nns, TRANS_BLOCK_BODY, idx, cnn.Body[idx], &c).(Stmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -409,9 +384,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		// iterate over Body; its length can change if a statement is decomposed.
 		for idx := 0; idx < len(cnn.Body); idx++ {
 			cnn.Body[idx] = transcribe(t, nns, TRANS_DECL_BODY, idx, cnn.Body[idx], &c).(SimpleDeclStmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -455,9 +428,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		// iterate over Body; its length can change if a statement is decomposed.
 		for idx := 0; idx < len(cnn.Body); idx++ {
 			cnn.Body[idx] = transcribe(t, nns, TRANS_FOR_BODY, idx, cnn.Body[idx], &c).(Stmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -506,9 +477,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		// iterate over Body; its length can change if a statement is decomposed.
 		for idx := 0; idx < len(cnn.Body); idx++ {
 			cnn.Body[idx] = transcribe(t, nns, TRANS_IF_CASE_BODY, idx, cnn.Body[idx], &c).(Stmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -544,18 +513,14 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		// iterate over Body; its length can change if a statement is decomposed.
 		for idx := 0; idx < len(cnn.Body); idx++ {
 			cnn.Body[idx] = transcribe(t, nns, TRANS_RANGE_BODY, idx, cnn.Body[idx], &c).(Stmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
 	case *ReturnStmt:
 		for idx := range cnn.Results {
 			cnn.Results[idx] = transcribe(t, nns, TRANS_RETURN_RESULT, idx, cnn.Results[idx], &c).(Expr)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -564,9 +529,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 	case *SelectStmt:
 		for idx := range cnn.Cases {
 			cnn.Cases[idx] = *transcribe(t, nns, TRANS_SELECT_CASE, idx, &cnn.Cases[idx], &c).(*SelectCaseStmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -585,9 +548,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		// iterate over Body; its length can change if a statement is decomposed.
 		for idx := 0; idx < len(cnn.Body); idx++ {
 			cnn.Body[idx] = transcribe(t, nns, TRANS_SELECTCASE_BODY, idx, cnn.Body[idx], &c).(Stmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -632,9 +593,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		}
 		for idx := range cnn.Clauses {
 			cnn.Clauses[idx] = *transcribe(t, nns, TRANS_SWITCH_CASE, idx, &cnn.Clauses[idx], &c).(*SwitchClauseStmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -652,18 +611,14 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		}
 		for idx := range cnn.Cases {
 			cnn.Cases[idx] = transcribe(t, nns, TRANS_SWITCHCASE_CASE, idx, cnn.Cases[idx], &c).(Expr)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
 		// iterate over Body; its length can change if a statement is decomposed.
 		for idx := 0; idx < len(cnn.Body); idx++ {
 			cnn.Body[idx] = transcribe(t, nns, TRANS_SWITCHCASE_BODY, idx, cnn.Body[idx], &c).(Stmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -688,9 +643,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		// iterate over Body; its length can change if a statement is decomposed.
 		for idx := 0; idx < len(cnn.Body); idx++ {
 			cnn.Body[idx] = transcribe(t, nns, TRANS_FUNC_BODY, idx, cnn.Body[idx], &c).(Stmt)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -709,9 +662,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		}
 		for idx := range cnn.Values {
 			cnn.Values[idx] = transcribe(t, nns, TRANS_VAR_VALUE, idx, cnn.Values[idx], &c).(Expr)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -730,9 +681,7 @@ func transcribe(t Transform, ns []Node, ftype TransField, index int, n Node, nc
 		}
 		for idx := range cnn.Decls {
 			cnn.Decls[idx] = transcribe(t, nns, TRANS_FILE_BODY, idx, cnn.Decls[idx], &c).(Decl)
-			if isBreak(c) {
-				break
-			} else if isStopOrSkip(nc, c) {
+			if isStopOrSkip(nc, c) {
 				return
 			}
 		}
@@ -768,12 +717,3 @@ func isStopOrSkip(oldnc *TransCtrl, nc TransCtrl) (stop bool) {
 		panic("should not happen")
 	}
 }
-
-// returns true if transcribe() should break (a loop).
-func isBreak(nc TransCtrl) (brek bool) {
-	if nc == TRANS_BREAK {
-		return true
-	} else {
-		return false
-	}
-}

From 4f036699e4dc0024195fc142f8de60c72a34d66f Mon Sep 17 00:00:00 2001
From: Marc Vertes <marc.vertes@tendermint.com>
Date: Tue, 11 Feb 2025 16:22:10 +0100
Subject: [PATCH 02/47] chore(gnovm): instrument debug tracing to display the
 caller site. (#3702)

Running the gnovm with the debug traces enabled (build tag `debug`)
allows to display the details of preprocessing and opcodes operations.

This PR adds the caller location in source (file + line) to each trace,
allowing to identify the calling context of opcodes, to ease
understanding the gnovm behavior.

No change when debug is disabled (the default mode).

Tracing can be activated by: `go run -tags debug ./cmd/gno run args`

Before:

```console
DEBUG: |||| -v (true <untyped> bool)
DEBUG: EXEC: (const (println func(xs ...interface{})()))((const ("i:" string)), i<VPBlock(1,0)>)
DEBUG: |||| -s bodyStmt[0/0/1]=(end)
DEBUG: |||| +o OpPopResults
DEBUG: ||||| +x (const (println func(xs ...interface{})()))((const ("i:" string)), i<VPBlock(1,0)>)
DEBUG: ||||| +o OpEval
DEBUG: |||||| -o OpEval
DEBUG: EVAL: (*gnolang.CallExpr) (const (println func(xs ...interface{})()))((const ("i:" string)), i<VPBlock(1,0)>)
DEBUG: ||||| +o OpPrecall
DEBUG: |||||| +x i<VPBlock(1,0)>
DEBUG: |||||| +o OpEval
DEBUG: ||||||| +x (const ("i:" string))
DEBUG: ||||||| +o OpEval
DEBUG: |||||||| +x (const (println func(xs ...interface{})()))
DEBUG: |||||||| +o OpEval
DEBUG: ||||||||| -o OpEval
DEBUG: EVAL: (*gnolang.ConstExpr) (const (println func(xs ...interface{})()))
DEBUG: |||||||| -x (const (println func(xs ...interface{})()))
DEBUG: |||||||| +v (println func(xs ...interface{})())
DEBUG: |||||||| -o OpEval
DEBUG: EVAL: (*gnolang.ConstExpr) (const ("i:" string))
DEBUG: ||||||| -x (const ("i:" string))
DEBUG: ||||||| +v ("i:" string)
DEBUG: ||||||| -o OpEval
```

After:
```console
DEBUG:   op_exec.go:99  : |||| -v (true <untyped> bool)
DEBUG:   machine.go:1535: EXEC: (const (println func(xs ...interface{})()))((const ("i:" string)), i<VPBlock(1,0)>)
DEBUG:   op_exec.go:484 : |||| -s bodyStmt[0/0/1]=(end)
DEBUG:   op_exec.go:488 : |||| +o OpPopResults
DEBUG:   op_exec.go:493 : ||||| +x (const (println func(xs ...interface{})()))((const ("i:" string)), i<VPBlock(1,0)>)
DEBUG:   op_exec.go:494 : ||||| +o OpEval
DEBUG:   machine.go:1218: |||||| -o OpEval
DEBUG:   machine.go:1380: EVAL: (*gnolang.CallExpr) (const (println func(xs ...interface{})()))((const ("i:" string)), i<VPBlock(1,0)>)
DEBUG:   op_eval.go:243 : ||||| +o OpPrecall
DEBUG:   op_eval.go:247 : |||||| +x i<VPBlock(1,0)>
DEBUG:   op_eval.go:248 : |||||| +o OpEval
DEBUG:   op_eval.go:247 : ||||||| +x (const ("i:" string))
DEBUG:   op_eval.go:248 : ||||||| +o OpEval
DEBUG:   op_eval.go:251 : |||||||| +x (const (println func(xs ...interface{})()))
DEBUG:   op_eval.go:252 : |||||||| +o OpEval
DEBUG:   machine.go:1218: ||||||||| -o OpEval
DEBUG:   machine.go:1380: EVAL: (*gnolang.ConstExpr) (const (println func(xs ...interface{})()))
DEBUG:   op_eval.go:317 : |||||||| -x (const (println func(xs ...interface{})()))
DEBUG:   op_eval.go:319 : |||||||| +v (println func(xs ...interface{})())
DEBUG:   machine.go:1218: |||||||| -o OpEval
DEBUG:   machine.go:1380: EVAL: (*gnolang.ConstExpr) (const ("i:" string))
DEBUG:   op_eval.go:317 : ||||||| -x (const ("i:" string))
DEBUG:   op_eval.go:319 : ||||||| +v ("i:" string)
DEBUG:   machine.go:1218: ||||||| -o OpEval
```

---------

Co-authored-by: Morgan <morgan@morganbaz.com>
---
 gnovm/pkg/gnolang/debug.go   | 12 ++++++++++--
 gnovm/pkg/gnolang/machine.go | 16 ++++++++++++----
 2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/gnovm/pkg/gnolang/debug.go b/gnovm/pkg/gnolang/debug.go
index c7f9311ffe4..0f9cb9a1f9c 100644
--- a/gnovm/pkg/gnolang/debug.go
+++ b/gnovm/pkg/gnolang/debug.go
@@ -3,6 +3,8 @@ package gnolang
 import (
 	"fmt"
 	"net/http"
+	"path"
+	"runtime"
 	"strings"
 	"time"
 
@@ -48,7 +50,10 @@ var enabled bool = true
 func (debugging) Println(args ...interface{}) {
 	if debug {
 		if enabled {
-			fmt.Println(append([]interface{}{"DEBUG:"}, args...)...)
+			_, file, line, _ := runtime.Caller(2)
+			caller := fmt.Sprintf("%-.12s:%-4d", path.Base(file), line)
+			prefix := fmt.Sprintf("DEBUG: %17s: ", caller)
+			fmt.Println(append([]interface{}{prefix}, args...)...)
 		}
 	}
 }
@@ -56,7 +61,10 @@ func (debugging) Println(args ...interface{}) {
 func (debugging) Printf(format string, args ...interface{}) {
 	if debug {
 		if enabled {
-			fmt.Printf("DEBUG: "+format, args...)
+			_, file, line, _ := runtime.Caller(2)
+			caller := fmt.Sprintf("%.12s:%-4d", path.Base(file), line)
+			prefix := fmt.Sprintf("DEBUG: %17s: ", caller)
+			fmt.Printf(prefix+format, args...)
 		}
 	}
 }
diff --git a/gnovm/pkg/gnolang/machine.go b/gnovm/pkg/gnolang/machine.go
index 627854c9e9a..7b89e98eb6d 100644
--- a/gnovm/pkg/gnolang/machine.go
+++ b/gnovm/pkg/gnolang/machine.go
@@ -3,7 +3,9 @@ package gnolang
 import (
 	"fmt"
 	"io"
+	"path"
 	"reflect"
+	"runtime"
 	"slices"
 	"strconv"
 	"strings"
@@ -2120,8 +2122,11 @@ func (m *Machine) Panic(ex TypedValue) {
 func (m *Machine) Println(args ...interface{}) {
 	if debug {
 		if enabled {
-			s := strings.Repeat("|", m.NumOps)
-			debug.Println(append([]interface{}{s}, args...)...)
+			_, file, line, _ := runtime.Caller(2) // get caller info
+			caller := fmt.Sprintf("%-.12s:%-4d", path.Base(file), line)
+			prefix := fmt.Sprintf("DEBUG: %17s: ", caller)
+			s := prefix + strings.Repeat("|", m.NumOps)
+			fmt.Println(append([]interface{}{s}, args...)...)
 		}
 	}
 }
@@ -2129,8 +2134,11 @@ func (m *Machine) Println(args ...interface{}) {
 func (m *Machine) Printf(format string, args ...interface{}) {
 	if debug {
 		if enabled {
-			s := strings.Repeat("|", m.NumOps)
-			debug.Printf(s+" "+format, args...)
+			_, file, line, _ := runtime.Caller(2) // get caller info
+			caller := fmt.Sprintf("%-.12s:%-4d", path.Base(file), line)
+			prefix := fmt.Sprintf("DEBUG: %17s: ", caller)
+			s := prefix + strings.Repeat("|", m.NumOps)
+			fmt.Printf(s+" "+format, args...)
 		}
 	}
 }

From 7ca5ed2718988736cd1dc7ed493a053d8b6518fa Mon Sep 17 00:00:00 2001
From: Morgan <morgan@morganbaz.com>
Date: Tue, 11 Feb 2025 16:26:18 +0100
Subject: [PATCH 03/47] test(cmd/gno): don't fail if tests take more than 10
 seconds (#3723)

https://github.com/gnolang/gno/actions/runs/13265575679/job/37032064155

Changes the regex for txtar tests like `\d\.\d\ds` to have a + symbol
instead, in case they take longer than 10 seconds.
---
 gnovm/cmd/gno/testdata/test/error_correct.txtar    | 4 ++--
 gnovm/cmd/gno/testdata/test/filetest_events.txtar  | 6 +++---
 gnovm/cmd/gno/testdata/test/minim2.txtar           | 4 ++--
 gnovm/cmd/gno/testdata/test/minim3.txtar           | 4 ++--
 gnovm/cmd/gno/testdata/test/multitest_events.txtar | 4 ++--
 gnovm/cmd/gno/testdata/test/output_correct.txtar   | 4 ++--
 gnovm/cmd/gno/testdata/test/output_sync.txtar      | 4 ++--
 gnovm/cmd/gno/testdata/test/realm_correct.txtar    | 6 +++---
 gnovm/cmd/gno/testdata/test/realm_sync.txtar       | 4 ++--
 gnovm/cmd/gno/testdata/test/valid_filetest.txtar   | 6 +++---
 gnovm/cmd/gno/testdata/test/valid_test.txtar       | 8 ++++----
 11 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/gnovm/cmd/gno/testdata/test/error_correct.txtar b/gnovm/cmd/gno/testdata/test/error_correct.txtar
index f9ce4dd9028..bcd2c87da5c 100644
--- a/gnovm/cmd/gno/testdata/test/error_correct.txtar
+++ b/gnovm/cmd/gno/testdata/test/error_correct.txtar
@@ -3,8 +3,8 @@
 gno test -v .
 
 stderr '=== RUN   file/x_filetest.gno'
-stderr '--- PASS: file/x_filetest.gno \(\d\.\d\ds\)'
-stderr 'ok      \. 	\d\.\d\ds'
+stderr '--- PASS: file/x_filetest.gno \(\d+\.\d\ds\)'
+stderr 'ok      \. 	\d+\.\d\ds'
 
 -- x_filetest.gno --
 package main
diff --git a/gnovm/cmd/gno/testdata/test/filetest_events.txtar b/gnovm/cmd/gno/testdata/test/filetest_events.txtar
index 34da5fe2ff0..87f873980d5 100644
--- a/gnovm/cmd/gno/testdata/test/filetest_events.txtar
+++ b/gnovm/cmd/gno/testdata/test/filetest_events.txtar
@@ -3,14 +3,14 @@
 gno test -print-events .
 
 ! stdout .+
-stderr 'ok      \. 	\d\.\d\ds'
+stderr 'ok      \. 	\d+\.\d\ds'
 
 gno test -print-events -v .
 
 stdout 'test'
 stderr '=== RUN   file/valid_filetest.gno'
-stderr '--- PASS: file/valid_filetest.gno \(\d\.\d\ds\)'
-stderr 'ok      \. 	\d\.\d\ds'
+stderr '--- PASS: file/valid_filetest.gno \(\d+\.\d\ds\)'
+stderr 'ok      \. 	\d+\.\d\ds'
 
 -- valid.gno --
 package valid
diff --git a/gnovm/cmd/gno/testdata/test/minim2.txtar b/gnovm/cmd/gno/testdata/test/minim2.txtar
index 3c4d1d085f0..d66d5076ef0 100644
--- a/gnovm/cmd/gno/testdata/test/minim2.txtar
+++ b/gnovm/cmd/gno/testdata/test/minim2.txtar
@@ -2,8 +2,8 @@
 
 gno test .
 
-! stdout .+ 
-stderr 'ok      \. 	\d\.\d\ds'
+! stdout .+
+stderr 'ok      \. 	\d+\.\d\ds'
 
 -- minim.gno --
 package minim
diff --git a/gnovm/cmd/gno/testdata/test/minim3.txtar b/gnovm/cmd/gno/testdata/test/minim3.txtar
index ac8ae0c41d4..ba1847a21df 100644
--- a/gnovm/cmd/gno/testdata/test/minim3.txtar
+++ b/gnovm/cmd/gno/testdata/test/minim3.txtar
@@ -2,8 +2,8 @@
 
 gno test .
 
-! stdout .+ 
-stderr 'ok      \. 	\d\.\d\ds'
+! stdout .+
+stderr 'ok      \. 	\d+\.\d\ds'
 
 -- minim.gno --
 package minim
diff --git a/gnovm/cmd/gno/testdata/test/multitest_events.txtar b/gnovm/cmd/gno/testdata/test/multitest_events.txtar
index 321c790561a..5cb134f46a1 100644
--- a/gnovm/cmd/gno/testdata/test/multitest_events.txtar
+++ b/gnovm/cmd/gno/testdata/test/multitest_events.txtar
@@ -2,10 +2,10 @@
 
 gno test -print-events .
 
-! stdout .+ 
+! stdout .+
 stderr 'EVENTS: \[{\"type\":\"EventA\",\"attrs\":\[\],\"pkg_path\":\"gno.land/r/.*\",\"func\":\"TestA\"}\]'
 stderr 'EVENTS: \[{\"type\":\"EventB\",\"attrs\":\[{\"key\":\"keyA\",\"value\":\"valA\"}\],\"pkg_path\":\"gno.land/r/.*\",\"func\":\"TestB\"},{\"type\":\"EventC\",\"attrs\":\[{\"key\":\"keyD\",\"value\":\"valD\"}\],\"pkg_path\":\"gno.land/r/.*\",\"func\":\"TestB\"}\]'
-stderr 'ok      \. 	\d\.\d\ds'
+stderr 'ok      \. 	\d+\.\d\ds'
 
 -- valid.gno --
 package valid
diff --git a/gnovm/cmd/gno/testdata/test/output_correct.txtar b/gnovm/cmd/gno/testdata/test/output_correct.txtar
index a8aa878e0a4..3a829e66bee 100644
--- a/gnovm/cmd/gno/testdata/test/output_correct.txtar
+++ b/gnovm/cmd/gno/testdata/test/output_correct.txtar
@@ -5,8 +5,8 @@ gno test -v .
 stdout 'hey'
 stdout 'hru?'
 stderr '=== RUN   file/x_filetest.gno'
-stderr '--- PASS: file/x_filetest.gno \(\d\.\d\ds\)'
-stderr 'ok      \. 	\d\.\d\ds'
+stderr '--- PASS: file/x_filetest.gno \(\d+\.\d\ds\)'
+stderr 'ok      \. 	\d+\.\d\ds'
 
 -- x_filetest.gno --
 package main
diff --git a/gnovm/cmd/gno/testdata/test/output_sync.txtar b/gnovm/cmd/gno/testdata/test/output_sync.txtar
index 45385a7eef9..1d701cc1c7f 100644
--- a/gnovm/cmd/gno/testdata/test/output_sync.txtar
+++ b/gnovm/cmd/gno/testdata/test/output_sync.txtar
@@ -6,8 +6,8 @@ stdout 'hey'
 stdout '^hru\?'
 
 stderr '=== RUN   file/x_filetest.gno'
-stderr '--- PASS: file/x_filetest.gno \(\d\.\d\ds\)'
-stderr 'ok      \. 	\d\.\d\ds'
+stderr '--- PASS: file/x_filetest.gno \(\d+\.\d\ds\)'
+stderr 'ok      \. 	\d+\.\d\ds'
 
 cmp x_filetest.gno x_filetest.gno.golden
 
diff --git a/gnovm/cmd/gno/testdata/test/realm_correct.txtar b/gnovm/cmd/gno/testdata/test/realm_correct.txtar
index ae1212133fd..8b1478d0df7 100644
--- a/gnovm/cmd/gno/testdata/test/realm_correct.txtar
+++ b/gnovm/cmd/gno/testdata/test/realm_correct.txtar
@@ -4,8 +4,8 @@ gno test -v .
 
 ! stdout .+ # stdout should be empty
 stderr '=== RUN   file/x_filetest.gno'
-stderr '--- PASS: file/x_filetest.gno \(\d\.\d\ds\)'
-stderr 'ok      \. 	\d\.\d\ds'
+stderr '--- PASS: file/x_filetest.gno \(\d+\.\d\ds\)'
+stderr 'ok      \. 	\d+\.\d\ds'
 
 -- x_filetest.gno --
 // PKGPATH: gno.land/r/xx
@@ -18,4 +18,4 @@ func main() {
 }
 
 // Realm:
-// switchrealm["gno.land/r/xx"]
\ No newline at end of file
+// switchrealm["gno.land/r/xx"]
diff --git a/gnovm/cmd/gno/testdata/test/realm_sync.txtar b/gnovm/cmd/gno/testdata/test/realm_sync.txtar
index 65a930b2f03..91c83235d15 100644
--- a/gnovm/cmd/gno/testdata/test/realm_sync.txtar
+++ b/gnovm/cmd/gno/testdata/test/realm_sync.txtar
@@ -4,8 +4,8 @@ gno test -v . -update-golden-tests
 
 ! stdout .+ # stdout should be empty
 stderr '=== RUN   file/x_filetest.gno'
-stderr '--- PASS: file/x_filetest.gno \(\d\.\d\ds\)'
-stderr 'ok      \. 	\d\.\d\ds'
+stderr '--- PASS: file/x_filetest.gno \(\d+\.\d\ds\)'
+stderr 'ok      \. 	\d+\.\d\ds'
 
 cmp x_filetest.gno x_filetest.gno.golden
 
diff --git a/gnovm/cmd/gno/testdata/test/valid_filetest.txtar b/gnovm/cmd/gno/testdata/test/valid_filetest.txtar
index 4e24ad9ab08..bd73ce3dc99 100644
--- a/gnovm/cmd/gno/testdata/test/valid_filetest.txtar
+++ b/gnovm/cmd/gno/testdata/test/valid_filetest.txtar
@@ -3,14 +3,14 @@
 gno test .
 
 ! stdout .+
-stderr 'ok      \. 	\d\.\d\ds'
+stderr 'ok      \. 	\d+\.\d\ds'
 
 gno test -v .
 
 stdout 'test'
 stderr '=== RUN   file/valid_filetest.gno'
-stderr '--- PASS: file/valid_filetest.gno \(\d\.\d\ds\)'
-stderr 'ok      \. 	\d\.\d\ds'
+stderr '--- PASS: file/valid_filetest.gno \(\d+\.\d\ds\)'
+stderr 'ok      \. 	\d+\.\d\ds'
 
 -- valid.gno --
 package valid
diff --git a/gnovm/cmd/gno/testdata/test/valid_test.txtar b/gnovm/cmd/gno/testdata/test/valid_test.txtar
index 9590626776c..5a9fe37a4b0 100644
--- a/gnovm/cmd/gno/testdata/test/valid_test.txtar
+++ b/gnovm/cmd/gno/testdata/test/valid_test.txtar
@@ -2,13 +2,13 @@
 
 gno test .
 
-! stdout .+ 
-stderr 'ok      \. 	\d\.\d\ds'
+! stdout .+
+stderr 'ok      \. 	\d+\.\d\ds'
 
 gno test ./...
 
-! stdout .+ 
-stderr 'ok      \. 	\d\.\d\ds'
+! stdout .+
+stderr 'ok      \. 	\d+\.\d\ds'
 
 -- valid.gno --
 package valid

From f4192a6fb8933316a8a27cd44d5cce91914c9512 Mon Sep 17 00:00:00 2001
From: Manfred Touron <94029+moul@users.noreply.github.com>
Date: Tue, 11 Feb 2025 17:23:20 +0100
Subject: [PATCH 04/47] feat(examples): add p/moul/dynreplacer (#3710)

See https://github.com/gnolang/gno/issues/3249#issuecomment-2646045913

Expected usage: homepages that rely on other realms for parts of their
rendered content. This approach simplifies updating the content layout,
enables freeform content, and allows users to toggle blocks, change
their order, or modify the layout itself (including titles, delimiters,
etc.).

---------

Signed-off-by: moul <94029+moul@users.noreply.github.com>
---
 .../p/moul/dynreplacer/dynreplacer.gno        | 111 +++++++++
 .../p/moul/dynreplacer/dynreplacer_test.gno   | 235 ++++++++++++++++++
 examples/gno.land/p/moul/dynreplacer/gno.mod  |   1 +
 3 files changed, 347 insertions(+)
 create mode 100644 examples/gno.land/p/moul/dynreplacer/dynreplacer.gno
 create mode 100644 examples/gno.land/p/moul/dynreplacer/dynreplacer_test.gno
 create mode 100644 examples/gno.land/p/moul/dynreplacer/gno.mod

diff --git a/examples/gno.land/p/moul/dynreplacer/dynreplacer.gno b/examples/gno.land/p/moul/dynreplacer/dynreplacer.gno
new file mode 100644
index 00000000000..ea9687b7570
--- /dev/null
+++ b/examples/gno.land/p/moul/dynreplacer/dynreplacer.gno
@@ -0,0 +1,111 @@
+// Package dynreplacer provides a simple template engine for handling dynamic
+// content replacement. It is similar to strings.Replacer but with lazy
+// execution of replacements, making it more optimization-friendly in several
+// cases. While strings.Replacer requires all replacement values to be computed
+// upfront, dynreplacer only executes the callback functions for placeholders
+// that actually exist in the template, avoiding unnecessary computations.
+//
+// The package ensures efficient, non-recursive replacement of placeholders in a
+// single pass. This lazy evaluation approach is particularly beneficial when:
+// - Some replacement values are expensive to compute
+// - Not all placeholders are guaranteed to be present in the template
+// - Templates are reused with different content
+//
+// Example usage:
+//
+//	r := dynreplacer.New(
+//	    dynreplacer.Pair{":name:", func() string { return "World" }},
+//	    dynreplacer.Pair{":greeting:", func() string { return "Hello" }},
+//	)
+//	result := r.Replace("Hello :name:!") // Returns "Hello World!"
+//
+// The replacer caches computed values, so subsequent calls with the same
+// placeholder will reuse the cached value instead of executing the callback
+// again:
+//
+//	r := dynreplacer.New()
+//	r.RegisterCallback(":expensive:", func() string { return "computed" })
+//	r.Replace("Value1: :expensive:") // Computes the value
+//	r.Replace("Value2: :expensive:") // Uses cached value
+//	r.ClearCache()                   // Force re-computation on next use
+package dynreplacer
+
+import (
+	"strings"
+)
+
+// Replacer manages dynamic placeholders, their associated functions, and cached
+// values.
+type Replacer struct {
+	callbacks    map[string]func() string
+	cachedValues map[string]string
+}
+
+// Pair represents a placeholder and its callback function
+type Pair struct {
+	Placeholder string
+	Callback    func() string
+}
+
+// New creates a new Replacer instance with optional initial replacements.
+// It accepts pairs where each pair consists of a placeholder string and
+// its corresponding callback function.
+//
+// Example:
+//
+//	New(
+//	    Pair{":name:", func() string { return "World" }},
+//	    Pair{":greeting:", func() string { return "Hello" }},
+//	)
+func New(pairs ...Pair) *Replacer {
+	r := &Replacer{
+		callbacks:    make(map[string]func() string),
+		cachedValues: make(map[string]string),
+	}
+
+	for _, pair := range pairs {
+		r.RegisterCallback(pair.Placeholder, pair.Callback)
+	}
+
+	return r
+}
+
+// RegisterCallback associates a placeholder with a function to generate its
+// content.
+func (r *Replacer) RegisterCallback(placeholder string, callback func() string) {
+	r.callbacks[placeholder] = callback
+}
+
+// Replace processes the given layout, replacing placeholders with cached or
+// newly computed values.
+func (r *Replacer) Replace(layout string) string {
+	replacements := []string{}
+
+	// Check for placeholders and compute/retrieve values
+	hasReplacements := false
+	for placeholder, callback := range r.callbacks {
+		if strings.Contains(layout, placeholder) {
+			value, exists := r.cachedValues[placeholder]
+			if !exists {
+				value = callback()
+				r.cachedValues[placeholder] = value
+			}
+			replacements = append(replacements, placeholder, value)
+			hasReplacements = true
+		}
+	}
+
+	// If no replacements were found, return the original layout
+	if !hasReplacements {
+		return layout
+	}
+
+	// Create a strings.Replacer with all computed replacements
+	replacer := strings.NewReplacer(replacements...)
+	return replacer.Replace(layout)
+}
+
+// ClearCache clears all cached values, forcing re-computation on next Replace.
+func (r *Replacer) ClearCache() {
+	r.cachedValues = make(map[string]string)
+}
diff --git a/examples/gno.land/p/moul/dynreplacer/dynreplacer_test.gno b/examples/gno.land/p/moul/dynreplacer/dynreplacer_test.gno
new file mode 100644
index 00000000000..51235a28950
--- /dev/null
+++ b/examples/gno.land/p/moul/dynreplacer/dynreplacer_test.gno
@@ -0,0 +1,235 @@
+package dynreplacer
+
+import (
+	"strings"
+	"testing"
+
+	"gno.land/p/demo/uassert"
+)
+
+func TestNew(t *testing.T) {
+	tests := []struct {
+		name  string
+		pairs []Pair
+	}{
+		{
+			name:  "empty constructor",
+			pairs: []Pair{},
+		},
+		{
+			name: "single pair",
+			pairs: []Pair{
+				{":name:", func() string { return "World" }},
+			},
+		},
+		{
+			name: "multiple pairs",
+			pairs: []Pair{
+				{":greeting:", func() string { return "Hello" }},
+				{":name:", func() string { return "World" }},
+			},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			r := New(tt.pairs...)
+			uassert.True(t, r.callbacks != nil, "callbacks map should be initialized")
+			uassert.True(t, r.cachedValues != nil, "cachedValues map should be initialized")
+
+			// Verify all callbacks were registered
+			for _, pair := range tt.pairs {
+				_, exists := r.callbacks[pair.Placeholder]
+				uassert.True(t, exists, "callback should be registered for "+pair.Placeholder)
+			}
+		})
+	}
+}
+
+func TestReplace(t *testing.T) {
+	tests := []struct {
+		name     string
+		layout   string
+		setup    func(*Replacer)
+		expected string
+	}{
+		{
+			name:     "empty layout",
+			layout:   "",
+			setup:    func(r *Replacer) {},
+			expected: "",
+		},
+		{
+			name:   "single replacement",
+			layout: "Hello :name:!",
+			setup: func(r *Replacer) {
+				r.RegisterCallback(":name:", func() string { return "World" })
+			},
+			expected: "Hello World!",
+		},
+		{
+			name:   "multiple replacements",
+			layout: ":greeting: :name:!",
+			setup: func(r *Replacer) {
+				r.RegisterCallback(":greeting:", func() string { return "Hello" })
+				r.RegisterCallback(":name:", func() string { return "World" })
+			},
+			expected: "Hello World!",
+		},
+		{
+			name:   "no recursive replacement",
+			layout: ":outer:",
+			setup: func(r *Replacer) {
+				r.RegisterCallback(":outer:", func() string { return ":inner:" })
+				r.RegisterCallback(":inner:", func() string { return "content" })
+			},
+			expected: ":inner:",
+		},
+		{
+			name:   "unused callbacks",
+			layout: "Hello :name:!",
+			setup: func(r *Replacer) {
+				r.RegisterCallback(":name:", func() string { return "World" })
+				r.RegisterCallback(":unused:", func() string { return "Never Called" })
+			},
+			expected: "Hello World!",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			r := New()
+			tt.setup(r)
+			result := r.Replace(tt.layout)
+			uassert.Equal(t, tt.expected, result)
+		})
+	}
+}
+
+func TestCaching(t *testing.T) {
+	r := New()
+	callCount := 0
+	r.RegisterCallback(":expensive:", func() string {
+		callCount++
+		return "computed"
+	})
+
+	layout := "Value: :expensive:"
+
+	// First call should compute
+	result1 := r.Replace(layout)
+	uassert.Equal(t, "Value: computed", result1)
+	uassert.Equal(t, 1, callCount)
+
+	// Second call should use cache
+	result2 := r.Replace(layout)
+	uassert.Equal(t, "Value: computed", result2)
+	uassert.Equal(t, 1, callCount)
+
+	// After clearing cache, should recompute
+	r.ClearCache()
+	result3 := r.Replace(layout)
+	uassert.Equal(t, "Value: computed", result3)
+	uassert.Equal(t, 2, callCount)
+}
+
+func TestComplexExample(t *testing.T) {
+	layout := `
+		# Welcome to gno.land
+
+		## Blog
+		:latest-blogposts:
+
+		## Events
+		:next-events:
+
+		## Awesome Gno
+		:awesome-gno:
+	`
+
+	r := New(
+		Pair{":latest-blogposts:", func() string { return "Latest blog posts content here" }},
+		Pair{":next-events:", func() string { return "Upcoming events listed here" }},
+		Pair{":awesome-gno:", func() string { return ":latest-blogposts: (This should NOT be replaced again)" }},
+	)
+
+	result := r.Replace(layout)
+
+	// Check that original placeholders are replaced
+	uassert.True(t, !strings.Contains(result, ":latest-blogposts:\n"), "':latest-blogposts:' placeholder should be replaced")
+	uassert.True(t, !strings.Contains(result, ":next-events:\n"), "':next-events:' placeholder should be replaced")
+	uassert.True(t, !strings.Contains(result, ":awesome-gno:\n"), "':awesome-gno:' placeholder should be replaced")
+
+	// Check that the replacement content is present
+	uassert.True(t, strings.Contains(result, "Latest blog posts content here"), "Blog posts content should be present")
+	uassert.True(t, strings.Contains(result, "Upcoming events listed here"), "Events content should be present")
+	uassert.True(t, strings.Contains(result, ":latest-blogposts: (This should NOT be replaced again)"),
+		"Nested placeholder should not be replaced")
+}
+
+func TestEdgeCases(t *testing.T) {
+	tests := []struct {
+		name     string
+		layout   string
+		setup    func(*Replacer)
+		expected string
+	}{
+		{
+			name:   "empty string placeholder",
+			layout: "Hello :",
+			setup: func(r *Replacer) {
+				r.RegisterCallback("", func() string { return "World" })
+			},
+			expected: "WorldHWorldeWorldlWorldlWorldoWorld World:World",
+		},
+		{
+			name:   "overlapping placeholders",
+			layout: "Hello :name::greeting:",
+			setup: func(r *Replacer) {
+				r.RegisterCallback(":name:", func() string { return "World" })
+				r.RegisterCallback(":greeting:", func() string { return "Hi" })
+				r.RegisterCallback(":name::greeting:", func() string { return "Should not match" })
+			},
+			expected: "Hello WorldHi",
+		},
+		{
+			name:   "replacement order",
+			layout: ":a::b::c:",
+			setup: func(r *Replacer) {
+				r.RegisterCallback(":c:", func() string { return "3" })
+				r.RegisterCallback(":b:", func() string { return "2" })
+				r.RegisterCallback(":a:", func() string { return "1" })
+			},
+			expected: "123",
+		},
+		{
+			name:   "special characters in placeholders",
+			layout: "Hello :$name#123:!",
+			setup: func(r *Replacer) {
+				r.RegisterCallback(":$name#123:", func() string { return "World" })
+			},
+			expected: "Hello World!",
+		},
+		{
+			name:   "multiple occurrences of same placeholder",
+			layout: ":name: and :name: again",
+			setup: func(r *Replacer) {
+				callCount := 0
+				r.RegisterCallback(":name:", func() string {
+					callCount++
+					return "World"
+				})
+			},
+			expected: "World and World again",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			r := New()
+			tt.setup(r)
+			result := r.Replace(tt.layout)
+			uassert.Equal(t, tt.expected, result)
+		})
+	}
+}
diff --git a/examples/gno.land/p/moul/dynreplacer/gno.mod b/examples/gno.land/p/moul/dynreplacer/gno.mod
new file mode 100644
index 00000000000..9e196721f24
--- /dev/null
+++ b/examples/gno.land/p/moul/dynreplacer/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/moul/dynreplacer

From d0201fb33b271139c4fcfce95d96ad31c0ac11a6 Mon Sep 17 00:00:00 2001
From: Emmanuel T Odeke <emmanuel@orijtech.com>
Date: Wed, 12 Feb 2025 12:11:12 +0200
Subject: [PATCH 05/47] perf(tm2/pkg/*): use fmt.Fprintf instead of
 buf.Write([]byte(fmt.Sprintf(...))) expenses (#3732)

In the spirit of following along with PR #3434, this change plumbs more
uses of fmt.Fprint* as well as buf.WriteByte, buf.WriteString where
necessary.
---
 tm2/pkg/amino/codec.go     | 20 ++++++++++----------
 tm2/pkg/amino/wellknown.go |  4 ++--
 tm2/pkg/errors/errors.go   |  2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tm2/pkg/amino/codec.go b/tm2/pkg/amino/codec.go
index ba24f49a808..a441128458a 100644
--- a/tm2/pkg/amino/codec.go
+++ b/tm2/pkg/amino/codec.go
@@ -115,24 +115,24 @@ func (info *TypeInfo) String() string {
 	buf := poolBytesBuffer.Get()
 	defer poolBytesBuffer.Put(buf)
 
-	buf.Write([]byte("TypeInfo{"))
-	buf.Write([]byte(fmt.Sprintf("Type:%v,", info.Type)))
+	buf.WriteString("TypeInfo{")
+	fmt.Fprintf(buf, "Type:%v,", info.Type)
 	if info.ConcreteInfo.Registered {
-		buf.Write([]byte("Registered:true,"))
-		buf.Write([]byte(fmt.Sprintf("PointerPreferred:%v,", info.PointerPreferred)))
-		buf.Write([]byte(fmt.Sprintf("TypeURL:\"%v\",", info.TypeURL)))
+		buf.WriteString("Registered:true,")
+		fmt.Fprintf(buf, "PointerPreferred:%v,", info.PointerPreferred)
+		fmt.Fprintf(buf, "TypeURL:\"%v\",", info.TypeURL)
 	} else {
-		buf.Write([]byte("Registered:false,"))
+		buf.WriteString("Registered:false,")
 	}
 	if info.ReprType == info {
-		buf.Write([]byte(fmt.Sprintf("ReprType:<self>,")))
+		buf.WriteString("ReprType:<self>,")
 	} else {
-		buf.Write([]byte(fmt.Sprintf("ReprType:\"%v\",", info.ReprType)))
+		fmt.Fprintf(buf, "ReprType:\"%v\",", info.ReprType)
 	}
 	if info.Type.Kind() == reflect.Struct {
-		buf.Write([]byte(fmt.Sprintf("Fields:%v,", info.Fields)))
+		fmt.Fprintf(buf, "Fields:%v,", info.Fields)
 	}
-	buf.Write([]byte("}"))
+	buf.WriteByte('}')
 	return buf.String()
 }
 
diff --git a/tm2/pkg/amino/wellknown.go b/tm2/pkg/amino/wellknown.go
index 4053c23e893..53feb77be7e 100644
--- a/tm2/pkg/amino/wellknown.go
+++ b/tm2/pkg/amino/wellknown.go
@@ -425,7 +425,7 @@ func EncodeJSONTimeValue(w io.Writer, s int64, ns int32) (err error) {
 	x = strings.TrimSuffix(x, "000")
 	x = strings.TrimSuffix(x, "000")
 	x = strings.TrimSuffix(x, ".000")
-	_, err = w.Write([]byte(fmt.Sprintf(`"%vZ"`, x)))
+	_, err = fmt.Fprintf(w, `"%vZ"`, x)
 	return err
 }
 
@@ -456,7 +456,7 @@ func EncodeJSONDurationValue(w io.Writer, s int64, ns int32) (err error) {
 	x = strings.TrimSuffix(x, "000")
 	x = strings.TrimSuffix(x, "000")
 	x = strings.TrimSuffix(x, ".000")
-	_, err = w.Write([]byte(fmt.Sprintf(`"%vs"`, x)))
+	_, err = fmt.Fprintf(w, `"%vs"`, x)
 	return err
 }
 
diff --git a/tm2/pkg/errors/errors.go b/tm2/pkg/errors/errors.go
index 1b40c903c41..f465e9898dd 100644
--- a/tm2/pkg/errors/errors.go
+++ b/tm2/pkg/errors/errors.go
@@ -154,7 +154,7 @@ func (err *cmnError) doTrace(msg string, n int) Error {
 func (err *cmnError) Format(s fmt.State, verb rune) {
 	switch {
 	case verb == 'p':
-		s.Write([]byte(fmt.Sprintf("%p", &err)))
+		fmt.Fprintf(s, "%p", &err)
 	case verb == 'v' && s.Flag('+'):
 		s.Write([]byte("--= Error =--\n"))
 		// Write data.

From bb0a7c8cc19148888322e1e9205e9672042a6bde Mon Sep 17 00:00:00 2001
From: Morgan <morgan@morganbaz.com>
Date: Thu, 13 Feb 2025 16:54:43 +0100
Subject: [PATCH 06/47] fix(gno.land): limit gas in simulate and query (#3654)

fixes #3612
fixes #3563
---
 gno.land/pkg/gnoland/app_test.go              |  2 +-
 gno.land/pkg/integration/process_test.go      |  1 -
 .../integration/testdata/addpkg_invalid.txtar |  2 +-
 .../testdata/addpkg_namespace.txtar           |  8 +-
 .../testdata/assertorigincall.txtar           | 38 +++----
 .../pkg/integration/testdata/ghverify.txtar   |  3 +-
 .../testdata/gnokey_simulate.txtar            |  4 +
 .../testdata/grc20_invalid_address.txtar      |  4 +-
 ...roved-coins.txtar => improved_coins.txtar} |  0
 .../integration/testdata/infinite_loop.txtar  | 78 +++++++++++++++
 gno.land/pkg/sdk/vm/gas_test.go               | 18 +---
 gno.land/pkg/sdk/vm/handler.go                | 26 +----
 gno.land/pkg/sdk/vm/handler_test.go           |  5 +
 gno.land/pkg/sdk/vm/keeper.go                 | 98 ++++++++-----------
 tm2/pkg/sdk/auth/ante.go                      |  6 +-
 15 files changed, 166 insertions(+), 127 deletions(-)
 rename gno.land/pkg/integration/testdata/{improved-coins.txtar => improved_coins.txtar} (100%)
 create mode 100644 gno.land/pkg/integration/testdata/infinite_loop.txtar

diff --git a/gno.land/pkg/gnoland/app_test.go b/gno.land/pkg/gnoland/app_test.go
index 361d7505157..5d0de49d457 100644
--- a/gno.land/pkg/gnoland/app_test.go
+++ b/gno.land/pkg/gnoland/app_test.go
@@ -853,7 +853,7 @@ func newGasPriceTestApp(t *testing.T) abci.Application {
 				}
 			}
 
-			newCtx = auth.SetGasMeter(false, ctx, tx.Fee.GasWanted)
+			newCtx = auth.SetGasMeter(ctx, tx.Fee.GasWanted)
 
 			count := getTotalCount(tx)
 
diff --git a/gno.land/pkg/integration/process_test.go b/gno.land/pkg/integration/process_test.go
index b8768ad0e63..56ae16ff596 100644
--- a/gno.land/pkg/integration/process_test.go
+++ b/gno.land/pkg/integration/process_test.go
@@ -25,7 +25,6 @@ func TestMain(m *testing.M) {
 
 	// Check if the embedded command should be executed
 	if !*runCommand {
-		fmt.Println("Running tests...")
 		os.Exit(m.Run())
 	}
 
diff --git a/gno.land/pkg/integration/testdata/addpkg_invalid.txtar b/gno.land/pkg/integration/testdata/addpkg_invalid.txtar
index bcec784a530..cb8edd858d6 100644
--- a/gno.land/pkg/integration/testdata/addpkg_invalid.txtar
+++ b/gno.land/pkg/integration/testdata/addpkg_invalid.txtar
@@ -4,7 +4,7 @@
 gnoland start
 
 # add bar package located in $WORK directory as gno.land/r/foobar/bar
-! gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/foobar/bar -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid=tendermint_test test1
+! gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/foobar/bar -gas-fee 10000000ugnot -gas-wanted 20000000 -broadcast -chainid=tendermint_test test1
 
 # check error message
 stdout 'TX HASH:    '
diff --git a/gno.land/pkg/integration/testdata/addpkg_namespace.txtar b/gno.land/pkg/integration/testdata/addpkg_namespace.txtar
index 2cfd00acda4..e922a290443 100644
--- a/gno.land/pkg/integration/testdata/addpkg_namespace.txtar
+++ b/gno.land/pkg/integration/testdata/addpkg_namespace.txtar
@@ -43,7 +43,7 @@ stdout 'true'
 
 # Try to add a pkg an with unregistered user
 # gui addpkg -> gno.land/r/<addr_test1>/one
-! gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/$test1_user_addr/one -gas-fee 1000000ugnot -gas-wanted 1000000 -broadcast -chainid=tendermint_test gui
+! gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/$test1_user_addr/one -gas-fee 1000000ugnot -gas-wanted 10_000_000 -broadcast -chainid=tendermint_test gui
 stderr 'unauthorized user'
 
 # Try to add a pkg with an unregistered user, on their own address as namespace
@@ -55,8 +55,7 @@ stdout 'OK!'
 
 # Call addpkg with admin user on gui namespace
 # admin addpkg -> gno.land/r/guiland/one
-# This is expected to fail at the transaction simulation stage, which is why we set gas-wanted to 1.
-! gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/guiland/one -gas-fee 1000000ugnot -gas-wanted 1 -broadcast -chainid=tendermint_test admin
+! gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/guiland/one -gas-fee 1000000ugnot -gas-wanted 10_000_000 -broadcast -chainid=tendermint_test admin
 stderr 'unauthorized user'
 
 ## Test registered namespace
@@ -78,8 +77,7 @@ stdout 'OK!'
 
 # Test admin publishing on guiland/two
 # admin addpkg -> gno.land/r/guiland/two
-# This is expected to fail at the transaction simulation stage, which is why we set gas-wanted to 1.
-! gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/guiland/two -gas-fee 1000000ugnot -gas-wanted 1 -broadcast -chainid=tendermint_test admin
+! gnokey maketx addpkg -pkgdir $WORK -pkgpath gno.land/r/guiland/two -gas-fee 1000000ugnot -gas-wanted 10_000_000 -broadcast -chainid=tendermint_test admin
 stderr 'unauthorized user'
 
 -- one.gno --
diff --git a/gno.land/pkg/integration/testdata/assertorigincall.txtar b/gno.land/pkg/integration/testdata/assertorigincall.txtar
index 2c5da25c0aa..f6893bd5ca6 100644
--- a/gno.land/pkg/integration/testdata/assertorigincall.txtar
+++ b/gno.land/pkg/integration/testdata/assertorigincall.txtar
@@ -35,68 +35,68 @@ gnoland start
 
 # Test cases
 ## 1. MsgCall -> myrlm.A: PANIC
-! gnokey maketx call -pkgpath gno.land/r/myrlm -func A -gas-fee 100000ugnot -gas-wanted 1 -broadcast -chainid tendermint_test test1
+! gnokey maketx call -pkgpath gno.land/r/myrlm -func A -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1
 stderr 'invalid non-origin call'
 
 ## 2. MsgCall -> myrlm.B: PASS
-gnokey maketx call -pkgpath gno.land/r/myrlm -func B -gas-fee 100000ugnot -gas-wanted 150000 -broadcast -chainid tendermint_test test1
+gnokey maketx call -pkgpath gno.land/r/myrlm -func B -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1
 stdout 'OK!'
 
 ## 3. MsgCall -> myrlm.C: PASS
-gnokey maketx call -pkgpath gno.land/r/myrlm -func C -gas-fee 100000ugnot -gas-wanted 1500000 -broadcast -chainid tendermint_test test1
+gnokey maketx call -pkgpath gno.land/r/myrlm -func C -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1
 stdout 'OK!'
 
 ## 4. MsgCall -> r/foo.A -> myrlm.A: PANIC
-! gnokey maketx call -pkgpath gno.land/r/foo -func A -gas-fee 100000ugnot -gas-wanted 1 -broadcast -chainid tendermint_test test1
+! gnokey maketx call -pkgpath gno.land/r/foo -func A -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1
 stderr 'invalid non-origin call'
 
 ## 5. MsgCall -> r/foo.B -> myrlm.B: PASS
-gnokey maketx call -pkgpath gno.land/r/foo -func B -gas-fee 100000ugnot -gas-wanted 200000 -broadcast -chainid tendermint_test test1
+gnokey maketx call -pkgpath gno.land/r/foo -func B -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1
 stdout 'OK!'
 
 ## 6. MsgCall -> r/foo.C -> myrlm.C: PANIC
-! gnokey maketx call -pkgpath gno.land/r/foo -func C -gas-fee 100000ugnot -gas-wanted 10000000 -broadcast -chainid tendermint_test test1
+! gnokey maketx call -pkgpath gno.land/r/foo -func C -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1
 stderr 'invalid non-origin call'
 
 ## remove due to update to maketx call can only call realm (case 7,8,9)
 ## 7. MsgCall -> p/demo/bar.A: PANIC
-## ! gnokey maketx call -pkgpath gno.land/p/demo/bar -func A -gas-fee 100000ugnot -gas-wanted 5000000 -broadcast -chainid tendermint_test test1
+## ! gnokey maketx call -pkgpath gno.land/p/demo/bar -func A -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1
 ## stderr 'invalid non-origin call'
 
 ## 8. MsgCall -> p/demo/bar.B: PASS
-## gnokey maketx call -pkgpath gno.land/p/demo/bar -func B -gas-fee 100000ugnot -gas-wanted 5000000 -broadcast -chainid tendermint_test test1
+## gnokey maketx call -pkgpath gno.land/p/demo/bar -func B -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1
 ## stdout 'OK!'
 
 ## 9. MsgCall -> p/demo/bar.C: PANIC
-## ! gnokey maketx call -pkgpath gno.land/p/demo/bar -func C -gas-fee 100000ugnot -gas-wanted 5000000 -broadcast -chainid tendermint_test test1
+## ! gnokey maketx call -pkgpath gno.land/p/demo/bar -func C -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1
 ## stderr 'invalid non-origin call'
 
 ## 10. MsgRun -> run.main -> myrlm.A: PANIC
-! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 5500000 -broadcast -chainid tendermint_test test1 $WORK/run/myrlmA.gno
+! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1 $WORK/run/myrlmA.gno
 stderr 'invalid non-origin call'
 
 ## 11. MsgRun -> run.main -> myrlm.B: PASS
-gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10000000 -broadcast -chainid tendermint_test test1 $WORK/run/myrlmB.gno
+gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1 $WORK/run/myrlmB.gno
 stdout 'OK!'
 
 ## 12. MsgRun -> run.main -> myrlm.C: PANIC
-! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 5500000 -broadcast -chainid tendermint_test test1 $WORK/run/myrlmC.gno
+! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1 $WORK/run/myrlmC.gno
 stderr 'invalid non-origin call'
 
 ## 13. MsgRun -> run.main -> foo.A: PANIC
-! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 5500000 -broadcast -chainid tendermint_test test1 $WORK/run/fooA.gno
+! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1 $WORK/run/fooA.gno
 stderr 'invalid non-origin call'
 
 ## 14. MsgRun -> run.main -> foo.B: PASS
-gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10000000 -broadcast -chainid tendermint_test test1 $WORK/run/fooB.gno
+gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1 $WORK/run/fooB.gno
 stdout 'OK!'
 
 ## 15. MsgRun -> run.main -> foo.C: PANIC
-! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 5500000 -broadcast -chainid tendermint_test test1 $WORK/run/fooC.gno
+! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1 $WORK/run/fooC.gno
 stderr 'invalid non-origin call'
 
 ## 16. MsgRun -> run.main -> bar.A: PANIC
-! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 5500000 -broadcast -chainid tendermint_test test1 $WORK/run/barA.gno
+! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1 $WORK/run/barA.gno
 stderr 'invalid non-origin call'
 
 ## 17. MsgRun -> run.main -> bar.B: PASS
@@ -104,16 +104,16 @@ gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10000000 -broadcast -chainid
 stdout 'OK!'
 
 ## 18. MsgRun -> run.main -> bar.C: PANIC
-! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 5500000 -broadcast -chainid tendermint_test test1 $WORK/run/barC.gno
+! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1 $WORK/run/barC.gno
 stderr 'invalid non-origin call'
 
 ## remove testcase 19 due to maketx call forced to call a realm
 ## 19. MsgCall -> std.AssertOriginCall: pass
-## gnokey maketx call -pkgpath std -func AssertOriginCall -gas-fee 100000ugnot -gas-wanted 10000000 -broadcast -chainid tendermint_test test1
+## gnokey maketx call -pkgpath std -func AssertOriginCall -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1
 ## stdout 'OK!'
 
 ## 20. MsgRun -> std.AssertOriginCall: PANIC
-! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10000000 -broadcast -chainid tendermint_test test1 $WORK/run/baz.gno
+! gnokey maketx run -gas-fee 100000ugnot -gas-wanted 10_000_000 -broadcast -chainid tendermint_test test1 $WORK/run/baz.gno
 stderr 'invalid non-origin call'
 
 
diff --git a/gno.land/pkg/integration/testdata/ghverify.txtar b/gno.land/pkg/integration/testdata/ghverify.txtar
index 0f2d21f6bd5..a5df5e0ca29 100644
--- a/gno.land/pkg/integration/testdata/ghverify.txtar
+++ b/gno.land/pkg/integration/testdata/ghverify.txtar
@@ -20,8 +20,7 @@ gnokey maketx call -pkgpath gno.land/r/gnoland/ghverify -func GetAddressByHandle
 stdout ""
 
 # fail on ingestion with a bad task ID
-# This is expected to fail at the transaction simulation stage, which is why we set gas-wanted to 1.
-! gnokey maketx call -pkgpath gno.land/r/gnoland/ghverify -func GnorkleEntrypoint -args 'ingest,a' -gas-fee 1000000ugnot -gas-wanted 1 -broadcast -chainid=tendermint_test test1
+! gnokey maketx call -pkgpath gno.land/r/gnoland/ghverify -func GnorkleEntrypoint -args 'ingest,a' -gas-fee 1000000ugnot -gas-wanted 10_000_000 -broadcast -chainid=tendermint_test test1
 stderr 'invalid ingest id: a'
 
 # the agent publishes their response to the task and the verification is complete
diff --git a/gno.land/pkg/integration/testdata/gnokey_simulate.txtar b/gno.land/pkg/integration/testdata/gnokey_simulate.txtar
index 31b2249f8bb..438c452295b 100644
--- a/gno.land/pkg/integration/testdata/gnokey_simulate.txtar
+++ b/gno.land/pkg/integration/testdata/gnokey_simulate.txtar
@@ -67,6 +67,10 @@ stdout '"sequence": "5"'
 gnokey query vm/qeval --data "gno.land/r/hello.Hello()"
 stdout 'Hello, George!'
 
+# simulate should panic if gas-wanted is beyond the max block gas.
+! gnokey maketx call -pkgpath gno.land/r/hello -func SetName -args Paul -gas-wanted 100_000_000_000_000 -gas-fee 1000000ugnot -broadcast -chainid tendermint_test -simulate only test1
+stderr 'invalid gas wanted'
+
 -- test/test.gno --
 package test
 
diff --git a/gno.land/pkg/integration/testdata/grc20_invalid_address.txtar b/gno.land/pkg/integration/testdata/grc20_invalid_address.txtar
index 0068384903e..d7c3a7d68cd 100644
--- a/gno.land/pkg/integration/testdata/grc20_invalid_address.txtar
+++ b/gno.land/pkg/integration/testdata/grc20_invalid_address.txtar
@@ -8,6 +8,6 @@ gnokey maketx call -pkgpath gno.land/r/demo/foo20 -func Faucet -gas-fee 10000000
 stdout 'OK!'
 
 # execute Transfer for invalid address
-# This is expected to fail at the transaction simulation stage, which is why we set gas-wanted to 1.
-! gnokey maketx call -pkgpath gno.land/r/demo/foo20 -func Transfer -args g1ubwj0apf60hd90txhnh855fkac34rxlsvua0aa -args 1 -gas-fee 1000000ugnot -gas-wanted 1 -broadcast -chainid=tendermint_test test1
+# This is expected to fail at the transaction simulation stage.
+! gnokey maketx call -pkgpath gno.land/r/demo/foo20 -func Transfer -args g1ubwj0apf60hd90txhnh855fkac34rxlsvua0aa -args 1 -gas-fee 1000000ugnot -gas-wanted 10_000_000 -simulate only -broadcast -chainid=tendermint_test test1
 stderr '"gnokey" error: --= Error =--\nData: invalid address'
diff --git a/gno.land/pkg/integration/testdata/improved-coins.txtar b/gno.land/pkg/integration/testdata/improved_coins.txtar
similarity index 100%
rename from gno.land/pkg/integration/testdata/improved-coins.txtar
rename to gno.land/pkg/integration/testdata/improved_coins.txtar
diff --git a/gno.land/pkg/integration/testdata/infinite_loop.txtar b/gno.land/pkg/integration/testdata/infinite_loop.txtar
new file mode 100644
index 00000000000..30a32bdc588
--- /dev/null
+++ b/gno.land/pkg/integration/testdata/infinite_loop.txtar
@@ -0,0 +1,78 @@
+# regression test for https://github.com/gnolang/gno/issues/3612
+# infinite loops should panic in all of simulate, query, render, maketx run and addpkg.
+
+gnoland start
+
+# addpkg + -simulate skip
+! gnokey maketx addpkg -pkgdir $WORK/r1 -pkgpath gno.land/r/demo/r1 -simulate skip -gas-fee 10000000ugnot -gas-wanted 10_000_000 -broadcast -chainid=tendermint_test test1
+! stdout OK!
+stderr 'out of gas.* location: CPUCycles'
+
+# addpkg + -simulate only
+! gnokey maketx addpkg -pkgdir $WORK/r1 -pkgpath gno.land/r/demo/r1 -simulate only -gas-fee 10000000ugnot -gas-wanted 10_000_000 -broadcast -chainid=tendermint_test test1
+! stdout OK!
+stderr 'out of gas.* location: CPUCycles'
+
+# run + -simulate skip
+! gnokey maketx run -simulate skip -gas-fee 10000000ugnot -gas-wanted 10_000_000 -broadcast -chainid=tendermint_test test1 $WORK/run.gno
+! stdout OK!
+stderr 'out of gas.* location: CPUCycles'
+
+# run + -simulate only
+! gnokey maketx run -simulate only -gas-fee 10000000ugnot -gas-wanted 10_000_000 -broadcast -chainid=tendermint_test test1 $WORK/run.gno
+! stdout OK!
+stderr 'out of gas.* location: CPUCycles'
+
+# maketx addpkg on r2 (successful)
+gnokey maketx addpkg -pkgdir $WORK/r2 -pkgpath gno.land/r/demo/r2 -gas-fee 10000000ugnot -gas-wanted 10_000_000 -broadcast -chainid=tendermint_test test1
+stdout OK!
+
+# qeval on the render function
+! gnokey query vm/qeval --data "gno.land/r/demo/r2.Render(\"helloworld\")"
+stderr 'out of gas.* location: CPUCycles'
+
+# qrender function
+! gnokey query vm/qrender --data 'gno.land/r/demo/r2:noice'
+stderr 'out of gas.* location: CPUCycles'
+
+# call on the render function
+! gnokey maketx call -pkgpath gno.land/r/demo/r2 -func Render -args '' -simulate skip -gas-fee 100000ugnot -gas-wanted 1000000 -broadcast -chainid tendermint_test test1
+stderr 'out of gas.* location: CPUCycles'
+
+# simulated call on the render function
+! gnokey maketx call -pkgpath gno.land/r/demo/r2 -func Render -args '' -simulate only -gas-fee 100000ugnot -gas-wanted 1000000 -broadcast -chainid tendermint_test test1
+stderr 'out of gas.* location: CPUCycles'
+
+-- run.gno --
+package main
+
+func main() {
+	for {}
+
+	println("hey")
+}
+
+-- r1/gno.mod --
+module gno.land/r/demo/r1
+
+
+-- r1/realm.gno --
+package f1
+
+func init() {
+	for {}
+}
+
+func main() {}
+
+-- r2/gno.mod --
+module gno.land/r/demo/r2
+
+
+-- r2/realm.gno --
+package r2
+
+func Render(s string) string {
+	for {}
+	return "hello world!"
+}
diff --git a/gno.land/pkg/sdk/vm/gas_test.go b/gno.land/pkg/sdk/vm/gas_test.go
index acde3d315c6..ff260d39090 100644
--- a/gno.land/pkg/sdk/vm/gas_test.go
+++ b/gno.land/pkg/sdk/vm/gas_test.go
@@ -25,9 +25,8 @@ func TestAddPkgDeliverTxInsuffGas(t *testing.T) {
 	ctx, tx, vmHandler := setupAddPkg(isValidTx)
 
 	ctx = ctx.WithMode(sdk.RunTxModeDeliver)
-	simulate := false
 	tx.Fee.GasWanted = 3000
-	gctx := auth.SetGasMeter(simulate, ctx, tx.Fee.GasWanted)
+	gctx := auth.SetGasMeter(ctx, tx.Fee.GasWanted)
 	// Has to be set up after gas meter in the context; so the stores are
 	// correctly wrapped in gas stores.
 	gctx = vmHandler.vm.MakeGnoTransactionStore(gctx)
@@ -61,12 +60,9 @@ func TestAddPkgDeliverTx(t *testing.T) {
 	isValidTx := true
 	ctx, tx, vmHandler := setupAddPkg(isValidTx)
 
-	var simulate bool
-
 	ctx = ctx.WithMode(sdk.RunTxModeDeliver)
-	simulate = false
 	tx.Fee.GasWanted = 500000
-	gctx := auth.SetGasMeter(simulate, ctx, tx.Fee.GasWanted)
+	gctx := auth.SetGasMeter(ctx, tx.Fee.GasWanted)
 	gctx = vmHandler.vm.MakeGnoTransactionStore(gctx)
 	msgs := tx.GetMsgs()
 	res := vmHandler.Process(gctx, msgs[0])
@@ -83,12 +79,9 @@ func TestAddPkgDeliverTxFailed(t *testing.T) {
 	isValidTx := false
 	ctx, tx, vmHandler := setupAddPkg(isValidTx)
 
-	var simulate bool
-
 	ctx = ctx.WithMode(sdk.RunTxModeDeliver)
-	simulate = false
 	tx.Fee.GasWanted = 500000
-	gctx := auth.SetGasMeter(simulate, ctx, tx.Fee.GasWanted)
+	gctx := auth.SetGasMeter(ctx, tx.Fee.GasWanted)
 	gctx = vmHandler.vm.MakeGnoTransactionStore(gctx)
 	msgs := tx.GetMsgs()
 	res := vmHandler.Process(gctx, msgs[0])
@@ -103,12 +96,9 @@ func TestAddPkgDeliverTxFailedNoGas(t *testing.T) {
 	isValidTx := false
 	ctx, tx, vmHandler := setupAddPkg(isValidTx)
 
-	var simulate bool
-
 	ctx = ctx.WithMode(sdk.RunTxModeDeliver)
-	simulate = false
 	tx.Fee.GasWanted = 1230
-	gctx := auth.SetGasMeter(simulate, ctx, tx.Fee.GasWanted)
+	gctx := auth.SetGasMeter(ctx, tx.Fee.GasWanted)
 	gctx = vmHandler.vm.MakeGnoTransactionStore(gctx)
 
 	var res sdk.Result
diff --git a/gno.land/pkg/sdk/vm/handler.go b/gno.land/pkg/sdk/vm/handler.go
index 5aebf1afe46..af7c79e152d 100644
--- a/gno.land/pkg/sdk/vm/handler.go
+++ b/gno.land/pkg/sdk/vm/handler.go
@@ -68,12 +68,10 @@ func (vh vmHandler) handleMsgRun(ctx sdk.Context, msg MsgRun) (res sdk.Result) {
 
 // query paths
 const (
-	QueryPackage = "package"
-	QueryStore   = "store"
-	QueryRender  = "qrender"
-	QueryFuncs   = "qfuncs"
-	QueryEval    = "qeval"
-	QueryFile    = "qfile"
+	QueryRender = "qrender"
+	QueryFuncs  = "qfuncs"
+	QueryEval   = "qeval"
+	QueryFile   = "qfile"
 )
 
 func (vh vmHandler) Query(ctx sdk.Context, req abci.RequestQuery) abci.ResponseQuery {
@@ -83,10 +81,6 @@ func (vh vmHandler) Query(ctx sdk.Context, req abci.RequestQuery) abci.ResponseQ
 	)
 
 	switch path {
-	case QueryPackage:
-		res = vh.queryPackage(ctx, req)
-	case QueryStore:
-		res = vh.queryStore(ctx, req)
 	case QueryRender:
 		res = vh.queryRender(ctx, req)
 	case QueryFuncs:
@@ -105,18 +99,6 @@ func (vh vmHandler) Query(ctx sdk.Context, req abci.RequestQuery) abci.ResponseQ
 	return res
 }
 
-// queryPackage fetch a package's files.
-func (vh vmHandler) queryPackage(ctx sdk.Context, req abci.RequestQuery) (res abci.ResponseQuery) {
-	res.Data = []byte(fmt.Sprintf("TODO: parse parts get or make fileset..."))
-	return
-}
-
-// queryPackage fetch items from the store.
-func (vh vmHandler) queryStore(ctx sdk.Context, req abci.RequestQuery) (res abci.ResponseQuery) {
-	res.Data = []byte(fmt.Sprintf("TODO: fetch from store"))
-	return
-}
-
 // queryRender calls .Render(<path>) in readonly mode.
 func (vh vmHandler) queryRender(ctx sdk.Context, req abci.RequestQuery) (res abci.ResponseQuery) {
 	reqData := string(req.Data)
diff --git a/gno.land/pkg/sdk/vm/handler_test.go b/gno.land/pkg/sdk/vm/handler_test.go
index 0d238deed1f..a4f39242e3b 100644
--- a/gno.land/pkg/sdk/vm/handler_test.go
+++ b/gno.land/pkg/sdk/vm/handler_test.go
@@ -86,6 +86,10 @@ func TestVmHandlerQuery_Eval(t *testing.T) {
 		{input: []byte(`gno.land/r/hello.sl`), expectedResultMatch: `(slice[ref(.*)] []int)`},    // XXX: should return the actual value
 		{input: []byte(`gno.land/r/hello.sl[1]`), expectedResultMatch: `(slice[ref(.*)] []int)`}, // XXX: should return the actual value
 		{input: []byte(`gno.land/r/hello.println(1234)`), expectedResultMatch: `^$`},             // XXX: compare stdout?
+		{
+			input:          []byte(`gno.land/r/hello.func() string { return "hello123" + pvString }()`),
+			expectedResult: `("hello123private string" string)`,
+		},
 
 		// panics
 		{input: []byte(`gno.land/r/hello`), expectedPanicMatch: `expected <pkgpath>.<expression> syntax in query input data`},
@@ -95,6 +99,7 @@ func TestVmHandlerQuery_Eval(t *testing.T) {
 		{input: []byte(`gno.land/r/doesnotexist.Foo`), expectedErrorMatch: `^invalid package path$`},
 		{input: []byte(`gno.land/r/hello.Panic()`), expectedErrorMatch: `^foo$`},
 		{input: []byte(`gno.land/r/hello.sl[6]`), expectedErrorMatch: `^slice index out of bounds: 6 \(len=5\)$`},
+		{input: []byte(`gno.land/r/hello.func(){ for {} }()`), expectedErrorMatch: `out of gas in location: CPUCycles`},
 	}
 
 	for _, tc := range tt {
diff --git a/gno.land/pkg/sdk/vm/keeper.go b/gno.land/pkg/sdk/vm/keeper.go
index bf16cd44243..1ecf280dc59 100644
--- a/gno.land/pkg/sdk/vm/keeper.go
+++ b/gno.land/pkg/sdk/vm/keeper.go
@@ -39,6 +39,7 @@ import (
 const (
 	maxAllocTx    = 500_000_000
 	maxAllocQuery = 1_500_000_000 // higher limit for queries
+	maxGasQuery   = 3_000_000_000 // same as max block gas
 )
 
 // vm.VMKeeperI defines a module interface that supports Gno
@@ -512,14 +513,31 @@ func (vm *VMKeeper) Call(ctx sdk.Context, msg MsgCall) (res string, err error) {
 
 func doRecover(m *gno.Machine, e *error) {
 	r := recover()
+
+	// On normal transaction execution, out of gas panics are handled in the
+	// BaseApp, so repanic here.
+	const repanicOutOfGas = true
+	doRecoverInternal(m, e, r, repanicOutOfGas)
+}
+
+func doRecoverQuery(m *gno.Machine, e *error) {
+	r := recover()
+	const repanicOutOfGas = false
+	doRecoverInternal(m, e, r, repanicOutOfGas)
+}
+
+func doRecoverInternal(m *gno.Machine, e *error, r any, repanicOutOfGas bool) {
 	if r == nil {
 		return
 	}
 	if err, ok := r.(error); ok {
 		var oog types.OutOfGasError
 		if goerrors.As(err, &oog) {
-			// Re-panic and don't wrap.
-			panic(oog)
+			if repanicOutOfGas {
+				panic(oog)
+			}
+			*e = oog
+			return
 		}
 		var up gno.UnhandledPanicError
 		if goerrors.As(err, &up) {
@@ -708,51 +726,11 @@ func (vm *VMKeeper) QueryFuncs(ctx sdk.Context, pkgPath string) (fsigs FunctionS
 }
 
 // QueryEval evaluates a gno expression (readonly, for ABCI queries).
-// TODO: modify query protocol to allow MsgEval.
-// TODO: then, rename to "Eval".
 func (vm *VMKeeper) QueryEval(ctx sdk.Context, pkgPath string, expr string) (res string, err error) {
-	alloc := gno.NewAllocator(maxAllocQuery)
-	gnostore := vm.newGnoTransactionStore(ctx) // throwaway (never committed)
-	pkgAddr := gno.DerivePkgAddr(pkgPath)
-	// Get Package.
-	pv := gnostore.GetPackage(pkgPath, false)
-	if pv == nil {
-		err = ErrInvalidPkgPath(fmt.Sprintf(
-			"package not found: %s", pkgPath))
-		return "", err
-	}
-	// Parse expression.
-	xx, err := gno.ParseExpr(expr)
+	rtvs, err := vm.queryEvalInternal(ctx, pkgPath, expr)
 	if err != nil {
 		return "", err
 	}
-	// Construct new machine.
-	chainDomain := vm.getChainDomainParam(ctx)
-	msgCtx := stdlibs.ExecContext{
-		ChainID:     ctx.ChainID(),
-		ChainDomain: chainDomain,
-		Height:      ctx.BlockHeight(),
-		Timestamp:   ctx.BlockTime().Unix(),
-		// OrigCaller:    caller,
-		// OrigSend:      send,
-		// OrigSendSpent: nil,
-		OrigPkgAddr: pkgAddr.Bech32(),
-		Banker:      NewSDKBanker(vm, ctx), // safe as long as ctx is a fork to be discarded.
-		Params:      NewSDKParams(vm, ctx),
-		EventLogger: ctx.EventLogger(),
-	}
-	m := gno.NewMachineWithOptions(
-		gno.MachineOptions{
-			PkgPath:  pkgPath,
-			Output:   vm.Output,
-			Store:    gnostore,
-			Context:  msgCtx,
-			Alloc:    alloc,
-			GasMeter: ctx.GasMeter(),
-		})
-	defer m.Release()
-	defer doRecover(m, &err)
-	rtvs := m.Eval(xx)
 	res = ""
 	for i, rtv := range rtvs {
 		res += rtv.String()
@@ -765,9 +743,22 @@ func (vm *VMKeeper) QueryEval(ctx sdk.Context, pkgPath string, expr string) (res
 
 // QueryEvalString evaluates a gno expression (readonly, for ABCI queries).
 // The result is expected to be a single string (not a tuple).
-// TODO: modify query protocol to allow MsgEval.
-// TODO: then, rename to "EvalString".
 func (vm *VMKeeper) QueryEvalString(ctx sdk.Context, pkgPath string, expr string) (res string, err error) {
+	rtvs, err := vm.queryEvalInternal(ctx, pkgPath, expr)
+	if err != nil {
+		return "", err
+	}
+	if len(rtvs) != 1 {
+		return "", errors.New("expected 1 string result, got %d", len(rtvs))
+	} else if rtvs[0].T.Kind() != gno.StringKind {
+		return "", errors.New("expected 1 string result, got %v", rtvs[0].T.Kind())
+	}
+	res = rtvs[0].GetString()
+	return res, nil
+}
+
+func (vm *VMKeeper) queryEvalInternal(ctx sdk.Context, pkgPath string, expr string) (rtvs []gno.TypedValue, err error) {
+	ctx = ctx.WithGasMeter(store.NewGasMeter(maxGasQuery))
 	alloc := gno.NewAllocator(maxAllocQuery)
 	gnostore := vm.newGnoTransactionStore(ctx) // throwaway (never committed)
 	pkgAddr := gno.DerivePkgAddr(pkgPath)
@@ -776,12 +767,12 @@ func (vm *VMKeeper) QueryEvalString(ctx sdk.Context, pkgPath string, expr string
 	if pv == nil {
 		err = ErrInvalidPkgPath(fmt.Sprintf(
 			"package not found: %s", pkgPath))
-		return "", err
+		return nil, err
 	}
 	// Parse expression.
 	xx, err := gno.ParseExpr(expr)
 	if err != nil {
-		return "", err
+		return nil, err
 	}
 	// Construct new machine.
 	chainDomain := vm.getChainDomainParam(ctx)
@@ -791,7 +782,7 @@ func (vm *VMKeeper) QueryEvalString(ctx sdk.Context, pkgPath string, expr string
 		Height:      ctx.BlockHeight(),
 		Timestamp:   ctx.BlockTime().Unix(),
 		// OrigCaller:    caller,
-		// OrigSend:      jsend,
+		// OrigSend:      send,
 		// OrigSendSpent: nil,
 		OrigPkgAddr: pkgAddr.Bech32(),
 		Banker:      NewSDKBanker(vm, ctx), // safe as long as ctx is a fork to be discarded.
@@ -808,15 +799,8 @@ func (vm *VMKeeper) QueryEvalString(ctx sdk.Context, pkgPath string, expr string
 			GasMeter: ctx.GasMeter(),
 		})
 	defer m.Release()
-	defer doRecover(m, &err)
-	rtvs := m.Eval(xx)
-	if len(rtvs) != 1 {
-		return "", errors.New("expected 1 string result, got %d", len(rtvs))
-	} else if rtvs[0].T.Kind() != gno.StringKind {
-		return "", errors.New("expected 1 string result, got %v", rtvs[0].T.Kind())
-	}
-	res = rtvs[0].GetString()
-	return res, nil
+	defer doRecoverQuery(m, &err)
+	return m.Eval(xx), err
 }
 
 func (vm *VMKeeper) QueryFile(ctx sdk.Context, filepath string) (res string, err error) {
diff --git a/tm2/pkg/sdk/auth/ante.go b/tm2/pkg/sdk/auth/ante.go
index f941f398b17..12e47494664 100644
--- a/tm2/pkg/sdk/auth/ante.go
+++ b/tm2/pkg/sdk/auth/ante.go
@@ -67,7 +67,7 @@ func NewAnteHandler(ak AccountKeeper, bank BankKeeperI, sigGasConsumer Signature
 			}
 		}
 
-		newCtx = SetGasMeter(simulate, ctx, tx.Fee.GasWanted)
+		newCtx = SetGasMeter(ctx, tx.Fee.GasWanted)
 
 		// AnteHandlers must have their own defer/recover in order for the BaseApp
 		// to know how much gas was used! This is because the GasMeter is created in
@@ -406,10 +406,10 @@ func EnsureSufficientMempoolFees(ctx sdk.Context, fee std.Fee) sdk.Result {
 }
 
 // SetGasMeter returns a new context with a gas meter set from a given context.
-func SetGasMeter(simulate bool, ctx sdk.Context, gasLimit int64) sdk.Context {
+func SetGasMeter(ctx sdk.Context, gasLimit int64) sdk.Context {
 	// In various cases such as simulation and during the genesis block, we do not
 	// meter any gas utilization.
-	if simulate || ctx.BlockHeight() == 0 {
+	if ctx.BlockHeight() == 0 {
 		return ctx.WithGasMeter(store.NewInfiniteGasMeter())
 	}
 

From bd8f04e69c765dcb1a9801248a19127a1272d9f4 Mon Sep 17 00:00:00 2001
From: Marc Vertes <marc.vertes@tendermint.com>
Date: Thu, 13 Feb 2025 16:56:51 +0100
Subject: [PATCH 07/47] feat(gnovm): enforce size of int and uint to 64 bits on
 all arch. (#3591)

With these changes, `int` and `uint` are always represented in gnovm as
`int64` and `uint64` whatever the underlying hardware architecture.

There should be no change for 64 bits platforms. On other (unsupported)
platforms, `int` and `uint` will be 64 bits instead of hardware size.

Fixes #3288.

---------

Co-authored-by: Morgan <morgan@morganbaz.com>
---
 gno.land/pkg/sdk/vm/convert.go                |   4 +-
 gnovm/pkg/gnolang/gonative.go                 |  20 ++--
 .../gnolang/internal/softfloat/gen/main.go    |   2 +-
 gnovm/pkg/gnolang/op_binary.go                |  56 +++++-----
 gnovm/pkg/gnolang/op_exec.go                  |  10 +-
 gnovm/pkg/gnolang/op_expressions.go           |  10 +-
 gnovm/pkg/gnolang/op_types.go                 |   2 +-
 gnovm/pkg/gnolang/preprocess.go               |   8 +-
 gnovm/pkg/gnolang/uverse.go                   |  18 +--
 gnovm/pkg/gnolang/values.go                   |  35 +++---
 gnovm/pkg/gnolang/values_conversions.go       | 103 +++++++++---------
 gnovm/stdlibs/encoding/base32/base32_test.gno |  25 +----
 gnovm/stdlibs/math/const.gno                  |   2 +-
 gnovm/stdlibs/strconv/atoi_test.gno           |  82 ++++----------
 misc/genstd/util.go                           |   2 +-
 tm2/pkg/overflow/overflow_template.sh         |   5 +-
 16 files changed, 163 insertions(+), 221 deletions(-)

diff --git a/gno.land/pkg/sdk/vm/convert.go b/gno.land/pkg/sdk/vm/convert.go
index dbaabcfbc4b..508953731d8 100644
--- a/gno.land/pkg/sdk/vm/convert.go
+++ b/gno.land/pkg/sdk/vm/convert.go
@@ -50,7 +50,7 @@ func convertArgToGno(arg string, argT gno.Type) (tv gno.TypedValue) {
 					"error parsing int %q: %v",
 					arg, err))
 			}
-			tv.SetInt(int(i64))
+			tv.SetInt(i64)
 			return
 		case gno.Int8Type:
 			assertNoPlusPrefix(arg)
@@ -100,7 +100,7 @@ func convertArgToGno(arg string, argT gno.Type) (tv gno.TypedValue) {
 					"error parsing uint %q: %v",
 					arg, err))
 			}
-			tv.SetUint(uint(u64))
+			tv.SetUint(u64)
 			return
 		case gno.Uint8Type:
 			assertNoPlusPrefix(arg)
diff --git a/gnovm/pkg/gnolang/gonative.go b/gnovm/pkg/gnolang/gonative.go
index 85fc8b70051..a777c1cef3e 100644
--- a/gnovm/pkg/gnolang/gonative.go
+++ b/gnovm/pkg/gnolang/gonative.go
@@ -312,7 +312,7 @@ func go2GnoValue(alloc *Allocator, rv reflect.Value) (tv TypedValue) {
 	case reflect.String:
 		tv.V = alloc.NewString(rv.String())
 	case reflect.Int:
-		tv.SetInt(int(rv.Int()))
+		tv.SetInt(rv.Int())
 	case reflect.Int8:
 		tv.SetInt8(int8(rv.Int()))
 	case reflect.Int16:
@@ -322,7 +322,7 @@ func go2GnoValue(alloc *Allocator, rv reflect.Value) (tv TypedValue) {
 	case reflect.Int64:
 		tv.SetInt64(rv.Int())
 	case reflect.Uint:
-		tv.SetUint(uint(rv.Uint()))
+		tv.SetUint(rv.Uint())
 	case reflect.Uint8:
 		tv.SetUint8(uint8(rv.Uint()))
 	case reflect.Uint16:
@@ -391,7 +391,7 @@ func go2GnoValueUpdate(alloc *Allocator, rlm *Realm, lvl int, tv *TypedValue, rv
 		}
 	case IntKind:
 		if lvl != 0 {
-			tv.SetInt(int(rv.Int()))
+			tv.SetInt(rv.Int())
 		}
 	case Int8Kind:
 		if lvl != 0 {
@@ -411,7 +411,7 @@ func go2GnoValueUpdate(alloc *Allocator, rlm *Realm, lvl int, tv *TypedValue, rv
 		}
 	case UintKind:
 		if lvl != 0 {
-			tv.SetUint(uint(rv.Uint()))
+			tv.SetUint(rv.Uint())
 		}
 	case Uint8Kind:
 		if lvl != 0 {
@@ -627,7 +627,7 @@ func go2GnoValue2(alloc *Allocator, store Store, rv reflect.Value, recursive boo
 	case reflect.String:
 		tv.V = alloc.NewString(rv.String())
 	case reflect.Int:
-		tv.SetInt(int(rv.Int()))
+		tv.SetInt(rv.Int())
 	case reflect.Int8:
 		tv.SetInt8(int8(rv.Int()))
 	case reflect.Int16:
@@ -637,7 +637,7 @@ func go2GnoValue2(alloc *Allocator, store Store, rv reflect.Value, recursive boo
 	case reflect.Int64:
 		tv.SetInt64(rv.Int())
 	case reflect.Uint:
-		tv.SetUint(uint(rv.Uint()))
+		tv.SetUint(rv.Uint())
 	case reflect.Uint8:
 		tv.SetUint8(uint8(rv.Uint()))
 	case reflect.Uint16:
@@ -1032,7 +1032,7 @@ func gno2GoValue(tv *TypedValue, rv reflect.Value) (ret reflect.Value) {
 		case StringType, UntypedStringType:
 			rv.SetString(tv.GetString())
 		case IntType:
-			rv.SetInt(int64(tv.GetInt()))
+			rv.SetInt(tv.GetInt())
 		case Int8Type:
 			rv.SetInt(int64(tv.GetInt8()))
 		case Int16Type:
@@ -1042,7 +1042,7 @@ func gno2GoValue(tv *TypedValue, rv reflect.Value) (ret reflect.Value) {
 		case Int64Type:
 			rv.SetInt(tv.GetInt64())
 		case UintType:
-			rv.SetUint(uint64(tv.GetUint()))
+			rv.SetUint(tv.GetUint())
 		case Uint8Type:
 			rv.SetUint(uint64(tv.GetUint8()))
 		case Uint16Type:
@@ -1222,7 +1222,7 @@ func (m *Machine) doOpArrayLitGoNative() {
 			if kx := x.Elts[i].Key; kx != nil {
 				// XXX why convert? (also see doOpArrayLit())
 				k := kx.(*ConstExpr).ConvertGetInt()
-				rf := rv.Index(k)
+				rf := rv.Index(int(k)) // XXX: k may overflow on 32 bits plaforms.
 				gno2GoValue(&itvs[i], rf)
 			} else {
 				rf := rv.Index(i)
@@ -1261,7 +1261,7 @@ func (m *Machine) doOpSliceLitGoNative() {
 			if kx := x.Elts[i].Key; kx != nil {
 				// XXX why convert? (also see doOpArrayLit())
 				k := kx.(*ConstExpr).ConvertGetInt()
-				rf := rv.Index(k)
+				rf := rv.Index(int(k)) // XXX: k may overflow on 32 bits plaforms.
 				gno2GoValue(&itvs[i], rf)
 			} else {
 				rf := rv.Index(i)
diff --git a/gnovm/pkg/gnolang/internal/softfloat/gen/main.go b/gnovm/pkg/gnolang/internal/softfloat/gen/main.go
index 7c89ff9b5a9..5895b53a93a 100644
--- a/gnovm/pkg/gnolang/internal/softfloat/gen/main.go
+++ b/gnovm/pkg/gnolang/internal/softfloat/gen/main.go
@@ -90,7 +90,7 @@ func gitRoot() (string, error) {
 	}
 	p := wd
 	for {
-		if s, e := os.Stat(filepath.Join(p, ".git")); e == nil && s.IsDir() {
+		if _, e := os.Stat(filepath.Join(p, ".git")); e == nil {
 			return p, nil
 		}
 
diff --git a/gnovm/pkg/gnolang/op_binary.go b/gnovm/pkg/gnolang/op_binary.go
index 0e8eec9db23..42419ec5d54 100644
--- a/gnovm/pkg/gnolang/op_binary.go
+++ b/gnovm/pkg/gnolang/op_binary.go
@@ -1211,8 +1211,8 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 	switch baseOf(lv.T) {
 	case IntType:
 		checkOverflow(func() bool {
-			l := big.NewInt(int64(lv.GetInt()))
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			l := big.NewInt(lv.GetInt())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxInt)) != 1
 		})
@@ -1221,7 +1221,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 	case Int8Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(int64(lv.GetInt8()))
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxInt8)) != 1
 		})
@@ -1230,7 +1230,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 	case Int16Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(int64(lv.GetInt16()))
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxInt16)) != 1
 		})
@@ -1239,7 +1239,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 	case Int32Type, UntypedRuneType:
 		checkOverflow(func() bool {
 			l := big.NewInt(int64(lv.GetInt32()))
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxInt32)) != 1
 		})
@@ -1248,7 +1248,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 	case Int64Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(lv.GetInt64())
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxInt64)) != 1
 		})
@@ -1256,8 +1256,8 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 		lv.SetInt64(lv.GetInt64() << rv.GetUint())
 	case UintType:
 		checkOverflow(func() bool {
-			l := big.NewInt(0).SetUint64(uint64(lv.GetUint()))
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			l := big.NewInt(0).SetUint64(lv.GetUint())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(0).SetUint64(math.MaxUint)) != 1
 		})
@@ -1266,7 +1266,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 	case Uint8Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(0).SetUint64(uint64(lv.GetUint8()))
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxUint8)) != 1
 		})
@@ -1275,7 +1275,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 	case DataByteType:
 		checkOverflow(func() bool {
 			l := big.NewInt(0).SetUint64(uint64(lv.GetDataByte()))
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxUint8)) != 1
 		})
@@ -1284,7 +1284,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 	case Uint16Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(0).SetUint64(uint64(lv.GetUint16()))
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxUint16)) != 1
 		})
@@ -1293,7 +1293,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 	case Uint32Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(0).SetUint64(uint64(lv.GetUint32()))
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxUint32)) != 1
 		})
@@ -1302,7 +1302,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 	case Uint64Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(0).SetUint64(lv.GetUint64())
-			r := big.NewInt(0).Lsh(l, rv.GetUint())
+			r := big.NewInt(0).Lsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(0).SetUint64(math.MaxUint64)) != 1
 		})
@@ -1310,7 +1310,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 		lv.SetUint64(lv.GetUint64() << rv.GetUint())
 	case BigintType, UntypedBigintType:
 		lb := lv.GetBigInt()
-		lb = big.NewInt(0).Lsh(lb, rv.GetUint())
+		lb = big.NewInt(0).Lsh(lb, uint(rv.GetUint()))
 		lv.V = BigintValue{V: lb}
 	default:
 		panic(fmt.Sprintf(
@@ -1335,8 +1335,8 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 	switch baseOf(lv.T) {
 	case IntType:
 		checkOverflow(func() bool {
-			l := big.NewInt(int64(lv.GetInt()))
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			l := big.NewInt(lv.GetInt())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxInt)) != 1
 		})
@@ -1345,7 +1345,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 	case Int8Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(int64(lv.GetInt8()))
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxInt8)) != 1
 		})
@@ -1354,7 +1354,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 	case Int16Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(int64(lv.GetInt16()))
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxInt16)) != 1
 		})
@@ -1363,7 +1363,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 	case Int32Type, UntypedRuneType:
 		checkOverflow(func() bool {
 			l := big.NewInt(int64(lv.GetInt32()))
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxInt32)) != 1
 		})
@@ -1372,7 +1372,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 	case Int64Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(lv.GetInt64())
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxInt64)) != 1
 		})
@@ -1380,8 +1380,8 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 		lv.SetInt64(lv.GetInt64() >> rv.GetUint())
 	case UintType:
 		checkOverflow(func() bool {
-			l := big.NewInt(0).SetUint64(uint64(lv.GetUint()))
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			l := big.NewInt(0).SetUint64(lv.GetUint())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(0).SetUint64(math.MaxUint)) != 1
 		})
@@ -1390,7 +1390,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 	case Uint8Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(0).SetUint64(uint64(lv.GetUint8()))
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxUint8)) != 1
 		})
@@ -1399,7 +1399,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 	case DataByteType:
 		checkOverflow(func() bool {
 			l := big.NewInt(0).SetUint64(uint64(lv.GetDataByte()))
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxUint8)) != 1
 		})
@@ -1408,7 +1408,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 	case Uint16Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(0).SetUint64(uint64(lv.GetUint16()))
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxUint16)) != 1
 		})
@@ -1417,7 +1417,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 	case Uint32Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(0).SetUint64(uint64(lv.GetUint32()))
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(math.MaxUint32)) != 1
 		})
@@ -1426,7 +1426,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 	case Uint64Type:
 		checkOverflow(func() bool {
 			l := big.NewInt(0).SetUint64(lv.GetUint64())
-			r := big.NewInt(0).Rsh(l, rv.GetUint())
+			r := big.NewInt(0).Rsh(l, uint(rv.GetUint()))
 
 			return r.Cmp(big.NewInt(0).SetUint64(math.MaxUint64)) != 1
 		})
@@ -1434,7 +1434,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 		lv.SetUint64(lv.GetUint64() >> rv.GetUint())
 	case BigintType, UntypedBigintType:
 		lb := lv.GetBigInt()
-		lb = big.NewInt(0).Rsh(lb, rv.GetUint())
+		lb = big.NewInt(0).Rsh(lb, uint(rv.GetUint()))
 		lv.V = BigintValue{V: lb}
 	default:
 		panic(fmt.Sprintf(
diff --git a/gnovm/pkg/gnolang/op_exec.go b/gnovm/pkg/gnolang/op_exec.go
index 5f71ffefa0c..d81c15956d2 100644
--- a/gnovm/pkg/gnolang/op_exec.go
+++ b/gnovm/pkg/gnolang/op_exec.go
@@ -166,7 +166,7 @@ func (m *Machine) doOpExec(op Op) {
 		case -1: // assign list element.
 			if bs.Key != nil {
 				iv := TypedValue{T: IntType}
-				iv.SetInt(bs.ListIndex)
+				iv.SetInt(int64(bs.ListIndex))
 				switch bs.Op {
 				case ASSIGN:
 					m.PopAsPointer(bs.Key).Assign2(m.Alloc, m.Store, m.Realm, iv, false)
@@ -180,7 +180,7 @@ func (m *Machine) doOpExec(op Op) {
 			}
 			if bs.Value != nil {
 				iv := TypedValue{T: IntType}
-				iv.SetInt(bs.ListIndex)
+				iv.SetInt(int64(bs.ListIndex))
 				ev := xv.GetPointerAtIndex(m.Alloc, m.Store, &iv).Deref()
 				switch bs.Op {
 				case ASSIGN:
@@ -262,7 +262,7 @@ func (m *Machine) doOpExec(op Op) {
 		case -1: // assign list element.
 			if bs.Key != nil {
 				iv := TypedValue{T: IntType}
-				iv.SetInt(bs.ListIndex)
+				iv.SetInt(int64(bs.ListIndex))
 				switch bs.Op {
 				case ASSIGN:
 					m.PopAsPointer(bs.Key).Assign2(m.Alloc, m.Store, m.Realm, iv, false)
@@ -904,7 +904,7 @@ func (m *Machine) doOpSwitchClause() {
 	// caiv := m.PeekValue(2) // switch clause case index (reuse)
 	cliv := m.PeekValue(3) // switch clause index (reuse)
 	idx := cliv.GetInt()
-	if idx >= len(ss.Clauses) {
+	if int(idx) >= len(ss.Clauses) {
 		// no clauses matched: do nothing.
 		m.PopStmt()  // pop switch stmt
 		m.PopValue() // pop switch tag value
@@ -980,7 +980,7 @@ func (m *Machine) doOpSwitchClauseCase() {
 		clidx := cliv.GetInt()
 		cl := ss.Clauses[clidx]
 		caidx := caiv.GetInt()
-		if (caidx + 1) < len(cl.Cases) {
+		if int(caidx+1) < len(cl.Cases) {
 			// try next clause case.
 			m.PushOp(OpSwitchClauseCase) // TODO consider sticky
 			caiv.SetInt(caidx + 1)
diff --git a/gnovm/pkg/gnolang/op_expressions.go b/gnovm/pkg/gnolang/op_expressions.go
index c0f6225740b..475a91580ad 100644
--- a/gnovm/pkg/gnolang/op_expressions.go
+++ b/gnovm/pkg/gnolang/op_expressions.go
@@ -91,15 +91,15 @@ func (m *Machine) doOpSlice() {
 	var lowVal, highVal, maxVal int = -1, -1, -1
 	// max
 	if sx.Max != nil {
-		maxVal = m.PopValue().ConvertGetInt()
+		maxVal = int(m.PopValue().ConvertGetInt())
 	}
 	// high
 	if sx.High != nil {
-		highVal = m.PopValue().ConvertGetInt()
+		highVal = int(m.PopValue().ConvertGetInt())
 	}
 	// low
 	if sx.Low != nil {
-		lowVal = m.PopValue().ConvertGetInt()
+		lowVal = int(m.PopValue().ConvertGetInt())
 	} else {
 		lowVal = 0
 	}
@@ -513,7 +513,7 @@ func (m *Machine) doOpArrayLit() {
 		al, ad := av.List, av.Data
 		vs := m.PopValues(ne)
 		set := make([]bool, bt.Len)
-		idx := 0
+		var idx int64
 		for i, v := range vs {
 			if kx := x.Elts[i].Key; kx != nil {
 				// XXX why convert?
@@ -593,7 +593,7 @@ func (m *Machine) doOpSliceLit2() {
 	// peek slice type.
 	st := m.PeekValue(1).V.(TypeValue).Type
 	// calculate maximum index.
-	maxVal := 0
+	var maxVal int64
 	for i := 0; i < el; i++ {
 		itv := tvs[i*2+0]
 		idx := itv.ConvertGetInt()
diff --git a/gnovm/pkg/gnolang/op_types.go b/gnovm/pkg/gnolang/op_types.go
index f7f3f75f91d..e3003066037 100644
--- a/gnovm/pkg/gnolang/op_types.go
+++ b/gnovm/pkg/gnolang/op_types.go
@@ -47,7 +47,7 @@ func (m *Machine) doOpArrayType() {
 				panic("unexpected untyped const type for array type len during runtime")
 			}
 		}
-		t.Len = lv.GetInt() // TODO lazy convert?
+		t.Len = int(lv.GetInt()) // TODO lazy convert?
 	}
 	tv := m.PeekValue(1) // re-use
 	t.Elt = tv.GetType()
diff --git a/gnovm/pkg/gnolang/preprocess.go b/gnovm/pkg/gnolang/preprocess.go
index 0b86449b235..26e67e71fad 100644
--- a/gnovm/pkg/gnolang/preprocess.go
+++ b/gnovm/pkg/gnolang/preprocess.go
@@ -1814,7 +1814,7 @@ func preprocess1(store Store, ctx BlockNode, n Node) Node {
 							if elt.Key == nil {
 								idx++
 							} else {
-								k := evalConst(store, last, elt.Key).ConvertGetInt()
+								k := int(evalConst(store, last, elt.Key).ConvertGetInt())
 								if idx <= k {
 									idx = k + 1
 								} else {
@@ -1827,7 +1827,7 @@ func preprocess1(store Store, ctx BlockNode, n Node) Node {
 						// at.Vrd = false
 						at.Len = idx
 						// update node
-						cx := constInt(n, idx)
+						cx := constInt(n, int64(idx))
 						n.Type.(*ArrayTypeExpr).Len = cx
 					}
 				}
@@ -3381,7 +3381,7 @@ func evalConst(store Store, last BlockNode, x Expr) *ConstExpr {
 			switch fv.Name {
 			case "cap", "len":
 				tv := TypedValue{T: IntType}
-				tv.SetInt(ar.Len)
+				tv.SetInt(int64(ar.Len))
 				cx = &ConstExpr{
 					Source:     x,
 					TypedValue: tv,
@@ -5010,7 +5010,7 @@ func tryPredefine(store Store, last BlockNode, d Decl) (un Name) {
 	return ""
 }
 
-func constInt(source Expr, i int) *ConstExpr {
+func constInt(source Expr, i int64) *ConstExpr {
 	cx := &ConstExpr{Source: source}
 	cx.T = IntType
 	cx.SetInt(i)
diff --git a/gnovm/pkg/gnolang/uverse.go b/gnovm/pkg/gnolang/uverse.go
index 975038314ad..bfa4a6c65a7 100644
--- a/gnovm/pkg/gnolang/uverse.go
+++ b/gnovm/pkg/gnolang/uverse.go
@@ -637,7 +637,7 @@ func makeUverseNode() {
 				T: IntType,
 				V: nil,
 			}
-			res0.SetInt(arg0.TV.GetCapacity())
+			res0.SetInt(int64(arg0.TV.GetCapacity()))
 			m.PushValue(res0)
 			return
 		},
@@ -693,7 +693,7 @@ func makeUverseNode() {
 						T: IntType,
 						V: nil,
 					}
-					res0.SetInt(minl)
+					res0.SetInt(int64(minl))
 					m.PushValue(res0)
 					return
 				case *SliceType:
@@ -719,7 +719,7 @@ func makeUverseNode() {
 						T: IntType,
 						V: nil,
 					}
-					res0.SetInt(minl)
+					res0.SetInt(int64(minl))
 					m.PushValue(res0)
 					return
 				case *NativeType:
@@ -791,7 +791,7 @@ func makeUverseNode() {
 				T: IntType,
 				V: nil,
 			}
-			res0.SetInt(arg0.TV.GetLength())
+			res0.SetInt(int64(arg0.TV.GetLength()))
 			m.PushValue(res0)
 			return
 		},
@@ -814,7 +814,7 @@ func makeUverseNode() {
 				et := bt.Elem()
 				if vargsl == 1 {
 					lv := vargs.TV.GetPointerAtIndexInt(m.Store, 0).Deref()
-					li := lv.ConvertGetInt()
+					li := int(lv.ConvertGetInt())
 					if et.Kind() == Uint8Kind {
 						arrayValue := m.Alloc.NewDataArray(li)
 						m.PushValue(TypedValue{
@@ -840,9 +840,9 @@ func makeUverseNode() {
 					}
 				} else if vargsl == 2 {
 					lv := vargs.TV.GetPointerAtIndexInt(m.Store, 0).Deref()
-					li := lv.ConvertGetInt()
+					li := int(lv.ConvertGetInt())
 					cv := vargs.TV.GetPointerAtIndexInt(m.Store, 1).Deref()
-					ci := cv.ConvertGetInt()
+					ci := int(cv.ConvertGetInt())
 
 					if ci < li {
 						panic(&Exception{Value: typedString(`makeslice: cap out of range`)})
@@ -896,7 +896,7 @@ func makeUverseNode() {
 					return
 				} else if vargsl == 1 {
 					lv := vargs.TV.GetPointerAtIndexInt(m.Store, 0).Deref()
-					li := lv.ConvertGetInt()
+					li := int(lv.ConvertGetInt())
 					m.PushValue(TypedValue{
 						T: tt,
 						V: m.Alloc.NewMap(li),
@@ -926,7 +926,7 @@ func makeUverseNode() {
 						return
 					} else if vargsl == 1 {
 						sv := vargs.TV.GetPointerAtIndexInt(m.Store, 0).Deref()
-						si := sv.ConvertGetInt()
+						si := int(sv.ConvertGetInt())
 						m.PushValue(TypedValue{
 							T: tt,
 							V: m.Alloc.NewNative(
diff --git a/gnovm/pkg/gnolang/values.go b/gnovm/pkg/gnolang/values.go
index 3bfd7c0286f..ef537502bda 100644
--- a/gnovm/pkg/gnolang/values.go
+++ b/gnovm/pkg/gnolang/values.go
@@ -1116,7 +1116,7 @@ func (tv *TypedValue) PrimitiveBytes() (data []byte) {
 	case UintType, Uint64Type:
 		data = make([]byte, 8)
 		binary.LittleEndian.PutUint64(
-			data, uint64(tv.GetUint()))
+			data, tv.GetUint())
 		return data
 	case Float32Type:
 		data = make([]byte, 4)
@@ -1190,7 +1190,7 @@ func (tv *TypedValue) GetString() string {
 	return string(tv.V.(StringValue))
 }
 
-func (tv *TypedValue) SetInt(n int) {
+func (tv *TypedValue) SetInt(n int64) {
 	if debug {
 		if tv.T.Kind() != IntKind || isNative(tv.T) {
 			panic(fmt.Sprintf(
@@ -1198,19 +1198,16 @@ func (tv *TypedValue) SetInt(n int) {
 				tv.T.String()))
 		}
 	}
-	// XXX probably should be coerced into int64 for determinism.
-	// XXX otherwise, all nodes must run in 64bit.
-	// XXX alternatively, require 64bit.
-	*(*int)(unsafe.Pointer(&tv.N)) = n
+	*(*int64)(unsafe.Pointer(&tv.N)) = n
 }
 
-func (tv *TypedValue) ConvertGetInt() int {
+func (tv *TypedValue) ConvertGetInt() int64 {
 	var store Store = nil // not used
 	ConvertTo(nilAllocator, store, tv, IntType, false)
 	return tv.GetInt()
 }
 
-func (tv *TypedValue) GetInt() int {
+func (tv *TypedValue) GetInt() int64 {
 	if debug {
 		if tv.T != nil && tv.T.Kind() != IntKind {
 			panic(fmt.Sprintf(
@@ -1218,7 +1215,7 @@ func (tv *TypedValue) GetInt() int {
 				tv.T.String()))
 		}
 	}
-	return *(*int)(unsafe.Pointer(&tv.N))
+	return *(*int64)(unsafe.Pointer(&tv.N))
 }
 
 func (tv *TypedValue) SetInt8(n int8) {
@@ -1309,7 +1306,7 @@ func (tv *TypedValue) GetInt64() int64 {
 	return *(*int64)(unsafe.Pointer(&tv.N))
 }
 
-func (tv *TypedValue) SetUint(n uint) {
+func (tv *TypedValue) SetUint(n uint64) {
 	if debug {
 		if tv.T.Kind() != UintKind || isNative(tv.T) {
 			panic(fmt.Sprintf(
@@ -1317,10 +1314,10 @@ func (tv *TypedValue) SetUint(n uint) {
 				tv.T.String()))
 		}
 	}
-	*(*uint)(unsafe.Pointer(&tv.N)) = n
+	*(*uint64)(unsafe.Pointer(&tv.N)) = n
 }
 
-func (tv *TypedValue) GetUint() uint {
+func (tv *TypedValue) GetUint() uint64 {
 	if debug {
 		if tv.T != nil && tv.T.Kind() != UintKind {
 			panic(fmt.Sprintf(
@@ -1328,7 +1325,7 @@ func (tv *TypedValue) GetUint() uint {
 				tv.T.String()))
 		}
 	}
-	return *(*uint)(unsafe.Pointer(&tv.N))
+	return *(*uint64)(unsafe.Pointer(&tv.N))
 }
 
 func (tv *TypedValue) SetUint8(n uint8) {
@@ -1971,7 +1968,7 @@ func (tv *TypedValue) GetPointerToFromTV(alloc *Allocator, store Store, path Val
 // Convenience for GetPointerAtIndex().  Slow.
 func (tv *TypedValue) GetPointerAtIndexInt(store Store, ii int) PointerValue {
 	iv := TypedValue{T: IntType}
-	iv.SetInt(ii)
+	iv.SetInt(int64(ii))
 	return tv.GetPointerAtIndex(nilAllocator, store, &iv)
 }
 
@@ -1980,7 +1977,7 @@ func (tv *TypedValue) GetPointerAtIndex(alloc *Allocator, store Store, iv *Typed
 	case PrimitiveType:
 		if bt == StringType || bt == UntypedStringType {
 			sv := tv.GetString()
-			ii := iv.ConvertGetInt()
+			ii := int(iv.ConvertGetInt())
 			bv := &TypedValue{ // heap alloc
 				T: Uint8Type,
 			}
@@ -2003,14 +2000,14 @@ func (tv *TypedValue) GetPointerAtIndex(alloc *Allocator, store Store, iv *Typed
 			tv.T.String()))
 	case *ArrayType:
 		av := tv.V.(*ArrayValue)
-		ii := iv.ConvertGetInt()
+		ii := int(iv.ConvertGetInt())
 		return av.GetPointerAtIndexInt2(store, ii, bt.Elt)
 	case *SliceType:
 		if tv.V == nil {
 			panic("nil slice index (out of bounds)")
 		}
 		sv := tv.V.(*SliceValue)
-		ii := iv.ConvertGetInt()
+		ii := int(iv.ConvertGetInt())
 		return sv.GetPointerAtIndexInt2(store, ii, bt.Elt)
 	case *MapType:
 		if tv.V == nil {
@@ -2032,7 +2029,7 @@ func (tv *TypedValue) GetPointerAtIndex(alloc *Allocator, store Store, iv *Typed
 		rv := nv.Value
 		switch rt.Kind() {
 		case reflect.Array, reflect.Slice, reflect.String:
-			ii := iv.ConvertGetInt()
+			ii := int(iv.ConvertGetInt())
 			erv := rv.Index(ii)
 			etv := go2GnoValue(alloc, erv)
 			return PointerValue{
@@ -2654,7 +2651,7 @@ func defaultTypedValue(alloc *Allocator, t Type) TypedValue {
 
 func typedInt(i int) TypedValue {
 	tv := TypedValue{T: IntType}
-	tv.SetInt(i)
+	tv.SetInt(int64(i))
 	return tv
 }
 
diff --git a/gnovm/pkg/gnolang/values_conversions.go b/gnovm/pkg/gnolang/values_conversions.go
index e1c9378fe67..f6e39bd1912 100644
--- a/gnovm/pkg/gnolang/values_conversions.go
+++ b/gnovm/pkg/gnolang/values_conversions.go
@@ -130,13 +130,13 @@ GNO_CASE:
 			tv.T = t
 			tv.SetInt32(x)
 		case Int64Kind:
-			x := int64(tv.GetInt())
+			x := tv.GetInt()
 			tv.T = t
 			tv.SetInt64(x)
 		case UintKind:
 			validate(IntKind, UintKind, func() bool { return tv.GetInt() >= 0 })
 
-			x := uint(tv.GetInt())
+			x := uint64(tv.GetInt())
 			tv.T = t
 			tv.SetUint(x)
 		case Uint8Kind:
@@ -164,11 +164,11 @@ GNO_CASE:
 			tv.T = t
 			tv.SetUint64(x)
 		case Float32Kind:
-			x := softfloat.Fintto32(int64(tv.GetInt()))
+			x := softfloat.Fintto32(tv.GetInt())
 			tv.T = t
 			tv.SetFloat32(x)
 		case Float64Kind:
-			x := softfloat.Fintto64(int64(tv.GetInt()))
+			x := softfloat.Fintto64(tv.GetInt())
 			tv.T = t
 			tv.SetFloat64(x)
 		case StringKind:
@@ -184,7 +184,7 @@ GNO_CASE:
 	case Int8Kind:
 		switch k {
 		case IntKind:
-			x := int(tv.GetInt8())
+			x := int64(tv.GetInt8())
 			tv.T = t
 			tv.SetInt(x)
 		case Int8Kind:
@@ -206,7 +206,7 @@ GNO_CASE:
 		case UintKind:
 			validate(Int8Kind, UintKind, func() bool { return tv.GetInt8() >= 0 })
 
-			x := uint(tv.GetInt8())
+			x := uint64(tv.GetInt8())
 			tv.T = t
 			tv.SetUint(x)
 		case Uint8Kind:
@@ -253,7 +253,7 @@ GNO_CASE:
 	case Int16Kind:
 		switch k {
 		case IntKind:
-			x := int(tv.GetInt16())
+			x := int64(tv.GetInt16())
 			tv.T = t
 			tv.SetInt(x)
 		case Int8Kind:
@@ -277,7 +277,7 @@ GNO_CASE:
 		case UintKind:
 			validate(Int16Kind, UintKind, func() bool { return tv.GetInt16() >= 0 })
 
-			x := uint(tv.GetInt16())
+			x := uint64(tv.GetInt16())
 			tv.T = t
 			tv.SetUint(x)
 		case Uint8Kind:
@@ -326,7 +326,7 @@ GNO_CASE:
 	case Int32Kind:
 		switch k {
 		case IntKind:
-			x := int(tv.GetInt32())
+			x := int64(tv.GetInt32())
 			tv.T = t
 			tv.SetInt(x)
 		case Int8Kind:
@@ -352,7 +352,7 @@ GNO_CASE:
 		case UintKind:
 			validate(Int32Kind, UintKind, func() bool { return tv.GetInt32() >= 0 })
 
-			x := uint(tv.GetInt32())
+			x := uint64(tv.GetInt32())
 			tv.T = t
 			tv.SetUint(x)
 		case Uint8Kind:
@@ -401,7 +401,7 @@ GNO_CASE:
 	case Int64Kind:
 		switch k {
 		case IntKind:
-			x := int(tv.GetInt64())
+			x := tv.GetInt64()
 			tv.T = t
 			tv.SetInt(x)
 		case Int8Kind:
@@ -429,7 +429,7 @@ GNO_CASE:
 		case UintKind:
 			validate(Int64Kind, UintKind, func() bool { return tv.GetInt64() >= 0 && uint(tv.GetInt64()) <= math.MaxUint })
 
-			x := uint(tv.GetInt64())
+			x := uint64(tv.GetInt64())
 			tv.T = t
 			tv.SetUint(x)
 		case Uint8Kind:
@@ -480,7 +480,7 @@ GNO_CASE:
 		case IntKind:
 			validate(UintKind, IntKind, func() bool { return tv.GetUint() <= math.MaxInt })
 
-			x := int(tv.GetUint())
+			x := int64(tv.GetUint())
 			tv.T = t
 			tv.SetInt(x)
 		case Int8Kind:
@@ -502,7 +502,7 @@ GNO_CASE:
 			tv.T = t
 			tv.SetInt32(x)
 		case Int64Kind:
-			validate(UintKind, Int64Kind, func() bool { return uint64(tv.GetUint()) <= math.MaxInt64 })
+			validate(UintKind, Int64Kind, func() bool { return tv.GetUint() <= math.MaxInt64 })
 
 			x := int64(tv.GetUint())
 			tv.T = t
@@ -530,15 +530,15 @@ GNO_CASE:
 			tv.T = t
 			tv.SetUint32(x)
 		case Uint64Kind:
-			x := uint64(tv.GetUint())
+			x := tv.GetUint()
 			tv.T = t
 			tv.SetUint64(x)
 		case Float32Kind:
-			x := softfloat.Fuint64to32(uint64(tv.GetUint()))
+			x := softfloat.Fuint64to32(tv.GetUint())
 			tv.T = t
 			tv.SetFloat32(x)
 		case Float64Kind:
-			x := softfloat.Fuint64to64(uint64(tv.GetUint()))
+			x := softfloat.Fuint64to64(tv.GetUint())
 			tv.T = t
 			tv.SetFloat64(x)
 		case StringKind:
@@ -555,7 +555,7 @@ GNO_CASE:
 	case Uint8Kind:
 		switch k {
 		case IntKind:
-			x := int(tv.GetUint8())
+			x := int64(tv.GetUint8())
 			tv.T = t
 			tv.SetInt(x)
 		case Int8Kind:
@@ -565,13 +565,13 @@ GNO_CASE:
 			tv.T = t
 			tv.SetInt8(x)
 		case Int16Kind:
-			validate(Uint8Kind, Int16Kind, func() bool { return int(tv.GetUint8()) <= math.MaxInt16 })
+			validate(Uint8Kind, Int16Kind, func() bool { return int64(tv.GetUint8()) <= math.MaxInt16 })
 
 			x := int16(tv.GetUint8())
 			tv.T = t
 			tv.SetInt16(x)
 		case Int32Kind:
-			validate(Uint8Kind, Int32Kind, func() bool { return int(tv.GetUint8()) <= math.MaxInt32 })
+			validate(Uint8Kind, Int32Kind, func() bool { return int64(tv.GetUint8()) <= math.MaxInt32 })
 
 			x := int32(tv.GetUint8())
 			tv.T = t
@@ -583,7 +583,7 @@ GNO_CASE:
 			tv.T = t
 			tv.SetInt64(x)
 		case UintKind:
-			x := uint(tv.GetUint8())
+			x := uint64(tv.GetUint8())
 			tv.T = t
 			tv.SetUint(x)
 		case Uint8Kind:
@@ -624,7 +624,7 @@ GNO_CASE:
 	case Uint16Kind:
 		switch k {
 		case IntKind:
-			x := int(tv.GetUint16())
+			x := int64(tv.GetUint16())
 			tv.T = t
 			tv.SetInt(x)
 		case Int8Kind:
@@ -640,7 +640,7 @@ GNO_CASE:
 			tv.T = t
 			tv.SetInt16(x)
 		case Int32Kind:
-			validate(Uint16Kind, Int32Kind, func() bool { return int(tv.GetUint16()) <= math.MaxInt32 })
+			validate(Uint16Kind, Int32Kind, func() bool { return int64(tv.GetUint16()) <= math.MaxInt32 })
 
 			x := int32(tv.GetUint16())
 			tv.T = t
@@ -652,11 +652,11 @@ GNO_CASE:
 			tv.T = t
 			tv.SetInt64(x)
 		case UintKind:
-			x := uint(tv.GetUint16())
+			x := uint64(tv.GetUint16())
 			tv.T = t
 			tv.SetUint(x)
 		case Uint8Kind:
-			validate(Uint16Kind, Uint8Kind, func() bool { return int(tv.GetUint16()) <= math.MaxUint8 })
+			validate(Uint16Kind, Uint8Kind, func() bool { return int64(tv.GetUint16()) <= math.MaxUint8 })
 
 			x := uint8(tv.GetUint16())
 			tv.T = t
@@ -695,25 +695,25 @@ GNO_CASE:
 	case Uint32Kind:
 		switch k {
 		case IntKind:
-			validate(Uint32Kind, IntKind, func() bool { return int(tv.GetUint32()) <= math.MaxInt })
+			validate(Uint32Kind, IntKind, func() bool { return int64(tv.GetUint32()) <= math.MaxInt })
 
-			x := int(tv.GetUint32())
+			x := int64(tv.GetUint32())
 			tv.T = t
 			tv.SetInt(x)
 		case Int8Kind:
-			validate(Uint32Kind, Int8Kind, func() bool { return int(tv.GetUint32()) <= math.MaxInt8 })
+			validate(Uint32Kind, Int8Kind, func() bool { return int64(tv.GetUint32()) <= math.MaxInt8 })
 
 			x := int8(tv.GetUint32())
 			tv.T = t
 			tv.SetInt8(x)
 		case Int16Kind:
-			validate(Uint32Kind, Int16Kind, func() bool { return int(tv.GetUint32()) <= math.MaxInt16 })
+			validate(Uint32Kind, Int16Kind, func() bool { return int64(tv.GetUint32()) <= math.MaxInt16 })
 
 			x := int16(tv.GetUint32())
 			tv.T = t
 			tv.SetInt16(x)
 		case Int32Kind:
-			validate(Uint32Kind, Int32Kind, func() bool { return int(tv.GetUint32()) <= math.MaxInt32 })
+			validate(Uint32Kind, Int32Kind, func() bool { return int64(tv.GetUint32()) <= math.MaxInt32 })
 
 			x := int32(tv.GetUint32())
 			tv.T = t
@@ -723,9 +723,9 @@ GNO_CASE:
 			tv.T = t
 			tv.SetInt64(x)
 		case UintKind:
-			x := uint(tv.GetUint32())
+			x := uint64(tv.GetUint32())
 			tv.T = t
-			tv.SetUint(x)
+			tv.SetUint64(x)
 		case Uint8Kind:
 			validate(Uint32Kind, Uint8Kind, func() bool { return int(tv.GetUint32()) <= math.MaxUint8 })
 
@@ -768,25 +768,25 @@ GNO_CASE:
 	case Uint64Kind:
 		switch k {
 		case IntKind:
-			validate(Uint64Kind, IntKind, func() bool { return int(tv.GetUint64()) <= math.MaxInt })
+			validate(Uint64Kind, IntKind, func() bool { return int64(tv.GetUint64()) <= math.MaxInt })
 
-			x := int(tv.GetUint64())
+			x := int64(tv.GetUint64())
 			tv.T = t
 			tv.SetInt(x)
 		case Int8Kind:
-			validate(Uint64Kind, Int8Kind, func() bool { return int(tv.GetUint64()) <= math.MaxInt8 })
+			validate(Uint64Kind, Int8Kind, func() bool { return int64(tv.GetUint64()) <= math.MaxInt8 })
 
 			x := int8(tv.GetUint64())
 			tv.T = t
 			tv.SetInt8(x)
 		case Int16Kind:
-			validate(Uint64Kind, Int16Kind, func() bool { return int(tv.GetUint64()) <= math.MaxInt16 })
+			validate(Uint64Kind, Int16Kind, func() bool { return int64(tv.GetUint64()) <= math.MaxInt16 })
 
 			x := int16(tv.GetUint64())
 			tv.T = t
 			tv.SetInt16(x)
 		case Int32Kind:
-			validate(Uint64Kind, Int32Kind, func() bool { return int(tv.GetUint64()) <= math.MaxInt32 })
+			validate(Uint64Kind, Int32Kind, func() bool { return int64(tv.GetUint64()) <= math.MaxInt32 })
 
 			x := int32(tv.GetUint64())
 			tv.T = t
@@ -800,17 +800,17 @@ GNO_CASE:
 		case UintKind:
 			validate(Uint64Kind, UintKind, func() bool { return tv.GetUint64() <= math.MaxUint })
 
-			x := uint(tv.GetUint64())
+			x := tv.GetUint64()
 			tv.T = t
-			tv.SetUint(x)
+			tv.SetUint64(x)
 		case Uint8Kind:
-			validate(Uint64Kind, Uint8Kind, func() bool { return int(tv.GetUint64()) <= math.MaxUint8 })
+			validate(Uint64Kind, Uint8Kind, func() bool { return int64(tv.GetUint64()) <= math.MaxUint8 })
 
 			x := uint8(tv.GetUint64())
 			tv.T = t
 			tv.SetUint8(x)
 		case Uint16Kind:
-			validate(Uint64Kind, Uint16Kind, func() bool { return int(tv.GetUint64()) <= math.MaxUint16 })
+			validate(Uint64Kind, Uint16Kind, func() bool { return int64(tv.GetUint64()) <= math.MaxUint16 })
 
 			x := uint16(tv.GetUint64())
 			tv.T = t
@@ -858,7 +858,7 @@ GNO_CASE:
 				return truncInt64 >= math.MinInt && truncInt64 <= math.MaxInt
 			})
 
-			x := int(softfloat.F32toint64(tv.GetFloat32()))
+			x := softfloat.F32toint64(tv.GetFloat32())
 			tv.T = t
 			tv.SetInt(x)
 		case Int8Kind:
@@ -928,7 +928,7 @@ GNO_CASE:
 				return truncUint64 >= 0 && truncUint64 <= math.MaxUint
 			})
 
-			x := uint(softfloat.F32touint64(tv.GetFloat32()))
+			x := softfloat.F32touint64(tv.GetFloat32())
 			tv.T = t
 			tv.SetUint(x)
 		case Uint8Kind:
@@ -1019,9 +1019,8 @@ GNO_CASE:
 			})
 
 			xp, _ := softfloat.F64toint(tv.GetFloat64())
-			x := int(xp)
 			tv.T = t
-			tv.SetInt(x)
+			tv.SetInt(xp)
 		case Int8Kind:
 			validate(Float64Kind, Int8Kind, func() bool {
 				trunc := softfloat.Ftrunc64(tv.GetFloat64())
@@ -1090,7 +1089,7 @@ GNO_CASE:
 				return truncUint64 >= 0 && truncUint64 <= math.MaxUint
 			})
 
-			x := uint(softfloat.F64touint64(tv.GetFloat64()))
+			x := softfloat.F64touint64(tv.GetFloat64())
 			tv.T = t
 			tv.SetUint(x)
 		case Uint8Kind:
@@ -1372,7 +1371,7 @@ func ConvertUntypedRuneTo(dst *TypedValue, t Type) {
 	// the value is within int64 or uint64.
 	switch k {
 	case IntKind:
-		dst.SetInt(int(sv))
+		dst.SetInt(int64(sv))
 	case Int8Kind:
 		if math.MaxInt8 < sv {
 			panic("rune overflows target kind")
@@ -1397,7 +1396,7 @@ func ConvertUntypedRuneTo(dst *TypedValue, t Type) {
 		if sv < 0 {
 			panic("rune underflows target kind")
 		}
-		dst.SetUint(uint(sv))
+		dst.SetUint(uint64(sv))
 	case Uint8Kind:
 		if sv < 0 {
 			panic("rune underflows target kind")
@@ -1523,9 +1522,9 @@ func ConvertUntypedBigintTo(dst *TypedValue, bv BigintValue, t Type) {
 			if sv < math.MinInt32 {
 				panic("bigint underflows target kind")
 			}
-			dst.SetInt(int(sv))
+			dst.SetInt(sv)
 		} else if strconv.IntSize == 64 {
-			dst.SetInt(int(sv))
+			dst.SetInt(sv)
 		} else {
 			panic("unexpected IntSize")
 		}
@@ -1560,9 +1559,9 @@ func ConvertUntypedBigintTo(dst *TypedValue, bv BigintValue, t Type) {
 			if math.MaxUint32 < uv {
 				panic("bigint overflows target kind")
 			}
-			dst.SetUint(uint(uv))
+			dst.SetUint(uv)
 		} else if strconv.IntSize == 64 {
-			dst.SetUint(uint(uv))
+			dst.SetUint(uv)
 		} else {
 			panic("unexpected IntSize")
 		}
diff --git a/gnovm/stdlibs/encoding/base32/base32_test.gno b/gnovm/stdlibs/encoding/base32/base32_test.gno
index fa09c2cd2f3..84d8e42df67 100644
--- a/gnovm/stdlibs/encoding/base32/base32_test.gno
+++ b/gnovm/stdlibs/encoding/base32/base32_test.gno
@@ -9,7 +9,6 @@ import (
 	"errors"
 	"io"
 	"math"
-	"strconv"
 	"strings"
 	"testing"
 )
@@ -765,15 +764,9 @@ func TestEncodedLen(t *testing.T) {
 		{rawStdEncoding, 7, 12},
 		{rawStdEncoding, 10, 16},
 		{rawStdEncoding, 11, 18},
-	}
-	// check overflow
-	switch strconv.IntSize {
-	case 32:
-		tests = append(tests, test{rawStdEncoding, (math.MaxInt-4)/8 + 1, 429496730})
-		tests = append(tests, test{rawStdEncoding, math.MaxInt/8*5 + 4, math.MaxInt})
-	case 64:
-		tests = append(tests, test{rawStdEncoding, (math.MaxInt-4)/8 + 1, 1844674407370955162})
-		tests = append(tests, test{rawStdEncoding, math.MaxInt/8*5 + 4, math.MaxInt})
+		// check overflow
+		{rawStdEncoding, (math.MaxInt-4)/8 + 1, 1844674407370955162},
+		{rawStdEncoding, math.MaxInt/8*5 + 4, math.MaxInt},
 	}
 	for _, tt := range tests {
 		if got := tt.enc.EncodedLen(tt.n); int64(got) != tt.want {
@@ -804,15 +797,9 @@ func TestDecodedLen(t *testing.T) {
 		{rawStdEncoding, 12, 7},
 		{rawStdEncoding, 16, 10},
 		{rawStdEncoding, 18, 11},
-	}
-	// check overflow
-	switch strconv.IntSize {
-	case 32:
-		tests = append(tests, test{rawStdEncoding, math.MaxInt/5 + 1, 268435456})
-		tests = append(tests, test{rawStdEncoding, math.MaxInt, 1342177279})
-	case 64:
-		tests = append(tests, test{rawStdEncoding, math.MaxInt/5 + 1, 1152921504606846976})
-		tests = append(tests, test{rawStdEncoding, math.MaxInt, 5764607523034234879})
+		// check overflow
+		{rawStdEncoding, math.MaxInt/5 + 1, 1152921504606846976},
+		{rawStdEncoding, math.MaxInt, 5764607523034234879},
 	}
 	for _, tt := range tests {
 		if got := tt.enc.DecodedLen(tt.n); int64(got) != tt.want {
diff --git a/gnovm/stdlibs/math/const.gno b/gnovm/stdlibs/math/const.gno
index ad13d53477e..1835c9202ee 100644
--- a/gnovm/stdlibs/math/const.gno
+++ b/gnovm/stdlibs/math/const.gno
@@ -37,7 +37,7 @@ const (
 
 // Integer limit values.
 const (
-	intSize = 32 << (^uint(0) >> 63) // 32 or 64
+	intSize = 64 // Integers are 64 bits only.
 
 	MaxInt    = 1<<(intSize-1) - 1  // == MaxInt64
 	MinInt    = -1 << (intSize - 1) // == MinInt64
diff --git a/gnovm/stdlibs/strconv/atoi_test.gno b/gnovm/stdlibs/strconv/atoi_test.gno
index 5dc0577924f..ad4e5e0528c 100644
--- a/gnovm/stdlibs/strconv/atoi_test.gno
+++ b/gnovm/stdlibs/strconv/atoi_test.gno
@@ -423,78 +423,38 @@ func TestParseInt64Base(t *testing.T) {
 }
 
 func TestParseUint(t *testing.T) {
-	switch strconv.IntSize {
-	case 32:
-		for i := range parseUint32Tests {
-			test := &parseUint32Tests[i]
-			out, err := strconv.ParseUint(test.in, 10, 0)
-			if uint64(test.out) != out || !errEqual(test.err, err) {
-				t.Errorf("ParseUint(%q, 10, 0) = %v, %v want %v, %v",
-					test.in, out, err, test.out, test.err)
-			}
-		}
-	case 64:
-		for i := range parseUint64Tests {
-			test := &parseUint64Tests[i]
-			out, err := strconv.ParseUint(test.in, 10, 0)
-			if test.out != out || !errEqual(test.err, err) {
-				t.Errorf("ParseUint(%q, 10, 0) = %v, %v want %v, %v",
-					test.in, out, err, test.out, test.err)
-			}
+	for i := range parseUint64Tests {
+		test := &parseUint64Tests[i]
+		out, err := strconv.ParseUint(test.in, 10, 0)
+		if test.out != out || !errEqual(test.err, err) {
+			t.Errorf("ParseUint(%q, 10, 0) = %v, %v want %v, %v",
+				test.in, out, err, test.out, test.err)
 		}
 	}
 }
 
 func TestParseInt(t *testing.T) {
-	switch strconv.IntSize {
-	case 32:
-		for i := range parseInt32Tests {
-			test := &parseInt32Tests[i]
-			out, err := strconv.ParseInt(test.in, 10, 0)
-			if int64(test.out) != out || !errEqual(test.err, err) {
-				t.Errorf("ParseInt(%q, 10, 0) = %v, %v want %v, %v",
-					test.in, out, err, test.out, test.err)
-			}
-		}
-	case 64:
-		for i := range parseInt64Tests {
-			test := &parseInt64Tests[i]
-			out, err := strconv.ParseInt(test.in, 10, 0)
-			if test.out != out || !errEqual(test.err, err) {
-				t.Errorf("ParseInt(%q, 10, 0) = %v, %v want %v, %v",
-					test.in, out, err, test.out, test.err)
-			}
+	for i := range parseInt64Tests {
+		test := &parseInt64Tests[i]
+		out, err := strconv.ParseInt(test.in, 10, 0)
+		if test.out != out || !errEqual(test.err, err) {
+			t.Errorf("ParseInt(%q, 10, 0) = %v, %v want %v, %v",
+				test.in, out, err, test.out, test.err)
 		}
 	}
 }
 
 func TestAtoi(t *testing.T) {
-	switch strconv.IntSize {
-	case 32:
-		for i := range parseInt32Tests {
-			test := &parseInt32Tests[i]
-			out, err := strconv.Atoi(test.in)
-			var testErr error
-			if test.err != nil {
-				testErr = &strconv.NumError{"Atoi", test.in, test.err.(*strconv.NumError).Err}
-			}
-			if int(test.out) != out || !errEqual(testErr, err) {
-				t.Errorf("Atoi(%q) = %v, %v want %v, %v",
-					test.in, out, err, test.out, testErr)
-			}
+	for i := range parseInt64Tests {
+		test := &parseInt64Tests[i]
+		out, err := strconv.Atoi(test.in)
+		var testErr error
+		if test.err != nil {
+			testErr = &strconv.NumError{"Atoi", test.in, test.err.(*strconv.NumError).Err}
 		}
-	case 64:
-		for i := range parseInt64Tests {
-			test := &parseInt64Tests[i]
-			out, err := strconv.Atoi(test.in)
-			var testErr error
-			if test.err != nil {
-				testErr = &strconv.NumError{"Atoi", test.in, test.err.(*strconv.NumError).Err}
-			}
-			if test.out != int64(out) || !errEqual(testErr, err) {
-				t.Errorf("Atoi(%q) = %v, %v want %v, %v",
-					test.in, out, err, test.out, testErr)
-			}
+		if test.out != int64(out) || !errEqual(testErr, err) {
+			t.Errorf("Atoi(%q) = %v, %v want %v, %v",
+				test.in, out, err, test.out, testErr)
 		}
 	}
 }
diff --git a/misc/genstd/util.go b/misc/genstd/util.go
index 025fe4b673e..1793e69c7b7 100644
--- a/misc/genstd/util.go
+++ b/misc/genstd/util.go
@@ -70,7 +70,7 @@ func findDirs() (gitRoot string, relPath string, err error) {
 	}
 	p := wd
 	for {
-		if s, e := os.Stat(filepath.Join(p, ".git")); e == nil && s.IsDir() {
+		if _, e := os.Stat(filepath.Join(p, ".git")); e == nil {
 			// make relPath relative to the git root
 			rp := strings.TrimPrefix(wd, p+string(filepath.Separator))
 			// normalize separator to /
diff --git a/tm2/pkg/overflow/overflow_template.sh b/tm2/pkg/overflow/overflow_template.sh
index 0cc3c9595bf..423770c22be 100755
--- a/tm2/pkg/overflow/overflow_template.sh
+++ b/tm2/pkg/overflow/overflow_template.sh
@@ -91,7 +91,6 @@ func Quotient${SIZE}(a, b int${SIZE}) (int${SIZE}, int${SIZE}, bool) {
 	}
 	c := a / b
 	status := (c < 0) == ((a < 0) != (b < 0)) || (c == 0) // no sign check for 0 quotient
-	return c, a%b, status
-}
-"
+	return c, a % b, status
+}"
 done

From c61e217968d5d01125ac467e99849ad75de16c6f Mon Sep 17 00:00:00 2001
From: Petar Dambovaliev <petar.atanasov.1987@gmail.com>
Date: Thu, 13 Feb 2025 17:13:53 +0100
Subject: [PATCH 08/47] fix(gnovm): object deletion; add comments (#3741)

Closes [3688](https://github.com/gnolang/gno/issues/3688)
---
 gnovm/pkg/gnolang/ownership.go | 38 +++++++++++-----
 gnovm/tests/files/zrealm14.gno | 80 ----------------------------------
 gnovm/tests/files/zrealm15.gno | 49 ---------------------
 3 files changed, 28 insertions(+), 139 deletions(-)

diff --git a/gnovm/pkg/gnolang/ownership.go b/gnovm/pkg/gnolang/ownership.go
index 511b44bfc73..da254d383a9 100644
--- a/gnovm/pkg/gnolang/ownership.go
+++ b/gnovm/pkg/gnolang/ownership.go
@@ -133,17 +133,29 @@ var (
 )
 
 type ObjectInfo struct {
-	ID        ObjectID  // set if real.
-	Hash      ValueHash `json:",omitempty"` // zero if dirty.
-	OwnerID   ObjectID  `json:",omitempty"` // parent in the ownership tree.
-	ModTime   uint64    // time last updated.
-	RefCount  int       // for persistence. deleted/gc'd if 0.
-	IsEscaped bool      `json:",omitempty"` // hash in iavl.
+	ID       ObjectID  // set if real.
+	Hash     ValueHash `json:",omitempty"` // zero if dirty.
+	OwnerID  ObjectID  `json:",omitempty"` // parent in the ownership tree.
+	ModTime  uint64    // time last updated.
+	RefCount int       // for persistence. deleted/gc'd if 0.
+
+	// Object has multiple references (refcount > 1) and is persisted separately
+	IsEscaped bool `json:",omitempty"` // hash in iavl.
+
 	// MemRefCount int // consider for optimizations.
-	isDirty      bool
-	isDeleted    bool
-	isNewReal    bool
+	// Object has been modified and needs to be saved
+	isDirty bool
+
+	// Object has been permanently deleted
+	isDeleted bool
+
+	// Object is newly created in current transaction and will be persisted
+	isNewReal bool
+
+	// Object newly created multiple references in current transaction
 	isNewEscaped bool
+
+	// Object is marked for deletion in current transaction
 	isNewDeleted bool
 
 	// XXX huh?
@@ -294,7 +306,13 @@ func (oi *ObjectInfo) SetIsDeleted(x bool, mt uint64) {
 	// NOTE: Don't over-write modtime.
 	// Consider adding a DelTime, or just log it somewhere, or
 	// continue to ignore it.
-	oi.isDirty = x
+
+	// The above comment is likely made because it could introduce complexity
+	// Objects can be "undeleted" if referenced during a transaction
+	// If an object is deleted and then undeleted in the same transaction
+	// If an object is deleted multiple times
+	// ie...continue to ignore it
+	oi.isDeleted = x
 }
 
 func (oi *ObjectInfo) GetIsNewReal() bool {
diff --git a/gnovm/tests/files/zrealm14.gno b/gnovm/tests/files/zrealm14.gno
index ffffa4883fd..84ef45982cb 100644
--- a/gnovm/tests/files/zrealm14.gno
+++ b/gnovm/tests/files/zrealm14.gno
@@ -65,86 +65,6 @@ func main() {
 //         "RefCount": "1"
 //     }
 // }
-// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:8]={
-//     "Fields": [
-//         {
-//             "T": {
-//                 "@type": "/gno.PointerType",
-//                 "Elt": {
-//                     "@type": "/gno.RefType",
-//                     "ID": "gno.land/r/test.A"
-//                 }
-//             },
-//             "V": {
-//                 "@type": "/gno.PointerValue",
-//                 "Base": {
-//                     "@type": "/gno.RefValue",
-//                     "Escaped": true,
-//                     "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:3"
-//                 },
-//                 "Index": "0",
-//                 "TV": null
-//             }
-//         },
-//         {
-//             "T": {
-//                 "@type": "/gno.PrimitiveType",
-//                 "value": "16"
-//             },
-//             "V": {
-//                 "@type": "/gno.StringValue",
-//                 "value": "c"
-//             }
-//         }
-//     ],
-//     "ObjectInfo": {
-//         "Hash": "c22ccb7832b422c83fec9943b751cb134fcbed0b",
-//         "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:8",
-//         "ModTime": "0",
-//         "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:7",
-//         "RefCount": "0"
-//     }
-// }
-// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:9]={
-//     "Fields": [
-//         {
-//             "T": {
-//                 "@type": "/gno.PointerType",
-//                 "Elt": {
-//                     "@type": "/gno.RefType",
-//                     "ID": "gno.land/r/test.A"
-//                 }
-//             },
-//             "V": {
-//                 "@type": "/gno.PointerValue",
-//                 "Base": {
-//                     "@type": "/gno.RefValue",
-//                     "Escaped": true,
-//                     "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:3"
-//                 },
-//                 "Index": "0",
-//                 "TV": null
-//             }
-//         },
-//         {
-//             "T": {
-//                 "@type": "/gno.PrimitiveType",
-//                 "value": "16"
-//             },
-//             "V": {
-//                 "@type": "/gno.StringValue",
-//                 "value": "d"
-//             }
-//         }
-//     ],
-//     "ObjectInfo": {
-//         "Hash": "86c916fd78da57d354cb38019923bf64c1a3471c",
-//         "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:9",
-//         "ModTime": "0",
-//         "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:7",
-//         "RefCount": "0"
-//     }
-// }
 // u[a8ada09dee16d791fd406d629fe29bb0ed084a30:3]={
 //     "ObjectInfo": {
 //         "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:3",
diff --git a/gnovm/tests/files/zrealm15.gno b/gnovm/tests/files/zrealm15.gno
index 4ca6ef3b03d..b8ba84bad04 100644
--- a/gnovm/tests/files/zrealm15.gno
+++ b/gnovm/tests/files/zrealm15.gno
@@ -69,55 +69,6 @@ func main() {
 //         "RefCount": "1"
 //     }
 // }
-// u[a8ada09dee16d791fd406d629fe29bb0ed084a30:10]={
-//     "Fields": [
-//         {
-//             "T": {
-//                 "@type": "/gno.PointerType",
-//                 "Elt": {
-//                     "@type": "/gno.RefType",
-//                     "ID": "gno.land/r/test.A"
-//                 }
-//             },
-//             "V": {
-//                 "@type": "/gno.PointerValue",
-//                 "Base": {
-//                     "@type": "/gno.RefValue",
-//                     "Escaped": true,
-//                     "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:3"
-//                 },
-//                 "Index": "0",
-//                 "TV": null
-//             }
-//         },
-//         {
-//             "T": {
-//                 "@type": "/gno.PointerType",
-//                 "Elt": {
-//                     "@type": "/gno.RefType",
-//                     "ID": "gno.land/r/test.S"
-//                 }
-//             },
-//             "V": {
-//                 "@type": "/gno.PointerValue",
-//                 "Base": {
-//                     "@type": "/gno.RefValue",
-//                     "Escaped": true,
-//                     "ObjectID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:7"
-//                 },
-//                 "Index": "0",
-//                 "TV": null
-//             }
-//         }
-//     ],
-//     "ObjectInfo": {
-//         "Hash": "5bf603ab337f9f40f8b22441562319d67be402b2",
-//         "ID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:10",
-//         "ModTime": "0",
-//         "OwnerID": "a8ada09dee16d791fd406d629fe29bb0ed084a30:9",
-//         "RefCount": "0"
-//     }
-// }
 // u[a8ada09dee16d791fd406d629fe29bb0ed084a30:4]={
 //     "Fields": [
 //         {

From 52a4198467f002aa469a95c1a090405a842d5a03 Mon Sep 17 00:00:00 2001
From: Marc Vertes <marc.vertes@tendermint.com>
Date: Thu, 13 Feb 2025 17:15:42 +0100
Subject: [PATCH 09/47] fix(tm2): overflow check when computing remaining gas.
 (#3745)

Panic on overflow when computing the remaining gas, to avoid
inconsistent and wrong gas amounts.
---
 tm2/pkg/store/types/gas.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tm2/pkg/store/types/gas.go b/tm2/pkg/store/types/gas.go
index a86cff17d1a..8afbed698ea 100644
--- a/tm2/pkg/store/types/gas.go
+++ b/tm2/pkg/store/types/gas.go
@@ -79,7 +79,7 @@ func (g *basicGasMeter) Limit() Gas {
 }
 
 func (g *basicGasMeter) Remaining() Gas {
-	return g.Limit() - g.GasConsumedToLimit()
+	return overflow.Sub64p(g.Limit(), g.GasConsumedToLimit())
 }
 
 func (g *basicGasMeter) GasConsumedToLimit() Gas {

From e9e04ea7dfdcce7fb47b74d0b0a4bac27cd37f49 Mon Sep 17 00:00:00 2001
From: Marc Vertes <marc.vertes@tendermint.com>
Date: Thu, 13 Feb 2025 17:17:11 +0100
Subject: [PATCH 10/47] chore(gnovm): remove unused Machine.MaxCycles (#3744)

The logic to manage the CPU limit is already handled by the gasmeter,
which has the ability to panic the gnovm if a cpu limit is reached.

It's simpler and faster to have only one path of failure.

No other changes in CPU cycles accounting, still performed in gnovm.
---
 gnovm/pkg/gnolang/machine.go | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/gnovm/pkg/gnolang/machine.go b/gnovm/pkg/gnolang/machine.go
index 7b89e98eb6d..ac20a6540a1 100644
--- a/gnovm/pkg/gnolang/machine.go
+++ b/gnovm/pkg/gnolang/machine.go
@@ -43,7 +43,6 @@ type Machine struct {
 	// Configuration
 	PreprocessorMode bool // this is used as a flag when const values are evaluated during preprocessing
 	ReadOnly         bool
-	MaxCycles        int64
 	Output           io.Writer
 	Store            Store
 	Context          interface{}
@@ -87,7 +86,6 @@ type MachineOptions struct {
 	Context          interface{}
 	Alloc            *Allocator // or see MaxAllocBytes.
 	MaxAllocBytes    int64      // or 0 for no limit.
-	MaxCycles        int64      // or 0 for no limit.
 	GasMeter         store.GasMeter
 }
 
@@ -112,7 +110,6 @@ var machinePool = sync.Pool{
 func NewMachineWithOptions(opts MachineOptions) *Machine {
 	preprocessorMode := opts.PreprocessorMode
 	readOnly := opts.ReadOnly
-	maxCycles := opts.MaxCycles
 	vmGasMeter := opts.GasMeter
 
 	output := opts.Output
@@ -145,7 +142,6 @@ func NewMachineWithOptions(opts MachineOptions) *Machine {
 	mm.Alloc = alloc
 	mm.PreprocessorMode = preprocessorMode
 	mm.ReadOnly = readOnly
-	mm.MaxCycles = maxCycles
 	mm.Output = output
 	mm.Store = store
 	mm.Context = context
@@ -1025,13 +1021,9 @@ const GasFactorCPU int64 = 1
 func (m *Machine) incrCPU(cycles int64) {
 	if m.GasMeter != nil {
 		gasCPU := overflow.Mul64p(cycles, GasFactorCPU)
-		m.GasMeter.ConsumeGas(gasCPU, "CPUCycles")
+		m.GasMeter.ConsumeGas(gasCPU, "CPUCycles") // May panic if out of gas.
 	}
-
 	m.Cycles += cycles
-	if m.MaxCycles != 0 && m.Cycles > m.MaxCycles {
-		panic("CPU cycle overrun")
-	}
 }
 
 const (

From 70b8a7072c96117cb673b58434ea5801158a6afe Mon Sep 17 00:00:00 2001
From: Guilhem Fanton <8671905+gfanton@users.noreply.github.com>
Date: Thu, 13 Feb 2025 17:21:36 +0100
Subject: [PATCH 11/47] fix(gnodev): fix the use of filepath instead of path on
 windows (#3737)

fix #3722

Using `filepath` to work with the `path` creates some obvious issues on
Windows, primarily because the `Clean` function replaces `/` with `\\`.
This PR updates the usage of `filepath` to `path` where necessary.

At some point, adapting path-specific tests on Windows would be very
helpful.

---

@Milosevic02, can you confirm that this fix resolves most of your issues
with gnodev?

**EDIT:** It seems that the fix is effective:
https://github.com/gnolang/gno/issues/3722#issuecomment-2653988097

---------

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
---
 contribs/gnodev/cmd/gnobro/main.go            |  5 +-
 contribs/gnodev/cmd/gnodev/command_staging.go |  3 +-
 contribs/gnodev/cmd/gnodev/setup_loader.go    |  3 +-
 contribs/gnodev/pkg/browser/model.go          |  4 +-
 contribs/gnodev/pkg/browser/utils.go          |  4 +-
 contribs/gnodev/pkg/dev/query_path.go         |  4 +-
 contribs/gnodev/pkg/events/events.go          |  4 +-
 contribs/gnodev/pkg/packages/loader_glob.go   | 17 +++---
 .../gnodev/pkg/packages/resolver_local.go     |  3 +-
 .../gnodev/pkg/packages/resolver_remote.go    |  4 +-
 contribs/gnodev/pkg/packages/utils_other.go   |  9 ++++
 contribs/gnodev/pkg/packages/utils_windows.go | 11 ++++
 contribs/gnodev/pkg/proxy/path_interceptor.go | 25 +++++----
 .../gnodev/pkg/proxy/path_interceptor_test.go |  3 +-
 contribs/gnodev/pkg/watcher/watch.go          | 52 +++++++++----------
 gno.land/pkg/gnoweb/handler.go                |  6 +--
 gno.land/pkg/gnoweb/webclient_html.go         |  6 +--
 gno.land/pkg/gnoweb/weburl/url.go             |  6 +--
 18 files changed, 101 insertions(+), 68 deletions(-)
 create mode 100644 contribs/gnodev/pkg/packages/utils_other.go
 create mode 100644 contribs/gnodev/pkg/packages/utils_windows.go

diff --git a/contribs/gnodev/cmd/gnobro/main.go b/contribs/gnodev/cmd/gnobro/main.go
index 91713d6c6d8..7e47fb96780 100644
--- a/contribs/gnodev/cmd/gnobro/main.go
+++ b/contribs/gnodev/cmd/gnobro/main.go
@@ -11,7 +11,7 @@ import (
 	"net/url"
 	"os"
 	"os/signal"
-	"path/filepath"
+	gopath "path"
 	"strings"
 	"time"
 
@@ -239,7 +239,6 @@ func runLocal(ctx context.Context, gnocl *gnoclient.Client, cfg *broCfg, bcfg br
 	)
 
 	var errgs errgroup.Group
-
 	if cfg.dev {
 		devpoint, err := getDevEndpoint(cfg)
 		if err != nil {
@@ -453,7 +452,7 @@ func ValidatePathCommandMiddleware(pathPrefix string) wish.Middleware {
 				return
 			case 1: // check for valid path
 				path := cmd[0]
-				if strings.HasPrefix(path, pathPrefix) && filepath.Clean(path) == path {
+				if strings.HasPrefix(path, pathPrefix) && gopath.Clean(path) == path {
 					s.Context().SetValue("path", path)
 					next(s)
 					return
diff --git a/contribs/gnodev/cmd/gnodev/command_staging.go b/contribs/gnodev/cmd/gnodev/command_staging.go
index 7b1a0ab3f5a..d02d7c289fe 100644
--- a/contribs/gnodev/cmd/gnodev/command_staging.go
+++ b/contribs/gnodev/cmd/gnodev/command_staging.go
@@ -3,6 +3,7 @@ package main
 import (
 	"context"
 	"flag"
+	"path"
 	"path/filepath"
 
 	"github.com/gnolang/gno/contribs/gnodev/pkg/packages"
@@ -28,7 +29,7 @@ var defaultStagingOptions = AppConfig{
 	interactive:         false,
 	unsafeAPI:           false,
 	lazyLoader:          false,
-	paths:               filepath.Join(DefaultDomain, "/**"), // Load every package under the main domain},
+	paths:               path.Join(DefaultDomain, "/**"), // Load every package under the main domain},
 
 	// As we have no reason to configure this yet, set this to random port
 	// to avoid potential conflict with other app
diff --git a/contribs/gnodev/cmd/gnodev/setup_loader.go b/contribs/gnodev/cmd/gnodev/setup_loader.go
index 8f10a6a5a76..69342657352 100644
--- a/contribs/gnodev/cmd/gnodev/setup_loader.go
+++ b/contribs/gnodev/cmd/gnodev/setup_loader.go
@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"log/slog"
+	gopath "path"
 	"path/filepath"
 	"regexp"
 	"strings"
@@ -103,5 +104,5 @@ func guessPath(cfg *AppConfig, dir string) (path string) {
 	}
 
 	rname := reInvalidChar.ReplaceAllString(filepath.Base(dir), "-")
-	return filepath.Join(cfg.chainDomain, "/r/dev/", rname)
+	return gopath.Join(cfg.chainDomain, "/r/dev/", rname)
 }
diff --git a/contribs/gnodev/pkg/browser/model.go b/contribs/gnodev/pkg/browser/model.go
index bdd7eac9c82..148497e77db 100644
--- a/contribs/gnodev/pkg/browser/model.go
+++ b/contribs/gnodev/pkg/browser/model.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 	"log/slog"
-	"path/filepath"
+	gopath "path"
 	"regexp"
 	"strings"
 
@@ -576,5 +576,5 @@ func (m *model) getCurrentPath() string {
 		return m.urlPrefix
 	}
 
-	return filepath.Join(m.urlPrefix, path)
+	return gopath.Join(m.urlPrefix, path)
 }
diff --git a/contribs/gnodev/pkg/browser/utils.go b/contribs/gnodev/pkg/browser/utils.go
index b322bea552a..94f0bd6344c 100644
--- a/contribs/gnodev/pkg/browser/utils.go
+++ b/contribs/gnodev/pkg/browser/utils.go
@@ -1,7 +1,7 @@
 package browser
 
 import (
-	"path/filepath"
+	gopath "path"
 	"strings"
 
 	"github.com/gnolang/gno/gno.land/pkg/gnoweb"
@@ -27,7 +27,7 @@ func cleanupRealmPath(prefix, realm string) string {
 	// trim any slash
 	path = strings.TrimPrefix(path, "/")
 	// clean up path
-	path = filepath.Clean(path)
+	path = gopath.Clean(path)
 
 	return path
 }
diff --git a/contribs/gnodev/pkg/dev/query_path.go b/contribs/gnodev/pkg/dev/query_path.go
index e899d8212e4..b33576ccc71 100644
--- a/contribs/gnodev/pkg/dev/query_path.go
+++ b/contribs/gnodev/pkg/dev/query_path.go
@@ -3,7 +3,7 @@ package dev
 import (
 	"fmt"
 	"net/url"
-	"path/filepath"
+	"path"
 
 	"github.com/gnolang/gno/contribs/gnodev/pkg/address"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
@@ -24,7 +24,7 @@ func ResolveQueryPath(bk *address.Book, query string) (QueryPath, error) {
 		return qpath, fmt.Errorf("malformed path/query: %w", err)
 	}
 
-	qpath.Path = filepath.Clean(upath.Path)
+	qpath.Path = path.Clean(upath.Path)
 
 	// Check for creator option
 	creator := upath.Query().Get("creator")
diff --git a/contribs/gnodev/pkg/events/events.go b/contribs/gnodev/pkg/events/events.go
index c387c331eed..3137b5d50bb 100644
--- a/contribs/gnodev/pkg/events/events.go
+++ b/contribs/gnodev/pkg/events/events.go
@@ -41,8 +41,8 @@ type PackagesUpdate struct {
 }
 
 type PackageUpdate struct {
-	Package string   `json:"package"`
-	Files   []string `json:"files"`
+	PackageDir string   `json:"package"`
+	Files      []string `json:"files"`
 }
 
 func (PackagesUpdate) Type() Type   { return EvtPackagesUpdate }
diff --git a/contribs/gnodev/pkg/packages/loader_glob.go b/contribs/gnodev/pkg/packages/loader_glob.go
index dabfe613574..6e3d1158cb5 100644
--- a/contribs/gnodev/pkg/packages/loader_glob.go
+++ b/contribs/gnodev/pkg/packages/loader_glob.go
@@ -5,6 +5,7 @@ import (
 	"go/token"
 	"io/fs"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 )
@@ -33,7 +34,7 @@ func (l GlobLoader) MatchPaths(globs ...string) ([]string, error) {
 
 	mpaths := []string{}
 	for _, input := range globs {
-		cleanInput := filepath.Clean(input)
+		cleanInput := path.Clean(input)
 		gpath, err := Parse(cleanInput)
 		if err != nil {
 			return nil, fmt.Errorf("invalid glob path %q: %w", input, err)
@@ -45,18 +46,20 @@ func (l GlobLoader) MatchPaths(globs ...string) ([]string, error) {
 			continue
 		}
 
-		// root := filepath.Join(l.Root, base)
 		root := l.Root
 		err = filepath.WalkDir(root, func(dirpath string, d fs.DirEntry, err error) error {
 			if err != nil {
 				return err
 			}
 
-			relPath, relErr := filepath.Rel(root, dirpath)
-			if relErr != nil {
-				return relErr
+			path, err := filepath.Rel(root, dirpath)
+			if err != nil {
+				return err
 			}
 
+			// normalize filepath to path
+			path = NormalizeFilepathToPath(path)
+
 			if !d.IsDir() {
 				return nil
 			}
@@ -65,8 +68,8 @@ func (l GlobLoader) MatchPaths(globs ...string) ([]string, error) {
 				return fs.SkipDir
 			}
 
-			if gpath.Match(relPath) {
-				mpaths = append(mpaths, relPath)
+			if gpath.Match(path) {
+				mpaths = append(mpaths, path)
 			}
 
 			return nil
diff --git a/contribs/gnodev/pkg/packages/resolver_local.go b/contribs/gnodev/pkg/packages/resolver_local.go
index 13448aca52d..0312b262403 100644
--- a/contribs/gnodev/pkg/packages/resolver_local.go
+++ b/contribs/gnodev/pkg/packages/resolver_local.go
@@ -3,6 +3,7 @@ package packages
 import (
 	"fmt"
 	"go/token"
+	"path"
 	"path/filepath"
 	"strings"
 )
@@ -20,7 +21,7 @@ func NewLocalResolver(path, dir string) *LocalResolver {
 }
 
 func (r *LocalResolver) Name() string {
-	return fmt.Sprintf("local<%s>", filepath.Base(r.Dir))
+	return fmt.Sprintf("local<%s>", path.Base(r.Dir))
 }
 
 func (r LocalResolver) IsValid() bool {
diff --git a/contribs/gnodev/pkg/packages/resolver_remote.go b/contribs/gnodev/pkg/packages/resolver_remote.go
index 94396f70c83..ff7b8fa723a 100644
--- a/contribs/gnodev/pkg/packages/resolver_remote.go
+++ b/contribs/gnodev/pkg/packages/resolver_remote.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"go/parser"
 	"go/token"
-	"path/filepath"
+	gopath "path"
 	"strings"
 
 	"github.com/gnolang/gno/gno.land/pkg/sdk/vm"
@@ -56,7 +56,7 @@ func (res *remoteResolver) Resolve(fset *token.FileSet, path string) (*Package,
 	files := bytes.Split(qres.Response.Data, []byte{'\n'})
 	for _, filename := range files {
 		fname := string(filename)
-		fpath := filepath.Join(path, fname)
+		fpath := gopath.Join(path, fname)
 		qres, err := res.RPCClient.ABCIQuery(qpath, []byte(fpath))
 		if err != nil {
 			return nil, fmt.Errorf("unable to query path")
diff --git a/contribs/gnodev/pkg/packages/utils_other.go b/contribs/gnodev/pkg/packages/utils_other.go
new file mode 100644
index 00000000000..0455aa57480
--- /dev/null
+++ b/contribs/gnodev/pkg/packages/utils_other.go
@@ -0,0 +1,9 @@
+//go:build !windows
+// +build !windows
+
+package packages
+
+// NormalizeFilepathToPath normalize path an unix like path
+func NormalizeFilepathToPath(path string) string {
+	return path
+}
diff --git a/contribs/gnodev/pkg/packages/utils_windows.go b/contribs/gnodev/pkg/packages/utils_windows.go
new file mode 100644
index 00000000000..23c7fa54379
--- /dev/null
+++ b/contribs/gnodev/pkg/packages/utils_windows.go
@@ -0,0 +1,11 @@
+//go:build windows
+// +build windows
+
+package packages
+
+import "strings"
+
+// NormalizeFilepathToPath normalize path an unix like path
+func NormalizeFilepathToPath(path string) string {
+	return strings.ReplaceAll(path, "\\", "/")
+}
diff --git a/contribs/gnodev/pkg/proxy/path_interceptor.go b/contribs/gnodev/pkg/proxy/path_interceptor.go
index 84d2f92b22f..88240d904a5 100644
--- a/contribs/gnodev/pkg/proxy/path_interceptor.go
+++ b/contribs/gnodev/pkg/proxy/path_interceptor.go
@@ -10,7 +10,7 @@ import (
 	"log/slog"
 	"net"
 	"net/http"
-	"path/filepath"
+	gopath "path"
 	"strings"
 	"sync"
 
@@ -220,7 +220,11 @@ func (upaths uniqPaths) list() []string {
 	return paths
 }
 
-func (upaths uniqPaths) add(path string) { upaths[path] = struct{}{} }
+// Add a path to
+func (upaths uniqPaths) add(path string) {
+	path = cleanupPath(path)
+	upaths[path] = struct{}{}
+}
 
 // handleRequest parses and processes the RPC request body.
 func (proxy *PathInterceptor) handleRequest(body []byte) error {
@@ -312,13 +316,6 @@ func handleQuery(path string, data []byte, upaths uniqPaths) error {
 
 	case "vm/qrender", "vm/qfile", "vm/qfuncs", "vm/qeval":
 		path, _, _ := strings.Cut(string(data), ":") // Cut arguments out
-		path = filepath.Clean(path)
-
-		// If path is a file, grab the directory instead
-		if ext := filepath.Ext(path); ext != "" {
-			path = filepath.Dir(path)
-		}
-
 		upaths.add(path)
 		return nil
 
@@ -328,3 +325,13 @@ func handleQuery(path string, data []byte, upaths uniqPaths) error {
 
 	// XXX: handle more cases
 }
+
+func cleanupPath(path string) string {
+	path = gopath.Clean(path)
+	// If path is a file, grab the directory instead
+	if ext := gopath.Ext(path); ext != "" {
+		path = gopath.Dir(path)
+	}
+
+	return path
+}
diff --git a/contribs/gnodev/pkg/proxy/path_interceptor_test.go b/contribs/gnodev/pkg/proxy/path_interceptor_test.go
index c7082adfa30..0e1e95e82a4 100644
--- a/contribs/gnodev/pkg/proxy/path_interceptor_test.go
+++ b/contribs/gnodev/pkg/proxy/path_interceptor_test.go
@@ -3,6 +3,7 @@ package proxy_test
 import (
 	"net"
 	"net/http"
+	"path"
 	"path/filepath"
 	"testing"
 
@@ -86,7 +87,7 @@ func TestProxy(t *testing.T) {
 		cli, err := client.NewHTTPClient(interceptor.TargetAddress())
 		require.NoError(t, err)
 
-		res, err := cli.ABCIQuery("vm/qfile", []byte(filepath.Join(targetPath, "foo.gno")))
+		res, err := cli.ABCIQuery("vm/qfile", []byte(path.Join(targetPath, "foo.gno")))
 		require.NoError(t, err)
 		assert.Nil(t, res.Response.Error)
 
diff --git a/contribs/gnodev/pkg/watcher/watch.go b/contribs/gnodev/pkg/watcher/watch.go
index 5f277fd6646..0a7d284bd37 100644
--- a/contribs/gnodev/pkg/watcher/watch.go
+++ b/contribs/gnodev/pkg/watcher/watch.go
@@ -58,7 +58,7 @@ func (p *PackageWatcher) startWatching() {
 		defer close(pkgsUpdateChan)
 
 		var debounceTimer <-chan time.Time
-		pathList := []string{}
+		filesList := []string{}
 		var err error
 
 		for err == nil {
@@ -69,10 +69,10 @@ func (p *PackageWatcher) startWatching() {
 				err = fmt.Errorf("watch error: %w", watchErr)
 			case <-debounceTimer:
 				// Process and emit package updates after the debounce interval
-				updates := p.generatePackagesUpdateList(pathList)
+				updates := p.generatePackagesUpdateList(filesList)
 				for _, update := range updates {
 					p.logger.Info("packages update",
-						"pkg", update.Package,
+						"pkg", update.PackageDir,
 						"files", update.Files,
 					)
 				}
@@ -84,7 +84,7 @@ func (p *PackageWatcher) startWatching() {
 				})
 
 				// Reset the path list and debounce timer
-				pathList = []string{}
+				filesList = []string{}
 				debounceTimer = nil
 			case evt := <-p.watcher.Events:
 				// Only handle write operations
@@ -92,7 +92,7 @@ func (p *PackageWatcher) startWatching() {
 					continue
 				}
 
-				pathList = append(pathList, evt.Name)
+				filesList = append(filesList, evt.Name)
 
 				// Set up the debounce timer
 				debounceTimer = time.After(timeout)
@@ -125,26 +125,26 @@ func (p *PackageWatcher) UpdatePackagesWatch(pkgs ...packages.Package) {
 			continue
 		}
 
-		path, err := filepath.Abs(pkg.Location)
+		dir, err := filepath.Abs(pkg.Location)
 		if err != nil {
 			p.logger.Error("Unable to get absolute path", "path", pkg.Location, "error", err)
 			continue
 		}
 
-		newPkgs[path] = struct{}{}
+		newPkgs[dir] = struct{}{}
 	}
 
-	for path := range oldPkgs {
-		if _, exists := newPkgs[path]; !exists {
-			p.watcher.Remove(path)
-			p.logger.Debug("Watcher list: removed", "path", path)
+	for dir := range oldPkgs {
+		if _, exists := newPkgs[dir]; !exists {
+			p.watcher.Remove(dir)
+			p.logger.Debug("Watcher list: removed", "path", dir)
 		}
 	}
 
-	for path := range newPkgs {
-		if _, exists := oldPkgs[path]; !exists {
-			p.watcher.Add(path)
-			p.logger.Debug("Watcher list: added", "path", path)
+	for dir := range newPkgs {
+		if _, exists := oldPkgs[dir]; !exists {
+			p.watcher.Add(dir)
+			p.logger.Debug("Watcher list: added", "path", dir)
 		}
 	}
 }
@@ -154,29 +154,29 @@ func (p *PackageWatcher) generatePackagesUpdateList(paths []string) PackageUpdat
 
 	mpkgs := map[string]*events.PackageUpdate{} // Pkg -> Update
 	watchList := p.watcher.WatchList()
-	for _, path := range paths {
-		for _, pkg := range watchList {
-			if len(pkg) == len(path) {
-				continue // Skip if pkg == path
+	for _, file := range paths {
+		for _, watchDir := range watchList {
+			if len(watchDir) == len(file) {
+				continue // Skip if watchDir == file
 			}
 
 			// Check if a package directory contain our path directory
-			dirPath := filepath.Dir(path)
-			if !strings.HasPrefix(pkg, dirPath) {
+			dir := filepath.Dir(file)
+			if !strings.HasPrefix(watchDir, dir) {
 				continue
 			}
 
 			// Accumulate file updates for each package
-			pkgu, ok := mpkgs[pkg]
+			pkgu, ok := mpkgs[watchDir]
 			if !ok {
 				pkgsUpdate = append(pkgsUpdate, events.PackageUpdate{
-					Package: pkg,
-					Files:   []string{},
+					PackageDir: watchDir,
+					Files:      []string{},
 				})
 				pkgu = &pkgsUpdate[len(pkgsUpdate)-1]
 			}
 
-			pkgu.Files = append(pkgu.Files, path)
+			pkgu.Files = append(pkgu.Files, file)
 		}
 	}
 
@@ -188,7 +188,7 @@ type PackageUpdateList []events.PackageUpdate
 func (pkgsu PackageUpdateList) PackagesPath() []string {
 	pkgs := make([]string, len(pkgsu))
 	for i, pkg := range pkgsu {
-		pkgs[i] = pkg.Package
+		pkgs[i] = pkg.PackageDir
 	}
 	return pkgs
 }
diff --git a/gno.land/pkg/gnoweb/handler.go b/gno.land/pkg/gnoweb/handler.go
index cfad9919506..41a61c4cead 100644
--- a/gno.land/pkg/gnoweb/handler.go
+++ b/gno.land/pkg/gnoweb/handler.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"log/slog"
 	"net/http"
-	"path/filepath"
+	"path"
 	"strings"
 	"time"
 
@@ -207,14 +207,14 @@ func (h *WebHandler) GetHelpView(gnourl *weburl.GnoURL) (int, *components.View)
 		}
 	}
 
-	realmName := filepath.Base(gnourl.Path)
+	realmName := path.Base(gnourl.Path)
 	return http.StatusOK, components.HelpView(components.HelpData{
 		SelectedFunc: selFn,
 		SelectedArgs: selArgs,
 		RealmName:    realmName,
 		// TODO: get chain domain and use that.
 		ChainId:   h.Static.ChainId,
-		PkgPath:   filepath.Join(h.Static.Domain, gnourl.Path),
+		PkgPath:   path.Join(h.Static.Domain, gnourl.Path),
 		Remote:    h.Static.RemoteHelp,
 		Functions: fsigs,
 	})
diff --git a/gno.land/pkg/gnoweb/webclient_html.go b/gno.land/pkg/gnoweb/webclient_html.go
index 72b1b3f8b06..efbc08870de 100644
--- a/gno.land/pkg/gnoweb/webclient_html.go
+++ b/gno.land/pkg/gnoweb/webclient_html.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"io"
 	"log/slog"
-	"path/filepath"
+	gopath "path"
 	"strings"
 
 	"github.com/alecthomas/chroma/v2"
@@ -121,7 +121,7 @@ func (s *HTMLWebClient) SourceFile(w io.Writer, path, fileName string) (*FileMet
 	}
 
 	// XXX: Consider moving this into gnoclient
-	fullPath := filepath.Join(s.domain, strings.Trim(path, "/"), fileName)
+	fullPath := gopath.Join(s.domain, strings.Trim(path, "/"), fileName)
 
 	source, err := s.query(qpath, []byte(fullPath))
 	if err != nil {
@@ -230,7 +230,7 @@ func (s *HTMLWebClient) FormatSource(w io.Writer, fileName string, src []byte) e
 	var lexer chroma.Lexer
 
 	// Determine the lexer to be used based on the file extension.
-	switch strings.ToLower(filepath.Ext(fileName)) {
+	switch strings.ToLower(gopath.Ext(fileName)) {
 	case ".gno":
 		lexer = lexers.Get("go")
 	case ".md":
diff --git a/gno.land/pkg/gnoweb/weburl/url.go b/gno.land/pkg/gnoweb/weburl/url.go
index cbe861e9e42..8b62ada198f 100644
--- a/gno.land/pkg/gnoweb/weburl/url.go
+++ b/gno.land/pkg/gnoweb/weburl/url.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"net/url"
-	"path/filepath"
+	gopath "path"
 	"regexp"
 	"slices"
 	"strings"
@@ -179,8 +179,8 @@ func ParseGnoURL(u *url.URL) (*GnoURL, error) {
 
 	// A file is considered as one that either ends with an extension or
 	// contains an uppercase rune
-	ext := filepath.Ext(upath)
-	base := filepath.Base(upath)
+	ext := gopath.Ext(upath)
+	base := gopath.Base(upath)
 	if ext != "" || strings.ToLower(base) != base {
 		file = base
 		upath = strings.TrimSuffix(upath, base)

From 041f56d6bdfa4a4deeb830f7344aa9ba6ec9598e Mon Sep 17 00:00:00 2001
From: Emmanuel T Odeke <emmanuel@orijtech.com>
Date: Thu, 13 Feb 2025 19:03:19 +0200
Subject: [PATCH 12/47] fix(gnolang): make Go2Gno return a prespective error
 instead of sudden/elusive runtime panic with a bad receiver (#3733)

The pattern:

```go
func() A()
```
confuses Go into expecting a receiver and it returns a compile time
error "missing receiver", but previously Gno panicked with a runtime
error due to a deference yet the Recv.List was empty. This change fixes
that by detecting that condition and prescriptively panicking which can
then be relayed reasonably as expecting to the calling user.

Fixes #3727

---------

Co-authored-by: Morgan Bazalgette <morgan@morganbaz.com>
---
 gnovm/pkg/gnolang/go2gno.go      |  5 ++++-
 gnovm/tests/files/parse_err0.gno | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 gnovm/tests/files/parse_err0.gno

diff --git a/gnovm/pkg/gnolang/go2gno.go b/gnovm/pkg/gnolang/go2gno.go
index 34686dc4cc1..1ef23a0079e 100644
--- a/gnovm/pkg/gnolang/go2gno.go
+++ b/gnovm/pkg/gnolang/go2gno.go
@@ -433,7 +433,10 @@ func Go2Gno(fs *token.FileSet, gon ast.Node) (n Node) {
 		recv := FieldTypeExpr{}
 		if isMethod {
 			if len(gon.Recv.List) > 1 {
-				panic("*ast.FuncDecl cannot have multiple receivers")
+				panic("method has multiple receivers")
+			}
+			if len(gon.Recv.List) == 0 {
+				panic("method has no receiver")
 			}
 			recv = *Go2Gno(fs, gon.Recv.List[0]).(*FieldTypeExpr)
 		}
diff --git a/gnovm/tests/files/parse_err0.gno b/gnovm/tests/files/parse_err0.gno
new file mode 100644
index 00000000000..88a8e0df132
--- /dev/null
+++ b/gnovm/tests/files/parse_err0.gno
@@ -0,0 +1,10 @@
+// https://github.com/gnolang/gno/issues/3727
+
+package main
+
+func () A()
+
+func main() {}
+
+// Error:
+// method has no receiver

From 2e491411894e9bb2c882ad88bfe111a8cdb4a1d7 Mon Sep 17 00:00:00 2001
From: Mason McBride <56214403+masonmcbride@users.noreply.github.com>
Date: Thu, 13 Feb 2025 09:25:45 -0800
Subject: [PATCH 13/47] feat(examples): add mason realm to examples + md
 project (#3726)

Hi I'm putting this here so I can be added into the examples folder. I
will also be making a md implementation that's slightly different than
moul and sunspirits but in the same spirit as them.
---
 examples/gno.land/p/mason/md/gno.mod    |  1 +
 examples/gno.land/p/mason/md/md.gno     | 48 +++++++++++++++
 examples/gno.land/r/mason/home/gno.mod  |  1 +
 examples/gno.land/r/mason/home/home.gno | 77 +++++++++++++++++++++++++
 4 files changed, 127 insertions(+)
 create mode 100644 examples/gno.land/p/mason/md/gno.mod
 create mode 100644 examples/gno.land/p/mason/md/md.gno
 create mode 100644 examples/gno.land/r/mason/home/gno.mod
 create mode 100644 examples/gno.land/r/mason/home/home.gno

diff --git a/examples/gno.land/p/mason/md/gno.mod b/examples/gno.land/p/mason/md/gno.mod
new file mode 100644
index 00000000000..1f154210baf
--- /dev/null
+++ b/examples/gno.land/p/mason/md/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/mason/md
diff --git a/examples/gno.land/p/mason/md/md.gno b/examples/gno.land/p/mason/md/md.gno
new file mode 100644
index 00000000000..06e69b2c668
--- /dev/null
+++ b/examples/gno.land/p/mason/md/md.gno
@@ -0,0 +1,48 @@
+package md
+
+import (
+	"strings"
+)
+
+type MD struct {
+	elements []string
+}
+
+func New() *MD {
+	return &MD{elements: []string{}}
+}
+
+func (m *MD) H1(text string) {
+	m.elements = append(m.elements, "# "+text)
+}
+
+func (m *MD) H3(text string) {
+	m.elements = append(m.elements, "### "+text)
+}
+
+func (m *MD) P(text string) {
+	m.elements = append(m.elements, text)
+}
+
+func (m *MD) Code(text string) {
+	m.elements = append(m.elements, "  ```\n"+text+"\n```\n")
+}
+
+func (m *MD) Im(path string, caption string) {
+	m.elements = append(m.elements, "!["+caption+"]("+path+" \""+caption+"\")")
+}
+
+func (m *MD) Bullet(point string) {
+	m.elements = append(m.elements, "- "+point)
+}
+
+func Link(text, url string, title ...string) string {
+	if len(title) > 0 && title[0] != "" {
+		return "[" + text + "](" + url + " \"" + title[0] + "\")"
+	}
+	return "[" + text + "](" + url + ")"
+}
+
+func (m *MD) Render() string {
+	return strings.Join(m.elements, "\n\n")
+}
diff --git a/examples/gno.land/r/mason/home/gno.mod b/examples/gno.land/r/mason/home/gno.mod
new file mode 100644
index 00000000000..0b934f1a5d1
--- /dev/null
+++ b/examples/gno.land/r/mason/home/gno.mod
@@ -0,0 +1 @@
+module gno.land/r/mason/home
diff --git a/examples/gno.land/r/mason/home/home.gno b/examples/gno.land/r/mason/home/home.gno
new file mode 100644
index 00000000000..557227cf5d4
--- /dev/null
+++ b/examples/gno.land/r/mason/home/home.gno
@@ -0,0 +1,77 @@
+package home
+
+import (
+	"gno.land/p/mason/md"
+)
+
+const (
+	gnomeArt1 = `   /\
+                  /  \
+                  ,,,,,
+                  (o.o)
+                  (\_/)
+                  -"-"-`
+	dgnonut = `
+                        #$$$$$$$$*                         
+                     #$$@@@@@@@@@@$$$#                      
+                   #$$@@@@@@@@@@@@@$$$$#                    
+                 #$$$@@@@$$$$$$$$$$$$$$$$*                  
+                #$$$$$$$$$$$$$$$$$$$$$$$$$#!                
+               #$$$$$$$$$############$$$$$##*               
+             !##$$$$$$####**********#####$###*              
+            =##$$$$$###****!!!!!!!!!***######*!             
+            *##$$$###***!!!!!!==!!!!!!**######*=            
+           !*#######***!!!=;;;;;====!!!!**####**            
+          !*#######**!!!==;;::::::;;==!!!**###**!           
+          !*######***!==;::~~~~~~:::;;=!!!***#***=          
+         =**#####**!!==;::~-,,,,,--~:;;=!!!******!          
+         !**####***!==;:~-,..  ..,,-~:;==!!******!;         
+        ;!**###***!!=;:~-,.       ..-~:;==!!*****!=         
+        =!*******!!==::-.          .,-::==!!*****!=         
+        =!*******!!=;:~,            .-~:;=!!!****!=:        
+       ~=!*******!==;:-.            .,-:;=!!!****!=;        
+       :=!*******!==;~,.             ,-:;==!!!***!=;        
+       :=!******!!==:~,              ,-:;=!!!***!!=;        
+       :=!!*****!!=;:~,              ,~:;=!!****!!=;-       
+       :=!!!****!!==;~,              -~;==!!****!!=;-       
+       :;=!!*****!!=;:-              -:;=!!*****!!=:-       
+       ~;=!!!****!!==;~              :;=!!*****!!!;:-       
+       ~;==!!****!!!==:              ;=!!******!!=;:,       
+       ~:==!!!****!!!=;~            :=!********!!=;:.       
+       -:;==!!*****!!!!;            =!*********!==;:        
+       ,~;==!!*******!!==          =**#####****!==:~        
+       ,~:;=!!!!*********!        **#######***!!=;~-        
+        -~;;=!!!!**********!    *##$$$$$###***!!=:~.        
+        ,~:;==!!!****##########$$$$$$$$###****!=;:~         
+         -~:;==!!!***####$$$$$$@@@@@$$$###**!!=;:~,         
+         ,-~:;=!!!***####$$$$@@@@@@$$$$##**!!!=;:-.         
+          -~:;;=!!!***###$$$$$@@@@$$$$##***!!=;:-.          
+          .-~:;;=!!!***###$$$$$$$$$$$##***!==;:~-           
+           .-~:;==!!!!**####$$$$$$$###**!!==;:~-            
+            ,-~::;==!!!!***########****!!==;:~-.            
+             ,-~:;;==!!!!!***********!!!==;:~,.             
+              ,,~~::;====!!!!!!!!!!!!!==;::~,.              
+               .,-~::;;;===!!!!!!!!===;::~-,.               
+                 ,--~~:;;;;========;;::~--.                 
+                  .,,-~~:::::::::::~~~-,,.                  
+                    ..,---~~~~~~~~~--,..                    
+                       ..,,,,,,,,,...                       
+                             ...`
+)
+
+func Render(path string) string {
+	home := md.New()
+	home.H1("Mason's Realm")
+
+	home.Im("https://cdn.esawebb.org/archives/images/screen/weic2428a.jpg", "Placeholder")
+	home.P("Welcome to my realm. " + md.Link("github", "https://github.com/masonmcbride"))
+
+	home.H3("Dgnonut")
+	home.Code(dgnonut)
+
+	home.H3("More")
+	home.Code(gnomeArt1)
+	home.Bullet("Credit to " + md.Link("JJOptimist", "https://gno.land/r/jjoptimist/home") + " for this gnome art.")
+	home.Bullet("I'm testing out my markdown system.")
+	return home.Render()
+}

From 9884ba10e8b06af670f3d2a7508e92595601f050 Mon Sep 17 00:00:00 2001
From: Guilhem Fanton <8671905+gfanton@users.noreply.github.com>
Date: Fri, 14 Feb 2025 14:09:04 +0100
Subject: [PATCH 14/47] feat(gnoweb): add secure headers by default & timeout
 configuration (#3619)

This PR adds the following secure headers by default `strict=true` to
gnoweb:

```go
func SecureHeadersMiddleware(next http.Handler, strict bool) http.Handler {
	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
		// Prevent MIME type sniffing by browsers. This ensures that the browser
		// does not interpret files as a different MIME type than declared.
		w.Header().Set("X-Content-Type-Options", "nosniff")

		// Prevent the page from being embedded in an iframe. This mitigates
		// clickjacking attacks by ensuring the page cannot be loaded in a frame.
		w.Header().Set("X-Frame-Options", "DENY")

		// Control the amount of referrer information sent in the Referer header.
		// 'no-referrer' ensures that no referrer information is sent, which
		// enhances privacy and prevents leakage of sensitive URLs.
		w.Header().Set("Referrer-Policy", "no-referrer")

		// In `strict` mode, prevent cross-site resource forgery and enforce https
		if strict {
			// Define a Content Security Policy (CSP) to restrict the sources of
			// scripts, styles, images, and other resources. This helps prevent
			// cross-site scripting (XSS) and other code injection attacks.
			// - 'self' allows resources from the same origin.
			// - '*' allows images from any external source.
			// - data: is not included to prevent inline images (e.g., base64-encoded images).
			w.Header().Set("Content-Security-Policy", "default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' *; font-src 'self'")

			// Enforce HTTPS by telling browsers to only access the site over HTTPS
			// for a specified duration (1 year in this case). This also applies to
			// subdomains and allows preloading into the browser's HSTS list.
			w.Header().Set("Strict-Transport-Security", "max-age=31536000; includeSubDomains; preload")
		}

		next.ServeHTTP(w, r)
	})
}

```

I've also enforced a timeout on read/write/idle (default to 1 minute).

cc @kristovatlas

---------

Signed-off-by: gfanton <8671905+gfanton@users.noreply.github.com>
Co-authored-by: Antoine Eddi <5222525+aeddi@users.noreply.github.com>
Co-authored-by: alexiscolin <alexis@jaunebleu.co>
Co-authored-by: Morgan <git@howl.moe>
---
 gno.land/cmd/gnoweb/main.go                  | 64 +++++++++++++++++++-
 gno.land/pkg/gnoweb/Makefile                 |  3 +-
 gno.land/pkg/gnoweb/components/ui/icons.html |  2 +-
 3 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/gno.land/cmd/gnoweb/main.go b/gno.land/cmd/gnoweb/main.go
index 8c0df00aa35..5b8961859f4 100644
--- a/gno.land/cmd/gnoweb/main.go
+++ b/gno.land/cmd/gnoweb/main.go
@@ -23,9 +23,11 @@ type webCfg struct {
 	bind       string
 	faucetURL  string
 	assetsDir  string
+	timeout    time.Duration
 	analytics  bool
 	json       bool
 	html       bool
+	noStrict   bool
 	verbose    bool
 }
 
@@ -33,6 +35,7 @@ var defaultWebOptions = webCfg{
 	chainid: "dev",
 	remote:  "127.0.0.1:26657",
 	bind:    ":8888",
+	timeout: time.Minute,
 }
 
 func main() {
@@ -127,7 +130,14 @@ func (c *webCfg) RegisterFlags(fs *flag.FlagSet) {
 		&c.analytics,
 		"with-analytics",
 		defaultWebOptions.analytics,
-		"nable privacy-first analytics",
+		"enable privacy-first analytics",
+	)
+
+	fs.BoolVar(
+		&c.noStrict,
+		"no-strict",
+		defaultWebOptions.noStrict,
+		"allow cross-site resource forgery and disable https enforcement",
 	)
 
 	fs.BoolVar(
@@ -136,6 +146,13 @@ func (c *webCfg) RegisterFlags(fs *flag.FlagSet) {
 		defaultWebOptions.verbose,
 		"verbose logging mode",
 	)
+
+	fs.DurationVar(
+		&c.timeout,
+		"timeout",
+		defaultWebOptions.timeout,
+		"set read/write/idle timeout for server connections",
+	)
 }
 
 func setupWeb(cfg *webCfg, _ []string, io commands.IO) (func() error, error) {
@@ -179,11 +196,17 @@ func setupWeb(cfg *webCfg, _ []string, io commands.IO) (func() error, error) {
 
 	logger.Info("Running", "listener", bindaddr.String())
 
+	// Setup security headers
+	secureHandler := SecureHeadersMiddleware(app, !cfg.noStrict)
+
 	// Setup server
 	server := &http.Server{
-		Handler:           app,
+		Handler:           secureHandler,
 		Addr:              bindaddr.String(),
-		ReadHeaderTimeout: 60 * time.Second,
+		ReadTimeout:       cfg.timeout, // Time to read the request
+		WriteTimeout:      cfg.timeout, // Time to write the entire response
+		IdleTimeout:       cfg.timeout, // Time to keep idle connections open
+		ReadHeaderTimeout: time.Minute, // Time to read request headers
 	}
 
 	return func() error {
@@ -191,6 +214,41 @@ func setupWeb(cfg *webCfg, _ []string, io commands.IO) (func() error, error) {
 			logger.Error("HTTP server stopped", "error", err)
 			return commands.ExitCodeError(1)
 		}
+
 		return nil
 	}, nil
 }
+
+func SecureHeadersMiddleware(next http.Handler, strict bool) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		// Prevent MIME type sniffing by browsers. This ensures that the browser
+		// does not interpret files as a different MIME type than declared.
+		w.Header().Set("X-Content-Type-Options", "nosniff")
+
+		// Prevent the page from being embedded in an iframe. This mitigates
+		// clickjacking attacks by ensuring the page cannot be loaded in a frame.
+		w.Header().Set("X-Frame-Options", "DENY")
+
+		// Control the amount of referrer information sent in the Referer header.
+		// 'no-referrer' ensures that no referrer information is sent, which
+		// enhances privacy and prevents leakage of sensitive URLs.
+		w.Header().Set("Referrer-Policy", "no-referrer")
+
+		// In `strict` mode, prevent cross-site ressources forgery and enforce https
+		if strict {
+			// Define a Content Security Policy (CSP) to restrict the sources of
+			// scripts, styles, images, and other resources. This helps prevent
+			// cross-site scripting (XSS) and other code injection attacks.
+			// - 'self' allows resources from the same origin.
+			// - 'data:' allows inline images (e.g., base64-encoded images).
+			w.Header().Set("Content-Security-Policy", "default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' data:; font-src 'self'")
+
+			// Enforce HTTPS by telling browsers to only access the site over HTTPS
+			// for a specified duration (1 year in this case). This also applies to
+			// subdomains and allows preloading into the browser's HSTS list.
+			w.Header().Set("Strict-Transport-Security", "max-age=31536000")
+		}
+
+		next.ServeHTTP(w, r)
+	})
+}
diff --git a/gno.land/pkg/gnoweb/Makefile b/gno.land/pkg/gnoweb/Makefile
index c8d662ec3b5..be7c2c2a3a2 100644
--- a/gno.land/pkg/gnoweb/Makefile
+++ b/gno.land/pkg/gnoweb/Makefile
@@ -80,7 +80,8 @@ dev:
 # Go server in development mode
 dev.gnoweb: generate
 	$(run_reflex) -s -r '.*\.(go|html)' -- \
-		go run ../../cmd/gnoweb -assets-dir=${PUBLIC_DIR} -chainid=${CHAIN_ID} -remote=${DEV_REMOTE} \
+		go run ../../cmd/gnoweb -no-strict -assets-dir=${PUBLIC_DIR} -chainid=${CHAIN_ID} -remote=${DEV_REMOTE} \
+
 		2>&1 | $(run_logname) gnoweb
 
 # Tailwind CSS in development mode
diff --git a/gno.land/pkg/gnoweb/components/ui/icons.html b/gno.land/pkg/gnoweb/components/ui/icons.html
index f1145d74359..61c11259817 100644
--- a/gno.land/pkg/gnoweb/components/ui/icons.html
+++ b/gno.land/pkg/gnoweb/components/ui/icons.html
@@ -1,5 +1,5 @@
 {{ define "ui/icons" }}
-<svg xmlns="http://www.w3.org/2000/svg" style="display: none">
+<svg xmlns="http://www.w3.org/2000/svg" class="hidden">
   <symbol id="ico-search" viewBox="0 0 14 14">
     <title>Search</title>
     <path

From 3a132414e572a3663b046232e4ed3b90f49b555d Mon Sep 17 00:00:00 2001
From: Guilhem Fanton <8671905+gfanton@users.noreply.github.com>
Date: Mon, 17 Feb 2025 07:42:44 +0100
Subject: [PATCH 15/47] fix(gnoweb): allow `gno.services` url for analytics
 (#3762)

---
 gno.land/cmd/gnoweb/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gno.land/cmd/gnoweb/main.go b/gno.land/cmd/gnoweb/main.go
index 5b8961859f4..a3503848657 100644
--- a/gno.land/cmd/gnoweb/main.go
+++ b/gno.land/cmd/gnoweb/main.go
@@ -241,7 +241,7 @@ func SecureHeadersMiddleware(next http.Handler, strict bool) http.Handler {
 			// cross-site scripting (XSS) and other code injection attacks.
 			// - 'self' allows resources from the same origin.
 			// - 'data:' allows inline images (e.g., base64-encoded images).
-			w.Header().Set("Content-Security-Policy", "default-src 'self'; script-src 'self'; style-src 'self'; img-src 'self' data:; font-src 'self'")
+			w.Header().Set("Content-Security-Policy", "default-src 'self'; script-src 'self' https://sa.gno.services; style-src 'self'; img-src 'self' data:; font-src 'self'")
 
 			// Enforce HTTPS by telling browsers to only access the site over HTTPS
 			// for a specified duration (1 year in this case). This also applies to

From bac0fcc19faf9ba95a651d4e43efdaf32e6f9591 Mon Sep 17 00:00:00 2001
From: Morgan <morgan@morganbaz.com>
Date: Mon, 17 Feb 2025 11:52:38 +0100
Subject: [PATCH 16/47] ci: linter hotfix + update to 1.64 (#3766)

---
 .github/golangci.yml                |   8 +-
 .github/workflows/lint_template.yml |   5 +-
 misc/devdeps/go.mod                 | 173 +++---
 misc/devdeps/go.sum                 | 811 ++++++++--------------------
 4 files changed, 316 insertions(+), 681 deletions(-)

diff --git a/.github/golangci.yml b/.github/golangci.yml
index afc581d2ec5..476aa8451fb 100644
--- a/.github/golangci.yml
+++ b/.github/golangci.yml
@@ -1,15 +1,13 @@
 run:
   concurrency: 8
   timeout: 10m
-  issue-exit-code: 1
+  issues-exit-code: 1
   tests: true
-  skip-dirs-use-default: true
   modules-download-mode: readonly
   allow-parallel-runners: false
   go: ""
 
 output:
-  uniq-by-line: false
   path-prefix: ""
   sort-results: true
 
@@ -55,7 +53,7 @@ linters-settings:
       - G306 # Expect WriteFile permissions to be 0600 or less
       - G115 # Integer overflow conversion, no solution to check the overflow in time of convert, so linter shouldn't check the overflow.
   stylecheck:
-    checks: [ "all", "-ST1022", "-ST1003" ]
+    checks: ["all", "-ST1022", "-ST1003"]
   errorlint:
     asserts: false
 
@@ -78,6 +76,8 @@ issues:
   max-same-issues: 0
   new: false
   fix: false
+  exclude-dirs-use-default: true
+  uniq-by-line: false
 
   exclude-rules:
     - path: _test\.go
diff --git a/.github/workflows/lint_template.yml b/.github/workflows/lint_template.yml
index 43246572daa..0dbc4678edb 100644
--- a/.github/workflows/lint_template.yml
+++ b/.github/workflows/lint_template.yml
@@ -22,6 +22,5 @@ jobs:
         uses: golangci/golangci-lint-action@v6
         with:
           working-directory: ${{ inputs.modulepath }}
-          args:
-            --config=${{ github.workspace }}/.github/golangci.yml
-          version: v1.62 # sync with misc/devdeps
+          args: --config=${{ github.workspace }}/.github/golangci.yml
+          version: v1.64 # sync with misc/devdeps
diff --git a/misc/devdeps/go.mod b/misc/devdeps/go.mod
index d3b40b73b52..74ceda0abf0 100644
--- a/misc/devdeps/go.mod
+++ b/misc/devdeps/go.mod
@@ -1,62 +1,65 @@
 module github.com/gnolang/gno/misc/devdeps
 
-go 1.22.1
+go 1.23.0
+
+toolchain go1.23.2
 
 require (
 	github.com/campoy/embedmd v1.0.0
-	github.com/golangci/golangci-lint v1.62.2 // sync with github action
-	golang.org/x/tools v0.27.0
-	google.golang.org/protobuf v1.35.1
+	github.com/golangci/golangci-lint v1.64.5 // sync with github action
+	golang.org/x/tools v0.30.0
+	google.golang.org/protobuf v1.36.5
 	moul.io/testman v1.5.0
 	mvdan.cc/gofumpt v0.7.0
 )
 
 require (
 	4d63.com/gocheckcompilerdirectives v1.2.1 // indirect
-	4d63.com/gochecknoglobals v0.2.1 // indirect
-	github.com/4meepo/tagalign v1.3.4 // indirect
+	4d63.com/gochecknoglobals v0.2.2 // indirect
+	github.com/4meepo/tagalign v1.4.2 // indirect
 	github.com/Abirdcfly/dupword v0.1.3 // indirect
 	github.com/Antonboom/errname v1.0.0 // indirect
-	github.com/Antonboom/nilnil v1.0.0 // indirect
+	github.com/Antonboom/nilnil v1.0.1 // indirect
 	github.com/Antonboom/testifylint v1.5.2 // indirect
 	github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c // indirect
-	github.com/Crocmagnon/fatcontext v0.5.3 // indirect
+	github.com/Crocmagnon/fatcontext v0.7.1 // indirect
 	github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
 	github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 // indirect
-	github.com/Masterminds/semver/v3 v3.3.0 // indirect
+	github.com/Masterminds/semver/v3 v3.3.1 // indirect
 	github.com/OpenPeeDeeP/depguard/v2 v2.2.0 // indirect
-	github.com/alecthomas/go-check-sumtype v0.2.0 // indirect
+	github.com/alecthomas/go-check-sumtype v0.3.1 // indirect
 	github.com/alexkohler/nakedret/v2 v2.0.5 // indirect
 	github.com/alexkohler/prealloc v1.0.0 // indirect
 	github.com/alingse/asasalint v0.0.11 // indirect
+	github.com/alingse/nilnesserr v0.1.2 // indirect
 	github.com/ashanbrown/forbidigo v1.6.0 // indirect
-	github.com/ashanbrown/makezero v1.1.1 // indirect
+	github.com/ashanbrown/makezero v1.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/bkielbasa/cyclop v1.2.3 // indirect
 	github.com/blizzy78/varnamelen v0.8.0 // indirect
-	github.com/bombsimon/wsl/v4 v4.4.1 // indirect
+	github.com/bombsimon/wsl/v4 v4.5.0 // indirect
 	github.com/breml/bidichk v0.3.2 // indirect
 	github.com/breml/errchkjson v0.4.0 // indirect
-	github.com/butuzov/ireturn v0.3.0 // indirect
-	github.com/butuzov/mirror v1.2.0 // indirect
-	github.com/catenacyber/perfsprint v0.7.1 // indirect
+	github.com/butuzov/ireturn v0.3.1 // indirect
+	github.com/butuzov/mirror v1.3.0 // indirect
+	github.com/catenacyber/perfsprint v0.8.1 // indirect
 	github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/charithe/durationcheck v0.0.10 // indirect
 	github.com/chavacava/garif v0.1.0 // indirect
-	github.com/ckaznocha/intrange v0.2.1 // indirect
-	github.com/curioswitch/go-reassign v0.2.0 // indirect
+	github.com/ckaznocha/intrange v0.3.0 // indirect
+	github.com/curioswitch/go-reassign v0.3.0 // indirect
 	github.com/daixiang0/gci v0.13.5 // indirect
-	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/denis-tingaikin/go-header v0.5.0 // indirect
 	github.com/ettle/strcase v0.2.0 // indirect
 	github.com/fatih/color v1.18.0 // indirect
 	github.com/fatih/structtag v1.2.0 // indirect
 	github.com/firefart/nonamedreturns v1.0.5 // indirect
-	github.com/fsnotify/fsnotify v1.5.4 // indirect
+	github.com/fsnotify/fsnotify v1.8.0 // indirect
 	github.com/fzipp/gocyclo v0.6.0 // indirect
-	github.com/ghostiam/protogetter v0.3.8 // indirect
-	github.com/go-critic/go-critic v0.11.5 // indirect
+	github.com/ghostiam/protogetter v0.3.9 // indirect
+	github.com/go-critic/go-critic v0.12.0 // indirect
 	github.com/go-toolsmith/astcast v1.1.0 // indirect
 	github.com/go-toolsmith/astcopy v1.1.0 // indirect
 	github.com/go-toolsmith/astequal v1.2.0 // indirect
@@ -65,134 +68,136 @@ require (
 	github.com/go-toolsmith/strparse v1.1.0 // indirect
 	github.com/go-toolsmith/typep v1.1.0 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
-	github.com/go-xmlfmt/xmlfmt v1.1.2 // indirect
+	github.com/go-xmlfmt/xmlfmt v1.1.3 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/gofrs/flock v0.12.1 // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect
 	github.com/golangci/go-printf-func-name v0.1.0 // indirect
-	github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 // indirect
+	github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d // indirect
 	github.com/golangci/misspell v0.6.0 // indirect
-	github.com/golangci/modinfo v0.3.4 // indirect
 	github.com/golangci/plugin-module-register v0.1.1 // indirect
-	github.com/golangci/revgrep v0.5.3 // indirect
+	github.com/golangci/revgrep v0.8.0 // indirect
 	github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/gordonklaus/ineffassign v0.1.0 // indirect
 	github.com/gostaticanalysis/analysisutil v0.7.1 // indirect
-	github.com/gostaticanalysis/comment v1.4.2 // indirect
-	github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect
+	github.com/gostaticanalysis/comment v1.5.0 // indirect
+	github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
 	github.com/gostaticanalysis/nilerr v0.1.1 // indirect
+	github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
 	github.com/hashicorp/go-version v1.7.0 // indirect
+	github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/hexops/gotextdiff v1.0.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jgautheron/goconst v1.7.1 // indirect
 	github.com/jingyugao/rowserrcheck v1.1.1 // indirect
-	github.com/jjti/go-spancheck v0.6.2 // indirect
-	github.com/julz/importas v0.1.0 // indirect
-	github.com/karamaru-alpha/copyloopvar v1.1.0 // indirect
+	github.com/jjti/go-spancheck v0.6.4 // indirect
+	github.com/julz/importas v0.2.0 // indirect
+	github.com/karamaru-alpha/copyloopvar v1.2.1 // indirect
 	github.com/kisielk/errcheck v1.8.0 // indirect
 	github.com/kkHAIKE/contextcheck v1.1.5 // indirect
 	github.com/kulti/thelper v0.6.3 // indirect
 	github.com/kunwardeep/paralleltest v1.0.10 // indirect
-	github.com/kyoh86/exportloopref v0.1.11 // indirect
 	github.com/lasiar/canonicalheader v1.1.2 // indirect
-	github.com/ldez/gomoddirectives v0.2.4 // indirect
-	github.com/ldez/tagliatelle v0.5.0 // indirect
+	github.com/ldez/exptostd v0.4.1 // indirect
+	github.com/ldez/gomoddirectives v0.6.1 // indirect
+	github.com/ldez/grignotin v0.9.0 // indirect
+	github.com/ldez/tagliatelle v0.7.1 // indirect
+	github.com/ldez/usetesting v0.4.2 // indirect
 	github.com/leonklingele/grouper v1.1.2 // indirect
 	github.com/macabu/inamedparam v0.1.3 // indirect
-	github.com/magiconair/properties v1.8.6 // indirect
+	github.com/magiconair/properties v1.8.9 // indirect
 	github.com/maratori/testableexamples v1.0.0 // indirect
 	github.com/maratori/testpackage v1.1.1 // indirect
-	github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/matoous/godox v1.1.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/mattn/go-runewidth v0.0.16 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
-	github.com/mgechev/revive v1.5.1 // indirect
+	github.com/mgechev/revive v1.7.0 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/moricho/tparallel v0.3.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nakabonne/nestif v0.3.1 // indirect
 	github.com/nishanths/exhaustive v0.12.0 // indirect
 	github.com/nishanths/predeclared v0.2.2 // indirect
-	github.com/nunnatsa/ginkgolinter v0.18.3 // indirect
+	github.com/nunnatsa/ginkgolinter v0.19.0 // indirect
 	github.com/olekukonko/tablewriter v0.0.5 // indirect
-	github.com/pelletier/go-toml v1.9.5 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
-	github.com/peterbourgon/ff/v3 v3.3.0 // indirect
-	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/polyfloyd/go-errorlint v1.7.0 // indirect
-	github.com/prometheus/client_golang v1.12.1 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.32.1 // indirect
-	github.com/prometheus/procfs v0.7.3 // indirect
+	github.com/peterbourgon/ff/v3 v3.4.0 // indirect
+	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
+	github.com/polyfloyd/go-errorlint v1.7.1 // indirect
+	github.com/prometheus/client_golang v1.20.5 // indirect
+	github.com/prometheus/client_model v0.6.1 // indirect
+	github.com/prometheus/common v0.62.0 // indirect
+	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 // indirect
 	github.com/quasilyte/go-ruleguard/dsl v0.3.22 // indirect
 	github.com/quasilyte/gogrep v0.5.0 // indirect
 	github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 // indirect
 	github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect
-	github.com/raeperd/recvcheck v0.1.2 // indirect
+	github.com/raeperd/recvcheck v0.2.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
-	github.com/rogpeppe/go-internal v1.13.1 // indirect
+	github.com/rogpeppe/go-internal v1.13.2-0.20241226121412-a5dc8ff20d0a // indirect
 	github.com/ryancurrah/gomodguard v1.3.5 // indirect
 	github.com/ryanrolds/sqlclosecheck v0.5.1 // indirect
-	github.com/sanposhiho/wastedassign/v2 v2.0.7 // indirect
-	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
+	github.com/sagikazarmark/locafero v0.7.0 // indirect
+	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sanposhiho/wastedassign/v2 v2.1.0 // indirect
+	github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 // indirect
 	github.com/sashamelentyev/interfacebloat v1.1.0 // indirect
-	github.com/sashamelentyev/usestdlibvars v1.27.0 // indirect
-	github.com/securego/gosec/v2 v2.21.4 // indirect
-	github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect
+	github.com/sashamelentyev/usestdlibvars v1.28.0 // indirect
+	github.com/securego/gosec/v2 v2.22.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/sivchari/containedctx v1.0.3 // indirect
 	github.com/sivchari/tenv v1.12.1 // indirect
 	github.com/sonatard/noctx v0.1.0 // indirect
+	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/sourcegraph/go-diff v0.7.0 // indirect
-	github.com/spf13/afero v1.11.0 // indirect
-	github.com/spf13/cast v1.5.0 // indirect
-	github.com/spf13/cobra v1.8.1 // indirect
-	github.com/spf13/jwalterweatherman v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/spf13/viper v1.12.0 // indirect
+	github.com/spf13/afero v1.12.0 // indirect
+	github.com/spf13/cast v1.7.1 // indirect
+	github.com/spf13/cobra v1.9.1 // indirect
+	github.com/spf13/pflag v1.0.6 // indirect
+	github.com/spf13/viper v1.19.0 // indirect
 	github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect
-	github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect
+	github.com/stbenjam/no-sprintf-host-port v0.2.0 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/stretchr/testify v1.10.0 // indirect
-	github.com/subosito/gotenv v1.4.1 // indirect
-	github.com/tdakkota/asciicheck v0.2.0 // indirect
-	github.com/tetafro/godot v1.4.18 // indirect
-	github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 // indirect
+	github.com/subosito/gotenv v1.6.0 // indirect
+	github.com/tdakkota/asciicheck v0.4.1 // indirect
+	github.com/tetafro/godot v1.5.0 // indirect
+	github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 // indirect
 	github.com/timonwong/loggercheck v0.10.1 // indirect
-	github.com/tomarrell/wrapcheck/v2 v2.9.0 // indirect
+	github.com/tomarrell/wrapcheck/v2 v2.10.0 // indirect
 	github.com/tommy-muehle/go-mnd/v2 v2.5.1 // indirect
-	github.com/ultraware/funlen v0.1.0 // indirect
-	github.com/ultraware/whitespace v0.1.1 // indirect
-	github.com/uudashr/gocognit v1.1.3 // indirect
-	github.com/uudashr/iface v1.2.1 // indirect
+	github.com/ultraware/funlen v0.2.0 // indirect
+	github.com/ultraware/whitespace v0.2.0 // indirect
+	github.com/uudashr/gocognit v1.2.0 // indirect
+	github.com/uudashr/iface v1.3.1 // indirect
 	github.com/xen0n/gosmopolitan v1.2.2 // indirect
 	github.com/yagipy/maintidx v1.0.0 // indirect
 	github.com/yeya24/promlinter v0.3.0 // indirect
 	github.com/ykadowak/zerologlint v0.1.5 // indirect
-	github.com/yuin/goldmark v1.4.13 // indirect
+	github.com/yuin/goldmark v1.7.8 // indirect
 	gitlab.com/bosi/decorder v0.4.2 // indirect
 	go-simpler.org/musttag v0.13.0 // indirect
-	go-simpler.org/sloglint v0.7.2 // indirect
+	go-simpler.org/sloglint v0.9.0 // indirect
 	go.uber.org/automaxprocs v1.6.0 // indirect
-	go.uber.org/multierr v1.10.0 // indirect
-	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
-	golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f // indirect
-	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/sync v0.9.0 // indirect
-	golang.org/x/sys v0.27.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/exp v0.0.0-20250215185904-eff6e970281f // indirect
+	golang.org/x/exp/typeparams v0.0.0-20250215185904-eff6e970281f // indirect
+	golang.org/x/mod v0.23.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	honnef.co/go/tools v0.5.1 // indirect
+	honnef.co/go/tools v0.6.0 // indirect
 	moul.io/banner v1.0.1 // indirect
 	moul.io/motd v1.0.0 // indirect
 	moul.io/u v1.27.0 // indirect
-	mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f // indirect
+	mvdan.cc/unparam v0.0.0-20250211232406-0e51248738fc // indirect
 )
diff --git a/misc/devdeps/go.sum b/misc/devdeps/go.sum
index fcba3fba624..6a720aaf84d 100644
--- a/misc/devdeps/go.sum
+++ b/misc/devdeps/go.sum
@@ -1,139 +1,92 @@
 4d63.com/gocheckcompilerdirectives v1.2.1 h1:AHcMYuw56NPjq/2y615IGg2kYkBdTvOaojYCBcRE7MA=
 4d63.com/gocheckcompilerdirectives v1.2.1/go.mod h1:yjDJSxmDTtIHHCqX0ufRYZDL6vQtMG7tJdKVeWwsqvs=
-4d63.com/gochecknoglobals v0.2.1 h1:1eiorGsgHOFOuoOiJDy2psSrQbRdIHrlge0IJIkUgDc=
-4d63.com/gochecknoglobals v0.2.1/go.mod h1:KRE8wtJB3CXCsb1xy421JfTHIIbmT3U5ruxw2Qu8fSU=
-cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
-cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
-cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
-cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
-cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
-cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
-cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
-cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
-cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
-cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
-cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
-cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
-cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
-cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
-cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
-cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
-cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
-cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
-cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
-cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
-cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
-cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
-cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
-cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
-cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
-cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
-cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
-cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
-cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
-cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
-dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-github.com/4meepo/tagalign v1.3.4 h1:P51VcvBnf04YkHzjfclN6BbsopfJR5rxs1n+5zHt+w8=
-github.com/4meepo/tagalign v1.3.4/go.mod h1:M+pnkHH2vG8+qhE5bVc/zeP7HS/j910Fwa9TUSyZVI0=
+4d63.com/gochecknoglobals v0.2.2 h1:H1vdnwnMaZdQW/N+NrkT1SZMTBmcwHe9Vq8lJcYYTtU=
+4d63.com/gochecknoglobals v0.2.2/go.mod h1:lLxwTQjL5eIesRbvnzIP3jZtG140FnTdz+AlMa+ogt0=
+github.com/4meepo/tagalign v1.4.2 h1:0hcLHPGMjDyM1gHG58cS73aQF8J4TdVR96TZViorO9E=
+github.com/4meepo/tagalign v1.4.2/go.mod h1:+p4aMyFM+ra7nb41CnFG6aSDXqRxU/w1VQqScKqDARI=
 github.com/Abirdcfly/dupword v0.1.3 h1:9Pa1NuAsZvpFPi9Pqkd93I7LIYRURj+A//dFd5tgBeE=
 github.com/Abirdcfly/dupword v0.1.3/go.mod h1:8VbB2t7e10KRNdwTVoxdBaxla6avbhGzb8sCTygUMhw=
 github.com/Antonboom/errname v1.0.0 h1:oJOOWR07vS1kRusl6YRSlat7HFnb3mSfMl6sDMRoTBA=
 github.com/Antonboom/errname v1.0.0/go.mod h1:gMOBFzK/vrTiXN9Oh+HFs+e6Ndl0eTFbtsRTSRdXyGI=
-github.com/Antonboom/nilnil v1.0.0 h1:n+v+B12dsE5tbAqRODXmEKfZv9j2KcTBrp+LkoM4HZk=
-github.com/Antonboom/nilnil v1.0.0/go.mod h1:fDJ1FSFoLN6yoG65ANb1WihItf6qt9PJVTn/s2IrcII=
+github.com/Antonboom/nilnil v1.0.1 h1:C3Tkm0KUxgfO4Duk3PM+ztPncTFlOf0b2qadmS0s4xs=
+github.com/Antonboom/nilnil v1.0.1/go.mod h1:CH7pW2JsRNFgEh8B2UaPZTEPhCMuFowP/e8Udp9Nnb0=
 github.com/Antonboom/testifylint v1.5.2 h1:4s3Xhuv5AvdIgbd8wOOEeo0uZG7PbDKQyKY5lGoQazk=
 github.com/Antonboom/testifylint v1.5.2/go.mod h1:vxy8VJ0bc6NavlYqjZfmp6EfqXMtBgQ4+mhCojwC1P8=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c h1:pxW6RcqyfI9/kWtOwnv/G+AzdKuy2ZrqINhenH4HyNs=
 github.com/BurntSushi/toml v1.4.1-0.20240526193622-a339e1f7089c/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
-github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/Crocmagnon/fatcontext v0.5.3 h1:zCh/wjc9oyeF+Gmp+V60wetm8ph2tlsxocgg/J0hOps=
-github.com/Crocmagnon/fatcontext v0.5.3/go.mod h1:XoCQYY1J+XTfyv74qLXvNw4xFunr3L1wkopIIKG7wGM=
+github.com/Crocmagnon/fatcontext v0.7.1 h1:SC/VIbRRZQeQWj/TcQBS6JmrXcfA+BU4OGSVUt54PjM=
+github.com/Crocmagnon/fatcontext v0.7.1/go.mod h1:1wMvv3NXEBJucFGfwOJBxSVWcoIO6emV215SMkW9MFU=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM=
 github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs=
 github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0 h1:/fTUt5vmbkAcMBt4YQiuC23cV0kEsN1MVMNqeOW43cU=
 github.com/GaijinEntertainment/go-exhaustruct/v3 v3.3.0/go.mod h1:ONJg5sxcbsdQQ4pOW8TGdTidT2TMAUy/2Xhr8mrYaao=
-github.com/Masterminds/semver/v3 v3.3.0 h1:B8LGeaivUe71a5qox1ICM/JLl0NqZSW5CHyL+hmvYS0=
-github.com/Masterminds/semver/v3 v3.3.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
+github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
+github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/OpenPeeDeeP/depguard/v2 v2.2.0 h1:vDfG60vDtIuf0MEOhmLlLLSzqaRM8EMcgJPdp74zmpA=
 github.com/OpenPeeDeeP/depguard/v2 v2.2.0/go.mod h1:CIzddKRvLBC4Au5aYP/i3nyaWQ+ClszLIuVocRiCYFQ=
-github.com/alecthomas/assert/v2 v2.2.2 h1:Z/iVC0xZfWTaFNE6bA3z07T86hd45Xe2eLt6WVy2bbk=
-github.com/alecthomas/assert/v2 v2.2.2/go.mod h1:pXcQ2Asjp247dahGEmsZ6ru0UVwnkhktn7S0bBDLxvQ=
-github.com/alecthomas/go-check-sumtype v0.2.0 h1:Bo+e4DFf3rs7ME9w/0SU/g6nmzJaphduP8Cjiz0gbwY=
-github.com/alecthomas/go-check-sumtype v0.2.0/go.mod h1:WyYPfhfkdhyrdaligV6svFopZV8Lqdzn5pyVBaV6jhQ=
-github.com/alecthomas/repr v0.2.0 h1:HAzS41CIzNW5syS8Mf9UwXhNH1J9aix/BvDRf1Ml2Yk=
-github.com/alecthomas/repr v0.2.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
-github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
-github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
-github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho=
+github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0=
+github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k=
+github.com/alecthomas/go-check-sumtype v0.3.1 h1:u9aUvbGINJxLVXiFvHUlPEaD7VDULsrxJb4Aq31NLkU=
+github.com/alecthomas/go-check-sumtype v0.3.1/go.mod h1:A8TSiN3UPRw3laIgWEUOHHLPa6/r9MtoigdlP5h3K/E=
+github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc=
+github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4=
 github.com/alexkohler/nakedret/v2 v2.0.5 h1:fP5qLgtwbx9EJE8dGEERT02YwS8En4r9nnZ71RK+EVU=
 github.com/alexkohler/nakedret/v2 v2.0.5/go.mod h1:bF5i0zF2Wo2o4X4USt9ntUWve6JbFv02Ff4vlkmS/VU=
 github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw=
 github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE=
 github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw=
 github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I=
+github.com/alingse/nilnesserr v0.1.2 h1:Yf8Iwm3z2hUUrP4muWfW83DF4nE3r1xZ26fGWUKCZlo=
+github.com/alingse/nilnesserr v0.1.2/go.mod h1:1xJPrXonEtX7wyTq8Dytns5P2hNzoWymVUIaKm4HNFg=
 github.com/ashanbrown/forbidigo v1.6.0 h1:D3aewfM37Yb3pxHujIPSpTf6oQk9sc9WZi8gerOIVIY=
 github.com/ashanbrown/forbidigo v1.6.0/go.mod h1:Y8j9jy9ZYAEHXdu723cUlraTqbzjKF1MUyfOKL+AjcU=
-github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s=
-github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI=
-github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
-github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
+github.com/ashanbrown/makezero v1.2.0 h1:/2Lp1bypdmK9wDIq7uWBlDF1iMUpIIS4A+pF6C9IEUU=
+github.com/ashanbrown/makezero v1.2.0/go.mod h1:dxlPhHbDMC6N6xICzFBSK+4njQDdK8euNO0qjQMtGY4=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
 github.com/bkielbasa/cyclop v1.2.3 h1:faIVMIGDIANuGPWH031CZJTi2ymOQBULs9H21HSMa5w=
 github.com/bkielbasa/cyclop v1.2.3/go.mod h1:kHTwA9Q0uZqOADdupvcFJQtp/ksSnytRMe8ztxG8Fuo=
 github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M=
 github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k=
-github.com/bombsimon/wsl/v4 v4.4.1 h1:jfUaCkN+aUpobrMO24zwyAMwMAV5eSziCkOKEauOLdw=
-github.com/bombsimon/wsl/v4 v4.4.1/go.mod h1:Xu/kDxGZTofQcDGCtQe9KCzhHphIe0fDuyWTxER9Feo=
+github.com/bombsimon/wsl/v4 v4.5.0 h1:iZRsEvDdyhd2La0FVi5k6tYehpOR/R7qIUjmKk7N74A=
+github.com/bombsimon/wsl/v4 v4.5.0/go.mod h1:NOQ3aLF4nD7N5YPXMruR6ZXDOAqLoM0GEpLwTdvmOSc=
 github.com/breml/bidichk v0.3.2 h1:xV4flJ9V5xWTqxL+/PMFF6dtJPvZLPsyixAoPe8BGJs=
 github.com/breml/bidichk v0.3.2/go.mod h1:VzFLBxuYtT23z5+iVkamXO386OB+/sVwZOpIj6zXGos=
 github.com/breml/errchkjson v0.4.0 h1:gftf6uWZMtIa/Is3XJgibewBm2ksAQSY/kABDNFTAdk=
 github.com/breml/errchkjson v0.4.0/go.mod h1:AuBOSTHyLSaaAFlWsRSuRBIroCh3eh7ZHh5YeelDIk8=
-github.com/butuzov/ireturn v0.3.0 h1:hTjMqWw3y5JC3kpnC5vXmFJAWI/m31jaCYQqzkS6PL0=
-github.com/butuzov/ireturn v0.3.0/go.mod h1:A09nIiwiqzN/IoVo9ogpa0Hzi9fex1kd9PSD6edP5ZA=
-github.com/butuzov/mirror v1.2.0 h1:9YVK1qIjNspaqWutSv8gsge2e/Xpq1eqEkslEUHy5cs=
-github.com/butuzov/mirror v1.2.0/go.mod h1:DqZZDtzm42wIAIyHXeN8W/qb1EPlb9Qn/if9icBOpdQ=
+github.com/butuzov/ireturn v0.3.1 h1:mFgbEI6m+9W8oP/oDdfA34dLisRFCj2G6o/yiI1yZrY=
+github.com/butuzov/ireturn v0.3.1/go.mod h1:ZfRp+E7eJLC0NQmk1Nrm1LOrn/gQlOykv+cVPdiXH5M=
+github.com/butuzov/mirror v1.3.0 h1:HdWCXzmwlQHdVhwvsfBb2Au0r3HyINry3bDWLYXiKoc=
+github.com/butuzov/mirror v1.3.0/go.mod h1:AEij0Z8YMALaq4yQj9CPPVYOyJQyiexpQEQgihajRfI=
 github.com/campoy/embedmd v1.0.0 h1:V4kI2qTJJLf4J29RzI/MAt2c3Bl4dQSYPuflzwFH2hY=
 github.com/campoy/embedmd v1.0.0/go.mod h1:oxyr9RCiSXg0M3VJ3ks0UGfp98BpSSGr0kpiX3MzVl8=
-github.com/catenacyber/perfsprint v0.7.1 h1:PGW5G/Kxn+YrN04cRAZKC+ZuvlVwolYMrIyyTJ/rMmc=
-github.com/catenacyber/perfsprint v0.7.1/go.mod h1:/wclWYompEyjUD2FuIIDVKNkqz7IgBIWXIH3V0Zol50=
+github.com/catenacyber/perfsprint v0.8.1 h1:bGOHuzHe0IkoGeY831RW4aSlt1lPRd3WRAScSWOaV7E=
+github.com/catenacyber/perfsprint v0.8.1/go.mod h1:/wclWYompEyjUD2FuIIDVKNkqz7IgBIWXIH3V0Zol50=
 github.com/ccojocar/zxcvbn-go v1.0.2 h1:na/czXU8RrhXO4EZme6eQJLR4PzcGsahsBOAwU6I3Vg=
 github.com/ccojocar/zxcvbn-go v1.0.2/go.mod h1:g1qkXtUSvHP8lhHp5GrSmTz6uWALGRMQdw6Qnz/hi60=
-github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
-github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
-github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/charithe/durationcheck v0.0.10 h1:wgw73BiocdBDQPik+zcEoBG/ob8uyBHf2iyoHGPf5w4=
 github.com/charithe/durationcheck v0.0.10/go.mod h1:bCWXb7gYRysD1CU3C+u4ceO49LoGOY1C1L6uouGNreQ=
 github.com/chavacava/garif v0.1.0 h1:2JHa3hbYf5D9dsgseMKAmc/MZ109otzgNFk5s87H9Pc=
 github.com/chavacava/garif v0.1.0/go.mod h1:XMyYCkEL58DF0oyW4qDjjnPWONs2HBqYKI+UIPD+Gww=
-github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
-github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
-github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
-github.com/ckaznocha/intrange v0.2.1 h1:M07spnNEQoALOJhwrImSrJLaxwuiQK+hA2DeajBlwYk=
-github.com/ckaznocha/intrange v0.2.1/go.mod h1:7NEhVyf8fzZO5Ds7CRaqPEm52Ut83hsTiL5zbER/HYk=
-github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/ckaznocha/intrange v0.3.0 h1:VqnxtK32pxgkhJgYQEeOArVidIPg+ahLP7WBOXZd5ZY=
+github.com/ckaznocha/intrange v0.3.0/go.mod h1:+I/o2d2A1FBHgGELbGxzIcyd3/9l9DuwjM8FsbSS3Lo=
+github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/curioswitch/go-reassign v0.2.0 h1:G9UZyOcpk/d7Gd6mqYgd8XYWFMw/znxwGDUstnC9DIo=
-github.com/curioswitch/go-reassign v0.2.0/go.mod h1:x6OpXuWvgfQaMGks2BZybTngWjT84hqJfKoO8Tt/Roc=
+github.com/curioswitch/go-reassign v0.3.0 h1:dh3kpQHuADL3cobV/sSGETA8DOv457dwl+fbBAhrQPs=
+github.com/curioswitch/go-reassign v0.3.0/go.mod h1:nApPCCTtqLJN/s8HfItCcKV0jIPwluBOvZP+dsJGA88=
 github.com/daixiang0/gci v0.13.5 h1:kThgmH1yBmZSBCh1EJVxQ7JsHpm5Oms0AMed/0LaH4c=
 github.com/daixiang0/gci v0.13.5/go.mod h1:12etP2OniiIdP4q+kjUGrC/rUagga7ODbqsom5Eo5Yk=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
+github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/denis-tingaikin/go-header v0.5.0 h1:SRdnP5ZKvcO9KKRP1KJrhFR3RrlGuD+42t4429eC9k8=
 github.com/denis-tingaikin/go-header v0.5.0/go.mod h1:mMenU5bWrok6Wl2UsZjy+1okegmwQ3UgWl4V1D8gjlY=
-github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
-github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
+github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
+github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/ettle/strcase v0.2.0 h1:fGNiVF21fHXpX1niBgk0aROov1LagYsOwV/xqKDKR/Q=
 github.com/ettle/strcase v0.2.0/go.mod h1:DajmHElDSaX76ITe3/VHVyMin4LWSJN5Z909Wp+ED1A=
 github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
@@ -142,30 +95,20 @@ github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4
 github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94=
 github.com/firefart/nonamedreturns v1.0.5 h1:tM+Me2ZaXs8tfdDw3X6DOX++wMCOqzYUho6tUTYIdRA=
 github.com/firefart/nonamedreturns v1.0.5/go.mod h1:gHJjDqhGM4WyPt639SOZs+G89Ko7QKH5R5BhnO6xJhw=
-github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE=
-github.com/frankban/quicktest v1.14.3/go.mod h1:mgiwOwqx65TmIk1wJ6Q7wvnVMocbUorkibMOrVTHZps=
-github.com/fsnotify/fsnotify v1.5.4 h1:jRbGcIw6P2Meqdwuo0H1p6JVLbL5DHKAKlYndzMwVZI=
-github.com/fsnotify/fsnotify v1.5.4/go.mod h1:OVB6XrOHzAwXMpEM7uPOzcehqUV2UqJxmVXmkdnm1bU=
+github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
+github.com/frankban/quicktest v1.14.6/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
+github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
 github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo=
 github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA=
-github.com/ghostiam/protogetter v0.3.8 h1:LYcXbYvybUyTIxN2Mj9h6rHrDZBDwZloPoKctWrFyJY=
-github.com/ghostiam/protogetter v0.3.8/go.mod h1:WZ0nw9pfzsgxuRsPOFQomgDVSWtDLJRfQJEhsGbmQMA=
-github.com/go-critic/go-critic v0.11.5 h1:TkDTOn5v7EEngMxu8KbuFqFR43USaaH8XRJLz1jhVYA=
-github.com/go-critic/go-critic v0.11.5/go.mod h1:wu6U7ny9PiaHaZHcvMDmdysMqvDem162Rh3zWTrqk8M=
-github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
-github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
-github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY=
-github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
-github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
-github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A=
+github.com/ghostiam/protogetter v0.3.9 h1:j+zlLLWzqLay22Cz/aYwTHKQ88GE2DQ6GkWSYFOI4lQ=
+github.com/ghostiam/protogetter v0.3.9/go.mod h1:WZ0nw9pfzsgxuRsPOFQomgDVSWtDLJRfQJEhsGbmQMA=
+github.com/go-critic/go-critic v0.12.0 h1:iLosHZuye812wnkEz1Xu3aBwn5ocCPfc9yqmFG9pa6w=
+github.com/go-critic/go-critic v0.12.0/go.mod h1:DpE0P6OVc6JzVYzmM5gq5jMU31zLr4am5mB/VfFK64w=
 github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
 github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
 github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
-github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
 github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
 github.com/go-toolsmith/astcast v1.1.0 h1:+JN9xZV1A+Re+95pgnMgDboWNVnIMMQXwfBwLRPgSC8=
@@ -189,146 +132,86 @@ github.com/go-toolsmith/typep v1.1.0 h1:fIRYDyF+JywLfqzyhdiHzRop/GQDxxNhLGQ6gFUN
 github.com/go-toolsmith/typep v1.1.0/go.mod h1:fVIw+7zjdsMxDA3ITWnH1yOiw1rnTQKCsF/sk2H/qig=
 github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
 github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
-github.com/go-xmlfmt/xmlfmt v1.1.2 h1:Nea7b4icn8s57fTx1M5AI4qQT5HEM3rVUO8MuE6g80U=
-github.com/go-xmlfmt/xmlfmt v1.1.2/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
+github.com/go-xmlfmt/xmlfmt v1.1.3 h1:t8Ey3Uy7jDSEisW2K3somuMKIpzktkWptA0iFCnRUWY=
+github.com/go-xmlfmt/xmlfmt v1.1.3/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
 github.com/gofrs/flock v0.12.1 h1:MTLVXXHf8ekldpJk3AKicLij9MdwOWkZ+a/jHHZby9E=
 github.com/gofrs/flock v0.12.1/go.mod h1:9zxTsyu5xtJ9DK+1tFZyibEV7y3uwDxPPfbxeeHCoD0=
-github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
-github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
-github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
-github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
-github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
-github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
-github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
-github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
-github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
-github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
-github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
-github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
-github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
-github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
-github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM=
 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk=
 github.com/golangci/go-printf-func-name v0.1.0 h1:dVokQP+NMTO7jwO4bwsRwLWeudOVUPPyAKJuzv8pEJU=
 github.com/golangci/go-printf-func-name v0.1.0/go.mod h1:wqhWFH5mUdJQhweRnldEywnR5021wTdZSNgwYceV14s=
-github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9 h1:/1322Qns6BtQxUZDTAT4SdcoxknUki7IAoK4SAXr8ME=
-github.com/golangci/gofmt v0.0.0-20240816233607-d8596aa466a9/go.mod h1:Oesb/0uFAyWoaw1U1qS5zyjCg5NP9C9iwjnI4tIsXEE=
-github.com/golangci/golangci-lint v1.62.2 h1:b8K5K9PN+rZN1+mKLtsZHz2XXS9aYKzQ9i25x3Qnxxw=
-github.com/golangci/golangci-lint v1.62.2/go.mod h1:ILWWyeFUrctpHVGMa1dg2xZPKoMUTc5OIMgW7HZr34g=
+github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d h1:viFft9sS/dxoYY0aiOTsLKO2aZQAPT4nlQCsimGcSGE=
+github.com/golangci/gofmt v0.0.0-20250106114630-d62b90e6713d/go.mod h1:ivJ9QDg0XucIkmwhzCDsqcnxxlDStoTl89jDMIoNxKY=
+github.com/golangci/golangci-lint v1.64.5 h1:5omC86XFBKXZgCrVdUWU+WNHKd+CWCxNx717KXnzKZY=
+github.com/golangci/golangci-lint v1.64.5/go.mod h1:WZnwq8TF0z61h3jLQ7Sk5trcP7b3kUFxLD6l1ivtdvU=
 github.com/golangci/misspell v0.6.0 h1:JCle2HUTNWirNlDIAUO44hUsKhOFqGPoC4LZxlaSXDs=
 github.com/golangci/misspell v0.6.0/go.mod h1:keMNyY6R9isGaSAu+4Q8NMBwMPkh15Gtc8UCVoDtAWo=
-github.com/golangci/modinfo v0.3.4 h1:oU5huX3fbxqQXdfspamej74DFX0kyGLkw1ppvXoJ8GA=
-github.com/golangci/modinfo v0.3.4/go.mod h1:wytF1M5xl9u0ij8YSvhkEVPP3M5Mc7XLl1pxH3B2aUM=
 github.com/golangci/plugin-module-register v0.1.1 h1:TCmesur25LnyJkpsVrupv1Cdzo+2f7zX0H6Jkw1Ol6c=
 github.com/golangci/plugin-module-register v0.1.1/go.mod h1:TTpqoB6KkwOJMV8u7+NyXMrkwwESJLOkfl9TxR1DGFc=
-github.com/golangci/revgrep v0.5.3 h1:3tL7c1XBMtWHHqVpS5ChmiAAoe4PF/d5+ULzV9sLAzs=
-github.com/golangci/revgrep v0.5.3/go.mod h1:U4R/s9dlXZsg8uJmaR1GrloUr14D7qDl8gi2iPXJH8k=
+github.com/golangci/revgrep v0.8.0 h1:EZBctwbVd0aMeRnNUsFogoyayvKHyxlV3CdUA46FX2s=
+github.com/golangci/revgrep v0.8.0/go.mod h1:U4R/s9dlXZsg8uJmaR1GrloUr14D7qDl8gi2iPXJH8k=
 github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed h1:IURFTjxeTfNFP0hTEi1YKjB/ub8zkpaOqFFMApi2EAs=
 github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed/go.mod h1:XLXN8bNw4CGRPaqgl3bv/lhz7bsGPh4/xSaMTbo2vkQ=
-github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
-github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
-github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
-github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
-github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0=
-github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
-github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
-github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5 h1:5iH8iuqE5apketRbSFBy+X1V0o+l+8NF1avt4HWl7cA=
-github.com/google/pprof v0.0.0-20240827171923-fa2c70bbbfe5/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
-github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
-github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
-github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
+github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad h1:a6HEuzUHeKH6hwfN/ZoQgRgVIWFJljSWa/zetS2WTvg=
+github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad/go.mod h1:vavhavw2zAxS5dIdcRluK6cSGGPlZynqzFM8NdvU144=
 github.com/gordonklaus/ineffassign v0.1.0 h1:y2Gd/9I7MdY1oEIt+n+rowjBNDcLQq3RsH5hwJd0f9s=
 github.com/gordonklaus/ineffassign v0.1.0/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0=
 github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk=
 github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc=
 github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado=
-github.com/gostaticanalysis/comment v1.4.2 h1:hlnx5+S2fY9Zo9ePo4AhgYsYHbM2+eAv8m/s1JiCd6Q=
 github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM=
-github.com/gostaticanalysis/forcetypeassert v0.1.0 h1:6eUflI3DiGusXGK6X7cCcIgVCpZ2CiZ1Q7jl6ZxNV70=
-github.com/gostaticanalysis/forcetypeassert v0.1.0/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak=
+github.com/gostaticanalysis/comment v1.5.0 h1:X82FLl+TswsUMpMh17srGRuKaaXprTaytmEpgnKIDu8=
+github.com/gostaticanalysis/comment v1.5.0/go.mod h1:V6eb3gpCv9GNVqb6amXzEUX3jXLVK/AdA+IrAMSqvEc=
+github.com/gostaticanalysis/forcetypeassert v0.2.0 h1:uSnWrrUEYDr86OCxWa4/Tp2jeYDlogZiZHzGkWFefTk=
+github.com/gostaticanalysis/forcetypeassert v0.2.0/go.mod h1:M5iPavzE9pPqWyeiVXSFghQjljW1+l/Uke3PXHS6ILY=
 github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3Uqrmrcpk=
 github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A=
 github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M=
-github.com/gostaticanalysis/testutil v0.4.0 h1:nhdCmubdmDF6VEatUNjgUZBJKWRqugoISdUv3PPQgHY=
-github.com/gostaticanalysis/testutil v0.4.0/go.mod h1:bLIoPefWXrRi/ssLFWX1dx7Repi5x3CuviD3dgAZaBU=
+github.com/gostaticanalysis/testutil v0.5.0 h1:Dq4wT1DdTwTGCQQv3rl3IvD5Ld0E6HiY+3Zh0sUGqw8=
+github.com/gostaticanalysis/testutil v0.5.0/go.mod h1:OLQSbuM6zw2EvCcXTz1lVq5unyoNft372msDY0nY5Hs=
+github.com/hashicorp/go-immutable-radix/v2 v2.1.0 h1:CUW5RYIcysz+D3B+l1mDeXrQ7fUvGGCwJfdASSzbrfo=
+github.com/hashicorp/go-immutable-radix/v2 v2.1.0/go.mod h1:hgdqLXA4f6NIjRVisM1TJ9aOJVNRqKZj+xDGF6m7PBw=
+github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
+github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
 github.com/hashicorp/go-version v1.7.0 h1:5tqGy27NaOTB8yJKUZELlFAS/LTKJkrmONwQKeRZfjY=
 github.com/hashicorp/go-version v1.7.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA=
-github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
+github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
+github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=
 github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg=
-github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/jgautheron/goconst v1.7.1 h1:VpdAG7Ca7yvvJk5n8dMwQhfEZJh95kl/Hl9S1OI5Jkk=
 github.com/jgautheron/goconst v1.7.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4=
 github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs=
 github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c=
-github.com/jjti/go-spancheck v0.6.2 h1:iYtoxqPMzHUPp7St+5yA8+cONdyXD3ug6KK15n7Pklk=
-github.com/jjti/go-spancheck v0.6.2/go.mod h1:+X7lvIrR5ZdUTkxFYqzJ0abr8Sb5LOo80uOhWNqIrYA=
-github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4=
-github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
-github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
-github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
-github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
-github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
-github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY=
-github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0=
-github.com/karamaru-alpha/copyloopvar v1.1.0 h1:x7gNyKcC2vRBO1H2Mks5u1VxQtYvFiym7fCjIP8RPos=
-github.com/karamaru-alpha/copyloopvar v1.1.0/go.mod h1:u7CIfztblY0jZLOQZgH3oYsJzpC2A7S6u/lfgSXHy0k=
+github.com/jjti/go-spancheck v0.6.4 h1:Tl7gQpYf4/TMU7AT84MN83/6PutY21Nb9fuQjFTpRRc=
+github.com/jjti/go-spancheck v0.6.4/go.mod h1:yAEYdKJ2lRkDA8g7X+oKUHXOWVAXSBJRv04OhF+QUjk=
+github.com/julz/importas v0.2.0 h1:y+MJN/UdL63QbFJHws9BVC5RpA2iq0kpjrFajTGivjQ=
+github.com/julz/importas v0.2.0/go.mod h1:pThlt589EnCYtMnmhmRYY/qn9lCf/frPOK+WMx3xiJY=
+github.com/karamaru-alpha/copyloopvar v1.2.1 h1:wmZaZYIjnJ0b5UoKDjUHrikcV0zuPyyxI4SVplLd2CI=
+github.com/karamaru-alpha/copyloopvar v1.2.1/go.mod h1:nFmMlFNlClC2BPvNaHMdkirmTJxVCY0lhxBtlfOypMM=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
 github.com/kisielk/errcheck v1.8.0 h1:ZX/URYa7ilESY19ik/vBmCn6zdGQLxACwjAcWbHlYlg=
 github.com/kisielk/errcheck v1.8.0/go.mod h1:1kLL+jV4e+CFfueBmI1dSK2ADDyQnlrnrY/FqKluHJQ=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kkHAIKE/contextcheck v1.1.5 h1:CdnJh63tcDe53vG+RebdpdXJTc9atMgGqdx8LXxiilg=
 github.com/kkHAIKE/contextcheck v1.1.5/go.mod h1:O930cpht4xb1YQpK+1+AgoM3mFsvxr7uyFptcnWTYUA=
-github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
-github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
+github.com/klauspost/compress v1.17.9 h1:6KIumPrER1LHsvBVuDa0r5xaG0Es51mhhB9BQB2qeMA=
+github.com/klauspost/compress v1.17.9/go.mod h1:Di0epgTjJY877eYKx5yC51cX2A2Vl2ibi7bDH9ttBbw=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
@@ -341,67 +224,63 @@ github.com/kulti/thelper v0.6.3 h1:ElhKf+AlItIu+xGnI990no4cE2+XaSu1ULymV2Yulxs=
 github.com/kulti/thelper v0.6.3/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I=
 github.com/kunwardeep/paralleltest v1.0.10 h1:wrodoaKYzS2mdNVnc4/w31YaXFtsc21PCTdvWJ/lDDs=
 github.com/kunwardeep/paralleltest v1.0.10/go.mod h1:2C7s65hONVqY7Q5Efj5aLzRCNLjw2h4eMc9EcypGjcY=
-github.com/kyoh86/exportloopref v0.1.11 h1:1Z0bcmTypkL3Q4k+IDHMWTcnCliEZcaPiIe0/ymEyhQ=
-github.com/kyoh86/exportloopref v0.1.11/go.mod h1:qkV4UF1zGl6EkF1ox8L5t9SwyeBAZ3qLMd6up458uqA=
 github.com/lasiar/canonicalheader v1.1.2 h1:vZ5uqwvDbyJCnMhmFYimgMZnJMjwljN5VGY0VKbMXb4=
 github.com/lasiar/canonicalheader v1.1.2/go.mod h1:qJCeLFS0G/QlLQ506T+Fk/fWMa2VmBUiEI2cuMK4djI=
-github.com/ldez/gomoddirectives v0.2.4 h1:j3YjBIjEBbqZ0NKtBNzr8rtMHTOrLPeiwTkfUJZ3alg=
-github.com/ldez/gomoddirectives v0.2.4/go.mod h1:oWu9i62VcQDYp9EQ0ONTfqLNh+mDLWWDO+SO0qSQw5g=
-github.com/ldez/tagliatelle v0.5.0 h1:epgfuYt9v0CG3fms0pEgIMNPuFf/LpPIfjk4kyqSioo=
-github.com/ldez/tagliatelle v0.5.0/go.mod h1:rj1HmWiL1MiKQuOONhd09iySTEkUuE/8+5jtPYz9xa4=
+github.com/ldez/exptostd v0.4.1 h1:DIollgQ3LWZMp3HJbSXsdE2giJxMfjyHj3eX4oiD6JU=
+github.com/ldez/exptostd v0.4.1/go.mod h1:iZBRYaUmcW5jwCR3KROEZ1KivQQp6PHXbDPk9hqJKCQ=
+github.com/ldez/gomoddirectives v0.6.1 h1:Z+PxGAY+217f/bSGjNZr/b2KTXcyYLgiWI6geMBN2Qc=
+github.com/ldez/gomoddirectives v0.6.1/go.mod h1:cVBiu3AHR9V31em9u2kwfMKD43ayN5/XDgr+cdaFaKs=
+github.com/ldez/grignotin v0.9.0 h1:MgOEmjZIVNn6p5wPaGp/0OKWyvq42KnzAt/DAb8O4Ow=
+github.com/ldez/grignotin v0.9.0/go.mod h1:uaVTr0SoZ1KBii33c47O1M8Jp3OP3YDwhZCmzT9GHEk=
+github.com/ldez/tagliatelle v0.7.1 h1:bTgKjjc2sQcsgPiT902+aadvMjCeMHrY7ly2XKFORIk=
+github.com/ldez/tagliatelle v0.7.1/go.mod h1:3zjxUpsNB2aEZScWiZTHrAXOl1x25t3cRmzfK1mlo2I=
+github.com/ldez/usetesting v0.4.2 h1:J2WwbrFGk3wx4cZwSMiCQQ00kjGR0+tuuyW0Lqm4lwA=
+github.com/ldez/usetesting v0.4.2/go.mod h1:eEs46T3PpQ+9RgN9VjpY6qWdiw2/QmfiDeWmdZdrjIQ=
 github.com/leonklingele/grouper v1.1.2 h1:o1ARBDLOmmasUaNDesWqWCIFH3u7hoFlM84YrjT3mIY=
 github.com/leonklingele/grouper v1.1.2/go.mod h1:6D0M/HVkhs2yRKRFZUoGjeDy7EZTfFBE9gl4kjmIGkA=
 github.com/macabu/inamedparam v0.1.3 h1:2tk/phHkMlEL/1GNe/Yf6kkR/hkcUdAEY3L0hjYV1Mk=
 github.com/macabu/inamedparam v0.1.3/go.mod h1:93FLICAIk/quk7eaPPQvbzihUdn/QkGDwIZEoLtpH6I=
-github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo=
-github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
+github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM=
+github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
 github.com/maratori/testableexamples v1.0.0 h1:dU5alXRrD8WKSjOUnmJZuzdxWOEQ57+7s93SLMxb2vI=
 github.com/maratori/testableexamples v1.0.0/go.mod h1:4rhjL1n20TUTT4vdh3RDqSizKLyXp7K2u6HgraZCGzE=
 github.com/maratori/testpackage v1.1.1 h1:S58XVV5AD7HADMmD0fNnziNHqKvSdDuEKdPD1rNTU04=
 github.com/maratori/testpackage v1.1.1/go.mod h1:s4gRK/ym6AMrqpOa/kEbQTV4Q4jb7WeLZzVhVVVOQMc=
-github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26 h1:gWg6ZQ4JhDfJPqlo2srm/LN17lpybq15AryXIRcWYLE=
-github.com/matoous/godox v0.0.0-20230222163458-006bad1f9d26/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s=
+github.com/matoous/godox v1.1.0 h1:W5mqwbyWrwZv6OQ5Z1a/DHGMOvXYCBP3+Ht7KMoJhq4=
+github.com/matoous/godox v1.1.0/go.mod h1:jgE/3fUXiTurkdHOLT5WEkThTSuE7yxHv5iWPa80afs=
 github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE=
 github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU=
-github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
-github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
 github.com/mattn/go-runewidth v0.0.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc=
 github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
-github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
-github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
-github.com/mgechev/revive v1.5.1 h1:hE+QPeq0/wIzJwOphdVyUJ82njdd8Khp4fUIHGZHW3M=
-github.com/mgechev/revive v1.5.1/go.mod h1:lC9AhkJIBs5zwx8wkudyHrU+IJkrEKmpCmGMnIJPk4o=
+github.com/mgechev/revive v1.7.0 h1:JyeQ4yO5K8aZhIKf5rec56u0376h8AlKNQEmjfkjKlY=
+github.com/mgechev/revive v1.7.0/go.mod h1:qZnwcNhoguE58dfi96IJeSTPeZQejNeoMQLUZGi4SW4=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/moricho/tparallel v0.3.2 h1:odr8aZVFA3NZrNybggMkYO3rgPRcqjeQUlBBFVxKHTI=
 github.com/moricho/tparallel v0.3.2/go.mod h1:OQ+K3b4Ln3l2TZveGCywybl68glfLEwFGqvnjok8b+U=
-github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
-github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U=
 github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE=
 github.com/nishanths/exhaustive v0.12.0 h1:vIY9sALmw6T/yxiASewa4TQcFsVYZQQRUQJhKRf3Swg=
 github.com/nishanths/exhaustive v0.12.0/go.mod h1:mEZ95wPIZW+x8kC4TgC+9YCUgiST7ecevsVDTgc2obs=
 github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk=
 github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c=
-github.com/nunnatsa/ginkgolinter v0.18.3 h1:WgS7X3zzmni3vwHSBhvSgqrRgUecN6PQUcfB0j1noDw=
-github.com/nunnatsa/ginkgolinter v0.18.3/go.mod h1:BE1xyB/PNtXXG1azrvrqJW5eFH0hSRylNzFy8QHPwzs=
+github.com/nunnatsa/ginkgolinter v0.19.0 h1:CnHRFAeBS3LdLI9h+Jidbcc5KH71GKOmaBZQk8Srnto=
+github.com/nunnatsa/ginkgolinter v0.19.0/go.mod h1:jkQ3naZDmxaZMXPWaS9rblH+i+GWXQCaS/JFIWcOH2s=
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
-github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
-github.com/onsi/ginkgo/v2 v2.20.2/go.mod h1:K9gyxPIlb+aIvnZ8bd9Ak+YP18w3APlR+5coaZoE2ag=
-github.com/onsi/gomega v1.34.2 h1:pNCwDkzrsv7MS9kpaQvVb1aVLahQXyJ/Tv5oAZMI3i8=
-github.com/onsi/gomega v1.34.2/go.mod h1:v1xfxRgk0KIsG+QOdm7p8UosrOzPYRo60fd3B/1Dukc=
+github.com/onsi/ginkgo/v2 v2.22.2 h1:/3X8Panh8/WwhU/3Ssa6rCKqPLuAkVY2I0RoyDLySlU=
+github.com/onsi/ginkgo/v2 v2.22.2/go.mod h1:oeMosUL+8LtarXBHu/c0bx2D/K9zyQ6uX3cTyztHwsk=
+github.com/onsi/gomega v1.36.2 h1:koNYke6TVk6ZmnyHrCXba/T/MoLBXFjeC1PtvYgw0A8=
+github.com/onsi/gomega v1.36.2/go.mod h1:DdwyADRjrc825LhMEkD76cHR5+pUnjhUN8GlHlRPHzY=
 github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw=
 github.com/otiai10/copy v1.14.0 h1:dCI/t1iTdYGtkvCuBG2BgR6KZa83PTclw4U5n2wAllU=
 github.com/otiai10/copy v1.14.0/go.mod h1:ECfuL02W+/FkTWZWgQqXPWZgW9oeKCSQ5qVfSc4qc4w=
@@ -410,46 +289,28 @@ github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6
 github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo=
 github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc=
 github.com/pelletier/go-toml v1.6.0/go.mod h1:5N711Q9dKgbdkxHL+MEfF31hpT7l0S0s/t2kKREewys=
-github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
-github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
 github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/peterbourgon/ff/v3 v3.0.0/go.mod h1:UILIFjRH5a/ar8TjXYLTkIvSvekZqPm5Eb/qbGk6CT0=
-github.com/peterbourgon/ff/v3 v3.3.0 h1:PaKe7GW8orVFh8Unb5jNHS+JZBwWUMa2se0HM6/BI24=
-github.com/peterbourgon/ff/v3 v3.3.0/go.mod h1:zjJVUhx+twciwfDl0zBcFzl4dW8axCRyXE/eKY9RztQ=
+github.com/peterbourgon/ff/v3 v3.4.0 h1:QBvM/rizZM1cB0p0lGMdmR7HxZeI/ZrBWB4DqLkMUBc=
+github.com/peterbourgon/ff/v3 v3.4.0/go.mod h1:zjJVUhx+twciwfDl0zBcFzl4dW8axCRyXE/eKY9RztQ=
 github.com/pkg/diff v0.0.0-20200914180035-5b29258ca4f7/go.mod h1:zO8QMzTeZd5cpnIkz/Gn6iK0jDfGicM1nynOkkPIl28=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
-github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/polyfloyd/go-errorlint v1.7.0 h1:Zp6lzCK4hpBDj8y8a237YK4EPrMXQWvOe3nGoH4pFrU=
-github.com/polyfloyd/go-errorlint v1.7.0/go.mod h1:dGWKu85mGHnegQ2SWpEybFityCg3j7ZbwsVUxAOk9gY=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
+github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/polyfloyd/go-errorlint v1.7.1 h1:RyLVXIbosq1gBdk/pChWA8zWYLsq9UEw7a1L5TVMCnA=
+github.com/polyfloyd/go-errorlint v1.7.1/go.mod h1:aXjNb1x2TNhoLsk26iv1yl7a+zTnXPhwEMtEXukiLR8=
 github.com/prashantv/gostub v1.1.0 h1:BTyx3RfQjRHnUWaGF9oQos79AlQ5k8WNktv7VGvVH4g=
 github.com/prashantv/gostub v1.1.0/go.mod h1:A5zLQHz7ieHGG7is6LLXLz7I8+3LZzsrV0P1IAHhP5U=
-github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
-github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo=
-github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M=
-github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0=
-github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk=
-github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY=
-github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
-github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M=
-github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
-github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo=
-github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc=
-github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4=
-github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls=
-github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
-github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
-github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU=
-github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
-github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU=
-github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA=
+github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y=
+github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
+github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
+github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
+github.com/prometheus/common v0.62.0 h1:xasJaQlnWAeyHdUBeGjXmutelfJHWMRr+Fg4QszZ2Io=
+github.com/prometheus/common v0.62.0/go.mod h1:vyBcEuLSvWos9B1+CyL7JZ2up+uFzXhkqml0W5zIY1I=
+github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
+github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
 github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1 h1:+Wl/0aFp0hpuHM3H//KMft64WQ1yX9LdJY64Qm/gFCo=
 github.com/quasilyte/go-ruleguard v0.4.3-0.20240823090925-0fe6f58b47b1/go.mod h1:GJLgqsLeo4qgavUoL8JeGFNS7qcisx3awV/w9eWTmNI=
 github.com/quasilyte/go-ruleguard/dsl v0.3.22 h1:wd8zkOhSNr+I+8Qeciml08ivDt1pSXe60+5DqOpCjPE=
@@ -460,37 +321,35 @@ github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727 h1:TCg2WBOl
 github.com/quasilyte/regex/syntax v0.0.0-20210819130434-b3f0c404a727/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0=
 github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 h1:M8mH9eK4OUR4lu7Gd+PU1fV2/qnDNfzT635KRSObncs=
 github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567/go.mod h1:DWNGW8A4Y+GyBgPuaQJuWiy0XYftx4Xm/y5Jqk9I6VQ=
-github.com/raeperd/recvcheck v0.1.2 h1:SjdquRsRXJc26eSonWIo8b7IMtKD3OAT2Lb5G3ZX1+4=
-github.com/raeperd/recvcheck v0.1.2/go.mod h1:n04eYkwIR0JbgD73wT8wL4JjPC3wm0nFtzBnWNocnYU=
+github.com/raeperd/recvcheck v0.2.0 h1:GnU+NsbiCqdC2XX5+vMZzP+jAJC5fht7rcVTAhX74UI=
+github.com/raeperd/recvcheck v0.2.0/go.mod h1:n04eYkwIR0JbgD73wT8wL4JjPC3wm0nFtzBnWNocnYU=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
-github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
-github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
+github.com/rogpeppe/go-internal v1.13.2-0.20241226121412-a5dc8ff20d0a h1:w3tdWGKbLGBPtR/8/oO74W6hmz0qE5q0z9aqSAewaaM=
+github.com/rogpeppe/go-internal v1.13.2-0.20241226121412-a5dc8ff20d0a/go.mod h1:S8kfXMp+yh77OxPD4fdM6YUknrZpQxLhvxzS4gDHENY=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryancurrah/gomodguard v1.3.5 h1:cShyguSwUEeC0jS7ylOiG/idnd1TpJ1LfHGpV3oJmPU=
 github.com/ryancurrah/gomodguard v1.3.5/go.mod h1:MXlEPQRxgfPQa62O8wzK3Ozbkv9Rkqr+wKjSxTdsNJE=
 github.com/ryanrolds/sqlclosecheck v0.5.1 h1:dibWW826u0P8jNLsLN+En7+RqWWTYrjCB9fJfSfdyCU=
 github.com/ryanrolds/sqlclosecheck v0.5.1/go.mod h1:2g3dUjoS6AL4huFdv6wn55WpLIDjY7ZgUR4J8HOO/XQ=
-github.com/sanposhiho/wastedassign/v2 v2.0.7 h1:J+6nrY4VW+gC9xFzUc+XjPD3g3wF3je/NsJFwFK7Uxc=
-github.com/sanposhiho/wastedassign/v2 v2.0.7/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI=
-github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
-github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=
+github.com/sagikazarmark/locafero v0.7.0 h1:5MqpDsTGNDhY8sGp0Aowyf0qKsPrhewaLSsFaodPcyo=
+github.com/sagikazarmark/locafero v0.7.0/go.mod h1:2za3Cg5rMaTMoG/2Ulr9AwtFaIppKXTRYnozin4aB5k=
+github.com/sagikazarmark/slog-shim v0.1.0 h1:diDBnUNK9N/354PgrxMywXnAwEr1QZcOr6gto+ugjYE=
+github.com/sagikazarmark/slog-shim v0.1.0/go.mod h1:SrcSrq8aKtyuqEI1uvTDTK1arOWRIczQRv+GVI1AkeQ=
+github.com/sanposhiho/wastedassign/v2 v2.1.0 h1:crurBF7fJKIORrV85u9UUpePDYGWnwvv3+A96WvwXT0=
+github.com/sanposhiho/wastedassign/v2 v2.1.0/go.mod h1:+oSmSC+9bQ+VUAxA66nBb0Z7N8CK7mscKTDYC6aIek4=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.1 h1:PKK9DyHxif4LZo+uQSgXNqs0jj5+xZwwfKHgph2lxBw=
+github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=
 github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw=
 github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ=
-github.com/sashamelentyev/usestdlibvars v1.27.0 h1:t/3jZpSXtRPRf2xr0m63i32ZrusyurIGT9E5wAvXQnI=
-github.com/sashamelentyev/usestdlibvars v1.27.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8=
-github.com/securego/gosec/v2 v2.21.4 h1:Le8MSj0PDmOnHJgUATjD96PaXRvCpKC+DGJvwyy0Mlk=
-github.com/securego/gosec/v2 v2.21.4/go.mod h1:Jtb/MwRQfRxCXyCm1rfM1BEiiiTfUOdyzzAhlr6lUTA=
+github.com/sashamelentyev/usestdlibvars v1.28.0 h1:jZnudE2zKCtYlGzLVreNp5pmCdOxXUzwsMDBkR21cyQ=
+github.com/sashamelentyev/usestdlibvars v1.28.0/go.mod h1:9nl0jgOfHKWNFS43Ojw0i7aRoS4j6EBye3YBhmAIRF8=
+github.com/securego/gosec/v2 v2.22.1 h1:IcBt3TpI5Y9VN1YlwjSpM2cHu0i3Iw52QM+PQeg7jN8=
+github.com/securego/gosec/v2 v2.22.1/go.mod h1:4bb95X4Jz7VSEPdVjC0hD7C/yR6kdeUBvCPOy9gDQ0g=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU=
-github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs=
 github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxrven61rcy3hJMUqaf/CLWYhHNPmT14Lk=
 github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ=
-github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
-github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sivchari/containedctx v1.0.3 h1:x+etemjbsh2fB5ewm5FeLNi5bUjK0V8n0RB+Wwfd0XE=
@@ -499,31 +358,30 @@ github.com/sivchari/tenv v1.12.1 h1:+E0QzjktdnExv/wwsnnyk4oqZBUfuh89YMQT1cyuvSY=
 github.com/sivchari/tenv v1.12.1/go.mod h1:1LjSOUCc25snIr5n3DtGGrENhX3LuWefcplwVGC24mw=
 github.com/sonatard/noctx v0.1.0 h1:JjqOc2WN16ISWAjAk8M5ej0RfExEXtkEyExl2hLW+OM=
 github.com/sonatard/noctx v0.1.0/go.mod h1:0RvBxqY8D4j9cTTTWE8ylt2vqj2EPI8fHmrxHdsaZ2c=
+github.com/sourcegraph/conc v0.3.0 h1:OQTbbt6P72L20UqAkXXuLOj79LfEanQ+YQFNpLA9ySo=
+github.com/sourcegraph/conc v0.3.0/go.mod h1:Sdozi7LEKbFPqYX2/J+iBAM6HpqSLTASQIKqDmF7Mt0=
 github.com/sourcegraph/go-diff v0.7.0 h1:9uLlrd5T46OXs5qpp8L/MTltk0zikUGi0sNNyCpA8G0=
 github.com/sourcegraph/go-diff v0.7.0/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs=
-github.com/spf13/afero v1.11.0 h1:WJQKhtpdm3v2IzqG8VMqrr6Rf3UYpEF239Jy9wNepM8=
-github.com/spf13/afero v1.11.0/go.mod h1:GH9Y3pIexgf1MTIWtNGyogA5MwRIDXGUr+hbWNoBjkY=
-github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w=
-github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
-github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
-github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/afero v1.12.0 h1:UcOPyRBYczmFn6yvphxkn9ZEOY65cpwGKb5mL36mrqs=
+github.com/spf13/afero v1.12.0/go.mod h1:ZTlWwG4/ahT8W7T0WQ5uYmjI9duaLQGy3Q2OAl4sk/4=
+github.com/spf13/cast v1.7.1 h1:cuNEagBQEHWN1FnbGEjCXL2szYEXqfJPbP2HNUaca9Y=
+github.com/spf13/cast v1.7.1/go.mod h1:ancEpBxwJDODSW/UG4rDrAqiKolqNNh2DX3mk86cAdo=
+github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
+github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
-github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ=
-github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI=
+github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
+github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/spf13/viper v1.19.0 h1:RWq5SEjt8o25SROyN3z2OrDB9l7RPd3lwTWU8EcEdcI=
+github.com/spf13/viper v1.19.0/go.mod h1:GQUN9bilAbhU/jgc1bKs99f/suXKeUMct8Adx5+Ntkg=
 github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0=
 github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I=
-github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc=
-github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I=
+github.com/stbenjam/no-sprintf-host-port v0.2.0 h1:i8pxvGrt1+4G0czLr/WnmyH7zbZ8Bg8etvARQ1rpyl4=
+github.com/stbenjam/no-sprintf-host-port v0.2.0/go.mod h1:eL0bQ9PasS0hsyTyfTjjG+E80QIyPnBVQbYZyv20Jfk=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
@@ -534,33 +392,33 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/subosito/gotenv v1.4.1 h1:jyEFiXpy21Wm81FBN71l9VoMMV8H8jG+qIK3GCpY6Qs=
-github.com/subosito/gotenv v1.4.1/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
+github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
+github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
 github.com/tailscale/depaware v0.0.0-20210622194025-720c4b409502/go.mod h1:p9lPsd+cx33L3H9nNoecRRxPssFKUwwI50I3pZ0yT+8=
-github.com/tdakkota/asciicheck v0.2.0 h1:o8jvnUANo0qXtnslk2d3nMKTFNlOnJjRrNcj0j9qkHM=
-github.com/tdakkota/asciicheck v0.2.0/go.mod h1:Qb7Y9EgjCLJGup51gDHFzbI08/gbGhL/UVhYIPWG2rg=
+github.com/tdakkota/asciicheck v0.4.1 h1:bm0tbcmi0jezRA2b5kg4ozmMuGAFotKI3RZfrhfovg8=
+github.com/tdakkota/asciicheck v0.4.1/go.mod h1:0k7M3rCfRXb0Z6bwgvkEIMleKH3kXNz9UqJ9Xuqopr8=
 github.com/tenntenn/modver v1.0.1 h1:2klLppGhDgzJrScMpkj9Ujy3rXPUspSjAcev9tSEBgA=
 github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0=
 github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpRQGxTSkNYKJ51yaw6ChIqO+Je8UqsTKN/cDag=
 github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY=
-github.com/tetafro/godot v1.4.18 h1:ouX3XGiziKDypbpXqShBfnNLTSjR8r3/HVzrtJ+bHlI=
-github.com/tetafro/godot v1.4.18/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio=
-github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966 h1:quvGphlmUVU+nhpFa4gg4yJyTRJ13reZMDHrKwYw53M=
-github.com/timakin/bodyclose v0.0.0-20230421092635-574207250966/go.mod h1:27bSVNWSBOHm+qRp1T9qzaIpsWEP6TbUnei/43HK+PQ=
+github.com/tetafro/godot v1.5.0 h1:aNwfVI4I3+gdxjMgYPus9eHmoBeJIbnajOyqZYStzuw=
+github.com/tetafro/godot v1.5.0/go.mod h1:2oVxTBSftRTh4+MVfUaUXR6bn2GDXCaMcOG4Dk3rfio=
+github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67 h1:9LPGD+jzxMlnk5r6+hJnar67cgpDIz/iyD+rfl5r2Vk=
+github.com/timakin/bodyclose v0.0.0-20241222091800-1db5c5ca4d67/go.mod h1:mkjARE7Yr8qU23YcGMSALbIxTQ9r9QBVahQOBRfU460=
 github.com/timonwong/loggercheck v0.10.1 h1:uVZYClxQFpw55eh+PIoqM7uAOHMrhVcDoWDery9R8Lg=
 github.com/timonwong/loggercheck v0.10.1/go.mod h1:HEAWU8djynujaAVX7QI65Myb8qgfcZ1uKbdpg3ZzKl8=
-github.com/tomarrell/wrapcheck/v2 v2.9.0 h1:801U2YCAjLhdN8zhZ/7tdjB3EnAoRlJHt/s+9hijLQ4=
-github.com/tomarrell/wrapcheck/v2 v2.9.0/go.mod h1:g9vNIyhb5/9TQgumxQyOEqDHsmGYcGsVMOx/xGkqdMo=
+github.com/tomarrell/wrapcheck/v2 v2.10.0 h1:SzRCryzy4IrAH7bVGG4cK40tNUhmVmMDuJujy4XwYDg=
+github.com/tomarrell/wrapcheck/v2 v2.10.0/go.mod h1:g9vNIyhb5/9TQgumxQyOEqDHsmGYcGsVMOx/xGkqdMo=
 github.com/tommy-muehle/go-mnd/v2 v2.5.1 h1:NowYhSdyE/1zwK9QCLeRb6USWdoif80Ie+v+yU8u1Zw=
 github.com/tommy-muehle/go-mnd/v2 v2.5.1/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw=
-github.com/ultraware/funlen v0.1.0 h1:BuqclbkY6pO+cvxoq7OsktIXZpgBSkYTQtmwhAK81vI=
-github.com/ultraware/funlen v0.1.0/go.mod h1:XJqmOQja6DpxarLj6Jj1U7JuoS8PvL4nEqDaQhy22p4=
-github.com/ultraware/whitespace v0.1.1 h1:bTPOGejYFulW3PkcrqkeQwOd6NKOOXvmGD9bo/Gk8VQ=
-github.com/ultraware/whitespace v0.1.1/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8=
-github.com/uudashr/gocognit v1.1.3 h1:l+a111VcDbKfynh+airAy/DJQKaXh2m9vkoysMPSZyM=
-github.com/uudashr/gocognit v1.1.3/go.mod h1:aKH8/e8xbTRBwjbCkwZ8qt4l2EpKXl31KMHgSS+lZ2U=
-github.com/uudashr/iface v1.2.1 h1:vHHyzAUmWZ64Olq6NZT3vg/z1Ws56kyPdBOd5kTXDF8=
-github.com/uudashr/iface v1.2.1/go.mod h1:4QvspiRd3JLPAEXBQ9AiZpLbJlrWWgRChOKDJEuQTdg=
+github.com/ultraware/funlen v0.2.0 h1:gCHmCn+d2/1SemTdYMiKLAHFYxTYz7z9VIDRaTGyLkI=
+github.com/ultraware/funlen v0.2.0/go.mod h1:ZE0q4TsJ8T1SQcjmkhN/w+MceuatI6pBFSxxyteHIJA=
+github.com/ultraware/whitespace v0.2.0 h1:TYowo2m9Nfj1baEQBjuHzvMRbp19i+RCcRYrSWoFa+g=
+github.com/ultraware/whitespace v0.2.0/go.mod h1:XcP1RLD81eV4BW8UhQlpaR+SDc2givTvyI8a586WjW8=
+github.com/uudashr/gocognit v1.2.0 h1:3BU9aMr1xbhPlvJLSydKwdLN3tEUUrzPSSM8S4hDYRA=
+github.com/uudashr/gocognit v1.2.0/go.mod h1:k/DdKPI6XBZO1q7HgoV2juESI2/Ofj9AcHPZhBBdrTU=
+github.com/uudashr/iface v1.3.1 h1:bA51vmVx1UIhiIsQFSNq6GZ6VPTk3WNMZgRiCe9R29U=
+github.com/uudashr/iface v1.3.1/go.mod h1:4QvspiRd3JLPAEXBQ9AiZpLbJlrWWgRChOKDJEuQTdg=
 github.com/xen0n/gosmopolitan v1.2.2 h1:/p2KTnMzwRexIW8GlKawsTWOxn7UHA+jCMF/V8HHtvU=
 github.com/xen0n/gosmopolitan v1.2.2/go.mod h1:7XX7Mj61uLYrj0qmeN0zi7XDon9JRAEhYQqAPLVNTeg=
 github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM=
@@ -570,184 +428,91 @@ github.com/yeya24/promlinter v0.3.0/go.mod h1:cDfJQQYv9uYciW60QT0eeHlFodotkYZlL+
 github.com/ykadowak/zerologlint v0.1.5 h1:Gy/fMz1dFQN9JZTPjv1hxEk+sRWm05row04Yoolgdiw=
 github.com/ykadowak/zerologlint v0.1.5/go.mod h1:KaUskqF3e/v59oPmdq1U1DnKcuHokl2/K1U4pmIELKg=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/yuin/goldmark v1.7.8 h1:iERMLn0/QJeHFhxSt3p6PeN9mGnvIKSpG9YYorDMnic=
+github.com/yuin/goldmark v1.7.8/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E=
 gitlab.com/bosi/decorder v0.4.2 h1:qbQaV3zgwnBZ4zPMhGLW4KZe7A7NwxEhJx39R3shffo=
 gitlab.com/bosi/decorder v0.4.2/go.mod h1:muuhHoaJkA9QLcYHq4Mj8FJUwDZ+EirSHRiaTcTf6T8=
 go-simpler.org/assert v0.9.0 h1:PfpmcSvL7yAnWyChSjOz6Sp6m9j5lyK8Ok9pEL31YkQ=
 go-simpler.org/assert v0.9.0/go.mod h1:74Eqh5eI6vCK6Y5l3PI8ZYFXG4Sa+tkr70OIPJAUr28=
 go-simpler.org/musttag v0.13.0 h1:Q/YAW0AHvaoaIbsPj3bvEI5/QFP7w696IMUpnKXQfCE=
 go-simpler.org/musttag v0.13.0/go.mod h1:FTzIGeK6OkKlUDVpj0iQUXZLUO1Js9+mvykDQy9C5yM=
-go-simpler.org/sloglint v0.7.2 h1:Wc9Em/Zeuu7JYpl+oKoYOsQSy2X560aVueCW/m6IijY=
-go-simpler.org/sloglint v0.7.2/go.mod h1:US+9C80ppl7VsThQclkM7BkCHQAzuz8kHLsW3ppuluo=
-go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
-go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
-go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go-simpler.org/sloglint v0.9.0 h1:/40NQtjRx9txvsB/RN022KsUJU+zaaSb/9q9BSefSrE=
+go-simpler.org/sloglint v0.9.0/go.mod h1:G/OrAF6uxj48sHahCzrbarVMptL2kjWTaUeC8+fOGww=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=
 go.uber.org/automaxprocs v1.6.0/go.mod h1:ifeIMSnPZuznNm6jmdzmU3/bfk01Fe2fotchwEFJ8r8=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
-go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
-go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.7.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
-go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
-go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
-go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
-golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.1.0/go.mod h1:RecgLatLF4+eUMCP1PoPZQb+cVrJcOPbHkTkbkB9sbw=
-golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
-golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
-golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
-golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
-golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
-golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWBtpfqks2bwGcexMxgtk=
-golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
+golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
+golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
+golang.org/x/exp v0.0.0-20250215185904-eff6e970281f h1:oFMYAjX0867ZD2jcNiLBrI9BdpmEkvPyi5YrBGXbamg=
+golang.org/x/exp v0.0.0-20250215185904-eff6e970281f/go.mod h1:BHOTPb3L19zxehTsLoJXVaTktb06DFgmdW6Wb9s8jqk=
 golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
 golang.org/x/exp/typeparams v0.0.0-20230203172020-98cc5a0785f9/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
-golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f h1:WTyX8eCCyfdqiPYkRGm0MqElSfYFH3yR1+rl/mct9sA=
-golang.org/x/exp/typeparams v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk=
-golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
-golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
-golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/exp/typeparams v0.0.0-20250215185904-eff6e970281f h1:lwUSxjTFq2sP4q5JdTtCEuDDSl3udvTn2UEksv8OHFY=
+golang.org/x/exp/typeparams v0.0.0-20250215185904-eff6e970281f/go.mod h1:LKZHyeOpPuZcMgxeHjJp4p5yvxrCX1xDvH10zYHhjjQ=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
-golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
-golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
-golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
-golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
-golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
-golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro=
 golang.org/x/mod v0.6.0-dev.0.20220106191415-9b9b3d81d5e3/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.22.0 h1:D4nJWe9zXqHOmWqj4VMOJhvzj7bEZg4wEYa759z1pH4=
-golang.org/x/mod v0.22.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.13.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
+golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
-golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
-golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
-golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo=
-golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM=
-golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
-golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
+golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
+golang.org/x/net v0.16.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/net v0.35.0 h1:T5GQRQb2y08kTAByq9L4/bz8cipCdA8FbRTXewonqY8=
+golang.org/x/net v0.35.0/go.mod h1:EglIi67kWsHKlRzzVMUD93VMSWGFOMSZgxFjparz1Qk=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.9.0 h1:fEo0HyrW1GIgZdpbhCRO0PkJajUS5H9IFUztCgEo2jQ=
-golang.org/x/sync v0.9.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
-golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.4.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -755,92 +520,49 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s=
-golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
-golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
-golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
-golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
+golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
+golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
+golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
-golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
-golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
-golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
-golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
-golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
-golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
-golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
-golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
 golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
 golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
-golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
-golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA=
 golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.0.0-20201211185031-d93e913c1a58/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
@@ -848,110 +570,29 @@ golang.org/x/tools v0.1.1-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0t
 golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU=
 golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
 golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
-golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.27.0 h1:qEKojBykQkQ4EynWy4S8Weg69NumxKdn40Fce3uc/8o=
-golang.org/x/tools v0.27.0/go.mod h1:sUi0ZgbwW9ZPAq26Ekut+weQPR5eIM6GQLQ1Yjm1H0Q=
+golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
+golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
+golang.org/x/tools v0.14.0/go.mod h1:uYBEerGOWcJyEORxN+Ek8+TT266gXkNlHdJBwexUsBg=
+golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
+golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
-google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
-google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
-google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
-google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
-google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
-google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
-google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
-google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
-google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
-google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
-google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
-google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
-google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
-google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
-google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
-google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
-google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
-google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
-google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
-google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
-google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
-google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
-google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
-google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
-google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
-google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
-google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
-google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
-google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
-google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
-google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
-google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
-google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
-google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
-google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
-gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
+google.golang.org/protobuf v1.36.5 h1:tPhr+woSbjfYvY6/GPufUoYizxw1cF/yFoxJ2fmpwlM=
+google.golang.org/protobuf v1.36.5/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
 gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
-gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20190709130402-674ba3eaed22/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -959,15 +600,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
-honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
-honnef.co/go/tools v0.5.1 h1:4bH5o3b5ZULQ4UrBmP+63W9r7qIkqJClEA9ko5YKx+I=
-honnef.co/go/tools v0.5.1/go.mod h1:e9irvo83WDG9/irijV44wr3tbhcFeRnfpVlRqVwpzMs=
+honnef.co/go/tools v0.6.0 h1:TAODvD3knlq75WCp2nyGJtT4LeRV/o7NN9nYPeVJXf8=
+honnef.co/go/tools v0.6.0/go.mod h1:3puzxxljPCe8RGJX7BIy1plGbxEOZni5mR2aXe3/uk4=
 moul.io/banner v1.0.1 h1:+WsemGLhj2pOajw2eR5VYjLhOIqs0XhIRYchzTyMLk0=
 moul.io/banner v1.0.1/go.mod h1:XwvIGKkhKRKyN1vIdmR5oaKQLIkMhkMqrsHpS94QzAU=
 moul.io/godev v1.7.0/go.mod h1:5lgSpI1oH7xWpLl2Ew/Nsgk8DiNM6FzN9WV9+lgW8RQ=
@@ -980,8 +614,5 @@ moul.io/u v1.27.0 h1:rF0p184mludn2DzL0unA8Gf/mFWMBerdqOh8cyuQYzQ=
 moul.io/u v1.27.0/go.mod h1:ggYDXxUjoHpfDsMPD3STqkUZTyA741PZiQhSd+7kRnA=
 mvdan.cc/gofumpt v0.7.0 h1:bg91ttqXmi9y2xawvkuMXyvAA/1ZGJqYAEGjXuP0JXU=
 mvdan.cc/gofumpt v0.7.0/go.mod h1:txVFJy/Sc/mvaycET54pV8SW8gWxTlUuGHVEcncmNUo=
-mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f h1:lMpcwN6GxNbWtbpI1+xzFLSW8XzX0u72NttUGVFjO3U=
-mvdan.cc/unparam v0.0.0-20240528143540-8a5130ca722f/go.mod h1:RSLa7mKKCNeTTMHBw5Hsy2rfJmd6O2ivt9Dw9ZqCQpQ=
-rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
-rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
-rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
+mvdan.cc/unparam v0.0.0-20250211232406-0e51248738fc h1:mEpjEutR7Qjdis+HqGQNdsJY/uRbH/MnyGXzLKMhDFo=
+mvdan.cc/unparam v0.0.0-20250211232406-0e51248738fc/go.mod h1:rthT7OuvRbaGcd5ginj6dA2oLE7YNlta9qhBNNdCaLE=

From 913006367308fa611ba00ded7834018a61afb0fb Mon Sep 17 00:00:00 2001
From: Alexis Colin <alexis@jaunebleu.co>
Date: Mon, 17 Feb 2025 19:54:20 +0900
Subject: [PATCH 17/47] fix: allows images from gnolang.github.io in csp
 (#3765)

Related to #3619, this PR is a hotfix for blog images from
[gno.land](https://gnolang.github.io/) until a proper generic
whitelisted image provider is implemented.

Or do we want to use base64 and replace all images from blog and realm
instead?
---
 gno.land/cmd/gnoweb/main.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gno.land/cmd/gnoweb/main.go b/gno.land/cmd/gnoweb/main.go
index a3503848657..0bd38489ff6 100644
--- a/gno.land/cmd/gnoweb/main.go
+++ b/gno.land/cmd/gnoweb/main.go
@@ -241,7 +241,8 @@ func SecureHeadersMiddleware(next http.Handler, strict bool) http.Handler {
 			// cross-site scripting (XSS) and other code injection attacks.
 			// - 'self' allows resources from the same origin.
 			// - 'data:' allows inline images (e.g., base64-encoded images).
-			w.Header().Set("Content-Security-Policy", "default-src 'self'; script-src 'self' https://sa.gno.services; style-src 'self'; img-src 'self' data:; font-src 'self'")
+			// - 'https://gnolang.github.io' allows images from this specific domain - used by gno.land. TODO: use a proper generic whitelisted service
+			w.Header().Set("Content-Security-Policy", "default-src 'self'; script-src 'self' https://sa.gno.services; style-src 'self'; img-src 'self' data: https://gnolang.github.io; font-src 'self'")
 
 			// Enforce HTTPS by telling browsers to only access the site over HTTPS
 			// for a specified duration (1 year in this case). This also applies to

From 21ec808c61f2288c225a9b51c0c4cff9646d4cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20=C5=BDivkovi=C4=87?=
 <milos.zivkovic@tendermint.com>
Date: Tue, 18 Feb 2025 12:55:47 +0100
Subject: [PATCH 18/47] chore: bump go version in CI (#3772)

## Description

Thank you @piux2 for reporting this and fixing it in your PR.

This PR bumps the minimum go version for the CI / workflows to `go
1.23`, as we have dependent tools (like the linter for example) which
require at least the `latest go version - 1`.

Following up on:
 https://github.com/gnolang/gno/pull/3766

Related:
https://github.com/gnolang/gno/pull/3767/files
---
 .github/ISSUE_TEMPLATE/BUG-REPORT.md  |  2 +-
 .github/workflows/examples.yml        | 10 +++++-----
 .github/workflows/gnofmt_template.yml |  2 +-
 .github/workflows/gnoland.yml         |  2 +-
 .github/workflows/main_template.yml   |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.md b/.github/ISSUE_TEMPLATE/BUG-REPORT.md
index a63b450d678..3aca60cdbb7 100644
--- a/.github/ISSUE_TEMPLATE/BUG-REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.md
@@ -13,7 +13,7 @@ Describe your issue in as much detail as possible here
 
 ### Your environment
 
-* Go version (example: go1.22.4)
+* Go version (example: go1.23.4)
 * OS and CPU architecture (example: linux/amd64)
 * Gno commit hash causing the issue (example: f24690e7ebf325bffcfaf9e328c3df8e6b21e50c)
 
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index ffe40c2db7e..09c0ee0bbd9 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -20,7 +20,7 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.22.x"
+          - "1.23.x"
     runs-on: ubuntu-latest
     timeout-minutes: 30
     steps:
@@ -35,7 +35,7 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.22.x"
+          - "1.23.x"
         # unittests: TODO: matrix with contracts
     runs-on: ubuntu-latest
     timeout-minutes: 30
@@ -58,7 +58,7 @@ jobs:
       fail-fast: false
       matrix:
         goversion:
-          - "1.22.x"
+          - "1.23.x"
         # unittests: TODO: matrix with contracts
     runs-on: ubuntu-latest
     timeout-minutes: 10
@@ -83,13 +83,13 @@ jobs:
     uses: ./.github/workflows/build_template.yml
     with:
       modulepath: "examples"
-      go-version: "1.22.x"
+      go-version: "1.23.x"
 
   mod-tidy:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ "1.22.x" ]
+        go-version: [ "1.23.x" ]
         # unittests: TODO: matrix with contracts
     runs-on: ubuntu-latest
     timeout-minutes: 10
diff --git a/.github/workflows/gnofmt_template.yml b/.github/workflows/gnofmt_template.yml
index 096dbaa1b5d..c47ef35efd7 100644
--- a/.github/workflows/gnofmt_template.yml
+++ b/.github/workflows/gnofmt_template.yml
@@ -9,7 +9,7 @@ on:
         description: "Go version to use"
         required: false
         type: string
-        default: "1.22.x"
+        default: "1.23.x"
 
 jobs:
   fmt:
diff --git a/.github/workflows/gnoland.yml b/.github/workflows/gnoland.yml
index c4bc26a45fc..44644842618 100644
--- a/.github/workflows/gnoland.yml
+++ b/.github/workflows/gnoland.yml
@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: ["1.22.x"]
+        go-version: ["1.23.x"]
         # unittests: TODO: matrix with contracts
     runs-on: ubuntu-latest
     timeout-minutes: 10
diff --git a/.github/workflows/main_template.yml b/.github/workflows/main_template.yml
index a463bb330ea..260c983e871 100644
--- a/.github/workflows/main_template.yml
+++ b/.github/workflows/main_template.yml
@@ -11,7 +11,7 @@ on:
         description: "Go version to use"
         required: false
         type: string
-        default: "1.22.x"
+        default: "1.23.x"
     secrets:
       codecov-token:
         required: true

From de78e5bd3360643829072f4c83b6b074e2d05680 Mon Sep 17 00:00:00 2001
From: Antoine Eddi <5222525+aeddi@users.noreply.github.com>
Date: Tue, 18 Feb 2025 13:49:20 +0100
Subject: [PATCH 19/47] ci(docs): fix go-version-file path (#3773)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a quick fix to get master’s CI back to green.

It should work even though I noticed while digging in that the `docs`
folder’s Makefile has two rules, each calling different go dependencies
with their own `go.mod` files requiring different go versions.
It might be wise to refactor this and consolidate everything into a
single `go.mod` and probably even moving it to the `docs` folder?
---
 .github/workflows/docs-linter.yml | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docs-linter.yml b/.github/workflows/docs-linter.yml
index d603d796ae9..dc66fb5b57d 100644
--- a/.github/workflows/docs-linter.yml
+++ b/.github/workflows/docs-linter.yml
@@ -16,12 +16,13 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Set up Go
+      - name: Set up Go (docs builder)
         uses: actions/setup-go@v5
         with:
-          go-version-file: go.mod
+          go-version-file: misc/devdeps/go.mod
 
-      - name: Install dependencies
+      - name: Install dependencies (docs builder)
+        working-directory: misc/devdeps
         run: go mod download
 
       - name: Build docs
@@ -30,5 +31,14 @@ jobs:
       - name: Check diff
         run: git diff --exit-code || (echo "Some docs files are not formatted, please run 'make build'." && exit 1)
 
+      - name: Set up Go (docs linter)
+        uses: actions/setup-go@v5
+        with:
+          go-version-file: misc/docs-linter/go.mod
+
+      - name: Install dependencies (docs linter)
+        working-directory: misc/docs-linter
+        run: go mod download
+
       - name: Run linter
         run: make -C docs/ lint

From 0a3df04924df318a166438934a253df759821894 Mon Sep 17 00:00:00 2001
From: Morgan <morgan@morganbaz.com>
Date: Tue, 18 Feb 2025 18:08:28 +0100
Subject: [PATCH 20/47] feat(gnovm)!: remove `bigint` type (#3641)

This PR removes the `bigint` type. It is a new feature deviating from
the go programming language, and it is largely untested and possibly
dangerous to have as we approach mainnet, as it is only used publicly in
a few test files.
---
 gnovm/pkg/gnolang/gno_test.go         |  3 +--
 gnovm/pkg/gnolang/gonative.go         |  8 +++---
 gnovm/pkg/gnolang/op_binary.go        | 30 ++++++++++-----------
 gnovm/pkg/gnolang/op_inc_dec.go       |  8 +++---
 gnovm/pkg/gnolang/op_unary.go         |  6 ++---
 gnovm/pkg/gnolang/store.go            |  2 +-
 gnovm/pkg/gnolang/types.go            | 38 +++++++--------------------
 gnovm/pkg/gnolang/uverse.go           |  1 -
 gnovm/pkg/gnolang/values.go           |  2 --
 gnovm/pkg/gnolang/values_string.go    |  4 +--
 gnovm/tests/files/zpersist_valids.gno | 11 +++-----
 11 files changed, 43 insertions(+), 70 deletions(-)

diff --git a/gnovm/pkg/gnolang/gno_test.go b/gnovm/pkg/gnolang/gno_test.go
index 5a8c6faf315..16ea1f4118d 100644
--- a/gnovm/pkg/gnolang/gno_test.go
+++ b/gnovm/pkg/gnolang/gno_test.go
@@ -64,7 +64,6 @@ func TestBuiltinIdentifiersShadowing(t *testing.T) {
 		"println",
 		"recover",
 		"nil",
-		"bigint",
 		"bool",
 		"byte",
 		"float32",
@@ -247,7 +246,7 @@ func main() {
 		},
 		{
 			`package test
-		
+
 		func main() {
 			const f = float64(1.0)
 		   println(int64(f))
diff --git a/gnovm/pkg/gnolang/gonative.go b/gnovm/pkg/gnolang/gonative.go
index a777c1cef3e..0a2429fb1c6 100644
--- a/gnovm/pkg/gnolang/gonative.go
+++ b/gnovm/pkg/gnolang/gonative.go
@@ -769,9 +769,9 @@ func gno2GoType(t Type) reflect.Type {
 			return reflect.TypeOf(float32(0))
 		case Float64Type:
 			return reflect.TypeOf(float64(0))
-		case BigintType, UntypedBigintType:
+		case UntypedBigintType:
 			panic("not yet implemented")
-		case BigdecType, UntypedBigdecType:
+		case UntypedBigdecType:
 			panic("not yet implemented")
 		default:
 			panic("should not happen")
@@ -887,9 +887,9 @@ func gno2GoTypeMatches(t Type, rt reflect.Type) (result bool) {
 			return rt.Kind() == reflect.Float32
 		case Float64Type:
 			return rt.Kind() == reflect.Float64
-		case BigintType, UntypedBigintType:
+		case UntypedBigintType:
 			panic("not yet implemented")
-		case BigdecType, UntypedBigdecType:
+		case UntypedBigdecType:
 			panic("not yet implemented")
 		default:
 			panic("should not happen")
diff --git a/gnovm/pkg/gnolang/op_binary.go b/gnovm/pkg/gnolang/op_binary.go
index 42419ec5d54..ad41cb7d0ff 100644
--- a/gnovm/pkg/gnolang/op_binary.go
+++ b/gnovm/pkg/gnolang/op_binary.go
@@ -719,11 +719,11 @@ func addAssign(alloc *Allocator, lv, rv *TypedValue) {
 	case Float64Type:
 		// NOTE: gno doesn't fuse *+.
 		lv.SetFloat64(softfloat.Fadd64(lv.GetFloat64(), rv.GetFloat64()))
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).Add(lb, rv.GetBigInt())
 		lv.V = BigintValue{V: lb}
-	case BigdecType, UntypedBigdecType:
+	case UntypedBigdecType:
 		lb := lv.GetBigDec()
 		rb := rv.GetBigDec()
 		sum := apd.New(0, 0)
@@ -775,11 +775,11 @@ func subAssign(lv, rv *TypedValue) {
 	case Float64Type:
 		// NOTE: gno doesn't fuse *+.
 		lv.SetFloat64(softfloat.Fsub64(lv.GetFloat64(), rv.GetFloat64()))
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).Sub(lb, rv.GetBigInt())
 		lv.V = BigintValue{V: lb}
-	case BigdecType, UntypedBigdecType:
+	case UntypedBigdecType:
 		lb := lv.GetBigDec()
 		rb := rv.GetBigDec()
 		diff := apd.New(0, 0)
@@ -831,11 +831,11 @@ func mulAssign(lv, rv *TypedValue) {
 	case Float64Type:
 		// NOTE: gno doesn't fuse *+.
 		lv.SetFloat64(softfloat.Fmul64(lv.GetFloat64(), rv.GetFloat64()))
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).Mul(lb, rv.GetBigInt())
 		lv.V = BigintValue{V: lb}
-	case BigdecType, UntypedBigdecType:
+	case UntypedBigdecType:
 		lb := lv.GetBigDec()
 		rb := rv.GetBigDec()
 		prod := apd.New(0, 0)
@@ -929,14 +929,14 @@ func quoAssign(lv, rv *TypedValue) *Exception {
 		if ok {
 			lv.SetFloat64(softfloat.Fdiv64(lv.GetFloat64(), rv.GetFloat64()))
 		}
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		if rv.GetBigInt().Sign() == 0 {
 			return expt
 		}
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).Quo(lb, rv.GetBigInt())
 		lv.V = BigintValue{V: lb}
-	case BigdecType, UntypedBigdecType:
+	case UntypedBigdecType:
 		if rv.GetBigDec().Cmp(apd.New(0, 0)) == 0 {
 			return expt
 		}
@@ -1022,7 +1022,7 @@ func remAssign(lv, rv *TypedValue) *Exception {
 			return expt
 		}
 		lv.SetUint64(lv.GetUint64() % rv.GetUint64())
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		if rv.GetBigInt().Sign() == 0 {
 			return expt
 		}
@@ -1067,7 +1067,7 @@ func bandAssign(lv, rv *TypedValue) {
 		lv.SetUint32(lv.GetUint32() & rv.GetUint32())
 	case Uint64Type:
 		lv.SetUint64(lv.GetUint64() & rv.GetUint64())
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).And(lb, rv.GetBigInt())
 		lv.V = BigintValue{V: lb}
@@ -1106,7 +1106,7 @@ func bandnAssign(lv, rv *TypedValue) {
 		lv.SetUint32(lv.GetUint32() &^ rv.GetUint32())
 	case Uint64Type:
 		lv.SetUint64(lv.GetUint64() &^ rv.GetUint64())
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).AndNot(lb, rv.GetBigInt())
 		lv.V = BigintValue{V: lb}
@@ -1145,7 +1145,7 @@ func borAssign(lv, rv *TypedValue) {
 		lv.SetUint32(lv.GetUint32() | rv.GetUint32())
 	case Uint64Type:
 		lv.SetUint64(lv.GetUint64() | rv.GetUint64())
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).Or(lb, rv.GetBigInt())
 		lv.V = BigintValue{V: lb}
@@ -1184,7 +1184,7 @@ func xorAssign(lv, rv *TypedValue) {
 		lv.SetUint32(lv.GetUint32() ^ rv.GetUint32())
 	case Uint64Type:
 		lv.SetUint64(lv.GetUint64() ^ rv.GetUint64())
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).Xor(lb, rv.GetBigInt())
 		lv.V = BigintValue{V: lb}
@@ -1308,7 +1308,7 @@ func shlAssign(m *Machine, lv, rv *TypedValue) {
 		})
 
 		lv.SetUint64(lv.GetUint64() << rv.GetUint())
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).Lsh(lb, uint(rv.GetUint()))
 		lv.V = BigintValue{V: lb}
@@ -1432,7 +1432,7 @@ func shrAssign(m *Machine, lv, rv *TypedValue) {
 		})
 
 		lv.SetUint64(lv.GetUint64() >> rv.GetUint())
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).Rsh(lb, uint(rv.GetUint()))
 		lv.V = BigintValue{V: lb}
diff --git a/gnovm/pkg/gnolang/op_inc_dec.go b/gnovm/pkg/gnolang/op_inc_dec.go
index 708aae821ac..ee0e90a94a5 100644
--- a/gnovm/pkg/gnolang/op_inc_dec.go
+++ b/gnovm/pkg/gnolang/op_inc_dec.go
@@ -58,11 +58,11 @@ func (m *Machine) doOpInc() {
 		lv.SetFloat32(softfloat.Fadd32(lv.GetFloat32(), softfloat.Fintto32(1)))
 	case Float64Type:
 		lv.SetFloat64(softfloat.Fadd64(lv.GetFloat64(), softfloat.Fintto64(1)))
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).Add(lb, big.NewInt(1))
 		lv.V = BigintValue{V: lb}
-	case BigdecType, UntypedBigdecType:
+	case UntypedBigdecType:
 		lb := lv.GetBigDec()
 		sum := apd.New(0, 0)
 		cond, err := apd.BaseContext.WithPrecision(0).Add(sum, lb, apd.New(1, 0))
@@ -128,11 +128,11 @@ func (m *Machine) doOpDec() {
 		lv.SetFloat32(softfloat.Fsub32(lv.GetFloat32(), softfloat.Fintto32(1)))
 	case Float64Type:
 		lv.SetFloat64(softfloat.Fsub64(lv.GetFloat64(), softfloat.Fintto64(1)))
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		lb := lv.GetBigInt()
 		lb = big.NewInt(0).Sub(lb, big.NewInt(1))
 		lv.V = BigintValue{V: lb}
-	case BigdecType, UntypedBigdecType:
+	case UntypedBigdecType:
 		lb := lv.GetBigDec()
 		sum := apd.New(0, 0)
 		cond, err := apd.BaseContext.WithPrecision(0).Sub(sum, lb, apd.New(1, 0))
diff --git a/gnovm/pkg/gnolang/op_unary.go b/gnovm/pkg/gnolang/op_unary.go
index 469c80b8dac..fdf4324349c 100644
--- a/gnovm/pkg/gnolang/op_unary.go
+++ b/gnovm/pkg/gnolang/op_unary.go
@@ -50,10 +50,10 @@ func (m *Machine) doOpUneg() {
 		xv.SetFloat32(softfloat.Fneg32(xv.GetFloat32()))
 	case Float64Type:
 		xv.SetFloat64(softfloat.Fneg64(xv.GetFloat64()))
-	case UntypedBigintType, BigintType:
+	case UntypedBigintType:
 		bv := xv.V.(BigintValue)
 		xv.V = BigintValue{V: new(big.Int).Neg(bv.V)}
-	case UntypedBigdecType, BigdecType:
+	case UntypedBigdecType:
 		bv := xv.V.(BigdecValue)
 		xv.V = BigdecValue{V: apd.New(0, 0).Neg(bv.V)}
 	case nil:
@@ -112,7 +112,7 @@ func (m *Machine) doOpUxor() {
 		xv.SetUint32(^xv.GetUint32())
 	case Uint64Type:
 		xv.SetUint64(^xv.GetUint64())
-	case UntypedBigintType, BigintType:
+	case UntypedBigintType:
 		// XXX can it even be implemented?
 		panic("not yet implemented")
 	default:
diff --git a/gnovm/pkg/gnolang/store.go b/gnovm/pkg/gnolang/store.go
index 3a70d07381b..84625bd92c1 100644
--- a/gnovm/pkg/gnolang/store.go
+++ b/gnovm/pkg/gnolang/store.go
@@ -1028,7 +1028,7 @@ func InitStoreCaches(store Store) {
 		StringType, UntypedStringType,
 		IntType, Int8Type, Int16Type, Int32Type, Int64Type, UntypedRuneType,
 		UintType, Uint8Type, Uint16Type, Uint32Type, Uint64Type,
-		BigintType, UntypedBigintType,
+		UntypedBigintType,
 		gTypeType,
 		gPackageType,
 		blockType{},
diff --git a/gnovm/pkg/gnolang/types.go b/gnovm/pkg/gnolang/types.go
index 8ac07162f10..9a0c4fdabf9 100644
--- a/gnovm/pkg/gnolang/types.go
+++ b/gnovm/pkg/gnolang/types.go
@@ -108,9 +108,7 @@ const (
 	Float32Type
 	Float64Type
 	UntypedBigintType
-	BigintType
 	UntypedBigdecType
-	BigdecType
 	// UintptrType
 )
 
@@ -153,20 +151,16 @@ func (pt PrimitiveType) Specificity() int {
 		return 0
 	case Float64Type:
 		return 0
-	case BigintType:
-		return 1
-	case BigdecType:
-		return 2
 	case UntypedBigdecType:
-		return 3
+		return 1
 	case UntypedStringType:
-		return 4
+		return 2
 	case UntypedBigintType:
-		return 4
+		return 2
 	case UntypedRuneType:
-		return 5
+		return 3
 	case UntypedBoolType:
-		return 6
+		return 4
 	default:
 		panic(fmt.Sprintf("unexpected primitive type %v", pt))
 	}
@@ -204,9 +198,9 @@ func (pt PrimitiveType) Kind() Kind {
 		return Float32Kind
 	case Float64Type:
 		return Float64Kind
-	case BigintType, UntypedBigintType:
+	case UntypedBigintType:
 		return BigintKind
-	case BigdecType, UntypedBigdecType:
+	case UntypedBigdecType:
 		return BigdecKind
 	default:
 		panic(fmt.Sprintf("unexpected primitive type %v", pt))
@@ -256,12 +250,8 @@ func (pt PrimitiveType) TypeID() TypeID {
 		return typeid("float64")
 	case UntypedBigintType:
 		return typeid("<untyped> bigint")
-	case BigintType:
-		return typeid("bigint")
 	case UntypedBigdecType:
 		return typeid("<untyped> bigdec")
-	case BigdecType:
-		return typeid("bigdec")
 	default:
 		panic(fmt.Sprintf("unexpected primitive type %v", pt))
 	}
@@ -309,12 +299,8 @@ func (pt PrimitiveType) String() string {
 		return string("float64")
 	case UntypedBigintType:
 		return string("<untyped> bigint")
-	case BigintType:
-		return string("bigint")
 	case UntypedBigdecType:
 		return string("<untyped> bigdec")
-	case BigdecType:
-		return string("bigdec")
 	default:
 		panic(fmt.Sprintf("unexpected primitive type %d", pt))
 	}
@@ -2206,9 +2192,9 @@ func KindOf(t Type) Kind {
 			return Float32Kind
 		case Float64Type:
 			return Float64Kind
-		case BigintType, UntypedBigintType:
+		case UntypedBigintType:
 			return BigintKind
-		case BigdecType, UntypedBigdecType:
+		case UntypedBigdecType:
 			return BigdecKind
 		default:
 			panic(fmt.Sprintf("unexpected primitive type %s", t.String()))
@@ -2401,12 +2387,6 @@ func fillEmbeddedName(ft *FieldType) {
 			ft.Name = Name("float32")
 		case Float64Type:
 			ft.Name = Name("float64")
-		case BigintType:
-			ft.Name = Name("bigint")
-		case BigdecType:
-			ft.Name = Name("bigdec")
-		default:
-			panic("should not happen")
 		}
 	case *NativeType:
 		panic("native type cannot be embedded")
diff --git a/gnovm/pkg/gnolang/uverse.go b/gnovm/pkg/gnolang/uverse.go
index bfa4a6c65a7..55791ba4900 100644
--- a/gnovm/pkg/gnolang/uverse.go
+++ b/gnovm/pkg/gnolang/uverse.go
@@ -129,7 +129,6 @@ func makeUverseNode() {
 	def("._", undefined)   // special, path is zero.
 	def("iota", undefined) // special
 	def("nil", undefined)
-	def("bigint", asValue(BigintType))
 	def("bool", asValue(BoolType))
 	def("byte", asValue(Uint8Type))
 	def("float32", asValue(Float32Type))
diff --git a/gnovm/pkg/gnolang/values.go b/gnovm/pkg/gnolang/values.go
index ef537502bda..351e99ce469 100644
--- a/gnovm/pkg/gnolang/values.go
+++ b/gnovm/pkg/gnolang/values.go
@@ -1130,8 +1130,6 @@ func (tv *TypedValue) PrimitiveBytes() (data []byte) {
 		binary.LittleEndian.PutUint64(
 			data, u64)
 		return data
-	case BigintType:
-		return tv.V.(BigintValue).V.Bytes()
 	default:
 		panic(fmt.Sprintf(
 			"unexpected primitive value type: %s",
diff --git a/gnovm/pkg/gnolang/values_string.go b/gnovm/pkg/gnolang/values_string.go
index fdf0c8f55de..b18bdb0dddc 100644
--- a/gnovm/pkg/gnolang/values_string.go
+++ b/gnovm/pkg/gnolang/values_string.go
@@ -343,9 +343,9 @@ func (tv *TypedValue) ProtectedSprint(seen *seenValues, considerDeclaredType boo
 			return fmt.Sprintf("%v", math.Float32frombits(tv.GetFloat32()))
 		case Float64Type:
 			return fmt.Sprintf("%v", math.Float64frombits(tv.GetFloat64()))
-		case UntypedBigintType, BigintType:
+		case UntypedBigintType:
 			return tv.V.(BigintValue).V.String()
-		case UntypedBigdecType, BigdecType:
+		case UntypedBigdecType:
 			return tv.V.(BigdecValue).V.String()
 		default:
 			panic("should not happen")
diff --git a/gnovm/tests/files/zpersist_valids.gno b/gnovm/tests/files/zpersist_valids.gno
index 2709a243adf..790d4ea1551 100644
--- a/gnovm/tests/files/zpersist_valids.gno
+++ b/gnovm/tests/files/zpersist_valids.gno
@@ -8,7 +8,6 @@ type myStruct struct {
 
 var (
 	// Native types
-	abigint      bigint        = 16
 	abool        bool          = true
 	abyte        byte          = 0x16
 	afloat32     float32       = 16.16
@@ -52,7 +51,6 @@ func main() {
 }
 
 func mutateVars(stringModifier string) {
-	abigint *= 2
 	abool = !abool
 	abyte *= 2
 	afloat32 *= 2
@@ -82,7 +80,6 @@ func mutateVars(stringModifier string) {
 func printVars(phase string) {
 	println(phase,
 		// variables
-		abigint,
 		abool,
 		abyte,
 		afloat32,
@@ -108,7 +105,7 @@ func printVars(phase string) {
 }
 
 // Output:
-// preinit  16 true 22 16.16 16.16 16 16 16 16 16 97 hello slice[("A" string)] A (struct{(16 int),("A" string)} gno.land/r/demo/tests_test.myStruct) 16 16 16 16 16 struct{(16 float32)} A
-// postinit 32 false 44 32.32 32.32 32 32 32 32 32 66 helloB slice[("A" string),("B" string)] A (struct{(32 int),("B" string)} gno.land/r/demo/tests_test.myStruct) 32 32 32 32 32 struct{("B" string)} B
-// premain  32 false 44 32.32 32.32 32 32 32 32 32 66 helloB slice[("A" string),("B" string)] A (struct{(32 int),("B" string)} gno.land/r/demo/tests_test.myStruct) 32 32 32 32 32 struct{("B" string)} B
-// postmain 64 true 88 64.64 64.64 64 64 64 64 64 67 helloBC slice[("A" string),("B" string),("C" string)] A (struct{(64 int),("C" string)} gno.land/r/demo/tests_test.myStruct) 64 64 64 64 64 struct{("C" string)} C
+// preinit  true 22 16.16 16.16 16 16 16 16 16 97 hello slice[("A" string)] A (struct{(16 int),("A" string)} gno.land/r/demo/tests_test.myStruct) 16 16 16 16 16 struct{(16 float32)} A
+// postinit false 44 32.32 32.32 32 32 32 32 32 66 helloB slice[("A" string),("B" string)] A (struct{(32 int),("B" string)} gno.land/r/demo/tests_test.myStruct) 32 32 32 32 32 struct{("B" string)} B
+// premain  false 44 32.32 32.32 32 32 32 32 32 66 helloB slice[("A" string),("B" string)] A (struct{(32 int),("B" string)} gno.land/r/demo/tests_test.myStruct) 32 32 32 32 32 struct{("B" string)} B
+// postmain true 88 64.64 64.64 64 64 64 64 64 67 helloBC slice[("A" string),("B" string),("C" string)] A (struct{(64 int),("C" string)} gno.land/r/demo/tests_test.myStruct) 64 64 64 64 64 struct{("C" string)} C

From 64ea826a4d0bdb8ac87392045324daa5dfae2b7f Mon Sep 17 00:00:00 2001
From: ltzmaxwell <ltz.maxwell@gmail.com>
Date: Wed, 19 Feb 2025 02:01:40 +0800
Subject: [PATCH 21/47] fix: correct typed-nil handling (#1891)

update: ready for review.

====================================
the dependency relationship: #1890 <- this one.

---------

Co-authored-by: Morgan Bazalgette <morgan@morganbaz.com>
---
 gnovm/pkg/gnolang/preprocess.go               | 13 +++++++++
 gnovm/pkg/gnolang/values_conversions.go       |  5 ++++
 gnovm/tests/files/convert4.gno                |  2 +-
 gnovm/tests/files/convert5.gno                |  2 +-
 .../tests/files/types/cmp_iface_0_stdlibs.gno | 27 +++++++++++++++++++
 .../tests/files/types/cmp_iface_3_stdlibs.gno | 27 +++++++++++++++++++
 .../tests/files/types/cmp_iface_5_stdlibs.gno | 27 +++++++++++++++++++
 gnovm/tests/files/types/typed_nil_a.gno       | 18 +++++++++++++
 gnovm/tests/files/types/typed_nil_b.gno       | 16 +++++++++++
 gnovm/tests/files/types/typed_nil_c.gno       | 12 +++++++++
 10 files changed, 147 insertions(+), 2 deletions(-)
 create mode 100644 gnovm/tests/files/types/cmp_iface_0_stdlibs.gno
 create mode 100644 gnovm/tests/files/types/cmp_iface_3_stdlibs.gno
 create mode 100644 gnovm/tests/files/types/cmp_iface_5_stdlibs.gno
 create mode 100644 gnovm/tests/files/types/typed_nil_a.gno
 create mode 100644 gnovm/tests/files/types/typed_nil_b.gno
 create mode 100644 gnovm/tests/files/types/typed_nil_c.gno

diff --git a/gnovm/pkg/gnolang/preprocess.go b/gnovm/pkg/gnolang/preprocess.go
index 26e67e71fad..7a23bb35cdd 100644
--- a/gnovm/pkg/gnolang/preprocess.go
+++ b/gnovm/pkg/gnolang/preprocess.go
@@ -1402,6 +1402,19 @@ func preprocess1(store Store, ctx BlockNode, n Node) Node {
 						if !constConverted {
 							convertConst(store, last, n, arg0, nil)
 						}
+
+						// check legal type for nil
+						if arg0.IsUndefined() {
+							switch ct.Kind() { // special case for nil conversion check.
+							case SliceKind, PointerKind, FuncKind, MapKind, InterfaceKind, ChanKind:
+								convertConst(store, last, n, arg0, ct)
+							default:
+								panic(fmt.Sprintf(
+									"cannot convert %v to %v",
+									arg0, ct.Kind()))
+							}
+						}
+
 						// evaluate the new expression.
 						cx := evalConst(store, last, n)
 						// Though cx may be undefined if ct is interface,
diff --git a/gnovm/pkg/gnolang/values_conversions.go b/gnovm/pkg/gnolang/values_conversions.go
index f6e39bd1912..920ed655ec9 100644
--- a/gnovm/pkg/gnolang/values_conversions.go
+++ b/gnovm/pkg/gnolang/values_conversions.go
@@ -75,6 +75,11 @@ func ConvertTo(alloc *Allocator, store Store, tv *TypedValue, t Type, isConst bo
 GNO_CASE:
 	// special case for interface target
 	if t.Kind() == InterfaceKind {
+		if tv.IsUndefined() && tv.T == nil {
+			if _, ok := t.(*NativeType); !ok { // no support for native now
+				tv.T = t
+			}
+		}
 		return
 	}
 	// special case for undefined/nil source
diff --git a/gnovm/tests/files/convert4.gno b/gnovm/tests/files/convert4.gno
index e03e1d07ce3..03c7d454b82 100644
--- a/gnovm/tests/files/convert4.gno
+++ b/gnovm/tests/files/convert4.gno
@@ -5,4 +5,4 @@ func main() {
 }
 
 // Error:
-// main/files/convert4.gno:4:10: cannot convert (undefined) to int
+// main/files/convert4.gno:4:10: cannot convert (const (undefined)) to IntKind
diff --git a/gnovm/tests/files/convert5.gno b/gnovm/tests/files/convert5.gno
index e2e16c5eb83..1e785abdd7b 100644
--- a/gnovm/tests/files/convert5.gno
+++ b/gnovm/tests/files/convert5.gno
@@ -7,4 +7,4 @@ func main() {
 }
 
 // Error:
-// main/files/convert5.gno:3:1: cannot convert (undefined) to int
+// main/files/convert5.gno:3:1: cannot convert (const (undefined)) to IntKind
diff --git a/gnovm/tests/files/types/cmp_iface_0_stdlibs.gno b/gnovm/tests/files/types/cmp_iface_0_stdlibs.gno
new file mode 100644
index 00000000000..fb4ac682243
--- /dev/null
+++ b/gnovm/tests/files/types/cmp_iface_0_stdlibs.gno
@@ -0,0 +1,27 @@
+package main
+
+import (
+	"errors"
+	"strconv"
+)
+
+type Error int64
+
+func (e Error) Error() string {
+	return "error: " + strconv.Itoa(int(e))
+}
+
+var errCmp = errors.New("XXXX")
+
+// special case:
+// one is interface
+func main() {
+	if Error(0) == errCmp {
+		println("what the firetruck?")
+	} else {
+		println("something else")
+	}
+}
+
+// Output:
+// something else
diff --git a/gnovm/tests/files/types/cmp_iface_3_stdlibs.gno b/gnovm/tests/files/types/cmp_iface_3_stdlibs.gno
new file mode 100644
index 00000000000..9c4cb0e5ea0
--- /dev/null
+++ b/gnovm/tests/files/types/cmp_iface_3_stdlibs.gno
@@ -0,0 +1,27 @@
+package main
+
+import (
+	"errors"
+	"strconv"
+)
+
+type Error int64
+
+func (e Error) Error() string {
+	return "error: " + strconv.Itoa(int(e))
+}
+
+var errCmp = errors.New("XXXX")
+
+// special case:
+// one is interface
+func main() {
+	if Error(1) == errCmp {
+		println("what the firetruck?")
+	} else {
+		println("something else")
+	}
+}
+
+// Output:
+// something else
diff --git a/gnovm/tests/files/types/cmp_iface_5_stdlibs.gno b/gnovm/tests/files/types/cmp_iface_5_stdlibs.gno
new file mode 100644
index 00000000000..e706c74808e
--- /dev/null
+++ b/gnovm/tests/files/types/cmp_iface_5_stdlibs.gno
@@ -0,0 +1,27 @@
+package main
+
+import (
+	"errors"
+	"strconv"
+)
+
+type Error int64
+
+func (e Error) Error() string {
+	return "error: " + strconv.Itoa(int(e))
+}
+
+var errCmp = errors.New("XXXX")
+
+// special case:
+// one is interface
+func main() {
+	if errCmp == int64(1) {
+		println("what the firetruck?")
+	} else {
+		println("something else")
+	}
+}
+
+// Error:
+// main/files/types/cmp_iface_5_stdlibs.gno:19:5: int64 does not implement .uverse.error (missing method Error)
diff --git a/gnovm/tests/files/types/typed_nil_a.gno b/gnovm/tests/files/types/typed_nil_a.gno
new file mode 100644
index 00000000000..f212c677bab
--- /dev/null
+++ b/gnovm/tests/files/types/typed_nil_a.gno
@@ -0,0 +1,18 @@
+package main
+
+import "fmt"
+
+type integer int
+
+func main() {
+	// illegal conversion
+	// should not work
+	if integer(nil) == nil {
+		fmt.Println("integer is nil")
+	} else {
+		fmt.Println("integer is not nil")
+	}
+}
+
+// Error:
+// main/files/types/typed_nil_a.gno:10:5: cannot convert (const (undefined)) to IntKind
diff --git a/gnovm/tests/files/types/typed_nil_b.gno b/gnovm/tests/files/types/typed_nil_b.gno
new file mode 100644
index 00000000000..fb1492dd02b
--- /dev/null
+++ b/gnovm/tests/files/types/typed_nil_b.gno
@@ -0,0 +1,16 @@
+package main
+
+import "fmt"
+
+type integer *int
+
+func main() {
+	println(integer(nil))
+	fmt.Println(integer(nil))
+	fmt.Printf("%T\n", integer(nil))
+}
+
+// Output:
+// (nil main.integer)
+// <nil>
+// *int
diff --git a/gnovm/tests/files/types/typed_nil_c.gno b/gnovm/tests/files/types/typed_nil_c.gno
new file mode 100644
index 00000000000..c8a556ea0c1
--- /dev/null
+++ b/gnovm/tests/files/types/typed_nil_c.gno
@@ -0,0 +1,12 @@
+package main
+
+import "fmt"
+
+func main() {
+	println(interface{}(nil) == (*int)(nil))
+	fmt.Printf("%T\n", interface{}(nil))
+}
+
+// Output:
+// false
+// <nil>

From 78bf1f11848ef6a5a8d7354eda1b8ac4196f8c66 Mon Sep 17 00:00:00 2001
From: Leon Hudak <33522493+leohhhn@users.noreply.github.com>
Date: Tue, 18 Feb 2025 19:43:51 +0100
Subject: [PATCH 22/47] chore(examples): update leon's config package (#3761)

## Description

Updates Leon's config package.
---
 examples/gno.land/r/leon/config/config.gno | 93 +++++++---------------
 examples/gno.land/r/leon/config/render.gno | 69 ++++++++++++++++
 2 files changed, 99 insertions(+), 63 deletions(-)
 create mode 100644 examples/gno.land/r/leon/config/render.gno

diff --git a/examples/gno.land/r/leon/config/config.gno b/examples/gno.land/r/leon/config/config.gno
index bb90a6c21d7..eaea52c951e 100644
--- a/examples/gno.land/r/leon/config/config.gno
+++ b/examples/gno.land/r/leon/config/config.gno
@@ -3,22 +3,18 @@ package config
 import (
 	"errors"
 	"std"
-	"strconv"
 	"strings"
 	"time"
 
 	"gno.land/p/demo/avl"
-	p "gno.land/p/demo/avl/pager"
 	"gno.land/p/demo/ownable"
-	"gno.land/p/demo/ufmt"
-	"gno.land/p/moul/md"
-	"gno.land/p/moul/realmpath"
+	"gno.land/p/demo/seqid"
 )
 
 var (
+	cfgID   seqid.ID
 	configs = avl.NewTree()
-	pager   = p.NewPager(configs, 10, false)
-	banner  = "---\n[[Leon's Home page]](/r/leon/home) | [[GitHub: @leohhhn]](https://github.com/leohhhn)\n\n---"
+
 	absPath = strings.TrimPrefix(std.CurrentRealm().PkgPath(), std.GetChainDomain())
 
 	// SafeObjects
@@ -29,6 +25,8 @@ var (
 )
 
 type Config struct {
+	id      seqid.ID
+	name    string
 	lines   string
 	updated time.Time
 }
@@ -38,81 +36,50 @@ func AddConfig(name, lines string) {
 		panic(ErrUnauthorized)
 	}
 
-	configs.Set(name, Config{
+	id := cfgID.Next()
+	configs.Set(id.String(), Config{
+		id:      id,
+		name:    name,
 		lines:   lines,
 		updated: time.Now(),
-	}) // no overwrite check
+	})
 }
 
-func RemoveConfig(name string) {
+func EditConfig(id string, name, lines string) {
 	if !IsAuthorized(std.PrevRealm().Addr()) {
 		panic(ErrUnauthorized)
 	}
 
-	if _, ok := configs.Remove(name); !ok {
-		panic("no config with that name")
+	raw, ok := configs.Remove(id)
+	if !ok {
+		panic("no config with that id")
 	}
+
+	conf := raw.(Config)
+	// Overwrites data
+	conf.lines = lines
+	conf.name = name
+	conf.updated = time.Now()
 }
 
-func UpdateBanner(newBanner string) {
+func RemoveConfig(id string) {
 	if !IsAuthorized(std.PrevRealm().Addr()) {
 		panic(ErrUnauthorized)
 	}
 
-	banner = newBanner
-}
-
-func IsAuthorized(addr std.Address) bool {
-	return addr == OwnableMain.Owner() || addr == OwnableBackup.Owner()
-}
-
-func Banner() string {
-	return banner
-}
-
-func Render(path string) (out string) {
-	req := realmpath.Parse(path)
-	if req.Path == "" {
-		out += md.H1("Leon's config package")
-
-		out += ufmt.Sprintf("Leon's main address: %s\n\n", OwnableMain.Owner().String())
-		out += ufmt.Sprintf("Leon's backup address: %s\n\n", OwnableBackup.Owner().String())
-
-		out += md.H2("Leon's configs")
-
-		if configs.Size() == 0 {
-			out += "No configs yet :c\n\n"
-		}
-
-		page := pager.MustGetPageByPath(path)
-		for _, item := range page.Items {
-			out += ufmt.Sprintf("- [%s](%s:%s)\n\n", item.Key, absPath, item.Key)
-		}
-
-		out += page.Picker()
-		out += "\n\n"
-		out += "Page " + strconv.Itoa(page.PageNumber) + " of " + strconv.Itoa(page.TotalPages) + "\n\n"
-
-		out += Banner()
-
-		return out
+	if _, ok := configs.Remove(id); !ok {
+		panic("no config with that id")
 	}
-
-	return renderConfPage(req.Path)
 }
 
-func renderConfPage(confName string) (out string) {
-	raw, ok := configs.Get(confName)
-	if !ok {
-		out += md.H1("404")
-		out += "That config does not exist :/"
-		return out
+func UpdateBanner(newBanner string) {
+	if !IsAuthorized(std.PrevRealm().Addr()) {
+		panic(ErrUnauthorized)
 	}
 
-	conf := raw.(Config)
-	out += md.H1(confName)
-	out += ufmt.Sprintf("```\n%s\n```\n\n", conf.lines)
-	out += ufmt.Sprintf("_Last updated on %s_", conf.updated.Format("02 Jan, 2006"))
+	banner = newBanner
+}
 
-	return out
+func IsAuthorized(addr std.Address) bool {
+	return addr == OwnableMain.Owner() || addr == OwnableBackup.Owner()
 }
diff --git a/examples/gno.land/r/leon/config/render.gno b/examples/gno.land/r/leon/config/render.gno
new file mode 100644
index 00000000000..e32435b0d59
--- /dev/null
+++ b/examples/gno.land/r/leon/config/render.gno
@@ -0,0 +1,69 @@
+package config
+
+import (
+	"strconv"
+
+	p "gno.land/p/demo/avl/pager"
+	"gno.land/p/demo/ufmt"
+	"gno.land/p/moul/md"
+	"gno.land/p/moul/realmpath"
+	"gno.land/p/moul/txlink"
+)
+
+var (
+	banner = "---\n[[Leon's Home page]](/r/leon/home) | [[Leon's snippets]](/r/leon/config) | [[GitHub: @leohhhn]](https://github.com/leohhhn)\n\n---"
+	pager  = p.NewPager(configs, 10, true)
+)
+
+func Banner() string {
+	return banner
+}
+
+func Render(path string) (out string) {
+	req := realmpath.Parse(path)
+	if req.Path == "" {
+		out += md.H1("Leon's configs & snippets")
+
+		out += ufmt.Sprintf("Leon's main address: %s\n\n", OwnableMain.Owner().String())
+		out += ufmt.Sprintf("Leon's backup address: %s\n\n", OwnableBackup.Owner().String())
+
+		out += md.H2("Snippets")
+
+		if configs.Size() == 0 {
+			out += "No configs yet :c\n\n"
+		} else {
+			page := pager.MustGetPageByPath(path)
+			for _, item := range page.Items {
+				out += ufmt.Sprintf("- [%s](%s:%s)\n\n", item.Value.(Config).name, absPath, item.Key)
+			}
+
+			out += page.Picker()
+			out += "\n\n"
+			out += "Page " + strconv.Itoa(page.PageNumber) + " of " + strconv.Itoa(page.TotalPages) + "\n\n"
+		}
+
+		out += Banner()
+
+		return out
+	}
+
+	return renderConfPage(req.Path)
+}
+
+func renderConfPage(id string) (out string) {
+	raw, ok := configs.Get(id)
+	if !ok {
+		out += md.H1("404")
+		out += "That config does not exist :/"
+		return out
+	}
+
+	conf := raw.(Config)
+	out += md.H1(conf.name)
+	out += ufmt.Sprintf("```\n%s\n```\n\n", conf.lines)
+	out += ufmt.Sprintf("_Last updated on %s_\n\n", conf.updated.Format("02 Jan, 2006"))
+	out += md.HorizontalRule()
+	out += ufmt.Sprintf("[[EDIT]](%s) - [[DELETE]](%s)", txlink.Call("EditConfig", "id", conf.id.String()), txlink.Call("RemoveConfig", "id", conf.id.String()))
+
+	return out
+}

From d7e18a22525f89fd29c3ded753b059b113a082b6 Mon Sep 17 00:00:00 2001
From: 6h057 <15034695+omarsy@users.noreply.github.com>
Date: Tue, 18 Feb 2025 20:43:00 +0100
Subject: [PATCH 23/47] fix(gnovm): no ValuePath depths should exceed uint8/2
 (#3753)

closes: #1781
---
 gnovm/pkg/gnolang/nodes.go      |  20 +-
 gnovm/pkg/gnolang/op_types.go   |  18 +-
 gnovm/pkg/gnolang/preprocess.go |   7 +-
 gnovm/pkg/gnolang/types.go      |   7 +-
 gnovm/pkg/gnolang/values.go     |  14 +-
 gnovm/tests/files/block1.gno    | 669 ++++++++++++++++++++++++++++++++
 gnovm/tests/files/block2.gno    | 550 ++++++++++++++++++++++++++
 7 files changed, 1262 insertions(+), 23 deletions(-)
 create mode 100644 gnovm/tests/files/block1.gno
 create mode 100644 gnovm/tests/files/block2.gno

diff --git a/gnovm/pkg/gnolang/nodes.go b/gnovm/pkg/gnolang/nodes.go
index 0e8f701dea8..b2e646cf697 100644
--- a/gnovm/pkg/gnolang/nodes.go
+++ b/gnovm/pkg/gnolang/nodes.go
@@ -2119,12 +2119,28 @@ func (x *PackageNode) SetBody(b Body) {
 // such as those for *DeclaredType methods or *StructType fields,
 // see tests/selector_test.go.
 type ValuePath struct {
-	Type  VPType // see VPType* consts.
+	Type VPType // see VPType* consts.
+	// Warning: Use SetDepth() to set Depth.
 	Depth uint8  // see doc for ValuePath.
 	Index uint16 // index of value, field, or method.
 	Name  Name   // name of value, field, or method.
 }
 
+// Maximum depth of a ValuePath.
+const MaxValuePathDepth = 127
+
+func (vp ValuePath) validateDepth() {
+	if vp.Depth > MaxValuePathDepth {
+		panic(fmt.Sprintf("exceeded maximum %s depth (%d)", vp.Type, MaxValuePathDepth))
+	}
+}
+
+func (vp *ValuePath) SetDepth(d uint8) {
+	vp.Depth = d
+
+	vp.validateDepth()
+}
+
 type VPType uint8
 
 const (
@@ -2203,6 +2219,8 @@ func NewValuePathNative(n Name) ValuePath {
 }
 
 func (vp ValuePath) Validate() {
+	vp.validateDepth()
+
 	switch vp.Type {
 	case VPUverse:
 		if vp.Depth != 0 {
diff --git a/gnovm/pkg/gnolang/op_types.go b/gnovm/pkg/gnolang/op_types.go
index e3003066037..640ddc7d9a9 100644
--- a/gnovm/pkg/gnolang/op_types.go
+++ b/gnovm/pkg/gnolang/op_types.go
@@ -239,7 +239,7 @@ func (m *Machine) doOpStaticTypeOf() {
 				dxt = xt
 			case 1:
 				dxt = baseOf(xt)
-				path.Depth = 0
+				path.SetDepth(0)
 			default:
 				panic("should not happen")
 			}
@@ -247,16 +247,16 @@ func (m *Machine) doOpStaticTypeOf() {
 			switch path.Depth {
 			case 0:
 				dxt = xt.Elem()
-				path.Depth = 0
+				path.SetDepth(0)
 			case 1:
 				dxt = xt.Elem()
-				path.Depth = 0
+				path.SetDepth(0)
 			case 2:
 				dxt = baseOf(xt.Elem())
-				path.Depth = 0
+				path.SetDepth(0)
 			case 3:
 				dxt = baseOf(xt.Elem())
-				path.Depth = 0
+				path.SetDepth(0)
 			default:
 				panic("should not happen")
 			}
@@ -265,19 +265,19 @@ func (m *Machine) doOpStaticTypeOf() {
 			case 0:
 				dxt = xt.Elem()
 				path.Type = VPField
-				path.Depth = 0
+				path.SetDepth(0)
 			case 1:
 				dxt = xt.Elem()
 				path.Type = VPField
-				path.Depth = 0
+				path.SetDepth(0)
 			case 2:
 				dxt = baseOf(xt.Elem())
 				path.Type = VPField
-				path.Depth = 0
+				path.SetDepth(0)
 			case 3:
 				dxt = baseOf(xt.Elem())
 				path.Type = VPField
-				path.Depth = 0
+				path.SetDepth(0)
 			default:
 				panic("should not happen")
 			}
diff --git a/gnovm/pkg/gnolang/preprocess.go b/gnovm/pkg/gnolang/preprocess.go
index 7a23bb35cdd..e30f02b1b87 100644
--- a/gnovm/pkg/gnolang/preprocess.go
+++ b/gnovm/pkg/gnolang/preprocess.go
@@ -2899,7 +2899,7 @@ func findLoopUses1(ctx BlockNode, bn BlockNode) {
 							idx := addHeapCapture(dbn, fle, n.Name)
 							// adjust NameExpr type.
 							n.Type = NameExprTypeHeapUse
-							n.Path.Depth = uint8(depth)
+							n.Path.SetDepth(uint8(depth))
 							n.Path.Index = idx
 						} else {
 							if ftype == TRANS_REF_X {
@@ -2995,7 +2995,7 @@ func addHeapCapture(dbn BlockNode, fle *FuncLitExpr, name Name) (idx uint16) {
 
 	// add name to fle.HeapCaptures.
 	vp := fle.GetPathForName(nil, name)
-	vp.Depth -= 1 // minus 1 for fle itself.
+	vp.SetDepth(vp.Depth - 1) // minus 1 for fle itself.
 	ne := NameExpr{
 		Path: vp,
 		Name: name,
@@ -5079,7 +5079,8 @@ func fillNameExprPath(last BlockNode, nx *NameExpr, isDefineLHS bool) {
 					break
 				}
 			}
-			path.Depth += uint8(i)
+			path.SetDepth(path.Depth + uint8(i))
+			path.Validate()
 			nx.Path = path
 			return
 		}
diff --git a/gnovm/pkg/gnolang/types.go b/gnovm/pkg/gnolang/types.go
index 9a0c4fdabf9..259c3e0a5ae 100644
--- a/gnovm/pkg/gnolang/types.go
+++ b/gnovm/pkg/gnolang/types.go
@@ -684,7 +684,7 @@ func (pt *PointerType) FindEmbeddedFieldType(callerPath string, n Name, m map[Ty
 					case 1:
 						// *DeclaredType > *StructType.Field has depth 1 (& type VPField).
 						// *PointerType > *DeclaredType > *StructType.Field has depth 2.
-						trail[0].Depth = 2
+						trail[0].SetDepth(2)
 						/*
 							// If trail[-1].Type == VPPtrMethod, set VPDerefPtrMethod.
 							if len(trail) > 1 && trail[1].Type == VPPtrMethod {
@@ -1588,7 +1588,7 @@ func (dt *DeclaredType) GetPathForName(n Name) ValuePath {
 	}
 	// Otherwise it is underlying.
 	path := dt.Base.(ValuePather).GetPathForName(n)
-	path.Depth += 1
+	path.SetDepth(path.Depth + 1)
 	return path
 }
 
@@ -1658,7 +1658,8 @@ func (dt *DeclaredType) FindEmbeddedFieldType(callerPath string, n Name, m map[T
 				panic("should not happen")
 			}
 		}
-		trail[0].Depth += 1
+
+		trail[0].SetDepth(trail[0].Depth + 1)
 		return trail, hasPtr, rcvr, ft, false
 	default:
 		panic("should not happen")
diff --git a/gnovm/pkg/gnolang/values.go b/gnovm/pkg/gnolang/values.go
index 351e99ce469..53919845de8 100644
--- a/gnovm/pkg/gnolang/values.go
+++ b/gnovm/pkg/gnolang/values.go
@@ -1665,7 +1665,7 @@ func (tv *TypedValue) GetPointerToFromTV(alloc *Allocator, store Store, path Val
 			dtv = tv
 		case 1:
 			dtv = tv
-			path.Depth = 0
+			path.SetDepth(0)
 		default:
 			panic("should not happen")
 		}
@@ -1677,15 +1677,15 @@ func (tv *TypedValue) GetPointerToFromTV(alloc *Allocator, store Store, path Val
 		case 1:
 			dtv = tv.V.(PointerValue).TV
 			isPtr = true
-			path.Depth = 0
+			path.SetDepth(0)
 		case 2:
 			dtv = tv.V.(PointerValue).TV
 			isPtr = true
-			path.Depth = 0
+			path.SetDepth(0)
 		case 3:
 			dtv = tv.V.(PointerValue).TV
 			isPtr = true
-			path.Depth = 0
+			path.SetDepth(0)
 		default:
 			panic("should not happen")
 		}
@@ -1699,7 +1699,7 @@ func (tv *TypedValue) GetPointerToFromTV(alloc *Allocator, store Store, path Val
 			dtv = tv.V.(PointerValue).TV
 			isPtr = true
 			path.Type = VPField
-			path.Depth = 0
+			path.SetDepth(0)
 		case 2:
 			if tv.V == nil {
 				panic(&Exception{Value: typedString("nil pointer dereference")})
@@ -1707,12 +1707,12 @@ func (tv *TypedValue) GetPointerToFromTV(alloc *Allocator, store Store, path Val
 			dtv = tv.V.(PointerValue).TV
 			isPtr = true
 			path.Type = VPField
-			path.Depth = 0
+			path.SetDepth(0)
 		case 3:
 			dtv = tv.V.(PointerValue).TV
 			isPtr = true
 			path.Type = VPField
-			path.Depth = 0
+			path.SetDepth(0)
 		default:
 			panic("should not happen")
 		}
diff --git a/gnovm/tests/files/block1.gno b/gnovm/tests/files/block1.gno
new file mode 100644
index 00000000000..6eb2403c163
--- /dev/null
+++ b/gnovm/tests/files/block1.gno
@@ -0,0 +1,669 @@
+// You can edit this code!
+// Click here and start typing.
+package main
+
+var v int = 1
+
+func main() {
+	v++
+	if v >= 1 {
+		v++
+		println(v)
+		if v >= 1 {
+			v++
+			println(v)
+			if v >= 1 {
+				v++
+				println(v)
+				if v >= 1 {
+					v++
+					println(v)
+					if v >= 1 {
+						v++
+						println(v)
+
+						if v >= 1 {
+							v++
+							println(v)
+							if v >= 1 {
+								v++
+								println(v)
+								if v >= 1 {
+									v++
+									println(v)
+									if v >= 1 {
+										v++
+										println(v)
+
+										if v >= 1 {
+											v++
+											println(v)
+											if v >= 1 {
+												v++
+												println(v)
+
+												if v >= 1 {
+													v++
+													println(v)
+													if v >= 1 {
+														v++
+														println(v)
+
+														if v >= 1 {
+															v++
+															println(v)
+															if v >= 1 {
+																v++
+																println(v)
+
+																if v >= 1 {
+																	v++
+																	println(v)
+																	if v >= 1 {
+																		v++
+																		println(v)
+																		if v >= 1 {
+																			v++
+																			println(v)
+																			if v >= 1 {
+																				v++
+																				println(v)
+																				if v >= 1 {
+																					v++
+																					println(v)
+																					if v >= 1 {
+																						v++
+																						println(v)
+
+																						if v >= 1 {
+																							v++
+																							println(v)
+																							if v >= 1 {
+																								v++
+																								println(v)
+																								if v >= 1 {
+																									v++
+																									println(v)
+																									if v >= 1 {
+																										v++
+																										println(v)
+
+																										if v >= 1 {
+																											v++
+																											println(v)
+																											if v >= 1 {
+																												v++
+																												println(v)
+
+																												if v >= 1 {
+																													v++
+																													println(v)
+																													if v >= 1 {
+																														v++
+																														println(v)
+
+																														if v >= 1 {
+																															v++
+																															println(v)
+																															if v >= 1 {
+																																v++
+																																println(v)
+
+																																if v >= 1 {
+																																	v++
+																																	println(v)
+																																	if v >= 1 {
+																																		v++
+																																		println(v)
+																																		if v >= 1 {
+																																			v++
+																																			println(v)
+																																			if v >= 1 {
+																																				v++
+																																				println(v)
+																																				if v >= 1 {
+																																					v++
+																																					println(v)
+																																					if v >= 1 {
+																																						v++
+																																						println(v)
+
+																																						if v >= 1 {
+																																							v++
+																																							println(v)
+																																							if v >= 1 {
+																																								v++
+																																								println(v)
+																																								if v >= 1 {
+																																									v++
+																																									println(v)
+																																									if v >= 1 {
+																																										v++
+																																										println(v)
+
+																																										if v >= 1 {
+																																											v++
+																																											println(v)
+																																											if v >= 1 {
+																																												v++
+																																												println(v)
+
+																																												if v >= 1 {
+																																													v++
+																																													println(v)
+																																													if v >= 1 {
+																																														v++
+																																														println(v)
+
+																																														if v >= 1 {
+																																															v++
+																																															println(v)
+																																															if v >= 1 {
+																																																v++
+																																																println(v)
+
+																																																if v >= 1 {
+																																																	v++
+																																																	println(v)
+																																																	if v >= 1 {
+																																																		v++
+																																																		println(v)
+																																																		if v >= 1 {
+																																																			v++
+																																																			println(v)
+																																																			if v >= 1 {
+																																																				v++
+																																																				println(v)
+																																																				if v >= 1 {
+																																																					v++
+																																																					println(v)
+																																																					if v >= 1 {
+																																																						v++
+																																																						println(v)
+
+																																																						if v >= 1 {
+																																																							v++
+																																																							println(v)
+																																																							if v >= 1 {
+																																																								v++
+																																																								println(v)
+																																																								if v >= 1 {
+																																																									v++
+																																																									println(v)
+																																																									if v >= 1 {
+																																																										v++
+																																																										println(v)
+
+																																																										if v >= 1 {
+																																																											v++
+																																																											println(v)
+																																																											if v >= 1 {
+																																																												v++
+																																																												println(v)
+
+																																																												if v >= 1 {
+																																																													v++
+																																																													println(v)
+																																																													if v >= 1 {
+																																																														v++
+																																																														println(v)
+
+																																																														if v >= 1 {
+																																																															v++
+																																																															println(v)
+																																																															if v >= 1 {
+																																																																v++
+																																																																println(v)
+
+																																																																if v >= 1 {
+																																																																	v++
+																																																																	println(v)
+																																																																	if v >= 1 {
+																																																																		v++
+																																																																		println(v)
+																																																																		if v >= 1 {
+																																																																			v++
+																																																																			println(v)
+																																																																			if v >= 1 {
+																																																																				v++
+																																																																				println(v)
+																																																																				if v >= 1 {
+																																																																					v++
+																																																																					println(v)
+																																																																					if v >= 1 {
+																																																																						v++
+																																																																						println(v)
+
+																																																																						if v >= 1 {
+																																																																							v++
+																																																																							println(v)
+																																																																							if v >= 1 {
+																																																																								v++
+																																																																								println(v)
+																																																																								if v >= 1 {
+																																																																									v++
+																																																																									println(v)
+																																																																									if v >= 1 {
+																																																																										v++
+																																																																										println(v)
+
+																																																																										if v >= 1 {
+																																																																											v++
+																																																																											println(v)
+																																																																											if v >= 1 {
+																																																																												v++
+																																																																												println(v)
+
+																																																																												if v >= 1 {
+																																																																													v++
+																																																																													println(v)
+																																																																													if v >= 1 {
+																																																																														v++
+																																																																														println(v)
+
+																																																																														if v >= 1 {
+																																																																															v++
+																																																																															println(v)
+																																																																															if v >= 1 {
+																																																																																v++
+																																																																																println(v)
+
+																																																																																if v >= 1 {
+																																																																																	v++
+																																																																																	println(v)
+																																																																																	if v >= 1 {
+																																																																																		v++
+																																																																																		println(v)
+																																																																																		if v >= 1 {
+																																																																																			v++
+																																																																																			println(v)
+																																																																																			if v >= 1 {
+																																																																																				v++
+																																																																																				println(v)
+																																																																																				if v >= 1 {
+																																																																																					v++
+																																																																																					println(v)
+																																																																																					if v >= 1 {
+																																																																																						v++
+																																																																																						println(v)
+
+																																																																																						if v >= 1 {
+																																																																																							v++
+																																																																																							println(v)
+																																																																																							if v >= 1 {
+																																																																																								v++
+																																																																																								println(v)
+																																																																																								if v >= 1 {
+																																																																																									v++
+																																																																																									println(v)
+																																																																																									if v >= 1 {
+																																																																																										v++
+																																																																																										println(v)
+
+																																																																																										if v >= 1 {
+																																																																																											v++
+																																																																																											println(v)
+																																																																																											if v >= 1 {
+																																																																																												v++
+																																																																																												println(v)
+
+																																																																																												if v >= 1 {
+																																																																																													v++
+																																																																																													println(v)
+																																																																																													if v >= 1 {
+																																																																																														v++
+																																																																																														println(v)
+
+																																																																																														if v >= 1 {
+																																																																																															v++
+																																																																																															println(v)
+																																																																																															if v >= 1 {
+																																																																																																v++
+																																																																																																println(v)
+
+																																																																																																if v >= 1 {
+																																																																																																	v++
+																																																																																																	println(v)
+																																																																																																	if v >= 1 {
+																																																																																																		v++
+																																																																																																		println(v)
+																																																																																																		if v >= 1 {
+																																																																																																			v++
+																																																																																																			println(v)
+																																																																																																			if v >= 1 {
+																																																																																																				v++
+																																																																																																				println(v)
+																																																																																																				if v >= 1 {
+																																																																																																					v++
+																																																																																																					println(v)
+																																																																																																					if v >= 1 {
+																																																																																																						v++
+																																																																																																						println(v)
+
+																																																																																																						if v >= 1 {
+																																																																																																							v++
+																																																																																																							println(v)
+																																																																																																							if v >= 1 {
+																																																																																																								v++
+																																																																																																								println(v)
+																																																																																																								if v >= 1 {
+																																																																																																									v++
+																																																																																																									println(v)
+																																																																																																									if v >= 1 {
+																																																																																																										v++
+																																																																																																										println(v)
+
+																																																																																																										if v >= 1 {
+																																																																																																											v++
+																																																																																																											println(v)
+																																																																																																											if v >= 1 {
+																																																																																																												v++
+																																																																																																												println(v)
+
+																																																																																																												if v >= 1 {
+																																																																																																													v++
+																																																																																																													println(v)
+																																																																																																													if v >= 1 {
+																																																																																																														v++
+																																																																																																														println(v)
+
+																																																																																																														if v >= 1 {
+																																																																																																															v++
+																																																																																																															println(v)
+																																																																																																															if v >= 1 {
+																																																																																																																v++
+																																																																																																																println(v)
+
+																																																																																																																if v >= 1 {
+																																																																																																																	v++
+																																																																																																																	println(v)
+																																																																																																																	if v >= 1 {
+																																																																																																																		v++
+																																																																																																																		println(v)
+																																																																																																																		if v >= 1 {
+																																																																																																																			v++
+																																																																																																																			println(v)
+																																																																																																																			if v >= 1 {
+																																																																																																																				v++
+																																																																																																																				println(v)
+																																																																																																																				if v >= 1 {
+																																																																																																																					v++
+																																																																																																																					println(v)
+																																																																																																																					if v >= 1 {
+																																																																																																																						v++
+																																																																																																																						println(v)
+
+																																																																																																																						if v >= 1 {
+																																																																																																																							v++
+																																																																																																																							println(v)
+																																																																																																																							if v >= 1 {
+																																																																																																																								v++
+																																																																																																																								println(v)
+																																																																																																																								if v >= 1 {
+																																																																																																																									v++
+																																																																																																																									println(v)
+																																																																																																																									if v >= 1 {
+																																																																																																																										v++
+																																																																																																																										println(v)
+
+																																																																																																																										if v >= 1 {
+																																																																																																																											v++
+																																																																																																																											println(v)
+																																																																																																																											if v >= 1 {
+																																																																																																																												v++
+																																																																																																																												println(v)
+
+																																																																																																																												if v >= 1 {
+																																																																																																																													v++
+																																																																																																																													println(v)
+																																																																																																																												}
+																																																																																																																											}
+																																																																																																																										}
+																																																																																																																									}
+																																																																																																																								}
+																																																																																																																							}
+																																																																																																																						}
+																																																																																																																					}
+																																																																																																																				}
+																																																																																																																			}
+																																																																																																																		}
+																																																																																																																	}
+																																																																																																																}
+																																																																																																															}
+																																																																																																														}
+																																																																																																													}
+																																																																																																												}
+																																																																																																											}
+																																																																																																										}
+																																																																																																									}
+																																																																																																								}
+																																																																																																							}
+																																																																																																						}
+																																																																																																					}
+																																																																																																				}
+																																																																																																			}
+																																																																																																		}
+																																																																																																	}
+																																																																																																}
+																																																																																															}
+																																																																																														}
+																																																																																													}
+																																																																																												}
+																																																																																											}
+																																																																																										}
+																																																																																									}
+																																																																																								}
+																																																																																							}
+																																																																																						}
+																																																																																					}
+																																																																																				}
+																																																																																			}
+																																																																																		}
+																																																																																	}
+																																																																																}
+																																																																															}
+																																																																														}
+																																																																													}
+																																																																												}
+																																																																											}
+																																																																										}
+																																																																									}
+																																																																								}
+																																																																							}
+																																																																						}
+																																																																					}
+																																																																				}
+																																																																			}
+																																																																		}
+																																																																	}
+																																																																}
+																																																															}
+																																																														}
+																																																													}
+																																																												}
+																																																											}
+																																																										}
+																																																									}
+																																																								}
+																																																							}
+																																																						}
+																																																					}
+																																																				}
+																																																			}
+																																																		}
+																																																	}
+																																																}
+																																															}
+																																														}
+																																													}
+																																												}
+																																											}
+																																										}
+																																									}
+																																								}
+																																							}
+																																						}
+																																					}
+																																				}
+																																			}
+																																		}
+																																	}
+																																}
+																															}
+																														}
+																													}
+																												}
+																											}
+																										}
+																									}
+																								}
+																							}
+																						}
+																					}
+																				}
+																			}
+																		}
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+// Output:
+// 3
+// 4
+// 5
+// 6
+// 7
+// 8
+// 9
+// 10
+// 11
+// 12
+// 13
+// 14
+// 15
+// 16
+// 17
+// 18
+// 19
+// 20
+// 21
+// 22
+// 23
+// 24
+// 25
+// 26
+// 27
+// 28
+// 29
+// 30
+// 31
+// 32
+// 33
+// 34
+// 35
+// 36
+// 37
+// 38
+// 39
+// 40
+// 41
+// 42
+// 43
+// 44
+// 45
+// 46
+// 47
+// 48
+// 49
+// 50
+// 51
+// 52
+// 53
+// 54
+// 55
+// 56
+// 57
+// 58
+// 59
+// 60
+// 61
+// 62
+// 63
+// 64
+// 65
+// 66
+// 67
+// 68
+// 69
+// 70
+// 71
+// 72
+// 73
+// 74
+// 75
+// 76
+// 77
+// 78
+// 79
+// 80
+// 81
+// 82
+// 83
+// 84
+// 85
+// 86
+// 87
+// 88
+// 89
+// 90
+// 91
+// 92
+// 93
+// 94
+// 95
+// 96
+// 97
+// 98
+// 99
+// 100
+// 101
+// 102
+// 103
+// 104
+// 105
+// 106
+// 107
+// 108
+// 109
+// 110
+// 111
+// 112
+// 113
+// 114
+// 115
+// 116
+// 117
+// 118
+// 119
+// 120
+// 121
+// 122
+// 123
+// 124
+// 125
+// 126
diff --git a/gnovm/tests/files/block2.gno b/gnovm/tests/files/block2.gno
new file mode 100644
index 00000000000..6738c76bf40
--- /dev/null
+++ b/gnovm/tests/files/block2.gno
@@ -0,0 +1,550 @@
+// You can edit this code!
+// Click here and start typing.
+package main
+
+var v int = 1
+
+func main() {
+	v++
+	if v >= 1 {
+		v++
+		println(v)
+		if v >= 1 {
+			v++
+			println(v)
+			if v >= 1 {
+				v++
+				println(v)
+				if v >= 1 {
+					v++
+					println(v)
+					if v >= 1 {
+						v++
+						println(v)
+
+						if v >= 1 {
+							v++
+							println(v)
+							if v >= 1 {
+								v++
+								println(v)
+								if v >= 1 {
+									v++
+									println(v)
+									if v >= 1 {
+										v++
+										println(v)
+
+										if v >= 1 {
+											v++
+											println(v)
+											if v >= 1 {
+												v++
+												println(v)
+
+												if v >= 1 {
+													v++
+													println(v)
+													if v >= 1 {
+														v++
+														println(v)
+
+														if v >= 1 {
+															v++
+															println(v)
+															if v >= 1 {
+																v++
+																println(v)
+
+																if v >= 1 {
+																	v++
+																	println(v)
+																	if v >= 1 {
+																		v++
+																		println(v)
+																		if v >= 1 {
+																			v++
+																			println(v)
+																			if v >= 1 {
+																				v++
+																				println(v)
+																				if v >= 1 {
+																					v++
+																					println(v)
+																					if v >= 1 {
+																						v++
+																						println(v)
+
+																						if v >= 1 {
+																							v++
+																							println(v)
+																							if v >= 1 {
+																								v++
+																								println(v)
+																								if v >= 1 {
+																									v++
+																									println(v)
+																									if v >= 1 {
+																										v++
+																										println(v)
+
+																										if v >= 1 {
+																											v++
+																											println(v)
+																											if v >= 1 {
+																												v++
+																												println(v)
+
+																												if v >= 1 {
+																													v++
+																													println(v)
+																													if v >= 1 {
+																														v++
+																														println(v)
+
+																														if v >= 1 {
+																															v++
+																															println(v)
+																															if v >= 1 {
+																																v++
+																																println(v)
+
+																																if v >= 1 {
+																																	v++
+																																	println(v)
+																																	if v >= 1 {
+																																		v++
+																																		println(v)
+																																		if v >= 1 {
+																																			v++
+																																			println(v)
+																																			if v >= 1 {
+																																				v++
+																																				println(v)
+																																				if v >= 1 {
+																																					v++
+																																					println(v)
+																																					if v >= 1 {
+																																						v++
+																																						println(v)
+
+																																						if v >= 1 {
+																																							v++
+																																							println(v)
+																																							if v >= 1 {
+																																								v++
+																																								println(v)
+																																								if v >= 1 {
+																																									v++
+																																									println(v)
+																																									if v >= 1 {
+																																										v++
+																																										println(v)
+
+																																										if v >= 1 {
+																																											v++
+																																											println(v)
+																																											if v >= 1 {
+																																												v++
+																																												println(v)
+
+																																												if v >= 1 {
+																																													v++
+																																													println(v)
+																																													if v >= 1 {
+																																														v++
+																																														println(v)
+
+																																														if v >= 1 {
+																																															v++
+																																															println(v)
+																																															if v >= 1 {
+																																																v++
+																																																println(v)
+
+																																																if v >= 1 {
+																																																	v++
+																																																	println(v)
+																																																	if v >= 1 {
+																																																		v++
+																																																		println(v)
+																																																		if v >= 1 {
+																																																			v++
+																																																			println(v)
+																																																			if v >= 1 {
+																																																				v++
+																																																				println(v)
+																																																				if v >= 1 {
+																																																					v++
+																																																					println(v)
+																																																					if v >= 1 {
+																																																						v++
+																																																						println(v)
+
+																																																						if v >= 1 {
+																																																							v++
+																																																							println(v)
+																																																							if v >= 1 {
+																																																								v++
+																																																								println(v)
+																																																								if v >= 1 {
+																																																									v++
+																																																									println(v)
+																																																									if v >= 1 {
+																																																										v++
+																																																										println(v)
+
+																																																										if v >= 1 {
+																																																											v++
+																																																											println(v)
+																																																											if v >= 1 {
+																																																												v++
+																																																												println(v)
+
+																																																												if v >= 1 {
+																																																													v++
+																																																													println(v)
+																																																													if v >= 1 {
+																																																														v++
+																																																														println(v)
+
+																																																														if v >= 1 {
+																																																															v++
+																																																															println(v)
+																																																															if v >= 1 {
+																																																																v++
+																																																																println(v)
+
+																																																																if v >= 1 {
+																																																																	v++
+																																																																	println(v)
+																																																																	if v >= 1 {
+																																																																		v++
+																																																																		println(v)
+																																																																		if v >= 1 {
+																																																																			v++
+																																																																			println(v)
+																																																																			if v >= 1 {
+																																																																				v++
+																																																																				println(v)
+																																																																				if v >= 1 {
+																																																																					v++
+																																																																					println(v)
+																																																																					if v >= 1 {
+																																																																						v++
+																																																																						println(v)
+
+																																																																						if v >= 1 {
+																																																																							v++
+																																																																							println(v)
+																																																																							if v >= 1 {
+																																																																								v++
+																																																																								println(v)
+																																																																								if v >= 1 {
+																																																																									v++
+																																																																									println(v)
+																																																																									if v >= 1 {
+																																																																										v++
+																																																																										println(v)
+
+																																																																										if v >= 1 {
+																																																																											v++
+																																																																											println(v)
+																																																																											if v >= 1 {
+																																																																												v++
+																																																																												println(v)
+
+																																																																												if v >= 1 {
+																																																																													v++
+																																																																													println(v)
+																																																																													if v >= 1 {
+																																																																														v++
+																																																																														println(v)
+
+																																																																														if v >= 1 {
+																																																																															v++
+																																																																															println(v)
+																																																																															if v >= 1 {
+																																																																																v++
+																																																																																println(v)
+
+																																																																																if v >= 1 {
+																																																																																	v++
+																																																																																	println(v)
+																																																																																	if v >= 1 {
+																																																																																		v++
+																																																																																		println(v)
+																																																																																		if v >= 1 {
+																																																																																			v++
+																																																																																			println(v)
+																																																																																			if v >= 1 {
+																																																																																				v++
+																																																																																				println(v)
+																																																																																				if v >= 1 {
+																																																																																					v++
+																																																																																					println(v)
+																																																																																					if v >= 1 {
+																																																																																						v++
+																																																																																						println(v)
+
+																																																																																						if v >= 1 {
+																																																																																							v++
+																																																																																							println(v)
+																																																																																							if v >= 1 {
+																																																																																								v++
+																																																																																								println(v)
+																																																																																								if v >= 1 {
+																																																																																									v++
+																																																																																									println(v)
+																																																																																									if v >= 1 {
+																																																																																										v++
+																																																																																										println(v)
+
+																																																																																										if v >= 1 {
+																																																																																											v++
+																																																																																											println(v)
+																																																																																											if v >= 1 {
+																																																																																												v++
+																																																																																												println(v)
+
+																																																																																												if v >= 1 {
+																																																																																													v++
+																																																																																													println(v)
+																																																																																													if v >= 1 {
+																																																																																														v++
+																																																																																														println(v)
+
+																																																																																														if v >= 1 {
+																																																																																															v++
+																																																																																															println(v)
+																																																																																															if v >= 1 {
+																																																																																																v++
+																																																																																																println(v)
+
+																																																																																																if v >= 1 {
+																																																																																																	v++
+																																																																																																	println(v)
+																																																																																																	if v >= 1 {
+																																																																																																		v++
+																																																																																																		println(v)
+																																																																																																		if v >= 1 {
+																																																																																																			v++
+																																																																																																			println(v)
+																																																																																																			if v >= 1 {
+																																																																																																				v++
+																																																																																																				println(v)
+																																																																																																				if v >= 1 {
+																																																																																																					v++
+																																																																																																					println(v)
+																																																																																																					if v >= 1 {
+																																																																																																						v++
+																																																																																																						println(v)
+
+																																																																																																						if v >= 1 {
+																																																																																																							v++
+																																																																																																							println(v)
+																																																																																																							if v >= 1 {
+																																																																																																								v++
+																																																																																																								println(v)
+																																																																																																								if v >= 1 {
+																																																																																																									v++
+																																																																																																									println(v)
+																																																																																																									if v >= 1 {
+																																																																																																										v++
+																																																																																																										println(v)
+
+																																																																																																										if v >= 1 {
+																																																																																																											v++
+																																																																																																											println(v)
+																																																																																																											if v >= 1 {
+																																																																																																												v++
+																																																																																																												println(v)
+
+																																																																																																												if v >= 1 {
+																																																																																																													v++
+																																																																																																													println(v)
+																																																																																																													if v >= 1 {
+																																																																																																														v++
+																																																																																																														println(v)
+
+																																																																																																														if v >= 1 {
+																																																																																																															v++
+																																																																																																															println(v)
+																																																																																																															if v >= 1 {
+																																																																																																																v++
+																																																																																																																println(v)
+
+																																																																																																																if v >= 1 {
+																																																																																																																	v++
+																																																																																																																	println(v)
+																																																																																																																	if v >= 1 {
+																																																																																																																		v++
+																																																																																																																		println(v)
+																																																																																																																		if v >= 1 {
+																																																																																																																			v++
+																																																																																																																			println(v)
+																																																																																																																			if v >= 1 {
+																																																																																																																				v++
+																																																																																																																				println(v)
+																																																																																																																				if v >= 1 {
+																																																																																																																					v++
+																																																																																																																					println(v)
+																																																																																																																					if v >= 1 {
+																																																																																																																						v++
+																																																																																																																						println(v)
+
+																																																																																																																						if v >= 1 {
+																																																																																																																							v++
+																																																																																																																							println(v)
+																																																																																																																							if v >= 1 {
+																																																																																																																								v++
+																																																																																																																								println(v)
+																																																																																																																								if v >= 1 {
+																																																																																																																									v++
+																																																																																																																									println(v)
+																																																																																																																									if v >= 1 {
+																																																																																																																										v++
+																																																																																																																										println(v)
+
+																																																																																																																										if v >= 1 {
+																																																																																																																											v++
+																																																																																																																											println(v)
+																																																																																																																											if v >= 1 {
+																																																																																																																												v++
+																																																																																																																												println(v)
+
+																																																																																																																												if v >= 1 {
+																																																																																																																													v++
+																																																																																																																													println(v)
+																																																																																																																													if v >= 1 {
+																																																																																																																														v++
+																																																																																																																														println(v)
+																																																																																																																													}
+																																																																																																																												}
+																																																																																																																											}
+																																																																																																																										}
+																																																																																																																									}
+																																																																																																																								}
+																																																																																																																							}
+																																																																																																																						}
+																																																																																																																					}
+																																																																																																																				}
+																																																																																																																			}
+																																																																																																																		}
+																																																																																																																	}
+																																																																																																																}
+																																																																																																															}
+																																																																																																														}
+																																																																																																													}
+																																																																																																												}
+																																																																																																											}
+																																																																																																										}
+																																																																																																									}
+																																																																																																								}
+																																																																																																							}
+																																																																																																						}
+																																																																																																					}
+																																																																																																				}
+																																																																																																			}
+																																																																																																		}
+																																																																																																	}
+																																																																																																}
+																																																																																															}
+																																																																																														}
+																																																																																													}
+																																																																																												}
+																																																																																											}
+																																																																																										}
+																																																																																									}
+																																																																																								}
+																																																																																							}
+																																																																																						}
+																																																																																					}
+																																																																																				}
+																																																																																			}
+																																																																																		}
+																																																																																	}
+																																																																																}
+																																																																															}
+																																																																														}
+																																																																													}
+																																																																												}
+																																																																											}
+																																																																										}
+																																																																									}
+																																																																								}
+																																																																							}
+																																																																						}
+																																																																					}
+																																																																				}
+																																																																			}
+																																																																		}
+																																																																	}
+																																																																}
+																																																															}
+																																																														}
+																																																													}
+																																																												}
+																																																											}
+																																																										}
+																																																									}
+																																																								}
+																																																							}
+																																																						}
+																																																					}
+																																																				}
+																																																			}
+																																																		}
+																																																	}
+																																																}
+																																															}
+																																														}
+																																													}
+																																												}
+																																											}
+																																										}
+																																									}
+																																								}
+																																							}
+																																						}
+																																					}
+																																				}
+																																			}
+																																		}
+																																	}
+																																}
+																															}
+																														}
+																													}
+																												}
+																											}
+																										}
+																									}
+																								}
+																							}
+																						}
+																					}
+																				}
+																			}
+																		}
+																	}
+																}
+															}
+														}
+													}
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+// Error:
+// main/files/block2.gno:419:129: exceeded maximum VPBlock depth (127)

From ca7aac43ab5d0fdcf93c4edcaf754cd3add3caa7 Mon Sep 17 00:00:00 2001
From: Sergio Maria Matone <sergio.matone@tendermint.com>
Date: Wed, 19 Feb 2025 11:15:55 +0100
Subject: [PATCH 24/47] chore: introducing Gnodev official Docker image (#3784)

Adding support for Gnodev Docker image in Goreleaser
---
 .github/goreleaser.yaml | 58 +++++++++++++++++++++++++++++++++++++++++
 Dockerfile.release      | 11 ++++++++
 2 files changed, 69 insertions(+)

diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
index 95f7fdaab4c..4ec29d76e62 100644
--- a/.github/goreleaser.yaml
+++ b/.github/goreleaser.yaml
@@ -67,6 +67,20 @@ builds:
     goarch:
       - amd64
       - arm64
+  - id: gnodev
+    dir: ./contribs/gnodev/cmd/gnodev
+    binary: gnodev
+    ldflags:
+      # using hardcoded ldflag
+      - -X main.build="-X github.com/gnolang/gno/gnovm/pkg/gnoenv._GNOROOT=/gnoroot"
+    env:
+      - CGO_ENABLED=0
+    goos:
+      - linux
+      - darwin
+    goarch:
+      - amd64
+      - arm64
   # Gno Contribs
   # NOTE: Contribs binary will be added in a single docker image below: gnocontribs
   - id: gnobro
@@ -307,6 +321,40 @@ dockers:
     ids:
       - gnofaucet
 
+  # gnodev
+  - use: buildx
+    dockerfile: Dockerfile.release
+    goos: linux
+    goarch: amd64
+    image_templates:
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnodev:{{ .Version }}-amd64"
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnodev:{{ .Env.TAG_VERSION }}-amd64"
+    build_flag_templates:
+      - "--target=gnodev"
+      - "--platform=linux/amd64"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}/gnodev"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+    ids:
+      - gnodev
+  - use: buildx
+    dockerfile: Dockerfile.release
+    goos: linux
+    goarch: arm64
+    image_templates:
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnodev:{{ .Version }}-arm64v8"
+      - "ghcr.io/gnolang/{{ .ProjectName }}/gnodev:{{ .Env.TAG_VERSION }}-arm64v8"
+    build_flag_templates:
+      - "--target=gnodev"
+      - "--platform=linux/arm64/v8"
+      - "--label=org.opencontainers.image.created={{.Date}}"
+      - "--label=org.opencontainers.image.title={{.ProjectName}}/gnodev"
+      - "--label=org.opencontainers.image.revision={{.FullCommit}}"
+      - "--label=org.opencontainers.image.version={{.Version}}"
+    ids:
+      - gnodev
+
   # gnocontribs
   - use: buildx
     dockerfile: Dockerfile.release
@@ -406,6 +454,16 @@ docker_manifests:
       - ghcr.io/gnolang/{{ .ProjectName }}/gnofaucet:{{ .Env.TAG_VERSION }}-amd64
       - ghcr.io/gnolang/{{ .ProjectName }}/gnofaucet:{{ .Env.TAG_VERSION }}-arm64v8
 
+ # gnodev
+  - name_template: ghcr.io/gnolang/{{ .ProjectName }}/gnodev:{{ .Version }}
+    image_templates:
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnodev:{{ .Version }}-amd64
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnodev:{{ .Version }}-arm64v8
+  - name_template: ghcr.io/gnolang/{{ .ProjectName }}/gnodev:{{ .Env.TAG_VERSION }}
+    image_templates:
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnodev:{{ .Env.TAG_VERSION }}-amd64
+      - ghcr.io/gnolang/{{ .ProjectName }}/gnodev:{{ .Env.TAG_VERSION }}-arm64v8
+
   # gnocontribs
   - name_template: ghcr.io/gnolang/{{ .ProjectName }}/gnocontribs:{{ .Version }}
     image_templates:
diff --git a/Dockerfile.release b/Dockerfile.release
index c7bb1b582ed..5e5149a496b 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -44,6 +44,17 @@ COPY       ./gnofaucet /usr/bin/gnofaucet
 EXPOSE     5050
 ENTRYPOINT [ "/usr/bin/gnofaucet" ]
 
+#
+## ghcr.io/gnolang/gno/gnodev
+FROM base as gnodev
+
+COPY       ./gnodev /usr/bin/gnodev
+COPY       ./gno.land/genesis/genesis_balances.txt /gnoroot/gno.land/genesis/genesis_balances.txt
+COPY       ./gno.land/genesis/genesis_txs.jsonl    /gnoroot/gno.land/genesis/genesis_txs.jsonl
+# gnoweb exposed by default
+EXPOSE     8888
+ENTRYPOINT [ "/usr/bin/gnodev" ]
+
 #
 ## ghcr.io/gnolang/gno
 FROM base as gno

From 5f180bdce4d29eda1464fc9bbd61acbc3a4f17b5 Mon Sep 17 00:00:00 2001
From: Sergio Maria Matone <sergio.matone@tendermint.com>
Date: Wed, 19 Feb 2025 11:35:14 +0100
Subject: [PATCH 25/47] chore: fixing ldflags for gnodev build in Goreleaser
 (#3785)

fixing ldflags for gnodev build in Goreleaser
---
 .github/goreleaser.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
index 4ec29d76e62..9ea739d0465 100644
--- a/.github/goreleaser.yaml
+++ b/.github/goreleaser.yaml
@@ -72,7 +72,7 @@ builds:
     binary: gnodev
     ldflags:
       # using hardcoded ldflag
-      - -X main.build="-X github.com/gnolang/gno/gnovm/pkg/gnoenv._GNOROOT=/gnoroot"
+      - -X github.com/gnolang/gno/gnovm/pkg/gnoenv._GNOROOT=/gnoroot
     env:
       - CGO_ENABLED=0
     goos:

From d7184acffa543f96a6a1edf799f8eac0e740f584 Mon Sep 17 00:00:00 2001
From: Sergio Maria Matone <sergio.matone@tendermint.com>
Date: Wed, 19 Feb 2025 11:49:52 +0100
Subject: [PATCH 26/47] chore: fixing extra_files in gnodev (#3786)

fixing extra_files in gnodev
---
 .github/goreleaser.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
index 9ea739d0465..cc685648456 100644
--- a/.github/goreleaser.yaml
+++ b/.github/goreleaser.yaml
@@ -354,6 +354,9 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gnodev
+    extra_files:
+      - gno.land/genesis/genesis_balances.txt
+      - gno.land/genesis/genesis_txs.jsonl
 
   # gnocontribs
   - use: buildx

From 2d2f96b9d6e3d93cbab7177186f14e241c775b80 Mon Sep 17 00:00:00 2001
From: Sergio Maria Matone <sergio.matone@tendermint.com>
Date: Wed, 19 Feb 2025 12:09:55 +0100
Subject: [PATCH 27/47] chore: fixing extra_files in gnodev amd64 (#3787)

---
 .github/goreleaser.yaml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
index cc685648456..ea733b57742 100644
--- a/.github/goreleaser.yaml
+++ b/.github/goreleaser.yaml
@@ -338,6 +338,9 @@ dockers:
       - "--label=org.opencontainers.image.version={{.Version}}"
     ids:
       - gnodev
+    extra_files:
+      - gno.land/genesis/genesis_balances.txt
+      - gno.land/genesis/genesis_txs.jsonl
   - use: buildx
     dockerfile: Dockerfile.release
     goos: linux

From ec696d40ae44eee809e3ca2c7cdb2ce4c6eece04 Mon Sep 17 00:00:00 2001
From: Sergio Maria Matone <sergio.matone@tendermint.com>
Date: Wed, 19 Feb 2025 12:38:33 +0100
Subject: [PATCH 28/47] chore: adding examples to govdev Docker image (#3788)

---
 .github/goreleaser.yaml | 2 ++
 Dockerfile.release      | 1 +
 2 files changed, 3 insertions(+)

diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
index ea733b57742..186bac6f31a 100644
--- a/.github/goreleaser.yaml
+++ b/.github/goreleaser.yaml
@@ -339,6 +339,7 @@ dockers:
     ids:
       - gnodev
     extra_files:
+      - examples
       - gno.land/genesis/genesis_balances.txt
       - gno.land/genesis/genesis_txs.jsonl
   - use: buildx
@@ -358,6 +359,7 @@ dockers:
     ids:
       - gnodev
     extra_files:
+      - examples
       - gno.land/genesis/genesis_balances.txt
       - gno.land/genesis/genesis_txs.jsonl
 
diff --git a/Dockerfile.release b/Dockerfile.release
index 5e5149a496b..69a508000aa 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -49,6 +49,7 @@ ENTRYPOINT [ "/usr/bin/gnofaucet" ]
 FROM base as gnodev
 
 COPY       ./gnodev /usr/bin/gnodev
+COPY       ./examples                              /gnoroot/examples/
 COPY       ./gno.land/genesis/genesis_balances.txt /gnoroot/gno.land/genesis/genesis_balances.txt
 COPY       ./gno.land/genesis/genesis_txs.jsonl    /gnoroot/gno.land/genesis/genesis_txs.jsonl
 # gnoweb exposed by default

From 0a239e1ec444916260c400324ccb66fc02f01bc2 Mon Sep 17 00:00:00 2001
From: Yo HA <tronghieu.ha@gmail.com>
Date: Wed, 19 Feb 2025 22:10:48 +0700
Subject: [PATCH 29/47] feat(stdlibs/std)!: remove `Get` prefixes, extend
 abbreviations (#3374)

Linked to https://github.com/gnolang/gno/issues/1475

- GetCallerAt =>CallerAt
- GetOrigSend => OriginSend
- origSend => originSend
- GetOrigCaller => OriginCaller
- origCaller => originCaller
- Orig => Origin
- Addr => Address
- PrevRealm => PreviousRealm
- GetChainID => ChainID
- GetBanker => NewBanker
- GetChainDomain => ChainDomain
- GetHeight => Height


BREAKING CHANGE: changes many of the existing standard library
functions.

---------

Co-authored-by: hieu.ha <hieu.ha@hsc.com.vn>
Co-authored-by: Leon Hudak <33522493+leohhhn@users.noreply.github.com>
Co-authored-by: Morgan Bazalgette <morgan@morganbaz.com>
---
 .../creating-grc20/mytoken-1.gno              |  2 +-
 .../creating-grc20/mytoken-2.gno              |  4 +-
 .../porting-solidity-to-gno/porting-11.gno    |  6 +-
 .../porting-solidity-to-gno/porting-12.gno    |  2 +-
 .../porting-solidity-to-gno/porting-13.gno    | 22 ++---
 .../porting-solidity-to-gno/porting-3.gno     |  2 +-
 .../porting-solidity-to-gno/porting-5.gno     |  6 +-
 .../porting-solidity-to-gno/porting-6.gno     | 24 ++---
 .../porting-solidity-to-gno/porting-8.gno     | 10 +-
 .../porting-solidity-to-gno/porting-9.gno     |  4 +-
 .../how-to-guides/simple-library/tapas.gno    |  4 +-
 .../write-simple-dapp/poll-2.gno              |  6 +-
 docs/concepts/effective-gno.md                | 34 +++----
 docs/concepts/stdlibs/banker.md               |  2 +-
 docs/how-to-guides/creating-grc20.md          |  8 +-
 docs/how-to-guides/porting-solidity-to-gno.md | 76 +++++++--------
 docs/how-to-guides/simple-library.md          |  4 +-
 docs/how-to-guides/write-simple-dapp.md       |  6 +-
 docs/reference/stdlibs/std/banker.md          |  8 +-
 docs/reference/stdlibs/std/chain.md           | 46 ++++-----
 docs/reference/stdlibs/std/realm.md           |  6 +-
 docs/reference/stdlibs/std/testing.md         | 26 ++---
 examples/gno.land/p/demo/entropy/entropy.gno  |  6 +-
 .../p/demo/gnorkle/gnorkle/instance.gno       |  2 +-
 .../demo/grc/grc1155/basic_grc1155_token.gno  | 20 ++--
 .../grc/grc1155/basic_grc1155_token_test.gno  |  6 +-
 .../p/demo/grc/grc20/examples_test.gno        |  2 +-
 .../gno.land/p/demo/grc/grc20/tellers.gno     |  8 +-
 .../p/demo/grc/grc20/tellers_test.gno         |  4 +-
 .../gno.land/p/demo/grc/grc721/basic_nft.gno  | 10 +-
 .../p/demo/grc/grc721/basic_nft_test.gno      | 14 +--
 .../demo/grc/grc721/grc721_metadata_test.gno  |  6 +-
 .../p/demo/grc/grc721/grc721_royalty.gno      |  2 +-
 .../p/demo/grc/grc721/grc721_royalty_test.gno |  6 +-
 .../gno.land/p/demo/memeland/memeland.gno     |  4 +-
 .../p/demo/memeland/memeland_test.gno         | 12 +--
 .../gno.land/p/demo/microblog/microblog.gno   |  2 +-
 .../gno.land/p/demo/nestedpkg/nestedpkg.gno   | 16 ++--
 .../exts/authorizable/authorizable.gno        |  4 +-
 .../exts/authorizable/authorizable_test.gno   | 20 ++--
 examples/gno.land/p/demo/ownable/ownable.gno  |  6 +-
 .../gno.land/p/demo/ownable/ownable_test.gno  | 12 +--
 .../p/demo/pausable/pausable_test.gno         |  8 +-
 examples/gno.land/p/demo/simpledao/dao.gno    |  6 +-
 .../gno.land/p/demo/simpledao/dao_test.gno    | 42 ++++-----
 .../p/demo/subscription/lifetime/lifetime.gno |  4 +-
 .../subscription/lifetime/lifetime_test.gno   | 20 ++--
 .../demo/subscription/recurring/recurring.gno |  4 +-
 .../subscription/recurring/recurring_test.gno | 34 +++----
 .../p/demo/tests/subtests/subtests.gno        |  4 +-
 examples/gno.land/p/demo/tests/tests.gno      |  8 +-
 examples/gno.land/p/demo/testutils/misc.gno   |  2 +-
 .../gno.land/p/demo/todolist/todolist.gno     |  2 +-
 .../p/demo/todolist/todolist_test.gno         |  2 +-
 examples/gno.land/p/moul/debug/debug.gno      |  8 +-
 .../gno.land/p/moul/debug/z1_filetest.gno     |  8 +-
 .../gno.land/p/moul/debug/z2_filetest.gno     |  8 +-
 examples/gno.land/p/n2p5/loci/loci.gno        |  4 +-
 examples/gno.land/p/n2p5/loci/loci_test.gno   |  8 +-
 examples/gno.land/p/n2p5/mgroup/mgroup.gno    |  2 +-
 .../gno.land/p/n2p5/mgroup/mgroup_test.gno    | 44 ++++-----
 .../p/oxtekgrinder/ownable2step/ownable.gno   |  8 +-
 .../ownable2step/ownable_test.gno             | 16 ++--
 .../gno.land/r/demo/atomicswap/atomicswap.gno | 12 +--
 .../r/demo/atomicswap/atomicswap_test.gno     | 10 +-
 examples/gno.land/r/demo/atomicswap/swap.gno  |  4 +-
 examples/gno.land/r/demo/banktest/README.md   | 12 +--
 .../gno.land/r/demo/banktest/banktest.gno     | 12 +--
 .../gno.land/r/demo/banktest/z_0_filetest.gno | 10 +-
 .../gno.land/r/demo/banktest/z_1_filetest.gno |  4 +-
 .../gno.land/r/demo/banktest/z_2_filetest.gno | 10 +-
 .../gno.land/r/demo/banktest/z_3_filetest.gno |  4 +-
 examples/gno.land/r/demo/bar20/bar20.gno      |  2 +-
 examples/gno.land/r/demo/bar20/bar20_test.gno |  2 +-
 examples/gno.land/r/demo/boards/public.gno    | 26 ++---
 .../r/demo/boards/z_12_a_filetest.gno         |  4 +-
 .../gno.land/r/demo/boards/z_5_b_filetest.gno |  4 +-
 .../gno.land/r/demo/boards/z_5_c_filetest.gno |  4 +-
 .../gno.land/r/demo/boards/z_5_d_filetest.gno |  4 +-
 .../gno.land/r/demo/btree_dao/btree_dao.gno   |  2 +-
 .../r/demo/btree_dao/btree_dao_test.gno       |  2 +-
 .../gno.land/r/demo/disperse/disperse.gno     | 10 +-
 .../gno.land/r/demo/disperse/z_0_filetest.gno |  6 +-
 .../gno.land/r/demo/disperse/z_1_filetest.gno |  6 +-
 .../gno.land/r/demo/disperse/z_2_filetest.gno |  6 +-
 .../gno.land/r/demo/disperse/z_3_filetest.gno |  6 +-
 .../gno.land/r/demo/disperse/z_4_filetest.gno |  6 +-
 examples/gno.land/r/demo/foo1155/foo1155.gno  |  8 +-
 examples/gno.land/r/demo/foo20/foo20.gno      |  2 +-
 examples/gno.land/r/demo/foo20/foo20_test.gno |  2 +-
 examples/gno.land/r/demo/foo721/foo721.gno    |  4 +-
 .../r/demo/games/dice_roller/dice_roller.gno  |  4 +-
 .../games/dice_roller/dice_roller_test.gno    | 22 ++---
 .../gno.land/r/demo/games/shifumi/shifumi.gno |  4 +-
 .../r/demo/grc20factory/grc20factory.gno      | 10 +-
 .../r/demo/grc20factory/grc20factory_test.gno | 12 +--
 .../gno.land/r/demo/grc20reg/grc20reg.gno     |  2 +-
 .../r/demo/grc20reg/grc20reg_test.gno         |  2 +-
 examples/gno.land/r/demo/groups/public.gno    |  8 +-
 .../gno.land/r/demo/groups/z_1_a_filetest.gno | 22 ++---
 .../gno.land/r/demo/groups/z_1_c_filetest.gno |  4 +-
 .../gno.land/r/demo/groups/z_2_a_filetest.gno | 22 ++---
 .../gno.land/r/demo/groups/z_2_d_filetest.gno |  4 +-
 .../gno.land/r/demo/groups/z_2_g_filetest.gno |  4 +-
 .../gno.land/r/demo/keystore/keystore.gno     | 12 +--
 .../r/demo/keystore/keystore_test.gno         |  2 +-
 .../gno.land/r/demo/microblog/microblog.gno   |  2 +-
 .../r/demo/microblog/microblog_test.gno       |  4 +-
 examples/gno.land/r/demo/nft/nft.gno          |  6 +-
 examples/gno.land/r/demo/nft/z_2_filetest.gno |  2 +-
 examples/gno.land/r/demo/nft/z_3_filetest.gno |  2 +-
 examples/gno.land/r/demo/nft/z_4_filetest.gno |  2 +-
 examples/gno.land/r/demo/profile/profile.gno  |  6 +-
 .../r/demo/releases_example/example.gno       |  4 +-
 examples/gno.land/r/demo/tamagotchi/realm.gno |  2 +-
 .../r/demo/tests/crossrealm_b/crossrealm.gno  |  2 +-
 .../r/demo/tests/subtests/subtests.gno        |  6 +-
 examples/gno.land/r/demo/tests/tests.gno      | 16 ++--
 examples/gno.land/r/demo/tests/tests_test.gno | 16 ++--
 .../gno.land/r/demo/tests/z2_filetest.gno     | 14 +--
 .../gno.land/r/demo/tests/z3_filetest.gno     | 14 +--
 .../r/demo/todolist/todolist_test.gno         |  2 +-
 .../gno.land/r/demo/userbook/userbook.gno     |  2 +-
 examples/gno.land/r/demo/users/users.gno      | 28 +++---
 .../gno.land/r/demo/users/z_0_filetest.gno    |  2 +-
 .../gno.land/r/demo/users/z_10_filetest.gno   |  8 +-
 .../gno.land/r/demo/users/z_11_filetest.gno   |  6 +-
 .../gno.land/r/demo/users/z_11b_filetest.gno  |  6 +-
 .../gno.land/r/demo/users/z_2_filetest.gno    |  8 +-
 .../gno.land/r/demo/users/z_3_filetest.gno    | 10 +-
 .../gno.land/r/demo/users/z_4_filetest.gno    | 10 +-
 .../gno.land/r/demo/users/z_5_filetest.gno    | 10 +-
 .../gno.land/r/demo/users/z_6_filetest.gno    |  4 +-
 .../gno.land/r/demo/users/z_7_filetest.gno    | 12 +--
 .../gno.land/r/demo/users/z_7b_filetest.gno   | 12 +--
 .../gno.land/r/demo/users/z_8_filetest.gno    | 12 +--
 .../gno.land/r/demo/users/z_9_filetest.gno    |  8 +-
 examples/gno.land/r/demo/wugnot/wugnot.gno    | 10 +-
 .../gno.land/r/demo/wugnot/z0_filetest.gno    | 10 +-
 examples/gno.land/r/docs/buttons/buttons.gno  |  2 +-
 examples/gno.land/r/gnoland/blog/admin.gno    | 12 +--
 examples/gno.land/r/gnoland/blog/gnoblog.gno  |  2 +-
 .../gno.land/r/gnoland/blog/gnoblog_test.gno  |  3 +-
 .../gno.land/r/gnoland/events/events_test.gno | 12 +--
 examples/gno.land/r/gnoland/faucet/admin.gno  |  2 +-
 examples/gno.land/r/gnoland/faucet/faucet.gno | 12 +--
 .../gno.land/r/gnoland/faucet/faucet_test.gno | 22 ++---
 .../gno.land/r/gnoland/faucet/z2_filetest.gno |  2 +-
 .../gno.land/r/gnoland/faucet/z3_filetest.gno |  6 +-
 .../gno.land/r/gnoland/ghverify/contract.gno  |  6 +-
 .../r/gnoland/ghverify/contract_test.gno      | 12 +--
 examples/gno.land/r/gnoland/home/home.gno     |  2 +-
 .../r/gnoland/home/overide_filetest.gno       |  2 +-
 examples/gno.land/r/gnoland/monit/monit.gno   |  4 +-
 examples/gno.land/r/gnoland/pages/admin.gno   |  8 +-
 .../r/gnoland/valopers/v2/valopers.gno        |  2 +-
 examples/gno.land/r/gov/dao/bridge/bridge.gno |  2 +-
 .../gno.land/r/gov/dao/bridge/bridge_test.gno |  2 +-
 examples/gno.land/r/jjoptimist/home/home.gno  |  2 +-
 examples/gno.land/r/leon/config/config.gno    | 10 +-
 examples/gno.land/r/leon/hof/hof.gno          |  8 +-
 examples/gno.land/r/leon/hof/hof_test.gno     |  2 +-
 examples/gno.land/r/leon/home/home.gno        | 10 +-
 .../r/matijamarjanovic/home/config.gno        |  4 +-
 .../gno.land/r/matijamarjanovic/home/home.gno | 10 +-
 .../r/matijamarjanovic/home/home_test.gno     |  8 +-
 .../gno.land/r/morgan/guestbook/guestbook.gno |  8 +-
 examples/gno.land/r/moul/config/config.gno    |  2 +-
 examples/gno.land/r/moul/home/z2_filetest.gno | 10 +-
 examples/gno.land/r/moul/microposts/realm.gno |  2 +-
 examples/gno.land/r/moul/present/present.gno  |  6 +-
 .../r/n2p5/haystack/haystack_test.gno         |  8 +-
 examples/gno.land/r/n2p5/home/home.gno        |  2 +-
 examples/gno.land/r/n2p5/loci/loci.gno        |  2 +-
 examples/gno.land/r/nemanya/config/config.gno |  2 +-
 examples/gno.land/r/nemanya/home/home.gno     | 26 ++---
 examples/gno.land/r/stefann/fomo3d/fomo3d.gno | 28 +++---
 .../gno.land/r/stefann/fomo3d/fomo3d_test.gno | 86 ++++++++---------
 examples/gno.land/r/stefann/fomo3d/render.gno |  2 +-
 examples/gno.land/r/stefann/home/home.gno     |  8 +-
 .../gno.land/r/stefann/home/home_test.gno     | 22 ++---
 .../r/sys/validators/v2/validators.gno        |  4 +-
 .../r/sys/validators/v2/validators_test.gno   |  2 +-
 examples/gno.land/r/ursulovic/home/home.gno   |  2 +-
 .../gno.land/r/ursulovic/home/home_test.gno   | 14 +--
 .../r/ursulovic/registry/registry.gno         |  2 +-
 .../r/x/jeronimo_render_proxy/home/home.gno   |  2 +-
 .../upgrade_b/v1/v1.gno                       |  6 +-
 .../upgrade_b/v2/v2.gno                       |  6 +-
 .../upgrade_c/root/root.gno                   |  2 +-
 .../nir1218_evaluation_proposal/committee.gno | 14 +--
 .../committee_test.gno                        |  6 +-
 .../skiptime_test.gno                         |  4 +-
 gno.land/genesis/genesis_txs.jsonl            |  2 +-
 .../integration/testdata/grc20_registry.txtar |  6 +-
 .../integration/testdata/grc721_emit.txtar    |  4 +-
 .../pkg/integration/testdata/initctx.txtar    |  4 +-
 .../pkg/integration/testdata/issue_1786.txtar | 14 +--
 .../pkg/integration/testdata/issue_2283.txtar |  6 +-
 .../testdata/issue_2283_cacheTypes.txtar      |  6 +-
 .../pkg/integration/testdata/prevrealm.txtar  | 18 ++--
 .../realm_banker_issued_coin_denom.txtar      | 12 +--
 gno.land/pkg/sdk/vm/handler_test.go           |  4 +-
 gno.land/pkg/sdk/vm/keeper.go                 | 94 +++++++++----------
 gno.land/pkg/sdk/vm/keeper_test.go            | 58 ++++++------
 .../transpile/valid_transpile_file.txtar      |  4 +-
 gnovm/pkg/gnolang/gonative.go                 |  2 +-
 gnovm/pkg/test/test.go                        | 22 ++---
 gnovm/pkg/transpiler/transpiler_test.go       | 20 ++--
 gnovm/stdlibs/generated.go                    | 24 ++---
 gnovm/stdlibs/std/banker.gno                  | 24 ++---
 gnovm/stdlibs/std/banker.go                   | 12 +--
 gnovm/stdlibs/std/context.go                  | 24 ++---
 gnovm/stdlibs/std/emit_event.go               |  2 +-
 gnovm/stdlibs/std/frame.gno                   |  2 +-
 gnovm/stdlibs/std/native.gno                  | 30 +++---
 gnovm/stdlibs/std/native.go                   | 46 ++++-----
 gnovm/stdlibs/std/native_test.go              |  4 +-
 gnovm/tests/files/std10.gno                   |  4 +-
 gnovm/tests/files/std11.gno                   |  2 +-
 gnovm/tests/files/std2.gno                    |  2 +-
 gnovm/tests/files/std3.gno                    |  4 +-
 gnovm/tests/files/std4.gno                    |  2 +-
 gnovm/tests/files/std5.gno                    |  6 +-
 gnovm/tests/files/std6.gno                    |  4 +-
 gnovm/tests/files/std7.gno                    |  6 +-
 gnovm/tests/files/std8.gno                    | 10 +-
 gnovm/tests/files/zrealm_crossrealm11.gno     | 40 ++++----
 gnovm/tests/files/zrealm_crossrealm12.gno     |  6 +-
 gnovm/tests/files/zrealm_crossrealm13.gno     | 20 ++--
 gnovm/tests/files/zrealm_crossrealm13a.gno    | 20 ++--
 gnovm/tests/files/zrealm_initctx.gno          |  4 +-
 gnovm/tests/files/zrealm_natbind0.gno         |  6 +-
 gnovm/tests/files/zrealm_natbind1_stdlibs.gno |  2 +-
 gnovm/tests/files/zrealm_std0.gno             |  2 +-
 gnovm/tests/files/zrealm_std1.gno             |  4 +-
 gnovm/tests/files/zrealm_std2.gno             |  4 +-
 gnovm/tests/files/zrealm_std6.gno             |  2 +-
 gnovm/tests/integ/context/context.gno         |  2 +-
 gnovm/tests/stdlibs/generated.go              | 12 +--
 gnovm/tests/stdlibs/std/std.gno               | 18 ++--
 gnovm/tests/stdlibs/std/std.go                | 28 +++---
 242 files changed, 1195 insertions(+), 1194 deletions(-)

diff --git a/docs/assets/how-to-guides/creating-grc20/mytoken-1.gno b/docs/assets/how-to-guides/creating-grc20/mytoken-1.gno
index bbdf84f8a9f..df1fcac406c 100644
--- a/docs/assets/how-to-guides/creating-grc20/mytoken-1.gno
+++ b/docs/assets/how-to-guides/creating-grc20/mytoken-1.gno
@@ -17,7 +17,7 @@ var (
 // init is called once at time of deployment
 func init() {
 	// Set deployer of Realm to admin
-	admin = std.PrevRealm().Addr()
+	admin = std.PreviousRealm().Address()
 
 	// Set token name, symbol and number of decimals
 	banker = grc20.NewBanker("My Token", "TKN", 4)
diff --git a/docs/assets/how-to-guides/creating-grc20/mytoken-2.gno b/docs/assets/how-to-guides/creating-grc20/mytoken-2.gno
index 71616feba15..6f5d206f4b3 100644
--- a/docs/assets/how-to-guides/creating-grc20/mytoken-2.gno
+++ b/docs/assets/how-to-guides/creating-grc20/mytoken-2.gno
@@ -44,13 +44,13 @@ func TransferFrom(from, to std.Address, amount uint64) {
 
 // Mint mints amount of tokens to address. Callable only by admin of token
 func Mint(address std.Address, amount uint64) {
-	assertIsAdmin(std.PrevRealm().Addr())
+	assertIsAdmin(std.PreviousRealm().Address())
 	checkErr(banker.Mint(address, amount))
 }
 
 // Burn burns amount of tokens from address. Callable only by admin of token
 func Burn(address std.Address, amount uint64) {
-	assertIsAdmin(std.PrevRealm().Addr())
+	assertIsAdmin(std.PreviousRealm().Address())
 	checkErr(banker.Burn(address, amount))
 }
 
diff --git a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-11.gno b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-11.gno
index e48ebf919a0..8ee31bc4552 100644
--- a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-11.gno
+++ b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-11.gno
@@ -1,5 +1,5 @@
 func AuctionEnd() {
-	if std.GetHeight() < auctionEndBlock {
+	if std.ChainHeight() < auctionEndBlock {
 		panic("Auction hasn't ended")
 	}
 
@@ -10,8 +10,8 @@ func AuctionEnd() {
 	ended = true
 
 	// Send the highest bid to the recipient
-	banker := std.GetBanker(std.BankerTypeRealmSend)
-	pkgAddr := std.GetOrigPkgAddr()
+	banker := std.NewBanker(std.BankerTypeRealmSend)
+	pkgAddr := std.OriginPkgAddress()
 
 	banker.SendCoins(pkgAddr, receiver, std.Coins{{"ugnot", int64(highestBid)}})
 }
diff --git a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-12.gno b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-12.gno
index 55817537298..62738004f94 100644
--- a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-12.gno
+++ b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-12.gno
@@ -9,7 +9,7 @@ func TestAuctionEnd(t *testing.T) {
 	shouldNoPanic(t, AuctionEnd)
 	shouldEqual(t, ended, true)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	shouldEqual(t, banker.GetCoins(receiver).String(), "3ugnot")
 
 	// Auction has already ended
diff --git a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-13.gno b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-13.gno
index 0e5f2d57de9..ec3f4145b21 100644
--- a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-13.gno
+++ b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-13.gno
@@ -15,22 +15,22 @@ func TestFull(t *testing.T) {
 
 	// Send two or more types of coins
 	{
-		std.TestSetOrigCaller(bidder01)
-		std.TestSetOrigSend(std.Coins{{"ugnot", 0}, {"test", 1}}, nil)
+		std.TestSetOriginCaller(bidder01)
+		std.TestSetOriginSend(std.Coins{{"ugnot", 0}, {"test", 1}}, nil)
 		shouldPanic(t, Bid)
 	}
 
 	// Send less than the highest bid
 	{
-		std.TestSetOrigCaller(bidder01)
-		std.TestSetOrigSend(std.Coins{{"ugnot", 0}}, nil)
+		std.TestSetOriginCaller(bidder01)
+		std.TestSetOriginSend(std.Coins{{"ugnot", 0}}, nil)
 		shouldPanic(t, Bid)
 	}
 
 	// Send more than the highest bid
 	{
-		std.TestSetOrigCaller(bidder01)
-		std.TestSetOrigSend(std.Coins{{"ugnot", 1}}, nil)
+		std.TestSetOriginCaller(bidder01)
+		std.TestSetOriginSend(std.Coins{{"ugnot", 1}}, nil)
 		shouldNoPanic(t, Bid)
 
 		shouldEqual(t, pendingReturns.Size(), 0)
@@ -42,13 +42,13 @@ func TestFull(t *testing.T) {
 	{
 
 		// Send less amount than the current highest bid (current: 1)
-		std.TestSetOrigCaller(bidder02)
-		std.TestSetOrigSend(std.Coins{{"ugnot", 1}}, nil)
+		std.TestSetOriginCaller(bidder02)
+		std.TestSetOriginSend(std.Coins{{"ugnot", 1}}, nil)
 		shouldPanic(t, Bid)
 
 		// Send more amount than the current highest bid (exceeded)
-		std.TestSetOrigCaller(bidder02)
-		std.TestSetOrigSend(std.Coins{{"ugnot", 2}}, nil)
+		std.TestSetOriginCaller(bidder02)
+		std.TestSetOriginSend(std.Coins{{"ugnot", 2}}, nil)
 		shouldNoPanic(t, Bid)
 
 		shouldEqual(t, highestBid, 2)
@@ -68,7 +68,7 @@ func TestFull(t *testing.T) {
 		shouldNoPanic(t, AuctionEnd)
 		shouldEqual(t, ended, true)
 
-		banker := std.GetBanker(std.BankerTypeRealmSend)
+		banker := std.NewBanker(std.BankerTypeRealmSend)
 		shouldEqual(t, banker.GetCoins(receiver).String(), "2ugnot")
 	}
 }
diff --git a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-3.gno b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-3.gno
index af8137b4044..ae429ed1a39 100644
--- a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-3.gno
+++ b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-3.gno
@@ -1,6 +1,6 @@
 var (
 	receiver        = std.Address("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
-	auctionEndBlock = std.GetHeight() + uint(300) // in blocks
+	auctionEndBlock = std.ChainHeight() + uint(300) // in blocks
 	highestBidder   std.Address
 	highestBid      = uint(0)
 	pendingReturns  avl.Tree
diff --git a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-5.gno b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-5.gno
index 43f0b43b397..9750d3e90d2 100644
--- a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-5.gno
+++ b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-5.gno
@@ -1,9 +1,9 @@
 func Bid() {
-	if std.GetHeight() > auctionEndBlock {
+	if std.ChainHeight() > auctionEndBlock {
 		panic("Exceeded auction end block")
 	}
 
-	sentCoins := std.GetOrigSend()
+	sentCoins := std.OriginSend()
 	if len(sentCoins) != 1 {
 		panic("Send only one type of coin")
 	}
@@ -23,7 +23,7 @@ func Bid() {
 		}
 
 		// Update the top bidder address
-		highestBidder = std.GetOrigCaller()
+		highestBidder = std.OriginCaller()
 		// Update the top bid amount
 		highestBid = sentAmount
 	}
diff --git a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-6.gno b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-6.gno
index b544d0017c4..b226d4a69a2 100644
--- a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-6.gno
+++ b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-6.gno
@@ -1,39 +1,39 @@
 // Bid Function Test - Send Coin
 func TestBidCoins(t *testing.T) {
 	// Sending two types of coins
-	std.TestSetOrigCaller(bidder01)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 0}, {"test", 1}}, nil)
+	std.TestSetOriginCaller(bidder01)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 0}, {"test", 1}}, nil)
 	shouldPanic(t, Bid)
 
 	// Sending lower amount than the current highest bid
-	std.TestSetOrigCaller(bidder01)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 0}}, nil)
+	std.TestSetOriginCaller(bidder01)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 0}}, nil)
 	shouldPanic(t, Bid)
 
 	// Sending more amount than the current highest bid (exceeded)
-	std.TestSetOrigCaller(bidder01)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 1}}, nil)
+	std.TestSetOriginCaller(bidder01)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 1}}, nil)
 	shouldNoPanic(t, Bid)
 }
 
 // Bid Function Test - Bid by two or more people
 func TestBidCoins(t *testing.T) {
 	// bidder01 bidding with 1 coin
-	std.TestSetOrigCaller(bidder01)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 1}}, nil)
+	std.TestSetOriginCaller(bidder01)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 1}}, nil)
 	shouldNoPanic(t, Bid)
 	shouldEqual(t, highestBid, 1)
 	shouldEqual(t, highestBidder, bidder01)
 	shouldEqual(t, pendingReturns.Size(), 0)
 
 	// bidder02 bidding with 1 coin
-	std.TestSetOrigCaller(bidder02)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 1}}, nil)
+	std.TestSetOriginCaller(bidder02)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 1}}, nil)
 	shouldPanic(t, Bid)
 
 	// bidder02 bidding with 2 coins
-	std.TestSetOrigCaller(bidder02)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 2}}, nil)
+	std.TestSetOriginCaller(bidder02)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 2}}, nil)
 	shouldNoPanic(t, Bid)
 	shouldEqual(t, highestBid, 2)
 	shouldEqual(t, highestBidder, bidder02)
diff --git a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-8.gno b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-8.gno
index 7cb6bbd8d90..ad352d017c6 100644
--- a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-8.gno
+++ b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-8.gno
@@ -1,15 +1,15 @@
 func Withdraw() {
 	// Query the return amount to non-highest bidders
-	amount, _ := pendingReturns.Get(std.GetOrigCaller().String())
+	amount, _ := pendingReturns.Get(std.OriginCaller().String())
 
 	if amount > 0 {
 		// If there's an amount, reset the amount first,
-		pendingReturns.Set(std.GetOrigCaller().String(), 0)
+		pendingReturns.Set(std.OriginCaller().String(), 0)
 
 		// Return the exceeded amount
-		banker := std.GetBanker(std.BankerTypeRealmSend)
-		pkgAddr := std.GetOrigPkgAddr()
+		banker := std.NewBanker(std.BankerTypeRealmSend)
+		pkgAddr := std.OriginPkgAddress()
 
-		banker.SendCoins(pkgAddr, std.GetOrigCaller(), std.Coins{{"ugnot", amount.(int64)}})
+		banker.SendCoins(pkgAddr, std.OriginCaller(), std.Coins{{"ugnot", amount.(int64)}})
 	}
 }
diff --git a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-9.gno b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-9.gno
index fbc06792ce4..28f4917a66d 100644
--- a/docs/assets/how-to-guides/porting-solidity-to-gno/porting-9.gno
+++ b/docs/assets/how-to-guides/porting-solidity-to-gno/porting-9.gno
@@ -10,8 +10,8 @@ func TestWithdraw(t *testing.T) {
 	shouldEqual(t, pendingReturns.Size(), 1)
 	shouldEqual(t, pendingReturns.Has(returnAddr), true)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
-	pkgAddr := std.GetOrigPkgAddr()
+	banker := std.NewBanker(std.BankerTypeRealmSend)
+	pkgAddr := std.OriginPkgAddress()
 	banker.SendCoins(pkgAddr, std.Address(returnAddr), std.Coins{{"ugnot", returnAmount}})
 	shouldEqual(t, banker.GetCoins(std.Address(returnAddr)).String(), "3ugnot")
 }
diff --git a/docs/assets/how-to-guides/simple-library/tapas.gno b/docs/assets/how-to-guides/simple-library/tapas.gno
index c55fceaf3b8..9c523e72d91 100644
--- a/docs/assets/how-to-guides/simple-library/tapas.gno
+++ b/docs/assets/how-to-guides/simple-library/tapas.gno
@@ -28,9 +28,9 @@ var listOfTapas = []string{
 func GetTapaSuggestion(userInput string) string {
 
 	// Create a random number depending on the block height.
-	// We get the block height using std.GetHeight(), which is from an imported Gno library, "std"
+	// We get the block height using std.ChainHeight(), which is from an imported Gno library, "std"
 	// Note: this value is not fully random and is easily guessable
-	randomNumber := int(std.GetHeight()) % len(listOfTapas)
+	randomNumber := int(std.ChainHeight()) % len(listOfTapas)
 
 	// Return the random suggestion
 	return listOfTapas[randomNumber]
diff --git a/docs/assets/how-to-guides/write-simple-dapp/poll-2.gno b/docs/assets/how-to-guides/write-simple-dapp/poll-2.gno
index c7dbaedfbb2..6aa4aa6e36a 100644
--- a/docs/assets/how-to-guides/write-simple-dapp/poll-2.gno
+++ b/docs/assets/how-to-guides/write-simple-dapp/poll-2.gno
@@ -22,7 +22,7 @@ func init() {
 // NewPoll - Creates a new Poll instance
 func NewPoll(title, description string, deadline int64) string {
 	// get block height
-	if deadline <= std.GetHeight() {
+	if deadline <= std.ChainHeight() {
 		panic("deadline has to be in the future")
 	}
 
@@ -40,7 +40,7 @@ func NewPoll(title, description string, deadline int64) string {
 // yes - true, no - false
 func Vote(id string, vote bool) string {
 	// get txSender
-	txSender := std.GetOrigCaller()
+	txSender := std.OriginCaller()
 
 	// get specific Poll from AVL tree
 	pollRaw, exists := polls.Get(id)
@@ -57,7 +57,7 @@ func Vote(id string, vote bool) string {
 		panic("you've already voted!")
 	}
 
-	if poll.Deadline() <= std.GetHeight() {
+	if poll.Deadline() <= std.ChainHeight() {
 		panic("voting for this poll is closed")
 	}
 
diff --git a/docs/concepts/effective-gno.md b/docs/concepts/effective-gno.md
index d4e2af8422e..74886a8e515 100644
--- a/docs/concepts/effective-gno.md
+++ b/docs/concepts/effective-gno.md
@@ -115,7 +115,7 @@ that could lead to user frustration or the need to fork the code.
 import "std"
 
 func Foobar() {
-    caller := std.PrevRealm().Addr()
+    caller := std.PreviousRealm().Address()
     if caller != "g1xxxxx" {
         panic("permission denied")
     }
@@ -169,10 +169,10 @@ var (
 
 func init() {
     created = time.Now()
-    // std.GetOrigCaller in the context of realm initialisation is,
+    // std.OriginCaller in the context of realm initialisation is,
     // of course, the publisher of the realm :)
     // This can be better than hardcoding an admin address as a constant.
-    admin = std.GetOrigCaller()
+    admin = std.OriginCaller()
     // list is already initialized, so it will already contain "foo", "bar" and
     // the current time as existing items.
     list = append(list, admin.String())
@@ -449,7 +449,7 @@ certain operations.
 import "std"
 
 func PublicMethod(nb int) {
-    caller := std.PrevRealm().Addr()
+    caller := std.PreviousRealm().Address()
     privateMethod(caller, nb)
 }
 
@@ -457,7 +457,7 @@ func privateMethod(caller std.Address, nb int) { /* ... */ }
 ```
 
 In this example, `PublicMethod` is a public function that can be called by other
-realms. It retrieves the caller's address using `std.PrevRealm().Addr()`, and
+realms. It retrieves the caller's address using `std.PreviousRealm().Address()`, and
 then passes it to `privateMethod`, which is a private function that performs the
 actual logic. This way, `privateMethod` can only be called from within the
 realm, and it can use the caller's address for authentication or authorization
@@ -490,11 +490,11 @@ import (
 var owner std.Address
 
 func init() {
-	owner = std.PrevRealm().Addr()
+	owner = std.PreviousRealm().Address()
 }
 
 func ChangeOwner(newOwner std.Address) {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 
 	if caller != owner {
 		panic("access denied")
@@ -544,14 +544,14 @@ whitelisted or not.
 
 Let's deep dive into the different access control mechanisms we can use:
 
-One strategy is to look at the caller with `std.PrevRealm()`, which could be the
+One strategy is to look at the caller with `std.PreviousRealm()`, which could be the
 EOA (Externally Owned Account), or the preceding realm in the call stack.
 
 Another approach is to look specifically at the EOA. For this, you should call
-`std.GetOrigCaller()`, which returns the public address of the account that
+`std.OriginCaller()`, which returns the public address of the account that
 signed the transaction.
 
-TODO: explain when to use `std.GetOrigCaller`.
+TODO: explain when to use `std.OriginCaller`.
 
 Internally, this call will look at the frame stack, which is basically the stack
 of callers including all the functions, anonymous functions, other realms, and
@@ -566,7 +566,7 @@ import "std"
 var admin std.Address = "g1xxxxx"
 
 func AdminOnlyFunction() {
-    caller := std.PrevRealm().Addr()
+    caller := std.PreviousRealm().Address()
     if caller != admin {
         panic("permission denied")
     }
@@ -577,7 +577,7 @@ func AdminOnlyFunction() {
 ```
 
 In this example, `AdminOnlyFunction` is a function that can only be called by
-the admin. It retrieves the caller's address using `std.PrevRealm().Addr()`,
+the admin. It retrieves the caller's address using `std.PreviousRealm().Address()`,
 this can be either another realm contract, or the calling user if there is no
 other intermediary realm. and then checks if the caller is the admin. If not, it
 panics and stops the execution.
@@ -593,7 +593,7 @@ Here's an example:
 import "std"
 
 func TransferTokens(to std.Address, amount int64) {
-    caller := std.PrevRealm().Addr()
+    caller := std.PreviousRealm().Address()
     if caller != admin {
         panic("permission denied")
     }
@@ -602,7 +602,7 @@ func TransferTokens(to std.Address, amount int64) {
 ```
 
 In this example, `TransferTokens` is a function that can only be called by the
-admin. It retrieves the caller's address using `std.PrevRealm().Addr()`, and
+admin. It retrieves the caller's address using `std.PreviousRealm().Address()`, and
 then checks if the caller is the admin. If not, the function panics and execution is stopped.
 
 By using these access control mechanisms, you can ensure that your contract's
@@ -681,7 +681,7 @@ type MySafeStruct {
 }
 
 func NewSafeStruct() *MySafeStruct {
-    caller := std.PrevRealm().Addr()
+    caller := std.PreviousRealm().Address()
     return &MySafeStruct{
         counter: 0,
         admin: caller,
@@ -690,7 +690,7 @@ func NewSafeStruct() *MySafeStruct {
 
 func (s *MySafeStruct) Counter() int { return s.counter }
 func (s *MySafeStruct) Inc() {
-    caller := std.PrevRealm().Addr()
+    caller := std.PreviousRealm().Address()
     if caller != s.admin {
         panic("permission denied")
     }
@@ -754,7 +754,7 @@ import "gno.land/p/demo/grc/grc20"
 var fooToken = grc20.NewBanker("Foo Token", "FOO", 4)
 
 func MyBalance() uint64 {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	return fooToken.BalanceOf(caller)
 }
 ```
diff --git a/docs/concepts/stdlibs/banker.md b/docs/concepts/stdlibs/banker.md
index 873fac7c418..2ba4ca4402b 100644
--- a/docs/concepts/stdlibs/banker.md
+++ b/docs/concepts/stdlibs/banker.md
@@ -11,7 +11,7 @@ The Banker module can be cast into 4 subtypes of bankers that expose different f
 ### Banker Types
 
 1. `BankerTypeReadonly` - read-only access to coin balances
-2. `BankerTypeOrigSend` - full access to coins sent with the transaction that called the banker
+2. `BankerTypeOriginSend` - full access to coins sent with the transaction that called the banker
 3. `BankerTypeRealmSend` - full access to coins that the realm itself owns, including the ones sent with the transaction
 4. `BankerTypeRealmIssue` - able to issue new coins
 
diff --git a/docs/how-to-guides/creating-grc20.md b/docs/how-to-guides/creating-grc20.md
index 13f22fcc6a2..86718d5b89c 100644
--- a/docs/how-to-guides/creating-grc20.md
+++ b/docs/how-to-guides/creating-grc20.md
@@ -41,7 +41,7 @@ var (
 // init is called once at time of deployment
 func init() {
 	// Set deployer of Realm to admin
-	admin = std.PrevRealm().Addr()
+	admin = std.PreviousRealm().Address()
 
 	// Set token name, symbol and number of decimals
 	banker = grc20.NewBanker("My Token", "TKN", 4)
@@ -142,7 +142,7 @@ caller’s allowance.
 ```go
 // Mint mints amount of tokens to address. Callable only by admin of token
 func Mint(address std.Address, amount uint64) {
-	assertIsAdmin(std.PrevRealm().Addr())
+	assertIsAdmin(std.PreviousRealm().Address())
 	checkErr(banker.Mint(address, amount))
 }
 ```
@@ -153,7 +153,7 @@ increasing the total supply.
 ```go
 // Burn burns amount of tokens from address. Callable only by admin of token
 func Burn(address std.Address, amount uint64) {
-	assertIsAdmin(std.PrevRealm().Addr())
+	assertIsAdmin(std.PreviousRealm().Address())
 	checkErr(banker.Burn(address, amount))
 }
 ```
@@ -162,7 +162,7 @@ decreasing the total supply.
 
 [embedmd]:# (../assets/how-to-guides/creating-grc20/mytoken-2.gno go /.*assertIsAdmin/ /^}/)
 ```go
-	assertIsAdmin(std.PrevRealm().Addr())
+	assertIsAdmin(std.PreviousRealm().Address())
 	checkErr(banker.Mint(address, amount))
 }
 ```
diff --git a/docs/how-to-guides/porting-solidity-to-gno.md b/docs/how-to-guides/porting-solidity-to-gno.md
index 85c426c4c83..1c491eda5f2 100644
--- a/docs/how-to-guides/porting-solidity-to-gno.md
+++ b/docs/how-to-guides/porting-solidity-to-gno.md
@@ -287,7 +287,7 @@ constructor(
 ```go
 var (
 	receiver        = std.Address("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5")
-	auctionEndBlock = std.GetHeight() + uint(300) // in blocks
+	auctionEndBlock = std.ChainHeight() + uint(300) // in blocks
 	highestBidder   std.Address
 	highestBid      = uint(0)
 	pendingReturns  avl.Tree
@@ -349,11 +349,11 @@ function bid() external payable {
 [embedmd]:# (../assets/how-to-guides/porting-solidity-to-gno/porting-5.gno go)
 ```go
 func Bid() {
-	if std.GetHeight() > auctionEndBlock {
+	if std.ChainHeight() > auctionEndBlock {
 		panic("Exceeded auction end block")
 	}
 
-	sentCoins := std.GetOrigSend()
+	sentCoins := std.OriginSend()
 	if len(sentCoins) != 1 {
 		panic("Send only one type of coin")
 	}
@@ -373,7 +373,7 @@ func Bid() {
 		}
 
 		// Update the top bidder address
-		highestBidder = std.GetOrigCaller()
+		highestBidder = std.OriginCaller()
 		// Update the top bid amount
 		highestBid = sentAmount
 	}
@@ -387,39 +387,39 @@ func Bid() {
 // Bid Function Test - Send Coin
 func TestBidCoins(t *testing.T) {
 	// Sending two types of coins
-	std.TestSetOrigCaller(bidder01)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 0}, {"test", 1}}, nil)
+	std.TestSetOriginCaller(bidder01)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 0}, {"test", 1}}, nil)
 	shouldPanic(t, Bid)
 
 	// Sending lower amount than the current highest bid
-	std.TestSetOrigCaller(bidder01)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 0}}, nil)
+	std.TestSetOriginCaller(bidder01)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 0}}, nil)
 	shouldPanic(t, Bid)
 
 	// Sending more amount than the current highest bid (exceeded)
-	std.TestSetOrigCaller(bidder01)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 1}}, nil)
+	std.TestSetOriginCaller(bidder01)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 1}}, nil)
 	shouldNoPanic(t, Bid)
 }
 
 // Bid Function Test - Bid by two or more people
 func TestBidCoins(t *testing.T) {
 	// bidder01 bidding with 1 coin
-	std.TestSetOrigCaller(bidder01)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 1}}, nil)
+	std.TestSetOriginCaller(bidder01)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 1}}, nil)
 	shouldNoPanic(t, Bid)
 	shouldEqual(t, highestBid, 1)
 	shouldEqual(t, highestBidder, bidder01)
 	shouldEqual(t, pendingReturns.Size(), 0)
 
 	// bidder02 bidding with 1 coin
-	std.TestSetOrigCaller(bidder02)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 1}}, nil)
+	std.TestSetOriginCaller(bidder02)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 1}}, nil)
 	shouldPanic(t, Bid)
 
 	// bidder02 bidding with 2 coins
-	std.TestSetOrigCaller(bidder02)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 2}}, nil)
+	std.TestSetOriginCaller(bidder02)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 2}}, nil)
 	shouldNoPanic(t, Bid)
 	shouldEqual(t, highestBid, 2)
 	shouldEqual(t, highestBidder, bidder02)
@@ -466,17 +466,17 @@ function withdraw() external returns (bool) {
 ```go
 func Withdraw() {
 	// Query the return amount to non-highest bidders
-	amount, _ := pendingReturns.Get(std.GetOrigCaller().String())
+	amount, _ := pendingReturns.Get(std.OriginCaller().String())
 
 	if amount > 0 {
 		// If there's an amount, reset the amount first,
-		pendingReturns.Set(std.GetOrigCaller().String(), 0)
+		pendingReturns.Set(std.OriginCaller().String(), 0)
 
 		// Return the exceeded amount
-		banker := std.GetBanker(std.BankerTypeRealmSend)
-		pkgAddr := std.GetOrigPkgAddr()
+		banker := std.NewBanker(std.BankerTypeRealmSend)
+		pkgAddr := std.OriginPkgAddress()
 
-		banker.SendCoins(pkgAddr, std.GetOrigCaller(), std.Coins{{"ugnot", amount.(int64)}})
+		banker.SendCoins(pkgAddr, std.OriginCaller(), std.Coins{{"ugnot", amount.(int64)}})
 	}
 }
 ```
@@ -499,8 +499,8 @@ func TestWithdraw(t *testing.T) {
 	shouldEqual(t, pendingReturns.Size(), 1)
 	shouldEqual(t, pendingReturns.Has(returnAddr), true)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
-	pkgAddr := std.GetOrigPkgAddr()
+	banker := std.NewBanker(std.BankerTypeRealmSend)
+	pkgAddr := std.OriginPkgAddress()
 	banker.SendCoins(pkgAddr, std.Address(returnAddr), std.Coins{{"ugnot", returnAmount}})
 	shouldEqual(t, banker.GetCoins(std.Address(returnAddr)).String(), "3ugnot")
 }
@@ -553,7 +553,7 @@ function auctionEnd() external {
 [embedmd]:# (../assets/how-to-guides/porting-solidity-to-gno/porting-11.gno go)
 ```go
 func AuctionEnd() {
-	if std.GetHeight() < auctionEndBlock {
+	if std.ChainHeight() < auctionEndBlock {
 		panic("Auction hasn't ended")
 	}
 
@@ -564,8 +564,8 @@ func AuctionEnd() {
 	ended = true
 
 	// Send the highest bid to the recipient
-	banker := std.GetBanker(std.BankerTypeRealmSend)
-	pkgAddr := std.GetOrigPkgAddr()
+	banker := std.NewBanker(std.BankerTypeRealmSend)
+	pkgAddr := std.OriginPkgAddress()
 
 	banker.SendCoins(pkgAddr, receiver, std.Coins{{"ugnot", int64(highestBid)}})
 }
@@ -586,7 +586,7 @@ func TestAuctionEnd(t *testing.T) {
 	shouldNoPanic(t, AuctionEnd)
 	shouldEqual(t, ended, true)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	shouldEqual(t, banker.GetCoins(receiver).String(), "3ugnot")
 
 	// Auction has already ended
@@ -620,22 +620,22 @@ func TestFull(t *testing.T) {
 
 	// Send two or more types of coins
 	{
-		std.TestSetOrigCaller(bidder01)
-		std.TestSetOrigSend(std.Coins{{"ugnot", 0}, {"test", 1}}, nil)
+		std.TestSetOriginCaller(bidder01)
+		std.TestSetOriginSend(std.Coins{{"ugnot", 0}, {"test", 1}}, nil)
 		shouldPanic(t, Bid)
 	}
 
 	// Send less than the highest bid
 	{
-		std.TestSetOrigCaller(bidder01)
-		std.TestSetOrigSend(std.Coins{{"ugnot", 0}}, nil)
+		std.TestSetOriginCaller(bidder01)
+		std.TestSetOriginSend(std.Coins{{"ugnot", 0}}, nil)
 		shouldPanic(t, Bid)
 	}
 
 	// Send more than the highest bid
 	{
-		std.TestSetOrigCaller(bidder01)
-		std.TestSetOrigSend(std.Coins{{"ugnot", 1}}, nil)
+		std.TestSetOriginCaller(bidder01)
+		std.TestSetOriginSend(std.Coins{{"ugnot", 1}}, nil)
 		shouldNoPanic(t, Bid)
 
 		shouldEqual(t, pendingReturns.Size(), 0)
@@ -647,13 +647,13 @@ func TestFull(t *testing.T) {
 	{
 
 		// Send less amount than the current highest bid (current: 1)
-		std.TestSetOrigCaller(bidder02)
-		std.TestSetOrigSend(std.Coins{{"ugnot", 1}}, nil)
+		std.TestSetOriginCaller(bidder02)
+		std.TestSetOriginSend(std.Coins{{"ugnot", 1}}, nil)
 		shouldPanic(t, Bid)
 
 		// Send more amount than the current highest bid (exceeded)
-		std.TestSetOrigCaller(bidder02)
-		std.TestSetOrigSend(std.Coins{{"ugnot", 2}}, nil)
+		std.TestSetOriginCaller(bidder02)
+		std.TestSetOriginSend(std.Coins{{"ugnot", 2}}, nil)
 		shouldNoPanic(t, Bid)
 
 		shouldEqual(t, highestBid, 2)
@@ -673,7 +673,7 @@ func TestFull(t *testing.T) {
 		shouldNoPanic(t, AuctionEnd)
 		shouldEqual(t, ended, true)
 
-		banker := std.GetBanker(std.BankerTypeRealmSend)
+		banker := std.NewBanker(std.BankerTypeRealmSend)
 		shouldEqual(t, banker.GetCoins(receiver).String(), "2ugnot")
 	}
 }
diff --git a/docs/how-to-guides/simple-library.md b/docs/how-to-guides/simple-library.md
index 62ff2bd2c0f..7582fa0b24d 100644
--- a/docs/how-to-guides/simple-library.md
+++ b/docs/how-to-guides/simple-library.md
@@ -128,9 +128,9 @@ var listOfTapas = []string{
 func GetTapaSuggestion(userInput string) string {
 
 	// Create a random number depending on the block height.
-	// We get the block height using std.GetHeight(), which is from an imported Gno library, "std"
+	// We get the block height using std.ChainHeight(), which is from an imported Gno library, "std"
 	// Note: this value is not fully random and is easily guessable
-	randomNumber := int(std.GetHeight()) % len(listOfTapas)
+	randomNumber := int(std.ChainHeight()) % len(listOfTapas)
 
 	// Return the random suggestion
 	return listOfTapas[randomNumber]
diff --git a/docs/how-to-guides/write-simple-dapp.md b/docs/how-to-guides/write-simple-dapp.md
index f844f8ab7c8..b73e67bac74 100644
--- a/docs/how-to-guides/write-simple-dapp.md
+++ b/docs/how-to-guides/write-simple-dapp.md
@@ -156,7 +156,7 @@ func init() {
 // NewPoll - Creates a new Poll instance
 func NewPoll(title, description string, deadline int64) string {
 	// get block height
-	if deadline <= std.GetHeight() {
+	if deadline <= std.ChainHeight() {
 		panic("deadline has to be in the future")
 	}
 
@@ -174,7 +174,7 @@ func NewPoll(title, description string, deadline int64) string {
 // yes - true, no - false
 func Vote(id string, vote bool) string {
 	// get txSender
-	txSender := std.GetOrigCaller()
+	txSender := std.OriginCaller()
 
 	// get specific Poll from AVL tree
 	pollRaw, exists := polls.Get(id)
@@ -191,7 +191,7 @@ func Vote(id string, vote bool) string {
 		panic("you've already voted!")
 	}
 
-	if poll.Deadline() <= std.GetHeight() {
+	if poll.Deadline() <= std.ChainHeight() {
 		panic("voting for this poll is closed")
 	}
 
diff --git a/docs/reference/stdlibs/std/banker.md b/docs/reference/stdlibs/std/banker.md
index b60b55ee93b..1e5d48815ad 100644
--- a/docs/reference/stdlibs/std/banker.md
+++ b/docs/reference/stdlibs/std/banker.md
@@ -10,7 +10,7 @@ type BankerType uint8
 
 const (
     BankerTypeReadonly BankerType = iota
-    BankerTypeOrigSend
+    BankerTypeOriginSend
     BankerTypeRealmSend
     BankerTypeRealmIssue
 )
@@ -23,20 +23,20 @@ type Banker interface {
 }
 ```
 
-## GetBanker
+## NewBanker
 Returns `Banker` of the specified type.
 
 #### Parameters
 - `BankerType` - type of Banker to get:
     - `BankerTypeReadonly` - read-only access to coin balances
-    - `BankerTypeOrigSend` - full access to coins sent with the transaction that calls the banker
+    - `BankerTypeOriginSend` - full access to coins sent with the transaction that calls the banker
     - `BankerTypeRealmSend` - full access to coins that the realm itself owns, including the ones sent with the transaction
     - `BankerTypeRealmIssue` - able to issue new coins
 
 #### Usage
 
 ```go
-banker := std.GetBanker(std.<BankerType>)
+banker := std.NewBanker(std.<BankerType>)
 ```
 
 :::info `Banker` methods expect qualified denomination of the coins. Read more [here](./realm.md#coindenom).
diff --git a/docs/reference/stdlibs/std/chain.md b/docs/reference/stdlibs/std/chain.md
index f3b2c6be0b8..9129cd17665 100644
--- a/docs/reference/stdlibs/std/chain.md
+++ b/docs/reference/stdlibs/std/chain.md
@@ -41,63 +41,63 @@ std.Emit("MyEvent", "myKey1", "myValue1", "myKey2", "myValue2")
 ```
 ---
 
-## GetChainID
+## ChainID
 ```go
-func GetChainID() string
+func ChainID() string
 ```
 Returns the chain ID.
 
 #### Usage
 ```go
-chainID := std.GetChainID() // dev | test5 | main ...
+chainID := std.ChainID() // dev | test5 | main ...
 ```
 ---
 
-## GetHeight
+## ChainHeight
 ```go
-func GetHeight() int64
+func ChainHeight() int64
 ```
 Returns the current block number (height).
 
 #### Usage
 ```go
-height := std.GetHeight()
+height := std.ChainHeight()
 ```
 ---
 
-## GetOrigSend
+## OriginSend
 ```go
-func GetOrigSend() Coins
+func OriginSend() Coins
 ```
 Returns the `Coins` that were sent along with the calling transaction.
 
 #### Usage
 ```go
-coinsSent := std.GetOrigSend()
+coinsSent := std.OriginSend()
 ```
 ---
 
-## GetOrigCaller
+## OriginCaller
 ```go
-func GetOrigCaller() Address
+func OriginCaller() Address
 ```
 Returns the original signer of the transaction.
 
 #### Usage
 ```go
-caller := std.GetOrigCaller()
+caller := std.OriginCaller()
 ```
 ---
 
-## GetOrigPkgAddr
+## OriginPkgAddress
 ```go
-func GetOrigPkgAddr() string
+func OriginPkgAddress() string
 ```
 Returns the address of the first (entry point) realm/package in a sequence of realm/package calls.
 
 #### Usage
 ```go
-origPkgAddr := std.GetOrigPkgAddr()
+originPkgAddr := std.OriginPkgAddress()
 ```
 ---
 
@@ -113,30 +113,30 @@ currentRealm := std.CurrentRealm()
 ```
 ---
 
-## PrevRealm
+## PreviousRealm
 ```go
-func PrevRealm() Realm
+func PreviousRealm() Realm
 ```
 Returns the previous caller [realm](realm.md) (can be code or user realm). If caller is a
 user realm, `pkgpath` will be empty.
 
 #### Usage
 ```go
-prevRealm := std.PrevRealm()
+prevRealm := std.PreviousRealm()
 ```
 ---
 
-## GetCallerAt
+## CallerAt
 ```go
-func GetCallerAt(n int) Address
+func CallerAt(n int) Address
 ```
 Returns the n-th caller of the function, going back in the call trace.
 
 #### Usage
 ```go
-currentRealm := std.GetCallerAt(1)      // returns address of current realm
-previousRealm := std.GetCallerAt(2)     // returns address of previous realm/caller
-std.GetCallerAt(0)                      // error, n must be > 0
+currentRealm := std.CallerAt(1)      // returns address of current realm
+previousRealm := std.CallerAt(2)     // returns address of previous realm/caller
+std.CallerAt(0)                      // error, n must be > 0
 ```
 --- 
 
diff --git a/docs/reference/stdlibs/std/realm.md b/docs/reference/stdlibs/std/realm.md
index f69cd874c75..207285ca546 100644
--- a/docs/reference/stdlibs/std/realm.md
+++ b/docs/reference/stdlibs/std/realm.md
@@ -11,18 +11,18 @@ type Realm struct {
     pkgPath string
 }
 
-func (r Realm) Addr() Address {...}
+func (r Realm) Address() Address {...}
 func (r Realm) PkgPath() string {...}
 func (r Realm) IsUser() bool {...}
 func (r Realm) CoinDenom(coinName string) string {...}
 ```
 
-## Addr
+## Address
 Returns the **Address** field of the realm it was called upon.
 
 #### Usage
 ```go
-realmAddr := r.Addr() // eg. g1n2j0gdyv45aem9p0qsfk5d2gqjupv5z536na3d
+realmAddr := r.Address() // eg. g1n2j0gdyv45aem9p0qsfk5d2gqjupv5z536na3d
 ```
 ---
 ## PkgPath
diff --git a/docs/reference/stdlibs/std/testing.md b/docs/reference/stdlibs/std/testing.md
index 8a95ecf7827..6a18d7381f2 100644
--- a/docs/reference/stdlibs/std/testing.md
+++ b/docs/reference/stdlibs/std/testing.md
@@ -6,9 +6,9 @@ id: testing
 
 ```go
 func TestSkipHeights(count int64)
-func TestSetOrigCaller(addr Address)
-func TestSetOrigPkgAddr(addr Address)
-func TestSetOrigSend(sent, spent Coins)
+func TestSetOriginCaller(addr Address)
+func TestSetOriginPkgAddress(addr Address)
+func TestSetOriginSend(sent, spent Coins)
 func TestIssueCoins(addr Address, coins Coins)
 func TestSetRealm(realm Realm)
 func NewUserRealm(address Address) Realm
@@ -32,43 +32,43 @@ std.TestSkipHeights(100)
 ```
 ---
 
-## TestSetOrigCaller
+## TestSetOriginCaller
 
 ```go
-func TestSetOrigCaller(addr Address)
+func TestSetOriginCaller(addr Address)
 ```
 Sets the current caller of the transaction to **addr**.
 
 #### Usage
 ```go
-std.TestSetOrigCaller(std.Address("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5"))
+std.TestSetOriginCaller(std.Address("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5"))
 ```
 ---
 
-## TestSetOrigPkgAddr
+## TestSetOriginPkgAddress
 
 ```go
-func TestSetOrigPkgAddr(addr Address)
+func TestSetOriginPkgAddress(addr Address)
 ```
 Sets the call entry realm address to **addr**.
 
 #### Usage
 ```go
-std.TestSetOrigPkgAddr(std.Address("g1ecely4gjy0yl6s9kt409ll330q9hk2lj9ls3ec"))
+std.TestSetOriginPkgAddress(std.Address("g1ecely4gjy0yl6s9kt409ll330q9hk2lj9ls3ec"))
 ```
 
 ---
 
-## TestSetOrigSend
+## TestSetOriginSend
 
 ```go
-func TestSetOrigSend(sent, spent Coins)
+func TestSetOriginSend(sent, spent Coins)
 ```
 Sets the sent & spent coins for the current context.
 
 #### Usage
 ```go
-std.TestSetOrigSend(sent, spent Coins)
+std.TestSetOriginSend(sent, spent Coins)
 ```
 ---
 
@@ -98,7 +98,7 @@ func TestSetRealm(rlm Realm)
 
 Sets the realm for the current frame. After calling `TestSetRealm()`, calling 
 [`CurrentRealm()`](chain.md#currentrealm) in the same test function will yield the value of `rlm`, and 
-any `PrevRealm()` called from a function used after TestSetRealm will yield `rlm`.
+any `PreviousRealm()` called from a function used after TestSetRealm will yield `rlm`.
 
 Should be used in combination with [`NewUserRealm`](#newuserrealm) &
 [`NewCodeRealm`](#newcoderealm).
diff --git a/examples/gno.land/p/demo/entropy/entropy.gno b/examples/gno.land/p/demo/entropy/entropy.gno
index 9e8f656c21b..850365c8236 100644
--- a/examples/gno.land/p/demo/entropy/entropy.gno
+++ b/examples/gno.land/p/demo/entropy/entropy.gno
@@ -57,15 +57,15 @@ func (i *Instance) addEntropy() {
 
 	// handle callers
 	{
-		caller1 := std.GetCallerAt(1).String()
+		caller1 := std.CallerAt(1).String()
 		i.djb2String(caller1)
-		caller2 := std.GetCallerAt(2).String()
+		caller2 := std.CallerAt(2).String()
 		i.djb2String(caller2)
 	}
 
 	// height
 	{
-		height := std.GetHeight()
+		height := std.ChainHeight()
 		if height >= math.MaxUint32 {
 			height -= math.MaxUint32
 		}
diff --git a/examples/gno.land/p/demo/gnorkle/gnorkle/instance.gno b/examples/gno.land/p/demo/gnorkle/gnorkle/instance.gno
index eea4782909e..00fbff0cdbf 100644
--- a/examples/gno.land/p/demo/gnorkle/gnorkle/instance.gno
+++ b/examples/gno.land/p/demo/gnorkle/gnorkle/instance.gno
@@ -106,7 +106,7 @@ type PostMessageHandler interface {
 // TODO: Consider further message types that could allow administrative action such as modifying
 // a feed's whitelist without the owner of this oracle having to maintain a reference to it.
 func (i *Instance) HandleMessage(msg string, postHandler PostMessageHandler) (string, error) {
-	caller := string(std.GetOrigCaller())
+	caller := string(std.OriginCaller())
 
 	funcType, msg := message.ParseFunc(msg)
 
diff --git a/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token.gno b/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token.gno
index f152ee90e79..1ed5f93d5fd 100644
--- a/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token.gno
+++ b/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token.gno
@@ -62,7 +62,7 @@ func (s *basicGRC1155Token) SetApprovalForAll(operator std.Address, approved boo
 		return ErrInvalidAddress
 	}
 
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	return s.setApprovalForAll(caller, operator, approved)
 }
 
@@ -85,7 +85,7 @@ func (s *basicGRC1155Token) IsApprovedForAll(owner, operator std.Address) bool {
 // contract recipients are aware of the GRC1155 protocol to prevent
 // tokens from being forever locked.
 func (s *basicGRC1155Token) SafeTransferFrom(from, to std.Address, tid TokenID, amount uint64) error {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if !s.IsApprovedForAll(caller, from) {
 		return ErrCallerIsNotOwnerOrApproved
 	}
@@ -108,7 +108,7 @@ func (s *basicGRC1155Token) SafeTransferFrom(from, to std.Address, tid TokenID,
 // contract recipients are aware of the GRC1155 protocol to prevent
 // tokens from being forever locked.
 func (s *basicGRC1155Token) SafeBatchTransferFrom(from, to std.Address, batch []TokenID, amounts []uint64) error {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if !s.IsApprovedForAll(caller, from) {
 		return ErrCallerIsNotOwnerOrApproved
 	}
@@ -130,7 +130,7 @@ func (s *basicGRC1155Token) SafeBatchTransferFrom(from, to std.Address, batch []
 // Creates `amount` tokens of token type `id`, and assigns them to `to`. Also checks that
 // contract recipients are using GRC1155 protocol.
 func (s *basicGRC1155Token) SafeMint(to std.Address, tid TokenID, amount uint64) error {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 
 	err := s.mintBatch(to, []TokenID{tid}, []uint64{amount})
 	if err != nil {
@@ -149,7 +149,7 @@ func (s *basicGRC1155Token) SafeMint(to std.Address, tid TokenID, amount uint64)
 // Batch version of `SafeMint()`. Also checks that
 // contract recipients are using GRC1155 protocol.
 func (s *basicGRC1155Token) SafeBatchMint(to std.Address, batch []TokenID, amounts []uint64) error {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 
 	err := s.mintBatch(to, batch, amounts)
 	if err != nil {
@@ -167,7 +167,7 @@ func (s *basicGRC1155Token) SafeBatchMint(to std.Address, batch []TokenID, amoun
 
 // Destroys `amount` tokens of token type `id` from `from`.
 func (s *basicGRC1155Token) Burn(from std.Address, tid TokenID, amount uint64) error {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 
 	err := s.burnBatch(from, []TokenID{tid}, []uint64{amount})
 	if err != nil {
@@ -181,7 +181,7 @@ func (s *basicGRC1155Token) Burn(from std.Address, tid TokenID, amount uint64) e
 
 // Batch version of `Burn()`
 func (s *basicGRC1155Token) BatchBurn(from std.Address, batch []TokenID, amounts []uint64) error {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 
 	err := s.burnBatch(from, batch, amounts)
 	if err != nil {
@@ -225,7 +225,7 @@ func (s *basicGRC1155Token) safeBatchTransferFrom(from, to std.Address, batch []
 		return ErrCannotTransferToSelf
 	}
 
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	s.beforeTokenTransfer(caller, from, to, batch, amounts)
 
 	for i := 0; i < len(batch); i++ {
@@ -265,7 +265,7 @@ func (s *basicGRC1155Token) mintBatch(to std.Address, batch []TokenID, amounts [
 		return ErrInvalidAddress
 	}
 
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	s.beforeTokenTransfer(caller, zeroAddress, to, batch, amounts)
 
 	for i := 0; i < len(batch); i++ {
@@ -294,7 +294,7 @@ func (s *basicGRC1155Token) burnBatch(from std.Address, batch []TokenID, amounts
 		return ErrInvalidAddress
 	}
 
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	s.beforeTokenTransfer(caller, from, zeroAddress, batch, amounts)
 
 	for i := 0; i < len(batch); i++ {
diff --git a/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno b/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno
index 930ae03fa04..4092af72037 100644
--- a/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno
+++ b/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno
@@ -91,7 +91,7 @@ func TestSetApprovalForAll(t *testing.T) {
 	dummy := NewBasicGRC1155Token(dummyURI)
 	uassert.True(t, dummy != nil, "should not be nil")
 
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	isApprovedForAll := dummy.IsApprovedForAll(caller, addr)
@@ -114,7 +114,7 @@ func TestSafeTransferFrom(t *testing.T) {
 	dummy := NewBasicGRC1155Token(dummyURI)
 	uassert.True(t, dummy != nil, "should not be nil")
 
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	tid := TokenID("1")
@@ -145,7 +145,7 @@ func TestSafeBatchTransferFrom(t *testing.T) {
 	dummy := NewBasicGRC1155Token(dummyURI)
 	uassert.True(t, dummy != nil, "should not be nil")
 
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	tid1 := TokenID("1")
diff --git a/examples/gno.land/p/demo/grc/grc20/examples_test.gno b/examples/gno.land/p/demo/grc/grc20/examples_test.gno
index 6a2bfa11d8c..17ceb240668 100644
--- a/examples/gno.land/p/demo/grc/grc20/examples_test.gno
+++ b/examples/gno.land/p/demo/grc/grc20/examples_test.gno
@@ -7,7 +7,7 @@ func ExampleExposeBankForMaketxRunOrImports() {}
 func ExampleCustomTellerImpl()                {}
 func ExampleAllowance()                       {}
 func ExampleRealmBanker()                     {}
-func ExamplePrevRealmBanker()                 {}
+func ExamplePreviousRealmBanker()             {}
 func ExampleAccountBanker()                   {}
 func ExampleTransfer()                        {}
 func ExampleApprove()                         {}
diff --git a/examples/gno.land/p/demo/grc/grc20/tellers.gno b/examples/gno.land/p/demo/grc/grc20/tellers.gno
index ee5d2d7fcca..733d10148e3 100644
--- a/examples/gno.land/p/demo/grc/grc20/tellers.gno
+++ b/examples/gno.land/p/demo/grc/grc20/tellers.gno
@@ -4,7 +4,7 @@ import (
 	"std"
 )
 
-// CallerTeller returns a GRC20 compatible teller that checks the PrevRealm
+// CallerTeller returns a GRC20 compatible teller that checks the PreviousRealm
 // caller for each call. It's usually safe to expose it publicly to let users
 // manipulate their tokens directly, or for realms to use their allowance.
 func (tok *Token) CallerTeller() Teller {
@@ -14,7 +14,7 @@ func (tok *Token) CallerTeller() Teller {
 
 	return &fnTeller{
 		accountFn: func() std.Address {
-			caller := std.PrevRealm().Addr()
+			caller := std.PreviousRealm().Address()
 			return caller
 		},
 		Token: tok,
@@ -44,7 +44,7 @@ func (tok *Token) RealmTeller() Teller {
 		panic("Token cannot be nil")
 	}
 
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 
 	return &fnTeller{
 		accountFn: func() std.Address {
@@ -61,7 +61,7 @@ func (tok *Token) RealmSubTeller(slug string) Teller {
 		panic("Token cannot be nil")
 	}
 
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	account := accountSlugAddr(caller, slug)
 
 	return &fnTeller{
diff --git a/examples/gno.land/p/demo/grc/grc20/tellers_test.gno b/examples/gno.land/p/demo/grc/grc20/tellers_test.gno
index 2a724964edc..3175359df85 100644
--- a/examples/gno.land/p/demo/grc/grc20/tellers_test.gno
+++ b/examples/gno.land/p/demo/grc/grc20/tellers_test.gno
@@ -115,12 +115,12 @@ func TestCallerTeller(t *testing.T) {
 	checkBalances(1000, 0, 0)
 	checkAllowances(0, 0, 0, 0, 0, 0)
 
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 	urequire.NoError(t, teller.Approve(bob, 600))
 	checkBalances(1000, 0, 0)
 	checkAllowances(600, 0, 0, 0, 0, 0)
 
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 	urequire.Error(t, teller.TransferFrom(alice, carl, 700))
 	checkBalances(1000, 0, 0)
 	checkAllowances(600, 0, 0, 0, 0, 0)
diff --git a/examples/gno.land/p/demo/grc/grc721/basic_nft.gno b/examples/gno.land/p/demo/grc/grc721/basic_nft.gno
index 0505aaa1c26..ed7f96dd598 100644
--- a/examples/gno.land/p/demo/grc/grc721/basic_nft.gno
+++ b/examples/gno.land/p/demo/grc/grc721/basic_nft.gno
@@ -81,7 +81,7 @@ func (s *basicNFT) SetTokenURI(tid TokenID, tURI TokenURI) (bool, error) {
 	if err != nil {
 		return false, err
 	}
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	if caller != owner {
 		return false, ErrCallerIsNotOwner
 	}
@@ -115,7 +115,7 @@ func (s *basicNFT) Approve(to std.Address, tid TokenID) error {
 		return ErrApprovalToCurrentOwner
 	}
 
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	if caller != owner && !s.IsApprovedForAll(owner, caller) {
 		return ErrCallerIsNotOwnerOrApproved
 	}
@@ -147,7 +147,7 @@ func (s *basicNFT) SetApprovalForAll(operator std.Address, approved bool) error
 		return ErrInvalidAddress
 	}
 
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	return s.setApprovalForAll(caller, operator, approved)
 }
 
@@ -155,7 +155,7 @@ func (s *basicNFT) SetApprovalForAll(operator std.Address, approved bool) error
 // contract recipients are aware of the GRC721 protocol to prevent
 // tokens from being forever locked.
 func (s *basicNFT) SafeTransferFrom(from, to std.Address, tid TokenID) error {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	if !s.isApprovedOrOwner(caller, tid) {
 		return ErrCallerIsNotOwnerOrApproved
 	}
@@ -174,7 +174,7 @@ func (s *basicNFT) SafeTransferFrom(from, to std.Address, tid TokenID) error {
 
 // Transfers `tokenId` token from `from` to `to`.
 func (s *basicNFT) TransferFrom(from, to std.Address, tid TokenID) error {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	if !s.isApprovedOrOwner(caller, tid) {
 		return ErrCallerIsNotOwnerOrApproved
 	}
diff --git a/examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno b/examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno
index 0481bf6b268..ed45373684a 100644
--- a/examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno
+++ b/examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno
@@ -111,7 +111,7 @@ func TestSetApprovalForAll(t *testing.T) {
 	dummy := NewBasicNFT(dummyNFTName, dummyNFTSymbol)
 	uassert.True(t, dummy != nil, "should not be nil")
 
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	isApprovedForAll := dummy.IsApprovedForAll(caller, addr)
@@ -136,7 +136,7 @@ func TestApprove(t *testing.T) {
 	dummy := NewBasicNFT(dummyNFTName, dummyNFTSymbol)
 	uassert.True(t, dummy != nil, "should not be nil")
 
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	dummy.mint(caller, TokenID("1"))
@@ -156,7 +156,7 @@ func TestTransferFrom(t *testing.T) {
 	dummy := NewBasicNFT(dummyNFTName, dummyNFTSymbol)
 	uassert.True(t, dummy != nil, "should not be nil")
 
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	dummy.mint(caller, TokenID("1"))
@@ -185,7 +185,7 @@ func TestSafeTransferFrom(t *testing.T) {
 	dummy := NewBasicNFT(dummyNFTName, dummyNFTSymbol)
 	uassert.True(t, dummy != nil, "should not be nil")
 
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	addr := std.Address("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	dummy.mint(caller, TokenID("1"))
@@ -259,7 +259,7 @@ func TestSetTokenURI(t *testing.T) {
 	addr2 := std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj")
 	tokenURI := "http://example.com/token"
 
-	std.TestSetOrigCaller(std.Address(addr1)) // addr1
+	std.TestSetOriginCaller(std.Address(addr1)) // addr1
 
 	dummy.mint(addr1, TokenID("1"))
 	_, derr := dummy.SetTokenURI(TokenID("1"), TokenURI(tokenURI))
@@ -269,13 +269,13 @@ func TestSetTokenURI(t *testing.T) {
 	_, err := dummy.SetTokenURI(TokenID("3"), TokenURI(tokenURI))
 	uassert.ErrorIs(t, err, ErrInvalidTokenId)
 
-	std.TestSetOrigCaller(std.Address(addr2)) // addr2
+	std.TestSetOriginCaller(std.Address(addr2)) // addr2
 
 	_, cerr := dummy.SetTokenURI(TokenID("1"), TokenURI(tokenURI)) // addr2 trying to set URI for token 1
 	uassert.ErrorIs(t, cerr, ErrCallerIsNotOwner)
 
 	// Test case: Retrieving TokenURI
-	std.TestSetOrigCaller(std.Address(addr1)) // addr1
+	std.TestSetOriginCaller(std.Address(addr1)) // addr1
 
 	dummyTokenURI, err := dummy.TokenURI(TokenID("1"))
 	uassert.NoError(t, err, "TokenURI error")
diff --git a/examples/gno.land/p/demo/grc/grc721/grc721_metadata_test.gno b/examples/gno.land/p/demo/grc/grc721/grc721_metadata_test.gno
index ad002a7c98e..b1de830fb36 100644
--- a/examples/gno.land/p/demo/grc/grc721/grc721_metadata_test.gno
+++ b/examples/gno.land/p/demo/grc/grc721/grc721_metadata_test.gno
@@ -31,7 +31,7 @@ func TestSetMetadata(t *testing.T) {
 	youtubeURL := "test"
 
 	// Set the original caller to addr1
-	std.TestSetOrigCaller(addr1) // addr1
+	std.TestSetOriginCaller(addr1) // addr1
 
 	// Mint a new token for addr1
 	dummy.mint(addr1, TokenID("1"))
@@ -69,7 +69,7 @@ func TestSetMetadata(t *testing.T) {
 	uassert.ErrorIs(t, err, ErrInvalidTokenId)
 
 	// Set the original caller to addr2
-	std.TestSetOrigCaller(addr2) // addr2
+	std.TestSetOriginCaller(addr2) // addr2
 
 	// Try to set metadata for token 1 from addr2 (should fail)
 	cerr := dummy.SetTokenMetadata(TokenID("1"), Metadata{
@@ -88,7 +88,7 @@ func TestSetMetadata(t *testing.T) {
 	uassert.ErrorIs(t, cerr, ErrCallerIsNotOwner)
 
 	// Set the original caller back to addr1
-	std.TestSetOrigCaller(addr1) // addr1
+	std.TestSetOriginCaller(addr1) // addr1
 
 	// Retrieve metadata for token 1
 	dummyMetadata, err := dummy.TokenMetadata(TokenID("1"))
diff --git a/examples/gno.land/p/demo/grc/grc721/grc721_royalty.gno b/examples/gno.land/p/demo/grc/grc721/grc721_royalty.gno
index 9831c709121..df13ae76d20 100644
--- a/examples/gno.land/p/demo/grc/grc721/grc721_royalty.gno
+++ b/examples/gno.land/p/demo/grc/grc721/grc721_royalty.gno
@@ -45,7 +45,7 @@ func (r *royaltyNFT) SetTokenRoyalty(tid TokenID, royaltyInfo RoyaltyInfo) error
 	if err != nil {
 		return err
 	}
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	if caller != owner {
 		return ErrCallerIsNotOwner
 	}
diff --git a/examples/gno.land/p/demo/grc/grc721/grc721_royalty_test.gno b/examples/gno.land/p/demo/grc/grc721/grc721_royalty_test.gno
index af5b4d3b239..7d732854a7c 100644
--- a/examples/gno.land/p/demo/grc/grc721/grc721_royalty_test.gno
+++ b/examples/gno.land/p/demo/grc/grc721/grc721_royalty_test.gno
@@ -21,7 +21,7 @@ func TestSetTokenRoyalty(t *testing.T) {
 	salePrice := uint64(1000)
 	expectRoyaltyAmount := uint64(100)
 
-	std.TestSetOrigCaller(addr1) // addr1
+	std.TestSetOriginCaller(addr1) // addr1
 
 	dummy.mint(addr1, TokenID("1"))
 
@@ -38,7 +38,7 @@ func TestSetTokenRoyalty(t *testing.T) {
 	})
 	uassert.ErrorIs(t, derr, ErrInvalidTokenId)
 
-	std.TestSetOrigCaller(addr2) // addr2
+	std.TestSetOriginCaller(addr2) // addr2
 
 	cerr := dummy.SetTokenRoyalty(TokenID("1"), RoyaltyInfo{
 		PaymentAddress: paymentAddress,
@@ -61,7 +61,7 @@ func TestSetTokenRoyalty(t *testing.T) {
 	uassert.ErrorIs(t, perr, ErrInvalidRoyaltyPercentage)
 
 	// Test case: Retrieving Royalty Info
-	std.TestSetOrigCaller(addr1) // addr1
+	std.TestSetOriginCaller(addr1) // addr1
 
 	dummyPaymentAddress, dummyRoyaltyAmount, rerr := dummy.RoyaltyInfo(TokenID("1"), salePrice)
 	uassert.NoError(t, rerr, "RoyaltyInfo error")
diff --git a/examples/gno.land/p/demo/memeland/memeland.gno b/examples/gno.land/p/demo/memeland/memeland.gno
index 38f42239bec..55a8dbb27b1 100644
--- a/examples/gno.land/p/demo/memeland/memeland.gno
+++ b/examples/gno.land/p/demo/memeland/memeland.gno
@@ -50,7 +50,7 @@ func (m *Memeland) PostMeme(data string, timestamp int64) string {
 	newPost := &Post{
 		ID:            id,
 		Data:          data,
-		Author:        std.PrevRealm().Addr(),
+		Author:        std.PreviousRealm().Address(),
 		Timestamp:     time.Unix(timestamp, 0),
 		UpvoteTracker: avl.NewTree(),
 	}
@@ -65,7 +65,7 @@ func (m *Memeland) Upvote(id string) string {
 		panic("post with specified ID does not exist")
 	}
 
-	caller := std.PrevRealm().Addr().String()
+	caller := std.PreviousRealm().Address().String()
 
 	if _, exists := post.UpvoteTracker.Get(caller); exists {
 		panic("user has already upvoted this post")
diff --git a/examples/gno.land/p/demo/memeland/memeland_test.gno b/examples/gno.land/p/demo/memeland/memeland_test.gno
index 95065b8cd64..bf1084a6f55 100644
--- a/examples/gno.land/p/demo/memeland/memeland_test.gno
+++ b/examples/gno.land/p/demo/memeland/memeland_test.gno
@@ -122,7 +122,7 @@ func TestGetPostsInRangeByUpvote(t *testing.T) {
 	m.Upvote(id2)
 
 	// Change caller so avoid double upvote panic
-	std.TestSetOrigCaller(testutils.TestAddress("alice"))
+	std.TestSetOriginCaller(testutils.TestAddress("alice"))
 	m.Upvote(id1)
 
 	// Final upvote count:
@@ -236,21 +236,21 @@ func TestUpvote(t *testing.T) {
 
 func TestDelete(t *testing.T) {
 	alice := testutils.TestAddress("alice")
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	// Alice is admin
 	m := NewMemeland()
 
 	// Set caller to Bob
 	bob := testutils.TestAddress("bob")
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 
 	// Bob adds post to Memeland
 	now := time.Now()
 	postID := m.PostMeme("Meme #1", now.Unix())
 
 	// Alice removes Bob's post
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	id := m.RemovePost(postID)
 	uassert.Equal(t, postID, id, "post IDs not matching")
@@ -259,7 +259,7 @@ func TestDelete(t *testing.T) {
 
 func TestDeleteByNonAdmin(t *testing.T) {
 	alice := testutils.TestAddress("alice")
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	m := NewMemeland()
 
@@ -269,7 +269,7 @@ func TestDeleteByNonAdmin(t *testing.T) {
 
 	// Bob will try to delete meme posted by Alice, which should fail
 	bob := testutils.TestAddress("bob")
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 
 	defer func() {
 		if r := recover(); r == nil {
diff --git a/examples/gno.land/p/demo/microblog/microblog.gno b/examples/gno.land/p/demo/microblog/microblog.gno
index f6d6709f20b..b94398f1cf0 100644
--- a/examples/gno.land/p/demo/microblog/microblog.gno
+++ b/examples/gno.land/p/demo/microblog/microblog.gno
@@ -48,7 +48,7 @@ func (m *Microblog) GetPages() []*Page {
 }
 
 func (m *Microblog) NewPost(text string) error {
-	author := std.GetOrigCaller()
+	author := std.OriginCaller()
 	_, found := m.Pages.Get(author.String())
 	if !found {
 		// make a new page for the new author
diff --git a/examples/gno.land/p/demo/nestedpkg/nestedpkg.gno b/examples/gno.land/p/demo/nestedpkg/nestedpkg.gno
index 4c489f430f9..9ed8f1a155c 100644
--- a/examples/gno.land/p/demo/nestedpkg/nestedpkg.gno
+++ b/examples/gno.land/p/demo/nestedpkg/nestedpkg.gno
@@ -2,10 +2,10 @@
 // It is useful for upgrade patterns relying on namespaces.
 package nestedpkg
 
-// To test this from a realm and have std.CurrentRealm/PrevRealm work correctly,
+// To test this from a realm and have std.CurrentRealm/PreviousRealm work correctly,
 // this file is tested from gno.land/r/demo/tests/nestedpkg_test.gno
 // XXX: move test to ths directory once we support testing a package and
-// specifying values for both PrevRealm and CurrentRealm.
+// specifying values for both PreviousRealm and CurrentRealm.
 
 import (
 	"std"
@@ -16,7 +16,7 @@ import (
 func IsCallerSubPath() bool {
 	var (
 		cur  = std.CurrentRealm().PkgPath() + "/"
-		prev = std.PrevRealm().PkgPath() + "/"
+		prev = std.PreviousRealm().PkgPath() + "/"
 	)
 	return strings.HasPrefix(prev, cur)
 }
@@ -25,7 +25,7 @@ func IsCallerSubPath() bool {
 func AssertCallerIsSubPath() {
 	var (
 		cur  = std.CurrentRealm().PkgPath() + "/"
-		prev = std.PrevRealm().PkgPath() + "/"
+		prev = std.PreviousRealm().PkgPath() + "/"
 	)
 	if !strings.HasPrefix(prev, cur) {
 		panic("call restricted to nested packages. current realm is " + cur + ", previous realm is " + prev)
@@ -36,7 +36,7 @@ func AssertCallerIsSubPath() {
 func IsCallerParentPath() bool {
 	var (
 		cur  = std.CurrentRealm().PkgPath() + "/"
-		prev = std.PrevRealm().PkgPath() + "/"
+		prev = std.PreviousRealm().PkgPath() + "/"
 	)
 	return strings.HasPrefix(cur, prev)
 }
@@ -45,7 +45,7 @@ func IsCallerParentPath() bool {
 func AssertCallerIsParentPath() {
 	var (
 		cur  = std.CurrentRealm().PkgPath() + "/"
-		prev = std.PrevRealm().PkgPath() + "/"
+		prev = std.PreviousRealm().PkgPath() + "/"
 	)
 	if !strings.HasPrefix(cur, prev) {
 		panic("call restricted to parent packages. current realm is " + cur + ", previous realm is " + prev)
@@ -56,7 +56,7 @@ func AssertCallerIsParentPath() {
 func IsSameNamespace() bool {
 	var (
 		cur  = nsFromPath(std.CurrentRealm().PkgPath()) + "/"
-		prev = nsFromPath(std.PrevRealm().PkgPath()) + "/"
+		prev = nsFromPath(std.PreviousRealm().PkgPath()) + "/"
 	)
 	return cur == prev
 }
@@ -65,7 +65,7 @@ func IsSameNamespace() bool {
 func AssertIsSameNamespace() {
 	var (
 		cur  = nsFromPath(std.CurrentRealm().PkgPath()) + "/"
-		prev = nsFromPath(std.PrevRealm().PkgPath()) + "/"
+		prev = nsFromPath(std.PreviousRealm().PkgPath()) + "/"
 	)
 	if cur != prev {
 		panic("call restricted to packages from the same namespace. current realm is " + cur + ", previous realm is " + prev)
diff --git a/examples/gno.land/p/demo/ownable/exts/authorizable/authorizable.gno b/examples/gno.land/p/demo/ownable/exts/authorizable/authorizable.gno
index 95bd2ac4959..ef2428ab2ed 100644
--- a/examples/gno.land/p/demo/ownable/exts/authorizable/authorizable.gno
+++ b/examples/gno.land/p/demo/ownable/exts/authorizable/authorizable.gno
@@ -72,7 +72,7 @@ func (a *Authorizable) DeleteFromAuthList(addr std.Address) error {
 }
 
 func (a Authorizable) CallerOnAuthList() error {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 
 	if !a.authorized.Has(caller.String()) {
 		return ErrNotInAuthList
@@ -82,7 +82,7 @@ func (a Authorizable) CallerOnAuthList() error {
 }
 
 func (a Authorizable) AssertOnAuthList() {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 
 	if !a.authorized.Has(caller.String()) {
 		panic(ErrNotInAuthList)
diff --git a/examples/gno.land/p/demo/ownable/exts/authorizable/authorizable_test.gno b/examples/gno.land/p/demo/ownable/exts/authorizable/authorizable_test.gno
index 10a5e411bdb..8fb1b9422f6 100644
--- a/examples/gno.land/p/demo/ownable/exts/authorizable/authorizable_test.gno
+++ b/examples/gno.land/p/demo/ownable/exts/authorizable/authorizable_test.gno
@@ -16,7 +16,7 @@ var (
 
 func TestNewAuthorizable(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice) // TODO(bug, issue #2371): should not be needed
+	std.TestSetOriginCaller(alice) // TODO(bug, issue #2371): should not be needed
 
 	a := NewAuthorizable()
 	got := a.Owner()
@@ -39,7 +39,7 @@ func TestNewAuthorizableWithAddress(t *testing.T) {
 func TestCallerOnAuthList(t *testing.T) {
 	a := NewAuthorizableWithAddress(alice)
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	if err := a.CallerOnAuthList(); err == ErrNotInAuthList {
 		t.Fatalf("expected alice to be on the list")
@@ -49,7 +49,7 @@ func TestCallerOnAuthList(t *testing.T) {
 func TestNotCallerOnAuthList(t *testing.T) {
 	a := NewAuthorizableWithAddress(alice)
 	std.TestSetRealm(std.NewUserRealm(bob))
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 
 	if err := a.CallerOnAuthList(); err == nil {
 		t.Fatalf("expected bob to not be on the list")
@@ -59,14 +59,14 @@ func TestNotCallerOnAuthList(t *testing.T) {
 func TestAddToAuthList(t *testing.T) {
 	a := NewAuthorizableWithAddress(alice)
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	if err := a.AddToAuthList(bob); err != nil {
 		t.Fatalf("Expected no error, got %v", err)
 	}
 
 	std.TestSetRealm(std.NewUserRealm(bob))
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 
 	if err := a.AddToAuthList(bob); err == nil {
 		t.Fatalf("Expected AddToAuth to error while bob called it, but it didn't")
@@ -76,7 +76,7 @@ func TestAddToAuthList(t *testing.T) {
 func TestDeleteFromList(t *testing.T) {
 	a := NewAuthorizableWithAddress(alice)
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	if err := a.AddToAuthList(bob); err != nil {
 		t.Fatalf("Expected no error, got %v", err)
@@ -87,7 +87,7 @@ func TestDeleteFromList(t *testing.T) {
 	}
 
 	std.TestSetRealm(std.NewUserRealm(bob))
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 
 	// Try an unauthorized deletion
 	if err := a.DeleteFromAuthList(alice); err == nil {
@@ -95,7 +95,7 @@ func TestDeleteFromList(t *testing.T) {
 	}
 
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	if err := a.DeleteFromAuthList(charlie); err != nil {
 		t.Fatalf("Expected no error, got %v", err)
@@ -104,11 +104,11 @@ func TestDeleteFromList(t *testing.T) {
 
 func TestAssertOnList(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 	a := NewAuthorizableWithAddress(alice)
 
 	std.TestSetRealm(std.NewUserRealm(bob))
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 
 	uassert.PanicsWithMessage(t, ErrNotInAuthList.Error(), func() {
 		a.AssertOnAuthList()
diff --git a/examples/gno.land/p/demo/ownable/ownable.gno b/examples/gno.land/p/demo/ownable/ownable.gno
index a8cb5ea95a7..96ed0955240 100644
--- a/examples/gno.land/p/demo/ownable/ownable.gno
+++ b/examples/gno.land/p/demo/ownable/ownable.gno
@@ -13,7 +13,7 @@ type Ownable struct {
 
 func New() *Ownable {
 	return &Ownable{
-		owner: std.PrevRealm().Addr(),
+		owner: std.PreviousRealm().Address(),
 	}
 }
 
@@ -77,7 +77,7 @@ func (o *Ownable) CallerIsOwner() bool {
 	if o == nil {
 		return false
 	}
-	return std.PrevRealm().Addr() == o.owner
+	return std.PreviousRealm().Address() == o.owner
 }
 
 // AssertCallerIsOwner panics if the caller is not the owner
@@ -85,7 +85,7 @@ func (o *Ownable) AssertCallerIsOwner() {
 	if o == nil {
 		panic(ErrUnauthorized)
 	}
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	if caller != o.owner {
 		panic(ErrUnauthorized)
 	}
diff --git a/examples/gno.land/p/demo/ownable/ownable_test.gno b/examples/gno.land/p/demo/ownable/ownable_test.gno
index d8b7f9a8e3a..c2a9595e192 100644
--- a/examples/gno.land/p/demo/ownable/ownable_test.gno
+++ b/examples/gno.land/p/demo/ownable/ownable_test.gno
@@ -16,7 +16,7 @@ var (
 
 func TestNew(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice) // TODO(bug): should not be needed
+	std.TestSetOriginCaller(alice) // TODO(bug): should not be needed
 
 	o := New()
 	got := o.Owner()
@@ -50,7 +50,7 @@ func TestCallerIsOwner(t *testing.T) {
 	unauthorizedCaller := bob
 
 	std.TestSetRealm(std.NewUserRealm(unauthorizedCaller))
-	std.TestSetOrigCaller(unauthorizedCaller) // TODO(bug): should not be needed
+	std.TestSetOriginCaller(unauthorizedCaller) // TODO(bug): should not be needed
 
 	uassert.False(t, o.CallerIsOwner())
 }
@@ -71,12 +71,12 @@ func TestDropOwnership(t *testing.T) {
 
 func TestErrUnauthorized(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice) // TODO(bug): should not be needed
+	std.TestSetOriginCaller(alice) // TODO(bug): should not be needed
 
 	o := New()
 
 	std.TestSetRealm(std.NewUserRealm(bob))
-	std.TestSetOrigCaller(bob) // TODO(bug): should not be needed
+	std.TestSetOriginCaller(bob) // TODO(bug): should not be needed
 
 	uassert.ErrorContains(t, o.TransferOwnership(alice), ErrUnauthorized.Error())
 	uassert.ErrorContains(t, o.DropOwnership(), ErrUnauthorized.Error())
@@ -96,7 +96,7 @@ func TestErrInvalidAddress(t *testing.T) {
 
 func TestAssertCallerIsOwner(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	o := New()
 
@@ -105,7 +105,7 @@ func TestAssertCallerIsOwner(t *testing.T) {
 
 	// Should panic when caller is not owner
 	std.TestSetRealm(std.NewUserRealm(bob))
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 
 	defer func() {
 		r := recover()
diff --git a/examples/gno.land/p/demo/pausable/pausable_test.gno b/examples/gno.land/p/demo/pausable/pausable_test.gno
index 47028cd85c8..41e4534ee5b 100644
--- a/examples/gno.land/p/demo/pausable/pausable_test.gno
+++ b/examples/gno.land/p/demo/pausable/pausable_test.gno
@@ -15,14 +15,14 @@ var (
 )
 
 func TestNewFromOwnable(t *testing.T) {
-	std.TestSetOrigCaller(firstCaller)
+	std.TestSetOriginCaller(firstCaller)
 
 	result := NewFromOwnable(o)
 	urequire.Equal(t, firstCaller.String(), result.Ownable().Owner().String())
 }
 
 func TestSetUnpaused(t *testing.T) {
-	std.TestSetOrigCaller(firstCaller)
+	std.TestSetOriginCaller(firstCaller)
 	result := NewFromOwnable(o)
 
 	result.Unpause()
@@ -30,7 +30,7 @@ func TestSetUnpaused(t *testing.T) {
 }
 
 func TestSetPaused(t *testing.T) {
-	std.TestSetOrigCaller(firstCaller)
+	std.TestSetOriginCaller(firstCaller)
 	result := NewFromOwnable(o)
 
 	result.Pause()
@@ -41,7 +41,7 @@ func TestIsPaused(t *testing.T) {
 	result := NewFromOwnable(o)
 	urequire.False(t, result.IsPaused(), "Expected result to be unpaused")
 
-	std.TestSetOrigCaller(firstCaller)
+	std.TestSetOriginCaller(firstCaller)
 	result.Pause()
 	uassert.True(t, result.IsPaused(), "Expected result to be paused")
 }
diff --git a/examples/gno.land/p/demo/simpledao/dao.gno b/examples/gno.land/p/demo/simpledao/dao.gno
index 837f64a41d6..a8194eecdea 100644
--- a/examples/gno.land/p/demo/simpledao/dao.gno
+++ b/examples/gno.land/p/demo/simpledao/dao.gno
@@ -56,7 +56,7 @@ func (s *SimpleDAO) Propose(request dao.ProposalRequest) (uint64, error) {
 
 	var (
 		caller      = getDAOCaller()
-		sentCoins   = std.GetOrigSend() // Get the sent coins, if any
+		sentCoins   = std.OriginSend() // Get the sent coins, if any
 		canCoverFee = sentCoins.AmountOf("ugnot") >= minProposalFee.Amount
 	)
 
@@ -168,7 +168,7 @@ func (s *SimpleDAO) VoteOnProposal(id uint64, option dao.VoteOption) error {
 func (s *SimpleDAO) ExecuteProposal(id uint64) error {
 	var (
 		caller      = getDAOCaller()
-		sentCoins   = std.GetOrigSend() // Get the sent coins, if any
+		sentCoins   = std.OriginSend() // Get the sent coins, if any
 		canCoverFee = sentCoins.AmountOf("ugnot") >= minExecuteFee.Amount
 	)
 
@@ -219,5 +219,5 @@ func (s *SimpleDAO) ExecuteProposal(id uint64) error {
 // However, the current MsgRun context does not persist escaping the main() scope.
 // Until a better solution is developed, this enables proposals to be made through a package deployment + init()
 func getDAOCaller() std.Address {
-	return std.GetOrigCaller()
+	return std.OriginCaller()
 }
diff --git a/examples/gno.land/p/demo/simpledao/dao_test.gno b/examples/gno.land/p/demo/simpledao/dao_test.gno
index 275455d1479..1e67c0a8b64 100644
--- a/examples/gno.land/p/demo/simpledao/dao_test.gno
+++ b/examples/gno.land/p/demo/simpledao/dao_test.gno
@@ -74,7 +74,7 @@ func TestSimpleDAO_Propose(t *testing.T) {
 			s = New(ms)
 		)
 
-		std.TestSetOrigSend(sentCoins, std.Coins{})
+		std.TestSetOriginSend(sentCoins, std.Coins{})
 
 		_, err := s.Propose(dao.ProposalRequest{
 			Executor: ex,
@@ -121,7 +121,7 @@ func TestSimpleDAO_Propose(t *testing.T) {
 
 		// Set the sent coins to be lower
 		// than the proposal fee
-		std.TestSetOrigSend(sentCoins, std.Coins{})
+		std.TestSetOriginSend(sentCoins, std.Coins{})
 
 		_, err := s.Propose(dao.ProposalRequest{
 			Executor: ex,
@@ -171,8 +171,8 @@ func TestSimpleDAO_Propose(t *testing.T) {
 
 		// Set the sent coins to be enough
 		// to cover the fee
-		std.TestSetOrigSend(sentCoins, std.Coins{})
-		std.TestSetOrigCaller(proposer)
+		std.TestSetOriginSend(sentCoins, std.Coins{})
+		std.TestSetOriginCaller(proposer)
 
 		// Make sure the proposal was added
 		id, err := s.Propose(dao.ProposalRequest{
@@ -221,7 +221,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 			s = New(ms)
 		)
 
-		std.TestSetOrigCaller(voter)
+		std.TestSetOriginCaller(voter)
 
 		// Attempt to vote on the proposal
 		uassert.ErrorContains(
@@ -251,7 +251,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 			s = New(ms)
 		)
 
-		std.TestSetOrigCaller(voter)
+		std.TestSetOriginCaller(voter)
 
 		// Attempt to vote on the proposal
 		uassert.ErrorContains(
@@ -285,7 +285,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 			}
 		)
 
-		std.TestSetOrigCaller(voter)
+		std.TestSetOriginCaller(voter)
 
 		// Add an initial proposal
 		id, err := s.addProposal(prop)
@@ -327,7 +327,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 			}
 		)
 
-		std.TestSetOrigCaller(voter)
+		std.TestSetOriginCaller(voter)
 
 		// Cast the initial vote
 		urequire.NoError(t, prop.tally.castVote(member, dao.YesVote))
@@ -386,7 +386,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 
 		majorityIndex := (len(members)*2)/3 + 1 // 2/3+
 		for _, m := range members[:majorityIndex] {
-			std.TestSetOrigCaller(m.Address)
+			std.TestSetOriginCaller(m.Address)
 
 			// Attempt to vote on the proposal
 			urequire.NoError(
@@ -441,7 +441,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 
 		majorityIndex := (len(members)*2)/3 + 1 // 2/3+
 		for _, m := range members[:majorityIndex] {
-			std.TestSetOrigCaller(m.Address)
+			std.TestSetOriginCaller(m.Address)
 
 			// Attempt to vote on the proposal
 			urequire.NoError(
@@ -496,7 +496,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 
 		majorityIndex := (len(members)*2)/3 + 1 // 2/3+
 		for _, m := range members[:majorityIndex] {
-			std.TestSetOrigCaller(m.Address)
+			std.TestSetOriginCaller(m.Address)
 
 			// Attempt to vote on the proposal
 			urequire.NoError(
@@ -551,7 +551,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 
 		// The first half votes yes
 		for _, m := range members[:len(members)/2] {
-			std.TestSetOrigCaller(m.Address)
+			std.TestSetOriginCaller(m.Address)
 
 			// Attempt to vote on the proposal
 			urequire.NoError(
@@ -562,7 +562,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 
 		// The other half votes no
 		for _, m := range members[len(members)/2:] {
-			std.TestSetOrigCaller(m.Address)
+			std.TestSetOriginCaller(m.Address)
 
 			// Attempt to vote on the proposal
 			urequire.NoError(
@@ -618,7 +618,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 
 		// The first quarter votes yes
 		for _, m := range members[:len(members)/4] {
-			std.TestSetOrigCaller(m.Address)
+			std.TestSetOriginCaller(m.Address)
 
 			// Attempt to vote on the proposal
 			urequire.NoError(
@@ -629,7 +629,7 @@ func TestSimpleDAO_VoteOnProposal(t *testing.T) {
 
 		// The second quarter votes no
 		for _, m := range members[len(members)/4 : len(members)/2] {
-			std.TestSetOrigCaller(m.Address)
+			std.TestSetOriginCaller(m.Address)
 
 			// Attempt to vote on the proposal
 			urequire.NoError(
@@ -668,7 +668,7 @@ func TestSimpleDAO_ExecuteProposal(t *testing.T) {
 
 		// Set the sent coins to be lower
 		// than the execute fee
-		std.TestSetOrigSend(sentCoins, std.Coins{})
+		std.TestSetOriginSend(sentCoins, std.Coins{})
 
 		uassert.ErrorIs(
 			t,
@@ -699,7 +699,7 @@ func TestSimpleDAO_ExecuteProposal(t *testing.T) {
 
 		// Set the sent coins to be enough
 		// so the execution can take place
-		std.TestSetOrigSend(sentCoins, std.Coins{})
+		std.TestSetOriginSend(sentCoins, std.Coins{})
 
 		uassert.ErrorContains(
 			t,
@@ -726,7 +726,7 @@ func TestSimpleDAO_ExecuteProposal(t *testing.T) {
 			}
 		)
 
-		std.TestSetOrigCaller(voter)
+		std.TestSetOriginCaller(voter)
 
 		// Add an initial proposal
 		id, err := s.addProposal(prop)
@@ -776,7 +776,7 @@ func TestSimpleDAO_ExecuteProposal(t *testing.T) {
 					}
 				)
 
-				std.TestSetOrigCaller(voter)
+				std.TestSetOriginCaller(voter)
 
 				// Add an initial proposal
 				id, err := s.addProposal(prop)
@@ -820,7 +820,7 @@ func TestSimpleDAO_ExecuteProposal(t *testing.T) {
 			}
 		)
 
-		std.TestSetOrigCaller(voter)
+		std.TestSetOriginCaller(voter)
 
 		// Add an initial proposal
 		id, err := s.addProposal(prop)
@@ -864,7 +864,7 @@ func TestSimpleDAO_ExecuteProposal(t *testing.T) {
 			}
 		)
 
-		std.TestSetOrigCaller(voter)
+		std.TestSetOriginCaller(voter)
 
 		// Add an initial proposal
 		id, err := s.addProposal(prop)
diff --git a/examples/gno.land/p/demo/subscription/lifetime/lifetime.gno b/examples/gno.land/p/demo/subscription/lifetime/lifetime.gno
index be661e70129..cbd7fde04a4 100644
--- a/examples/gno.land/p/demo/subscription/lifetime/lifetime.gno
+++ b/examples/gno.land/p/demo/subscription/lifetime/lifetime.gno
@@ -26,7 +26,7 @@ func NewLifetimeSubscription(amount int64) *LifetimeSubscription {
 
 // processSubscription handles the subscription process for a given receiver.
 func (ls *LifetimeSubscription) processSubscription(receiver std.Address) error {
-	amount := std.GetOrigSend()
+	amount := std.OriginSend()
 
 	if amount.AmountOf("ugnot") != ls.amount {
 		return ErrAmt
@@ -45,7 +45,7 @@ func (ls *LifetimeSubscription) processSubscription(receiver std.Address) error
 
 // Subscribe processes the payment for a lifetime subscription.
 func (ls *LifetimeSubscription) Subscribe() error {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	return ls.processSubscription(caller)
 }
 
diff --git a/examples/gno.land/p/demo/subscription/lifetime/lifetime_test.gno b/examples/gno.land/p/demo/subscription/lifetime/lifetime_test.gno
index efbae90c11c..eba1f2b5367 100644
--- a/examples/gno.land/p/demo/subscription/lifetime/lifetime_test.gno
+++ b/examples/gno.land/p/demo/subscription/lifetime/lifetime_test.gno
@@ -18,11 +18,11 @@ func TestLifetimeSubscription(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	ls := NewLifetimeSubscription(1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err := ls.Subscribe()
 	uassert.NoError(t, err, "Expected ProcessPayment to succeed")
 
-	err = ls.HasValidSubscription(std.PrevRealm().Addr())
+	err = ls.HasValidSubscription(std.PreviousRealm().Address())
 	uassert.NoError(t, err, "Expected Alice to have access")
 }
 
@@ -30,7 +30,7 @@ func TestLifetimeSubscriptionGift(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	ls := NewLifetimeSubscription(1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err := ls.GiftSubscription(bob)
 	uassert.NoError(t, err, "Expected ProcessPaymentGift to succeed for Bob")
 
@@ -48,7 +48,7 @@ func TestUpdateAmountAuthorization(t *testing.T) {
 	err := ls.UpdateAmount(2000)
 	uassert.NoError(t, err, "Expected Alice to succeed in updating amount")
 
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 
 	err = ls.UpdateAmount(3000)
 	uassert.Error(t, err, "Expected Bob to fail when updating amount")
@@ -58,7 +58,7 @@ func TestIncorrectPaymentAmount(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	ls := NewLifetimeSubscription(1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 500}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 500}}, nil)
 	err := ls.Subscribe()
 	uassert.Error(t, err, "Expected payment to fail with incorrect amount")
 }
@@ -67,11 +67,11 @@ func TestMultipleSubscriptionAttempts(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	ls := NewLifetimeSubscription(1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err := ls.Subscribe()
 	uassert.NoError(t, err, "Expected first subscription to succeed")
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err = ls.Subscribe()
 	uassert.Error(t, err, "Expected second subscription to fail as Alice is already subscribed")
 }
@@ -80,7 +80,7 @@ func TestGiftSubscriptionWithIncorrectAmount(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	ls := NewLifetimeSubscription(1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 500}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 500}}, nil)
 	err := ls.GiftSubscription(bob)
 	uassert.Error(t, err, "Expected gift subscription to fail with incorrect amount")
 
@@ -95,11 +95,11 @@ func TestUpdateAmountEffectiveness(t *testing.T) {
 	err := ls.UpdateAmount(2000)
 	uassert.NoError(t, err, "Expected Alice to succeed in updating amount")
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err = ls.Subscribe()
 	uassert.Error(t, err, "Expected subscription to fail with old amount after update")
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 2000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 2000}}, nil)
 	err = ls.Subscribe()
 	uassert.NoError(t, err, "Expected subscription to succeed with new amount")
 }
diff --git a/examples/gno.land/p/demo/subscription/recurring/recurring.gno b/examples/gno.land/p/demo/subscription/recurring/recurring.gno
index 8f116009aa6..2582c959bc6 100644
--- a/examples/gno.land/p/demo/subscription/recurring/recurring.gno
+++ b/examples/gno.land/p/demo/subscription/recurring/recurring.gno
@@ -43,7 +43,7 @@ func (rs *RecurringSubscription) HasValidSubscription(addr std.Address) error {
 
 // processSubscription processes the payment for a given receiver and renews or adds their subscription.
 func (rs *RecurringSubscription) processSubscription(receiver std.Address) error {
-	amount := std.GetOrigSend()
+	amount := std.OriginSend()
 
 	if amount.AmountOf("ugnot") != rs.amount {
 		return ErrAmt
@@ -68,7 +68,7 @@ func (rs *RecurringSubscription) processSubscription(receiver std.Address) error
 
 // Subscribe handles the payment for the caller's subscription.
 func (rs *RecurringSubscription) Subscribe() error {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 
 	return rs.processSubscription(caller)
 }
diff --git a/examples/gno.land/p/demo/subscription/recurring/recurring_test.gno b/examples/gno.land/p/demo/subscription/recurring/recurring_test.gno
index 0b458b716ec..c3289c05388 100644
--- a/examples/gno.land/p/demo/subscription/recurring/recurring_test.gno
+++ b/examples/gno.land/p/demo/subscription/recurring/recurring_test.gno
@@ -19,14 +19,14 @@ func TestRecurringSubscription(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	rs := NewRecurringSubscription(time.Hour*24, 1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err := rs.Subscribe()
 	uassert.NoError(t, err, "Expected ProcessPayment to succeed for Alice")
 
-	err = rs.HasValidSubscription(std.PrevRealm().Addr())
+	err = rs.HasValidSubscription(std.PreviousRealm().Address())
 	uassert.NoError(t, err, "Expected Alice to have access")
 
-	_, err = rs.GetExpiration(std.PrevRealm().Addr())
+	_, err = rs.GetExpiration(std.PreviousRealm().Address())
 	uassert.NoError(t, err, "Expected to get expiration for Alice")
 }
 
@@ -34,7 +34,7 @@ func TestRecurringSubscriptionGift(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	rs := NewRecurringSubscription(time.Hour*24, 1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err := rs.GiftSubscription(bob)
 	uassert.NoError(t, err, "Expected ProcessPaymentGift to succeed for Bob")
 
@@ -49,17 +49,17 @@ func TestRecurringSubscriptionExpiration(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	rs := NewRecurringSubscription(time.Hour, 1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err := rs.Subscribe()
 	uassert.NoError(t, err, "Expected ProcessPayment to succeed for Alice")
 
-	err = rs.HasValidSubscription(std.PrevRealm().Addr())
+	err = rs.HasValidSubscription(std.PreviousRealm().Address())
 	uassert.NoError(t, err, "Expected Alice to have access")
 
 	expiration := time.Now().Add(-time.Hour * 2)
-	rs.subs.Set(std.PrevRealm().Addr().String(), expiration)
+	rs.subs.Set(std.PreviousRealm().Address().String(), expiration)
 
-	err = rs.HasValidSubscription(std.PrevRealm().Addr())
+	err = rs.HasValidSubscription(std.PreviousRealm().Address())
 	uassert.Error(t, err, "Expected Alice's subscription to be expired")
 }
 
@@ -70,7 +70,7 @@ func TestUpdateAmountAuthorization(t *testing.T) {
 	err := rs.UpdateAmount(2000)
 	uassert.NoError(t, err, "Expected Alice to succeed in updating amount")
 
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 	err = rs.UpdateAmount(3000)
 	uassert.Error(t, err, "Expected Bob to fail when updating amount")
 }
@@ -93,7 +93,7 @@ func TestIncorrectPaymentAmount(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	rs := NewRecurringSubscription(time.Hour*24, 1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 500}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 500}}, nil)
 	err := rs.Subscribe()
 	uassert.Error(t, err, "Expected payment with incorrect amount to fail")
 }
@@ -102,11 +102,11 @@ func TestMultiplePaymentsForSameUser(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	rs := NewRecurringSubscription(time.Hour*24, 1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err := rs.Subscribe()
 	uassert.NoError(t, err, "Expected first ProcessPayment to succeed for Alice")
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err = rs.Subscribe()
 	uassert.Error(t, err, "Expected second ProcessPayment to fail for Alice due to existing subscription")
 }
@@ -115,20 +115,20 @@ func TestRecurringSubscriptionWithMultiplePayments(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
 	rs := NewRecurringSubscription(time.Hour, 1000)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err := rs.Subscribe()
 	uassert.NoError(t, err, "Expected first ProcessPayment to succeed for Alice")
 
-	err = rs.HasValidSubscription(std.PrevRealm().Addr())
+	err = rs.HasValidSubscription(std.PreviousRealm().Address())
 	uassert.NoError(t, err, "Expected Alice to have access after first payment")
 
 	expiration := time.Now().Add(-time.Hour * 2)
-	rs.subs.Set(std.PrevRealm().Addr().String(), expiration)
+	rs.subs.Set(std.PreviousRealm().Address().String(), expiration)
 
-	std.TestSetOrigSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
+	std.TestSetOriginSend([]std.Coin{{Denom: "ugnot", Amount: 1000}}, nil)
 	err = rs.Subscribe()
 	uassert.NoError(t, err, "Expected second ProcessPayment to succeed for Alice")
 
-	err = rs.HasValidSubscription(std.PrevRealm().Addr())
+	err = rs.HasValidSubscription(std.PreviousRealm().Address())
 	uassert.NoError(t, err, "Expected Alice to have access after second payment")
 }
diff --git a/examples/gno.land/p/demo/tests/subtests/subtests.gno b/examples/gno.land/p/demo/tests/subtests/subtests.gno
index e8796a73081..8a7f3572cfa 100644
--- a/examples/gno.land/p/demo/tests/subtests/subtests.gno
+++ b/examples/gno.land/p/demo/tests/subtests/subtests.gno
@@ -8,8 +8,8 @@ func GetCurrentRealm() std.Realm {
 	return std.CurrentRealm()
 }
 
-func GetPrevRealm() std.Realm {
-	return std.PrevRealm()
+func GetPreviousRealm() std.Realm {
+	return std.PreviousRealm()
 }
 
 func Exec(fn func()) {
diff --git a/examples/gno.land/p/demo/tests/tests.gno b/examples/gno.land/p/demo/tests/tests.gno
index ffad5b8c8cd..ae3468c5d48 100644
--- a/examples/gno.land/p/demo/tests/tests.gno
+++ b/examples/gno.land/p/demo/tests/tests.gno
@@ -47,12 +47,12 @@ func ModifyTestRealmObject2c() {
 	SomeValue3.Field = "modified"
 }
 
-func GetPrevRealm() std.Realm {
-	return std.PrevRealm()
+func GetPreviousRealm() std.Realm {
+	return std.PreviousRealm()
 }
 
-func GetPSubtestsPrevRealm() std.Realm {
-	return psubtests.GetPrevRealm()
+func GetPSubtestsPreviousRealm() std.Realm {
+	return psubtests.GetPreviousRealm()
 }
 
 // Warning: unsafe pattern.
diff --git a/examples/gno.land/p/demo/testutils/misc.gno b/examples/gno.land/p/demo/testutils/misc.gno
index d48304ad441..60dd611ef49 100644
--- a/examples/gno.land/p/demo/testutils/misc.gno
+++ b/examples/gno.land/p/demo/testutils/misc.gno
@@ -1,6 +1,6 @@
 package testutils
 
-// For testing std.GetCallerAt().
+// For testing std.CallerAt().
 func WrapCall(fn func()) {
 	fn()
 }
diff --git a/examples/gno.land/p/demo/todolist/todolist.gno b/examples/gno.land/p/demo/todolist/todolist.gno
index a675344655f..531daf1dcb3 100644
--- a/examples/gno.land/p/demo/todolist/todolist.gno
+++ b/examples/gno.land/p/demo/todolist/todolist.gno
@@ -22,7 +22,7 @@ func NewTodoList(title string) *TodoList {
 	return &TodoList{
 		Title: title,
 		Tasks: avl.NewTree(),
-		Owner: std.GetOrigCaller(),
+		Owner: std.OriginCaller(),
 	}
 }
 
diff --git a/examples/gno.land/p/demo/todolist/todolist_test.gno b/examples/gno.land/p/demo/todolist/todolist_test.gno
index 85836e2a17f..26daf05a374 100644
--- a/examples/gno.land/p/demo/todolist/todolist_test.gno
+++ b/examples/gno.land/p/demo/todolist/todolist_test.gno
@@ -13,7 +13,7 @@ func TestNewTodoList(t *testing.T) {
 
 	uassert.Equal(t, title, todoList.GetTodolistTitle())
 	uassert.Equal(t, 0, len(todoList.GetTasks()))
-	uassert.Equal(t, std.GetOrigCaller().String(), todoList.GetTodolistOwner().String())
+	uassert.Equal(t, std.OriginCaller().String(), todoList.GetTodolistOwner().String())
 }
 
 func TestNewTask(t *testing.T) {
diff --git a/examples/gno.land/p/moul/debug/debug.gno b/examples/gno.land/p/moul/debug/debug.gno
index 9ba3dd36a98..3bfe612c780 100644
--- a/examples/gno.land/p/moul/debug/debug.gno
+++ b/examples/gno.land/p/moul/debug/debug.gno
@@ -50,10 +50,10 @@ func (d Debug) Render(path string) string {
 			Headers: []string{"Key", "Value"},
 		}
 		table.Append([]string{"`std.CurrentRealm().PkgPath()`", string(std.CurrentRealm().PkgPath())})
-		table.Append([]string{"`std.CurrentRealm().Addr()`", string(std.CurrentRealm().Addr())})
-		table.Append([]string{"`std.PrevRealm().PkgPath()`", string(std.PrevRealm().PkgPath())})
-		table.Append([]string{"`std.PrevRealm().Addr()`", string(std.PrevRealm().Addr())})
-		table.Append([]string{"`std.GetHeight()`", ufmt.Sprintf("%d", std.GetHeight())})
+		table.Append([]string{"`std.CurrentRealm().Address()`", string(std.CurrentRealm().Address())})
+		table.Append([]string{"`std.PreviousRealm().PkgPath()`", string(std.PreviousRealm().PkgPath())})
+		table.Append([]string{"`std.PreviousRealm().Address()`", string(std.PreviousRealm().Address())})
+		table.Append([]string{"`std.ChainHeight()`", ufmt.Sprintf("%d", std.ChainHeight())})
 		table.Append([]string{"`time.Now().Format(time.RFC3339)`", time.Now().Format(time.RFC3339)})
 		content += table.String()
 	}
diff --git a/examples/gno.land/p/moul/debug/z1_filetest.gno b/examples/gno.land/p/moul/debug/z1_filetest.gno
index 8203749d3c7..5016fdab605 100644
--- a/examples/gno.land/p/moul/debug/z1_filetest.gno
+++ b/examples/gno.land/p/moul/debug/z1_filetest.gno
@@ -20,10 +20,10 @@ func main() {
 // | Key | Value |
 // | --- | --- |
 // | `std.CurrentRealm().PkgPath()` |  |
-// | `std.CurrentRealm().Addr()` | g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm |
-// | `std.PrevRealm().PkgPath()` |  |
-// | `std.PrevRealm().Addr()` | g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm |
-// | `std.GetHeight()` | 123 |
+// | `std.CurrentRealm().Address()` | g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm |
+// | `std.PreviousRealm().PkgPath()` |  |
+// | `std.PreviousRealm().Address()` | g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm |
+// | `std.ChainHeight()` | 123 |
 // | `time.Now().Format(time.RFC3339)` | 2009-02-13T23:31:30Z |
 //
 // </details>
diff --git a/examples/gno.land/p/moul/debug/z2_filetest.gno b/examples/gno.land/p/moul/debug/z2_filetest.gno
index 32c2fe49951..fab7e57cdc2 100644
--- a/examples/gno.land/p/moul/debug/z2_filetest.gno
+++ b/examples/gno.land/p/moul/debug/z2_filetest.gno
@@ -26,10 +26,10 @@ func main() {
 // | Key | Value |
 // | --- | --- |
 // | `std.CurrentRealm().PkgPath()` |  |
-// | `std.CurrentRealm().Addr()` | g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm |
-// | `std.PrevRealm().PkgPath()` |  |
-// | `std.PrevRealm().Addr()` | g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm |
-// | `std.GetHeight()` | 123 |
+// | `std.CurrentRealm().Address()` | g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm |
+// | `std.PreviousRealm().PkgPath()` |  |
+// | `std.PreviousRealm().Address()` | g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm |
+// | `std.ChainHeight()` | 123 |
 // | `time.Now().Format(time.RFC3339)` | 2009-02-13T23:31:30Z |
 //
 // </details>
diff --git a/examples/gno.land/p/n2p5/loci/loci.gno b/examples/gno.land/p/n2p5/loci/loci.gno
index 7bd5c29c3af..a50c537a8f4 100644
--- a/examples/gno.land/p/n2p5/loci/loci.gno
+++ b/examples/gno.land/p/n2p5/loci/loci.gno
@@ -25,10 +25,10 @@ func New() *LociStore {
 	}
 }
 
-// Set stores a byte slice in the AVL tree using the `std.PrevRealm().Addr()`
+// Set stores a byte slice in the AVL tree using the `std.PreviousRealm().Address()`
 // string as the key.
 func (s *LociStore) Set(value []byte) {
-	key := string(std.PrevRealm().Addr())
+	key := string(std.PreviousRealm().Address())
 	s.internal.Set(key, value)
 }
 
diff --git a/examples/gno.land/p/n2p5/loci/loci_test.gno b/examples/gno.land/p/n2p5/loci/loci_test.gno
index 6df6d4f9b2d..ad5342edf2d 100644
--- a/examples/gno.land/p/n2p5/loci/loci_test.gno
+++ b/examples/gno.land/p/n2p5/loci/loci_test.gno
@@ -15,7 +15,7 @@ func TestLociStore(t *testing.T) {
 
 		m1 := []byte("hello")
 		m2 := []byte("world")
-		std.TestSetOrigCaller(u1)
+		std.TestSetOriginCaller(u1)
 
 		// Ensure that the value is nil before setting it.
 		r1 := store.Get(u1)
@@ -47,11 +47,11 @@ func TestLociStore(t *testing.T) {
 		m2 := []byte("world")
 		m3 := []byte("goodbye")
 
-		std.TestSetOrigCaller(u1)
+		std.TestSetOriginCaller(u1)
 		store.Set(m1)
-		std.TestSetOrigCaller(u2)
+		std.TestSetOriginCaller(u2)
 		store.Set(m2)
-		std.TestSetOrigCaller(u3)
+		std.TestSetOriginCaller(u3)
 		store.Set(m3)
 
 		// Ensure that the value is correct after setting it.
diff --git a/examples/gno.land/p/n2p5/mgroup/mgroup.gno b/examples/gno.land/p/n2p5/mgroup/mgroup.gno
index 566d625a003..6e14ca6d38b 100644
--- a/examples/gno.land/p/n2p5/mgroup/mgroup.gno
+++ b/examples/gno.land/p/n2p5/mgroup/mgroup.gno
@@ -74,7 +74,7 @@ func (g *ManagedGroup) RemoveBackupOwner(addr std.Address) error {
 // If the caller is not a backup owner, an error is returned.
 // The caller is automatically added as a member of the group.
 func (g *ManagedGroup) ClaimOwnership() error {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	// already owner, skip
 	if caller == g.Owner() {
 		return nil
diff --git a/examples/gno.land/p/n2p5/mgroup/mgroup_test.gno b/examples/gno.land/p/n2p5/mgroup/mgroup_test.gno
index cd02db98683..13db176d8bf 100644
--- a/examples/gno.land/p/n2p5/mgroup/mgroup_test.gno
+++ b/examples/gno.land/p/n2p5/mgroup/mgroup_test.gno
@@ -21,7 +21,7 @@ func TestManagedGroup(t *testing.T) {
 		g := New(u1)
 		// happy path
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			err := g.AddBackupOwner(u2)
 			if err != nil {
 				t.Errorf("expected nil, got %v", err.Error())
@@ -29,7 +29,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// ensure checking for authorized caller
 		{
-			std.TestSetOrigCaller(u2)
+			std.TestSetOriginCaller(u2)
 			err := g.AddBackupOwner(u3)
 			if err != ownable.ErrUnauthorized {
 				t.Errorf("expected %v, got %v", ErrNotBackupOwner.Error(), err.Error())
@@ -37,7 +37,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// ensure invalid address is caught
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			var badAddr std.Address
 			err := g.AddBackupOwner(badAddr)
 			if err != ErrInvalidAddress {
@@ -50,7 +50,7 @@ func TestManagedGroup(t *testing.T) {
 		g := New(u1)
 		// happy path
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			g.AddBackupOwner(u2)
 			err := g.RemoveBackupOwner(u2)
 			if err != nil {
@@ -59,7 +59,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// running this twice should not error.
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			err := g.RemoveBackupOwner(u2)
 			if err != nil {
 				t.Errorf("expected nil, got %v", err.Error())
@@ -67,14 +67,14 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// ensure checking for authorized caller
 		{
-			std.TestSetOrigCaller(u2)
+			std.TestSetOriginCaller(u2)
 			err := g.RemoveBackupOwner(u3)
 			if err != ownable.ErrUnauthorized {
 				t.Errorf("expected %v, got %v", ErrNotBackupOwner.Error(), err.Error())
 			}
 		}
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			var badAddr std.Address
 			err := g.RemoveBackupOwner(badAddr)
 			if err != ErrInvalidAddress {
@@ -82,7 +82,7 @@ func TestManagedGroup(t *testing.T) {
 			}
 		}
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			err := g.RemoveBackupOwner(u1)
 			if err != ErrCannotRemoveOwner {
 				t.Errorf("expected %v, got %v", ErrCannotRemoveOwner.Error(), err.Error())
@@ -95,7 +95,7 @@ func TestManagedGroup(t *testing.T) {
 		g.AddBackupOwner(u2)
 		// happy path
 		{
-			std.TestSetOrigCaller(u2)
+			std.TestSetOriginCaller(u2)
 			err := g.ClaimOwnership()
 			if err != nil {
 				t.Errorf("expected nil, got %v", err.Error())
@@ -109,7 +109,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// running this twice should not error.
 		{
-			std.TestSetOrigCaller(u2)
+			std.TestSetOriginCaller(u2)
 			err := g.ClaimOwnership()
 			if err != nil {
 				t.Errorf("expected nil, got %v", err.Error())
@@ -117,7 +117,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// ensure checking for authorized caller
 		{
-			std.TestSetOrigCaller(u3)
+			std.TestSetOriginCaller(u3)
 			err := g.ClaimOwnership()
 			if err != ErrNotMember {
 				t.Errorf("expected %v, got %v", ErrNotMember.Error(), err.Error())
@@ -129,7 +129,7 @@ func TestManagedGroup(t *testing.T) {
 		g := New(u1)
 		// happy path
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			err := g.AddMember(u2)
 			if err != nil {
 				t.Errorf("expected nil, got %v", err.Error())
@@ -140,7 +140,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// ensure checking for authorized caller
 		{
-			std.TestSetOrigCaller(u2)
+			std.TestSetOriginCaller(u2)
 			err := g.AddMember(u3)
 			if err != ownable.ErrUnauthorized {
 				t.Errorf("expected %v, got %v", ownable.ErrUnauthorized.Error(), err.Error())
@@ -148,7 +148,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// ensure invalid address is caught
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			var badAddr std.Address
 			err := g.AddMember(badAddr)
 			if err != ErrInvalidAddress {
@@ -161,7 +161,7 @@ func TestManagedGroup(t *testing.T) {
 		g := New(u1)
 		// happy path
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			g.AddMember(u2)
 			err := g.RemoveMember(u2)
 			if err != nil {
@@ -173,7 +173,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// running this twice should not error.
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			err := g.RemoveMember(u2)
 			if err != nil {
 				t.Errorf("expected nil, got %v", err.Error())
@@ -181,7 +181,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// ensure checking for authorized caller
 		{
-			std.TestSetOrigCaller(u2)
+			std.TestSetOriginCaller(u2)
 			err := g.RemoveMember(u3)
 			if err != ownable.ErrUnauthorized {
 				t.Errorf("expected %v, got %v", ownable.ErrUnauthorized.Error(), err.Error())
@@ -189,7 +189,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// ensure invalid address is caught
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			var badAddr std.Address
 			err := g.RemoveMember(badAddr)
 			if err != ErrInvalidAddress {
@@ -198,7 +198,7 @@ func TestManagedGroup(t *testing.T) {
 		}
 		// ensure owner cannot be removed
 		{
-			std.TestSetOrigCaller(u1)
+			std.TestSetOriginCaller(u1)
 			err := g.RemoveMember(u1)
 			if err != ErrCannotRemoveOwner {
 				t.Errorf("expected %v, got %v", ErrCannotRemoveOwner.Error(), err.Error())
@@ -281,7 +281,7 @@ func TestManagedGroup(t *testing.T) {
 		if g.Owner() != u1 {
 			t.Errorf("expected %v, got %v", u1, g.Owner())
 		}
-		std.TestSetOrigCaller(u2)
+		std.TestSetOriginCaller(u2)
 		g.ClaimOwnership()
 		if g.Owner() != u2 {
 			t.Errorf("expected %v, got %v", u2, g.Owner())
@@ -289,7 +289,7 @@ func TestManagedGroup(t *testing.T) {
 	})
 	t.Run("BackupOwners", func(t *testing.T) {
 		t.Parallel()
-		std.TestSetOrigCaller(u1)
+		std.TestSetOriginCaller(u1)
 		g := New(u1)
 		g.AddBackupOwner(u2)
 		g.AddBackupOwner(u3)
@@ -309,7 +309,7 @@ func TestManagedGroup(t *testing.T) {
 	})
 	t.Run("Members", func(t *testing.T) {
 		t.Parallel()
-		std.TestSetOrigCaller(u1)
+		std.TestSetOriginCaller(u1)
 		g := New(u1)
 		g.AddMember(u2)
 		g.AddMember(u3)
diff --git a/examples/gno.land/p/oxtekgrinder/ownable2step/ownable.gno b/examples/gno.land/p/oxtekgrinder/ownable2step/ownable.gno
index 43afa1cd141..d81759819b5 100644
--- a/examples/gno.land/p/oxtekgrinder/ownable2step/ownable.gno
+++ b/examples/gno.land/p/oxtekgrinder/ownable2step/ownable.gno
@@ -15,7 +15,7 @@ type Ownable2Step struct {
 
 func New() *Ownable2Step {
 	return &Ownable2Step{
-		owner:        std.PrevRealm().Addr(),
+		owner:        std.PreviousRealm().Address(),
 		pendingOwner: "",
 	}
 }
@@ -45,7 +45,7 @@ func (o *Ownable2Step) AcceptOwnership() error {
 	if o.pendingOwner.String() == "" {
 		return ErrNoPendingOwner
 	}
-	if std.PrevRealm().Addr() != o.pendingOwner {
+	if std.PreviousRealm().Address() != o.pendingOwner {
 		return ErrPendingUnauthorized
 	}
 
@@ -87,12 +87,12 @@ func (o *Ownable2Step) PendingOwner() std.Address {
 
 // CallerIsOwner checks if the caller of the function is the Realm's owner
 func (o *Ownable2Step) CallerIsOwner() bool {
-	return std.PrevRealm().Addr() == o.owner
+	return std.PreviousRealm().Address() == o.owner
 }
 
 // AssertCallerIsOwner panics if the caller is not the owner
 func (o *Ownable2Step) AssertCallerIsOwner() {
-	if std.PrevRealm().Addr() != o.owner {
+	if std.PreviousRealm().Address() != o.owner {
 		panic(ErrUnauthorized)
 	}
 }
diff --git a/examples/gno.land/p/oxtekgrinder/ownable2step/ownable_test.gno b/examples/gno.land/p/oxtekgrinder/ownable2step/ownable_test.gno
index 4cca03b6ef5..9d73855fed8 100644
--- a/examples/gno.land/p/oxtekgrinder/ownable2step/ownable_test.gno
+++ b/examples/gno.land/p/oxtekgrinder/ownable2step/ownable_test.gno
@@ -16,7 +16,7 @@ var (
 
 func TestNew(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	o := New()
 	got := o.Owner()
@@ -38,7 +38,7 @@ func TestNewWithAddress(t *testing.T) {
 
 func TestInitiateTransferOwnership(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	o := New()
 
@@ -54,7 +54,7 @@ func TestInitiateTransferOwnership(t *testing.T) {
 
 func TestTransferOwnership(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	o := New()
 
@@ -68,7 +68,7 @@ func TestTransferOwnership(t *testing.T) {
 	uassert.Equal(t, pendingOwner, bob)
 
 	std.TestSetRealm(std.NewUserRealm(bob))
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 
 	err = o.AcceptOwnership()
 	urequire.NoError(t, err)
@@ -82,13 +82,13 @@ func TestTransferOwnership(t *testing.T) {
 
 func TestCallerIsOwner(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	o := New()
 	unauthorizedCaller := bob
 
 	std.TestSetRealm(std.NewUserRealm(unauthorizedCaller))
-	std.TestSetOrigCaller(unauthorizedCaller)
+	std.TestSetOriginCaller(unauthorizedCaller)
 
 	uassert.False(t, o.CallerIsOwner())
 }
@@ -109,12 +109,12 @@ func TestDropOwnership(t *testing.T) {
 
 func TestErrUnauthorized(t *testing.T) {
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice)
+	std.TestSetOriginCaller(alice)
 
 	o := New()
 
 	std.TestSetRealm(std.NewUserRealm(bob))
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 
 	uassert.ErrorContains(t, o.TransferOwnership(alice), ErrUnauthorized.Error())
 	uassert.ErrorContains(t, o.DropOwnership(), ErrUnauthorized.Error())
diff --git a/examples/gno.land/r/demo/atomicswap/atomicswap.gno b/examples/gno.land/r/demo/atomicswap/atomicswap.gno
index 8862feb1bed..4762431e258 100644
--- a/examples/gno.land/r/demo/atomicswap/atomicswap.gno
+++ b/examples/gno.land/r/demo/atomicswap/atomicswap.gno
@@ -76,14 +76,14 @@ func NewGRC20Swap(recipient std.Address, hashlock string, tokenRegistryKey strin
 // It allows specifying a custom timelock duration.
 // It is not callable with `gnokey maketx call`, but can be imported by another contract or `gnokey maketx run`.
 func NewCustomCoinSwap(recipient std.Address, hashlock string, timelock time.Time) (int, *Swap) {
-	sender := std.PrevRealm().Addr()
-	sent := std.GetOrigSend()
+	sender := std.PreviousRealm().Address()
+	sent := std.OriginSend()
 	require(len(sent) != 0, "at least one coin needs to be sent")
 
 	// Create the swap
 	sendFn := func(to std.Address) {
-		banker := std.GetBanker(std.BankerTypeRealmSend)
-		pkgAddr := std.GetOrigPkgAddr()
+		banker := std.NewBanker(std.BankerTypeRealmSend)
+		pkgAddr := std.OriginPkgAddress()
 		banker.SendCoins(pkgAddr, to, sent)
 	}
 	amountStr := sent.String()
@@ -98,8 +98,8 @@ func NewCustomCoinSwap(recipient std.Address, hashlock string, timelock time.Tim
 // NewCustomGRC20Swap creates a new atomic swap contract for grc20 tokens.
 // It is not callable with `gnokey maketx call`, but can be imported by another contract or `gnokey maketx run`.
 func NewCustomGRC20Swap(recipient std.Address, hashlock string, timelock time.Time, token *grc20.Token) (int, *Swap) {
-	sender := std.PrevRealm().Addr()
-	curAddr := std.CurrentRealm().Addr()
+	sender := std.PreviousRealm().Address()
+	curAddr := std.CurrentRealm().Address()
 
 	allowance := token.Allowance(sender, curAddr)
 	require(allowance > 0, "no allowance")
diff --git a/examples/gno.land/r/demo/atomicswap/atomicswap_test.gno b/examples/gno.land/r/demo/atomicswap/atomicswap_test.gno
index 0bcf6a1342d..1e39a7d902d 100644
--- a/examples/gno.land/r/demo/atomicswap/atomicswap_test.gno
+++ b/examples/gno.land/r/demo/atomicswap/atomicswap_test.gno
@@ -29,7 +29,7 @@ func TestNewCustomCoinSwap_Claim(t *testing.T) {
 
 	// Create a new swap
 	std.TestSetRealm(std.NewUserRealm(sender))
-	std.TestSetOrigSend(amount, nil)
+	std.TestSetOriginSend(amount, nil)
 	id, swap := NewCustomCoinSwap(recipient, hashlockHex, timelock)
 	uassert.Equal(t, 1, id)
 
@@ -86,7 +86,7 @@ func TestNewCustomCoinSwap_Refund(t *testing.T) {
 
 	// Create a new swap
 	std.TestSetRealm(std.NewUserRealm(sender))
-	std.TestSetOrigSend(amount, nil)
+	std.TestSetOriginSend(amount, nil)
 	id, swap := NewCustomCoinSwap(recipient, hashlockHex, timelock) // Create a new swap
 	uassert.Equal(t, 1, id)
 
@@ -102,7 +102,7 @@ func TestNewCustomCoinSwap_Refund(t *testing.T) {
 
 	// Test Refund
 	pkgAddr := std.DerivePkgAddr("gno.land/r/demo/atomicswap")
-	std.TestSetOrigPkgAddr(pkgAddr)
+	std.TestSetOriginPkgAddress(pkgAddr)
 	std.TestIssueCoins(pkgAddr, std.Coins{{"ugnot", 100000000}})
 	uassert.PanicsWithMessage(t, "timelock not expired", swap.Refund)
 	swap.timelock = time.Now().Add(-1 * time.Hour) // override timelock
@@ -233,7 +233,7 @@ func TestNewCustomGRC20Swap_Refund(t *testing.T) {
 
 	// Test Refund
 	pkgAddr := std.DerivePkgAddr("gno.land/r/demo/atomicswap")
-	std.TestSetOrigPkgAddr(pkgAddr)
+	std.TestSetOriginPkgAddress(pkgAddr)
 	std.TestIssueCoins(pkgAddr, std.Coins{{"ugnot", 100000000}})
 	uassert.PanicsWithMessage(t, "timelock not expired", swap.Refund)
 	swap.timelock = time.Now().Add(-1 * time.Hour) // override timelock
@@ -372,7 +372,7 @@ func TestNewGRC20Swap_Refund(t *testing.T) {
 
 	// Test Refund
 	pkgAddr := std.DerivePkgAddr("gno.land/r/demo/atomicswap")
-	std.TestSetOrigPkgAddr(pkgAddr)
+	std.TestSetOriginPkgAddress(pkgAddr)
 	std.TestIssueCoins(pkgAddr, std.Coins{{"ugnot", 100000000}})
 	uassert.PanicsWithMessage(t, "timelock not expired", swap.Refund)
 	swap.timelock = time.Now().Add(-1 * time.Hour) // override timelock
diff --git a/examples/gno.land/r/demo/atomicswap/swap.gno b/examples/gno.land/r/demo/atomicswap/swap.gno
index da40805221e..299a369db26 100644
--- a/examples/gno.land/r/demo/atomicswap/swap.gno
+++ b/examples/gno.land/r/demo/atomicswap/swap.gno
@@ -47,7 +47,7 @@ func newSwap(
 func (s *Swap) Claim(preimage string) {
 	require(!s.claimed, "already claimed")
 	require(!s.refunded, "already refunded")
-	require(std.PrevRealm().Addr() == s.recipient, "unauthorized")
+	require(std.PreviousRealm().Address() == s.recipient, "unauthorized")
 
 	hashlock := sha256.Sum256([]byte(preimage))
 	hashlockHex := hex.EncodeToString(hashlock[:])
@@ -61,7 +61,7 @@ func (s *Swap) Claim(preimage string) {
 func (s *Swap) Refund() {
 	require(!s.claimed, "already claimed")
 	require(!s.refunded, "already refunded")
-	require(std.PrevRealm().Addr() == s.sender, "unauthorized")
+	require(std.PreviousRealm().Address() == s.sender, "unauthorized")
 	require(time.Now().After(s.timelock), "timelock not expired")
 
 	s.refunded = true
diff --git a/examples/gno.land/r/demo/banktest/README.md b/examples/gno.land/r/demo/banktest/README.md
index 944757f9b12..7c41d5ca640 100644
--- a/examples/gno.land/r/demo/banktest/README.md
+++ b/examples/gno.land/r/demo/banktest/README.md
@@ -44,7 +44,7 @@ This means that calls to functions defined within this package are encapsulated
 // Deposit will take the coins (to the realm's pkgaddr) or return them to user.
 func Deposit(returnDenom string, returnAmount int64) string {
     std.AssertOriginCall()
-    caller := std.GetOrigCaller()
+    caller := std.OriginCaller()
     send := std.Coins{{returnDenom, returnAmount}}
 ```
 
@@ -54,7 +54,7 @@ This is the beginning of the definition of the contract function named "Deposit"
     // record activity
     act := &activity{
         caller:   caller,
-        sent:     std.GetOrigSend(),
+        sent:     std.OriginSend(),
         returned: send,
         time:     time.Now(),
     }
@@ -74,13 +74,13 @@ Updating the "latest" array for viewing at gno.land/r/demo/banktest: (w/ trailin
 If the user requested the return of coins...
 
 ```go
-        banker := std.GetBanker(std.BankerTypeOrigSend)
+        banker := std.NewBanker(std.BankerTypeOriginSend)
 ```
 
 use a std.Banker instance to return any deposited coins to the original sender.
 
 ```go
-        pkgaddr := std.GetOrigPkgAddr()
+        pkgaddr := std.OriginPkgAddress()
         // TODO: use std.Coins constructors, this isn't generally safe.
         banker.SendCoins(pkgaddr, caller, send)
         return "returned!"
@@ -93,8 +93,8 @@ Finally, the results are rendered via an ABCI query call when you visit [/r/demo
 ```go
 func Render(path string) string {
     // get realm coins.
-    banker := std.GetBanker(std.BankerTypeReadonly)
-    coins := banker.GetCoins(std.GetOrigPkgAddr())
+    banker := std.NewBanker(std.BankerTypeReadonly)
+    coins := banker.GetCoins(std.OriginPkgAddress())
 
     // render
     res := ""
diff --git a/examples/gno.land/r/demo/banktest/banktest.gno b/examples/gno.land/r/demo/banktest/banktest.gno
index 29c479dd025..94ec07b06e3 100644
--- a/examples/gno.land/r/demo/banktest/banktest.gno
+++ b/examples/gno.land/r/demo/banktest/banktest.gno
@@ -24,12 +24,12 @@ var latest [10]*activity
 // Deposit will take the coins (to the realm's pkgaddr) or return them to user.
 func Deposit(returnDenom string, returnAmount int64) string {
 	std.AssertOriginCall()
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	send := std.Coins{{returnDenom, returnAmount}}
 	// record activity
 	act := &activity{
 		caller:   caller,
-		sent:     std.GetOrigSend(),
+		sent:     std.OriginSend(),
 		returned: send,
 		time:     time.Now(),
 	}
@@ -39,8 +39,8 @@ func Deposit(returnDenom string, returnAmount int64) string {
 	latest[0] = act
 	// return if any.
 	if returnAmount > 0 {
-		banker := std.GetBanker(std.BankerTypeOrigSend)
-		pkgaddr := std.GetOrigPkgAddr()
+		banker := std.NewBanker(std.BankerTypeOriginSend)
+		pkgaddr := std.OriginPkgAddress()
 		// TODO: use std.Coins constructors, this isn't generally safe.
 		banker.SendCoins(pkgaddr, caller, send)
 		return "returned!"
@@ -51,8 +51,8 @@ func Deposit(returnDenom string, returnAmount int64) string {
 
 func Render(path string) string {
 	// get realm coins.
-	banker := std.GetBanker(std.BankerTypeReadonly)
-	coins := banker.GetCoins(std.GetOrigPkgAddr())
+	banker := std.NewBanker(std.BankerTypeReadonly)
+	coins := banker.GetCoins(std.OriginPkgAddress())
 
 	// render
 	res := ""
diff --git a/examples/gno.land/r/demo/banktest/z_0_filetest.gno b/examples/gno.land/r/demo/banktest/z_0_filetest.gno
index 5a8c8d70a48..066d6bb17d9 100644
--- a/examples/gno.land/r/demo/banktest/z_0_filetest.gno
+++ b/examples/gno.land/r/demo/banktest/z_0_filetest.gno
@@ -17,18 +17,18 @@ func main() {
 	// set up main address and banktest addr.
 	banktestAddr := std.DerivePkgAddr("gno.land/r/demo/banktest")
 	mainaddr := std.DerivePkgAddr("gno.land/r/demo/bank1")
-	std.TestSetOrigCaller(mainaddr)
-	std.TestSetOrigPkgAddr(banktestAddr)
+	std.TestSetOriginCaller(mainaddr)
+	std.TestSetOriginPkgAddress(banktestAddr)
 
 	// get and print balance of mainaddr.
 	// with the SEND, + 200 gnot given by the TestContext, main should have 300gnot.
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	mainbal := banker.GetCoins(mainaddr)
 	println("main before:", mainbal)
 
-	// simulate a Deposit call. use Send + OrigSend to simulate -send.
+	// simulate a Deposit call. use Send + OriginSend to simulate -send.
 	banker.SendCoins(mainaddr, banktestAddr, std.Coins{{"ugnot", 100_000_000}})
-	std.TestSetOrigSend(std.Coins{{"ugnot", 100_000_000}}, nil)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 100_000_000}}, nil)
 	res := banktest.Deposit("ugnot", 50_000_000)
 	println("Deposit():", res)
 
diff --git a/examples/gno.land/r/demo/banktest/z_1_filetest.gno b/examples/gno.land/r/demo/banktest/z_1_filetest.gno
index 39682d26330..eebe70f251d 100644
--- a/examples/gno.land/r/demo/banktest/z_1_filetest.gno
+++ b/examples/gno.land/r/demo/banktest/z_1_filetest.gno
@@ -15,9 +15,9 @@ func main() {
 	banktestAddr := std.DerivePkgAddr("gno.land/r/demo/banktest")
 
 	// simulate a Deposit call.
-	std.TestSetOrigPkgAddr(banktestAddr)
+	std.TestSetOriginPkgAddress(banktestAddr)
 	std.TestIssueCoins(banktestAddr, std.Coins{{"ugnot", 100000000}})
-	std.TestSetOrigSend(std.Coins{{"ugnot", 100000000}}, nil)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 100000000}}, nil)
 	res := banktest.Deposit("ugnot", 101000000)
 	println(res)
 }
diff --git a/examples/gno.land/r/demo/banktest/z_2_filetest.gno b/examples/gno.land/r/demo/banktest/z_2_filetest.gno
index e839f60354a..454763b3a6f 100644
--- a/examples/gno.land/r/demo/banktest/z_2_filetest.gno
+++ b/examples/gno.land/r/demo/banktest/z_2_filetest.gno
@@ -16,16 +16,16 @@ func main() {
 
 	// print main balance before.
 	mainaddr := std.DerivePkgAddr("gno.land/r/demo/bank1")
-	std.TestSetOrigCaller(mainaddr)
+	std.TestSetOriginCaller(mainaddr)
 
-	banker := std.GetBanker(std.BankerTypeReadonly)
+	banker := std.NewBanker(std.BankerTypeReadonly)
 	mainbal := banker.GetCoins(mainaddr)
-	println("main before:", mainbal) // plus OrigSend equals 300.
+	println("main before:", mainbal) // plus OriginSend equals 300.
 
 	// simulate a Deposit call.
-	std.TestSetOrigPkgAddr(banktestAddr)
+	std.TestSetOriginPkgAddress(banktestAddr)
 	std.TestIssueCoins(banktestAddr, std.Coins{{"ugnot", 100000000}})
-	std.TestSetOrigSend(std.Coins{{"ugnot", 100000000}}, nil)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 100000000}}, nil)
 	res := banktest.Deposit("ugnot", 55000000)
 	println("Deposit():", res)
 
diff --git a/examples/gno.land/r/demo/banktest/z_3_filetest.gno b/examples/gno.land/r/demo/banktest/z_3_filetest.gno
index 7bf2aea4f38..e5796b4de72 100644
--- a/examples/gno.land/r/demo/banktest/z_3_filetest.gno
+++ b/examples/gno.land/r/demo/banktest/z_3_filetest.gno
@@ -13,9 +13,9 @@ func main() {
 	banktestAddr := std.DerivePkgAddr("gno.land/r/demo/banktest")
 
 	mainaddr := std.DerivePkgAddr("gno.land/r/demo/bank1")
-	std.TestSetOrigCaller(mainaddr)
+	std.TestSetOriginCaller(mainaddr)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	send := std.Coins{{"ugnot", 123}}
 	banker.SendCoins(banktestAddr, mainaddr, send)
 }
diff --git a/examples/gno.land/r/demo/bar20/bar20.gno b/examples/gno.land/r/demo/bar20/bar20.gno
index 52f1baa7408..14ef7ada17d 100644
--- a/examples/gno.land/r/demo/bar20/bar20.gno
+++ b/examples/gno.land/r/demo/bar20/bar20.gno
@@ -22,7 +22,7 @@ func init() {
 }
 
 func Faucet() string {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	if err := adm.Mint(caller, 1_000_000); err != nil {
 		return "error: " + err.Error()
 	}
diff --git a/examples/gno.land/r/demo/bar20/bar20_test.gno b/examples/gno.land/r/demo/bar20/bar20_test.gno
index 0561d13c865..81e986a7584 100644
--- a/examples/gno.land/r/demo/bar20/bar20_test.gno
+++ b/examples/gno.land/r/demo/bar20/bar20_test.gno
@@ -11,7 +11,7 @@ import (
 func TestPackage(t *testing.T) {
 	alice := testutils.TestAddress("alice")
 	std.TestSetRealm(std.NewUserRealm(alice))
-	std.TestSetOrigCaller(alice) // XXX: should not need this
+	std.TestSetOriginCaller(alice) // XXX: should not need this
 
 	urequire.Equal(t, UserTeller.BalanceOf(alice), uint64(0))
 	urequire.Equal(t, Faucet(), "OK")
diff --git a/examples/gno.land/r/demo/boards/public.gno b/examples/gno.land/r/demo/boards/public.gno
index db545446641..b8e350cd3b0 100644
--- a/examples/gno.land/r/demo/boards/public.gno
+++ b/examples/gno.land/r/demo/boards/public.gno
@@ -17,11 +17,11 @@ func GetBoardIDFromName(name string) (BoardID, bool) {
 }
 
 func CreateBoard(name string) BoardID {
-	if !std.PrevRealm().IsUser() {
+	if !std.PreviousRealm().IsUser() {
 		panic("invalid non-user call")
 	}
 	bid := incGetBoardID()
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if usernameOf(caller) == "" {
 		panic("unauthorized")
 	}
@@ -34,7 +34,7 @@ func CreateBoard(name string) BoardID {
 }
 
 func checkAnonFee() bool {
-	sent := std.GetOrigSend()
+	sent := std.OriginSend()
 	anonFeeCoin := std.NewCoin("ugnot", int64(gDefaultAnonFee))
 	if len(sent) == 1 && sent[0].IsGTE(anonFeeCoin) {
 		return true
@@ -43,10 +43,10 @@ func checkAnonFee() bool {
 }
 
 func CreateThread(bid BoardID, title string, body string) PostID {
-	if !std.PrevRealm().IsUser() {
+	if !std.PreviousRealm().IsUser() {
 		panic("invalid non-user call")
 	}
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if usernameOf(caller) == "" {
 		if !checkAnonFee() {
 			panic("please register, otherwise minimum fee " + strconv.Itoa(gDefaultAnonFee) + " is required if anonymous")
@@ -61,10 +61,10 @@ func CreateThread(bid BoardID, title string, body string) PostID {
 }
 
 func CreateReply(bid BoardID, threadid, postid PostID, body string) PostID {
-	if !std.PrevRealm().IsUser() {
+	if !std.PreviousRealm().IsUser() {
 		panic("invalid non-user call")
 	}
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if usernameOf(caller) == "" {
 		if !checkAnonFee() {
 			panic("please register, otherwise minimum fee " + strconv.Itoa(gDefaultAnonFee) + " is required if anonymous")
@@ -91,10 +91,10 @@ func CreateReply(bid BoardID, threadid, postid PostID, body string) PostID {
 // If dstBoard is private, does not ping back.
 // If board specified by bid is private, panics.
 func CreateRepost(bid BoardID, postid PostID, title string, body string, dstBoardID BoardID) PostID {
-	if !std.PrevRealm().IsUser() {
+	if !std.PreviousRealm().IsUser() {
 		panic("invalid non-user call")
 	}
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if usernameOf(caller) == "" {
 		// TODO: allow with gDefaultAnonFee payment.
 		if !checkAnonFee() {
@@ -121,10 +121,10 @@ func CreateRepost(bid BoardID, postid PostID, title string, body string, dstBoar
 }
 
 func DeletePost(bid BoardID, threadid, postid PostID, reason string) {
-	if !std.PrevRealm().IsUser() {
+	if !std.PreviousRealm().IsUser() {
 		panic("invalid non-user call")
 	}
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	board := getBoard(bid)
 	if board == nil {
 		panic("board not exist")
@@ -153,10 +153,10 @@ func DeletePost(bid BoardID, threadid, postid PostID, reason string) {
 }
 
 func EditPost(bid BoardID, threadid, postid PostID, title, body string) {
-	if !std.PrevRealm().IsUser() {
+	if !std.PreviousRealm().IsUser() {
 		panic("invalid non-user call")
 	}
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	board := getBoard(bid)
 	if board == nil {
 		panic("board not exist")
diff --git a/examples/gno.land/r/demo/boards/z_12_a_filetest.gno b/examples/gno.land/r/demo/boards/z_12_a_filetest.gno
index 380e9bc09e0..a6d84d284a5 100644
--- a/examples/gno.land/r/demo/boards/z_12_a_filetest.gno
+++ b/examples/gno.land/r/demo/boards/z_12_a_filetest.gno
@@ -22,8 +22,8 @@ func main() {
 
 	// create a repost via anon user
 	test2 := testutils.TestAddress("test2")
-	std.TestSetOrigCaller(test2)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 9000000}}, nil)
+	std.TestSetOriginCaller(test2)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 9000000}}, nil)
 
 	rid := boards.CreateRepost(bid1, pid, "", "Check this out", bid2)
 	println(rid)
diff --git a/examples/gno.land/r/demo/boards/z_5_b_filetest.gno b/examples/gno.land/r/demo/boards/z_5_b_filetest.gno
index 0ad15ca2600..bfe23d3ea06 100644
--- a/examples/gno.land/r/demo/boards/z_5_b_filetest.gno
+++ b/examples/gno.land/r/demo/boards/z_5_b_filetest.gno
@@ -22,8 +22,8 @@ func main() {
 
 	// create post via anon user
 	test2 := testutils.TestAddress("test2")
-	std.TestSetOrigCaller(test2)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 9000000}}, nil)
+	std.TestSetOriginCaller(test2)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 9000000}}, nil)
 
 	pid := boards.CreateThread(bid, "First Post (title)", "Body of the first post. (body)")
 	println(boards.Render("test_board/" + strconv.Itoa(int(pid))))
diff --git a/examples/gno.land/r/demo/boards/z_5_c_filetest.gno b/examples/gno.land/r/demo/boards/z_5_c_filetest.gno
index abe8f1cf0bd..2af19618f6f 100644
--- a/examples/gno.land/r/demo/boards/z_5_c_filetest.gno
+++ b/examples/gno.land/r/demo/boards/z_5_c_filetest.gno
@@ -22,8 +22,8 @@ func main() {
 
 	// create post via anon user
 	test2 := testutils.TestAddress("test2")
-	std.TestSetOrigCaller(test2)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 101000000}}, nil)
+	std.TestSetOriginCaller(test2)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 101000000}}, nil)
 
 	pid := boards.CreateThread(bid, "First Post (title)", "Body of the first post. (body)")
 	boards.CreateReply(bid, pid, pid, "Reply of the first post")
diff --git a/examples/gno.land/r/demo/boards/z_5_d_filetest.gno b/examples/gno.land/r/demo/boards/z_5_d_filetest.gno
index 33175efd4f2..27f7878ea91 100644
--- a/examples/gno.land/r/demo/boards/z_5_d_filetest.gno
+++ b/examples/gno.land/r/demo/boards/z_5_d_filetest.gno
@@ -23,8 +23,8 @@ func main() {
 
 	// create reply via anon user
 	test2 := testutils.TestAddress("test2")
-	std.TestSetOrigCaller(test2)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 9000000}}, nil)
+	std.TestSetOriginCaller(test2)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 9000000}}, nil)
 	boards.CreateReply(bid, pid, pid, "Reply of the first post")
 
 	println(boards.Render("test_board/" + strconv.Itoa(int(pid))))
diff --git a/examples/gno.land/r/demo/btree_dao/btree_dao.gno b/examples/gno.land/r/demo/btree_dao/btree_dao.gno
index c90742eb29b..66b857580c1 100644
--- a/examples/gno.land/r/demo/btree_dao/btree_dao.gno
+++ b/examples/gno.land/r/demo/btree_dao/btree_dao.gno
@@ -57,7 +57,7 @@ func PlantSeed(message string) error {
 // Returns an error if any validation fails or if NFT minting fails.
 func plantImpl(userBTree *btree.BTree, seedMessage string) error {
 	// Get the caller's address
-	userAddress := std.GetOrigCaller()
+	userAddress := std.OriginCaller()
 
 	var nftID string
 	var regDetails *RegistrationDetails
diff --git a/examples/gno.land/r/demo/btree_dao/btree_dao_test.gno b/examples/gno.land/r/demo/btree_dao/btree_dao_test.gno
index 0514f52f7b4..e6ad0c3f732 100644
--- a/examples/gno.land/r/demo/btree_dao/btree_dao_test.gno
+++ b/examples/gno.land/r/demo/btree_dao/btree_dao_test.gno
@@ -12,7 +12,7 @@ import (
 )
 
 func setupTest() {
-	std.TestSetOrigCaller(std.Address("g1ej0qca5ptsw9kfr64ey8jvfy9eacga6mpj2z0y"))
+	std.TestSetOriginCaller(std.Address("g1ej0qca5ptsw9kfr64ey8jvfy9eacga6mpj2z0y"))
 	members = btree.New()
 }
 
diff --git a/examples/gno.land/r/demo/disperse/disperse.gno b/examples/gno.land/r/demo/disperse/disperse.gno
index 0dc833dda95..41319992905 100644
--- a/examples/gno.land/r/demo/disperse/disperse.gno
+++ b/examples/gno.land/r/demo/disperse/disperse.gno
@@ -7,15 +7,15 @@ import (
 )
 
 // Get address of Disperse realm
-var realmAddr = std.CurrentRealm().Addr()
+var realmAddr = std.CurrentRealm().Address()
 
 // DisperseUgnot parses receivers and amounts and sends out ugnot
 // The function will send out the coins to the addresses and return the leftover coins to the caller
 // if there are any to return
 func DisperseUgnot(addresses []std.Address, coins std.Coins) {
-	coinSent := std.GetOrigSend()
-	caller := std.PrevRealm().Addr()
-	banker := std.GetBanker(std.BankerTypeOrigSend)
+	coinSent := std.OriginSend()
+	caller := std.PreviousRealm().Address()
+	banker := std.NewBanker(std.BankerTypeOriginSend)
 
 	if len(addresses) != len(coins) {
 		panic(ErrNumAddrValMismatch)
@@ -50,7 +50,7 @@ func DisperseUgnot(addresses []std.Address, coins std.Coins) {
 // Note that it is necessary to approve the realm to spend the tokens before calling this function
 // see the corresponding filetests for examples
 func DisperseGRC20(addresses []std.Address, amounts []uint64, symbols []string) {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 
 	if (len(addresses) != len(amounts)) || (len(amounts) != len(symbols)) {
 		panic(ErrArgLenAndSentLenMismatch)
diff --git a/examples/gno.land/r/demo/disperse/z_0_filetest.gno b/examples/gno.land/r/demo/disperse/z_0_filetest.gno
index ca1e9ea0ce8..695a7f7c2b8 100644
--- a/examples/gno.land/r/demo/disperse/z_0_filetest.gno
+++ b/examples/gno.land/r/demo/disperse/z_0_filetest.gno
@@ -14,10 +14,10 @@ func main() {
 	disperseAddr := std.DerivePkgAddr("gno.land/r/demo/disperse")
 	mainaddr := std.DerivePkgAddr("gno.land/r/demo/main")
 
-	std.TestSetOrigPkgAddr(disperseAddr)
-	std.TestSetOrigCaller(mainaddr)
+	std.TestSetOriginPkgAddress(disperseAddr)
+	std.TestSetOriginCaller(mainaddr)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 
 	mainbal := banker.GetCoins(mainaddr)
 	println("main before:", mainbal)
diff --git a/examples/gno.land/r/demo/disperse/z_1_filetest.gno b/examples/gno.land/r/demo/disperse/z_1_filetest.gno
index 4c27c50749f..a4c0d19b15a 100644
--- a/examples/gno.land/r/demo/disperse/z_1_filetest.gno
+++ b/examples/gno.land/r/demo/disperse/z_1_filetest.gno
@@ -14,10 +14,10 @@ func main() {
 	disperseAddr := std.DerivePkgAddr("gno.land/r/demo/disperse")
 	mainaddr := std.DerivePkgAddr("gno.land/r/demo/main")
 
-	std.TestSetOrigPkgAddr(disperseAddr)
-	std.TestSetOrigCaller(mainaddr)
+	std.TestSetOriginPkgAddress(disperseAddr)
+	std.TestSetOriginCaller(mainaddr)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 
 	mainbal := banker.GetCoins(mainaddr)
 	println("main before:", mainbal)
diff --git a/examples/gno.land/r/demo/disperse/z_2_filetest.gno b/examples/gno.land/r/demo/disperse/z_2_filetest.gno
index 79e8d81e2b1..0e6d9a5cd1a 100644
--- a/examples/gno.land/r/demo/disperse/z_2_filetest.gno
+++ b/examples/gno.land/r/demo/disperse/z_2_filetest.gno
@@ -14,10 +14,10 @@ func main() {
 	disperseAddr := std.DerivePkgAddr("gno.land/r/demo/disperse")
 	mainaddr := std.DerivePkgAddr("gno.land/r/demo/main")
 
-	std.TestSetOrigPkgAddr(disperseAddr)
-	std.TestSetOrigCaller(mainaddr)
+	std.TestSetOriginPkgAddress(disperseAddr)
+	std.TestSetOriginCaller(mainaddr)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 
 	banker.SendCoins(mainaddr, disperseAddr, std.Coins{{"ugnot", 100}})
 	disperse.DisperseUgnotString("g1dmt3sa5ucvecxuhf3j6ne5r0e3z4x7h6c03xc0,g1akeqsvhucjt8gf5yupyzjxsjd29wv8fayng37c", "150,50")
diff --git a/examples/gno.land/r/demo/disperse/z_3_filetest.gno b/examples/gno.land/r/demo/disperse/z_3_filetest.gno
index 7cb7ffbe71d..4c9ab05728a 100644
--- a/examples/gno.land/r/demo/disperse/z_3_filetest.gno
+++ b/examples/gno.land/r/demo/disperse/z_3_filetest.gno
@@ -17,10 +17,10 @@ func main() {
 	beneficiary1 := std.Address("g1dmt3sa5ucvecxuhf3j6ne5r0e3z4x7h6c03xc0")
 	beneficiary2 := std.Address("g1akeqsvhucjt8gf5yupyzjxsjd29wv8fayng37c")
 
-	std.TestSetOrigPkgAddr(disperseAddr)
-	std.TestSetOrigCaller(mainaddr)
+	std.TestSetOriginPkgAddress(disperseAddr)
+	std.TestSetOriginCaller(mainaddr)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 
 	tokens.New("test", "TEST", 4, 0, 0)
 	tokens.Mint("TEST", mainaddr, 200)
diff --git a/examples/gno.land/r/demo/disperse/z_4_filetest.gno b/examples/gno.land/r/demo/disperse/z_4_filetest.gno
index 4dafb780e83..2cfc9c820d1 100644
--- a/examples/gno.land/r/demo/disperse/z_4_filetest.gno
+++ b/examples/gno.land/r/demo/disperse/z_4_filetest.gno
@@ -17,10 +17,10 @@ func main() {
 	beneficiary1 := std.Address("g1dmt3sa5ucvecxuhf3j6ne5r0e3z4x7h6c03xc0")
 	beneficiary2 := std.Address("g1akeqsvhucjt8gf5yupyzjxsjd29wv8fayng37c")
 
-	std.TestSetOrigPkgAddr(disperseAddr)
-	std.TestSetOrigCaller(mainaddr)
+	std.TestSetOriginPkgAddress(disperseAddr)
+	std.TestSetOriginCaller(mainaddr)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 
 	tokens.New("test1", "TEST1", 4, 0, 0)
 	tokens.Mint("TEST1", mainaddr, 200)
diff --git a/examples/gno.land/r/demo/foo1155/foo1155.gno b/examples/gno.land/r/demo/foo1155/foo1155.gno
index 2bd3b7a84c0..1a14571d236 100644
--- a/examples/gno.land/r/demo/foo1155/foo1155.gno
+++ b/examples/gno.land/r/demo/foo1155/foo1155.gno
@@ -82,7 +82,7 @@ func BatchTransferFrom(from, to pusers.AddressOrName, batch []grc1155.TokenID, a
 // Admin
 
 func Mint(to pusers.AddressOrName, tid grc1155.TokenID, amount uint64) {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	assertIsAdmin(caller)
 	err := foo.SafeMint(users.Resolve(to), tid, amount)
 	if err != nil {
@@ -91,7 +91,7 @@ func Mint(to pusers.AddressOrName, tid grc1155.TokenID, amount uint64) {
 }
 
 func MintBatch(to pusers.AddressOrName, batch []grc1155.TokenID, amounts []uint64) {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	assertIsAdmin(caller)
 	err := foo.SafeBatchMint(users.Resolve(to), batch, amounts)
 	if err != nil {
@@ -100,7 +100,7 @@ func MintBatch(to pusers.AddressOrName, batch []grc1155.TokenID, amounts []uint6
 }
 
 func Burn(from pusers.AddressOrName, tid grc1155.TokenID, amount uint64) {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	assertIsAdmin(caller)
 	err := foo.Burn(users.Resolve(from), tid, amount)
 	if err != nil {
@@ -109,7 +109,7 @@ func Burn(from pusers.AddressOrName, tid grc1155.TokenID, amount uint64) {
 }
 
 func BurnBatch(from pusers.AddressOrName, batch []grc1155.TokenID, amounts []uint64) {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	assertIsAdmin(caller)
 	err := foo.BatchBurn(users.Resolve(from), batch, amounts)
 	if err != nil {
diff --git a/examples/gno.land/r/demo/foo20/foo20.gno b/examples/gno.land/r/demo/foo20/foo20.gno
index 917a037d49c..d79cf3b3dc4 100644
--- a/examples/gno.land/r/demo/foo20/foo20.gno
+++ b/examples/gno.land/r/demo/foo20/foo20.gno
@@ -50,7 +50,7 @@ func TransferFrom(from, to std.Address, amount uint64) {
 // Faucet is distributing foo20 tokens without restriction (unsafe).
 // For a real token faucet, you should take care of setting limits are asking payment.
 func Faucet() {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	amount := uint64(1_000 * 10_000) // 1k
 	checkErr(privateLedger.Mint(caller, amount))
 }
diff --git a/examples/gno.land/r/demo/foo20/foo20_test.gno b/examples/gno.land/r/demo/foo20/foo20_test.gno
index d24faef279c..8773114a681 100644
--- a/examples/gno.land/r/demo/foo20/foo20_test.gno
+++ b/examples/gno.land/r/demo/foo20/foo20_test.gno
@@ -37,7 +37,7 @@ func TestReadOnlyPublicMethods(t *testing.T) {
 	}
 
 	// bob uses the faucet.
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 	Faucet()
 
 	// check balances #2.
diff --git a/examples/gno.land/r/demo/foo721/foo721.gno b/examples/gno.land/r/demo/foo721/foo721.gno
index f7364d4185f..b88647101ca 100644
--- a/examples/gno.land/r/demo/foo721/foo721.gno
+++ b/examples/gno.land/r/demo/foo721/foo721.gno
@@ -87,7 +87,7 @@ func TransferFrom(from, to pusers.AddressOrName, tid grc721.TokenID) {
 // Admin
 
 func Mint(to pusers.AddressOrName, tid grc721.TokenID) {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	assertIsAdmin(caller)
 	err := foo.Mint(users.Resolve(to), tid)
 	if err != nil {
@@ -96,7 +96,7 @@ func Mint(to pusers.AddressOrName, tid grc721.TokenID) {
 }
 
 func Burn(tid grc721.TokenID) {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	assertIsAdmin(caller)
 	err := foo.Burn(tid)
 	if err != nil {
diff --git a/examples/gno.land/r/demo/games/dice_roller/dice_roller.gno b/examples/gno.land/r/demo/games/dice_roller/dice_roller.gno
index 4dbbd6c7682..18ead8e5fa3 100644
--- a/examples/gno.land/r/demo/games/dice_roller/dice_roller.gno
+++ b/examples/gno.land/r/demo/games/dice_roller/dice_roller.gno
@@ -62,7 +62,7 @@ func NewGame(addr std.Address) int {
 	}
 
 	games.Set(gameId.Next().String(), &game{
-		player1: std.PrevRealm().Addr(),
+		player1: std.PreviousRealm().Address(),
 		player2: addr,
 	})
 
@@ -79,7 +79,7 @@ func Play(idx int) int {
 	roll := rollDice() // Random the player's dice roll
 
 	// Play the game and update the player's roll
-	if err := g.play(std.PrevRealm().Addr(), roll); err != nil {
+	if err := g.play(std.PreviousRealm().Address(), roll); err != nil {
 		panic(err)
 	}
 
diff --git a/examples/gno.land/r/demo/games/dice_roller/dice_roller_test.gno b/examples/gno.land/r/demo/games/dice_roller/dice_roller_test.gno
index 4697b03bf66..0b6d9b06333 100644
--- a/examples/gno.land/r/demo/games/dice_roller/dice_roller_test.gno
+++ b/examples/gno.land/r/demo/games/dice_roller/dice_roller_test.gno
@@ -27,7 +27,7 @@ func resetGameState() {
 func TestNewGame(t *testing.T) {
 	resetGameState()
 
-	std.TestSetOrigCaller(player1)
+	std.TestSetOriginCaller(player1)
 	gameID := NewGame(player2)
 
 	// Verify that the game has been correctly initialized
@@ -43,7 +43,7 @@ func TestNewGame(t *testing.T) {
 func TestPlay(t *testing.T) {
 	resetGameState()
 
-	std.TestSetOrigCaller(player1)
+	std.TestSetOriginCaller(player1)
 	gameID := NewGame(player2)
 
 	g, err := getGame(gameID)
@@ -58,7 +58,7 @@ func TestPlay(t *testing.T) {
 	urequire.Equal(t, 0, g.roll2) // Player 2 hasn't rolled yet
 
 	// Simulate rolling dice for player 2
-	std.TestSetOrigCaller(player2)
+	std.TestSetOriginCaller(player2)
 	roll2 := Play(gameID)
 
 	// Verify player 2's roll
@@ -71,7 +71,7 @@ func TestPlay(t *testing.T) {
 func TestPlayAgainstSelf(t *testing.T) {
 	resetGameState()
 
-	std.TestSetOrigCaller(player1)
+	std.TestSetOriginCaller(player1)
 	gameID := NewGame(player1)
 
 	// Simulate rolling dice twice by the same player
@@ -88,11 +88,11 @@ func TestPlayAgainstSelf(t *testing.T) {
 func TestPlayInvalidPlayer(t *testing.T) {
 	resetGameState()
 
-	std.TestSetOrigCaller(player1)
+	std.TestSetOriginCaller(player1)
 	gameID := NewGame(player1)
 
 	// Attempt to play as an invalid player
-	std.TestSetOrigCaller(unknownPlayer)
+	std.TestSetOriginCaller(unknownPlayer)
 	urequire.PanicsWithMessage(t, "invalid player", func() {
 		Play(gameID)
 	})
@@ -102,7 +102,7 @@ func TestPlayInvalidPlayer(t *testing.T) {
 func TestPlayAlreadyPlayed(t *testing.T) {
 	resetGameState()
 
-	std.TestSetOrigCaller(player1)
+	std.TestSetOriginCaller(player1)
 	gameID := NewGame(player2)
 
 	// Player 1 rolls
@@ -118,13 +118,13 @@ func TestPlayAlreadyPlayed(t *testing.T) {
 func TestPlayBeyondGameEnd(t *testing.T) {
 	resetGameState()
 
-	std.TestSetOrigCaller(player1)
+	std.TestSetOriginCaller(player1)
 	gameID := NewGame(player2)
 
 	// Play for both players
-	std.TestSetOrigCaller(player1)
+	std.TestSetOriginCaller(player1)
 	Play(gameID)
-	std.TestSetOrigCaller(player2)
+	std.TestSetOriginCaller(player2)
 	Play(gameID)
 
 	// Check if the game is over
@@ -132,7 +132,7 @@ func TestPlayBeyondGameEnd(t *testing.T) {
 	urequire.NoError(t, err)
 
 	// Attempt to play more should fail
-	std.TestSetOrigCaller(player1)
+	std.TestSetOriginCaller(player1)
 	urequire.PanicsWithMessage(t, "game over", func() {
 		Play(gameID)
 	})
diff --git a/examples/gno.land/r/demo/games/shifumi/shifumi.gno b/examples/gno.land/r/demo/games/shifumi/shifumi.gno
index 3de09196da1..7ce3eb69653 100644
--- a/examples/gno.land/r/demo/games/shifumi/shifumi.gno
+++ b/examples/gno.land/r/demo/games/shifumi/shifumi.gno
@@ -63,7 +63,7 @@ func (g *game) winner() int {
 // NewGame creates a new game where player1 is the caller and player2 the argument.
 // A new game index is returned.
 func NewGame(player std.Address) int {
-	games.Set(id.Next().String(), &game{player1: std.PrevRealm().Addr(), player2: player})
+	games.Set(id.Next().String(), &game{player1: std.PreviousRealm().Address(), player2: player})
 	return int(id)
 }
 
@@ -74,7 +74,7 @@ func Play(idx, move int) {
 	if !ok {
 		panic("game not found")
 	}
-	if err := v.(*game).play(std.PrevRealm().Addr(), move); err != nil {
+	if err := v.(*game).play(std.PreviousRealm().Address(), move); err != nil {
 		panic(err)
 	}
 }
diff --git a/examples/gno.land/r/demo/grc20factory/grc20factory.gno b/examples/gno.land/r/demo/grc20factory/grc20factory.gno
index aa91084ab32..1aaee77f2a1 100644
--- a/examples/gno.land/r/demo/grc20factory/grc20factory.gno
+++ b/examples/gno.land/r/demo/grc20factory/grc20factory.gno
@@ -21,7 +21,7 @@ type instance struct {
 }
 
 func New(name, symbol string, decimals uint, initialMint, faucet uint64) {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	NewWithAdmin(name, symbol, decimals, initialMint, faucet, caller)
 }
 
@@ -76,21 +76,21 @@ func Allowance(symbol string, owner, spender std.Address) uint64 {
 
 func Transfer(symbol string, to std.Address, amount uint64) {
 	inst := mustGetInstance(symbol)
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	teller := inst.ledger.ImpersonateTeller(caller)
 	checkErr(teller.Transfer(to, amount))
 }
 
 func Approve(symbol string, spender std.Address, amount uint64) {
 	inst := mustGetInstance(symbol)
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	teller := inst.ledger.ImpersonateTeller(caller)
 	checkErr(teller.Approve(spender, amount))
 }
 
 func TransferFrom(symbol string, from, to std.Address, amount uint64) {
 	inst := mustGetInstance(symbol)
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	teller := inst.ledger.ImpersonateTeller(caller)
 	checkErr(teller.TransferFrom(from, to, amount))
 }
@@ -103,7 +103,7 @@ func Faucet(symbol string) {
 	}
 	// FIXME: add limits?
 	// FIXME: add payment in gnot?
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	checkErr(inst.ledger.Mint(caller, inst.faucet))
 }
 
diff --git a/examples/gno.land/r/demo/grc20factory/grc20factory_test.gno b/examples/gno.land/r/demo/grc20factory/grc20factory_test.gno
index 46fc07fabf2..16584e63a1f 100644
--- a/examples/gno.land/r/demo/grc20factory/grc20factory_test.gno
+++ b/examples/gno.land/r/demo/grc20factory/grc20factory_test.gno
@@ -10,7 +10,7 @@ import (
 )
 
 func TestReadOnlyPublicMethods(t *testing.T) {
-	std.TestSetOrigPkgAddr("gno.land/r/demo/grc20factory")
+	std.TestSetOriginPkgAddress("gno.land/r/demo/grc20factory")
 	admin := testutils.TestAddress("admin")
 	bob := testutils.TestAddress("bob")
 	carl := testutils.TestAddress("carl")
@@ -36,7 +36,7 @@ func TestReadOnlyPublicMethods(t *testing.T) {
 	}
 
 	// admin creates FOO and BAR.
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	std.TestSetRealm(std.NewUserRealm(admin))
 	NewWithAdmin("Foo", "FOO", 3, 1_111_111_000, 5_555, admin)
 	NewWithAdmin("Bar", "BAR", 3, 2_222_000, 6_666, admin)
@@ -47,25 +47,25 @@ func TestReadOnlyPublicMethods(t *testing.T) {
 	checkBalances("step2", 1_444_444_000, 1_111_111_000, 333_333_000, 0, 0)
 
 	// carl uses the faucet.
-	std.TestSetOrigCaller(carl)
+	std.TestSetOriginCaller(carl)
 	std.TestSetRealm(std.NewUserRealm(carl))
 	Faucet("FOO")
 	checkBalances("step3", 1_444_449_555, 1_111_111_000, 333_333_000, 0, 5_555)
 
 	// admin gives to bob some allowance.
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	std.TestSetRealm(std.NewUserRealm(admin))
 	Approve("FOO", bob, 1_000_000)
 	checkBalances("step4", 1_444_449_555, 1_111_111_000, 333_333_000, 1_000_000, 5_555)
 
 	// bob uses a part of the allowance.
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 	std.TestSetRealm(std.NewUserRealm(bob))
 	TransferFrom("FOO", admin, carl, 400_000)
 	checkBalances("step5", 1_444_449_555, 1_110_711_000, 333_333_000, 600_000, 405_555)
 
 	// bob uses a part of the allowance.
-	std.TestSetOrigCaller(bob)
+	std.TestSetOriginCaller(bob)
 	std.TestSetRealm(std.NewUserRealm(bob))
 	TransferFrom("FOO", admin, carl, 600_000)
 	checkBalances("step6", 1_444_449_555, 1_110_111_000, 333_333_000, 0, 1_005_555)
diff --git a/examples/gno.land/r/demo/grc20reg/grc20reg.gno b/examples/gno.land/r/demo/grc20reg/grc20reg.gno
index ff46ec94860..ba59019985a 100644
--- a/examples/gno.land/r/demo/grc20reg/grc20reg.gno
+++ b/examples/gno.land/r/demo/grc20reg/grc20reg.gno
@@ -12,7 +12,7 @@ import (
 var registry = avl.NewTree() // rlmPath[.slug] -> TokenGetter (slug is optional)
 
 func Register(tokenGetter grc20.TokenGetter, slug string) {
-	rlmPath := std.PrevRealm().PkgPath()
+	rlmPath := std.PreviousRealm().PkgPath()
 	key := fqname.Construct(rlmPath, slug)
 	registry.Set(key, tokenGetter)
 	std.Emit(
diff --git a/examples/gno.land/r/demo/grc20reg/grc20reg_test.gno b/examples/gno.land/r/demo/grc20reg/grc20reg_test.gno
index c93365ff7a1..35aad13abcf 100644
--- a/examples/gno.land/r/demo/grc20reg/grc20reg_test.gno
+++ b/examples/gno.land/r/demo/grc20reg/grc20reg_test.gno
@@ -13,7 +13,7 @@ func TestRegistry(t *testing.T) {
 	std.TestSetRealm(std.NewCodeRealm("gno.land/r/demo/foo"))
 	realmAddr := std.CurrentRealm().PkgPath()
 	token, ledger := grc20.NewToken("TestToken", "TST", 4)
-	ledger.Mint(std.CurrentRealm().Addr(), 1234567)
+	ledger.Mint(std.CurrentRealm().Address(), 1234567)
 	tokenGetter := func() *grc20.Token { return token }
 	// register
 	Register(tokenGetter, "")
diff --git a/examples/gno.land/r/demo/groups/public.gno b/examples/gno.land/r/demo/groups/public.gno
index 33e7dbdcf35..d59b0c2042f 100644
--- a/examples/gno.land/r/demo/groups/public.gno
+++ b/examples/gno.land/r/demo/groups/public.gno
@@ -19,7 +19,7 @@ func GetGroupIDFromName(name string) (GroupID, bool) {
 
 func CreateGroup(name string) GroupID {
 	std.AssertOriginCall()
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	usernameOf(caller)
 	url := "/r/demo/groups:" + name
 	group := newGroup(url, name, caller)
@@ -31,7 +31,7 @@ func CreateGroup(name string) GroupID {
 
 func AddMember(gid GroupID, address string, weight int, metadata string) MemberID {
 	std.AssertOriginCall()
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	usernameOf(caller)
 	group := getGroup(gid)
 	if !group.HasPermission(caller, EditPermission) {
@@ -52,7 +52,7 @@ func AddMember(gid GroupID, address string, weight int, metadata string) MemberI
 
 func DeleteGroup(gid GroupID) {
 	std.AssertOriginCall()
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	group := getGroup(gid)
 	if !group.HasPermission(caller, DeletePermission) {
 		panic("unauthorized to delete group")
@@ -62,7 +62,7 @@ func DeleteGroup(gid GroupID) {
 
 func DeleteMember(gid GroupID, mid MemberID) {
 	std.AssertOriginCall()
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	group := getGroup(gid)
 	if !group.HasPermission(caller, DeletePermission) {
 		panic("unauthorized to delete member")
diff --git a/examples/gno.land/r/demo/groups/z_1_a_filetest.gno b/examples/gno.land/r/demo/groups/z_1_a_filetest.gno
index 71da1b966ec..1db5453ba34 100644
--- a/examples/gno.land/r/demo/groups/z_1_a_filetest.gno
+++ b/examples/gno.land/r/demo/groups/z_1_a_filetest.gno
@@ -16,43 +16,43 @@ var gid groups.GroupID
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	users.Register("", "gnouser0", "my profile 1")
 
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test1 := testutils.TestAddress("gnouser1")
 	users.Invite(test1.String())
 	// switch to test1
-	std.TestSetOrigCaller(test1)
+	std.TestSetOriginCaller(test1)
 	users.Register(caller, "gnouser1", "my other profile 1")
 
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test2 := testutils.TestAddress("gnouser2")
 	users.Invite(test2.String())
 	// switch to test1
-	std.TestSetOrigCaller(test2)
+	std.TestSetOriginCaller(test2)
 	users.Register(caller, "gnouser2", "my other profile 2")
 
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test3 := testutils.TestAddress("gnouser3")
 	users.Invite(test3.String())
 	// switch to test1
-	std.TestSetOrigCaller(test3)
+	std.TestSetOriginCaller(test3)
 	users.Register(caller, "gnouser3", "my other profile 3")
 
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 
 	gid = groups.CreateGroup("test_group")
 	println(gid)
diff --git a/examples/gno.land/r/demo/groups/z_1_c_filetest.gno b/examples/gno.land/r/demo/groups/z_1_c_filetest.gno
index 6eaabb07cdf..b13c88fe1c8 100644
--- a/examples/gno.land/r/demo/groups/z_1_c_filetest.gno
+++ b/examples/gno.land/r/demo/groups/z_1_c_filetest.gno
@@ -18,8 +18,8 @@ func main() {
 
 	// add member via anon user
 	test2 := testutils.TestAddress("test2")
-	std.TestSetOrigCaller(test2)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 9000000}}, nil)
+	std.TestSetOriginCaller(test2)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 9000000}}, nil)
 
 	groups.AddMember(gid, test2.String(), 42, "metadata3")
 }
diff --git a/examples/gno.land/r/demo/groups/z_2_a_filetest.gno b/examples/gno.land/r/demo/groups/z_2_a_filetest.gno
index 0c482e1b52f..a01b7571d26 100644
--- a/examples/gno.land/r/demo/groups/z_2_a_filetest.gno
+++ b/examples/gno.land/r/demo/groups/z_2_a_filetest.gno
@@ -16,43 +16,43 @@ var gid groups.GroupID
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	users.Register("", "gnouser0", "my profile 1")
 
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test1 := testutils.TestAddress("gnouser1")
 	users.Invite(test1.String())
 	// switch to test1
-	std.TestSetOrigCaller(test1)
+	std.TestSetOriginCaller(test1)
 	users.Register(caller, "gnouser1", "my other profile 1")
 
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test2 := testutils.TestAddress("gnouser2")
 	users.Invite(test2.String())
 	// switch to test1
-	std.TestSetOrigCaller(test2)
+	std.TestSetOriginCaller(test2)
 	users.Register(caller, "gnouser2", "my other profile 2")
 
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test3 := testutils.TestAddress("gnouser3")
 	users.Invite(test3.String())
 	// switch to test1
-	std.TestSetOrigCaller(test3)
+	std.TestSetOriginCaller(test3)
 	users.Register(caller, "gnouser3", "my other profile 3")
 
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 
 	gid = groups.CreateGroup("test_group")
 	println(gid)
diff --git a/examples/gno.land/r/demo/groups/z_2_d_filetest.gno b/examples/gno.land/r/demo/groups/z_2_d_filetest.gno
index 3caa726cbd3..ac91caf15b5 100644
--- a/examples/gno.land/r/demo/groups/z_2_d_filetest.gno
+++ b/examples/gno.land/r/demo/groups/z_2_d_filetest.gno
@@ -20,8 +20,8 @@ func main() {
 
 	// delete member via anon user
 	test2 := testutils.TestAddress("test2")
-	std.TestSetOrigCaller(test2)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 9000000}}, nil)
+	std.TestSetOriginCaller(test2)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 9000000}}, nil)
 
 	groups.DeleteMember(gid, 0)
 	println(groups.Render(""))
diff --git a/examples/gno.land/r/demo/groups/z_2_g_filetest.gno b/examples/gno.land/r/demo/groups/z_2_g_filetest.gno
index 6230b110c74..88805c2c94a 100644
--- a/examples/gno.land/r/demo/groups/z_2_g_filetest.gno
+++ b/examples/gno.land/r/demo/groups/z_2_g_filetest.gno
@@ -20,8 +20,8 @@ func main() {
 
 	// delete group via anon user
 	test2 := testutils.TestAddress("test2")
-	std.TestSetOrigCaller(test2)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 9000000}}, nil)
+	std.TestSetOriginCaller(test2)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 9000000}}, nil)
 
 	groups.DeleteGroup(gid)
 	println(groups.Render(""))
diff --git a/examples/gno.land/r/demo/keystore/keystore.gno b/examples/gno.land/r/demo/keystore/keystore.gno
index 5c76ccd90f8..5edff4ebf25 100644
--- a/examples/gno.land/r/demo/keystore/keystore.gno
+++ b/examples/gno.land/r/demo/keystore/keystore.gno
@@ -33,14 +33,14 @@ type KeyStore struct {
 // Set will set a value to a key
 // requires write-access (original caller must be caller)
 func Set(k, v string) string {
-	origOwner := std.GetOrigCaller()
+	origOwner := std.OriginCaller()
 	return set(origOwner.String(), k, v)
 }
 
 // set (private) will set a key to value
 // requires write-access (original caller must be caller)
 func set(owner, k, v string) string {
-	origOwner := std.GetOrigCaller()
+	origOwner := std.OriginCaller()
 	if origOwner.String() != owner {
 		return StatusNoWriteAccess
 	}
@@ -62,14 +62,14 @@ func set(owner, k, v string) string {
 // Remove removes a key
 // requires write-access (original owner must be caller)
 func Remove(k string) string {
-	origOwner := std.GetOrigCaller()
+	origOwner := std.OriginCaller()
 	return remove(origOwner.String(), k)
 }
 
 // remove (private) removes a key
 // requires write-access (original owner must be caller)
 func remove(owner, k string) string {
-	origOwner := std.GetOrigCaller()
+	origOwner := std.OriginCaller()
 	if origOwner.String() != owner {
 		return StatusNoWriteAccess
 	}
@@ -94,7 +94,7 @@ func remove(owner, k string) string {
 // Get returns a value for a key
 // read-only
 func Get(k string) string {
-	origOwner := std.GetOrigCaller()
+	origOwner := std.OriginCaller()
 	return remove(origOwner.String(), k)
 }
 
@@ -116,7 +116,7 @@ func get(owner, k string) string {
 // Size returns size of database
 // read-only
 func Size() string {
-	origOwner := std.GetOrigCaller()
+	origOwner := std.OriginCaller()
 	return size(origOwner.String())
 }
 
diff --git a/examples/gno.land/r/demo/keystore/keystore_test.gno b/examples/gno.land/r/demo/keystore/keystore_test.gno
index 03b61e79663..19d2eea16c1 100644
--- a/examples/gno.land/r/demo/keystore/keystore_test.gno
+++ b/examples/gno.land/r/demo/keystore/keystore_test.gno
@@ -62,7 +62,7 @@ func TestRender(t *testing.T) {
 		}
 		p = strings.TrimSuffix(p, ":")
 		t.Run(p, func(t *testing.T) {
-			std.TestSetOrigCaller(tc.caller)
+			std.TestSetOriginCaller(tc.caller)
 			var act string
 			if len(tc.ps) > 0 && tc.ps[0] == "set" {
 				act = strings.TrimSpace(Set(tc.ps[1], tc.ps[2]))
diff --git a/examples/gno.land/r/demo/microblog/microblog.gno b/examples/gno.land/r/demo/microblog/microblog.gno
index 1c3cd5e7d68..bfa8ad676d0 100644
--- a/examples/gno.land/r/demo/microblog/microblog.gno
+++ b/examples/gno.land/r/demo/microblog/microblog.gno
@@ -91,7 +91,7 @@ func NewPost(text string) string {
 }
 
 func Register(name, profile string) string {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	users.Register(caller, name, profile)
 	return "OK"
 }
diff --git a/examples/gno.land/r/demo/microblog/microblog_test.gno b/examples/gno.land/r/demo/microblog/microblog_test.gno
index 9ad98d3cbfe..e3c1721b9f7 100644
--- a/examples/gno.land/r/demo/microblog/microblog_test.gno
+++ b/examples/gno.land/r/demo/microblog/microblog_test.gno
@@ -15,7 +15,7 @@ func TestMicroblog(t *testing.T) {
 		author2 std.Address = testutils.TestAddress("author2")
 	)
 
-	std.TestSetOrigCaller(author1)
+	std.TestSetOriginCaller(author1)
 
 	urequire.Equal(t, "404", Render("/wrongpath"), "rendering not giving 404")
 	urequire.NotEqual(t, "404", Render(""), "rendering / should not give 404")
@@ -27,7 +27,7 @@ func TestMicroblog(t *testing.T) {
 	_, err = m.GetPage("no such author")
 	urequire.Error(t, err, "silo should not exist")
 
-	std.TestSetOrigCaller(author2)
+	std.TestSetOriginCaller(author2)
 
 	urequire.NoError(t, m.NewPost("hello, web3"), "could not create post")
 	urequire.NoError(t, m.NewPost("hello again, web3"), "could not create post")
diff --git a/examples/gno.land/r/demo/nft/nft.gno b/examples/gno.land/r/demo/nft/nft.gno
index f4340d6d2a9..fe328a5be17 100644
--- a/examples/gno.land/r/demo/nft/nft.gno
+++ b/examples/gno.land/r/demo/nft/nft.gno
@@ -74,7 +74,7 @@ func (grc *token) SafeTransferFrom(from, to std.Address, tid grc721.TokenID) {
 }
 
 func (grc *token) TransferFrom(from, to std.Address, tid grc721.TokenID) {
-	caller := std.GetCallerAt(2)
+	caller := std.CallerAt(2)
 	token, ok := grc.getToken(tid)
 	// Throws if `_tokenId` is not a valid NFT.
 	if !ok {
@@ -101,7 +101,7 @@ func (grc *token) TransferFrom(from, to std.Address, tid grc721.TokenID) {
 }
 
 func (grc *token) Approve(approved std.Address, tid grc721.TokenID) {
-	caller := std.GetCallerAt(2)
+	caller := std.CallerAt(2)
 	token, ok := grc.getToken(tid)
 	// Throws if `_tokenId` is not a valid NFT.
 	if !ok {
@@ -121,7 +121,7 @@ func (grc *token) Approve(approved std.Address, tid grc721.TokenID) {
 
 // XXX make it work for set of operators.
 func (grc *token) SetApprovalForAll(operator std.Address, approved bool) {
-	caller := std.GetCallerAt(2)
+	caller := std.CallerAt(2)
 	grc.operators.Set(caller.String(), operator)
 }
 
diff --git a/examples/gno.land/r/demo/nft/z_2_filetest.gno b/examples/gno.land/r/demo/nft/z_2_filetest.gno
index 91c48bd5957..1848cd8222e 100644
--- a/examples/gno.land/r/demo/nft/z_2_filetest.gno
+++ b/examples/gno.land/r/demo/nft/z_2_filetest.gno
@@ -9,7 +9,7 @@ import (
 )
 
 func main() {
-	caller := std.GetCallerAt(1)
+	caller := std.CallerAt(1)
 	addr1 := testutils.TestAddress("addr1")
 	// addr2 := testutils.TestAddress("addr2")
 	grc721 := nft.GetToken()
diff --git a/examples/gno.land/r/demo/nft/z_3_filetest.gno b/examples/gno.land/r/demo/nft/z_3_filetest.gno
index d0210c8ba4d..09402b38246 100644
--- a/examples/gno.land/r/demo/nft/z_3_filetest.gno
+++ b/examples/gno.land/r/demo/nft/z_3_filetest.gno
@@ -9,7 +9,7 @@ import (
 )
 
 func main() {
-	caller := std.GetCallerAt(1)
+	caller := std.CallerAt(1)
 	addr1 := testutils.TestAddress("addr1")
 	addr2 := testutils.TestAddress("addr2")
 	grc721 := nft.GetToken()
diff --git a/examples/gno.land/r/demo/nft/z_4_filetest.gno b/examples/gno.land/r/demo/nft/z_4_filetest.gno
index b38ce8ea190..3a167f3c87b 100644
--- a/examples/gno.land/r/demo/nft/z_4_filetest.gno
+++ b/examples/gno.land/r/demo/nft/z_4_filetest.gno
@@ -9,7 +9,7 @@ import (
 )
 
 func main() {
-	caller := std.GetCallerAt(1)
+	caller := std.CallerAt(1)
 	addr1 := testutils.TestAddress("addr1")
 	addr2 := testutils.TestAddress("addr2")
 	grc721 := nft.GetToken()
diff --git a/examples/gno.land/r/demo/profile/profile.gno b/examples/gno.land/r/demo/profile/profile.gno
index 1318e19eaf3..6e0baa10929 100644
--- a/examples/gno.land/r/demo/profile/profile.gno
+++ b/examples/gno.land/r/demo/profile/profile.gno
@@ -70,7 +70,7 @@ var boolFields = map[string]bool{
 // Setters
 
 func SetStringField(field, value string) bool {
-	addr := std.PrevRealm().Addr()
+	addr := std.PreviousRealm().Address()
 	key := addr.String() + ":" + field
 	updated := fields.Set(key, value)
 
@@ -85,7 +85,7 @@ func SetStringField(field, value string) bool {
 }
 
 func SetIntField(field string, value int) bool {
-	addr := std.PrevRealm().Addr()
+	addr := std.PreviousRealm().Address()
 	key := addr.String() + ":" + field
 	updated := fields.Set(key, value)
 
@@ -100,7 +100,7 @@ func SetIntField(field string, value int) bool {
 }
 
 func SetBoolField(field string, value bool) bool {
-	addr := std.PrevRealm().Addr()
+	addr := std.PreviousRealm().Address()
 	key := addr.String() + ":" + field
 	updated := fields.Set(key, value)
 
diff --git a/examples/gno.land/r/demo/releases_example/example.gno b/examples/gno.land/r/demo/releases_example/example.gno
index a2713687d28..74a306b4251 100644
--- a/examples/gno.land/r/demo/releases_example/example.gno
+++ b/examples/gno.land/r/demo/releases_example/example.gno
@@ -17,7 +17,7 @@ func init() {
 }
 
 func NewRelease(name, url, notes string) {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if caller != admin {
 		panic("restricted area")
 	}
@@ -25,7 +25,7 @@ func NewRelease(name, url, notes string) {
 }
 
 func UpdateAdmin(address std.Address) {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if caller != admin {
 		panic("restricted area")
 	}
diff --git a/examples/gno.land/r/demo/tamagotchi/realm.gno b/examples/gno.land/r/demo/tamagotchi/realm.gno
index f6d648180ed..4222a9c63b5 100644
--- a/examples/gno.land/r/demo/tamagotchi/realm.gno
+++ b/examples/gno.land/r/demo/tamagotchi/realm.gno
@@ -16,7 +16,7 @@ func init() {
 func Reset(optionalName string) string {
 	name := optionalName
 	if name == "" {
-		height := std.GetHeight()
+		height := std.ChainHeight()
 		name = ufmt.Sprintf("gnome#%d", height)
 	}
 
diff --git a/examples/gno.land/r/demo/tests/crossrealm_b/crossrealm.gno b/examples/gno.land/r/demo/tests/crossrealm_b/crossrealm.gno
index d412b6ee6b1..058c81ed034 100644
--- a/examples/gno.land/r/demo/tests/crossrealm_b/crossrealm.gno
+++ b/examples/gno.land/r/demo/tests/crossrealm_b/crossrealm.gno
@@ -15,7 +15,7 @@ func (f *fooer) SetS(newVal string) {
 }
 
 func (f *fooer) Foo() {
-	println("hello " + f.s + " cur=" + std.CurrentRealm().PkgPath() + " prev=" + std.PrevRealm().PkgPath())
+	println("hello " + f.s + " cur=" + std.CurrentRealm().PkgPath() + " prev=" + std.PreviousRealm().PkgPath())
 }
 
 var (
diff --git a/examples/gno.land/r/demo/tests/subtests/subtests.gno b/examples/gno.land/r/demo/tests/subtests/subtests.gno
index 5043c704017..ddfe54cd4b3 100644
--- a/examples/gno.land/r/demo/tests/subtests/subtests.gno
+++ b/examples/gno.land/r/demo/tests/subtests/subtests.gno
@@ -8,8 +8,8 @@ func GetCurrentRealm() std.Realm {
 	return std.CurrentRealm()
 }
 
-func GetPrevRealm() std.Realm {
-	return std.PrevRealm()
+func GetPreviousRealm() std.Realm {
+	return std.PreviousRealm()
 }
 
 func Exec(fn func()) {
@@ -21,5 +21,5 @@ func CallAssertOriginCall() {
 }
 
 func CallIsOriginCall() bool {
-	return std.PrevRealm().IsUser()
+	return std.PreviousRealm().IsUser()
 }
diff --git a/examples/gno.land/r/demo/tests/tests.gno b/examples/gno.land/r/demo/tests/tests.gno
index cdeea62de66..452319c7aca 100644
--- a/examples/gno.land/r/demo/tests/tests.gno
+++ b/examples/gno.land/r/demo/tests/tests.gno
@@ -21,10 +21,10 @@ func CurrentRealmPath() string {
 	return std.CurrentRealm().PkgPath()
 }
 
-var initOrigCaller = std.GetOrigCaller()
+var initOriginCaller = std.OriginCaller()
 
-func InitOrigCaller() std.Address {
-	return initOrigCaller
+func InitOriginCaller() std.Address {
+	return initOriginCaller
 }
 
 func CallAssertOriginCall() {
@@ -32,7 +32,7 @@ func CallAssertOriginCall() {
 }
 
 func CallIsOriginCall() bool {
-	return std.PrevRealm().IsUser()
+	return std.PreviousRealm().IsUser()
 }
 
 func CallSubtestsAssertOriginCall() {
@@ -91,12 +91,12 @@ func PrintTestNodes() {
 	println(gTestNode2.Child.Name)
 }
 
-func GetPrevRealm() std.Realm {
-	return std.PrevRealm()
+func GetPreviousRealm() std.Realm {
+	return std.PreviousRealm()
 }
 
-func GetRSubtestsPrevRealm() std.Realm {
-	return rsubtests.GetPrevRealm()
+func GetRSubtestsPreviousRealm() std.Realm {
+	return rsubtests.GetPreviousRealm()
 }
 
 func Exec(fn func()) {
diff --git a/examples/gno.land/r/demo/tests/tests_test.gno b/examples/gno.land/r/demo/tests/tests_test.gno
index fa3872744c8..e5851f317b9 100644
--- a/examples/gno.land/r/demo/tests/tests_test.gno
+++ b/examples/gno.land/r/demo/tests/tests_test.gno
@@ -48,18 +48,18 @@ func TestAssertOriginCall(t *testing.T) {
 	tests.CallSubtestsAssertOriginCall()
 }
 
-func TestPrevRealm(t *testing.T) {
+func TestPreviousRealm(t *testing.T) {
 	var (
 		firstRealm = std.DerivePkgAddr("gno.land/r/demo/tests_test")
 		rTestsAddr = std.DerivePkgAddr("gno.land/r/demo/tests")
 	)
-	// When only one realm in the frames, PrevRealm returns the same realm
-	if addr := tests.GetPrevRealm().Addr(); addr != firstRealm {
-		println(tests.GetPrevRealm())
-		t.Errorf("want GetPrevRealm().Addr==%s, got %s", firstRealm, addr)
+	// When only one realm in the frames, PreviousRealm returns the same realm
+	if addr := tests.GetPreviousRealm().Address(); addr != firstRealm {
+		println(tests.GetPreviousRealm())
+		t.Errorf("want GetPreviousRealm().Address==%s, got %s", firstRealm, addr)
 	}
-	// When 2 or more realms in the frames, PrevRealm returns the second to last
-	if addr := tests.GetRSubtestsPrevRealm().Addr(); addr != rTestsAddr {
-		t.Errorf("want GetRSubtestsPrevRealm().Addr==%s, got %s", rTestsAddr, addr)
+	// When 2 or more realms in the frames, PreviousRealm returns the second to last
+	if addr := tests.GetRSubtestsPreviousRealm().Address(); addr != rTestsAddr {
+		t.Errorf("want GetRSubtestsPreviousRealm().Address==%s, got %s", rTestsAddr, addr)
 	}
 }
diff --git a/examples/gno.land/r/demo/tests/z2_filetest.gno b/examples/gno.land/r/demo/tests/z2_filetest.gno
index 147d2c12c6c..bad59e0a32b 100644
--- a/examples/gno.land/r/demo/tests/z2_filetest.gno
+++ b/examples/gno.land/r/demo/tests/z2_filetest.gno
@@ -7,18 +7,18 @@ import (
 	"gno.land/r/demo/tests"
 )
 
-// When a single realm in the frames, PrevRealm returns the user
-// When 2 or more realms in the frames, PrevRealm returns the second to last
+// When a single realm in the frames, PreviousRealm returns the user
+// 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")
 	)
-	std.TestSetOrigCaller(eoa)
-	println("tests.GetPrevRealm().Addr(): ", tests.GetPrevRealm().Addr())
-	println("tests.GetRSubtestsPrevRealm().Addr(): ", tests.GetRSubtestsPrevRealm().Addr())
+	std.TestSetOriginCaller(eoa)
+	println("tests.GetPreviousRealm().Address(): ", tests.GetPreviousRealm().Address())
+	println("tests.GetRSubtestsPreviousRealm().Address(): ", tests.GetRSubtestsPreviousRealm().Address())
 }
 
 // Output:
-// tests.GetPrevRealm().Addr():  g1wdhk6et0dej47h6lta047h6lta047h6lrnerlk
-// tests.GetRSubtestsPrevRealm().Addr():  g1gz4ycmx0s6ln2wdrsh4e00l9fsel2wskqa3snq
+// tests.GetPreviousRealm().Address():  g1wdhk6et0dej47h6lta047h6lta047h6lrnerlk
+// tests.GetRSubtestsPreviousRealm().Address():  g1gz4ycmx0s6ln2wdrsh4e00l9fsel2wskqa3snq
diff --git a/examples/gno.land/r/demo/tests/z3_filetest.gno b/examples/gno.land/r/demo/tests/z3_filetest.gno
index 5430e7f7151..430486e2818 100644
--- a/examples/gno.land/r/demo/tests/z3_filetest.gno
+++ b/examples/gno.land/r/demo/tests/z3_filetest.gno
@@ -13,16 +13,16 @@ func main() {
 		eoa        = testutils.TestAddress("someone")
 		rTestsAddr = std.DerivePkgAddr("gno.land/r/demo/tests")
 	)
-	std.TestSetOrigCaller(eoa)
-	// Contrarily to z2_filetest.gno we EXPECT GetPrevRealms != eoa (#1704)
-	if addr := tests.GetPrevRealm().Addr(); addr != eoa {
-		println("want tests.GetPrevRealm().Addr ==", eoa, "got", addr)
+	std.TestSetOriginCaller(eoa)
+	// Contrarily to z2_filetest.gno we EXPECT GetPreviousRealms != eoa (#1704)
+	if addr := tests.GetPreviousRealm().Address(); addr != eoa {
+		println("want tests.GetPreviousRealm().Addr ==", eoa, "got", addr)
 	}
 	// When 2 or more realms in the frames, it is also different
-	if addr := tests.GetRSubtestsPrevRealm().Addr(); addr != rTestsAddr {
-		println("want GetRSubtestsPrevRealm().Addr ==", rTestsAddr, "got", addr)
+	if addr := tests.GetRSubtestsPreviousRealm().Address(); addr != rTestsAddr {
+		println("want GetRSubtestsPreviousRealm().Addr ==", rTestsAddr, "got", addr)
 	}
 }
 
 // Output:
-// want tests.GetPrevRealm().Addr == g1wdhk6et0dej47h6lta047h6lta047h6lrnerlk got g1xufrdvnfk6zc9r0nqa23ld3tt2r5gkyvw76q63
+// want tests.GetPreviousRealm().Addr == g1wdhk6et0dej47h6lta047h6lta047h6lrnerlk got g1xufrdvnfk6zc9r0nqa23ld3tt2r5gkyvw76q63
diff --git a/examples/gno.land/r/demo/todolist/todolist_test.gno b/examples/gno.land/r/demo/todolist/todolist_test.gno
index 6446732df3e..f6e510bcc03 100644
--- a/examples/gno.land/r/demo/todolist/todolist_test.gno
+++ b/examples/gno.land/r/demo/todolist/todolist_test.gno
@@ -26,7 +26,7 @@ func TestNewTodoList(t *testing.T) {
 
 	uassert.Equal(t, title, tdl.Title, "title does not match")
 	uassert.Equal(t, 1, tlid, "tlid does not match")
-	uassert.Equal(t, tdl.Owner.String(), std.GetOrigCaller().String(), "owner does not match")
+	uassert.Equal(t, tdl.Owner.String(), std.OriginCaller().String(), "owner does not match")
 	uassert.Equal(t, 0, len(tdl.GetTasks()), "Expected no tasks in the todo list")
 }
 
diff --git a/examples/gno.land/r/demo/userbook/userbook.gno b/examples/gno.land/r/demo/userbook/userbook.gno
index 03027f064b0..412f9410318 100644
--- a/examples/gno.land/r/demo/userbook/userbook.gno
+++ b/examples/gno.land/r/demo/userbook/userbook.gno
@@ -30,7 +30,7 @@ func init() {
 
 func SignUp() string {
 	// Get transaction caller
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 
 	// Check if the user is already signed up
 	if _, exists := tracker.Get(caller.String()); exists {
diff --git a/examples/gno.land/r/demo/users/users.gno b/examples/gno.land/r/demo/users/users.gno
index 451afc7bf96..4d578c87d1b 100644
--- a/examples/gno.land/r/demo/users/users.gno
+++ b/examples/gno.land/r/demo/users/users.gno
@@ -34,16 +34,16 @@ func Register(inviter std.Address, name string, profile string) {
 	// assert CallTx call.
 	std.AssertOriginCall()
 	// assert invited or paid.
-	caller := std.GetCallerAt(2)
-	if caller != std.GetOrigCaller() {
-		panic("should not happen") // because std.AssertOrigCall().
+	caller := std.CallerAt(2)
+	if caller != std.OriginCaller() {
+		panic("should not happen") // because std.AssertOriginCall().
 	}
 
-	sentCoins := std.GetOrigSend()
+	sentCoins := std.OriginSend()
 	minCoin := std.NewCoin("ugnot", minFee)
 
 	if inviter == "" {
-		// banker := std.GetBanker(std.BankerTypeOrigSend)
+		// banker := std.NewBanker(std.BankerTypeOriginSend)
 		if len(sentCoins) == 1 && sentCoins[0].IsGTE(minCoin) {
 			if sentCoins[0].Amount > minFee*maxFeeMult {
 				panic("payment must not be greater than " + strconv.Itoa(int(minFee*maxFeeMult)))
@@ -118,9 +118,9 @@ func Invite(invitee string) {
 	// assert CallTx call.
 	std.AssertOriginCall()
 	// get caller/inviter.
-	caller := std.GetCallerAt(2)
-	if caller != std.GetOrigCaller() {
-		panic("should not happen") // because std.AssertOrigCall().
+	caller := std.CallerAt(2)
+	if caller != std.OriginCaller() {
+		panic("should not happen") // because std.AssertOriginCall().
 	}
 	lines := strings.Split(invitee, "\n")
 	if caller == admin {
@@ -157,9 +157,9 @@ func GrantInvites(invites string) {
 	// assert CallTx call.
 	std.AssertOriginCall()
 	// assert admin.
-	caller := std.GetCallerAt(2)
-	if caller != std.GetOrigCaller() {
-		panic("should not happen") // because std.AssertOrigCall().
+	caller := std.CallerAt(2)
+	if caller != std.OriginCaller() {
+		panic("should not happen") // because std.AssertOriginCall().
 	}
 	if caller != admin {
 		panic("unauthorized")
@@ -208,7 +208,7 @@ func SetMinFee(newMinFee int64) {
 	// assert CallTx call.
 	std.AssertOriginCall()
 	// assert admin caller.
-	caller := std.GetCallerAt(2)
+	caller := std.CallerAt(2)
 	if caller != admin {
 		panic("unauthorized")
 	}
@@ -221,7 +221,7 @@ func SetMaxFeeMultiple(newMaxFeeMult int64) {
 	// assert CallTx call.
 	std.AssertOriginCall()
 	// assert admin caller.
-	caller := std.GetCallerAt(2)
+	caller := std.CallerAt(2)
 	if caller != admin {
 		panic("unauthorized")
 	}
@@ -278,7 +278,7 @@ func AdminAddRestrictedName(name string) {
 	// assert CallTx call.
 	std.AssertOriginCall()
 	// get caller
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	// assert admin
 	if caller != admin {
 		panic("unauthorized")
diff --git a/examples/gno.land/r/demo/users/z_0_filetest.gno b/examples/gno.land/r/demo/users/z_0_filetest.gno
index cbb2e9209f4..bc06449bf90 100644
--- a/examples/gno.land/r/demo/users/z_0_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_0_filetest.gno
@@ -7,7 +7,7 @@ import (
 )
 
 func main() {
-	std.TestSetOrigSend(std.Coins{std.NewCoin("dontcare", 1)}, nil)
+	std.TestSetOriginSend(std.Coins{std.NewCoin("dontcare", 1)}, nil)
 	users.Register("", "gnouser", "my profile")
 	println("done")
 }
diff --git a/examples/gno.land/r/demo/users/z_10_filetest.gno b/examples/gno.land/r/demo/users/z_10_filetest.gno
index afeecffcc42..e4a6f714d6b 100644
--- a/examples/gno.land/r/demo/users/z_10_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_10_filetest.gno
@@ -11,20 +11,20 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func init() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	test2 := testutils.TestAddress("test2")
 	// as admin, invite gnouser and test2
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.Invite(caller.String() + "\n" + test2.String())
 	// register as caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	users.Register(admin, "gnouser", "my profile")
 }
 
 func main() {
 	// register as test2
 	test2 := testutils.TestAddress("test2")
-	std.TestSetOrigCaller(test2)
+	std.TestSetOriginCaller(test2)
 	users.Register(admin, "test222", "my profile 2")
 	println("done")
 }
diff --git a/examples/gno.land/r/demo/users/z_11_filetest.gno b/examples/gno.land/r/demo/users/z_11_filetest.gno
index 212dc169007..1d999c2a671 100644
--- a/examples/gno.land/r/demo/users/z_11_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_11_filetest.gno
@@ -11,12 +11,12 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	std.TestSetOrigCaller(admin)
-	caller := std.GetOrigCaller() // main
+	std.TestSetOriginCaller(admin)
+	caller := std.OriginCaller() // main
 	users.AdminAddRestrictedName("superrestricted")
 
 	// test restricted name
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	users.Register("", "superrestricted", "my profile")
 	println("done")
 }
diff --git a/examples/gno.land/r/demo/users/z_11b_filetest.gno b/examples/gno.land/r/demo/users/z_11b_filetest.gno
index 6041f4b7113..d83213ccf6f 100644
--- a/examples/gno.land/r/demo/users/z_11b_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_11b_filetest.gno
@@ -11,14 +11,14 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	std.TestSetOrigCaller(admin)
-	caller := std.GetOrigCaller() // main
+	std.TestSetOriginCaller(admin)
+	caller := std.OriginCaller() // main
 	// add restricted name
 	users.AdminAddRestrictedName("superrestricted")
 	// grant invite to caller
 	users.Invite(caller.String())
 	// set back caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// register restricted name with admin invite
 	users.Register(admin, "superrestricted", "my profile")
 	println("done")
diff --git a/examples/gno.land/r/demo/users/z_2_filetest.gno b/examples/gno.land/r/demo/users/z_2_filetest.gno
index c1b92790f8b..1436c53ab79 100644
--- a/examples/gno.land/r/demo/users/z_2_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_2_filetest.gno
@@ -12,18 +12,18 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	users.Register("", "gnouser", "my profile")
 	// as admin, grant invites to gnouser
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test1 := testutils.TestAddress("test1")
 	users.Invite(test1.String())
 	// switch to test1
-	std.TestSetOrigCaller(test1)
+	std.TestSetOriginCaller(test1)
 	users.Register(caller, "satoshi", "my other profile")
 	println("done")
 }
diff --git a/examples/gno.land/r/demo/users/z_3_filetest.gno b/examples/gno.land/r/demo/users/z_3_filetest.gno
index 5402235e03d..29d082aad62 100644
--- a/examples/gno.land/r/demo/users/z_3_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_3_filetest.gno
@@ -12,19 +12,19 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	users.Register("", "gnouser", "my profile")
 	// as admin, grant invites to gnouser
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test1 := testutils.TestAddress("test1")
 	users.Invite(test1.String())
 	// switch to test1
-	std.TestSetOrigCaller(test1)
-	std.TestSetOrigSend(std.Coins{{"dontcare", 1}}, nil)
+	std.TestSetOriginCaller(test1)
+	std.TestSetOriginSend(std.Coins{{"dontcare", 1}}, nil)
 	users.Register(caller, "satoshi", "my other profile")
 	println("done")
 }
diff --git a/examples/gno.land/r/demo/users/z_4_filetest.gno b/examples/gno.land/r/demo/users/z_4_filetest.gno
index 613fadf9625..53db4bb2f73 100644
--- a/examples/gno.land/r/demo/users/z_4_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_4_filetest.gno
@@ -12,20 +12,20 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	users.Register("", "gnouser", "my profile")
 	// as admin, grant invites to gnouser
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test1 := testutils.TestAddress("test1")
 	test2 := testutils.TestAddress("test2")
 	users.Invite(test1.String())
 	// switch to test2 (not test1)
-	std.TestSetOrigCaller(test2)
-	std.TestSetOrigSend(std.Coins{{"dontcare", 1}}, nil)
+	std.TestSetOriginCaller(test2)
+	std.TestSetOriginSend(std.Coins{{"dontcare", 1}}, nil)
 	users.Register(caller, "satoshi", "my other profile")
 	println("done")
 }
diff --git a/examples/gno.land/r/demo/users/z_5_filetest.gno b/examples/gno.land/r/demo/users/z_5_filetest.gno
index 9080b509b8e..11bb4de6366 100644
--- a/examples/gno.land/r/demo/users/z_5_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_5_filetest.gno
@@ -12,22 +12,22 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	users.Register("", "gnouser", "my profile")
 	// as admin, grant invites to gnouser
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	std.TestSetRealm(std.NewUserRealm(admin))
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	std.TestSetRealm(std.NewUserRealm(caller))
 	// invite another addr
 	test1 := testutils.TestAddress("test1")
 	users.Invite(test1.String())
 	// switch to test1
-	std.TestSetOrigCaller(test1)
+	std.TestSetOriginCaller(test1)
 	std.TestSetRealm(std.NewUserRealm(test1))
-	std.TestSetOrigSend(std.Coins{{"dontcare", 1}}, nil)
+	std.TestSetOriginSend(std.Coins{{"dontcare", 1}}, nil)
 	users.Register(caller, "satoshi", "my other profile")
 	println(users.Render(""))
 	println("========================================")
diff --git a/examples/gno.land/r/demo/users/z_6_filetest.gno b/examples/gno.land/r/demo/users/z_6_filetest.gno
index e6a63d83358..d0c6efeadaa 100644
--- a/examples/gno.land/r/demo/users/z_6_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_6_filetest.gno
@@ -9,9 +9,9 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	// as admin, grant invites to unregistered user.
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	println("done")
 }
diff --git a/examples/gno.land/r/demo/users/z_7_filetest.gno b/examples/gno.land/r/demo/users/z_7_filetest.gno
index 1d3c9e3a917..e2c3e4e6612 100644
--- a/examples/gno.land/r/demo/users/z_7_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_7_filetest.gno
@@ -12,22 +12,22 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	users.Register("", "gnouser", "my profile")
 	// as admin, grant invites to gnouser
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test1 := testutils.TestAddress("test1")
 	users.Invite(test1.String())
 	// switch to test1
-	std.TestSetOrigCaller(test1)
-	std.TestSetOrigSend(std.Coins{{"dontcare", 1}}, nil)
+	std.TestSetOriginCaller(test1)
+	std.TestSetOriginSend(std.Coins{{"dontcare", 1}}, nil)
 	users.Register(caller, "satoshi", "my other profile")
 	// as admin, grant invites to gnouser(again) and satoshi.
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1\n" + test1.String() + ":1")
 	println("done")
 }
diff --git a/examples/gno.land/r/demo/users/z_7b_filetest.gno b/examples/gno.land/r/demo/users/z_7b_filetest.gno
index 09c15bb135d..c35b9756d3e 100644
--- a/examples/gno.land/r/demo/users/z_7b_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_7b_filetest.gno
@@ -12,22 +12,22 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	users.Register("", "gnouser", "my profile")
 	// as admin, grant invites to gnouser
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1\n")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test1 := testutils.TestAddress("test1")
 	users.Invite(test1.String())
 	// switch to test1
-	std.TestSetOrigCaller(test1)
-	std.TestSetOrigSend(std.Coins{{"dontcare", 1}}, nil)
+	std.TestSetOriginCaller(test1)
+	std.TestSetOriginSend(std.Coins{{"dontcare", 1}}, nil)
 	users.Register(caller, "satoshi", "my other profile")
 	// as admin, grant invites to gnouser(again) and satoshi.
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1\n" + test1.String() + ":1")
 	println("done")
 }
diff --git a/examples/gno.land/r/demo/users/z_8_filetest.gno b/examples/gno.land/r/demo/users/z_8_filetest.gno
index 78fada74a71..56785ae85f1 100644
--- a/examples/gno.land/r/demo/users/z_8_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_8_filetest.gno
@@ -12,22 +12,22 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	users.Register("", "gnouser", "my profile")
 	// as admin, grant invites to gnouser
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.GrantInvites(caller.String() + ":1")
 	// switch back to caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	// invite another addr
 	test1 := testutils.TestAddress("test1")
 	users.Invite(test1.String())
 	// switch to test1
-	std.TestSetOrigCaller(test1)
-	std.TestSetOrigSend(std.Coins{{"dontcare", 1}}, nil)
+	std.TestSetOriginCaller(test1)
+	std.TestSetOriginSend(std.Coins{{"dontcare", 1}}, nil)
 	users.Register(caller, "satoshi", "my other profile")
 	// as admin, grant invites to gnouser(again) and nonexistent user.
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	test2 := testutils.TestAddress("test2")
 	users.GrantInvites(caller.String() + ":1\n" + test2.String() + ":1")
 	println("done")
diff --git a/examples/gno.land/r/demo/users/z_9_filetest.gno b/examples/gno.land/r/demo/users/z_9_filetest.gno
index c73c685aebd..d71e19d616d 100644
--- a/examples/gno.land/r/demo/users/z_9_filetest.gno
+++ b/examples/gno.land/r/demo/users/z_9_filetest.gno
@@ -10,16 +10,16 @@ import (
 const admin = std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 
 func main() {
-	caller := std.GetOrigCaller() // main
+	caller := std.OriginCaller() // main
 	test2 := testutils.TestAddress("test2")
 	// as admin, invite gnouser and test2
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 	users.Invite(caller.String() + "\n" + test2.String())
 	// register as caller
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 	users.Register(admin, "gnouser", "my profile")
 	// register as test2
-	std.TestSetOrigCaller(test2)
+	std.TestSetOriginCaller(test2)
 	users.Register(admin, "test222", "my profile 2")
 	println("done")
 }
diff --git a/examples/gno.land/r/demo/wugnot/wugnot.gno b/examples/gno.land/r/demo/wugnot/wugnot.gno
index d0395fe7e8c..75ce9a76a0a 100644
--- a/examples/gno.land/r/demo/wugnot/wugnot.gno
+++ b/examples/gno.land/r/demo/wugnot/wugnot.gno
@@ -22,8 +22,8 @@ func init() {
 }
 
 func Deposit() {
-	caller := std.PrevRealm().Addr()
-	sent := std.GetOrigSend()
+	caller := std.PreviousRealm().Address()
+	sent := std.OriginSend()
 	amount := sent.AmountOf("ugnot")
 
 	require(uint64(amount) >= ugnotMinDeposit, ufmt.Sprintf("Deposit below minimum: %d/%d ugnot.", amount, ugnotMinDeposit))
@@ -34,13 +34,13 @@ func Deposit() {
 func Withdraw(amount uint64) {
 	require(amount >= wugnotMinDeposit, ufmt.Sprintf("Deposit below minimum: %d/%d wugnot.", amount, wugnotMinDeposit))
 
-	caller := std.PrevRealm().Addr()
-	pkgaddr := std.CurrentRealm().Addr()
+	caller := std.PreviousRealm().Address()
+	pkgaddr := std.CurrentRealm().Address()
 	callerBal := Token.BalanceOf(caller)
 	require(amount <= callerBal, ufmt.Sprintf("Insufficient balance: %d available, %d needed.", callerBal, amount))
 
 	// send swapped ugnots to qcaller
-	stdBanker := std.GetBanker(std.BankerTypeRealmSend)
+	stdBanker := std.NewBanker(std.BankerTypeRealmSend)
 	send := std.Coins{{"ugnot", int64(amount)}}
 	stdBanker.SendCoins(pkgaddr, caller, send)
 	checkErr(adm.Burn(caller, amount))
diff --git a/examples/gno.land/r/demo/wugnot/z0_filetest.gno b/examples/gno.land/r/demo/wugnot/z0_filetest.gno
index ff2ea86bc0d..6e9fa0da961 100644
--- a/examples/gno.land/r/demo/wugnot/z0_filetest.gno
+++ b/examples/gno.land/r/demo/wugnot/z0_filetest.gno
@@ -16,7 +16,7 @@ var (
 )
 
 func main() {
-	std.TestSetOrigPkgAddr(addrc)
+	std.TestSetOriginPkgAddress(addrc)
 	std.TestIssueCoins(addrc, std.Coins{{"ugnot", 100000001}}) // TODO: remove this
 
 	// issue ugnots
@@ -27,8 +27,8 @@ func main() {
 	// println(wugnot.Render("queues"))
 	// println("A -", wugnot.Render(""))
 
-	std.TestSetOrigCaller(addr1)
-	std.TestSetOrigSend(std.Coins{{"ugnot", 123_400}}, nil)
+	std.TestSetOriginCaller(addr1)
+	std.TestSetOriginSend(std.Coins{{"ugnot", 123_400}}, nil)
 	wugnot.Deposit()
 	printBalances()
 	wugnot.Withdraw(4242)
@@ -38,8 +38,8 @@ func main() {
 func printBalances() {
 	printSingleBalance := func(name string, addr std.Address) {
 		wugnotBal := wugnot.BalanceOf(addr)
-		std.TestSetOrigCaller(addr)
-		robanker := std.GetBanker(std.BankerTypeReadonly)
+		std.TestSetOriginCaller(addr)
+		robanker := std.NewBanker(std.BankerTypeReadonly)
 		coins := robanker.GetCoins(addr).AmountOf("ugnot")
 		fmt.Printf("| %-13s | addr=%s | wugnot=%-5d | ugnot=%-9d |\n",
 			name, addr, wugnotBal, coins)
diff --git a/examples/gno.land/r/docs/buttons/buttons.gno b/examples/gno.land/r/docs/buttons/buttons.gno
index cb050b1bc38..129ffc149e2 100644
--- a/examples/gno.land/r/docs/buttons/buttons.gno
+++ b/examples/gno.land/r/docs/buttons/buttons.gno
@@ -14,7 +14,7 @@ var (
 
 func UpdateMOTD(newmotd string) {
 	motd = newmotd
-	lastCaller = std.PrevRealm().Addr()
+	lastCaller = std.PreviousRealm().Address()
 }
 
 func Render(path string) string {
diff --git a/examples/gno.land/r/gnoland/blog/admin.gno b/examples/gno.land/r/gnoland/blog/admin.gno
index 87d465449f3..664b905fba8 100644
--- a/examples/gno.land/r/gnoland/blog/admin.gno
+++ b/examples/gno.land/r/gnoland/blog/admin.gno
@@ -17,7 +17,7 @@ var (
 )
 
 func init() {
-	// adminAddr = std.GetOrigCaller() // FIXME: find a way to use this from the main's genesis.
+	// adminAddr = std.OriginCaller() // FIXME: find a way to use this from the main's genesis.
 	adminAddr = "g1manfred47kzduec920z88wfr64ylksmdcedlf5" // @moul
 }
 
@@ -43,7 +43,7 @@ func AdminRemoveModerator(addr std.Address) {
 
 func NewPostExecutor(slug, title, body, publicationDate, authors, tags string) dao.Executor {
 	callback := func() error {
-		addPost(std.PrevRealm().Addr(), slug, title, body, publicationDate, authors, tags)
+		addPost(std.PreviousRealm().Address(), slug, title, body, publicationDate, authors, tags)
 
 		return nil
 	}
@@ -53,7 +53,7 @@ func NewPostExecutor(slug, title, body, publicationDate, authors, tags string) d
 
 func ModAddPost(slug, title, body, publicationDate, authors, tags string) {
 	assertIsModerator()
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	addPost(caller, slug, title, body, publicationDate, authors, tags)
 }
 
@@ -120,14 +120,14 @@ func isCommenter(addr std.Address) bool {
 }
 
 func assertIsAdmin() {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if !isAdmin(caller) {
 		panic("access restricted.")
 	}
 }
 
 func assertIsModerator() {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if isAdmin(caller) || isModerator(caller) {
 		return
 	}
@@ -135,7 +135,7 @@ func assertIsModerator() {
 }
 
 func assertIsCommenter() {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if isAdmin(caller) || isModerator(caller) || isCommenter(caller) {
 		return
 	}
diff --git a/examples/gno.land/r/gnoland/blog/gnoblog.gno b/examples/gno.land/r/gnoland/blog/gnoblog.gno
index d2a163543e5..ee8fc01db69 100644
--- a/examples/gno.land/r/gnoland/blog/gnoblog.gno
+++ b/examples/gno.land/r/gnoland/blog/gnoblog.gno
@@ -15,7 +15,7 @@ func AddComment(postSlug, comment string) {
 	assertIsCommenter()
 	assertNotInPause()
 
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	err := b.GetPost(postSlug).AddComment(caller, comment)
 	checkErr(err)
 }
diff --git a/examples/gno.land/r/gnoland/blog/gnoblog_test.gno b/examples/gno.land/r/gnoland/blog/gnoblog_test.gno
index d046eb80f42..a486cf33176 100644
--- a/examples/gno.land/r/gnoland/blog/gnoblog_test.gno
+++ b/examples/gno.land/r/gnoland/blog/gnoblog_test.gno
@@ -7,7 +7,8 @@ import (
 )
 
 func TestPackage(t *testing.T) {
-	std.TestSetOrigCaller(std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5"))
+	std.TestSetOriginCaller(std.Address("g1manfred47kzduec920z88wfr64ylksmdcedlf5"))
+
 	// by default, no posts.
 	{
 		got := Render("")
diff --git a/examples/gno.land/r/gnoland/events/events_test.gno b/examples/gno.land/r/gnoland/events/events_test.gno
index 1d79b754ee4..47d327203d7 100644
--- a/examples/gno.land/r/gnoland/events/events_test.gno
+++ b/examples/gno.land/r/gnoland/events/events_test.gno
@@ -18,7 +18,7 @@ var (
 )
 
 func TestAddEvent(t *testing.T) {
-	std.TestSetOrigCaller(su)
+	std.TestSetOriginCaller(su)
 	std.TestSetRealm(suRealm)
 
 	e1Start := parsedTimeNow.Add(time.Hour * 24 * 5)
@@ -61,7 +61,7 @@ func TestAddEvent(t *testing.T) {
 }
 
 func TestAddEventErrors(t *testing.T) {
-	std.TestSetOrigCaller(su)
+	std.TestSetOriginCaller(su)
 	std.TestSetRealm(suRealm)
 
 	_, err := AddEvent("", "sample desc", "gno.land", "gnome land", "2009-02-13T23:31:31Z", "2009-02-13T23:33:31Z")
@@ -85,7 +85,7 @@ func TestAddEventErrors(t *testing.T) {
 }
 
 func TestDeleteEvent(t *testing.T) {
-	std.TestSetOrigCaller(su)
+	std.TestSetOriginCaller(su)
 	std.TestSetRealm(suRealm)
 
 	e1Start := parsedTimeNow.Add(time.Hour * 24 * 5)
@@ -108,7 +108,7 @@ func TestDeleteEvent(t *testing.T) {
 }
 
 func TestEditEvent(t *testing.T) {
-	std.TestSetOrigCaller(su)
+	std.TestSetOriginCaller(su)
 	std.TestSetRealm(suRealm)
 
 	e1Start := parsedTimeNow.Add(time.Hour * 24 * 5)
@@ -138,7 +138,7 @@ func TestEditEvent(t *testing.T) {
 }
 
 func TestInvalidEdit(t *testing.T) {
-	std.TestSetOrigCaller(su)
+	std.TestSetOriginCaller(su)
 	std.TestSetRealm(suRealm)
 
 	uassert.PanicsWithMessage(t, ErrNoSuchID.Error(), func() {
@@ -165,7 +165,7 @@ func TestParseTimes(t *testing.T) {
 }
 
 func TestRenderEventWidget(t *testing.T) {
-	std.TestSetOrigCaller(su)
+	std.TestSetOriginCaller(su)
 	std.TestSetRealm(suRealm)
 
 	// No events yet
diff --git a/examples/gno.land/r/gnoland/faucet/admin.gno b/examples/gno.land/r/gnoland/faucet/admin.gno
index 37108059b74..d991fcd9816 100644
--- a/examples/gno.land/r/gnoland/faucet/admin.gno
+++ b/examples/gno.land/r/gnoland/faucet/admin.gno
@@ -79,7 +79,7 @@ func AdminRemoveController(addr std.Address) string {
 }
 
 func assertIsAdmin() error {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if caller != gAdminAddr {
 		return errors.New("restricted for admin")
 	}
diff --git a/examples/gno.land/r/gnoland/faucet/faucet.gno b/examples/gno.land/r/gnoland/faucet/faucet.gno
index 908b86d4aaf..a173c0423ee 100644
--- a/examples/gno.land/r/gnoland/faucet/faucet.gno
+++ b/examples/gno.land/r/gnoland/faucet/faucet.gno
@@ -42,8 +42,8 @@ func Transfer(to std.Address, send int64) string {
 	gTotalTransferred = gTotalTransferred.Add(sendCoins)
 	gTotalTransfers++
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
-	pkgaddr := std.CurrentRealm().Addr()
+	banker := std.NewBanker(std.BankerTypeRealmSend)
+	pkgaddr := std.CurrentRealm().Address()
 	banker.SendCoins(pkgaddr, to, sendCoins)
 	return ""
 }
@@ -53,8 +53,8 @@ func GetPerTransferLimit() int64 {
 }
 
 func Render(_ string) string {
-	banker := std.GetBanker(std.BankerTypeRealmSend)
-	balance := banker.GetCoins(std.CurrentRealm().Addr())
+	banker := std.NewBanker(std.BankerTypeRealmSend)
+	balance := banker.GetCoins(std.CurrentRealm().Address())
 
 	output := gMessage
 	if gInPause {
@@ -65,7 +65,7 @@ func Render(_ string) string {
 	output += ufmt.Sprintf("Balance: %s.\n", balance.String())
 	output += ufmt.Sprintf("Total transfers: %s (in %d times).\n\n", gTotalTransferred.String(), gTotalTransfers)
 
-	output += "Package address: " + std.CurrentRealm().Addr().String() + "\n\n"
+	output += "Package address: " + std.CurrentRealm().Address().String() + "\n\n"
 	output += ufmt.Sprintf("Admin: %s\n\n ", gAdminAddr.String())
 	output += ufmt.Sprintf("Controllers:\n\n ")
 
@@ -81,7 +81,7 @@ func Render(_ string) string {
 }
 
 func assertIsController() error {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 
 	ok := gControllers.Has(caller.String())
 	if !ok {
diff --git a/examples/gno.land/r/gnoland/faucet/faucet_test.gno b/examples/gno.land/r/gnoland/faucet/faucet_test.gno
index 5672f317469..ca741ab017f 100644
--- a/examples/gno.land/r/gnoland/faucet/faucet_test.gno
+++ b/examples/gno.land/r/gnoland/faucet/faucet_test.gno
@@ -33,20 +33,20 @@ func TestPackage(t *testing.T) {
 	// by default, balance is empty, and as a user I cannot call Transfer, or Admin commands.
 
 	assertBalance(t, test1addr, 0)
-	std.TestSetOrigCaller(test1addr)
+	std.TestSetOriginCaller(test1addr)
 	assertErr(t, faucet.Transfer(test1addr, 1000000))
 
 	assertErr(t, faucet.AdminAddController(controlleraddr1))
-	std.TestSetOrigCaller(controlleraddr1)
+	std.TestSetOriginCaller(controlleraddr1)
 	assertErr(t, faucet.Transfer(test1addr, 1000000))
 
 	// as an admin, add the controller to contract and deposit more 2000gnot to contract
-	std.TestSetOrigCaller(adminaddr)
+	std.TestSetOriginCaller(adminaddr)
 	assertNoErr(t, faucet.AdminAddController(controlleraddr1))
 	assertBalance(t, faucetaddr, 1000000000)
 
 	// now, send some tokens as controller.
-	std.TestSetOrigCaller(controlleraddr1)
+	std.TestSetOriginCaller(controlleraddr1)
 	assertNoErr(t, faucet.Transfer(test1addr, 1000000))
 	assertBalance(t, test1addr, 1000000)
 	assertNoErr(t, faucet.Transfer(test1addr, 1000000))
@@ -55,13 +55,13 @@ func TestPackage(t *testing.T) {
 
 	// remove controller
 	// as an admin, remove controller
-	std.TestSetOrigCaller(adminaddr)
+	std.TestSetOriginCaller(adminaddr)
 	assertNoErr(t, faucet.AdminRemoveController(controlleraddr1))
-	std.TestSetOrigCaller(controlleraddr1)
+	std.TestSetOriginCaller(controlleraddr1)
 	assertErr(t, faucet.Transfer(test1addr, 1000000))
 
 	// duplicate controller
-	std.TestSetOrigCaller(adminaddr)
+	std.TestSetOriginCaller(adminaddr)
 	assertNoErr(t, faucet.AdminAddController(controlleraddr1))
 	assertErr(t, faucet.AdminAddController(controlleraddr1))
 	// add more than more than allowed controllers
@@ -77,13 +77,13 @@ func TestPackage(t *testing.T) {
 	assertErr(t, faucet.AdminAddController(controlleraddr11))
 
 	// send more than per transfer limit
-	std.TestSetOrigCaller(adminaddr)
+	std.TestSetOriginCaller(adminaddr)
 	faucet.AdminSetTransferLimit(300000000)
-	std.TestSetOrigCaller(controlleraddr1)
+	std.TestSetOriginCaller(controlleraddr1)
 	assertErr(t, faucet.Transfer(test1addr, 301000000))
 
 	// block transefer from the address not on the controllers list.
-	std.TestSetOrigCaller(controlleraddr11)
+	std.TestSetOriginCaller(controlleraddr11)
 	assertErr(t, faucet.Transfer(test1addr, 1000000))
 }
 
@@ -105,7 +105,7 @@ func assertNoErr(t *testing.T, err string) {
 
 func assertBalance(t *testing.T, addr std.Address, expectedBal int64) {
 	t.Helper()
-	banker := std.GetBanker(std.BankerTypeReadonly)
+	banker := std.NewBanker(std.BankerTypeReadonly)
 	coins := banker.GetCoins(addr)
 	got := coins.AmountOf("ugnot")
 
diff --git a/examples/gno.land/r/gnoland/faucet/z2_filetest.gno b/examples/gno.land/r/gnoland/faucet/z2_filetest.gno
index d0616b3afcd..1490c46ffc9 100644
--- a/examples/gno.land/r/gnoland/faucet/z2_filetest.gno
+++ b/examples/gno.land/r/gnoland/faucet/z2_filetest.gno
@@ -20,7 +20,7 @@ func main() {
 		controlleraddr1 = testutils.TestAddress("controller1")
 		controlleraddr2 = testutils.TestAddress("controller2")
 	)
-	std.TestSetOrigCaller(adminaddr)
+	std.TestSetOriginCaller(adminaddr)
 	err := faucet.AdminAddController(controlleraddr1)
 	if err != "" {
 		panic(err)
diff --git a/examples/gno.land/r/gnoland/faucet/z3_filetest.gno b/examples/gno.land/r/gnoland/faucet/z3_filetest.gno
index 0da06593710..90612aa3548 100644
--- a/examples/gno.land/r/gnoland/faucet/z3_filetest.gno
+++ b/examples/gno.land/r/gnoland/faucet/z3_filetest.gno
@@ -22,7 +22,7 @@ func main() {
 		testaddr1       = testutils.TestAddress("test1")
 		testaddr2       = testutils.TestAddress("test2")
 	)
-	std.TestSetOrigCaller(adminaddr)
+	std.TestSetOriginCaller(adminaddr)
 	err := faucet.AdminAddController(controlleraddr1)
 	if err != "" {
 		panic(err)
@@ -31,12 +31,12 @@ func main() {
 	if err != "" {
 		panic(err)
 	}
-	std.TestSetOrigCaller(controlleraddr1)
+	std.TestSetOriginCaller(controlleraddr1)
 	err = faucet.Transfer(testaddr1, 1000000)
 	if err != "" {
 		panic(err)
 	}
-	std.TestSetOrigCaller(controlleraddr2)
+	std.TestSetOriginCaller(controlleraddr2)
 	err = faucet.Transfer(testaddr1, 2000000)
 	if err != "" {
 		panic(err)
diff --git a/examples/gno.land/r/gnoland/ghverify/contract.gno b/examples/gno.land/r/gnoland/ghverify/contract.gno
index 3b8f7fcbbe1..1540e548887 100644
--- a/examples/gno.land/r/gnoland/ghverify/contract.gno
+++ b/examples/gno.land/r/gnoland/ghverify/contract.gno
@@ -16,7 +16,7 @@ const (
 )
 
 var (
-	ownerAddress = std.GetOrigCaller()
+	ownerAddress = std.OriginCaller()
 	oracle       *gnorkle.Instance
 	postHandler  postGnorkleMessageHandler
 
@@ -70,7 +70,7 @@ func (h postGnorkleMessageHandler) Handle(i *gnorkle.Instance, funcType message.
 // RequestVerification creates a new static feed with a single task that will
 // instruct an agent to verify the github handle / gno address pair.
 func RequestVerification(githubHandle string) {
-	gnoAddress := string(std.GetOrigCaller())
+	gnoAddress := string(std.OriginCaller())
 	if err := oracle.AddFeeds(
 		static.NewSingleValueFeed(
 			gnoAddress,
@@ -102,7 +102,7 @@ func GnorkleEntrypoint(message string) string {
 
 // SetOwner transfers ownership of the contract to the given address.
 func SetOwner(owner std.Address) {
-	if ownerAddress != std.GetOrigCaller() {
+	if ownerAddress != std.OriginCaller() {
 		panic("only the owner can set a new owner")
 	}
 
diff --git a/examples/gno.land/r/gnoland/ghverify/contract_test.gno b/examples/gno.land/r/gnoland/ghverify/contract_test.gno
index 5c0be0afcb1..3bf6e306fed 100644
--- a/examples/gno.land/r/gnoland/ghverify/contract_test.gno
+++ b/examples/gno.land/r/gnoland/ghverify/contract_test.gno
@@ -8,7 +8,7 @@ import (
 )
 
 func TestVerificationLifecycle(t *testing.T) {
-	defaultAddress := std.GetOrigCaller()
+	defaultAddress := std.OriginCaller()
 	user1Address := std.Address(testutils.TestAddress("user 1"))
 	user2Address := std.Address(testutils.TestAddress("user 2"))
 
@@ -19,7 +19,7 @@ func TestVerificationLifecycle(t *testing.T) {
 	}
 
 	// Make a verification request with the created user.
-	std.TestSetOrigCaller(user1Address)
+	std.TestSetOriginCaller(user1Address)
 	RequestVerification("deelawn")
 
 	// A subsequent request from the same address should panic because there is
@@ -44,13 +44,13 @@ func TestVerificationLifecycle(t *testing.T) {
 	}
 
 	// Make a verification request with the created user.
-	std.TestSetOrigCaller(user2Address)
+	std.TestSetOriginCaller(user2Address)
 	RequestVerification("omarsy")
 
 	// Set the caller back to the whitelisted user and verify that the feed data
 	// returned matches what should have been created by the `RequestVerification`
 	// invocation.
-	std.TestSetOrigCaller(defaultAddress)
+	std.TestSetOriginCaller(defaultAddress)
 	result = GnorkleEntrypoint("request")
 	expResult := `[{"id":"` + string(user1Address) + `","type":"0","value_type":"string","tasks":[{"gno_address":"` +
 		string(user1Address) + `","github_handle":"deelawn"}]},` +
@@ -61,7 +61,7 @@ func TestVerificationLifecycle(t *testing.T) {
 	}
 
 	// Try to trigger feed ingestion from the non-authorized user.
-	std.TestSetOrigCaller(user1Address)
+	std.TestSetOriginCaller(user1Address)
 	func() {
 		defer func() {
 			if r := recover(); r != nil {
@@ -75,7 +75,7 @@ func TestVerificationLifecycle(t *testing.T) {
 	}
 
 	// Set the caller back to the whitelisted user and transfer contract ownership.
-	std.TestSetOrigCaller(defaultAddress)
+	std.TestSetOriginCaller(defaultAddress)
 	SetOwner(defaultAddress)
 
 	// Now trigger the feed ingestion from the user and new owner and only whitelisted address.
diff --git a/examples/gno.land/r/gnoland/home/home.gno b/examples/gno.land/r/gnoland/home/home.gno
index 2d1aad8a1a0..1264f5332e4 100644
--- a/examples/gno.land/r/gnoland/home/home.gno
+++ b/examples/gno.land/r/gnoland/home/home.gno
@@ -149,7 +149,7 @@ func quoteOfTheBlock() ui.Element {
 		"Now, you Gno.",
 		"Come for the Go, Stay for the Gno.",
 	}
-	height := std.GetHeight()
+	height := std.ChainHeight()
 	idx := int(height) % len(quotes)
 	qotb := quotes[idx]
 
diff --git a/examples/gno.land/r/gnoland/home/overide_filetest.gno b/examples/gno.land/r/gnoland/home/overide_filetest.gno
index be7e33501d6..70c59cbaded 100644
--- a/examples/gno.land/r/gnoland/home/overide_filetest.gno
+++ b/examples/gno.land/r/gnoland/home/overide_filetest.gno
@@ -8,7 +8,7 @@ import (
 )
 
 func main() {
-	std.TestSetOrigCaller("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
+	std.TestSetOriginCaller("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 	home.AdminSetOverride("Hello World!")
 	println(home.Render(""))
 	home.AdminTransferOwnership(testutils.TestAddress("newAdmin"))
diff --git a/examples/gno.land/r/gnoland/monit/monit.gno b/examples/gno.land/r/gnoland/monit/monit.gno
index be94fbdd2bb..7c74e2f5733 100644
--- a/examples/gno.land/r/gnoland/monit/monit.gno
+++ b/examples/gno.land/r/gnoland/monit/monit.gno
@@ -29,7 +29,7 @@ var (
 func Incr() int {
 	counter++
 	lastUpdate = time.Now()
-	lastCaller = std.PrevRealm().Addr()
+	lastCaller = std.PreviousRealm().Address()
 	wd.Alive()
 	return counter
 }
@@ -40,7 +40,7 @@ func Reset() {
 	Ownable.AssertCallerIsOwner()
 
 	counter = 0
-	lastCaller = std.PrevRealm().Addr()
+	lastCaller = std.PreviousRealm().Address()
 	lastUpdate = time.Now()
 	wd = watchdog.Watchdog{Duration: 5 * time.Minute}
 }
diff --git a/examples/gno.land/r/gnoland/pages/admin.gno b/examples/gno.land/r/gnoland/pages/admin.gno
index 71050f4ef57..963c9161df7 100644
--- a/examples/gno.land/r/gnoland/pages/admin.gno
+++ b/examples/gno.land/r/gnoland/pages/admin.gno
@@ -14,7 +14,7 @@ var (
 )
 
 func init() {
-	// adminAddr = std.GetOrigCaller() // FIXME: find a way to use this from the main's genesis.
+	// adminAddr = std.OriginCaller() // FIXME: find a way to use this from the main's genesis.
 	adminAddr = "g1manfred47kzduec920z88wfr64ylksmdcedlf5" // @moul
 }
 
@@ -41,7 +41,7 @@ func AdminRemoveModerator(addr std.Address) {
 func ModAddPost(slug, title, body, publicationDate, authors, tags string) {
 	assertIsModerator()
 
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	tagList := strings.Split(tags, ",")
 	authorList := strings.Split(authors, ",")
 
@@ -69,14 +69,14 @@ func isModerator(addr std.Address) bool {
 }
 
 func assertIsAdmin() {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if !isAdmin(caller) {
 		panic("access restricted.")
 	}
 }
 
 func assertIsModerator() {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if isAdmin(caller) || isModerator(caller) {
 		return
 	}
diff --git a/examples/gno.land/r/gnoland/valopers/v2/valopers.gno b/examples/gno.land/r/gnoland/valopers/v2/valopers.gno
index d88ea4b872f..cd2a99bb336 100644
--- a/examples/gno.land/r/gnoland/valopers/v2/valopers.gno
+++ b/examples/gno.land/r/gnoland/valopers/v2/valopers.gno
@@ -148,7 +148,7 @@ func GovDAOProposal(address std.Address) {
 	)
 
 	// Make sure the valoper is the caller
-	if std.GetOrigCaller() != address {
+	if std.OriginCaller() != address {
 		panic(errValoperNotCaller)
 	}
 
diff --git a/examples/gno.land/r/gov/dao/bridge/bridge.gno b/examples/gno.land/r/gov/dao/bridge/bridge.gno
index 87a12d94e54..73de21c4cfe 100644
--- a/examples/gno.land/r/gov/dao/bridge/bridge.gno
+++ b/examples/gno.land/r/gov/dao/bridge/bridge.gno
@@ -33,7 +33,7 @@ func init() {
 // LoadGovDAO loads the initial version of GovDAO into the bridge
 // All changes to b.dao need to be done via GovDAO proposals after
 func LoadGovDAO(d DAO) {
-	if std.PrevRealm().PkgPath() != loader {
+	if std.PreviousRealm().PkgPath() != loader {
 		panic("unauthorized")
 	}
 
diff --git a/examples/gno.land/r/gov/dao/bridge/bridge_test.gno b/examples/gno.land/r/gov/dao/bridge/bridge_test.gno
index da06db293ab..ba642141387 100644
--- a/examples/gno.land/r/gov/dao/bridge/bridge_test.gno
+++ b/examples/gno.land/r/gov/dao/bridge/bridge_test.gno
@@ -82,7 +82,7 @@ func TestBridge_SetDAO(t *testing.T) {
 			}
 		)
 
-		std.TestSetOrigCaller(addr)
+		std.TestSetOriginCaller(addr)
 
 		Ownable = ownable.NewWithAddress(addr)
 
diff --git a/examples/gno.land/r/jjoptimist/home/home.gno b/examples/gno.land/r/jjoptimist/home/home.gno
index 91a23670271..e97898c41de 100644
--- a/examples/gno.land/r/jjoptimist/home/home.gno
+++ b/examples/gno.land/r/jjoptimist/home/home.gno
@@ -61,7 +61,7 @@ func init() {
 }
 
 func Render(path string) string {
-	height := std.GetHeight()
+	height := std.ChainHeight()
 
 	output := "# " + config.Title + "\n\n"
 
diff --git a/examples/gno.land/r/leon/config/config.gno b/examples/gno.land/r/leon/config/config.gno
index eaea52c951e..222ca98ebfa 100644
--- a/examples/gno.land/r/leon/config/config.gno
+++ b/examples/gno.land/r/leon/config/config.gno
@@ -15,7 +15,7 @@ var (
 	cfgID   seqid.ID
 	configs = avl.NewTree()
 
-	absPath = strings.TrimPrefix(std.CurrentRealm().PkgPath(), std.GetChainDomain())
+	absPath = strings.TrimPrefix(std.CurrentRealm().PkgPath(), std.ChainDomain())
 
 	// SafeObjects
 	OwnableMain   = ownable.NewWithAddress("g125em6arxsnj49vx35f0n0z34putv5ty3376fg5")
@@ -32,7 +32,7 @@ type Config struct {
 }
 
 func AddConfig(name, lines string) {
-	if !IsAuthorized(std.PrevRealm().Addr()) {
+	if !IsAuthorized(std.PreviousRealm().Address()) {
 		panic(ErrUnauthorized)
 	}
 
@@ -46,7 +46,7 @@ func AddConfig(name, lines string) {
 }
 
 func EditConfig(id string, name, lines string) {
-	if !IsAuthorized(std.PrevRealm().Addr()) {
+	if !IsAuthorized(std.PreviousRealm().Address()) {
 		panic(ErrUnauthorized)
 	}
 
@@ -63,7 +63,7 @@ func EditConfig(id string, name, lines string) {
 }
 
 func RemoveConfig(id string) {
-	if !IsAuthorized(std.PrevRealm().Addr()) {
+	if !IsAuthorized(std.PreviousRealm().Address()) {
 		panic(ErrUnauthorized)
 	}
 
@@ -73,7 +73,7 @@ func RemoveConfig(id string) {
 }
 
 func UpdateBanner(newBanner string) {
-	if !IsAuthorized(std.PrevRealm().Addr()) {
+	if !IsAuthorized(std.PreviousRealm().Address()) {
 		panic(ErrUnauthorized)
 	}
 
diff --git a/examples/gno.land/r/leon/hof/hof.gno b/examples/gno.land/r/leon/hof/hof.gno
index 96266ffe380..ef20d02d7a7 100644
--- a/examples/gno.land/r/leon/hof/hof.gno
+++ b/examples/gno.land/r/leon/hof/hof.gno
@@ -56,7 +56,7 @@ func Register() {
 		return
 	}
 
-	submission := std.PrevRealm()
+	submission := std.PreviousRealm()
 	pkgpath := submission.PkgPath()
 
 	// Must be called from code
@@ -73,7 +73,7 @@ func Register() {
 	i := &Item{
 		id:       id,
 		pkgpath:  pkgpath,
-		blockNum: std.GetHeight(),
+		blockNum: std.ChainHeight(),
 		upvote:   avl.NewTree(),
 		downvote: avl.NewTree(),
 	}
@@ -91,7 +91,7 @@ func Upvote(pkgpath string) {
 	}
 
 	item := rawItem.(*Item)
-	caller := std.PrevRealm().Addr().String()
+	caller := std.PreviousRealm().Address().String()
 
 	if item.upvote.Has(caller) {
 		panic(ErrDoubleUpvote)
@@ -107,7 +107,7 @@ func Downvote(pkgpath string) {
 	}
 
 	item := rawItem.(*Item)
-	caller := std.PrevRealm().Addr().String()
+	caller := std.PreviousRealm().Address().String()
 
 	if item.downvote.Has(caller) {
 		panic(ErrDoubleDownvote)
diff --git a/examples/gno.land/r/leon/hof/hof_test.gno b/examples/gno.land/r/leon/hof/hof_test.gno
index 4d6f70eab88..4e133a6bbe8 100644
--- a/examples/gno.land/r/leon/hof/hof_test.gno
+++ b/examples/gno.land/r/leon/hof/hof_test.gno
@@ -103,7 +103,7 @@ func TestDownvote(t *testing.T) {
 func TestDelete(t *testing.T) {
 	userRealm := std.NewUserRealm(admin)
 	std.TestSetRealm(userRealm)
-	std.TestSetOrigCaller(admin)
+	std.TestSetOriginCaller(admin)
 
 	uassert.PanicsWithMessage(t, ErrNoSuchItem.Error(), func() {
 		Delete("nonexistentpkgpath")
diff --git a/examples/gno.land/r/leon/home/home.gno b/examples/gno.land/r/leon/home/home.gno
index aef261fcd60..6f7fca01c68 100644
--- a/examples/gno.land/r/leon/home/home.gno
+++ b/examples/gno.land/r/leon/home/home.gno
@@ -52,7 +52,7 @@ TODO import r/gh`,
 }
 
 func UpdatePFP(url, caption string) {
-	if !config.IsAuthorized(std.PrevRealm().Addr()) {
+	if !config.IsAuthorized(std.PreviousRealm().Address()) {
 		panic(config.ErrUnauthorized)
 	}
 
@@ -61,7 +61,7 @@ func UpdatePFP(url, caption string) {
 }
 
 func UpdateAboutMe(col1, col2 string) {
-	if !config.IsAuthorized(std.PrevRealm().Addr()) {
+	if !config.IsAuthorized(std.PreviousRealm().Address()) {
 		panic(config.ErrUnauthorized)
 	}
 
@@ -71,7 +71,7 @@ func UpdateAboutMe(col1, col2 string) {
 
 func renderBlogPosts() string {
 	out := ""
-	//out += "## Leon's Blog Posts"
+	// out += "## Leon's Blog Posts"
 
 	// todo fetch blog posts authored by @leohhhn
 	// and render them
@@ -118,7 +118,7 @@ func renderArt() string {
 
 func renderGnoFace() string {
 	out := "<div>\n\n"
-	out += gnoface.Render(strconv.Itoa(int(std.GetHeight())))
+	out += gnoface.Render(strconv.Itoa(int(std.ChainHeight())))
 	out += "</div>\n\n"
 
 	return out
@@ -127,7 +127,7 @@ func renderGnoFace() string {
 func renderMillipede() string {
 	out := "<div>\n\n"
 	out += "Millipede\n\n"
-	out += "```\n" + millipede.Draw(int(std.GetHeight())%10+1) + "```\n"
+	out += "```\n" + millipede.Draw(int(std.ChainHeight())%10+1) + "```\n"
 	out += "</div>\n\n"
 
 	return out
diff --git a/examples/gno.land/r/matijamarjanovic/home/config.gno b/examples/gno.land/r/matijamarjanovic/home/config.gno
index 2a9669c0b58..8a5a4135025 100644
--- a/examples/gno.land/r/matijamarjanovic/home/config.gno
+++ b/examples/gno.land/r/matijamarjanovic/home/config.gno
@@ -48,7 +48,7 @@ func SetBackup(newAddress std.Address) error {
 }
 
 func checkAuthorized() error {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if caller != mainAddr && caller != backupAddr {
 		return errorUnauthorized
 	}
@@ -57,7 +57,7 @@ func checkAuthorized() error {
 }
 
 func AssertAuthorized() {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	if caller != mainAddr && caller != backupAddr {
 		panic(errorUnauthorized)
 	}
diff --git a/examples/gno.land/r/matijamarjanovic/home/home.gno b/examples/gno.land/r/matijamarjanovic/home/home.gno
index 3757324108a..133a5857f2b 100644
--- a/examples/gno.land/r/matijamarjanovic/home/home.gno
+++ b/examples/gno.land/r/matijamarjanovic/home/home.gno
@@ -71,21 +71,21 @@ func maxOfThree(a, b, c int64) int64 {
 }
 
 func VoteModern() {
-	ugnotAmount := std.GetOrigSend().AmountOf("ugnot")
+	ugnotAmount := std.OriginSend().AmountOf("ugnot")
 	votes := ugnotAmount
 	modernVotes += votes
 	updateCurrentTheme()
 }
 
 func VoteClassic() {
-	ugnotAmount := std.GetOrigSend().AmountOf("ugnot")
+	ugnotAmount := std.OriginSend().AmountOf("ugnot")
 	votes := ugnotAmount
 	classicVotes += votes
 	updateCurrentTheme()
 }
 
 func VoteMinimal() {
-	ugnotAmount := std.GetOrigSend().AmountOf("ugnot")
+	ugnotAmount := std.OriginSend().AmountOf("ugnot")
 	votes := ugnotAmount
 	minimalVotes += votes
 	updateCurrentTheme()
@@ -106,10 +106,10 @@ func updateCurrentTheme() {
 func CollectBalance() {
 	AssertAuthorized()
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	ownerAddr := Address()
 
-	banker.SendCoins(std.CurrentRealm().Addr(), ownerAddr, banker.GetCoins(std.CurrentRealm().Addr()))
+	banker.SendCoins(std.CurrentRealm().Address(), ownerAddr, banker.GetCoins(std.CurrentRealm().Address()))
 }
 
 func Render(path string) string {
diff --git a/examples/gno.land/r/matijamarjanovic/home/home_test.gno b/examples/gno.land/r/matijamarjanovic/home/home_test.gno
index 8cc6e6e5608..10e2e6db6fc 100644
--- a/examples/gno.land/r/matijamarjanovic/home/home_test.gno
+++ b/examples/gno.land/r/matijamarjanovic/home/home_test.gno
@@ -11,7 +11,7 @@ import (
 
 // Helper function to set up test environment
 func setupTest() {
-	std.TestSetOrigCaller(std.Address("g1ej0qca5ptsw9kfr64ey8jvfy9eacga6mpj2z0y"))
+	std.TestSetOriginCaller(std.Address("g1ej0qca5ptsw9kfr64ey8jvfy9eacga6mpj2z0y"))
 }
 
 func TestUpdatePFP(t *testing.T) {
@@ -41,7 +41,7 @@ func TestVoteModern(t *testing.T) {
 	coinsSent := std.NewCoins(std.NewCoin("ugnot", 75000000))
 	coinsSpent := std.NewCoins(std.NewCoin("ugnot", 1))
 
-	std.TestSetOrigSend(coinsSent, coinsSpent)
+	std.TestSetOriginSend(coinsSent, coinsSpent)
 	VoteModern()
 
 	uassert.Equal(t, int64(75000000), modernVotes, "Modern votes should be calculated correctly")
@@ -55,7 +55,7 @@ func TestVoteClassic(t *testing.T) {
 	coinsSent := std.NewCoins(std.NewCoin("ugnot", 75000000))
 	coinsSpent := std.NewCoins(std.NewCoin("ugnot", 1))
 
-	std.TestSetOrigSend(coinsSent, coinsSpent)
+	std.TestSetOriginSend(coinsSent, coinsSpent)
 	VoteClassic()
 
 	uassert.Equal(t, int64(75000000), classicVotes, "Classic votes should be calculated correctly")
@@ -69,7 +69,7 @@ func TestVoteMinimal(t *testing.T) {
 	coinsSent := std.NewCoins(std.NewCoin("ugnot", 75000000))
 	coinsSpent := std.NewCoins(std.NewCoin("ugnot", 1))
 
-	std.TestSetOrigSend(coinsSent, coinsSpent)
+	std.TestSetOriginSend(coinsSent, coinsSpent)
 	VoteMinimal()
 
 	uassert.Equal(t, int64(75000000), minimalVotes, "Minimal votes should be calculated correctly")
diff --git a/examples/gno.land/r/morgan/guestbook/guestbook.gno b/examples/gno.land/r/morgan/guestbook/guestbook.gno
index be9e9db6133..4930b0af209 100644
--- a/examples/gno.land/r/morgan/guestbook/guestbook.gno
+++ b/examples/gno.land/r/morgan/guestbook/guestbook.gno
@@ -43,22 +43,22 @@ const (
 
 // Sign signs the guestbook, with the specified message.
 func Sign(message string) {
-	prev := std.PrevRealm()
+	prev := std.PreviousRealm()
 	switch {
 	case !prev.IsUser():
 		panic(errNotAUser)
-	case hasSigned.Has(prev.Addr().String()):
+	case hasSigned.Has(prev.Address().String()):
 		panic(errAlreadySigned)
 	}
 	message = validateMessage(message)
 
 	guestbook.Set(signatureID.Next().Binary(), Signature{
 		Message: message,
-		Author:  prev.Addr(),
+		Author:  prev.Address(),
 		// NOTE: time.Now() will yield the "block time", which is deterministic.
 		Time: time.Now(),
 	})
-	hasSigned.Set(prev.Addr().String(), struct{}{})
+	hasSigned.Set(prev.Address().String(), struct{}{})
 }
 
 func validateMessage(msg string) string {
diff --git a/examples/gno.land/r/moul/config/config.gno b/examples/gno.land/r/moul/config/config.gno
index a4f24411747..0302163c3c8 100644
--- a/examples/gno.land/r/moul/config/config.gno
+++ b/examples/gno.land/r/moul/config/config.gno
@@ -14,7 +14,7 @@ func UpdateAddr(newAddr std.Address) {
 }
 
 func AssertIsAdmin() {
-	if std.GetOrigCaller() != addr {
+	if std.OriginCaller() != addr {
 		panic("restricted area")
 	}
 }
diff --git a/examples/gno.land/r/moul/home/z2_filetest.gno b/examples/gno.land/r/moul/home/z2_filetest.gno
index f471280d8ef..4ce99f21dfa 100644
--- a/examples/gno.land/r/moul/home/z2_filetest.gno
+++ b/examples/gno.land/r/moul/home/z2_filetest.gno
@@ -7,7 +7,7 @@ import (
 )
 
 func main() {
-	std.TestSetOrigCaller("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
+	std.TestSetOriginCaller("g1manfred47kzduec920z88wfr64ylksmdcedlf5")
 	home.AddTodo("aaa")
 	home.AddTodo("bbb")
 	home.AddTodo("ccc")
@@ -62,10 +62,10 @@ func main() {
 // | Key | Value |
 // | --- | --- |
 // | `std.CurrentRealm().PkgPath()` | gno.land/r/moul/home |
-// | `std.CurrentRealm().Addr()` | g1h8h57ntxadcze3f703skymfzdwa6t3ugf0nq3z |
-// | `std.PrevRealm().PkgPath()` |  |
-// | `std.PrevRealm().Addr()` | g1manfred47kzduec920z88wfr64ylksmdcedlf5 |
-// | `std.GetHeight()` | 123 |
+// | `std.CurrentRealm().Address()` | g1h8h57ntxadcze3f703skymfzdwa6t3ugf0nq3z |
+// | `std.PreviousRealm().PkgPath()` |  |
+// | `std.PreviousRealm().Address()` | g1manfred47kzduec920z88wfr64ylksmdcedlf5 |
+// | `std.ChainHeight()` | 123 |
 // | `time.Now().Format(time.RFC3339)` | 2009-02-13T23:31:30Z |
 //
 // </details>
diff --git a/examples/gno.land/r/moul/microposts/realm.gno b/examples/gno.land/r/moul/microposts/realm.gno
index a03b6dd958b..85155faf69a 100644
--- a/examples/gno.land/r/moul/microposts/realm.gno
+++ b/examples/gno.land/r/moul/microposts/realm.gno
@@ -11,7 +11,7 @@ var posts []*Post
 func CreatePost(text string) {
 	posts = append(posts, &Post{
 		text:      text,
-		author:    std.PrevRealm().Addr(), // provided by env
+		author:    std.PreviousRealm().Address(), // provided by env
 		createdAt: time.Now(),
 	})
 }
diff --git a/examples/gno.land/r/moul/present/present.gno b/examples/gno.land/r/moul/present/present.gno
index b4f880318bf..fd08d53b1bc 100644
--- a/examples/gno.land/r/moul/present/present.gno
+++ b/examples/gno.land/r/moul/present/present.gno
@@ -107,7 +107,7 @@ func Set(slug, title, event, author, date, content string) string {
 		Title:     title,
 		Event:     event,
 		Author:    author,
-		Uploader:  std.PrevRealm().Addr(),
+		Uploader:  std.PreviousRealm().Address(),
 		Date:      parsedDate,
 		Content:   content,
 		EditDate:  time.Now(),
@@ -128,7 +128,7 @@ func Delete(slug string) string {
 	}
 
 	// XXX: consider this:
-	// if entry.Obj.(*Presentation).Uploader != std.PrevRealm().Addr() {
+	// if entry.Obj.(*Presentation).Uploader != std.PreviousRealm().Address() {
 	// 	return "401: unauthorized - only the uploader can delete their presentations"
 	// }
 
@@ -210,7 +210,7 @@ func (p *Presentation) LastSlide() string {
 	out.WriteString(md.H1(p.Title))
 	out.WriteString(md.H2("Thank You!"))
 	out.WriteString(md.Paragraph(p.Author))
-	fullPath := "https://" + std.GetChainDomain() + localPath(p.Slug, nil)
+	fullPath := "https://" + std.ChainDomain() + localPath(p.Slug, nil)
 	out.WriteString(md.Paragraph("🔗 " + md.Link(fullPath, fullPath)))
 	// XXX: QRCode
 	return out.String()
diff --git a/examples/gno.land/r/n2p5/haystack/haystack_test.gno b/examples/gno.land/r/n2p5/haystack/haystack_test.gno
index 52dadf8bf9e..2a25649ff5a 100644
--- a/examples/gno.land/r/n2p5/haystack/haystack_test.gno
+++ b/examples/gno.land/r/n2p5/haystack/haystack_test.gno
@@ -31,14 +31,14 @@ func TestHaystack(t *testing.T) {
 		n2, _ := genNeedleHex(2)
 		n3, _ := genNeedleHex(3)
 
-		std.TestSetOrigCaller(u1)
+		std.TestSetOriginCaller(u1)
 		urequire.NotPanics(t, func() { Add(n1) })
 		urequire.PanicsWithMessage(t,
 			haystack.ErrorDuplicateNeedle.Error(),
 			func() {
 				Add(n1)
 			})
-		std.TestSetOrigCaller(u2)
+		std.TestSetOriginCaller(u2)
 		urequire.NotPanics(t, func() { Add(n2) })
 		urequire.NotPanics(t, func() { Add(n3) })
 	})
@@ -49,14 +49,14 @@ func TestHaystack(t *testing.T) {
 		n1, h1 := genNeedleHex(4)
 		_, h2 := genNeedleHex(5)
 
-		std.TestSetOrigCaller(u1)
+		std.TestSetOriginCaller(u1)
 		urequire.NotPanics(t, func() { Add(n1) })
 		urequire.NotPanics(t, func() {
 			result := Get(h1)
 			urequire.Equal(t, n1, result)
 		})
 
-		std.TestSetOrigCaller(u2)
+		std.TestSetOriginCaller(u2)
 		urequire.NotPanics(t, func() {
 			result := Get(h1)
 			urequire.Equal(t, n1, result)
diff --git a/examples/gno.land/r/n2p5/home/home.gno b/examples/gno.land/r/n2p5/home/home.gno
index 69b82e86d68..d99ec4d3b7d 100644
--- a/examples/gno.land/r/n2p5/home/home.gno
+++ b/examples/gno.land/r/n2p5/home/home.gno
@@ -52,7 +52,7 @@ func Render(path string) string {
 
 // assertAdmin panics if the caller is not an admin as defined in the config realm.
 func assertAdmin() {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	if !config.IsAdmin(caller) {
 		panic("forbidden: must be admin")
 	}
diff --git a/examples/gno.land/r/n2p5/loci/loci.gno b/examples/gno.land/r/n2p5/loci/loci.gno
index 36f282e729f..232de1e6459 100644
--- a/examples/gno.land/r/n2p5/loci/loci.gno
+++ b/examples/gno.land/r/n2p5/loci/loci.gno
@@ -23,7 +23,7 @@ func Set(value string) {
 		panic(err)
 	}
 	store.Set(b)
-	std.Emit("SetValue", "ForAddr", string(std.PrevRealm().Addr()))
+	std.Emit("SetValue", "ForAddr", string(std.PreviousRealm().Address()))
 }
 
 // Get retrieves the value stored at the provided address and
diff --git a/examples/gno.land/r/nemanya/config/config.gno b/examples/gno.land/r/nemanya/config/config.gno
index 795e48c94c1..78fe329d5fe 100644
--- a/examples/gno.land/r/nemanya/config/config.gno
+++ b/examples/gno.land/r/nemanya/config/config.gno
@@ -52,7 +52,7 @@ func SetBackup(a std.Address) error {
 }
 
 func checkAuthorized() error {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	isAuthorized := caller == main || caller == backup
 
 	if !isAuthorized {
diff --git a/examples/gno.land/r/nemanya/home/home.gno b/examples/gno.land/r/nemanya/home/home.gno
index 08e24baecfd..34545773f4d 100644
--- a/examples/gno.land/r/nemanya/home/home.gno
+++ b/examples/gno.land/r/nemanya/home/home.gno
@@ -137,7 +137,7 @@ func renderProjects(projectsMap map[string]Project, title string) string {
 }
 
 func UpdateLink(name, newURL string) {
-	if !isAuthorized(std.PrevRealm().Addr()) {
+	if !isAuthorized(std.PreviousRealm().Address()) {
 		panic(config.ErrUnauthorized)
 	}
 
@@ -152,7 +152,7 @@ func UpdateLink(name, newURL string) {
 }
 
 func UpdateAboutMe(text string) {
-	if !isAuthorized(std.PrevRealm().Addr()) {
+	if !isAuthorized(std.PreviousRealm().Address()) {
 		panic(config.ErrUnauthorized)
 	}
 
@@ -160,7 +160,7 @@ func UpdateAboutMe(text string) {
 }
 
 func AddGnoProject(name, description, url, imageURL string) {
-	if !isAuthorized(std.PrevRealm().Addr()) {
+	if !isAuthorized(std.PreviousRealm().Address()) {
 		panic(config.ErrUnauthorized)
 	}
 	project := Project{
@@ -174,7 +174,7 @@ func AddGnoProject(name, description, url, imageURL string) {
 }
 
 func DeleteGnoProject(projectName string) {
-	if !isAuthorized(std.PrevRealm().Addr()) {
+	if !isAuthorized(std.PreviousRealm().Address()) {
 		panic(config.ErrUnauthorized)
 	}
 
@@ -186,7 +186,7 @@ func DeleteGnoProject(projectName string) {
 }
 
 func AddOtherProject(name, description, url, imageURL string) {
-	if !isAuthorized(std.PrevRealm().Addr()) {
+	if !isAuthorized(std.PreviousRealm().Address()) {
 		panic(config.ErrUnauthorized)
 	}
 	project := Project{
@@ -200,7 +200,7 @@ func AddOtherProject(name, description, url, imageURL string) {
 }
 
 func RemoveOtherProject(projectName string) {
-	if !isAuthorized(std.PrevRealm().Addr()) {
+	if !isAuthorized(std.PreviousRealm().Address()) {
 		panic(config.ErrUnauthorized)
 	}
 
@@ -216,8 +216,8 @@ func isAuthorized(addr std.Address) bool {
 }
 
 func SponsorGnoProject(projectName string) {
-	address := std.GetOrigCaller()
-	amount := std.GetOrigSend()
+	address := std.OriginCaller()
+	amount := std.OriginSend()
 
 	if amount.AmountOf("ugnot") == 0 {
 		panic("Donation must include GNOT")
@@ -239,8 +239,8 @@ func SponsorGnoProject(projectName string) {
 }
 
 func SponsorOtherProject(projectName string) {
-	address := std.GetOrigCaller()
-	amount := std.GetOrigSend()
+	address := std.OriginCaller()
+	amount := std.OriginSend()
 
 	if amount.AmountOf("ugnot") == 0 {
 		panic("Donation must include GNOT")
@@ -262,12 +262,12 @@ func SponsorOtherProject(projectName string) {
 }
 
 func Withdraw() string {
-	if !isAuthorized(std.PrevRealm().Addr()) {
+	if !isAuthorized(std.PreviousRealm().Address()) {
 		panic(config.ErrUnauthorized)
 	}
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
-	realmAddress := std.GetOrigPkgAddr()
+	banker := std.NewBanker(std.BankerTypeRealmSend)
+	realmAddress := std.OriginPkgAddress()
 	coins := banker.GetCoins(realmAddress)
 
 	if len(coins) == 0 {
diff --git a/examples/gno.land/r/stefann/fomo3d/fomo3d.gno b/examples/gno.land/r/stefann/fomo3d/fomo3d.gno
index b2384ba07f4..cddd99f947f 100644
--- a/examples/gno.land/r/stefann/fomo3d/fomo3d.gno
+++ b/examples/gno.land/r/stefann/fomo3d/fomo3d.gno
@@ -83,7 +83,7 @@ func StartGame() {
 	}
 
 	gameState.CurrentRound++
-	gameState.StartBlock = std.GetHeight()
+	gameState.StartBlock = std.ChainHeight()
 	gameState.EndBlock = gameState.StartBlock + TIME_EXTENSION // Initial 24h window
 	gameState.LastKeyBlock = gameState.StartBlock
 	gameState.Jackpot = gameState.NextPot
@@ -109,13 +109,13 @@ func BuyKeys() {
 		panic(ErrGameEnded.Error())
 	}
 
-	currentBlock := std.GetHeight()
+	currentBlock := std.ChainHeight()
 	if currentBlock > gameState.EndBlock {
 		panic(ErrGameTimeExpired.Error())
 	}
 
 	// Get sent coins
-	sent := std.GetOrigSend()
+	sent := std.OriginSend()
 	if len(sent) != 1 || sent[0].Denom != "ugnot" {
 		panic(ErrInvalidPayment.Error())
 	}
@@ -131,7 +131,7 @@ func BuyKeys() {
 	excess := payment - actualCost
 
 	// Update buyer's info
-	buyer := std.PrevRealm().Addr()
+	buyer := std.PreviousRealm().Address()
 	var buyerInfo PlayerInfo
 	if info, exists := players.Get(buyer.String()); exists {
 		buyerInfo = info.(PlayerInfo)
@@ -153,9 +153,9 @@ func BuyKeys() {
 
 	// Return excess payment to buyer if any
 	if excess > 0 {
-		banker := std.GetBanker(std.BankerTypeOrigSend)
+		banker := std.NewBanker(std.BankerTypeOriginSend)
 		banker.SendCoins(
-			std.CurrentRealm().Addr(),
+			std.CurrentRealm().Address(),
 			buyer,
 			std.NewCoins(std.NewCoin("ugnot", excess)),
 		)
@@ -192,7 +192,7 @@ func BuyKeys() {
 
 // ClaimDividends allows players to withdraw their earned dividends
 func ClaimDividends() {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 
 	info, exists := players.Get(caller.String())
 	if !exists {
@@ -209,9 +209,9 @@ func ClaimDividends() {
 	playerInfo.Dividends = 0
 	players.Set(caller.String(), playerInfo)
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	banker.SendCoins(
-		std.CurrentRealm().Addr(),
+		std.CurrentRealm().Address(),
 		caller,
 		std.NewCoins(std.NewCoin("ugnot", amount)),
 	)
@@ -230,9 +230,9 @@ func ClaimOwnerFee() {
 	amount := gameState.OwnerFee
 	gameState.OwnerFee = 0
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	banker.SendCoins(
-		std.CurrentRealm().Addr(),
+		std.CurrentRealm().Address(),
 		Ownable.Owner(),
 		std.NewCoins(std.NewCoin("ugnot", amount)),
 	)
@@ -246,7 +246,7 @@ func EndGame() {
 		panic(ErrGameEnded.Error())
 	}
 
-	currentBlock := std.GetHeight()
+	currentBlock := std.ChainHeight()
 	if currentBlock <= gameState.EndBlock {
 		panic(ErrGameNotInProgress.Error())
 	}
@@ -258,9 +258,9 @@ func EndGame() {
 	gameState.Ended = true
 
 	// Send jackpot to winner
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	banker.SendCoins(
-		std.CurrentRealm().Addr(),
+		std.CurrentRealm().Address(),
 		gameState.LastBuyer,
 		std.NewCoins(std.NewCoin("ugnot", gameState.Jackpot)),
 	)
diff --git a/examples/gno.land/r/stefann/fomo3d/fomo3d_test.gno b/examples/gno.land/r/stefann/fomo3d/fomo3d_test.gno
index 29f2a9b07a9..8fb4edf386b 100644
--- a/examples/gno.land/r/stefann/fomo3d/fomo3d_test.gno
+++ b/examples/gno.land/r/stefann/fomo3d/fomo3d_test.gno
@@ -36,12 +36,12 @@ func TestOwnership(t *testing.T) {
 	nonOwner := testutils.TestAddress("nonOwner")
 
 	// Set up initial owner
-	std.TestSetOrigCaller(owner)
-	std.TestSetOrigPkgAddr(owner)
+	std.TestSetOriginCaller(owner)
+	std.TestSetOriginPkgAddress(owner)
 	setupTestGame(t)
 
 	// Transfer ownership to nonOwner first to test ownership functions
-	std.TestSetOrigCaller(owner)
+	std.TestSetOriginCaller(owner)
 	urequire.NotPanics(t, func() {
 		Ownable.TransferOwnership(nonOwner)
 	})
@@ -49,10 +49,10 @@ func TestOwnership(t *testing.T) {
 	// Test fee accumulation
 	StartGame()
 	payment := MIN_KEY_PRICE * 10
-	std.TestSetOrigCaller(owner)
-	std.TestSetOrigSend(std.Coins{{"ugnot", payment}}, nil)
+	std.TestSetOriginCaller(owner)
+	std.TestSetOriginSend(std.Coins{{"ugnot", payment}}, nil)
 	std.TestIssueCoins(owner, std.Coins{{"ugnot", payment}})
-	std.TestIssueCoins(std.GetOrigPkgAddr(), std.Coins{{"ugnot", payment}})
+	std.TestIssueCoins(std.OriginPkgAddress(), std.Coins{{"ugnot", payment}})
 	BuyKeys()
 
 	// Verify fee accumulation
@@ -61,20 +61,20 @@ func TestOwnership(t *testing.T) {
 	urequire.Equal(t, expectedFees, fees)
 
 	// Test unauthorized fee claim (using old owner)
-	std.TestSetOrigCaller(owner)
+	std.TestSetOriginCaller(owner)
 	urequire.PanicsWithMessage(t, "ownable: caller is not owner", ClaimOwnerFee)
 
 	// Test authorized fee claim (using new owner)
-	std.TestSetOrigCaller(nonOwner)
-	initialBalance := std.GetBanker(std.BankerTypeRealmSend).GetCoins(nonOwner)
-	std.TestIssueCoins(std.CurrentRealm().Addr(), std.Coins{{"ugnot", expectedFees}})
+	std.TestSetOriginCaller(nonOwner)
+	initialBalance := std.NewBanker(std.BankerTypeRealmSend).GetCoins(nonOwner)
+	std.TestIssueCoins(std.CurrentRealm().Address(), std.Coins{{"ugnot", expectedFees}})
 	urequire.NotPanics(t, ClaimOwnerFee)
 
 	// Verify fees were claimed
 	_, feesAfter := GetOwnerInfo()
 	urequire.Equal(t, int64(0), feesAfter)
 
-	finalBalance := std.GetBanker(std.BankerTypeRealmSend).GetCoins(nonOwner)
+	finalBalance := std.NewBanker(std.BankerTypeRealmSend).GetCoins(nonOwner)
 	urequire.Equal(t, initialBalance.AmountOf("ugnot")+expectedFees, finalBalance.AmountOf("ugnot"))
 }
 
@@ -94,23 +94,23 @@ func TestFullGameFlow(t *testing.T) {
 	// Start game
 	urequire.NotPanics(t, StartGame)
 	urequire.Equal(t, false, gameState.Ended)
-	urequire.Equal(t, std.GetHeight(), gameState.StartBlock)
+	urequire.Equal(t, std.ChainHeight(), gameState.StartBlock)
 	urequire.Equal(t, int64(1), gameState.CurrentRound)
 
 	t.Run("buying keys", func(t *testing.T) {
 		// Test insufficient payment
-		std.TestSetOrigCaller(player1)
+		std.TestSetOriginCaller(player1)
 		std.TestIssueCoins(player1, std.Coins{{"ugnot", MIN_KEY_PRICE - 1}})
-		std.TestSetOrigSend(std.Coins{{"ugnot", MIN_KEY_PRICE - 1}}, nil)
-		std.TestIssueCoins(std.GetOrigPkgAddr(), std.Coins{{"ugnot", MIN_KEY_PRICE - 1}})
+		std.TestSetOriginSend(std.Coins{{"ugnot", MIN_KEY_PRICE - 1}}, nil)
+		std.TestIssueCoins(std.OriginPkgAddress(), std.Coins{{"ugnot", MIN_KEY_PRICE - 1}})
 		urequire.PanicsWithMessage(t, ErrInsufficientPayment.Error(), BuyKeys)
 
 		// Test successful key purchase
 		payment := MIN_KEY_PRICE * 3
-		std.TestSetOrigSend(std.Coins{{"ugnot", payment}}, nil)
-		std.TestIssueCoins(std.GetOrigPkgAddr(), std.Coins{{"ugnot", payment}})
+		std.TestSetOriginSend(std.Coins{{"ugnot", payment}}, nil)
+		std.TestIssueCoins(std.OriginPkgAddress(), std.Coins{{"ugnot", payment}})
 
-		currentBlock := std.GetHeight()
+		currentBlock := std.ChainHeight()
 		urequire.NotPanics(t, BuyKeys)
 
 		// Verify time extension
@@ -139,10 +139,10 @@ func TestFullGameFlow(t *testing.T) {
 
 	t.Run("dividend distribution and claiming", func(t *testing.T) {
 		// Player 2 buys keys
-		std.TestSetOrigCaller(player2)
+		std.TestSetOriginCaller(player2)
 		payment := gameState.KeyPrice * 2 // Buy 2 keys using current keyPrice
-		std.TestSetOrigSend(std.Coins{{"ugnot", payment}}, nil)
-		std.TestIssueCoins(std.GetOrigPkgAddr(), std.Coins{{"ugnot", payment}})
+		std.TestSetOriginSend(std.Coins{{"ugnot", payment}}, nil)
+		std.TestIssueCoins(std.OriginPkgAddress(), std.Coins{{"ugnot", payment}})
 		urequire.NotPanics(t, BuyKeys)
 
 		// Check player1 received dividends
@@ -155,15 +155,15 @@ func TestFullGameFlow(t *testing.T) {
 		// Test claiming dividends
 		{
 			// Player1 claims dividends
-			std.TestSetOrigCaller(player1)
-			initialBalance := std.GetBanker(std.BankerTypeRealmSend).GetCoins(player1)
+			std.TestSetOriginCaller(player1)
+			initialBalance := std.NewBanker(std.BankerTypeRealmSend).GetCoins(player1)
 			urequire.NotPanics(t, ClaimDividends)
 
 			// Verify dividends were claimed
 			_, dividendsAfter := GetPlayerInfo(player1.String())
 			urequire.Equal(t, int64(0), dividendsAfter)
 
-			lastBuyerBalance := std.GetBanker(std.BankerTypeRealmSend).GetCoins(player1)
+			lastBuyerBalance := std.NewBanker(std.BankerTypeRealmSend).GetCoins(player1)
 			urequire.Equal(t, initialBalance.AmountOf("ugnot")+expectedDividends, lastBuyerBalance.AmountOf("ugnot"))
 		}
 	})
@@ -174,7 +174,7 @@ func TestFullGameFlow(t *testing.T) {
 
 		// Skip to end of current time window
 		currentEndBlock := gameState.EndBlock
-		std.TestSkipHeights(currentEndBlock - std.GetHeight() + 1)
+		std.TestSkipHeights(currentEndBlock - std.ChainHeight() + 1)
 
 		// End game successfully
 		urequire.NotPanics(t, EndGame)
@@ -182,7 +182,7 @@ func TestFullGameFlow(t *testing.T) {
 		urequire.Equal(t, int64(1), gameState.CurrentRound)
 
 		// Verify winner received jackpot
-		lastBuyerBalance := std.GetBanker(std.BankerTypeRealmSend).GetCoins(gameState.LastBuyer)
+		lastBuyerBalance := std.NewBanker(std.BankerTypeRealmSend).GetCoins(gameState.LastBuyer)
 		urequire.Equal(t, gameState.Jackpot, lastBuyerBalance.AmountOf("ugnot"))
 
 		// Verify NFT was minted to winner
@@ -226,7 +226,7 @@ func TestStartGame(t *testing.T) {
 	// Test starting first game
 	urequire.NotPanics(t, StartGame)
 	urequire.Equal(t, false, gameState.Ended)
-	urequire.Equal(t, std.GetHeight(), gameState.StartBlock)
+	urequire.Equal(t, std.ChainHeight(), gameState.StartBlock)
 
 	// Test cannot start while game in progress
 	urequire.PanicsWithMessage(t, ErrGameInProgress.Error(), StartGame)
@@ -237,30 +237,30 @@ func TestBuyKeys(t *testing.T) {
 	StartGame()
 
 	player := testutils.TestAddress("player")
-	std.TestSetOrigCaller(player)
+	std.TestSetOriginCaller(player)
 
 	// Test invalid coin denomination
 	std.TestIssueCoins(player, std.Coins{{"invalid", MIN_KEY_PRICE}})
-	std.TestSetOrigSend(std.Coins{{"invalid", MIN_KEY_PRICE}}, nil)
-	std.TestIssueCoins(std.GetOrigPkgAddr(), std.Coins{{"invalid", MIN_KEY_PRICE}})
+	std.TestSetOriginSend(std.Coins{{"invalid", MIN_KEY_PRICE}}, nil)
+	std.TestIssueCoins(std.OriginPkgAddress(), std.Coins{{"invalid", MIN_KEY_PRICE}})
 	urequire.PanicsWithMessage(t, ErrInvalidPayment.Error(), BuyKeys)
 
 	// Test multiple coin types
 	std.TestIssueCoins(player, std.Coins{{"ugnot", MIN_KEY_PRICE}, {"other", 100}})
-	std.TestSetOrigSend(std.Coins{{"ugnot", MIN_KEY_PRICE}, {"other", 100}}, nil)
-	std.TestIssueCoins(std.GetOrigPkgAddr(), std.Coins{{"ugnot", MIN_KEY_PRICE}, {"other", 100}})
+	std.TestSetOriginSend(std.Coins{{"ugnot", MIN_KEY_PRICE}, {"other", 100}}, nil)
+	std.TestIssueCoins(std.OriginPkgAddress(), std.Coins{{"ugnot", MIN_KEY_PRICE}, {"other", 100}})
 	urequire.PanicsWithMessage(t, ErrInvalidPayment.Error(), BuyKeys)
 
 	// Test insufficient payment
 	std.TestIssueCoins(player, std.Coins{{"ugnot", MIN_KEY_PRICE - 1}})
-	std.TestSetOrigSend(std.Coins{{"ugnot", MIN_KEY_PRICE - 1}}, nil)
-	std.TestIssueCoins(std.GetOrigPkgAddr(), std.Coins{{"ugnot", MIN_KEY_PRICE - 1}})
+	std.TestSetOriginSend(std.Coins{{"ugnot", MIN_KEY_PRICE - 1}}, nil)
+	std.TestIssueCoins(std.OriginPkgAddress(), std.Coins{{"ugnot", MIN_KEY_PRICE - 1}})
 	urequire.PanicsWithMessage(t, ErrInsufficientPayment.Error(), BuyKeys)
 
 	// Test successful purchase
 	std.TestIssueCoins(player, std.Coins{{"ugnot", MIN_KEY_PRICE * 2}})
-	std.TestSetOrigSend(std.Coins{{"ugnot", MIN_KEY_PRICE * 2}}, nil)
-	std.TestIssueCoins(std.GetOrigPkgAddr(), std.Coins{{"ugnot", MIN_KEY_PRICE * 2}})
+	std.TestSetOriginSend(std.Coins{{"ugnot", MIN_KEY_PRICE * 2}}, nil)
+	std.TestIssueCoins(std.OriginPkgAddress(), std.Coins{{"ugnot", MIN_KEY_PRICE * 2}})
 	urequire.NotPanics(t, BuyKeys)
 }
 
@@ -269,26 +269,26 @@ func TestClaimDividends(t *testing.T) {
 	StartGame()
 
 	player := testutils.TestAddress("player")
-	std.TestSetOrigCaller(player)
+	std.TestSetOriginCaller(player)
 
 	// Test claiming with no dividends
 	urequire.PanicsWithMessage(t, ErrNoDividendsToClaim.Error(), ClaimDividends)
 
 	// Setup player with dividends
 	std.TestIssueCoins(player, std.Coins{{"ugnot", MIN_KEY_PRICE}})
-	std.TestSetOrigSend(std.Coins{{"ugnot", MIN_KEY_PRICE}}, nil)
-	std.TestIssueCoins(std.GetOrigPkgAddr(), std.Coins{{"ugnot", MIN_KEY_PRICE}})
+	std.TestSetOriginSend(std.Coins{{"ugnot", MIN_KEY_PRICE}}, nil)
+	std.TestIssueCoins(std.OriginPkgAddress(), std.Coins{{"ugnot", MIN_KEY_PRICE}})
 	BuyKeys()
 
 	// Have another player buy to generate dividends
 	player2 := testutils.TestAddress("player2")
-	std.TestSetOrigCaller(player2)
+	std.TestSetOriginCaller(player2)
 	std.TestIssueCoins(player2, std.Coins{{"ugnot", MIN_KEY_PRICE * 2}})
-	std.TestSetOrigSend(std.Coins{{"ugnot", MIN_KEY_PRICE * 2}}, nil)
-	std.TestIssueCoins(std.GetOrigPkgAddr(), std.Coins{{"ugnot", MIN_KEY_PRICE * 2}})
+	std.TestSetOriginSend(std.Coins{{"ugnot", MIN_KEY_PRICE * 2}}, nil)
+	std.TestIssueCoins(std.OriginPkgAddress(), std.Coins{{"ugnot", MIN_KEY_PRICE * 2}})
 	BuyKeys()
 
 	// Test successful claim
-	std.TestSetOrigCaller(player)
+	std.TestSetOriginCaller(player)
 	urequire.NotPanics(t, ClaimDividends)
 }
diff --git a/examples/gno.land/r/stefann/fomo3d/render.gno b/examples/gno.land/r/stefann/fomo3d/render.gno
index ba0c7b8f147..fb5fe5fe8f8 100644
--- a/examples/gno.land/r/stefann/fomo3d/render.gno
+++ b/examples/gno.land/r/stefann/fomo3d/render.gno
@@ -53,7 +53,7 @@ func RenderHome() string {
 		} else {
 			builder.WriteString("🟢 **Game Status:** Active\n\n")
 			builder.WriteString(ufmt.Sprintf("🔄 **Round:** %d\n\n", gameState.CurrentRound))
-			builder.WriteString(ufmt.Sprintf("⏱️ **Time Remaining:** %d blocks\n\n", gameState.EndBlock-std.GetHeight()))
+			builder.WriteString(ufmt.Sprintf("⏱️ **Time Remaining:** %d blocks\n\n", gameState.EndBlock-std.ChainHeight()))
 		}
 		builder.WriteString(ufmt.Sprintf("💰 **Jackpot:** %d ugnot\n\n", gameState.Jackpot))
 		builder.WriteString(ufmt.Sprintf("🔑 **Key Price:** %d ugnot\n\n", gameState.KeyPrice))
diff --git a/examples/gno.land/r/stefann/home/home.gno b/examples/gno.land/r/stefann/home/home.gno
index f54721ce37c..53aa0fa5678 100644
--- a/examples/gno.land/r/stefann/home/home.gno
+++ b/examples/gno.land/r/stefann/home/home.gno
@@ -127,8 +127,8 @@ func UpdateMaxSponsors(newMax int) {
 }
 
 func Donate() {
-	address := std.GetOrigCaller()
-	amount := std.GetOrigSend()
+	address := std.OriginCaller()
+	amount := std.OriginSend()
 
 	if amount.AmountOf("ugnot") == 0 {
 		panic("Donation must include GNOT")
@@ -146,9 +146,9 @@ func Donate() {
 	travel.currentCityIndex++
 	sponsorship.DonationsCount++
 
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	ownerAddr := registry.MainAddr()
-	banker.SendCoins(std.CurrentRealm().Addr(), ownerAddr, banker.GetCoins(std.CurrentRealm().Addr()))
+	banker.SendCoins(std.CurrentRealm().Address(), ownerAddr, banker.GetCoins(std.CurrentRealm().Address()))
 }
 
 type SponsorSlice []Sponsor
diff --git a/examples/gno.land/r/stefann/home/home_test.gno b/examples/gno.land/r/stefann/home/home_test.gno
index b8ea88670a6..8fa8337dab4 100644
--- a/examples/gno.land/r/stefann/home/home_test.gno
+++ b/examples/gno.land/r/stefann/home/home_test.gno
@@ -11,7 +11,7 @@ import (
 
 func TestUpdateAboutMe(t *testing.T) {
 	var owner = std.Address("g1sd5ezmxt4rwpy52u6wl3l3y085n8x0p6nllxm8")
-	std.TestSetOrigCaller(owner)
+	std.TestSetOriginCaller(owner)
 
 	profile.aboutMe = []string{}
 
@@ -32,7 +32,7 @@ func TestUpdateAboutMe(t *testing.T) {
 
 func TestUpdateCities(t *testing.T) {
 	var owner = std.Address("g1sd5ezmxt4rwpy52u6wl3l3y085n8x0p6nllxm8")
-	std.TestSetOrigCaller(owner)
+	std.TestSetOriginCaller(owner)
 
 	travel.cities = []City{}
 
@@ -54,7 +54,7 @@ func TestUpdateCities(t *testing.T) {
 
 func TestUpdateJarLink(t *testing.T) {
 	var owner = std.Address("g1sd5ezmxt4rwpy52u6wl3l3y085n8x0p6nllxm8")
-	std.TestSetOrigCaller(owner)
+	std.TestSetOriginCaller(owner)
 
 	travel.jarLink = ""
 
@@ -67,7 +67,7 @@ func TestUpdateJarLink(t *testing.T) {
 
 func TestUpdateMaxSponsors(t *testing.T) {
 	var owner = std.Address("g1sd5ezmxt4rwpy52u6wl3l3y085n8x0p6nllxm8")
-	std.TestSetOrigCaller(owner)
+	std.TestSetOriginCaller(owner)
 
 	sponsorship.maxSponsors = 0
 
@@ -87,7 +87,7 @@ func TestUpdateMaxSponsors(t *testing.T) {
 
 func TestAddCities(t *testing.T) {
 	var owner = std.Address("g1sd5ezmxt4rwpy52u6wl3l3y085n8x0p6nllxm8")
-	std.TestSetOrigCaller(owner)
+	std.TestSetOriginCaller(owner)
 
 	travel.cities = []City{}
 
@@ -115,7 +115,7 @@ func TestAddCities(t *testing.T) {
 
 func TestAddAboutMeRows(t *testing.T) {
 	var owner = std.Address("g1sd5ezmxt4rwpy52u6wl3l3y085n8x0p6nllxm8")
-	std.TestSetOrigCaller(owner)
+	std.TestSetOriginCaller(owner)
 
 	profile.aboutMe = []string{}
 
@@ -140,7 +140,7 @@ func TestAddAboutMeRows(t *testing.T) {
 
 func TestDonate(t *testing.T) {
 	var user = testutils.TestAddress("user")
-	std.TestSetOrigCaller(user)
+	std.TestSetOriginCaller(user)
 
 	sponsorship.sponsors = avl.NewTree()
 	sponsorship.DonationsCount = 0
@@ -148,7 +148,7 @@ func TestDonate(t *testing.T) {
 	travel.currentCityIndex = 0
 
 	coinsSent := std.NewCoins(std.NewCoin("ugnot", 500))
-	std.TestSetOrigSend(coinsSent, std.NewCoins())
+	std.TestSetOriginSend(coinsSent, std.NewCoins())
 	Donate()
 
 	existingAmount, exists := sponsorship.sponsors.Get(string(user))
@@ -173,7 +173,7 @@ func TestDonate(t *testing.T) {
 	}
 
 	coinsSent = std.NewCoins(std.NewCoin("ugnot", 300))
-	std.TestSetOrigSend(coinsSent, std.NewCoins())
+	std.TestSetOriginSend(coinsSent, std.NewCoins())
 	Donate()
 
 	existingAmount, exists = sponsorship.sponsors.Get(string(user))
@@ -196,7 +196,7 @@ func TestDonate(t *testing.T) {
 
 func TestGetTopSponsors(t *testing.T) {
 	var user = testutils.TestAddress("user")
-	std.TestSetOrigCaller(user)
+	std.TestSetOriginCaller(user)
 
 	sponsorship.sponsors = avl.NewTree()
 	sponsorship.sponsorsCount = 0
@@ -227,7 +227,7 @@ func TestGetTopSponsors(t *testing.T) {
 
 func TestGetTotalDonations(t *testing.T) {
 	var user = testutils.TestAddress("user")
-	std.TestSetOrigCaller(user)
+	std.TestSetOriginCaller(user)
 
 	sponsorship.sponsors = avl.NewTree()
 	sponsorship.sponsorsCount = 0
diff --git a/examples/gno.land/r/sys/validators/v2/validators.gno b/examples/gno.land/r/sys/validators/v2/validators.gno
index bf42ece4990..538525b754f 100644
--- a/examples/gno.land/r/sys/validators/v2/validators.gno
+++ b/examples/gno.land/r/sys/validators/v2/validators.gno
@@ -30,7 +30,7 @@ func addValidator(validator validators.Validator) {
 
 	// Validator added, note the change
 	ch := change{
-		blockNum:  std.GetHeight(),
+		blockNum:  std.ChainHeight(),
 		validator: val,
 	}
 
@@ -50,7 +50,7 @@ func removeValidator(address std.Address) {
 
 	// Validator removed, note the change
 	ch := change{
-		blockNum: std.GetHeight(),
+		blockNum: std.ChainHeight(),
 		validator: validators.Validator{
 			Address:     val.Address,
 			PubKey:      val.PubKey,
diff --git a/examples/gno.land/r/sys/validators/v2/validators_test.gno b/examples/gno.land/r/sys/validators/v2/validators_test.gno
index 177d84144cb..dc159a3b957 100644
--- a/examples/gno.land/r/sys/validators/v2/validators_test.gno
+++ b/examples/gno.land/r/sys/validators/v2/validators_test.gno
@@ -67,7 +67,7 @@ func TestValidators_AddRemove(t *testing.T) {
 	}
 
 	// Save the beginning height for the removal
-	initialRemoveHeight := std.GetHeight()
+	initialRemoveHeight := std.ChainHeight()
 
 	// Clear any changes
 	changes = avl.NewTree()
diff --git a/examples/gno.land/r/ursulovic/home/home.gno b/examples/gno.land/r/ursulovic/home/home.gno
index cc420df5e6e..be96ab3f913 100644
--- a/examples/gno.land/r/ursulovic/home/home.gno
+++ b/examples/gno.land/r/ursulovic/home/home.gno
@@ -74,7 +74,7 @@ func UpdateSelectedImage(url string) {
 		panic("Url is not valid!")
 	}
 
-	sentCoins := std.GetOrigSend()
+	sentCoins := std.OriginSend()
 
 	if len(sentCoins) != 1 && sentCoins.AmountOf("ugnot") == imageUpdatePrice {
 		panic("Please send exactly " + strconv.Itoa(int(imageUpdatePrice)) + " ugnot")
diff --git a/examples/gno.land/r/ursulovic/home/home_test.gno b/examples/gno.land/r/ursulovic/home/home_test.gno
index ff3f763d62a..eea71c030e6 100644
--- a/examples/gno.land/r/ursulovic/home/home_test.gno
+++ b/examples/gno.land/r/ursulovic/home/home_test.gno
@@ -9,7 +9,7 @@ import (
 
 func TestUpdateGithubUrl(t *testing.T) {
 	caller := std.Address("g1d24j8fwnc0w5q427fauyey4gdd30qgu69k6n0x")
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 
 	newUrl := "https://github.com/example"
 
@@ -22,7 +22,7 @@ func TestUpdateGithubUrl(t *testing.T) {
 
 func TestUpdateLinkedinUrl(t *testing.T) {
 	caller := std.Address("g1d24j8fwnc0w5q427fauyey4gdd30qgu69k6n0x")
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 
 	newUrl := "https://www.linkedin.com/in/example"
 
@@ -35,7 +35,7 @@ func TestUpdateLinkedinUrl(t *testing.T) {
 
 func TestUpdateAboutMe(t *testing.T) {
 	caller := std.Address("g1d24j8fwnc0w5q427fauyey4gdd30qgu69k6n0x")
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 
 	newAboutMe := "This is new description!"
 
@@ -48,12 +48,12 @@ func TestUpdateAboutMe(t *testing.T) {
 
 func TestUpdateSelectedImage(t *testing.T) {
 	var user = testutils.TestAddress("user")
-	std.TestSetOrigCaller(user)
+	std.TestSetOriginCaller(user)
 
 	validImageUrl := "https://i.ibb.co/hLtmnX0/beautiful-rain-forest-ang-ka-nature-trail-doi-inthanon-national-park-thailand-36703721.webp"
 
 	coinsSent := std.NewCoins(std.NewCoin("ugnot", 5000000)) // Update to match the price expected by your function
-	std.TestSetOrigSend(coinsSent, std.NewCoins())
+	std.TestSetOriginSend(coinsSent, std.NewCoins())
 
 	UpdateSelectedImage(validImageUrl)
 
@@ -72,7 +72,7 @@ func TestUpdateSelectedImage(t *testing.T) {
 	UpdateSelectedImage(invalidImageUrl)
 
 	invalidCoins := std.NewCoins(std.NewCoin("ugnot", 1000000))
-	std.TestSetOrigSend(invalidCoins, std.NewCoins())
+	std.TestSetOriginSend(invalidCoins, std.NewCoins())
 
 	defer func() {
 		if r := recover(); r == nil {
@@ -85,7 +85,7 @@ func TestUpdateSelectedImage(t *testing.T) {
 
 func TestUpdateImagePrice(t *testing.T) {
 	caller := std.Address("g1d24j8fwnc0w5q427fauyey4gdd30qgu69k6n0x")
-	std.TestSetOrigCaller(caller)
+	std.TestSetOriginCaller(caller)
 
 	var newImageUpdatePrice int64 = 3000000
 
diff --git a/examples/gno.land/r/ursulovic/registry/registry.gno b/examples/gno.land/r/ursulovic/registry/registry.gno
index 0bbd6c80df5..f873bc6a120 100644
--- a/examples/gno.land/r/ursulovic/registry/registry.gno
+++ b/examples/gno.land/r/ursulovic/registry/registry.gno
@@ -50,7 +50,7 @@ func SetBackupAddress(addr std.Address) error {
 
 // It will stay here for now, might be useful later
 func assertAuthorized() {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	isAuthorized := caller == mainAddress || caller == backupAddress
 
 	if !isAuthorized {
diff --git a/examples/gno.land/r/x/jeronimo_render_proxy/home/home.gno b/examples/gno.land/r/x/jeronimo_render_proxy/home/home.gno
index c73e99cc583..92b277d1b9c 100644
--- a/examples/gno.land/r/x/jeronimo_render_proxy/home/home.gno
+++ b/examples/gno.land/r/x/jeronimo_render_proxy/home/home.gno
@@ -25,7 +25,7 @@ func Register(fn RenderFn) {
 	}
 
 	proxyPath := std.CurrentRealm().PkgPath()
-	callerPath := std.PrevRealm().PkgPath()
+	callerPath := std.PreviousRealm().PkgPath()
 	if !strings.HasPrefix(callerPath, proxyPath+"/") {
 		panic("caller realm path must start with " + proxyPath)
 	}
diff --git a/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_b/v1/v1.gno b/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_b/v1/v1.gno
index 1298b2539be..170aba1c71a 100644
--- a/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_b/v1/v1.gno
+++ b/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_b/v1/v1.gno
@@ -24,9 +24,9 @@ func SetNextVersion(addr string) {
 	// assert CallTx call.
 	std.AssertOriginCall()
 	// assert admin.
-	caller := std.GetCallerAt(2)
-	if caller != std.GetOrigCaller() {
-		panic("should not happen") // because std.AssertOrigCall().
+	caller := std.CallerAt(2)
+	if caller != std.OriginCaller() {
+		panic("should not happen") // because std.AssertOriginCall().
 	}
 	if caller != admin {
 		panic("unauthorized")
diff --git a/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_b/v2/v2.gno b/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_b/v2/v2.gno
index bf30ee1acab..80723ad01f1 100644
--- a/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_b/v2/v2.gno
+++ b/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_b/v2/v2.gno
@@ -28,9 +28,9 @@ func SetNextVersion(addr string) {
 	// assert CallTx call.
 	std.AssertOriginCall()
 	// assert admin.
-	caller := std.GetCallerAt(2)
-	if caller != std.GetOrigCaller() {
-		panic("should not happen") // because std.AssertOrigCall().
+	caller := std.CallerAt(2)
+	if caller != std.OriginCaller() {
+		panic("should not happen") // because std.AssertOriginCall().
 	}
 	if caller != admin {
 		panic("unauthorized")
diff --git a/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_c/root/root.gno b/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_c/root/root.gno
index 0a610b0b196..d71f5ec3db5 100644
--- a/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_c/root/root.gno
+++ b/examples/gno.land/r/x/manfred_upgrade_patterns/upgrade_c/root/root.gno
@@ -23,7 +23,7 @@ func SetCurrentImpl(pkgpath string) {
 }
 
 func assertIsCurrentImpl() {
-	if std.PrevRealm().PkgPath() != currentImpl {
+	if std.PreviousRealm().PkgPath() != currentImpl {
 		panic("unauthorized")
 	}
 }
diff --git a/examples/gno.land/r/x/nir1218_evaluation_proposal/committee.gno b/examples/gno.land/r/x/nir1218_evaluation_proposal/committee.gno
index 1ec801bb971..67311d401b3 100644
--- a/examples/gno.land/r/x/nir1218_evaluation_proposal/committee.gno
+++ b/examples/gno.land/r/x/nir1218_evaluation_proposal/committee.gno
@@ -36,7 +36,7 @@ func (c *Committee) DismissMembers(members []std.Address) []std.Address {
 
 func (c *Committee) AddCategory(name string, criteria []string) bool {
 	// TODO error handling
-	if !c.isMember(std.GetOrigCaller()) {
+	if !c.isMember(std.OriginCaller()) {
 		return false
 	}
 	category := NewCategory(name, criteria)
@@ -45,7 +45,7 @@ func (c *Committee) AddCategory(name string, criteria []string) bool {
 }
 
 func (c *Committee) ApproveCategory(name string, option string) bool {
-	if !c.isMember(std.GetOrigCaller()) {
+	if !c.isMember(std.OriginCaller()) {
 		return false
 	}
 
@@ -58,8 +58,8 @@ func (c *Committee) ApproveCategory(name string, option string) bool {
 		return false
 	}
 
-	vote := NewVote(std.GetOrigCaller(), option)
-	category.votes.Set(std.GetOrigCaller().String(), vote)
+	vote := NewVote(std.OriginCaller(), option)
+	category.votes.Set(std.OriginCaller().String(), vote)
 	category.Tally()
 
 	// TODO Add threshold factor for a category approval
@@ -81,7 +81,7 @@ func (c *Committee) ApproveCategory(name string, option string) bool {
 
 // TODO error handling
 func (c *Committee) AddContribution(pr *PullRequest, contributor std.Address) (contributionId int, ok bool) {
-	if !c.isMember(std.GetOrigCaller()) {
+	if !c.isMember(std.OriginCaller()) {
 		return -1, false
 	}
 	// Check the category of the PR matches a category this committee evaluates
@@ -95,7 +95,7 @@ func (c *Committee) AddContribution(pr *PullRequest, contributor std.Address) (c
 
 // TODO error handling
 func (c *Committee) ApproveContribution(id int, option string) bool {
-	if !c.isMember(std.GetOrigCaller()) {
+	if !c.isMember(std.OriginCaller()) {
 		return false
 	}
 
@@ -109,7 +109,7 @@ func (c *Committee) ApproveContribution(id int, option string) bool {
 		return false
 	}
 
-	vote := NewVote(std.GetOrigCaller(), option)
+	vote := NewVote(std.OriginCaller(), option)
 	contribution.votes = append(contribution.votes, vote)
 	contribution.Tally()
 
diff --git a/examples/gno.land/r/x/nir1218_evaluation_proposal/committee_test.gno b/examples/gno.land/r/x/nir1218_evaluation_proposal/committee_test.gno
index 8a3d16fd7f7..39e7fb6cabf 100644
--- a/examples/gno.land/r/x/nir1218_evaluation_proposal/committee_test.gno
+++ b/examples/gno.land/r/x/nir1218_evaluation_proposal/committee_test.gno
@@ -36,7 +36,7 @@ func TestCategoryEvaluationCriteria(t *testing.T) {
 	c.DesignateMembers([]std.Address{member})
 
 	t.Run("Add First Committee Category and Evaluation Criteria", func(t *testing.T) {
-		std.TestSetOrigCaller(member)
+		std.TestSetOriginCaller(member)
 		c.AddCategory(category, criteria)
 		value, exists := c.categories.Get(category)
 		if !exists {
@@ -49,7 +49,7 @@ func TestCategoryEvaluationCriteria(t *testing.T) {
 	})
 
 	t.Run("Add Second Committee Category and Evaluation Criteria", func(t *testing.T) {
-		std.TestSetOrigCaller(member)
+		std.TestSetOriginCaller(member)
 		c.AddCategory(category2, criteria2)
 		value2, exists2 := c.categories.Get(category2)
 		if !exists2 {
@@ -62,7 +62,7 @@ func TestCategoryEvaluationCriteria(t *testing.T) {
 	})
 
 	t.Run("Approve First Committee Category", func(t *testing.T) {
-		std.TestSetOrigCaller(member)
+		std.TestSetOriginCaller(member)
 		approved := c.ApproveCategory(category, VoteYes)
 		if !approved {
 			value, exists := c.categories.Get(category)
diff --git a/examples/gno.land/r/x/skip_height_to_skip_time/skiptime_test.gno b/examples/gno.land/r/x/skip_height_to_skip_time/skiptime_test.gno
index 52670a5626b..eff6e669be0 100644
--- a/examples/gno.land/r/x/skip_height_to_skip_time/skiptime_test.gno
+++ b/examples/gno.land/r/x/skip_height_to_skip_time/skiptime_test.gno
@@ -7,7 +7,7 @@ import (
 )
 
 func TestSkipHeights(t *testing.T) {
-	oldHeight := std.GetHeight()
+	oldHeight := std.ChainHeight()
 	shouldEQ(t, oldHeight, 123)
 
 	oldNow := time.Now().Unix()
@@ -16,7 +16,7 @@ func TestSkipHeights(t *testing.T) {
 	// skip 3 blocks == 15 seconds
 	std.TestSkipHeights(3)
 
-	shouldEQ(t, std.GetHeight()-oldHeight, 3)
+	shouldEQ(t, std.ChainHeight()-oldHeight, 3)
 	shouldEQ(t, time.Now().Unix()-oldNow, 15)
 }
 
diff --git a/gno.land/genesis/genesis_txs.jsonl b/gno.land/genesis/genesis_txs.jsonl
index 9027d51c0ac..24c42220055 100644
--- a/gno.land/genesis/genesis_txs.jsonl
+++ b/gno.land/genesis/genesis_txs.jsonl
@@ -10,7 +10,7 @@
 {"tx": {"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateBoard","args":["testboard"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"A+FhNtsXHjLfSJk1lB8FbiL4mGPjc50Kt81J7EKDnJ2y"},"signature":"vzlSxEFh5jOkaSdv3rsV91v/OJKEF2qSuoCpri1u5tRWq62T7xr3KHRCF5qFnn4aQX/yE8g8f/Y//WPOCUGhJw=="}],"memo":""}}
 {"tx": {"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","Hello World","This is a demo of Gno smart contract programming.  This document was\nconstructed by Gno onto a smart contract hosted on the data Realm \nname [\"gno.land/r/demo/boards\"](https://gno.land/r/demo/boards/)\n([github](https://github.com/gnolang/gno/tree/master/examples/gno.land/r/demo/boards)).\n\n## Starting the `gnoland` node node/validator.\n\nNOTE: Where you see `--remote %%REMOTE%%` here, that flag can be replaced\nwith `--remote localhost:26657` for local testnets.\n\n### build gnoland.\n\n```bash\ngit clone git@github.com:gnolang/gno.git\ncd ./gno\nmake \n```\n\n### add test account.\n\n```bash\n./build/gnokey add test1 --recover\n```\n\nUse this mnemonic:\n\u003e source bonus chronic canvas draft south burst lottery vacant surface solve popular case indicate oppose farm nothing bullet exhibit title speed wink action roast\n\n### start gnoland validator node.\n\n```bash\n./build/gnoland\n```\n\n(This can be reset with `make reset`).\n\n### start gnoland web server (optional).\n\n```bash\ngo run ./gnoland/website\n```\n\n## Signing and broadcasting transactions.\n\n### publish the \"gno.land/p/demo/avl\" package.\n\n```bash\n./build/gnokey maketx addpkg test1 --pkgpath \"gno.land/p/demo/avl\" --pkgdir \"examples/gno.land/p/demo/avl\" --deposit 100ugnot --gas-fee 1ugnot --gas-wanted 2000000 \u003e addpkg.avl.unsigned.txt\n./build/gnokey query \"auth/accounts/g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5\"\n./build/gnokey sign test1 --txpath addpkg.avl.unsigned.txt --chainid \"%%CHAINID%%\" --number 0 --sequence 0 \u003e addpkg.avl.signed.txt\n./build/gnokey broadcast addpkg.avl.signed.txt --remote %%REMOTE%%\n```\n\n### publish the \"gno.land/r/demo/boards\" realm package.\n\n```bash\n./build/gnokey maketx addpkg test1 --pkgpath \"gno.land/r/demo/boards\" --pkgdir \"examples/gno.land/r/demo/boards\" --deposit 100ugnot --gas-fee 1ugnot --gas-wanted 300000000 \u003e addpkg.boards.unsigned.txt\n./build/gnokey sign test1 --txpath addpkg.boards.unsigned.txt --chainid \"%%CHAINID%%\" --number 0 --sequence 1 \u003e addpkg.boards.signed.txt\n./build/gnokey broadcast addpkg.boards.signed.txt --remote %%REMOTE%%\n```\n\n### create a board with a smart contract call.\n\n```bash\n./build/gnokey maketx call test1 --pkgpath \"gno.land/r/demo/boards\" --func CreateBoard --args \"testboard\" --gas-fee 1ugnot --gas-wanted 2000000 \u003e createboard.unsigned.txt\n./build/gnokey sign test1 --txpath createboard.unsigned.txt --chainid \"%%CHAINID%%\" --number 0 --sequence 2 \u003e createboard.signed.txt\n./build/gnokey broadcast createboard.signed.txt --remote %%REMOTE%%\n```\nNext, query for the permanent board ID by querying (you need this to create a new post):\n\n```bash\n./build/gnokey query \"vm/qeval\" --data \"gno.land/r/demo/boards.GetBoardIDFromName(\\\"testboard\\\")\"\n```\n\n### create a post of a board with a smart contract call.\n\n```bash\n./build/gnokey maketx call test1 --pkgpath \"gno.land/r/demo/boards\" --func CreatePost --args 1 --args \"Hello World\" --args#file \"./examples/gno.land/r/demo/boards/README.md\" --gas-fee 1ugnot --gas-wanted 2000000 \u003e createpost.unsigned.txt\n./build/gnokey sign test1 --txpath createpost.unsigned.txt --chainid \"%%CHAINID%%\" --number 0 --sequence 3 \u003e createpost.signed.txt\n./build/gnokey broadcast createpost.signed.txt --remote %%REMOTE%%\n```\n\n### create a comment to a post.\n\n```bash\n./build/gnokey maketx call test1 --pkgpath \"gno.land/r/demo/boards\" --func CreateReply --args 1 --args 1 --args \"A comment\" --gas-fee 1ugnot --gas-wanted 2000000 \u003e createcomment.unsigned.txt\n./build/gnokey sign test1 --txpath createcomment.unsigned.txt --chainid \"%%CHAINID%%\" --number 0 --sequence 4 \u003e createcomment.signed.txt\n./build/gnokey broadcast createcomment.signed.txt --remote %%REMOTE%%\n```\n\n```bash\n./build/gnokey query \"vm/qrender\" --data \"gno.land/r/demo/boards:testboard/1\"\n```\n\n### render page with optional path expression.\n\nThe contents of `https://gno.land/r/demo/boards:` and `https://gno.land/r/demo/boards:testboard` are rendered by calling\nthe `Render(path string)` function like so:\n\n```bash\n./build/gnokey query \"vm/qrender\" --data \"gno.land/r/demo/boards:testboard\"\n```\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"A+FhNtsXHjLfSJk1lB8FbiL4mGPjc50Kt81J7EKDnJ2y"},"signature":"V43B1waFxhzheW9TfmCpjLdrC4dC1yjUGES5y3J6QsNar6hRpNz4G1thzWmWK7xXhg8u1PCIpxLxGczKQYhuPw=="}],"memo":""}}
 {"tx": {"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","NFT example","NFT's are all the rage these days, for various reasons.\n\nI read over EIP-721 which appears to be the de-facto NFT standard on Ethereum. Then, made a sample implementation of EIP-721 (let's here called GRC-721). The implementation isn't complete, but it demonstrates the main functionality.\n\n - [EIP-721](https://eips.ethereum.org/EIPS/eip-721)\n - [gno.land/r/demo/nft/nft.gno](https://gno.land/r/demo/nft/nft.gno)\n - [zrealm_nft3.gno test](https://github.com/gnolang/gno/blob/master/examples/gno.land/r/demo/nft/z_3_filetest.gno)\n\nIn short, this demonstrates how to implement Ethereum contract interfaces in gno.land; by using only standard Go language features.\n\nPlease leave a comment ([guide](https://gno.land/r/demo/boards:testboard/1)).\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"A+FhNtsXHjLfSJk1lB8FbiL4mGPjc50Kt81J7EKDnJ2y"},"signature":"ZXfrTiHxPFQL8uSm+Tv7WXIHPMca9okhm94RAlC6YgNbB1VHQYYpoP4w+cnL3YskVzGrOZxensXa9CAZ+cNNeg=="}],"memo":""}}
-{"tx": {"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","Simple echo example with coins","This is a simple test realm contract that demonstrates how to use the banker.\n\nSee [gno.land/r/demo/banktest/banktest.gno](/r/demo/banktest/banktest.gno) to see the original contract code.\n\nThis article will go through each line to explain how it works.\n\n```go\npackage banktest\n```\n\nThis package is locally named \"banktest\" (could be anything).\n\n```go\nimport (\n\t\"std\"\n)\n```\n\nThe \"std\" package is defined by the gno code in stdlibs/std/. \u003c/br\u003e\nSelf explanatory; and you'll see more usage from std later.\n\n```go\ntype activity struct {\n\tcaller   std.Address\n\tsent     std.Coins\n\treturned std.Coins\n\ttime     std.Time\n}\n\nfunc (act *activity) String() string {\n\treturn act.caller.String() + \" \" +\n\t\tact.sent.String() + \" sent, \" +\n\t\tact.returned.String() + \" returned, at \" +\n\t\tstd.FormatTimestamp(act.time, \"2006-01-02 3:04pm MST\")\n}\n\nvar latest [10]*activity\n```\n\nThis is just maintaining a list of recent activity to this contract.\nNotice that the \"latest\" variable is defined \"globally\" within\nthe context of the realm with path \"gno.land/r/demo/banktest\".\n\nThis means that calls to functions defined within this package\nare encapsulated within this \"data realm\", where the data is \nmutated based on transactions that can potentially cross many\nrealm and non-realm packge boundaries (in the call stack).\n\n```go\n// Deposit will take the coins (to the realm's pkgaddr) or return them to user.\nfunc Deposit(returnDenom string, returnAmount int64) string {\n\tstd.AssertOriginCall()\n\tcaller := std.GetOrigCaller()\n\tsend := std.Coins{{returnDenom, returnAmount}}\n```\n\nThis is the beginning of the definition of the contract function named\n\"Deposit\".  `std.AssertOriginCall() asserts that this function was called by a\ngno transactional Message. The caller is the user who signed off on this\ntransactional message. Send is the amount of deposit sent along with this\nmessage.\n\n```go\n\t// record activity\n\tact := \u0026activity{\n\t\tcaller:   caller,\n\t\tsent:     std.GetOrigSend(),\n\t\treturned: send,\n\t\ttime:     std.GetTimestamp(),\n\t}\n\tfor i := len(latest) - 2; i \u003e= 0; i-- {\n\t\tlatest[i+1] = latest[i] // shift by +1.\n\t}\n\tlatest[0] = act\n```\n\nUpdating the \"latest\" array for viewing at gno.land/r/demo/banktest: (w/ trailing colon).\n\n```go\n\t// return if any.\n\tif returnAmount \u003e 0 {\n```\n\nIf the user requested the return of coins...\n\n```go\n\t\tbanker := std.GetBanker(std.BankerTypeOrigSend)\n```\n\nuse a std.Banker instance to return any deposited coins to the original sender.\n\n```go\n\t\tpkgaddr := std.GetOrigPkgAddr()\n\t\t// TODO: use std.Coins constructors, this isn't generally safe.\n\t\tbanker.SendCoins(pkgaddr, caller, send)\n\t\treturn \"returned!\"\n```\n\nNotice that each realm package has an associated Cosmos address.\n\n\nFinally, the results are rendered via an ABCI query call when you visit [/r/demo/banktest:](/r/demo/banktest:).\n\n```go\nfunc Render(path string) string {\n\t// get realm coins.\n\tbanker := std.GetBanker(std.BankerTypeReadonly)\n\tcoins := banker.GetCoins(std.GetOrigPkgAddr())\n\n\t// render\n\tres := \"\"\n\tres += \"## recent activity\\n\"\n\tres += \"\\n\"\n\tfor _, act := range latest {\n\t\tif act == nil {\n\t\t\tbreak\n\t\t}\n\t\tres += \" * \" + act.String() + \"\\n\"\n\t}\n\tres += \"\\n\"\n\tres += \"## total deposits\\n\"\n\tres += coins.String()\n\treturn res\n}\n```\n\nYou can call this contract yourself, by vistiing [/r/demo/banktest](/r/demo/banktest) and the [quickstart guide](/r/demo/boards:testboard/4).\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"A+FhNtsXHjLfSJk1lB8FbiL4mGPjc50Kt81J7EKDnJ2y"},"signature":"iZX/llZlNTdZMLv1goCTgK2bWqzT8enlTq56wMTCpVxJGA0BTvuEM5Nnt9vrnlG6Taqj2GuTrmEnJBkDFTmt9g=="}],"memo":""}}
+{"tx": {"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","Simple echo example with coins","This is a simple test realm contract that demonstrates how to use the banker.\n\nSee [gno.land/r/demo/banktest/banktest.gno](/r/demo/banktest/banktest.gno) to see the original contract code.\n\nThis article will go through each line to explain how it works.\n\n```go\npackage banktest\n```\n\nThis package is locally named \"banktest\" (could be anything).\n\n```go\nimport (\n\t\"std\"\n)\n```\n\nThe \"std\" package is defined by the gno code in stdlibs/std/. \u003c/br\u003e\nSelf explanatory; and you'll see more usage from std later.\n\n```go\ntype activity struct {\n\tcaller   std.Address\n\tsent     std.Coins\n\treturned std.Coins\n\ttime     std.Time\n}\n\nfunc (act *activity) String() string {\n\treturn act.caller.String() + \" \" +\n\t\tact.sent.String() + \" sent, \" +\n\t\tact.returned.String() + \" returned, at \" +\n\t\tstd.FormatTimestamp(act.time, \"2006-01-02 3:04pm MST\")\n}\n\nvar latest [10]*activity\n```\n\nThis is just maintaining a list of recent activity to this contract.\nNotice that the \"latest\" variable is defined \"globally\" within\nthe context of the realm with path \"gno.land/r/demo/banktest\".\n\nThis means that calls to functions defined within this package\nare encapsulated within this \"data realm\", where the data is \nmutated based on transactions that can potentially cross many\nrealm and non-realm packge boundaries (in the call stack).\n\n```go\n// Deposit will take the coins (to the realm's pkgaddr) or return them to user.\nfunc Deposit(returnDenom string, returnAmount int64) string {\n\tstd.AssertOriginCall()\n\tcaller := std.OriginCaller()\n\tsend := std.Coins{{returnDenom, returnAmount}}\n```\n\nThis is the beginning of the definition of the contract function named\n\"Deposit\".  `std.AssertOriginCall() asserts that this function was called by a\ngno transactional Message. The caller is the user who signed off on this\ntransactional message. Send is the amount of deposit sent along with this\nmessage.\n\n```go\n\t// record activity\n\tact := \u0026activity{\n\t\tcaller:   caller,\n\t\tsent:     std.OriginSend(),\n\t\treturned: send,\n\t\ttime:     std.GetTimestamp(),\n\t}\n\tfor i := len(latest) - 2; i \u003e= 0; i-- {\n\t\tlatest[i+1] = latest[i] // shift by +1.\n\t}\n\tlatest[0] = act\n```\n\nUpdating the \"latest\" array for viewing at gno.land/r/demo/banktest: (w/ trailing colon).\n\n```go\n\t// return if any.\n\tif returnAmount \u003e 0 {\n```\n\nIf the user requested the return of coins...\n\n```go\n\t\tbanker := std.NewBanker(std.BankerTypeOriginSend)\n```\n\nuse a std.Banker instance to return any deposited coins to the original sender.\n\n```go\n\t\tpkgaddr := std.OriginPkgAddress()\n\t\t// TODO: use std.Coins constructors, this isn't generally safe.\n\t\tbanker.SendCoins(pkgaddr, caller, send)\n\t\treturn \"returned!\"\n```\n\nNotice that each realm package has an associated Cosmos address.\n\n\nFinally, the results are rendered via an ABCI query call when you visit [/r/demo/banktest:](/r/demo/banktest:).\n\n```go\nfunc Render(path string) string {\n\t// get realm coins.\n\tbanker := std.NewBanker(std.BankerTypeReadonly)\n\tcoins := banker.GetCoins(std.OriginPkgAddress())\n\n\t// render\n\tres := \"\"\n\tres += \"## recent activity\\n\"\n\tres += \"\\n\"\n\tfor _, act := range latest {\n\t\tif act == nil {\n\t\t\tbreak\n\t\t}\n\t\tres += \" * \" + act.String() + \"\\n\"\n\t}\n\tres += \"\\n\"\n\tres += \"## total deposits\\n\"\n\tres += coins.String()\n\treturn res\n}\n```\n\nYou can call this contract yourself, by vistiing [/r/demo/banktest](/r/demo/banktest) and the [quickstart guide](/r/demo/boards:testboard/4).\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"A+FhNtsXHjLfSJk1lB8FbiL4mGPjc50Kt81J7EKDnJ2y"},"signature":"iZX/llZlNTdZMLv1goCTgK2bWqzT8enlTq56wMTCpVxJGA0BTvuEM5Nnt9vrnlG6Taqj2GuTrmEnJBkDFTmt9g=="}],"memo":""}}
 {"tx": {"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","TASK: Describe in your words","Describe in an essay (250+ words), on your favorite medium, why you are interested in gno.land and gnolang.\n\nReply here with a URL link to your written piece as a comment, for rewards.\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"AmG6kzznyo1uNqWPAYU6wDpsmzQKDaEOrVRaZ08vOyX0"},"signature":"4HBNtrta8HdeHj4JTN56PBTRK8GOe31NMRRXDiyYtjozuyRdWfOGEsGjGgHWcoBUJq6DepBgD4FetdqfhZ6TNQ=="}],"memo":""}}
 {"tx": {"msg":[{"@type":"/vm.m_call","caller":"g1manfred47kzduec920z88wfr64ylksmdcedlf5","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","Getting Started","This is a demo of Gno smart contract programming.  This document was\nconstructed by Gno onto a smart contract hosted on the data Realm\nname [\"gno.land/r/demo/boards\"](https://gno.land/r/demo/boards/)\n([github](https://github.com/gnolang/gno/tree/master/examples/gno.land/r/demo/boards)).\n\n\n\n## Build `gnokey`, create your account, and interact with Gno.\n\nNOTE: Where you see `--remote %%REMOTE%%` here, that flag can be replaced\nwith `--remote localhost:26657` for local testnets.\n\n### Build `gnokey`.\n\n```bash\ngit clone git@github.com:gnolang/gno.git\ncd ./gno\nmake\n```\n\n### Generate a seed/mnemonic code.\n\n```bash\n./build/gnokey generate\n```\n\nNOTE: You can generate 24 words with any good bip39 generator.\n\n### Create a new account using your mnemonic.\n\n```bash\n./build/gnokey add KEYNAME --recover\n```\n\nNOTE: `KEYNAME` is your key identifier, and should be changed.\n\n### Verify that you can see your account locally.\n\n```bash\n./build/gnokey list\n```\n\n## Interact with the blockchain:\n\n### Get your current balance, account number, and sequence number.\n\n```bash\n./build/gnokey query auth/accounts/ACCOUNT_ADDR --remote %%REMOTE%%\n```\n\nNOTE: you can retrieve your `ACCOUNT_ADDR` with `./build/gnokey list`.\n\n### Acquire testnet tokens using the official faucet.\n\nGo to https://gno.land/faucet\n\n### Create a board with a smart contract call.\n\nNOTE: `BOARDNAME` will be the slug of the board, and should be changed.\n\n```bash\n./build/gnokey maketx call KEYNAME --pkgpath \"gno.land/r/demo/boards\" --func \"CreateBoard\" --args \"BOARDNAME\" --gas-fee \"1000000ugnot\" --gas-wanted \"2000000\" --broadcast=true --chainid %%CHAINID%% --remote %%REMOTE%%\n```\n\nInteractive documentation: https://gno.land/r/demo/boards$help\u0026func=CreateBoard\n\nNext, query for the permanent board ID by querying (you need this to create a new post):\n\n```bash\n./build/gnokey query \"vm/qeval\" --data \"gno.land/r/demo/boards.GetBoardIDFromName(\\\"BOARDNAME\\\")\" --remote %%REMOTE%%\n```\n\n### Create a post of a board with a smart contract call.\n\nNOTE: If a board was created successfully, your SEQUENCE_NUMBER would have increased.\n\n```bash\n./build/gnokey maketx call KEYNAME --pkgpath \"gno.land/r/demo/boards\" --func \"CreateThread\" --args BOARD_ID --args \"Hello gno.land\" --args\\#file \"./examples/gno.land/r/demo/boards/example_post.md\" --gas-fee 1000000ugnot --gas-wanted 2000000 --broadcast=true --chainid %%CHAINID%% --remote %%REMOTE%%\n```\n\nInteractive documentation: https://gno.land/r/demo/boards$help\u0026func=CreateThread\n\n### Create a comment to a post.\n\n```bash\n./build/gnokey maketx call KEYNAME --pkgpath \"gno.land/r/demo/boards\" --func \"CreateReply\" --args \"BOARD_ID\" --args \"1\" --args \"1\" --args \"Nice to meet you too.\" --gas-fee 1000000ugnot --gas-wanted 2000000 --broadcast=true --chainid %%CHAINID%% --remote %%REMOTE%%\n```\n\nInteractive documentation: https://gno.land/r/demo/boards$help\u0026func=CreateReply\n\n```bash\n./build/gnokey query \"vm/qrender\" --data \"gno.land/r/demo/boards:BOARDNAME/1\" --remote %%REMOTE%%\n```\n\n### Render page with optional path expression.\n\nThe contents of `https://gno.land/r/demo/boards:` and `https://gno.land/r/demo/boards:gnolang` are rendered by calling\nthe `Render(path string)` function like so:\n\n```bash\n./build/gnokey query \"vm/qrender\" --data \"gno.land/r/demo/boards:gnolang\"\n```\n\n## Starting a local `gnoland` node:\n\n### Add test account.\n\n```bash\n./build/gnokey add test1 --recover\n```\n\nUse this mneonic:\n\u003e source bonus chronic canvas draft south burst lottery vacant surface solve popular case indicate oppose farm nothing bullet exhibit title speed wink action roast\n\n### Start `gnoland` node.\n\n```bash\n./build/gnoland\n```\n\nNOTE: This can be reset with `make reset`\n\n### Publish the \"gno.land/p/demo/avl\" package.\n\n```bash\n./build/gnokey maketx addpkg test1 --pkgpath \"gno.land/p/demo/avl\" --pkgdir \"examples/gno.land/p/demo/avl\" --deposit 100000000ugnot --gas-fee 1000000ugnot --gas-wanted 2000000 --broadcast=true --chainid %%CHAINID%% --remote localhost:26657\n```\n\n### Publish the \"gno.land/r/demo/boards\" realm package.\n\n```bash\n./build/gnokey maketx addpkg test1 --pkgpath \"gno.land/r/demo/boards\" --pkgdir \"examples/gno.land/r/demo/boards\" --deposit 100000000ugnot --gas-fee 1000000ugnot --gas-wanted 300000000 --broadcast=true --chainid %%CHAINID%% --remote localhost:26657\n```\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"AnK+a6mcFDjY6b/v6p7r8QFW1M1PgIoQxBgrwOoyY7v3"},"signature":"sHjOGXZEi9wt2FSXFHmkDDoVQyepvFHKRDDU0zgedHYnCYPx5/YndyihsDD5Y2Z7/RgNYBh4JlJwDMGFNStzBQ=="}],"memo":""}}
 {"tx": {"msg":[{"@type":"/vm.m_call","caller":"g1manfred47kzduec920z88wfr64ylksmdcedlf5","send":"","pkg_path":"gno.land/r/gnoland/blog","func":"ModAddPost","args":["post1","First post","Lorem Ipsum","2022-05-20T13:17:22Z","","tag1,tag2"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"AnK+a6mcFDjY6b/v6p7r8QFW1M1PgIoQxBgrwOoyY7v3"},"signature":"sHjOGXZEi9wt2FSXFHmkDDoVQyepvFHKRDDU0zgedHYnCYPx5/YndyihsDD5Y2Z7/RgNYBh4JlJwDMGFNStzBQ=="}],"memo":""}}
diff --git a/gno.land/pkg/integration/testdata/grc20_registry.txtar b/gno.land/pkg/integration/testdata/grc20_registry.txtar
index 4377e10a575..ecfab2ea651 100644
--- a/gno.land/pkg/integration/testdata/grc20_registry.txtar
+++ b/gno.land/pkg/integration/testdata/grc20_registry.txtar
@@ -34,7 +34,7 @@ func TransferByName(name string, to string, amount uint64) string {
 		if pair.name != name {
 			continue
 		}
-		if std.CurrentRealm().Addr().String() != pair.cb(std.Address(to), amount) {
+		if std.CurrentRealm().Address().String() != pair.cb(std.Address(to), amount) {
 			return "invalid address, ownership issue :("
 		}
 		return "same address, success!"
@@ -58,6 +58,6 @@ package foo20
 import "std"
 
 func Transfer(to std.Address, amount uint64) string {
-	println("transfer from=" + std.PrevRealm().Addr().String() + " to=" + to.String() + " some-amount")
-	return std.PrevRealm().Addr().String()
+	println("transfer from=" + std.PreviousRealm().Address().String() + " to=" + to.String() + " some-amount")
+	return std.PreviousRealm().Address().String()
 }
diff --git a/gno.land/pkg/integration/testdata/grc721_emit.txtar b/gno.land/pkg/integration/testdata/grc721_emit.txtar
index 45101b74634..0b90188fd59 100644
--- a/gno.land/pkg/integration/testdata/grc721_emit.txtar
+++ b/gno.land/pkg/integration/testdata/grc721_emit.txtar
@@ -69,7 +69,7 @@ func TransferFrom(from, to pusers.AddressOrName, tid grc721.TokenID) {
 // Admin
 
 func Mint(to pusers.AddressOrName, tid grc721.TokenID) {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	assertIsAdmin(caller)
 	err := foo.Mint(users.Resolve(to), tid)
 	if err != nil {
@@ -78,7 +78,7 @@ func Mint(to pusers.AddressOrName, tid grc721.TokenID) {
 }
 
 func Burn(tid grc721.TokenID) {
-	caller := std.PrevRealm().Addr()
+	caller := std.PreviousRealm().Address()
 	assertIsAdmin(caller)
 	err := foo.Burn(tid)
 	if err != nil {
diff --git a/gno.land/pkg/integration/testdata/initctx.txtar b/gno.land/pkg/integration/testdata/initctx.txtar
index 9210268e66f..82e27dba642 100644
--- a/gno.land/pkg/integration/testdata/initctx.txtar
+++ b/gno.land/pkg/integration/testdata/initctx.txtar
@@ -18,8 +18,8 @@ var orig = std.Address("orig")
 var prev = std.Address("prev")
 
 func init() {
-    orig = std.GetOrigCaller()
-    prev = std.PrevRealm().Addr()
+    orig = std.OriginCaller()
+    prev = std.PreviousRealm().Address()
 }
 
 func Render(addr string) string {
diff --git a/gno.land/pkg/integration/testdata/issue_1786.txtar b/gno.land/pkg/integration/testdata/issue_1786.txtar
index 71cd19e7ed7..284ea951e5b 100644
--- a/gno.land/pkg/integration/testdata/issue_1786.txtar
+++ b/gno.land/pkg/integration/testdata/issue_1786.txtar
@@ -49,7 +49,7 @@ import (
 )
 
 func ProxyWrap() {
-	sent := std.GetOrigSend()
+	sent := std.OriginSend()
 	ugnotSent := uint64(sent.AmountOf("ugnot"))
 
 	if ugnotSent == 0 {
@@ -58,12 +58,12 @@ func ProxyWrap() {
 
 	// WRAP IT
 	wugnotAddr := std.DerivePkgAddr("gno.land/r/demo/wugnot")
-	banker := std.GetBanker(std.BankerTypeRealmSend)
-	banker.SendCoins(std.CurrentRealm().Addr(), wugnotAddr, std.Coins{{"ugnot", int64(ugnotSent)}})
+	banker := std.NewBanker(std.BankerTypeRealmSend)
+	banker.SendCoins(std.CurrentRealm().Address(), wugnotAddr, std.Coins{{"ugnot", int64(ugnotSent)}})
 	wugnot.Deposit() // `proxywugnot` has ugnot
 
 	// SEND WUGNOT: PROXY_WUGNOT -> USER
-	wugnot.Transfer(std.GetOrigCaller(), ugnotSent)
+	wugnot.Transfer(std.OriginCaller(), ugnotSent)
 }
 
 func ProxyUnwrap(wugnotAmount uint64) {
@@ -72,12 +72,12 @@ func ProxyUnwrap(wugnotAmount uint64) {
 	}
 
 	// SEND WUGNOT: USER -> PROXY_WUGNOT
-	wugnot.TransferFrom(std.GetOrigCaller(), std.CurrentRealm().Addr(), wugnotAmount)
+	wugnot.TransferFrom(std.OriginCaller(), std.CurrentRealm().Address(), wugnotAmount)
 
 	// UNWRAP IT
 	wugnot.Withdraw(wugnotAmount)
 
 	// SEND GNOT: PROXY_WUGNOT -> USER
-	banker := std.GetBanker(std.BankerTypeRealmSend)
-	banker.SendCoins(std.CurrentRealm().Addr(), std.GetOrigCaller(), std.Coins{{"ugnot", int64(wugnotAmount)}})
+	banker := std.NewBanker(std.BankerTypeRealmSend)
+	banker.SendCoins(std.CurrentRealm().Address(), std.OriginCaller(), std.Coins{{"ugnot", int64(wugnotAmount)}})
 }
diff --git a/gno.land/pkg/integration/testdata/issue_2283.txtar b/gno.land/pkg/integration/testdata/issue_2283.txtar
index 653a4dd79b0..222ca86f2fa 100644
--- a/gno.land/pkg/integration/testdata/issue_2283.txtar
+++ b/gno.land/pkg/integration/testdata/issue_2283.txtar
@@ -46,7 +46,7 @@ import (
           },
           {
             "Name": "feeds_test.gno",
-            "Body": "package social_feeds\n\nimport (\n\t\"encoding/base64\"\n\t\"fmt\"\n\t\"std\"\n\t\"strconv\"\n\t\"strings\"\n\t\"testing\"\n\n\t\"gno.land/p/demo/avl\"\n\tujson \"gno.land/p/demo/teritori/ujson\"\n\t\"gno.land/p/demo/testutils\"\n\t\"gno.land/r/demo/boards\"\n\t// Fake previous version for testing\n\tfeedsV7 \"gno.land/r/demo/teritori/social_feeds\"\n\t\"gno.land/r/demo/users\"\n)\n\nvar (\n\trootPostID = PostID(0)\n\tpostID1    = PostID(1)\n\tfeedID1    = FeedID(1)\n\tcat1       = uint64(1)\n\tcat2       = uint64(2)\n\tuser       = testutils.TestAddress(\"user\")\n\tfilter_all = []uint64{}\n)\n\nfunc getFeed1() *Feed {\n\treturn mustGetFeed(feedID1)\n}\n\nfunc getPost1() *Post {\n\tfeed1 := getFeed1()\n\tpost1 := feed1.MustGetPost(postID1)\n\treturn post1\n}\n\nfunc testCreateFeed(t *testing.T) {\n\tfeedID := CreateFeed(\"teritori1\")\n\tfeed := mustGetFeed(feedID)\n\n\tif feedID != 1 {\n\t\tt.Fatalf(\"expected feedID: 1, got %q.\", feedID)\n\t}\n\n\tif feed.name != \"teritori1\" {\n\t\tt.Fatalf(\"expected feedName: teritori1, got %q.\", feed.name)\n\t}\n}\n\nfunc testCreatePost(t *testing.T) {\n\tmetadata := `{\"gifs\": [], \"files\": [], \"title\": \"\", \"message\": \"testouille\", \"hashtags\": [], \"mentions\": [], \"createdAt\": \"2023-03-29T12:19:04.858Z\", \"updatedAt\": \"2023-03-29T12:19:04.858Z\"}`\n\tpostID := CreatePost(feedID1, rootPostID, cat1, metadata)\n\tfeed := mustGetFeed(feedID1)\n\tpost := feed.MustGetPost(postID)\n\n\tif postID != 1 {\n\t\tt.Fatalf(\"expected postID: 1, got %q.\", postID)\n\t}\n\n\tif post.category != cat1 {\n\t\tt.Fatalf(\"expected categoryID: %q, got %q.\", cat1, post.category)\n\t}\n}\n\nfunc toPostIDsStr(posts []*Post) string {\n\tvar postIDs []string\n\tfor _, post := range posts {\n\t\tpostIDs = append(postIDs, post.id.String())\n\t}\n\n\tpostIDsStr := strings.Join(postIDs, \",\")\n\treturn postIDsStr\n}\n\nfunc testGetPosts(t *testing.T) {\n\tuser := std.Address(\"user\")\n\tstd.TestSetOrigCaller(user)\n\n\tfeedID := CreateFeed(\"teritori10\")\n\tfeed := mustGetFeed(feedID)\n\n\tCreatePost(feedID, rootPostID, cat1, \"post1\")\n\tCreatePost(feedID, rootPostID, cat1, \"post2\")\n\tCreatePost(feedID, rootPostID, cat1, \"post3\")\n\tCreatePost(feedID, rootPostID, cat1, \"post4\")\n\tCreatePost(feedID, rootPostID, cat1, \"post5\")\n\tpostIDToFlagged := CreatePost(feedID, rootPostID, cat1, \"post6\")\n\tpostIDToHide := CreatePost(feedID, rootPostID, cat1, \"post7\")\n\tCreatePost(feedID, rootPostID, cat1, \"post8\")\n\n\tvar posts []*Post\n\tvar postIDsStr string\n\n\t// Query last 3 posts\n\tposts = getPosts(feed, 0, \"\", \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,7,6\" {\n\t\tt.Fatalf(\"expected posts order: 8,7,6. Got: %s\", postIDsStr)\n\t}\n\n\t// Query page 2\n\tposts = getPosts(feed, 0, \"\", \"\", []uint64{}, 3, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\tif postIDsStr != \"5,4,3\" {\n\t\tt.Fatalf(\"expected posts order: 5,4,3. Got: %s\", postIDsStr)\n\t}\n\n\t// Exclude hidden post\n\tHidePostForMe(feed.id, postIDToHide)\n\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,6,5\" {\n\t\tt.Fatalf(\"expected posts order: 8,6,5. Got: %s\", postIDsStr)\n\t}\n\n\t// Exclude flagged post\n\tFlagPost(feed.id, postIDToFlagged)\n\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,5,4\" {\n\t\tt.Fatalf(\"expected posts order: 8,5,4. Got: %s\", postIDsStr)\n\t}\n\n\t// Pagination with hidden/flagged posts\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 3, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"3,2,1\" {\n\t\tt.Fatalf(\"expected posts order: 3,2,1. Got: %s\", postIDsStr)\n\t}\n\n\t// Query out of range\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 6, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"\" {\n\t\tt.Fatalf(\"expected posts order: ''. Got: %s\", postIDsStr)\n\t}\n}\n\nfunc testReactPost(t *testing.T) {\n\tfeed := getFeed1()\n\tpost := getPost1()\n\n\ticon := \"🥰\"\n\tReactPost(feed.id, post.id, icon, true)\n\n\t// Set reaction\n\treactionCount_, ok := post.reactions.Get(\"🥰\")\n\tif !ok {\n\t\tt.Fatalf(\"expected 🥰 exists\")\n\t}\n\n\treactionCount := reactionCount_.(int)\n\tif reactionCount != 1 {\n\t\tt.Fatalf(\"expected reactionCount: 1, got %q.\", reactionCount)\n\t}\n\n\t// Unset reaction\n\tReactPost(feed.id, post.id, icon, false)\n\t_, exist := post.reactions.Get(\"🥰\")\n\tif exist {\n\t\tt.Fatalf(\"expected 🥰 not exist\")\n\t}\n}\n\nfunc testCreateAndDeleteComment(t *testing.T) {\n\tfeed1 := getFeed1()\n\tpost1 := getPost1()\n\n\tmetadata := `empty_meta_data`\n\n\tcommentID1 := CreatePost(feed1.id, post1.id, cat1, metadata)\n\tcommentID2 := CreatePost(feed1.id, post1.id, cat1, metadata)\n\tcomment2 := feed1.MustGetPost(commentID2)\n\n\tif comment2.id != 3 { // 1 post + 2 comments = 3\n\t\tt.Fatalf(\"expected comment postID: 3, got %q.\", comment2.id)\n\t}\n\n\tif comment2.parentID != post1.id {\n\t\tt.Fatalf(\"expected comment parentID: %q, got %q.\", post1.id, comment2.parentID)\n\t}\n\n\t// Check comment count on parent\n\tif post1.commentsCount != 2 {\n\t\tt.Fatalf(\"expected comments count: 2, got %d.\", post1.commentsCount)\n\t}\n\n\t// Get comments\n\tcomments := GetComments(feed1.id, post1.id, 0, 10)\n\tcommentsParsed := ujson.ParseSlice(comments)\n\n\tif len(commentsParsed) != 2 {\n\t\tt.Fatalf(\"expected encoded comments: 2, got %q.\", commentsParsed)\n\t}\n\n\t// Delete 1 comment\n\tDeletePost(feed1.id, comment2.id)\n\tcomments = GetComments(feed1.id, post1.id, 0, 10)\n\tcommentsParsed = ujson.ParseSlice(comments)\n\n\tif len(commentsParsed) != 1 {\n\t\tt.Fatalf(\"expected encoded comments: 1, got %q.\", commentsParsed)\n\t}\n\n\t// Check comment count on parent\n\tif post1.commentsCount != 1 {\n\t\tt.Fatalf(\"expected comments count: 1, got %d.\", post1.commentsCount)\n\t}\n}\n\nfunc countPosts(feedID FeedID, categories []uint64, limit uint8) int {\n\toffset := uint64(0)\n\n\tpostsStr := GetPosts(feedID, 0, \"\", categories, offset, limit)\n\tif postsStr == \"[]\" {\n\t\treturn 0\n\t}\n\n\tparsedPosts := ujson.ParseSlice(postsStr)\n\tpostsCount := len(parsedPosts)\n\treturn postsCount\n}\n\nfunc countPostsByUser(feedID FeedID, user string) int {\n\toffset := uint64(0)\n\tlimit := uint8(10)\n\n\tpostsStr := GetPosts(feedID, 0, user, []uint64{}, offset, limit)\n\tif postsStr == \"[]\" {\n\t\treturn 0\n\t}\n\n\tparsedPosts := ujson.ParseSlice(postsStr)\n\tpostsCount := len(parsedPosts)\n\treturn postsCount\n}\n\nfunc testFilterByCategories(t *testing.T) {\n\t// // Re-add reaction to test post list\n\t// ReactPost(1, postID, \"🥰\", true)\n\t// ReactPost(1, postID, \"😇\", true)\n\n\tfilter_cat1 := []uint64{1}\n\tfilter_cat1_2 := []uint64{1, 2}\n\tfilter_cat9 := []uint64{9}\n\tfilter_cat1_2_9 := []uint64{1, 2, 9}\n\n\tfeedID2 := CreateFeed(\"teritori2\")\n\tfeed2 := mustGetFeed(feedID2)\n\n\t// Create 2 posts on root with cat1\n\tpostID1 := CreatePost(feed2.id, rootPostID, cat1, \"metadata\")\n\tpostID2 := CreatePost(feed2.id, rootPostID, cat1, \"metadata\")\n\n\t// Create 1 posts on root with cat2\n\tpostID3 := CreatePost(feed2.id, rootPostID, cat2, \"metadata\")\n\n\t// Create comments on post 1\n\tcommentPostID1 := CreatePost(feed2.id, postID1, cat1, \"metadata\")\n\n\t// cat1: Should return max = limit\n\tif count := countPosts(feed2.id, filter_cat1, 1); count != 1 {\n\t\tt.Fatalf(\"expected posts count: 1, got %q.\", count)\n\t}\n\n\t// cat1: Should return max = total\n\tif count := countPosts(feed2.id, filter_cat1, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// cat 1 + 2: Should return max = limit\n\tif count := countPosts(feed2.id, filter_cat1_2, 2); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// cat 1 + 2: Should return max = total on both\n\tif count := countPosts(feed2.id, filter_cat1_2, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// cat 1, 2, 9: Should return total of 1, 2\n\tif count := countPosts(feed2.id, filter_cat1_2_9, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// cat 9: Should return 0\n\tif count := countPosts(feed2.id, filter_cat9, 10); count != 0 {\n\t\tt.Fatalf(\"expected posts count: 0, got %q.\", count)\n\t}\n\n\t// cat all: should return all\n\tif count := countPosts(feed2.id, filter_all, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// add comments should not impact the results\n\tCreatePost(feed2.id, postID1, cat1, \"metadata\")\n\tCreatePost(feed2.id, postID2, cat1, \"metadata\")\n\n\tif count := countPosts(feed2.id, filter_all, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// delete a post should affect the result\n\tDeletePost(feed2.id, postID1)\n\n\tif count := countPosts(feed2.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n}\n\nfunc testTipPost(t *testing.T) {\n\tcreator := testutils.TestAddress(\"creator\")\n\tstd.TestIssueCoins(creator, std.Coins{{\"ugnot\", 100_000_000}})\n\n\t// NOTE: Dont know why the address should be this to be able to call banker (= std.GetCallerAt(1))\n\ttipper := testutils.TestAddress(\"tipper\")\n\tstd.TestIssueCoins(tipper, std.Coins{{\"ugnot\", 50_000_000}})\n\n\tbanker := std.GetBanker(std.BankerTypeReadonly)\n\n\t// Check Original coins of creator/tipper\n\tif coins := banker.GetCoins(creator); coins[0].Amount != 100_000_000 {\n\t\tt.Fatalf(\"expected creator coin count: 100_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\tif coins := banker.GetCoins(tipper); coins[0].Amount != 50_000_000 {\n\t\tt.Fatalf(\"expected tipper coin count: 50_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\t// Creator creates feed, post\n\tstd.TestSetOrigCaller(creator)\n\n\tfeedID3 := CreateFeed(\"teritori3\")\n\tfeed3 := mustGetFeed(feedID3)\n\n\tpostID1 := CreatePost(feed3.id, rootPostID, cat1, \"metadata\")\n\tpost1 := feed3.MustGetPost(postID1)\n\n\t// Tiper tips the ppst\n\tstd.TestSetOrigCaller(tipper)\n\tstd.TestSetOrigSend(std.Coins{{\"ugnot\", 1_000_000}}, nil)\n\tTipPost(feed3.id, post1.id)\n\n\t// Coin must be increased for creator\n\tif coins := banker.GetCoins(creator); coins[0].Amount != 101_000_000 {\n\t\tt.Fatalf(\"expected creator coin after beging tipped: 101_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\t// Total tip amount should increased\n\tif post1.tipAmount != 1_000_000 {\n\t\tt.Fatalf(\"expected total tipAmount: 1_000_000, got %d.\", post1.tipAmount)\n\t}\n\n\t// Add more tip should update this total\n\tstd.TestSetOrigSend(std.Coins{{\"ugnot\", 2_000_000}}, nil)\n\tTipPost(feed3.id, post1.id)\n\n\tif post1.tipAmount != 3_000_000 {\n\t\tt.Fatalf(\"expected total tipAmount: 3_000_000, got %d.\", post1.tipAmount)\n\t}\n}\n\nfunc testFlagPost(t *testing.T) {\n\tflagger := testutils.TestAddress(\"flagger\")\n\n\tfeedID9 := CreateFeed(\"teritori9\")\n\tfeed9 := mustGetFeed(feedID9)\n\n\tCreatePost(feed9.id, rootPostID, cat1, \"metadata1\")\n\tpid := CreatePost(feed9.id, rootPostID, cat1, \"metadata1\")\n\n\t// Flag post\n\tstd.TestSetOrigCaller(flagger)\n\tFlagPost(feed9.id, pid)\n\n\t// Another user flags\n\tanother := testutils.TestAddress(\"another\")\n\tstd.TestSetOrigCaller(another)\n\tFlagPost(feed9.id, pid)\n\n\tflaggedPostsStr := GetFlaggedPosts(feed9.id, 0, 10)\n\tparsed := ujson.ParseSlice(flaggedPostsStr)\n\tif flaggedPostsCount := len(parsed); flaggedPostsCount != 1 {\n\t\tt.Fatalf(\"expected flagged posts: 1, got %d.\", flaggedPostsCount)\n\t}\n}\n\nfunc testFilterUser(t *testing.T) {\n\tuser1 := testutils.TestAddress(\"user1\")\n\tuser2 := testutils.TestAddress(\"user2\")\n\n\t// User1 create 2 posts\n\tstd.TestSetOrigCaller(user1)\n\n\tfeedID4 := CreateFeed(\"teritori4\")\n\tfeed4 := mustGetFeed(feedID4)\n\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata2\": \"value\"}`)\n\n\t// User2 create 1 post\n\tstd.TestSetOrigCaller(user2)\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\n\tif count := countPostsByUser(feed4.id, user1.String()); count != 2 {\n\t\tt.Fatalf(\"expected total posts by user1: 2, got %d.\", count)\n\t}\n\n\tif count := countPostsByUser(feed4.id, user2.String()); count != 1 {\n\t\tt.Fatalf(\"expected total posts by user2: 1, got %d.\", count)\n\t}\n\n\tif count := countPostsByUser(feed4.id, \"\"); count != 3 {\n\t\tt.Fatalf(\"expected total posts: 3, got %d.\", count)\n\t}\n}\n\nfunc testHidePostForMe(t *testing.T) {\n\tuser := std.Address(\"user\")\n\tstd.TestSetOrigCaller(user)\n\n\tfeedID8 := CreateFeed(\"teritor8\")\n\tfeed8 := mustGetFeed(feedID8)\n\n\tpostIDToHide := CreatePost(feed8.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\tpostID := CreatePost(feed8.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// Hide a post for me\n\tHidePostForMe(feed8.id, postIDToHide)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 1 {\n\t\tt.Fatalf(\"expected posts count after hidding: 1, got %q.\", count)\n\t}\n\n\t// Query from another user should return full list\n\tanother := std.Address(\"another\")\n\tstd.TestSetOrigCaller(another)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count from another: 2, got %q.\", count)\n\t}\n\n\t// UnHide a post for me\n\tstd.TestSetOrigCaller(user)\n\tUnHidePostForMe(feed8.id, postIDToHide)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count after unhidding: 2, got %q.\", count)\n\t}\n}\n\nfunc testMigrateFeedData(t *testing.T) string {\n\tfeedID := feedsV7.CreateFeed(\"teritor11\")\n\n\t// Post to test\n\tpostID := feedsV7.CreatePost(feedID, feedsV7.PostID(0), 2, `{\"metadata\": \"value\"}`)\n\tfeedsV7.ReactPost(feedID, postID, \"🇬🇸\", true)\n\n\t// Add comment to post\n\tcommentID := feedsV7.CreatePost(feedID, postID, 2, `{\"comment1\": \"value\"}`)\n\tfeedsV7.ReactPost(feedID, commentID, \"🇬🇸\", true)\n\n\t// // Post with json metadata\n\tfeedsV7.CreatePost(feedID, feedsV7.PostID(0), 2, `{'a':1}`)\n\n\t// Expect: should convert feed data to JSON successfully without error\n\tdataJSON := feedsV7.ExportFeedData(feedID)\n\tif dataJSON == \"\" {\n\t\tt.Fatalf(\"expected feed data exported successfully\")\n\t}\n\n\t// Import data =====================================\n\tImportFeedData(FeedID(uint64(feedID)), dataJSON)\n\n\t// Test public func\n\t// MigrateFromPreviousFeed(feedID)\n}\n\nfunc Test(t *testing.T) {\n\ttestCreateFeed(t)\n\n\ttestCreatePost(t)\n\n\ttestGetPosts(t)\n\n\ttestReactPost(t)\n\n\ttestCreateAndDeleteComment(t)\n\n\ttestFilterByCategories(t)\n\n\ttestTipPost(t)\n\n\ttestFilterUser(t)\n\n\ttestFlagPost(t)\n\n\ttestHidePostForMe(t)\n\n\ttestMigrateFeedData(t)\n}\n"
+            "Body": "package social_feeds\n\nimport (\n\t\"encoding/base64\"\n\t\"fmt\"\n\t\"std\"\n\t\"strconv\"\n\t\"strings\"\n\t\"testing\"\n\n\t\"gno.land/p/demo/avl\"\n\tujson \"gno.land/p/demo/teritori/ujson\"\n\t\"gno.land/p/demo/testutils\"\n\t\"gno.land/r/demo/boards\"\n\t// Fake previous version for testing\n\tfeedsV7 \"gno.land/r/demo/teritori/social_feeds\"\n\t\"gno.land/r/demo/users\"\n)\n\nvar (\n\trootPostID = PostID(0)\n\tpostID1    = PostID(1)\n\tfeedID1    = FeedID(1)\n\tcat1       = uint64(1)\n\tcat2       = uint64(2)\n\tuser       = testutils.TestAddress(\"user\")\n\tfilter_all = []uint64{}\n)\n\nfunc getFeed1() *Feed {\n\treturn mustGetFeed(feedID1)\n}\n\nfunc getPost1() *Post {\n\tfeed1 := getFeed1()\n\tpost1 := feed1.MustGetPost(postID1)\n\treturn post1\n}\n\nfunc testCreateFeed(t *testing.T) {\n\tfeedID := CreateFeed(\"teritori1\")\n\tfeed := mustGetFeed(feedID)\n\n\tif feedID != 1 {\n\t\tt.Fatalf(\"expected feedID: 1, got %q.\", feedID)\n\t}\n\n\tif feed.name != \"teritori1\" {\n\t\tt.Fatalf(\"expected feedName: teritori1, got %q.\", feed.name)\n\t}\n}\n\nfunc testCreatePost(t *testing.T) {\n\tmetadata := `{\"gifs\": [], \"files\": [], \"title\": \"\", \"message\": \"testouille\", \"hashtags\": [], \"mentions\": [], \"createdAt\": \"2023-03-29T12:19:04.858Z\", \"updatedAt\": \"2023-03-29T12:19:04.858Z\"}`\n\tpostID := CreatePost(feedID1, rootPostID, cat1, metadata)\n\tfeed := mustGetFeed(feedID1)\n\tpost := feed.MustGetPost(postID)\n\n\tif postID != 1 {\n\t\tt.Fatalf(\"expected postID: 1, got %q.\", postID)\n\t}\n\n\tif post.category != cat1 {\n\t\tt.Fatalf(\"expected categoryID: %q, got %q.\", cat1, post.category)\n\t}\n}\n\nfunc toPostIDsStr(posts []*Post) string {\n\tvar postIDs []string\n\tfor _, post := range posts {\n\t\tpostIDs = append(postIDs, post.id.String())\n\t}\n\n\tpostIDsStr := strings.Join(postIDs, \",\")\n\treturn postIDsStr\n}\n\nfunc testGetPosts(t *testing.T) {\n\tuser := std.Address(\"user\")\n\tstd.TestSetOriginCaller(user)\n\n\tfeedID := CreateFeed(\"teritori10\")\n\tfeed := mustGetFeed(feedID)\n\n\tCreatePost(feedID, rootPostID, cat1, \"post1\")\n\tCreatePost(feedID, rootPostID, cat1, \"post2\")\n\tCreatePost(feedID, rootPostID, cat1, \"post3\")\n\tCreatePost(feedID, rootPostID, cat1, \"post4\")\n\tCreatePost(feedID, rootPostID, cat1, \"post5\")\n\tpostIDToFlagged := CreatePost(feedID, rootPostID, cat1, \"post6\")\n\tpostIDToHide := CreatePost(feedID, rootPostID, cat1, \"post7\")\n\tCreatePost(feedID, rootPostID, cat1, \"post8\")\n\n\tvar posts []*Post\n\tvar postIDsStr string\n\n\t// Query last 3 posts\n\tposts = getPosts(feed, 0, \"\", \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,7,6\" {\n\t\tt.Fatalf(\"expected posts order: 8,7,6. Got: %s\", postIDsStr)\n\t}\n\n\t// Query page 2\n\tposts = getPosts(feed, 0, \"\", \"\", []uint64{}, 3, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\tif postIDsStr != \"5,4,3\" {\n\t\tt.Fatalf(\"expected posts order: 5,4,3. Got: %s\", postIDsStr)\n\t}\n\n\t// Exclude hidden post\n\tHidePostForMe(feed.id, postIDToHide)\n\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,6,5\" {\n\t\tt.Fatalf(\"expected posts order: 8,6,5. Got: %s\", postIDsStr)\n\t}\n\n\t// Exclude flagged post\n\tFlagPost(feed.id, postIDToFlagged)\n\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,5,4\" {\n\t\tt.Fatalf(\"expected posts order: 8,5,4. Got: %s\", postIDsStr)\n\t}\n\n\t// Pagination with hidden/flagged posts\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 3, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"3,2,1\" {\n\t\tt.Fatalf(\"expected posts order: 3,2,1. Got: %s\", postIDsStr)\n\t}\n\n\t// Query out of range\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 6, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"\" {\n\t\tt.Fatalf(\"expected posts order: ''. Got: %s\", postIDsStr)\n\t}\n}\n\nfunc testReactPost(t *testing.T) {\n\tfeed := getFeed1()\n\tpost := getPost1()\n\n\ticon := \"🥰\"\n\tReactPost(feed.id, post.id, icon, true)\n\n\t// Set reaction\n\treactionCount_, ok := post.reactions.Get(\"🥰\")\n\tif !ok {\n\t\tt.Fatalf(\"expected 🥰 exists\")\n\t}\n\n\treactionCount := reactionCount_.(int)\n\tif reactionCount != 1 {\n\t\tt.Fatalf(\"expected reactionCount: 1, got %q.\", reactionCount)\n\t}\n\n\t// Unset reaction\n\tReactPost(feed.id, post.id, icon, false)\n\t_, exist := post.reactions.Get(\"🥰\")\n\tif exist {\n\t\tt.Fatalf(\"expected 🥰 not exist\")\n\t}\n}\n\nfunc testCreateAndDeleteComment(t *testing.T) {\n\tfeed1 := getFeed1()\n\tpost1 := getPost1()\n\n\tmetadata := `empty_meta_data`\n\n\tcommentID1 := CreatePost(feed1.id, post1.id, cat1, metadata)\n\tcommentID2 := CreatePost(feed1.id, post1.id, cat1, metadata)\n\tcomment2 := feed1.MustGetPost(commentID2)\n\n\tif comment2.id != 3 { // 1 post + 2 comments = 3\n\t\tt.Fatalf(\"expected comment postID: 3, got %q.\", comment2.id)\n\t}\n\n\tif comment2.parentID != post1.id {\n\t\tt.Fatalf(\"expected comment parentID: %q, got %q.\", post1.id, comment2.parentID)\n\t}\n\n\t// Check comment count on parent\n\tif post1.commentsCount != 2 {\n\t\tt.Fatalf(\"expected comments count: 2, got %d.\", post1.commentsCount)\n\t}\n\n\t// Get comments\n\tcomments := GetComments(feed1.id, post1.id, 0, 10)\n\tcommentsParsed := ujson.ParseSlice(comments)\n\n\tif len(commentsParsed) != 2 {\n\t\tt.Fatalf(\"expected encoded comments: 2, got %q.\", commentsParsed)\n\t}\n\n\t// Delete 1 comment\n\tDeletePost(feed1.id, comment2.id)\n\tcomments = GetComments(feed1.id, post1.id, 0, 10)\n\tcommentsParsed = ujson.ParseSlice(comments)\n\n\tif len(commentsParsed) != 1 {\n\t\tt.Fatalf(\"expected encoded comments: 1, got %q.\", commentsParsed)\n\t}\n\n\t// Check comment count on parent\n\tif post1.commentsCount != 1 {\n\t\tt.Fatalf(\"expected comments count: 1, got %d.\", post1.commentsCount)\n\t}\n}\n\nfunc countPosts(feedID FeedID, categories []uint64, limit uint8) int {\n\toffset := uint64(0)\n\n\tpostsStr := GetPosts(feedID, 0, \"\", categories, offset, limit)\n\tif postsStr == \"[]\" {\n\t\treturn 0\n\t}\n\n\tparsedPosts := ujson.ParseSlice(postsStr)\n\tpostsCount := len(parsedPosts)\n\treturn postsCount\n}\n\nfunc countPostsByUser(feedID FeedID, user string) int {\n\toffset := uint64(0)\n\tlimit := uint8(10)\n\n\tpostsStr := GetPosts(feedID, 0, user, []uint64{}, offset, limit)\n\tif postsStr == \"[]\" {\n\t\treturn 0\n\t}\n\n\tparsedPosts := ujson.ParseSlice(postsStr)\n\tpostsCount := len(parsedPosts)\n\treturn postsCount\n}\n\nfunc testFilterByCategories(t *testing.T) {\n\t// // Re-add reaction to test post list\n\t// ReactPost(1, postID, \"🥰\", true)\n\t// ReactPost(1, postID, \"😇\", true)\n\n\tfilter_cat1 := []uint64{1}\n\tfilter_cat1_2 := []uint64{1, 2}\n\tfilter_cat9 := []uint64{9}\n\tfilter_cat1_2_9 := []uint64{1, 2, 9}\n\n\tfeedID2 := CreateFeed(\"teritori2\")\n\tfeed2 := mustGetFeed(feedID2)\n\n\t// Create 2 posts on root with cat1\n\tpostID1 := CreatePost(feed2.id, rootPostID, cat1, \"metadata\")\n\tpostID2 := CreatePost(feed2.id, rootPostID, cat1, \"metadata\")\n\n\t// Create 1 posts on root with cat2\n\tpostID3 := CreatePost(feed2.id, rootPostID, cat2, \"metadata\")\n\n\t// Create comments on post 1\n\tcommentPostID1 := CreatePost(feed2.id, postID1, cat1, \"metadata\")\n\n\t// cat1: Should return max = limit\n\tif count := countPosts(feed2.id, filter_cat1, 1); count != 1 {\n\t\tt.Fatalf(\"expected posts count: 1, got %q.\", count)\n\t}\n\n\t// cat1: Should return max = total\n\tif count := countPosts(feed2.id, filter_cat1, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// cat 1 + 2: Should return max = limit\n\tif count := countPosts(feed2.id, filter_cat1_2, 2); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// cat 1 + 2: Should return max = total on both\n\tif count := countPosts(feed2.id, filter_cat1_2, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// cat 1, 2, 9: Should return total of 1, 2\n\tif count := countPosts(feed2.id, filter_cat1_2_9, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// cat 9: Should return 0\n\tif count := countPosts(feed2.id, filter_cat9, 10); count != 0 {\n\t\tt.Fatalf(\"expected posts count: 0, got %q.\", count)\n\t}\n\n\t// cat all: should return all\n\tif count := countPosts(feed2.id, filter_all, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// add comments should not impact the results\n\tCreatePost(feed2.id, postID1, cat1, \"metadata\")\n\tCreatePost(feed2.id, postID2, cat1, \"metadata\")\n\n\tif count := countPosts(feed2.id, filter_all, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// delete a post should affect the result\n\tDeletePost(feed2.id, postID1)\n\n\tif count := countPosts(feed2.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n}\n\nfunc testTipPost(t *testing.T) {\n\tcreator := testutils.TestAddress(\"creator\")\n\tstd.TestIssueCoins(creator, std.Coins{{\"ugnot\", 100_000_000}})\n\n\t// NOTE: Dont know why the address should be this to be able to call banker (= std.CallerAt(1))\n\ttipper := testutils.TestAddress(\"tipper\")\n\tstd.TestIssueCoins(tipper, std.Coins{{\"ugnot\", 50_000_000}})\n\n\tbanker := std.NewBanker(std.BankerTypeReadonly)\n\n\t// Check Original coins of creator/tipper\n\tif coins := banker.GetCoins(creator); coins[0].Amount != 100_000_000 {\n\t\tt.Fatalf(\"expected creator coin count: 100_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\tif coins := banker.GetCoins(tipper); coins[0].Amount != 50_000_000 {\n\t\tt.Fatalf(\"expected tipper coin count: 50_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\t// Creator creates feed, post\n\tstd.TestSetOriginCaller(creator)\n\n\tfeedID3 := CreateFeed(\"teritori3\")\n\tfeed3 := mustGetFeed(feedID3)\n\n\tpostID1 := CreatePost(feed3.id, rootPostID, cat1, \"metadata\")\n\tpost1 := feed3.MustGetPost(postID1)\n\n\t// Tiper tips the ppst\n\tstd.TestSetOriginCaller(tipper)\n\tstd.TestSetOriginSend(std.Coins{{\"ugnot\", 1_000_000}}, nil)\n\tTipPost(feed3.id, post1.id)\n\n\t// Coin must be increased for creator\n\tif coins := banker.GetCoins(creator); coins[0].Amount != 101_000_000 {\n\t\tt.Fatalf(\"expected creator coin after beging tipped: 101_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\t// Total tip amount should increased\n\tif post1.tipAmount != 1_000_000 {\n\t\tt.Fatalf(\"expected total tipAmount: 1_000_000, got %d.\", post1.tipAmount)\n\t}\n\n\t// Add more tip should update this total\n\tstd.TestSetOriginSend(std.Coins{{\"ugnot\", 2_000_000}}, nil)\n\tTipPost(feed3.id, post1.id)\n\n\tif post1.tipAmount != 3_000_000 {\n\t\tt.Fatalf(\"expected total tipAmount: 3_000_000, got %d.\", post1.tipAmount)\n\t}\n}\n\nfunc testFlagPost(t *testing.T) {\n\tflagger := testutils.TestAddress(\"flagger\")\n\n\tfeedID9 := CreateFeed(\"teritori9\")\n\tfeed9 := mustGetFeed(feedID9)\n\n\tCreatePost(feed9.id, rootPostID, cat1, \"metadata1\")\n\tpid := CreatePost(feed9.id, rootPostID, cat1, \"metadata1\")\n\n\t// Flag post\n\tstd.TestSetOriginCaller(flagger)\n\tFlagPost(feed9.id, pid)\n\n\t// Another user flags\n\tanother := testutils.TestAddress(\"another\")\n\tstd.TestSetOriginCaller(another)\n\tFlagPost(feed9.id, pid)\n\n\tflaggedPostsStr := GetFlaggedPosts(feed9.id, 0, 10)\n\tparsed := ujson.ParseSlice(flaggedPostsStr)\n\tif flaggedPostsCount := len(parsed); flaggedPostsCount != 1 {\n\t\tt.Fatalf(\"expected flagged posts: 1, got %d.\", flaggedPostsCount)\n\t}\n}\n\nfunc testFilterUser(t *testing.T) {\n\tuser1 := testutils.TestAddress(\"user1\")\n\tuser2 := testutils.TestAddress(\"user2\")\n\n\t// User1 create 2 posts\n\tstd.TestSetOriginCaller(user1)\n\n\tfeedID4 := CreateFeed(\"teritori4\")\n\tfeed4 := mustGetFeed(feedID4)\n\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata2\": \"value\"}`)\n\n\t// User2 create 1 post\n\tstd.TestSetOriginCaller(user2)\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\n\tif count := countPostsByUser(feed4.id, user1.String()); count != 2 {\n\t\tt.Fatalf(\"expected total posts by user1: 2, got %d.\", count)\n\t}\n\n\tif count := countPostsByUser(feed4.id, user2.String()); count != 1 {\n\t\tt.Fatalf(\"expected total posts by user2: 1, got %d.\", count)\n\t}\n\n\tif count := countPostsByUser(feed4.id, \"\"); count != 3 {\n\t\tt.Fatalf(\"expected total posts: 3, got %d.\", count)\n\t}\n}\n\nfunc testHidePostForMe(t *testing.T) {\n\tuser := std.Address(\"user\")\n\tstd.TestSetOriginCaller(user)\n\n\tfeedID8 := CreateFeed(\"teritor8\")\n\tfeed8 := mustGetFeed(feedID8)\n\n\tpostIDToHide := CreatePost(feed8.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\tpostID := CreatePost(feed8.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// Hide a post for me\n\tHidePostForMe(feed8.id, postIDToHide)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 1 {\n\t\tt.Fatalf(\"expected posts count after hidding: 1, got %q.\", count)\n\t}\n\n\t// Query from another user should return full list\n\tanother := std.Address(\"another\")\n\tstd.TestSetOriginCaller(another)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count from another: 2, got %q.\", count)\n\t}\n\n\t// UnHide a post for me\n\tstd.TestSetOriginCaller(user)\n\tUnHidePostForMe(feed8.id, postIDToHide)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count after unhidding: 2, got %q.\", count)\n\t}\n}\n\nfunc testMigrateFeedData(t *testing.T) string {\n\tfeedID := feedsV7.CreateFeed(\"teritor11\")\n\n\t// Post to test\n\tpostID := feedsV7.CreatePost(feedID, feedsV7.PostID(0), 2, `{\"metadata\": \"value\"}`)\n\tfeedsV7.ReactPost(feedID, postID, \"🇬🇸\", true)\n\n\t// Add comment to post\n\tcommentID := feedsV7.CreatePost(feedID, postID, 2, `{\"comment1\": \"value\"}`)\n\tfeedsV7.ReactPost(feedID, commentID, \"🇬🇸\", true)\n\n\t// // Post with json metadata\n\tfeedsV7.CreatePost(feedID, feedsV7.PostID(0), 2, `{'a':1}`)\n\n\t// Expect: should convert feed data to JSON successfully without error\n\tdataJSON := feedsV7.ExportFeedData(feedID)\n\tif dataJSON == \"\" {\n\t\tt.Fatalf(\"expected feed data exported successfully\")\n\t}\n\n\t// Import data =====================================\n\tImportFeedData(FeedID(uint64(feedID)), dataJSON)\n\n\t// Test public func\n\t// MigrateFromPreviousFeed(feedID)\n}\n\nfunc Test(t *testing.T) {\n\ttestCreateFeed(t)\n\n\ttestCreatePost(t)\n\n\ttestGetPosts(t)\n\n\ttestReactPost(t)\n\n\ttestCreateAndDeleteComment(t)\n\n\ttestFilterByCategories(t)\n\n\ttestTipPost(t)\n\n\ttestFilterUser(t)\n\n\ttestFlagPost(t)\n\n\ttestHidePostForMe(t)\n\n\ttestMigrateFeedData(t)\n}\n"
           },
           {
             "Name": "flags.gno",
@@ -66,11 +66,11 @@ import (
           },
           {
             "Name": "post.gno",
-            "Body": "package social_feeds\n\nimport (\n\t\"std\"\n\t\"strconv\"\n\t\"time\"\n\n\t\"gno.land/p/demo/avl\"\n\tujson \"gno.land/p/demo/teritori/ujson\"\n)\n\ntype PostID uint64\n\nfunc (pid PostID) String() string {\n\treturn strconv.Itoa(int(pid))\n}\n\nfunc (pid *PostID) FromJSON(ast *ujson.JSONASTNode) {\n\tval, err := strconv.Atoi(ast.Value)\n\tif err != nil {\n\t\tpanic(err)\n\t}\n\t*pid = PostID(val)\n}\n\nfunc (pid PostID) ToJSON() string {\n\treturn strconv.Itoa(int(pid))\n}\n\ntype Reaction struct {\n\ticon  string\n\tcount uint64\n}\n\nvar Categories []string = []string{\n\t\"Reaction\",\n\t\"Comment\",\n\t\"Normal\",\n\t\"Article\",\n\t\"Picture\",\n\t\"Audio\",\n\t\"Video\",\n}\n\ntype Post struct {\n\tid            PostID\n\tparentID      PostID\n\tfeedID        FeedID\n\tcategory      uint64\n\tmetadata      string\n\treactions     avl.Tree // icon -> count\n\tcomments      avl.Tree // Post.id -> *Post\n\tcreator       std.Address\n\ttipAmount     uint64\n\tdeleted       bool\n\tcommentsCount uint64\n\n\tcreatedAt int64\n\tupdatedAt int64\n\tdeletedAt int64\n}\n\nfunc newPost(feed *Feed, id PostID, creator std.Address, parentID PostID, category uint64, metadata string) *Post {\n\treturn &Post{\n\t\tid:        id,\n\t\tparentID:  parentID,\n\t\tfeedID:    feed.id,\n\t\tcategory:  category,\n\t\tmetadata:  metadata,\n\t\treactions: avl.Tree{},\n\t\tcreator:   creator,\n\t\tcreatedAt: time.Now().Unix(),\n\t}\n}\n\nfunc (post *Post) String() string {\n\treturn post.ToJSON()\n}\n\nfunc (post *Post) Update(category uint64, metadata string) {\n\tpost.category = category\n\tpost.metadata = metadata\n\tpost.updatedAt = time.Now().Unix()\n}\n\nfunc (post *Post) Delete() {\n\tpost.deleted = true\n\tpost.deletedAt = time.Now().Unix()\n}\n\nfunc (post *Post) Tip(from std.Address, to std.Address) {\n\treceivedCoins := std.GetOrigSend()\n\tamount := receivedCoins[0].Amount\n\n\tbanker := std.GetBanker(std.BankerTypeOrigSend)\n\t// banker := std.GetBanker(std.BankerTypeRealmSend)\n\tcoinsToSend := std.Coins{std.Coin{Denom: \"ugnot\", Amount: amount}}\n\tpkgaddr := std.GetOrigPkgAddr()\n\n\tbanker.SendCoins(pkgaddr, to, coinsToSend)\n\n\t// Update tip amount\n\tpost.tipAmount += uint64(amount)\n}\n\n// Always remove reaction if count = 0\nfunc (post *Post) React(icon string, up bool) {\n\tcount_, ok := post.reactions.Get(icon)\n\tcount := 0\n\n\tif ok {\n\t\tcount = count_.(int)\n\t}\n\n\tif up {\n\t\tcount++\n\t} else {\n\t\tcount--\n\t}\n\n\tif count <= 0 {\n\t\tpost.reactions.Remove(icon)\n\t} else {\n\t\tpost.reactions.Set(icon, count)\n\t}\n}\n\nfunc (post *Post) Render() string {\n\treturn post.metadata\n}\n\nfunc (post *Post) FromJSON(jsonData string) {\n\tast := ujson.TokenizeAndParse(jsonData)\n\tast.ParseObject([]*ujson.ParseKV{\n\t\t{Key: \"id\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tpid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.id = PostID(pid)\n\t\t}},\n\t\t{Key: \"parentID\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tpid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.parentID = PostID(pid)\n\t\t}},\n\t\t{Key: \"feedID\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tfid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.feedID = FeedID(fid)\n\t\t}},\n\t\t{Key: \"category\", Value: &post.category},\n\t\t{Key: \"metadata\", Value: &post.metadata},\n\t\t{Key: \"reactions\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\treactions := avl.NewTree()\n\t\t\tfor _, child := range node.ObjectChildren {\n\t\t\t\treactionCount := child.Value\n\t\t\t\treactions.Set(child.Key, reactionCount)\n\t\t\t}\n\t\t\tpost.reactions = *reactions\n\t\t}},\n\t\t{Key: \"commentsCount\", Value: &post.commentsCount},\n\t\t{Key: \"creator\", Value: &post.creator},\n\t\t{Key: \"tipAmount\", Value: &post.tipAmount},\n\t\t{Key: \"deleted\", Value: &post.deleted},\n\t\t{Key: \"createdAt\", Value: &post.createdAt},\n\t\t{Key: \"updatedAt\", Value: &post.updatedAt},\n\t\t{Key: \"deletedAt\", Value: &post.deletedAt},\n\t})\n}\n\nfunc (post *Post) ToJSON() string {\n\treactionsKV := []ujson.FormatKV{}\n\tpost.reactions.Iterate(\"\", \"\", func(key string, value interface{}) bool {\n\t\tcount := value.(int)\n\t\tdata := ujson.FormatKV{Key: key, Value: count}\n\t\treactionsKV = append(reactionsKV, data)\n\t\treturn false\n\t})\n\treactions := ujson.FormatObject(reactionsKV)\n\n\tpostJSON := ujson.FormatObject([]ujson.FormatKV{\n\t\t{Key: \"id\", Value: uint64(post.id)},\n\t\t{Key: \"parentID\", Value: uint64(post.parentID)},\n\t\t{Key: \"feedID\", Value: uint64(post.feedID)},\n\t\t{Key: \"category\", Value: post.category},\n\t\t{Key: \"metadata\", Value: post.metadata},\n\t\t{Key: \"reactions\", Value: reactions, Raw: true},\n\t\t{Key: \"creator\", Value: post.creator},\n\t\t{Key: \"tipAmount\", Value: post.tipAmount},\n\t\t{Key: \"deleted\", Value: post.deleted},\n\t\t{Key: \"commentsCount\", Value: post.commentsCount},\n\t\t{Key: \"createdAt\", Value: post.createdAt},\n\t\t{Key: \"updatedAt\", Value: post.updatedAt},\n\t\t{Key: \"deletedAt\", Value: post.deletedAt},\n\t})\n\treturn postJSON\n}\n"
+            "Body": "package social_feeds\n\nimport (\n\t\"std\"\n\t\"strconv\"\n\t\"time\"\n\n\t\"gno.land/p/demo/avl\"\n\tujson \"gno.land/p/demo/teritori/ujson\"\n)\n\ntype PostID uint64\n\nfunc (pid PostID) String() string {\n\treturn strconv.Itoa(int(pid))\n}\n\nfunc (pid *PostID) FromJSON(ast *ujson.JSONASTNode) {\n\tval, err := strconv.Atoi(ast.Value)\n\tif err != nil {\n\t\tpanic(err)\n\t}\n\t*pid = PostID(val)\n}\n\nfunc (pid PostID) ToJSON() string {\n\treturn strconv.Itoa(int(pid))\n}\n\ntype Reaction struct {\n\ticon  string\n\tcount uint64\n}\n\nvar Categories []string = []string{\n\t\"Reaction\",\n\t\"Comment\",\n\t\"Normal\",\n\t\"Article\",\n\t\"Picture\",\n\t\"Audio\",\n\t\"Video\",\n}\n\ntype Post struct {\n\tid            PostID\n\tparentID      PostID\n\tfeedID        FeedID\n\tcategory      uint64\n\tmetadata      string\n\treactions     avl.Tree // icon -> count\n\tcomments      avl.Tree // Post.id -> *Post\n\tcreator       std.Address\n\ttipAmount     uint64\n\tdeleted       bool\n\tcommentsCount uint64\n\n\tcreatedAt int64\n\tupdatedAt int64\n\tdeletedAt int64\n}\n\nfunc newPost(feed *Feed, id PostID, creator std.Address, parentID PostID, category uint64, metadata string) *Post {\n\treturn &Post{\n\t\tid:        id,\n\t\tparentID:  parentID,\n\t\tfeedID:    feed.id,\n\t\tcategory:  category,\n\t\tmetadata:  metadata,\n\t\treactions: avl.Tree{},\n\t\tcreator:   creator,\n\t\tcreatedAt: time.Now().Unix(),\n\t}\n}\n\nfunc (post *Post) String() string {\n\treturn post.ToJSON()\n}\n\nfunc (post *Post) Update(category uint64, metadata string) {\n\tpost.category = category\n\tpost.metadata = metadata\n\tpost.updatedAt = time.Now().Unix()\n}\n\nfunc (post *Post) Delete() {\n\tpost.deleted = true\n\tpost.deletedAt = time.Now().Unix()\n}\n\nfunc (post *Post) Tip(from std.Address, to std.Address) {\n\treceivedCoins := std.OriginSend()\n\tamount := receivedCoins[0].Amount\n\n\tbanker := std.NewBanker(std.BankerTypeOriginSend)\n\t// banker := std.NewBanker(std.BankerTypeRealmSend)\n\tcoinsToSend := std.Coins{std.Coin{Denom: \"ugnot\", Amount: amount}}\n\tpkgaddr := std.OriginPkgAddress()\n\n\tbanker.SendCoins(pkgaddr, to, coinsToSend)\n\n\t// Update tip amount\n\tpost.tipAmount += uint64(amount)\n}\n\n// Always remove reaction if count = 0\nfunc (post *Post) React(icon string, up bool) {\n\tcount_, ok := post.reactions.Get(icon)\n\tcount := 0\n\n\tif ok {\n\t\tcount = count_.(int)\n\t}\n\n\tif up {\n\t\tcount++\n\t} else {\n\t\tcount--\n\t}\n\n\tif count <= 0 {\n\t\tpost.reactions.Remove(icon)\n\t} else {\n\t\tpost.reactions.Set(icon, count)\n\t}\n}\n\nfunc (post *Post) Render() string {\n\treturn post.metadata\n}\n\nfunc (post *Post) FromJSON(jsonData string) {\n\tast := ujson.TokenizeAndParse(jsonData)\n\tast.ParseObject([]*ujson.ParseKV{\n\t\t{Key: \"id\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tpid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.id = PostID(pid)\n\t\t}},\n\t\t{Key: \"parentID\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tpid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.parentID = PostID(pid)\n\t\t}},\n\t\t{Key: \"feedID\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tfid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.feedID = FeedID(fid)\n\t\t}},\n\t\t{Key: \"category\", Value: &post.category},\n\t\t{Key: \"metadata\", Value: &post.metadata},\n\t\t{Key: \"reactions\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\treactions := avl.NewTree()\n\t\t\tfor _, child := range node.ObjectChildren {\n\t\t\t\treactionCount := child.Value\n\t\t\t\treactions.Set(child.Key, reactionCount)\n\t\t\t}\n\t\t\tpost.reactions = *reactions\n\t\t}},\n\t\t{Key: \"commentsCount\", Value: &post.commentsCount},\n\t\t{Key: \"creator\", Value: &post.creator},\n\t\t{Key: \"tipAmount\", Value: &post.tipAmount},\n\t\t{Key: \"deleted\", Value: &post.deleted},\n\t\t{Key: \"createdAt\", Value: &post.createdAt},\n\t\t{Key: \"updatedAt\", Value: &post.updatedAt},\n\t\t{Key: \"deletedAt\", Value: &post.deletedAt},\n\t})\n}\n\nfunc (post *Post) ToJSON() string {\n\treactionsKV := []ujson.FormatKV{}\n\tpost.reactions.Iterate(\"\", \"\", func(key string, value interface{}) bool {\n\t\tcount := value.(int)\n\t\tdata := ujson.FormatKV{Key: key, Value: count}\n\t\treactionsKV = append(reactionsKV, data)\n\t\treturn false\n\t})\n\treactions := ujson.FormatObject(reactionsKV)\n\n\tpostJSON := ujson.FormatObject([]ujson.FormatKV{\n\t\t{Key: \"id\", Value: uint64(post.id)},\n\t\t{Key: \"parentID\", Value: uint64(post.parentID)},\n\t\t{Key: \"feedID\", Value: uint64(post.feedID)},\n\t\t{Key: \"category\", Value: post.category},\n\t\t{Key: \"metadata\", Value: post.metadata},\n\t\t{Key: \"reactions\", Value: reactions, Raw: true},\n\t\t{Key: \"creator\", Value: post.creator},\n\t\t{Key: \"tipAmount\", Value: post.tipAmount},\n\t\t{Key: \"deleted\", Value: post.deleted},\n\t\t{Key: \"commentsCount\", Value: post.commentsCount},\n\t\t{Key: \"createdAt\", Value: post.createdAt},\n\t\t{Key: \"updatedAt\", Value: post.updatedAt},\n\t\t{Key: \"deletedAt\", Value: post.deletedAt},\n\t})\n\treturn postJSON\n}\n"
           },
           {
             "Name": "public.gno",
-            "Body": "package social_feeds\n\nimport (\n\t\"std\"\n\t\"strconv\"\n\t\"strings\"\n\n\t\"gno.land/p/demo/avl\"\n\t\"gno.land/p/demo/teritori/flags_index\"\n\t\"gno.land/p/demo/ufmt\"\n)\n\n// Only registered user can create a new feed\n// For the flexibility when testing, allow all user to create feed\nfunc CreateFeed(name string) FeedID {\n\tpkgpath := std.CurrentRealmPath()\n\n\tfid := incGetFeedID()\n\tcaller := std.PrevRealm().Addr()\n\turl := strings.Replace(pkgpath, \"gno.land\", \"\", -1) + \":\" + name\n\tfeed := newFeed(fid, url, name, caller)\n\tfidkey := feedIDKey(fid)\n\tgFeeds.Set(fidkey, feed)\n\tgFeedsByName.Set(name, feed)\n\treturn feed.id\n}\n\n// Anyone can create a post in a existing feed, allow un-registered users also\nfunc CreatePost(fid FeedID, parentID PostID, catetory uint64, metadata string) PostID {\n\tcaller := std.PrevRealm().Addr()\n\n\tfeed := mustGetFeed(fid)\n\tpost := feed.AddPost(caller, parentID, catetory, metadata)\n\treturn post.id\n}\n\n// Only post's owner can edit post\nfunc EditPost(fid FeedID, pid PostID, category uint64, metadata string) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tif caller != post.creator {\n\t\tpanic(\"you are not creator of this post\")\n\t}\n\n\tpost.Update(category, metadata)\n}\n\n// Only feed creator/owner can call this\nfunc SetOwner(fid FeedID, newOwner std.Address) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\n\tif caller != feed.creator && caller != feed.owner {\n\t\tpanic(\"you are not creator/owner of this feed\")\n\t}\n\n\tfeed.owner = newOwner\n}\n\n// Only feed creator/owner or post creator can delete the post\nfunc DeletePost(fid FeedID, pid PostID) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tif caller != post.creator && caller != feed.creator && caller != feed.owner {\n\t\tpanic(\"you are nor creator of this post neither creator/owner of the feed\")\n\t}\n\n\tpost.Delete()\n\n\t// If post is comment then decrease comments count on parent\n\tif uint64(post.parentID) != 0 {\n\t\tparent := feed.MustGetPost(post.parentID)\n\t\tparent.commentsCount -= 1\n\t}\n}\n\n// Only feed owner can ban the post\nfunc BanPost(fid FeedID, pid PostID, reason string) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\t_ = feed.MustGetPost(pid)\n\n\t// For experimenting, we ban only the post for now\n\t// TODO: recursive delete/ban comments\n\tif caller != feed.owner {\n\t\tpanic(\"you are owner of the feed\")\n\t}\n\n\tfeed.BanPost(pid)\n\n\tfeed.flags.ClearFlagCount(getFlagID(fid, pid))\n}\n\n// Any one can react post\nfunc ReactPost(fid FeedID, pid PostID, icon string, up bool) {\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tpost.React(icon, up)\n}\n\nfunc TipPost(fid FeedID, pid PostID) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tpost.Tip(caller, post.creator)\n}\n\n// Get a list of flagged posts\n// NOTE: We can support multi feeds in the future but for now we will have only 1 feed\n// Return stringified list in format: postStr-count,postStr-count\nfunc GetFlaggedPosts(fid FeedID, offset uint64, limit uint8) string {\n\tfeed := mustGetFeed(fid)\n\n\t// Already sorted by count descending\n\tflags := feed.flags.GetFlags(uint64(limit), offset)\n\n\tvar postList []string\n\tfor _, flagCount := range flags {\n\t\tflagID := flagCount.FlagID\n\n\t\tfeedID, postID := parseFlagID(flagID)\n\t\tif feedID != feed.id {\n\t\t\tcontinue\n\t\t}\n\n\t\tpost := feed.GetPost(postID)\n\t\tpostList = append(postList, ufmt.Sprintf(\"%s\", post))\n\t}\n\n\tSEPARATOR := \",\"\n\tres := strings.Join(postList, SEPARATOR)\n\treturn ufmt.Sprintf(\"[%s]\", res)\n}\n\n// NOTE: due to bug of std.PrevRealm().Addr() return \"\" when query so we user this proxy function temporary\n// in waiting of correct behaviour of std.PrevRealm().Addr()\nfunc GetPosts(fid FeedID, parentID PostID, user string, categories []uint64, offset uint64, limit uint8) string {\n\tcaller := std.PrevRealm().Addr()\n\tdata := GetPostsWithCaller(fid, parentID, caller.String(), user, categories, offset, limit)\n\treturn data\n}\n\nfunc GetPostsWithCaller(fid FeedID, parentID PostID, callerAddrStr string, user string, categories []uint64, offset uint64, limit uint8) string {\n\t// Return flagged posts, we process flagged posts differently using FlagIndex\n\tif len(categories) == 1 && categories[0] == uint64(9) {\n\t\treturn GetFlaggedPosts(fid, offset, limit)\n\t}\n\n\t// BUG: normally std.PrevRealm().Addr() should return a value instead of empty\n\t// Fix is in progress on Gno side\n\tfeed := mustGetFeed(fid)\n\tposts := getPosts(feed, parentID, callerAddrStr, user, categories, offset, limit)\n\n\tSEPARATOR := \",\"\n\tvar postListStr []string\n\n\tfor _, post := range posts {\n\t\tpostListStr = append(postListStr, post.String())\n\t}\n\n\tres := strings.Join(postListStr, SEPARATOR)\n\treturn ufmt.Sprintf(\"[%s]\", res)\n}\n\n// user here is: filter by user\nfunc getPosts(feed *Feed, parentID PostID, callerAddrStr string, user string, categories []uint64, offset uint64, limit uint8) []*Post {\n\tcaller := std.Address(callerAddrStr)\n\n\tvar posts []*Post\n\tvar skipped uint64\n\n\t// Create an avlTree for optimizing the check\n\trequestedCategories := avl.NewTree()\n\tfor _, category := range categories {\n\t\tcatStr := strconv.FormatUint(category, 10)\n\t\trequestedCategories.Set(catStr, true)\n\t}\n\n\tfeed.posts.ReverseIterate(\"\", \"\", func(key string, value interface{}) bool {\n\t\tpost := value.(*Post)\n\n\t\tpostCatStr := strconv.FormatUint(post.category, 10)\n\n\t\t// NOTE: this search mechanism is not efficient, only for demo purpose\n\t\tif post.parentID == parentID && post.deleted == false {\n\t\t\tif requestedCategories.Size() > 0 && !requestedCategories.Has(postCatStr) {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\tif user != \"\" && std.Address(user) != post.creator {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\t// Filter hidden post\n\t\t\tflagID := getFlagID(feed.id, post.id)\n\t\t\tif feed.flags.HasFlagged(flagID, callerAddrStr) {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\t// Check if post is in hidden list\n\t\t\tvalue, exists := feed.hiddenPostsByUser.Get(caller.String())\n\t\t\tif exists {\n\t\t\t\thiddenPosts := value.(*avl.Tree)\n\t\t\t\t// If post.id exists in hiddenPosts tree => that post is hidden\n\t\t\t\tif hiddenPosts.Has(post.id.String()) {\n\t\t\t\t\treturn false\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tif skipped < offset {\n\t\t\t\tskipped++\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\tposts = append(posts, post)\n\t\t}\n\n\t\tif len(posts) == int(limit) {\n\t\t\treturn true\n\t\t}\n\n\t\treturn false\n\t})\n\n\treturn posts\n}\n\n// Get comments list\nfunc GetComments(fid FeedID, parentID PostID, offset uint64, limit uint8) string {\n\treturn GetPosts(fid, parentID, \"\", []uint64{}, offset, limit)\n}\n\n// Get Post\nfunc GetPost(fid FeedID, pid PostID) string {\n\tfeed := mustGetFeed(fid)\n\n\tdata, ok := feed.posts.Get(postIDKey(pid))\n\tif !ok {\n\t\tpanic(\"Unable to get post\")\n\t}\n\n\tpost := data.(*Post)\n\treturn post.String()\n}\n\nfunc FlagPost(fid FeedID, pid PostID) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.FlagPost(caller, pid)\n}\n\nfunc HidePostForMe(fid FeedID, pid PostID) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.HidePostForUser(caller, pid)\n}\n\nfunc UnHidePostForMe(fid FeedID, pid PostID) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.UnHidePostForUser(caller, pid)\n}\n\nfunc GetFlags(fid FeedID, limit uint64, offset uint64) string {\n\tfeed := mustGetFeed(fid)\n\n\ttype FlagCount struct {\n\t\tFlagID flags_index.FlagID\n\t\tCount  uint64\n\t}\n\n\tflags := feed.flags.GetFlags(limit, offset)\n\n\tvar res []string\n\tfor _, flag := range flags {\n\t\tres = append(res, ufmt.Sprintf(\"%s:%d\", flag.FlagID, flag.Count))\n\t}\n\n\treturn strings.Join(res, \"|\")\n}\n\n// TODO: allow only creator to call\nfunc GetFeedByID(fid FeedID) *Feed {\n\treturn mustGetFeed(fid)\n}\n\n// TODO: allow only admin to call\nfunc ExportFeedData(fid FeedID) string {\n\tfeed := mustGetFeed(fid)\n\tfeedJSON := feed.ToJSON()\n\treturn feedJSON\n}\n\n// TODO: allow only admin to call\nfunc ImportFeedData(fid FeedID, jsonData string) {\n\tfeed := mustGetFeed(fid)\n\tfeed.FromJSON(jsonData)\n}\n\n// func MigrateFromPreviousFeed(fid feedsV7.FeedID) {\n// \t// Get exported data from previous feeds\n// \tjsonData := feedsV7.ExportFeedData(fid)\n// \tImportFeedData(FeedID(uint64(fid)), jsonData)\n// }\n"
+            "Body": "package social_feeds\n\nimport (\n\t\"std\"\n\t\"strconv\"\n\t\"strings\"\n\n\t\"gno.land/p/demo/avl\"\n\t\"gno.land/p/demo/teritori/flags_index\"\n\t\"gno.land/p/demo/ufmt\"\n)\n\n// Only registered user can create a new feed\n// For the flexibility when testing, allow all user to create feed\nfunc CreateFeed(name string) FeedID {\n\tpkgpath := std.CurrentRealmPath()\n\n\tfid := incGetFeedID()\n\tcaller := std.PreviousRealm().Address()\n\turl := strings.Replace(pkgpath, \"gno.land\", \"\", -1) + \":\" + name\n\tfeed := newFeed(fid, url, name, caller)\n\tfidkey := feedIDKey(fid)\n\tgFeeds.Set(fidkey, feed)\n\tgFeedsByName.Set(name, feed)\n\treturn feed.id\n}\n\n// Anyone can create a post in a existing feed, allow un-registered users also\nfunc CreatePost(fid FeedID, parentID PostID, catetory uint64, metadata string) PostID {\n\tcaller := std.PreviousRealm().Address()\n\n\tfeed := mustGetFeed(fid)\n\tpost := feed.AddPost(caller, parentID, catetory, metadata)\n\treturn post.id\n}\n\n// Only post's owner can edit post\nfunc EditPost(fid FeedID, pid PostID, category uint64, metadata string) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tif caller != post.creator {\n\t\tpanic(\"you are not creator of this post\")\n\t}\n\n\tpost.Update(category, metadata)\n}\n\n// Only feed creator/owner can call this\nfunc SetOwner(fid FeedID, newOwner std.Address) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\n\tif caller != feed.creator && caller != feed.owner {\n\t\tpanic(\"you are not creator/owner of this feed\")\n\t}\n\n\tfeed.owner = newOwner\n}\n\n// Only feed creator/owner or post creator can delete the post\nfunc DeletePost(fid FeedID, pid PostID) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tif caller != post.creator && caller != feed.creator && caller != feed.owner {\n\t\tpanic(\"you are nor creator of this post neither creator/owner of the feed\")\n\t}\n\n\tpost.Delete()\n\n\t// If post is comment then decrease comments count on parent\n\tif uint64(post.parentID) != 0 {\n\t\tparent := feed.MustGetPost(post.parentID)\n\t\tparent.commentsCount -= 1\n\t}\n}\n\n// Only feed owner can ban the post\nfunc BanPost(fid FeedID, pid PostID, reason string) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\t_ = feed.MustGetPost(pid)\n\n\t// For experimenting, we ban only the post for now\n\t// TODO: recursive delete/ban comments\n\tif caller != feed.owner {\n\t\tpanic(\"you are owner of the feed\")\n\t}\n\n\tfeed.BanPost(pid)\n\n\tfeed.flags.ClearFlagCount(getFlagID(fid, pid))\n}\n\n// Any one can react post\nfunc ReactPost(fid FeedID, pid PostID, icon string, up bool) {\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tpost.React(icon, up)\n}\n\nfunc TipPost(fid FeedID, pid PostID) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tpost.Tip(caller, post.creator)\n}\n\n// Get a list of flagged posts\n// NOTE: We can support multi feeds in the future but for now we will have only 1 feed\n// Return stringified list in format: postStr-count,postStr-count\nfunc GetFlaggedPosts(fid FeedID, offset uint64, limit uint8) string {\n\tfeed := mustGetFeed(fid)\n\n\t// Already sorted by count descending\n\tflags := feed.flags.GetFlags(uint64(limit), offset)\n\n\tvar postList []string\n\tfor _, flagCount := range flags {\n\t\tflagID := flagCount.FlagID\n\n\t\tfeedID, postID := parseFlagID(flagID)\n\t\tif feedID != feed.id {\n\t\t\tcontinue\n\t\t}\n\n\t\tpost := feed.GetPost(postID)\n\t\tpostList = append(postList, ufmt.Sprintf(\"%s\", post))\n\t}\n\n\tSEPARATOR := \",\"\n\tres := strings.Join(postList, SEPARATOR)\n\treturn ufmt.Sprintf(\"[%s]\", res)\n}\n\n// NOTE: due to bug of std.PreviousRealm().Address() return \"\" when query so we user this proxy function temporary\n// in waiting of correct behaviour of std.PreviousRealm().Address()\nfunc GetPosts(fid FeedID, parentID PostID, user string, categories []uint64, offset uint64, limit uint8) string {\n\tcaller := std.PreviousRealm().Address()\n\tdata := GetPostsWithCaller(fid, parentID, caller.String(), user, categories, offset, limit)\n\treturn data\n}\n\nfunc GetPostsWithCaller(fid FeedID, parentID PostID, callerAddrStr string, user string, categories []uint64, offset uint64, limit uint8) string {\n\t// Return flagged posts, we process flagged posts differently using FlagIndex\n\tif len(categories) == 1 && categories[0] == uint64(9) {\n\t\treturn GetFlaggedPosts(fid, offset, limit)\n\t}\n\n\t// BUG: normally std.PreviousRealm().Address() should return a value instead of empty\n\t// Fix is in progress on Gno side\n\tfeed := mustGetFeed(fid)\n\tposts := getPosts(feed, parentID, callerAddrStr, user, categories, offset, limit)\n\n\tSEPARATOR := \",\"\n\tvar postListStr []string\n\n\tfor _, post := range posts {\n\t\tpostListStr = append(postListStr, post.String())\n\t}\n\n\tres := strings.Join(postListStr, SEPARATOR)\n\treturn ufmt.Sprintf(\"[%s]\", res)\n}\n\n// user here is: filter by user\nfunc getPosts(feed *Feed, parentID PostID, callerAddrStr string, user string, categories []uint64, offset uint64, limit uint8) []*Post {\n\tcaller := std.Address(callerAddrStr)\n\n\tvar posts []*Post\n\tvar skipped uint64\n\n\t// Create an avlTree for optimizing the check\n\trequestedCategories := avl.NewTree()\n\tfor _, category := range categories {\n\t\tcatStr := strconv.FormatUint(category, 10)\n\t\trequestedCategories.Set(catStr, true)\n\t}\n\n\tfeed.posts.ReverseIterate(\"\", \"\", func(key string, value interface{}) bool {\n\t\tpost := value.(*Post)\n\n\t\tpostCatStr := strconv.FormatUint(post.category, 10)\n\n\t\t// NOTE: this search mechanism is not efficient, only for demo purpose\n\t\tif post.parentID == parentID && post.deleted == false {\n\t\t\tif requestedCategories.Size() > 0 && !requestedCategories.Has(postCatStr) {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\tif user != \"\" && std.Address(user) != post.creator {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\t// Filter hidden post\n\t\t\tflagID := getFlagID(feed.id, post.id)\n\t\t\tif feed.flags.HasFlagged(flagID, callerAddrStr) {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\t// Check if post is in hidden list\n\t\t\tvalue, exists := feed.hiddenPostsByUser.Get(caller.String())\n\t\t\tif exists {\n\t\t\t\thiddenPosts := value.(*avl.Tree)\n\t\t\t\t// If post.id exists in hiddenPosts tree => that post is hidden\n\t\t\t\tif hiddenPosts.Has(post.id.String()) {\n\t\t\t\t\treturn false\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tif skipped < offset {\n\t\t\t\tskipped++\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\tposts = append(posts, post)\n\t\t}\n\n\t\tif len(posts) == int(limit) {\n\t\t\treturn true\n\t\t}\n\n\t\treturn false\n\t})\n\n\treturn posts\n}\n\n// Get comments list\nfunc GetComments(fid FeedID, parentID PostID, offset uint64, limit uint8) string {\n\treturn GetPosts(fid, parentID, \"\", []uint64{}, offset, limit)\n}\n\n// Get Post\nfunc GetPost(fid FeedID, pid PostID) string {\n\tfeed := mustGetFeed(fid)\n\n\tdata, ok := feed.posts.Get(postIDKey(pid))\n\tif !ok {\n\t\tpanic(\"Unable to get post\")\n\t}\n\n\tpost := data.(*Post)\n\treturn post.String()\n}\n\nfunc FlagPost(fid FeedID, pid PostID) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.FlagPost(caller, pid)\n}\n\nfunc HidePostForMe(fid FeedID, pid PostID) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.HidePostForUser(caller, pid)\n}\n\nfunc UnHidePostForMe(fid FeedID, pid PostID) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.UnHidePostForUser(caller, pid)\n}\n\nfunc GetFlags(fid FeedID, limit uint64, offset uint64) string {\n\tfeed := mustGetFeed(fid)\n\n\ttype FlagCount struct {\n\t\tFlagID flags_index.FlagID\n\t\tCount  uint64\n\t}\n\n\tflags := feed.flags.GetFlags(limit, offset)\n\n\tvar res []string\n\tfor _, flag := range flags {\n\t\tres = append(res, ufmt.Sprintf(\"%s:%d\", flag.FlagID, flag.Count))\n\t}\n\n\treturn strings.Join(res, \"|\")\n}\n\n// TODO: allow only creator to call\nfunc GetFeedByID(fid FeedID) *Feed {\n\treturn mustGetFeed(fid)\n}\n\n// TODO: allow only admin to call\nfunc ExportFeedData(fid FeedID) string {\n\tfeed := mustGetFeed(fid)\n\tfeedJSON := feed.ToJSON()\n\treturn feedJSON\n}\n\n// TODO: allow only admin to call\nfunc ImportFeedData(fid FeedID, jsonData string) {\n\tfeed := mustGetFeed(fid)\n\tfeed.FromJSON(jsonData)\n}\n\n// func MigrateFromPreviousFeed(fid feedsV7.FeedID) {\n// \t// Get exported data from previous feeds\n// \tjsonData := feedsV7.ExportFeedData(fid)\n// \tImportFeedData(FeedID(uint64(fid)), jsonData)\n// }\n"
           },
           {
             "Name": "render.gno",
diff --git a/gno.land/pkg/integration/testdata/issue_2283_cacheTypes.txtar b/gno.land/pkg/integration/testdata/issue_2283_cacheTypes.txtar
index 95bd48c0144..c5f1cf0ed6d 100644
--- a/gno.land/pkg/integration/testdata/issue_2283_cacheTypes.txtar
+++ b/gno.land/pkg/integration/testdata/issue_2283_cacheTypes.txtar
@@ -40,7 +40,7 @@ stdout OK!
           },
           {
             "Name": "feeds_test.gno",
-            "Body": "package social_feeds\n\nimport (\n\t\"encoding/base64\"\n\t\"fmt\"\n\t\"std\"\n\t\"strconv\"\n\t\"strings\"\n\t\"testing\"\n\n\t\"gno.land/p/demo/avl\"\n\tujson \"gno.land/p/demo/teritori/ujson\"\n\t\"gno.land/p/demo/testutils\"\n\t\"gno.land/r/demo/boards\"\n\t// Fake previous version for testing\n\tfeedsV7 \"gno.land/r/demo/teritori/social_feeds\"\n\t\"gno.land/r/demo/users\"\n)\n\nvar (\n\trootPostID = PostID(0)\n\tpostID1    = PostID(1)\n\tfeedID1    = FeedID(1)\n\tcat1       = uint64(1)\n\tcat2       = uint64(2)\n\tuser       = testutils.TestAddress(\"user\")\n\tfilter_all = []uint64{}\n)\n\nfunc getFeed1() *Feed {\n\treturn mustGetFeed(feedID1)\n}\n\nfunc getPost1() *Post {\n\tfeed1 := getFeed1()\n\tpost1 := feed1.MustGetPost(postID1)\n\treturn post1\n}\n\nfunc testCreateFeed(t *testing.T) {\n\tfeedID := CreateFeed(\"teritori1\")\n\tfeed := mustGetFeed(feedID)\n\n\tif feedID != 1 {\n\t\tt.Fatalf(\"expected feedID: 1, got %q.\", feedID)\n\t}\n\n\tif feed.name != \"teritori1\" {\n\t\tt.Fatalf(\"expected feedName: teritori1, got %q.\", feed.name)\n\t}\n}\n\nfunc testCreatePost(t *testing.T) {\n\tmetadata := `{\"gifs\": [], \"files\": [], \"title\": \"\", \"message\": \"testouille\", \"hashtags\": [], \"mentions\": [], \"createdAt\": \"2023-03-29T12:19:04.858Z\", \"updatedAt\": \"2023-03-29T12:19:04.858Z\"}`\n\tpostID := CreatePost(feedID1, rootPostID, cat1, metadata)\n\tfeed := mustGetFeed(feedID1)\n\tpost := feed.MustGetPost(postID)\n\n\tif postID != 1 {\n\t\tt.Fatalf(\"expected postID: 1, got %q.\", postID)\n\t}\n\n\tif post.category != cat1 {\n\t\tt.Fatalf(\"expected categoryID: %q, got %q.\", cat1, post.category)\n\t}\n}\n\nfunc toPostIDsStr(posts []*Post) string {\n\tvar postIDs []string\n\tfor _, post := range posts {\n\t\tpostIDs = append(postIDs, post.id.String())\n\t}\n\n\tpostIDsStr := strings.Join(postIDs, \",\")\n\treturn postIDsStr\n}\n\nfunc testGetPosts(t *testing.T) {\n\tuser := std.Address(\"user\")\n\tstd.TestSetOrigCaller(user)\n\n\tfeedID := CreateFeed(\"teritori10\")\n\tfeed := mustGetFeed(feedID)\n\n\tCreatePost(feedID, rootPostID, cat1, \"post1\")\n\tCreatePost(feedID, rootPostID, cat1, \"post2\")\n\tCreatePost(feedID, rootPostID, cat1, \"post3\")\n\tCreatePost(feedID, rootPostID, cat1, \"post4\")\n\tCreatePost(feedID, rootPostID, cat1, \"post5\")\n\tpostIDToFlagged := CreatePost(feedID, rootPostID, cat1, \"post6\")\n\tpostIDToHide := CreatePost(feedID, rootPostID, cat1, \"post7\")\n\tCreatePost(feedID, rootPostID, cat1, \"post8\")\n\n\tvar posts []*Post\n\tvar postIDsStr string\n\n\t// Query last 3 posts\n\tposts = getPosts(feed, 0, \"\", \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,7,6\" {\n\t\tt.Fatalf(\"expected posts order: 8,7,6. Got: %s\", postIDsStr)\n\t}\n\n\t// Query page 2\n\tposts = getPosts(feed, 0, \"\", \"\", []uint64{}, 3, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\tif postIDsStr != \"5,4,3\" {\n\t\tt.Fatalf(\"expected posts order: 5,4,3. Got: %s\", postIDsStr)\n\t}\n\n\t// Exclude hidden post\n\tHidePostForMe(feed.id, postIDToHide)\n\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,6,5\" {\n\t\tt.Fatalf(\"expected posts order: 8,6,5. Got: %s\", postIDsStr)\n\t}\n\n\t// Exclude flagged post\n\tFlagPost(feed.id, postIDToFlagged)\n\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,5,4\" {\n\t\tt.Fatalf(\"expected posts order: 8,5,4. Got: %s\", postIDsStr)\n\t}\n\n\t// Pagination with hidden/flagged posts\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 3, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"3,2,1\" {\n\t\tt.Fatalf(\"expected posts order: 3,2,1. Got: %s\", postIDsStr)\n\t}\n\n\t// Query out of range\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 6, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"\" {\n\t\tt.Fatalf(\"expected posts order: ''. Got: %s\", postIDsStr)\n\t}\n}\n\nfunc testReactPost(t *testing.T) {\n\tfeed := getFeed1()\n\tpost := getPost1()\n\n\ticon := \"🥰\"\n\tReactPost(feed.id, post.id, icon, true)\n\n\t// Set reaction\n\treactionCount_, ok := post.reactions.Get(\"🥰\")\n\tif !ok {\n\t\tt.Fatalf(\"expected 🥰 exists\")\n\t}\n\n\treactionCount := reactionCount_.(int)\n\tif reactionCount != 1 {\n\t\tt.Fatalf(\"expected reactionCount: 1, got %q.\", reactionCount)\n\t}\n\n\t// Unset reaction\n\tReactPost(feed.id, post.id, icon, false)\n\t_, exist := post.reactions.Get(\"🥰\")\n\tif exist {\n\t\tt.Fatalf(\"expected 🥰 not exist\")\n\t}\n}\n\nfunc testCreateAndDeleteComment(t *testing.T) {\n\tfeed1 := getFeed1()\n\tpost1 := getPost1()\n\n\tmetadata := `empty_meta_data`\n\n\tcommentID1 := CreatePost(feed1.id, post1.id, cat1, metadata)\n\tcommentID2 := CreatePost(feed1.id, post1.id, cat1, metadata)\n\tcomment2 := feed1.MustGetPost(commentID2)\n\n\tif comment2.id != 3 { // 1 post + 2 comments = 3\n\t\tt.Fatalf(\"expected comment postID: 3, got %q.\", comment2.id)\n\t}\n\n\tif comment2.parentID != post1.id {\n\t\tt.Fatalf(\"expected comment parentID: %q, got %q.\", post1.id, comment2.parentID)\n\t}\n\n\t// Check comment count on parent\n\tif post1.commentsCount != 2 {\n\t\tt.Fatalf(\"expected comments count: 2, got %d.\", post1.commentsCount)\n\t}\n\n\t// Get comments\n\tcomments := GetComments(feed1.id, post1.id, 0, 10)\n\tcommentsParsed := ujson.ParseSlice(comments)\n\n\tif len(commentsParsed) != 2 {\n\t\tt.Fatalf(\"expected encoded comments: 2, got %q.\", commentsParsed)\n\t}\n\n\t// Delete 1 comment\n\tDeletePost(feed1.id, comment2.id)\n\tcomments = GetComments(feed1.id, post1.id, 0, 10)\n\tcommentsParsed = ujson.ParseSlice(comments)\n\n\tif len(commentsParsed) != 1 {\n\t\tt.Fatalf(\"expected encoded comments: 1, got %q.\", commentsParsed)\n\t}\n\n\t// Check comment count on parent\n\tif post1.commentsCount != 1 {\n\t\tt.Fatalf(\"expected comments count: 1, got %d.\", post1.commentsCount)\n\t}\n}\n\nfunc countPosts(feedID FeedID, categories []uint64, limit uint8) int {\n\toffset := uint64(0)\n\n\tpostsStr := GetPosts(feedID, 0, \"\", categories, offset, limit)\n\tif postsStr == \"[]\" {\n\t\treturn 0\n\t}\n\n\tparsedPosts := ujson.ParseSlice(postsStr)\n\tpostsCount := len(parsedPosts)\n\treturn postsCount\n}\n\nfunc countPostsByUser(feedID FeedID, user string) int {\n\toffset := uint64(0)\n\tlimit := uint8(10)\n\n\tpostsStr := GetPosts(feedID, 0, user, []uint64{}, offset, limit)\n\tif postsStr == \"[]\" {\n\t\treturn 0\n\t}\n\n\tparsedPosts := ujson.ParseSlice(postsStr)\n\tpostsCount := len(parsedPosts)\n\treturn postsCount\n}\n\nfunc testFilterByCategories(t *testing.T) {\n\t// // Re-add reaction to test post list\n\t// ReactPost(1, postID, \"🥰\", true)\n\t// ReactPost(1, postID, \"😇\", true)\n\n\tfilter_cat1 := []uint64{1}\n\tfilter_cat1_2 := []uint64{1, 2}\n\tfilter_cat9 := []uint64{9}\n\tfilter_cat1_2_9 := []uint64{1, 2, 9}\n\n\tfeedID2 := CreateFeed(\"teritori2\")\n\tfeed2 := mustGetFeed(feedID2)\n\n\t// Create 2 posts on root with cat1\n\tpostID1 := CreatePost(feed2.id, rootPostID, cat1, \"metadata\")\n\tpostID2 := CreatePost(feed2.id, rootPostID, cat1, \"metadata\")\n\n\t// Create 1 posts on root with cat2\n\tpostID3 := CreatePost(feed2.id, rootPostID, cat2, \"metadata\")\n\n\t// Create comments on post 1\n\tcommentPostID1 := CreatePost(feed2.id, postID1, cat1, \"metadata\")\n\n\t// cat1: Should return max = limit\n\tif count := countPosts(feed2.id, filter_cat1, 1); count != 1 {\n\t\tt.Fatalf(\"expected posts count: 1, got %q.\", count)\n\t}\n\n\t// cat1: Should return max = total\n\tif count := countPosts(feed2.id, filter_cat1, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// cat 1 + 2: Should return max = limit\n\tif count := countPosts(feed2.id, filter_cat1_2, 2); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// cat 1 + 2: Should return max = total on both\n\tif count := countPosts(feed2.id, filter_cat1_2, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// cat 1, 2, 9: Should return total of 1, 2\n\tif count := countPosts(feed2.id, filter_cat1_2_9, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// cat 9: Should return 0\n\tif count := countPosts(feed2.id, filter_cat9, 10); count != 0 {\n\t\tt.Fatalf(\"expected posts count: 0, got %q.\", count)\n\t}\n\n\t// cat all: should return all\n\tif count := countPosts(feed2.id, filter_all, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// add comments should not impact the results\n\tCreatePost(feed2.id, postID1, cat1, \"metadata\")\n\tCreatePost(feed2.id, postID2, cat1, \"metadata\")\n\n\tif count := countPosts(feed2.id, filter_all, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// delete a post should affect the result\n\tDeletePost(feed2.id, postID1)\n\n\tif count := countPosts(feed2.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n}\n\nfunc testTipPost(t *testing.T) {\n\tcreator := testutils.TestAddress(\"creator\")\n\tstd.TestIssueCoins(creator, std.Coins{{\"ugnot\", 100_000_000}})\n\n\t// NOTE: Dont know why the address should be this to be able to call banker (= std.GetCallerAt(1))\n\ttipper := testutils.TestAddress(\"tipper\")\n\tstd.TestIssueCoins(tipper, std.Coins{{\"ugnot\", 50_000_000}})\n\n\tbanker := std.GetBanker(std.BankerTypeReadonly)\n\n\t// Check Original coins of creator/tipper\n\tif coins := banker.GetCoins(creator); coins[0].Amount != 100_000_000 {\n\t\tt.Fatalf(\"expected creator coin count: 100_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\tif coins := banker.GetCoins(tipper); coins[0].Amount != 50_000_000 {\n\t\tt.Fatalf(\"expected tipper coin count: 50_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\t// Creator creates feed, post\n\tstd.TestSetOrigCaller(creator)\n\n\tfeedID3 := CreateFeed(\"teritori3\")\n\tfeed3 := mustGetFeed(feedID3)\n\n\tpostID1 := CreatePost(feed3.id, rootPostID, cat1, \"metadata\")\n\tpost1 := feed3.MustGetPost(postID1)\n\n\t// Tiper tips the ppst\n\tstd.TestSetOrigCaller(tipper)\n\tstd.TestSetOrigSend(std.Coins{{\"ugnot\", 1_000_000}}, nil)\n\tTipPost(feed3.id, post1.id)\n\n\t// Coin must be increased for creator\n\tif coins := banker.GetCoins(creator); coins[0].Amount != 101_000_000 {\n\t\tt.Fatalf(\"expected creator coin after beging tipped: 101_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\t// Total tip amount should increased\n\tif post1.tipAmount != 1_000_000 {\n\t\tt.Fatalf(\"expected total tipAmount: 1_000_000, got %d.\", post1.tipAmount)\n\t}\n\n\t// Add more tip should update this total\n\tstd.TestSetOrigSend(std.Coins{{\"ugnot\", 2_000_000}}, nil)\n\tTipPost(feed3.id, post1.id)\n\n\tif post1.tipAmount != 3_000_000 {\n\t\tt.Fatalf(\"expected total tipAmount: 3_000_000, got %d.\", post1.tipAmount)\n\t}\n}\n\nfunc testFlagPost(t *testing.T) {\n\tflagger := testutils.TestAddress(\"flagger\")\n\n\tfeedID9 := CreateFeed(\"teritori9\")\n\tfeed9 := mustGetFeed(feedID9)\n\n\tCreatePost(feed9.id, rootPostID, cat1, \"metadata1\")\n\tpid := CreatePost(feed9.id, rootPostID, cat1, \"metadata1\")\n\n\t// Flag post\n\tstd.TestSetOrigCaller(flagger)\n\tFlagPost(feed9.id, pid)\n\n\t// Another user flags\n\tanother := testutils.TestAddress(\"another\")\n\tstd.TestSetOrigCaller(another)\n\tFlagPost(feed9.id, pid)\n\n\tflaggedPostsStr := GetFlaggedPosts(feed9.id, 0, 10)\n\tparsed := ujson.ParseSlice(flaggedPostsStr)\n\tif flaggedPostsCount := len(parsed); flaggedPostsCount != 1 {\n\t\tt.Fatalf(\"expected flagged posts: 1, got %d.\", flaggedPostsCount)\n\t}\n}\n\nfunc testFilterUser(t *testing.T) {\n\tuser1 := testutils.TestAddress(\"user1\")\n\tuser2 := testutils.TestAddress(\"user2\")\n\n\t// User1 create 2 posts\n\tstd.TestSetOrigCaller(user1)\n\n\tfeedID4 := CreateFeed(\"teritori4\")\n\tfeed4 := mustGetFeed(feedID4)\n\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata2\": \"value\"}`)\n\n\t// User2 create 1 post\n\tstd.TestSetOrigCaller(user2)\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\n\tif count := countPostsByUser(feed4.id, user1.String()); count != 2 {\n\t\tt.Fatalf(\"expected total posts by user1: 2, got %d.\", count)\n\t}\n\n\tif count := countPostsByUser(feed4.id, user2.String()); count != 1 {\n\t\tt.Fatalf(\"expected total posts by user2: 1, got %d.\", count)\n\t}\n\n\tif count := countPostsByUser(feed4.id, \"\"); count != 3 {\n\t\tt.Fatalf(\"expected total posts: 3, got %d.\", count)\n\t}\n}\n\nfunc testHidePostForMe(t *testing.T) {\n\tuser := std.Address(\"user\")\n\tstd.TestSetOrigCaller(user)\n\n\tfeedID8 := CreateFeed(\"teritor8\")\n\tfeed8 := mustGetFeed(feedID8)\n\n\tpostIDToHide := CreatePost(feed8.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\tpostID := CreatePost(feed8.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// Hide a post for me\n\tHidePostForMe(feed8.id, postIDToHide)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 1 {\n\t\tt.Fatalf(\"expected posts count after hidding: 1, got %q.\", count)\n\t}\n\n\t// Query from another user should return full list\n\tanother := std.Address(\"another\")\n\tstd.TestSetOrigCaller(another)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count from another: 2, got %q.\", count)\n\t}\n\n\t// UnHide a post for me\n\tstd.TestSetOrigCaller(user)\n\tUnHidePostForMe(feed8.id, postIDToHide)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count after unhidding: 2, got %q.\", count)\n\t}\n}\n\nfunc testMigrateFeedData(t *testing.T) string {\n\tfeedID := feedsV7.CreateFeed(\"teritor11\")\n\n\t// Post to test\n\tpostID := feedsV7.CreatePost(feedID, feedsV7.PostID(0), 2, `{\"metadata\": \"value\"}`)\n\tfeedsV7.ReactPost(feedID, postID, \"🇬🇸\", true)\n\n\t// Add comment to post\n\tcommentID := feedsV7.CreatePost(feedID, postID, 2, `{\"comment1\": \"value\"}`)\n\tfeedsV7.ReactPost(feedID, commentID, \"🇬🇸\", true)\n\n\t// // Post with json metadata\n\tfeedsV7.CreatePost(feedID, feedsV7.PostID(0), 2, `{'a':1}`)\n\n\t// Expect: should convert feed data to JSON successfully without error\n\tdataJSON := feedsV7.ExportFeedData(feedID)\n\tif dataJSON == \"\" {\n\t\tt.Fatalf(\"expected feed data exported successfully\")\n\t}\n\n\t// Import data =====================================\n\tImportFeedData(FeedID(uint64(feedID)), dataJSON)\n\n\t// Test public func\n\t// MigrateFromPreviousFeed(feedID)\n}\n\nfunc Test(t *testing.T) {\n\ttestCreateFeed(t)\n\n\ttestCreatePost(t)\n\n\ttestGetPosts(t)\n\n\ttestReactPost(t)\n\n\ttestCreateAndDeleteComment(t)\n\n\ttestFilterByCategories(t)\n\n\ttestTipPost(t)\n\n\ttestFilterUser(t)\n\n\ttestFlagPost(t)\n\n\ttestHidePostForMe(t)\n\n\ttestMigrateFeedData(t)\n}\n"
+            "Body": "package social_feeds\n\nimport (\n\t\"encoding/base64\"\n\t\"fmt\"\n\t\"std\"\n\t\"strconv\"\n\t\"strings\"\n\t\"testing\"\n\n\t\"gno.land/p/demo/avl\"\n\tujson \"gno.land/p/demo/teritori/ujson\"\n\t\"gno.land/p/demo/testutils\"\n\t\"gno.land/r/demo/boards\"\n\t// Fake previous version for testing\n\tfeedsV7 \"gno.land/r/demo/teritori/social_feeds\"\n\t\"gno.land/r/demo/users\"\n)\n\nvar (\n\trootPostID = PostID(0)\n\tpostID1    = PostID(1)\n\tfeedID1    = FeedID(1)\n\tcat1       = uint64(1)\n\tcat2       = uint64(2)\n\tuser       = testutils.TestAddress(\"user\")\n\tfilter_all = []uint64{}\n)\n\nfunc getFeed1() *Feed {\n\treturn mustGetFeed(feedID1)\n}\n\nfunc getPost1() *Post {\n\tfeed1 := getFeed1()\n\tpost1 := feed1.MustGetPost(postID1)\n\treturn post1\n}\n\nfunc testCreateFeed(t *testing.T) {\n\tfeedID := CreateFeed(\"teritori1\")\n\tfeed := mustGetFeed(feedID)\n\n\tif feedID != 1 {\n\t\tt.Fatalf(\"expected feedID: 1, got %q.\", feedID)\n\t}\n\n\tif feed.name != \"teritori1\" {\n\t\tt.Fatalf(\"expected feedName: teritori1, got %q.\", feed.name)\n\t}\n}\n\nfunc testCreatePost(t *testing.T) {\n\tmetadata := `{\"gifs\": [], \"files\": [], \"title\": \"\", \"message\": \"testouille\", \"hashtags\": [], \"mentions\": [], \"createdAt\": \"2023-03-29T12:19:04.858Z\", \"updatedAt\": \"2023-03-29T12:19:04.858Z\"}`\n\tpostID := CreatePost(feedID1, rootPostID, cat1, metadata)\n\tfeed := mustGetFeed(feedID1)\n\tpost := feed.MustGetPost(postID)\n\n\tif postID != 1 {\n\t\tt.Fatalf(\"expected postID: 1, got %q.\", postID)\n\t}\n\n\tif post.category != cat1 {\n\t\tt.Fatalf(\"expected categoryID: %q, got %q.\", cat1, post.category)\n\t}\n}\n\nfunc toPostIDsStr(posts []*Post) string {\n\tvar postIDs []string\n\tfor _, post := range posts {\n\t\tpostIDs = append(postIDs, post.id.String())\n\t}\n\n\tpostIDsStr := strings.Join(postIDs, \",\")\n\treturn postIDsStr\n}\n\nfunc testGetPosts(t *testing.T) {\n\tuser := std.Address(\"user\")\n\tstd.TestSetOriginCaller(user)\n\n\tfeedID := CreateFeed(\"teritori10\")\n\tfeed := mustGetFeed(feedID)\n\n\tCreatePost(feedID, rootPostID, cat1, \"post1\")\n\tCreatePost(feedID, rootPostID, cat1, \"post2\")\n\tCreatePost(feedID, rootPostID, cat1, \"post3\")\n\tCreatePost(feedID, rootPostID, cat1, \"post4\")\n\tCreatePost(feedID, rootPostID, cat1, \"post5\")\n\tpostIDToFlagged := CreatePost(feedID, rootPostID, cat1, \"post6\")\n\tpostIDToHide := CreatePost(feedID, rootPostID, cat1, \"post7\")\n\tCreatePost(feedID, rootPostID, cat1, \"post8\")\n\n\tvar posts []*Post\n\tvar postIDsStr string\n\n\t// Query last 3 posts\n\tposts = getPosts(feed, 0, \"\", \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,7,6\" {\n\t\tt.Fatalf(\"expected posts order: 8,7,6. Got: %s\", postIDsStr)\n\t}\n\n\t// Query page 2\n\tposts = getPosts(feed, 0, \"\", \"\", []uint64{}, 3, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\tif postIDsStr != \"5,4,3\" {\n\t\tt.Fatalf(\"expected posts order: 5,4,3. Got: %s\", postIDsStr)\n\t}\n\n\t// Exclude hidden post\n\tHidePostForMe(feed.id, postIDToHide)\n\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,6,5\" {\n\t\tt.Fatalf(\"expected posts order: 8,6,5. Got: %s\", postIDsStr)\n\t}\n\n\t// Exclude flagged post\n\tFlagPost(feed.id, postIDToFlagged)\n\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 0, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"8,5,4\" {\n\t\tt.Fatalf(\"expected posts order: 8,5,4. Got: %s\", postIDsStr)\n\t}\n\n\t// Pagination with hidden/flagged posts\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 3, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"3,2,1\" {\n\t\tt.Fatalf(\"expected posts order: 3,2,1. Got: %s\", postIDsStr)\n\t}\n\n\t// Query out of range\n\tposts = getPosts(feed, 0, user.String(), \"\", []uint64{}, 6, 3)\n\tpostIDsStr = toPostIDsStr(posts)\n\n\tif postIDsStr != \"\" {\n\t\tt.Fatalf(\"expected posts order: ''. Got: %s\", postIDsStr)\n\t}\n}\n\nfunc testReactPost(t *testing.T) {\n\tfeed := getFeed1()\n\tpost := getPost1()\n\n\ticon := \"🥰\"\n\tReactPost(feed.id, post.id, icon, true)\n\n\t// Set reaction\n\treactionCount_, ok := post.reactions.Get(\"🥰\")\n\tif !ok {\n\t\tt.Fatalf(\"expected 🥰 exists\")\n\t}\n\n\treactionCount := reactionCount_.(int)\n\tif reactionCount != 1 {\n\t\tt.Fatalf(\"expected reactionCount: 1, got %q.\", reactionCount)\n\t}\n\n\t// Unset reaction\n\tReactPost(feed.id, post.id, icon, false)\n\t_, exist := post.reactions.Get(\"🥰\")\n\tif exist {\n\t\tt.Fatalf(\"expected 🥰 not exist\")\n\t}\n}\n\nfunc testCreateAndDeleteComment(t *testing.T) {\n\tfeed1 := getFeed1()\n\tpost1 := getPost1()\n\n\tmetadata := `empty_meta_data`\n\n\tcommentID1 := CreatePost(feed1.id, post1.id, cat1, metadata)\n\tcommentID2 := CreatePost(feed1.id, post1.id, cat1, metadata)\n\tcomment2 := feed1.MustGetPost(commentID2)\n\n\tif comment2.id != 3 { // 1 post + 2 comments = 3\n\t\tt.Fatalf(\"expected comment postID: 3, got %q.\", comment2.id)\n\t}\n\n\tif comment2.parentID != post1.id {\n\t\tt.Fatalf(\"expected comment parentID: %q, got %q.\", post1.id, comment2.parentID)\n\t}\n\n\t// Check comment count on parent\n\tif post1.commentsCount != 2 {\n\t\tt.Fatalf(\"expected comments count: 2, got %d.\", post1.commentsCount)\n\t}\n\n\t// Get comments\n\tcomments := GetComments(feed1.id, post1.id, 0, 10)\n\tcommentsParsed := ujson.ParseSlice(comments)\n\n\tif len(commentsParsed) != 2 {\n\t\tt.Fatalf(\"expected encoded comments: 2, got %q.\", commentsParsed)\n\t}\n\n\t// Delete 1 comment\n\tDeletePost(feed1.id, comment2.id)\n\tcomments = GetComments(feed1.id, post1.id, 0, 10)\n\tcommentsParsed = ujson.ParseSlice(comments)\n\n\tif len(commentsParsed) != 1 {\n\t\tt.Fatalf(\"expected encoded comments: 1, got %q.\", commentsParsed)\n\t}\n\n\t// Check comment count on parent\n\tif post1.commentsCount != 1 {\n\t\tt.Fatalf(\"expected comments count: 1, got %d.\", post1.commentsCount)\n\t}\n}\n\nfunc countPosts(feedID FeedID, categories []uint64, limit uint8) int {\n\toffset := uint64(0)\n\n\tpostsStr := GetPosts(feedID, 0, \"\", categories, offset, limit)\n\tif postsStr == \"[]\" {\n\t\treturn 0\n\t}\n\n\tparsedPosts := ujson.ParseSlice(postsStr)\n\tpostsCount := len(parsedPosts)\n\treturn postsCount\n}\n\nfunc countPostsByUser(feedID FeedID, user string) int {\n\toffset := uint64(0)\n\tlimit := uint8(10)\n\n\tpostsStr := GetPosts(feedID, 0, user, []uint64{}, offset, limit)\n\tif postsStr == \"[]\" {\n\t\treturn 0\n\t}\n\n\tparsedPosts := ujson.ParseSlice(postsStr)\n\tpostsCount := len(parsedPosts)\n\treturn postsCount\n}\n\nfunc testFilterByCategories(t *testing.T) {\n\t// // Re-add reaction to test post list\n\t// ReactPost(1, postID, \"🥰\", true)\n\t// ReactPost(1, postID, \"😇\", true)\n\n\tfilter_cat1 := []uint64{1}\n\tfilter_cat1_2 := []uint64{1, 2}\n\tfilter_cat9 := []uint64{9}\n\tfilter_cat1_2_9 := []uint64{1, 2, 9}\n\n\tfeedID2 := CreateFeed(\"teritori2\")\n\tfeed2 := mustGetFeed(feedID2)\n\n\t// Create 2 posts on root with cat1\n\tpostID1 := CreatePost(feed2.id, rootPostID, cat1, \"metadata\")\n\tpostID2 := CreatePost(feed2.id, rootPostID, cat1, \"metadata\")\n\n\t// Create 1 posts on root with cat2\n\tpostID3 := CreatePost(feed2.id, rootPostID, cat2, \"metadata\")\n\n\t// Create comments on post 1\n\tcommentPostID1 := CreatePost(feed2.id, postID1, cat1, \"metadata\")\n\n\t// cat1: Should return max = limit\n\tif count := countPosts(feed2.id, filter_cat1, 1); count != 1 {\n\t\tt.Fatalf(\"expected posts count: 1, got %q.\", count)\n\t}\n\n\t// cat1: Should return max = total\n\tif count := countPosts(feed2.id, filter_cat1, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// cat 1 + 2: Should return max = limit\n\tif count := countPosts(feed2.id, filter_cat1_2, 2); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// cat 1 + 2: Should return max = total on both\n\tif count := countPosts(feed2.id, filter_cat1_2, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// cat 1, 2, 9: Should return total of 1, 2\n\tif count := countPosts(feed2.id, filter_cat1_2_9, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// cat 9: Should return 0\n\tif count := countPosts(feed2.id, filter_cat9, 10); count != 0 {\n\t\tt.Fatalf(\"expected posts count: 0, got %q.\", count)\n\t}\n\n\t// cat all: should return all\n\tif count := countPosts(feed2.id, filter_all, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// add comments should not impact the results\n\tCreatePost(feed2.id, postID1, cat1, \"metadata\")\n\tCreatePost(feed2.id, postID2, cat1, \"metadata\")\n\n\tif count := countPosts(feed2.id, filter_all, 10); count != 3 {\n\t\tt.Fatalf(\"expected posts count: 3, got %q.\", count)\n\t}\n\n\t// delete a post should affect the result\n\tDeletePost(feed2.id, postID1)\n\n\tif count := countPosts(feed2.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n}\n\nfunc testTipPost(t *testing.T) {\n\tcreator := testutils.TestAddress(\"creator\")\n\tstd.TestIssueCoins(creator, std.Coins{{\"ugnot\", 100_000_000}})\n\n\t// NOTE: Dont know why the address should be this to be able to call banker (= std.CallerAt(1))\n\ttipper := testutils.TestAddress(\"tipper\")\n\tstd.TestIssueCoins(tipper, std.Coins{{\"ugnot\", 50_000_000}})\n\n\tbanker := std.NewBanker(std.BankerTypeReadonly)\n\n\t// Check Original coins of creator/tipper\n\tif coins := banker.GetCoins(creator); coins[0].Amount != 100_000_000 {\n\t\tt.Fatalf(\"expected creator coin count: 100_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\tif coins := banker.GetCoins(tipper); coins[0].Amount != 50_000_000 {\n\t\tt.Fatalf(\"expected tipper coin count: 50_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\t// Creator creates feed, post\n\tstd.TestSetOriginCaller(creator)\n\n\tfeedID3 := CreateFeed(\"teritori3\")\n\tfeed3 := mustGetFeed(feedID3)\n\n\tpostID1 := CreatePost(feed3.id, rootPostID, cat1, \"metadata\")\n\tpost1 := feed3.MustGetPost(postID1)\n\n\t// Tiper tips the ppst\n\tstd.TestSetOriginCaller(tipper)\n\tstd.TestSetOriginSend(std.Coins{{\"ugnot\", 1_000_000}}, nil)\n\tTipPost(feed3.id, post1.id)\n\n\t// Coin must be increased for creator\n\tif coins := banker.GetCoins(creator); coins[0].Amount != 101_000_000 {\n\t\tt.Fatalf(\"expected creator coin after beging tipped: 101_000_000, got %d.\", coins[0].Amount)\n\t}\n\n\t// Total tip amount should increased\n\tif post1.tipAmount != 1_000_000 {\n\t\tt.Fatalf(\"expected total tipAmount: 1_000_000, got %d.\", post1.tipAmount)\n\t}\n\n\t// Add more tip should update this total\n\tstd.TestSetOriginSend(std.Coins{{\"ugnot\", 2_000_000}}, nil)\n\tTipPost(feed3.id, post1.id)\n\n\tif post1.tipAmount != 3_000_000 {\n\t\tt.Fatalf(\"expected total tipAmount: 3_000_000, got %d.\", post1.tipAmount)\n\t}\n}\n\nfunc testFlagPost(t *testing.T) {\n\tflagger := testutils.TestAddress(\"flagger\")\n\n\tfeedID9 := CreateFeed(\"teritori9\")\n\tfeed9 := mustGetFeed(feedID9)\n\n\tCreatePost(feed9.id, rootPostID, cat1, \"metadata1\")\n\tpid := CreatePost(feed9.id, rootPostID, cat1, \"metadata1\")\n\n\t// Flag post\n\tstd.TestSetOriginCaller(flagger)\n\tFlagPost(feed9.id, pid)\n\n\t// Another user flags\n\tanother := testutils.TestAddress(\"another\")\n\tstd.TestSetOriginCaller(another)\n\tFlagPost(feed9.id, pid)\n\n\tflaggedPostsStr := GetFlaggedPosts(feed9.id, 0, 10)\n\tparsed := ujson.ParseSlice(flaggedPostsStr)\n\tif flaggedPostsCount := len(parsed); flaggedPostsCount != 1 {\n\t\tt.Fatalf(\"expected flagged posts: 1, got %d.\", flaggedPostsCount)\n\t}\n}\n\nfunc testFilterUser(t *testing.T) {\n\tuser1 := testutils.TestAddress(\"user1\")\n\tuser2 := testutils.TestAddress(\"user2\")\n\n\t// User1 create 2 posts\n\tstd.TestSetOriginCaller(user1)\n\n\tfeedID4 := CreateFeed(\"teritori4\")\n\tfeed4 := mustGetFeed(feedID4)\n\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata2\": \"value\"}`)\n\n\t// User2 create 1 post\n\tstd.TestSetOriginCaller(user2)\n\tCreatePost(feed4.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\n\tif count := countPostsByUser(feed4.id, user1.String()); count != 2 {\n\t\tt.Fatalf(\"expected total posts by user1: 2, got %d.\", count)\n\t}\n\n\tif count := countPostsByUser(feed4.id, user2.String()); count != 1 {\n\t\tt.Fatalf(\"expected total posts by user2: 1, got %d.\", count)\n\t}\n\n\tif count := countPostsByUser(feed4.id, \"\"); count != 3 {\n\t\tt.Fatalf(\"expected total posts: 3, got %d.\", count)\n\t}\n}\n\nfunc testHidePostForMe(t *testing.T) {\n\tuser := std.Address(\"user\")\n\tstd.TestSetOriginCaller(user)\n\n\tfeedID8 := CreateFeed(\"teritor8\")\n\tfeed8 := mustGetFeed(feedID8)\n\n\tpostIDToHide := CreatePost(feed8.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\tpostID := CreatePost(feed8.id, rootPostID, cat1, `{\"metadata\": \"value\"}`)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count: 2, got %q.\", count)\n\t}\n\n\t// Hide a post for me\n\tHidePostForMe(feed8.id, postIDToHide)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 1 {\n\t\tt.Fatalf(\"expected posts count after hidding: 1, got %q.\", count)\n\t}\n\n\t// Query from another user should return full list\n\tanother := std.Address(\"another\")\n\tstd.TestSetOriginCaller(another)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count from another: 2, got %q.\", count)\n\t}\n\n\t// UnHide a post for me\n\tstd.TestSetOriginCaller(user)\n\tUnHidePostForMe(feed8.id, postIDToHide)\n\n\tif count := countPosts(feed8.id, filter_all, 10); count != 2 {\n\t\tt.Fatalf(\"expected posts count after unhidding: 2, got %q.\", count)\n\t}\n}\n\nfunc testMigrateFeedData(t *testing.T) string {\n\tfeedID := feedsV7.CreateFeed(\"teritor11\")\n\n\t// Post to test\n\tpostID := feedsV7.CreatePost(feedID, feedsV7.PostID(0), 2, `{\"metadata\": \"value\"}`)\n\tfeedsV7.ReactPost(feedID, postID, \"🇬🇸\", true)\n\n\t// Add comment to post\n\tcommentID := feedsV7.CreatePost(feedID, postID, 2, `{\"comment1\": \"value\"}`)\n\tfeedsV7.ReactPost(feedID, commentID, \"🇬🇸\", true)\n\n\t// // Post with json metadata\n\tfeedsV7.CreatePost(feedID, feedsV7.PostID(0), 2, `{'a':1}`)\n\n\t// Expect: should convert feed data to JSON successfully without error\n\tdataJSON := feedsV7.ExportFeedData(feedID)\n\tif dataJSON == \"\" {\n\t\tt.Fatalf(\"expected feed data exported successfully\")\n\t}\n\n\t// Import data =====================================\n\tImportFeedData(FeedID(uint64(feedID)), dataJSON)\n\n\t// Test public func\n\t// MigrateFromPreviousFeed(feedID)\n}\n\nfunc Test(t *testing.T) {\n\ttestCreateFeed(t)\n\n\ttestCreatePost(t)\n\n\ttestGetPosts(t)\n\n\ttestReactPost(t)\n\n\ttestCreateAndDeleteComment(t)\n\n\ttestFilterByCategories(t)\n\n\ttestTipPost(t)\n\n\ttestFilterUser(t)\n\n\ttestFlagPost(t)\n\n\ttestHidePostForMe(t)\n\n\ttestMigrateFeedData(t)\n}\n"
           },
           {
             "Name": "flags.gno",
@@ -60,11 +60,11 @@ stdout OK!
           },
           {
             "Name": "post.gno",
-            "Body": "package social_feeds\n\nimport (\n\t\"std\"\n\t\"strconv\"\n\t\"time\"\n\n\t\"gno.land/p/demo/avl\"\n\tujson \"gno.land/p/demo/teritori/ujson\"\n)\n\ntype PostID uint64\n\nfunc (pid PostID) String() string {\n\treturn strconv.Itoa(int(pid))\n}\n\nfunc (pid *PostID) FromJSON(ast *ujson.JSONASTNode) {\n\tval, err := strconv.Atoi(ast.Value)\n\tif err != nil {\n\t\tpanic(err)\n\t}\n\t*pid = PostID(val)\n}\n\nfunc (pid PostID) ToJSON() string {\n\treturn strconv.Itoa(int(pid))\n}\n\ntype Reaction struct {\n\ticon  string\n\tcount uint64\n}\n\nvar Categories []string = []string{\n\t\"Reaction\",\n\t\"Comment\",\n\t\"Normal\",\n\t\"Article\",\n\t\"Picture\",\n\t\"Audio\",\n\t\"Video\",\n}\n\ntype Post struct {\n\tid            PostID\n\tparentID      PostID\n\tfeedID        FeedID\n\tcategory      uint64\n\tmetadata      string\n\treactions     avl.Tree // icon -> count\n\tcomments      avl.Tree // Post.id -> *Post\n\tcreator       std.Address\n\ttipAmount     uint64\n\tdeleted       bool\n\tcommentsCount uint64\n\n\tcreatedAt int64\n\tupdatedAt int64\n\tdeletedAt int64\n}\n\nfunc newPost(feed *Feed, id PostID, creator std.Address, parentID PostID, category uint64, metadata string) *Post {\n\treturn &Post{\n\t\tid:        id,\n\t\tparentID:  parentID,\n\t\tfeedID:    feed.id,\n\t\tcategory:  category,\n\t\tmetadata:  metadata,\n\t\treactions: avl.Tree{},\n\t\tcreator:   creator,\n\t\tcreatedAt: time.Now().Unix(),\n\t}\n}\n\nfunc (post *Post) String() string {\n\treturn post.ToJSON()\n}\n\nfunc (post *Post) Update(category uint64, metadata string) {\n\tpost.category = category\n\tpost.metadata = metadata\n\tpost.updatedAt = time.Now().Unix()\n}\n\nfunc (post *Post) Delete() {\n\tpost.deleted = true\n\tpost.deletedAt = time.Now().Unix()\n}\n\nfunc (post *Post) Tip(from std.Address, to std.Address) {\n\treceivedCoins := std.GetOrigSend()\n\tamount := receivedCoins[0].Amount\n\n\tbanker := std.GetBanker(std.BankerTypeOrigSend)\n\t// banker := std.GetBanker(std.BankerTypeRealmSend)\n\tcoinsToSend := std.Coins{std.Coin{Denom: \"ugnot\", Amount: amount}}\n\tpkgaddr := std.GetOrigPkgAddr()\n\n\tbanker.SendCoins(pkgaddr, to, coinsToSend)\n\n\t// Update tip amount\n\tpost.tipAmount += uint64(amount)\n}\n\n// Always remove reaction if count = 0\nfunc (post *Post) React(icon string, up bool) {\n\tcount_, ok := post.reactions.Get(icon)\n\tcount := 0\n\n\tif ok {\n\t\tcount = count_.(int)\n\t}\n\n\tif up {\n\t\tcount++\n\t} else {\n\t\tcount--\n\t}\n\n\tif count <= 0 {\n\t\tpost.reactions.Remove(icon)\n\t} else {\n\t\tpost.reactions.Set(icon, count)\n\t}\n}\n\nfunc (post *Post) Render() string {\n\treturn post.metadata\n}\n\nfunc (post *Post) FromJSON(jsonData string) {\n\tast := ujson.TokenizeAndParse(jsonData)\n\tast.ParseObject([]*ujson.ParseKV{\n\t\t{Key: \"id\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tpid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.id = PostID(pid)\n\t\t}},\n\t\t{Key: \"parentID\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tpid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.parentID = PostID(pid)\n\t\t}},\n\t\t{Key: \"feedID\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tfid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.feedID = FeedID(fid)\n\t\t}},\n\t\t{Key: \"category\", Value: &post.category},\n\t\t{Key: \"metadata\", Value: &post.metadata},\n\t\t{Key: \"reactions\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\treactions := avl.NewTree()\n\t\t\tfor _, child := range node.ObjectChildren {\n\t\t\t\treactionCount := child.Value\n\t\t\t\treactions.Set(child.Key, reactionCount)\n\t\t\t}\n\t\t\tpost.reactions = *reactions\n\t\t}},\n\t\t{Key: \"commentsCount\", Value: &post.commentsCount},\n\t\t{Key: \"creator\", Value: &post.creator},\n\t\t{Key: \"tipAmount\", Value: &post.tipAmount},\n\t\t{Key: \"deleted\", Value: &post.deleted},\n\t\t{Key: \"createdAt\", Value: &post.createdAt},\n\t\t{Key: \"updatedAt\", Value: &post.updatedAt},\n\t\t{Key: \"deletedAt\", Value: &post.deletedAt},\n\t})\n}\n\nfunc (post *Post) ToJSON() string {\n\treactionsKV := []ujson.FormatKV{}\n\tpost.reactions.Iterate(\"\", \"\", func(key string, value interface{}) bool {\n\t\tcount := value.(int)\n\t\tdata := ujson.FormatKV{Key: key, Value: count}\n\t\treactionsKV = append(reactionsKV, data)\n\t\treturn false\n\t})\n\treactions := ujson.FormatObject(reactionsKV)\n\n\tpostJSON := ujson.FormatObject([]ujson.FormatKV{\n\t\t{Key: \"id\", Value: uint64(post.id)},\n\t\t{Key: \"parentID\", Value: uint64(post.parentID)},\n\t\t{Key: \"feedID\", Value: uint64(post.feedID)},\n\t\t{Key: \"category\", Value: post.category},\n\t\t{Key: \"metadata\", Value: post.metadata},\n\t\t{Key: \"reactions\", Value: reactions, Raw: true},\n\t\t{Key: \"creator\", Value: post.creator},\n\t\t{Key: \"tipAmount\", Value: post.tipAmount},\n\t\t{Key: \"deleted\", Value: post.deleted},\n\t\t{Key: \"commentsCount\", Value: post.commentsCount},\n\t\t{Key: \"createdAt\", Value: post.createdAt},\n\t\t{Key: \"updatedAt\", Value: post.updatedAt},\n\t\t{Key: \"deletedAt\", Value: post.deletedAt},\n\t})\n\treturn postJSON\n}\n"
+            "Body": "package social_feeds\n\nimport (\n\t\"std\"\n\t\"strconv\"\n\t\"time\"\n\n\t\"gno.land/p/demo/avl\"\n\tujson \"gno.land/p/demo/teritori/ujson\"\n)\n\ntype PostID uint64\n\nfunc (pid PostID) String() string {\n\treturn strconv.Itoa(int(pid))\n}\n\nfunc (pid *PostID) FromJSON(ast *ujson.JSONASTNode) {\n\tval, err := strconv.Atoi(ast.Value)\n\tif err != nil {\n\t\tpanic(err)\n\t}\n\t*pid = PostID(val)\n}\n\nfunc (pid PostID) ToJSON() string {\n\treturn strconv.Itoa(int(pid))\n}\n\ntype Reaction struct {\n\ticon  string\n\tcount uint64\n}\n\nvar Categories []string = []string{\n\t\"Reaction\",\n\t\"Comment\",\n\t\"Normal\",\n\t\"Article\",\n\t\"Picture\",\n\t\"Audio\",\n\t\"Video\",\n}\n\ntype Post struct {\n\tid            PostID\n\tparentID      PostID\n\tfeedID        FeedID\n\tcategory      uint64\n\tmetadata      string\n\treactions     avl.Tree // icon -> count\n\tcomments      avl.Tree // Post.id -> *Post\n\tcreator       std.Address\n\ttipAmount     uint64\n\tdeleted       bool\n\tcommentsCount uint64\n\n\tcreatedAt int64\n\tupdatedAt int64\n\tdeletedAt int64\n}\n\nfunc newPost(feed *Feed, id PostID, creator std.Address, parentID PostID, category uint64, metadata string) *Post {\n\treturn &Post{\n\t\tid:        id,\n\t\tparentID:  parentID,\n\t\tfeedID:    feed.id,\n\t\tcategory:  category,\n\t\tmetadata:  metadata,\n\t\treactions: avl.Tree{},\n\t\tcreator:   creator,\n\t\tcreatedAt: time.Now().Unix(),\n\t}\n}\n\nfunc (post *Post) String() string {\n\treturn post.ToJSON()\n}\n\nfunc (post *Post) Update(category uint64, metadata string) {\n\tpost.category = category\n\tpost.metadata = metadata\n\tpost.updatedAt = time.Now().Unix()\n}\n\nfunc (post *Post) Delete() {\n\tpost.deleted = true\n\tpost.deletedAt = time.Now().Unix()\n}\n\nfunc (post *Post) Tip(from std.Address, to std.Address) {\n\treceivedCoins := std.OriginSend()\n\tamount := receivedCoins[0].Amount\n\n\tbanker := std.NewBanker(std.BankerTypeOriginSend)\n\t// banker := std.NewBanker(std.BankerTypeRealmSend)\n\tcoinsToSend := std.Coins{std.Coin{Denom: \"ugnot\", Amount: amount}}\n\tpkgaddr := std.OriginPkgAddress()\n\n\tbanker.SendCoins(pkgaddr, to, coinsToSend)\n\n\t// Update tip amount\n\tpost.tipAmount += uint64(amount)\n}\n\n// Always remove reaction if count = 0\nfunc (post *Post) React(icon string, up bool) {\n\tcount_, ok := post.reactions.Get(icon)\n\tcount := 0\n\n\tif ok {\n\t\tcount = count_.(int)\n\t}\n\n\tif up {\n\t\tcount++\n\t} else {\n\t\tcount--\n\t}\n\n\tif count <= 0 {\n\t\tpost.reactions.Remove(icon)\n\t} else {\n\t\tpost.reactions.Set(icon, count)\n\t}\n}\n\nfunc (post *Post) Render() string {\n\treturn post.metadata\n}\n\nfunc (post *Post) FromJSON(jsonData string) {\n\tast := ujson.TokenizeAndParse(jsonData)\n\tast.ParseObject([]*ujson.ParseKV{\n\t\t{Key: \"id\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tpid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.id = PostID(pid)\n\t\t}},\n\t\t{Key: \"parentID\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tpid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.parentID = PostID(pid)\n\t\t}},\n\t\t{Key: \"feedID\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\tfid, _ := strconv.Atoi(node.Value)\n\t\t\tpost.feedID = FeedID(fid)\n\t\t}},\n\t\t{Key: \"category\", Value: &post.category},\n\t\t{Key: \"metadata\", Value: &post.metadata},\n\t\t{Key: \"reactions\", CustomParser: func(node *ujson.JSONASTNode) {\n\t\t\treactions := avl.NewTree()\n\t\t\tfor _, child := range node.ObjectChildren {\n\t\t\t\treactionCount := child.Value\n\t\t\t\treactions.Set(child.Key, reactionCount)\n\t\t\t}\n\t\t\tpost.reactions = *reactions\n\t\t}},\n\t\t{Key: \"commentsCount\", Value: &post.commentsCount},\n\t\t{Key: \"creator\", Value: &post.creator},\n\t\t{Key: \"tipAmount\", Value: &post.tipAmount},\n\t\t{Key: \"deleted\", Value: &post.deleted},\n\t\t{Key: \"createdAt\", Value: &post.createdAt},\n\t\t{Key: \"updatedAt\", Value: &post.updatedAt},\n\t\t{Key: \"deletedAt\", Value: &post.deletedAt},\n\t})\n}\n\nfunc (post *Post) ToJSON() string {\n\treactionsKV := []ujson.FormatKV{}\n\tpost.reactions.Iterate(\"\", \"\", func(key string, value interface{}) bool {\n\t\tcount := value.(int)\n\t\tdata := ujson.FormatKV{Key: key, Value: count}\n\t\treactionsKV = append(reactionsKV, data)\n\t\treturn false\n\t})\n\treactions := ujson.FormatObject(reactionsKV)\n\n\tpostJSON := ujson.FormatObject([]ujson.FormatKV{\n\t\t{Key: \"id\", Value: uint64(post.id)},\n\t\t{Key: \"parentID\", Value: uint64(post.parentID)},\n\t\t{Key: \"feedID\", Value: uint64(post.feedID)},\n\t\t{Key: \"category\", Value: post.category},\n\t\t{Key: \"metadata\", Value: post.metadata},\n\t\t{Key: \"reactions\", Value: reactions, Raw: true},\n\t\t{Key: \"creator\", Value: post.creator},\n\t\t{Key: \"tipAmount\", Value: post.tipAmount},\n\t\t{Key: \"deleted\", Value: post.deleted},\n\t\t{Key: \"commentsCount\", Value: post.commentsCount},\n\t\t{Key: \"createdAt\", Value: post.createdAt},\n\t\t{Key: \"updatedAt\", Value: post.updatedAt},\n\t\t{Key: \"deletedAt\", Value: post.deletedAt},\n\t})\n\treturn postJSON\n}\n"
           },
           {
             "Name": "public.gno",
-            "Body": "package social_feeds\n\nimport (\n\t\"std\"\n\t\"strconv\"\n\t\"strings\"\n\n\t\"gno.land/p/demo/avl\"\n\t\"gno.land/p/demo/teritori/flags_index\"\n\t\"gno.land/p/demo/ufmt\"\n)\n\n// Only registered user can create a new feed\n// For the flexibility when testing, allow all user to create feed\nfunc CreateFeed(name string) FeedID {\n\tpkgpath := std.CurrentRealmPath()\n\n\tfid := incGetFeedID()\n\tcaller := std.PrevRealm().Addr()\n\turl := strings.Replace(pkgpath, \"gno.land\", \"\", -1) + \":\" + name\n\tfeed := newFeed(fid, url, name, caller)\n\tfidkey := feedIDKey(fid)\n\tgFeeds.Set(fidkey, feed)\n\tgFeedsByName.Set(name, feed)\n\treturn feed.id\n}\n\n// Anyone can create a post in a existing feed, allow un-registered users also\nfunc CreatePost(fid FeedID, parentID PostID, catetory uint64, metadata string) PostID {\n\tcaller := std.PrevRealm().Addr()\n\n\tfeed := mustGetFeed(fid)\n\tpost := feed.AddPost(caller, parentID, catetory, metadata)\n\treturn post.id\n}\n\n// Only post's owner can edit post\nfunc EditPost(fid FeedID, pid PostID, category uint64, metadata string) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tif caller != post.creator {\n\t\tpanic(\"you are not creator of this post\")\n\t}\n\n\tpost.Update(category, metadata)\n}\n\n// Only feed creator/owner can call this\nfunc SetOwner(fid FeedID, newOwner std.Address) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\n\tif caller != feed.creator && caller != feed.owner {\n\t\tpanic(\"you are not creator/owner of this feed\")\n\t}\n\n\tfeed.owner = newOwner\n}\n\n// Only feed creator/owner or post creator can delete the post\nfunc DeletePost(fid FeedID, pid PostID) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tif caller != post.creator && caller != feed.creator && caller != feed.owner {\n\t\tpanic(\"you are nor creator of this post neither creator/owner of the feed\")\n\t}\n\n\tpost.Delete()\n\n\t// If post is comment then decrease comments count on parent\n\tif uint64(post.parentID) != 0 {\n\t\tparent := feed.MustGetPost(post.parentID)\n\t\tparent.commentsCount -= 1\n\t}\n}\n\n// Only feed owner can ban the post\nfunc BanPost(fid FeedID, pid PostID, reason string) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\t_ = feed.MustGetPost(pid)\n\n\t// For experimenting, we ban only the post for now\n\t// TODO: recursive delete/ban comments\n\tif caller != feed.owner {\n\t\tpanic(\"you are owner of the feed\")\n\t}\n\n\tfeed.BanPost(pid)\n\n\tfeed.flags.ClearFlagCount(getFlagID(fid, pid))\n}\n\n// Any one can react post\nfunc ReactPost(fid FeedID, pid PostID, icon string, up bool) {\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tpost.React(icon, up)\n}\n\nfunc TipPost(fid FeedID, pid PostID) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tpost.Tip(caller, post.creator)\n}\n\n// Get a list of flagged posts\n// NOTE: We can support multi feeds in the future but for now we will have only 1 feed\n// Return stringified list in format: postStr-count,postStr-count\nfunc GetFlaggedPosts(fid FeedID, offset uint64, limit uint8) string {\n\tfeed := mustGetFeed(fid)\n\n\t// Already sorted by count descending\n\tflags := feed.flags.GetFlags(uint64(limit), offset)\n\n\tvar postList []string\n\tfor _, flagCount := range flags {\n\t\tflagID := flagCount.FlagID\n\n\t\tfeedID, postID := parseFlagID(flagID)\n\t\tif feedID != feed.id {\n\t\t\tcontinue\n\t\t}\n\n\t\tpost := feed.GetPost(postID)\n\t\tpostList = append(postList, ufmt.Sprintf(\"%s\", post))\n\t}\n\n\tSEPARATOR := \",\"\n\tres := strings.Join(postList, SEPARATOR)\n\treturn ufmt.Sprintf(\"[%s]\", res)\n}\n\n// NOTE: due to bug of std.PrevRealm().Addr() return \"\" when query so we user this proxy function temporary\n// in waiting of correct behaviour of std.PrevRealm().Addr()\nfunc GetPosts(fid FeedID, parentID PostID, user string, categories []uint64, offset uint64, limit uint8) string {\n\tcaller := std.PrevRealm().Addr()\n\tdata := GetPostsWithCaller(fid, parentID, caller.String(), user, categories, offset, limit)\n\treturn data\n}\n\nfunc GetPostsWithCaller(fid FeedID, parentID PostID, callerAddrStr string, user string, categories []uint64, offset uint64, limit uint8) string {\n\t// Return flagged posts, we process flagged posts differently using FlagIndex\n\tif len(categories) == 1 && categories[0] == uint64(9) {\n\t\treturn GetFlaggedPosts(fid, offset, limit)\n\t}\n\n\t// BUG: normally std.PrevRealm().Addr() should return a value instead of empty\n\t// Fix is in progress on Gno side\n\tfeed := mustGetFeed(fid)\n\tposts := getPosts(feed, parentID, callerAddrStr, user, categories, offset, limit)\n\n\tSEPARATOR := \",\"\n\tvar postListStr []string\n\n\tfor _, post := range posts {\n\t\tpostListStr = append(postListStr, post.String())\n\t}\n\n\tres := strings.Join(postListStr, SEPARATOR)\n\treturn ufmt.Sprintf(\"[%s]\", res)\n}\n\n// user here is: filter by user\nfunc getPosts(feed *Feed, parentID PostID, callerAddrStr string, user string, categories []uint64, offset uint64, limit uint8) []*Post {\n\tcaller := std.Address(callerAddrStr)\n\n\tvar posts []*Post\n\tvar skipped uint64\n\n\t// Create an avlTree for optimizing the check\n\trequestedCategories := avl.NewTree()\n\tfor _, category := range categories {\n\t\tcatStr := strconv.FormatUint(category, 10)\n\t\trequestedCategories.Set(catStr, true)\n\t}\n\n\tfeed.posts.ReverseIterate(\"\", \"\", func(key string, value interface{}) bool {\n\t\tpost := value.(*Post)\n\n\t\tpostCatStr := strconv.FormatUint(post.category, 10)\n\n\t\t// NOTE: this search mechanism is not efficient, only for demo purpose\n\t\tif post.parentID == parentID && post.deleted == false {\n\t\t\tif requestedCategories.Size() > 0 && !requestedCategories.Has(postCatStr) {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\tif user != \"\" && std.Address(user) != post.creator {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\t// Filter hidden post\n\t\t\tflagID := getFlagID(feed.id, post.id)\n\t\t\tif feed.flags.HasFlagged(flagID, callerAddrStr) {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\t// Check if post is in hidden list\n\t\t\tvalue, exists := feed.hiddenPostsByUser.Get(caller.String())\n\t\t\tif exists {\n\t\t\t\thiddenPosts := value.(*avl.Tree)\n\t\t\t\t// If post.id exists in hiddenPosts tree => that post is hidden\n\t\t\t\tif hiddenPosts.Has(post.id.String()) {\n\t\t\t\t\treturn false\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tif skipped < offset {\n\t\t\t\tskipped++\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\tposts = append(posts, post)\n\t\t}\n\n\t\tif len(posts) == int(limit) {\n\t\t\treturn true\n\t\t}\n\n\t\treturn false\n\t})\n\n\treturn posts\n}\n\n// Get comments list\nfunc GetComments(fid FeedID, parentID PostID, offset uint64, limit uint8) string {\n\treturn GetPosts(fid, parentID, \"\", []uint64{}, offset, limit)\n}\n\n// Get Post\nfunc GetPost(fid FeedID, pid PostID) string {\n\tfeed := mustGetFeed(fid)\n\n\tdata, ok := feed.posts.Get(postIDKey(pid))\n\tif !ok {\n\t\tpanic(\"Unable to get post\")\n\t}\n\n\tpost := data.(*Post)\n\treturn post.String()\n}\n\nfunc FlagPost(fid FeedID, pid PostID) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.FlagPost(caller, pid)\n}\n\nfunc HidePostForMe(fid FeedID, pid PostID) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.HidePostForUser(caller, pid)\n}\n\nfunc UnHidePostForMe(fid FeedID, pid PostID) {\n\tcaller := std.PrevRealm().Addr()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.UnHidePostForUser(caller, pid)\n}\n\nfunc GetFlags(fid FeedID, limit uint64, offset uint64) string {\n\tfeed := mustGetFeed(fid)\n\n\ttype FlagCount struct {\n\t\tFlagID flags_index.FlagID\n\t\tCount  uint64\n\t}\n\n\tflags := feed.flags.GetFlags(limit, offset)\n\n\tvar res []string\n\tfor _, flag := range flags {\n\t\tres = append(res, ufmt.Sprintf(\"%s:%d\", flag.FlagID, flag.Count))\n\t}\n\n\treturn strings.Join(res, \"|\")\n}\n\n// TODO: allow only creator to call\nfunc GetFeedByID(fid FeedID) *Feed {\n\treturn mustGetFeed(fid)\n}\n\n// TODO: allow only admin to call\nfunc ExportFeedData(fid FeedID) string {\n\tfeed := mustGetFeed(fid)\n\tfeedJSON := feed.ToJSON()\n\treturn feedJSON\n}\n\n// TODO: allow only admin to call\nfunc ImportFeedData(fid FeedID, jsonData string) {\n\tfeed := mustGetFeed(fid)\n\tfeed.FromJSON(jsonData)\n}\n\n// func MigrateFromPreviousFeed(fid feedsV7.FeedID) {\n// \t// Get exported data from previous feeds\n// \tjsonData := feedsV7.ExportFeedData(fid)\n// \tImportFeedData(FeedID(uint64(fid)), jsonData)\n// }\n"
+            "Body": "package social_feeds\n\nimport (\n\t\"std\"\n\t\"strconv\"\n\t\"strings\"\n\n\t\"gno.land/p/demo/avl\"\n\t\"gno.land/p/demo/teritori/flags_index\"\n\t\"gno.land/p/demo/ufmt\"\n)\n\n// Only registered user can create a new feed\n// For the flexibility when testing, allow all user to create feed\nfunc CreateFeed(name string) FeedID {\n\tpkgpath := std.CurrentRealmPath()\n\n\tfid := incGetFeedID()\n\tcaller := std.PreviousRealm().Address()\n\turl := strings.Replace(pkgpath, \"gno.land\", \"\", -1) + \":\" + name\n\tfeed := newFeed(fid, url, name, caller)\n\tfidkey := feedIDKey(fid)\n\tgFeeds.Set(fidkey, feed)\n\tgFeedsByName.Set(name, feed)\n\treturn feed.id\n}\n\n// Anyone can create a post in a existing feed, allow un-registered users also\nfunc CreatePost(fid FeedID, parentID PostID, catetory uint64, metadata string) PostID {\n\tcaller := std.PreviousRealm().Address()\n\n\tfeed := mustGetFeed(fid)\n\tpost := feed.AddPost(caller, parentID, catetory, metadata)\n\treturn post.id\n}\n\n// Only post's owner can edit post\nfunc EditPost(fid FeedID, pid PostID, category uint64, metadata string) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tif caller != post.creator {\n\t\tpanic(\"you are not creator of this post\")\n\t}\n\n\tpost.Update(category, metadata)\n}\n\n// Only feed creator/owner can call this\nfunc SetOwner(fid FeedID, newOwner std.Address) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\n\tif caller != feed.creator && caller != feed.owner {\n\t\tpanic(\"you are not creator/owner of this feed\")\n\t}\n\n\tfeed.owner = newOwner\n}\n\n// Only feed creator/owner or post creator can delete the post\nfunc DeletePost(fid FeedID, pid PostID) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tif caller != post.creator && caller != feed.creator && caller != feed.owner {\n\t\tpanic(\"you are nor creator of this post neither creator/owner of the feed\")\n\t}\n\n\tpost.Delete()\n\n\t// If post is comment then decrease comments count on parent\n\tif uint64(post.parentID) != 0 {\n\t\tparent := feed.MustGetPost(post.parentID)\n\t\tparent.commentsCount -= 1\n\t}\n}\n\n// Only feed owner can ban the post\nfunc BanPost(fid FeedID, pid PostID, reason string) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\t_ = feed.MustGetPost(pid)\n\n\t// For experimenting, we ban only the post for now\n\t// TODO: recursive delete/ban comments\n\tif caller != feed.owner {\n\t\tpanic(\"you are owner of the feed\")\n\t}\n\n\tfeed.BanPost(pid)\n\n\tfeed.flags.ClearFlagCount(getFlagID(fid, pid))\n}\n\n// Any one can react post\nfunc ReactPost(fid FeedID, pid PostID, icon string, up bool) {\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tpost.React(icon, up)\n}\n\nfunc TipPost(fid FeedID, pid PostID) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\tpost := feed.MustGetPost(pid)\n\n\tpost.Tip(caller, post.creator)\n}\n\n// Get a list of flagged posts\n// NOTE: We can support multi feeds in the future but for now we will have only 1 feed\n// Return stringified list in format: postStr-count,postStr-count\nfunc GetFlaggedPosts(fid FeedID, offset uint64, limit uint8) string {\n\tfeed := mustGetFeed(fid)\n\n\t// Already sorted by count descending\n\tflags := feed.flags.GetFlags(uint64(limit), offset)\n\n\tvar postList []string\n\tfor _, flagCount := range flags {\n\t\tflagID := flagCount.FlagID\n\n\t\tfeedID, postID := parseFlagID(flagID)\n\t\tif feedID != feed.id {\n\t\t\tcontinue\n\t\t}\n\n\t\tpost := feed.GetPost(postID)\n\t\tpostList = append(postList, ufmt.Sprintf(\"%s\", post))\n\t}\n\n\tSEPARATOR := \",\"\n\tres := strings.Join(postList, SEPARATOR)\n\treturn ufmt.Sprintf(\"[%s]\", res)\n}\n\n// NOTE: due to bug of std.PreviousRealm().Address() return \"\" when query so we user this proxy function temporary\n// in waiting of correct behaviour of std.PreviousRealm().Address()\nfunc GetPosts(fid FeedID, parentID PostID, user string, categories []uint64, offset uint64, limit uint8) string {\n\tcaller := std.PreviousRealm().Address()\n\tdata := GetPostsWithCaller(fid, parentID, caller.String(), user, categories, offset, limit)\n\treturn data\n}\n\nfunc GetPostsWithCaller(fid FeedID, parentID PostID, callerAddrStr string, user string, categories []uint64, offset uint64, limit uint8) string {\n\t// Return flagged posts, we process flagged posts differently using FlagIndex\n\tif len(categories) == 1 && categories[0] == uint64(9) {\n\t\treturn GetFlaggedPosts(fid, offset, limit)\n\t}\n\n\t// BUG: normally std.PreviousRealm().Address() should return a value instead of empty\n\t// Fix is in progress on Gno side\n\tfeed := mustGetFeed(fid)\n\tposts := getPosts(feed, parentID, callerAddrStr, user, categories, offset, limit)\n\n\tSEPARATOR := \",\"\n\tvar postListStr []string\n\n\tfor _, post := range posts {\n\t\tpostListStr = append(postListStr, post.String())\n\t}\n\n\tres := strings.Join(postListStr, SEPARATOR)\n\treturn ufmt.Sprintf(\"[%s]\", res)\n}\n\n// user here is: filter by user\nfunc getPosts(feed *Feed, parentID PostID, callerAddrStr string, user string, categories []uint64, offset uint64, limit uint8) []*Post {\n\tcaller := std.Address(callerAddrStr)\n\n\tvar posts []*Post\n\tvar skipped uint64\n\n\t// Create an avlTree for optimizing the check\n\trequestedCategories := avl.NewTree()\n\tfor _, category := range categories {\n\t\tcatStr := strconv.FormatUint(category, 10)\n\t\trequestedCategories.Set(catStr, true)\n\t}\n\n\tfeed.posts.ReverseIterate(\"\", \"\", func(key string, value interface{}) bool {\n\t\tpost := value.(*Post)\n\n\t\tpostCatStr := strconv.FormatUint(post.category, 10)\n\n\t\t// NOTE: this search mechanism is not efficient, only for demo purpose\n\t\tif post.parentID == parentID && post.deleted == false {\n\t\t\tif requestedCategories.Size() > 0 && !requestedCategories.Has(postCatStr) {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\tif user != \"\" && std.Address(user) != post.creator {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\t// Filter hidden post\n\t\t\tflagID := getFlagID(feed.id, post.id)\n\t\t\tif feed.flags.HasFlagged(flagID, callerAddrStr) {\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\t// Check if post is in hidden list\n\t\t\tvalue, exists := feed.hiddenPostsByUser.Get(caller.String())\n\t\t\tif exists {\n\t\t\t\thiddenPosts := value.(*avl.Tree)\n\t\t\t\t// If post.id exists in hiddenPosts tree => that post is hidden\n\t\t\t\tif hiddenPosts.Has(post.id.String()) {\n\t\t\t\t\treturn false\n\t\t\t\t}\n\t\t\t}\n\n\t\t\tif skipped < offset {\n\t\t\t\tskipped++\n\t\t\t\treturn false\n\t\t\t}\n\n\t\t\tposts = append(posts, post)\n\t\t}\n\n\t\tif len(posts) == int(limit) {\n\t\t\treturn true\n\t\t}\n\n\t\treturn false\n\t})\n\n\treturn posts\n}\n\n// Get comments list\nfunc GetComments(fid FeedID, parentID PostID, offset uint64, limit uint8) string {\n\treturn GetPosts(fid, parentID, \"\", []uint64{}, offset, limit)\n}\n\n// Get Post\nfunc GetPost(fid FeedID, pid PostID) string {\n\tfeed := mustGetFeed(fid)\n\n\tdata, ok := feed.posts.Get(postIDKey(pid))\n\tif !ok {\n\t\tpanic(\"Unable to get post\")\n\t}\n\n\tpost := data.(*Post)\n\treturn post.String()\n}\n\nfunc FlagPost(fid FeedID, pid PostID) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.FlagPost(caller, pid)\n}\n\nfunc HidePostForMe(fid FeedID, pid PostID) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.HidePostForUser(caller, pid)\n}\n\nfunc UnHidePostForMe(fid FeedID, pid PostID) {\n\tcaller := std.PreviousRealm().Address()\n\tfeed := mustGetFeed(fid)\n\n\tfeed.UnHidePostForUser(caller, pid)\n}\n\nfunc GetFlags(fid FeedID, limit uint64, offset uint64) string {\n\tfeed := mustGetFeed(fid)\n\n\ttype FlagCount struct {\n\t\tFlagID flags_index.FlagID\n\t\tCount  uint64\n\t}\n\n\tflags := feed.flags.GetFlags(limit, offset)\n\n\tvar res []string\n\tfor _, flag := range flags {\n\t\tres = append(res, ufmt.Sprintf(\"%s:%d\", flag.FlagID, flag.Count))\n\t}\n\n\treturn strings.Join(res, \"|\")\n}\n\n// TODO: allow only creator to call\nfunc GetFeedByID(fid FeedID) *Feed {\n\treturn mustGetFeed(fid)\n}\n\n// TODO: allow only admin to call\nfunc ExportFeedData(fid FeedID) string {\n\tfeed := mustGetFeed(fid)\n\tfeedJSON := feed.ToJSON()\n\treturn feedJSON\n}\n\n// TODO: allow only admin to call\nfunc ImportFeedData(fid FeedID, jsonData string) {\n\tfeed := mustGetFeed(fid)\n\tfeed.FromJSON(jsonData)\n}\n\n// func MigrateFromPreviousFeed(fid feedsV7.FeedID) {\n// \t// Get exported data from previous feeds\n// \tjsonData := feedsV7.ExportFeedData(fid)\n// \tImportFeedData(FeedID(uint64(fid)), jsonData)\n// }\n"
           },
           {
             "Name": "render.gno",
diff --git a/gno.land/pkg/integration/testdata/prevrealm.txtar b/gno.land/pkg/integration/testdata/prevrealm.txtar
index 31f0ca336ba..73340d9b44d 100644
--- a/gno.land/pkg/integration/testdata/prevrealm.txtar
+++ b/gno.land/pkg/integration/testdata/prevrealm.txtar
@@ -1,4 +1,4 @@
-# This tests ensure the consistency of the std.PrevRealm function, in the
+# This tests ensure the consistency of the std.PreviousRealm function, in the
 # following situations:
 #
 #
@@ -16,8 +16,8 @@
 # | 10  |          |                     | myrlm.B()       | r/foo        |
 # | 11  |          | through /p/demo/bar | bar.A()         | user address |
 # | 12  |          |                     | bar.B()         | user address |
-# | 13  | MsgCall  | wallet direct       | std.PrevRealm() | user address |
-# | 14  | MsgRun   | wallet direct       | std.PrevRealm() | user address |
+# | 13  | MsgCall  | wallet direct       | std.PreviousRealm() | user address |
+# | 14  | MsgRun   | wallet direct       | std.PreviousRealm() | user address |
 
 # Init
 ## deploy myrlm
@@ -82,11 +82,11 @@ stdout ${test1_user_addr}
 gnokey maketx run -gas-fee 100000ugnot -gas-wanted 12000000 -broadcast -chainid tendermint_test test1 $WORK/run/barB.gno
 stdout ${test1_user_addr}
 
-## 13. MsgCall -> std.PrevRealm(): user address
-## gnokey maketx call -pkgpath std -func PrevRealm -gas-fee 100000ugnot -gas-wanted 4000000 -broadcast -chainid tendermint_test test1
+## 13. MsgCall -> std.PreviousRealm(): user address
+## gnokey maketx call -pkgpath std -func PreviousRealm -gas-fee 100000ugnot -gas-wanted 4000000 -broadcast -chainid tendermint_test test1
 ## stdout ${test1_user_addr}
 
-## 14. MsgRun -> std.PrevRealm(): user address
+## 14. MsgRun -> std.PreviousRealm(): user address
 gnokey maketx run -gas-fee 100000ugnot -gas-wanted 12000000 -broadcast -chainid tendermint_test test1 $WORK/run/baz.gno
 stdout ${test1_user_addr}
 
@@ -96,7 +96,7 @@ package myrlm
 import "std"
 
 func A() string {
-	return std.PrevRealm().Addr().String()
+	return std.PreviousRealm().Address().String()
 }
 
 func B() string {
@@ -120,7 +120,7 @@ package bar
 import "std"
 
 func A() string {
-	return std.PrevRealm().Addr().String()
+	return std.PreviousRealm().Address().String()
 }
 
 func B() string {
@@ -180,5 +180,5 @@ package main
 import "std"
 
 func main() {
-	println(std.PrevRealm().Addr().String())
+	println(std.PreviousRealm().Address().String())
 }
diff --git a/gno.land/pkg/integration/testdata/realm_banker_issued_coin_denom.txtar b/gno.land/pkg/integration/testdata/realm_banker_issued_coin_denom.txtar
index a55604267ae..a95f7e6f93d 100644
--- a/gno.land/pkg/integration/testdata/realm_banker_issued_coin_denom.txtar
+++ b/gno.land/pkg/integration/testdata/realm_banker_issued_coin_denom.txtar
@@ -79,12 +79,12 @@ import (
 )
 
 func Mint(addr std.Address, denom string, amount int64) {
-	banker := std.GetBanker(std.BankerTypeRealmIssue)
+	banker := std.NewBanker(std.BankerTypeRealmIssue)
 	banker.IssueCoin(addr, std.CurrentRealm().CoinDenom(denom), amount)
 }
 
 func Burn(addr std.Address, denom string, amount int64) {
-  banker := std.GetBanker(std.BankerTypeRealmIssue)
+  banker := std.NewBanker(std.BankerTypeRealmIssue)
   banker.RemoveCoin(addr, std.CurrentRealm().CoinDenom(denom), amount)
 }
 
@@ -97,12 +97,12 @@ import (
 )
 
 func Mint(addr std.Address, denom string, amount int64) {
-	banker := std.GetBanker(std.BankerTypeRealmIssue)
+	banker := std.NewBanker(std.BankerTypeRealmIssue)
 	banker.IssueCoin(addr, std.CurrentRealm().CoinDenom(denom), amount)
 }
 
 func Burn(addr std.Address, denom string, amount int64) {
-  banker := std.GetBanker(std.BankerTypeRealmIssue)
+  banker := std.NewBanker(std.BankerTypeRealmIssue)
   banker.RemoveCoin(addr, std.CurrentRealm().CoinDenom(denom), amount)
 }
 
@@ -114,11 +114,11 @@ import (
 )
 
 func Mint(addr std.Address, denom string, amount int64) {
-	banker := std.GetBanker(std.BankerTypeRealmIssue)
+	banker := std.NewBanker(std.BankerTypeRealmIssue)
 	banker.IssueCoin(addr, denom, amount)
 }
 
 func Burn(addr std.Address, denom string, amount int64) {
-  banker := std.GetBanker(std.BankerTypeRealmIssue)
+  banker := std.NewBanker(std.BankerTypeRealmIssue)
   banker.RemoveCoin(addr, denom, amount)
 }
diff --git a/gno.land/pkg/sdk/vm/handler_test.go b/gno.land/pkg/sdk/vm/handler_test.go
index a4f39242e3b..4c4157cb94f 100644
--- a/gno.land/pkg/sdk/vm/handler_test.go
+++ b/gno.land/pkg/sdk/vm/handler_test.go
@@ -125,8 +125,8 @@ import "std"
 import "time"
 
 var _ = time.RFC3339
-func caller() std.Address { return std.GetOrigCaller() }
-var GetHeight = std.GetHeight
+func caller() std.Address { return std.OriginCaller() }
+var GetHeight = std.ChainHeight
 var sl = []int{1,2,3,4,5}
 func fn() func(string) string { return Echo }
 type myStruct struct{a int}
diff --git a/gno.land/pkg/sdk/vm/keeper.go b/gno.land/pkg/sdk/vm/keeper.go
index 1ecf280dc59..db2574502f1 100644
--- a/gno.land/pkg/sdk/vm/keeper.go
+++ b/gno.land/pkg/sdk/vm/keeper.go
@@ -266,13 +266,13 @@ func (vm *VMKeeper) checkNamespacePermission(ctx sdk.Context, creator crypto.Add
 	// Parse and run the files, construct *PV.
 	pkgAddr := gno.DerivePkgAddr(pkgPath)
 	msgCtx := stdlibs.ExecContext{
-		ChainID:       ctx.ChainID(),
-		ChainDomain:   chainDomain,
-		Height:        ctx.BlockHeight(),
-		Timestamp:     ctx.BlockTime().Unix(),
-		OrigCaller:    creator.Bech32(),
-		OrigSendSpent: new(std.Coins),
-		OrigPkgAddr:   pkgAddr.Bech32(),
+		ChainID:         ctx.ChainID(),
+		ChainDomain:     chainDomain,
+		Height:          ctx.BlockHeight(),
+		Timestamp:       ctx.BlockTime().Unix(),
+		OriginCaller:    creator.Bech32(),
+		OriginSendSpent: new(std.Coins),
+		OriginPkgAddr:   pkgAddr.Bech32(),
 		// XXX: should we remove the banker ?
 		Banker:      NewSDKBanker(vm, ctx),
 		Params:      NewSDKParams(vm, ctx),
@@ -371,17 +371,17 @@ func (vm *VMKeeper) AddPackage(ctx sdk.Context, msg MsgAddPackage) (err error) {
 
 	// Parse and run the files, construct *PV.
 	msgCtx := stdlibs.ExecContext{
-		ChainID:       ctx.ChainID(),
-		ChainDomain:   chainDomain,
-		Height:        ctx.BlockHeight(),
-		Timestamp:     ctx.BlockTime().Unix(),
-		OrigCaller:    creator.Bech32(),
-		OrigSend:      deposit,
-		OrigSendSpent: new(std.Coins),
-		OrigPkgAddr:   pkgAddr.Bech32(),
-		Banker:        NewSDKBanker(vm, ctx),
-		Params:        NewSDKParams(vm, ctx),
-		EventLogger:   ctx.EventLogger(),
+		ChainID:         ctx.ChainID(),
+		ChainDomain:     chainDomain,
+		Height:          ctx.BlockHeight(),
+		Timestamp:       ctx.BlockTime().Unix(),
+		OriginCaller:    creator.Bech32(),
+		OriginSend:      deposit,
+		OriginSendSpent: new(std.Coins),
+		OriginPkgAddr:   pkgAddr.Bech32(),
+		Banker:          NewSDKBanker(vm, ctx),
+		Params:          NewSDKParams(vm, ctx),
+		EventLogger:     ctx.EventLogger(),
 	}
 	// Parse and run the files, construct *PV.
 	m2 := gno.NewMachineWithOptions(
@@ -462,17 +462,17 @@ func (vm *VMKeeper) Call(ctx sdk.Context, msg MsgCall) (res string, err error) {
 	// could it be safely partially memoized?
 	chainDomain := vm.getChainDomainParam(ctx)
 	msgCtx := stdlibs.ExecContext{
-		ChainID:       ctx.ChainID(),
-		ChainDomain:   chainDomain,
-		Height:        ctx.BlockHeight(),
-		Timestamp:     ctx.BlockTime().Unix(),
-		OrigCaller:    caller.Bech32(),
-		OrigSend:      send,
-		OrigSendSpent: new(std.Coins),
-		OrigPkgAddr:   pkgAddr.Bech32(),
-		Banker:        NewSDKBanker(vm, ctx),
-		Params:        NewSDKParams(vm, ctx),
-		EventLogger:   ctx.EventLogger(),
+		ChainID:         ctx.ChainID(),
+		ChainDomain:     chainDomain,
+		Height:          ctx.BlockHeight(),
+		Timestamp:       ctx.BlockTime().Unix(),
+		OriginCaller:    caller.Bech32(),
+		OriginSend:      send,
+		OriginSendSpent: new(std.Coins),
+		OriginPkgAddr:   pkgAddr.Bech32(),
+		Banker:          NewSDKBanker(vm, ctx),
+		Params:          NewSDKParams(vm, ctx),
+		EventLogger:     ctx.EventLogger(),
 	}
 	// Construct machine and evaluate.
 	m := gno.NewMachineWithOptions(
@@ -594,17 +594,17 @@ func (vm *VMKeeper) Run(ctx sdk.Context, msg MsgRun) (res string, err error) {
 
 	// Parse and run the files, construct *PV.
 	msgCtx := stdlibs.ExecContext{
-		ChainID:       ctx.ChainID(),
-		ChainDomain:   chainDomain,
-		Height:        ctx.BlockHeight(),
-		Timestamp:     ctx.BlockTime().Unix(),
-		OrigCaller:    caller.Bech32(),
-		OrigSend:      send,
-		OrigSendSpent: new(std.Coins),
-		OrigPkgAddr:   pkgAddr.Bech32(),
-		Banker:        NewSDKBanker(vm, ctx),
-		Params:        NewSDKParams(vm, ctx),
-		EventLogger:   ctx.EventLogger(),
+		ChainID:         ctx.ChainID(),
+		ChainDomain:     chainDomain,
+		Height:          ctx.BlockHeight(),
+		Timestamp:       ctx.BlockTime().Unix(),
+		OriginCaller:    caller.Bech32(),
+		OriginSend:      send,
+		OriginSendSpent: new(std.Coins),
+		OriginPkgAddr:   pkgAddr.Bech32(),
+		Banker:          NewSDKBanker(vm, ctx),
+		Params:          NewSDKParams(vm, ctx),
+		EventLogger:     ctx.EventLogger(),
 	}
 
 	buf := new(bytes.Buffer)
@@ -781,13 +781,13 @@ func (vm *VMKeeper) queryEvalInternal(ctx sdk.Context, pkgPath string, expr stri
 		ChainDomain: chainDomain,
 		Height:      ctx.BlockHeight(),
 		Timestamp:   ctx.BlockTime().Unix(),
-		// OrigCaller:    caller,
-		// OrigSend:      send,
-		// OrigSendSpent: nil,
-		OrigPkgAddr: pkgAddr.Bech32(),
-		Banker:      NewSDKBanker(vm, ctx), // safe as long as ctx is a fork to be discarded.
-		Params:      NewSDKParams(vm, ctx),
-		EventLogger: ctx.EventLogger(),
+		// OriginCaller:    caller,
+		// OriginSend:      send,
+		// OriginSendSpent: nil,
+		OriginPkgAddr: pkgAddr.Bech32(),
+		Banker:        NewSDKBanker(vm, ctx), // safe as long as ctx is a fork to be discarded.
+		Params:        NewSDKParams(vm, ctx),
+		EventLogger:   ctx.EventLogger(),
 	}
 	m := gno.NewMachineWithOptions(
 		gno.MachineOptions{
diff --git a/gno.land/pkg/sdk/vm/keeper_test.go b/gno.land/pkg/sdk/vm/keeper_test.go
index f8144988c44..243b2712632 100644
--- a/gno.land/pkg/sdk/vm/keeper_test.go
+++ b/gno.land/pkg/sdk/vm/keeper_test.go
@@ -106,7 +106,7 @@ func Echo() string {return "hello world"}`,
 }
 
 // Sending total send amount succeeds.
-func TestVMKeeperOrigSend1(t *testing.T) {
+func TestVMKeeperOriginSend1(t *testing.T) {
 	env := setupTestEnv()
 	ctx := env.vmk.MakeGnoTransactionStore(env.ctx)
 
@@ -128,10 +128,10 @@ func init() {
 }
 
 func Echo(msg string) string {
-	addr := std.GetOrigCaller()
-	pkgAddr := std.GetOrigPkgAddr()
-	send := std.GetOrigSend()
-	banker := std.GetBanker(std.BankerTypeOrigSend)
+	addr := std.OriginCaller()
+	pkgAddr := std.OriginPkgAddress()
+	send := std.OriginSend()
+	banker := std.NewBanker(std.BankerTypeOriginSend)
 	banker.SendCoins(pkgAddr, addr, send) // send back
 	return "echo:"+msg
 }`},
@@ -151,7 +151,7 @@ func Echo(msg string) string {
 }
 
 // Sending too much fails
-func TestVMKeeperOrigSend2(t *testing.T) {
+func TestVMKeeperOriginSend2(t *testing.T) {
 	env := setupTestEnv()
 	ctx := env.vmk.MakeGnoTransactionStore(env.ctx)
 
@@ -172,14 +172,14 @@ import "std"
 var admin std.Address
 
 func init() {
-     admin =	std.GetOrigCaller()
+     admin =	std.OriginCaller()
 }
 
 func Echo(msg string) string {
-	addr := std.GetOrigCaller()
-	pkgAddr := std.GetOrigPkgAddr()
-	send := std.GetOrigSend()
-	banker := std.GetBanker(std.BankerTypeOrigSend)
+	addr := std.OriginCaller()
+	pkgAddr := std.OriginPkgAddress()
+	send := std.OriginSend()
+	banker := std.NewBanker(std.BankerTypeOriginSend)
 	banker.SendCoins(pkgAddr, addr, send) // send back
 	return "echo:"+msg
 }
@@ -205,7 +205,7 @@ func GetAdmin() string {
 }
 
 // Sending more than tx send fails.
-func TestVMKeeperOrigSend3(t *testing.T) {
+func TestVMKeeperOriginSend3(t *testing.T) {
 	env := setupTestEnv()
 	ctx := env.vmk.MakeGnoTransactionStore(env.ctx)
 
@@ -227,10 +227,10 @@ func init() {
 }
 
 func Echo(msg string) string {
-	addr := std.GetOrigCaller()
-	pkgAddr := std.GetOrigPkgAddr()
+	addr := std.OriginCaller()
+	pkgAddr := std.OriginPkgAddress()
 	send := std.Coins{{"ugnot", 10000000}}
-	banker := std.GetBanker(std.BankerTypeOrigSend)
+	banker := std.NewBanker(std.BankerTypeOriginSend)
 	banker.SendCoins(pkgAddr, addr, send) // send back
 	return "echo:"+msg
 }`},
@@ -271,10 +271,10 @@ func init() {
 }
 
 func Echo(msg string) string {
-	addr := std.GetOrigCaller()
-	pkgAddr := std.GetOrigPkgAddr()
+	addr := std.OriginCaller()
+	pkgAddr := std.OriginPkgAddress()
 	send := std.Coins{{"ugnot", 10000000}}
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	banker.SendCoins(pkgAddr, addr, send) // send back
 	return "echo:"+msg
 }`},
@@ -315,10 +315,10 @@ func init() {
 }
 
 func Echo(msg string) string {
-	addr := std.GetOrigCaller()
-	pkgAddr := std.GetOrigPkgAddr()
+	addr := std.OriginCaller()
+	pkgAddr := std.OriginPkgAddress()
 	send := std.Coins{{"ugnot", 10000000}}
-	banker := std.GetBanker(std.BankerTypeRealmSend)
+	banker := std.NewBanker(std.BankerTypeRealmSend)
 	banker.SendCoins(pkgAddr, addr, send) // send back
 	return "echo:"+msg
 }`},
@@ -390,8 +390,8 @@ func Do() string {
 	assert.Equal(t, int64(1337), bar)
 }
 
-// Assign admin as OrigCaller on deploying the package.
-func TestVMKeeperOrigCallerInit(t *testing.T) {
+// Assign admin as OriginCaller on deploying the package.
+func TestVMKeeperOriginCallerInit(t *testing.T) {
 	env := setupTestEnv()
 	ctx := env.vmk.MakeGnoTransactionStore(env.ctx)
 
@@ -412,14 +412,14 @@ import "std"
 var admin std.Address
 
 func init() {
-     admin = std.GetOrigCaller()
+     admin = std.OriginCaller()
 }
 
 func Echo(msg string) string {
-	addr := std.GetOrigCaller()
-	pkgAddr := std.GetOrigPkgAddr()
-	send := std.GetOrigSend()
-	banker := std.GetBanker(std.BankerTypeOrigSend)
+	addr := std.OriginCaller()
+	pkgAddr := std.OriginPkgAddress()
+	send := std.OriginSend()
+	banker := std.NewBanker(std.BankerTypeOriginSend)
 	banker.SendCoins(pkgAddr, addr, send) // send back
 	return "echo:"+msg
 }
@@ -500,7 +500,7 @@ package main
 import "std"
 
 func main() {
-	addr := std.GetOrigCaller()
+	addr := std.OriginCaller()
 	println("hello world!", addr)
 }
 `},
diff --git a/gnovm/cmd/gno/testdata/transpile/valid_transpile_file.txtar b/gnovm/cmd/gno/testdata/transpile/valid_transpile_file.txtar
index 5e1f1a5ff0f..31907052225 100644
--- a/gnovm/cmd/gno/testdata/transpile/valid_transpile_file.txtar
+++ b/gnovm/cmd/gno/testdata/transpile/valid_transpile_file.txtar
@@ -36,7 +36,7 @@ package main
 import "std"
 
 func hello() {
-	std.GetChainID()
+	std.ChainID()
 }
 
 -- main.gno.gen.go.golden --
@@ -61,5 +61,5 @@ package main
 import "github.com/gnolang/gno/gnovm/stdlibs/std"
 
 func hello() {
-	std.GetChainID(nil)
+	std.ChainID(nil)
 }
diff --git a/gnovm/pkg/gnolang/gonative.go b/gnovm/pkg/gnolang/gonative.go
index 0a2429fb1c6..2fbf34ed1b1 100644
--- a/gnovm/pkg/gnolang/gonative.go
+++ b/gnovm/pkg/gnolang/gonative.go
@@ -275,7 +275,7 @@ func Go2GnoNativeValue(alloc *Allocator, rv reflect.Value) (tv TypedValue) {
 	return go2GnoValue(alloc, rv)
 }
 
-// NOTE: used by imports_test.go TestSetOrigCaller.
+// NOTE: used by imports_test.go TestSetOriginCaller.
 func Gno2GoValue(tv *TypedValue, rv reflect.Value) (ret reflect.Value) {
 	return gno2GoValue(tv, rv)
 }
diff --git a/gnovm/pkg/test/test.go b/gnovm/pkg/test/test.go
index 92a867e1886..71ec3bb2568 100644
--- a/gnovm/pkg/test/test.go
+++ b/gnovm/pkg/test/test.go
@@ -51,17 +51,17 @@ func Context(pkgPath string, send std.Coins) *teststd.TestExecContext {
 		},
 	}
 	ctx := stdlibs.ExecContext{
-		ChainID:       "dev",
-		ChainDomain:   "tests.gno.land",
-		Height:        DefaultHeight,
-		Timestamp:     DefaultTimestamp,
-		OrigCaller:    DefaultCaller,
-		OrigPkgAddr:   pkgAddr.Bech32(),
-		OrigSend:      send,
-		OrigSendSpent: new(std.Coins),
-		Banker:        banker,
-		Params:        newTestParams(),
-		EventLogger:   sdk.NewEventLogger(),
+		ChainID:         "dev",
+		ChainDomain:     "tests.gno.land",
+		Height:          DefaultHeight,
+		Timestamp:       DefaultTimestamp,
+		OriginCaller:    DefaultCaller,
+		OriginPkgAddr:   pkgAddr.Bech32(),
+		OriginSend:      send,
+		OriginSendSpent: new(std.Coins),
+		Banker:          banker,
+		Params:          newTestParams(),
+		EventLogger:     sdk.NewEventLogger(),
 	}
 	return &teststd.TestExecContext{
 		ExecContext: ctx,
diff --git a/gnovm/pkg/transpiler/transpiler_test.go b/gnovm/pkg/transpiler/transpiler_test.go
index 63b77e49446..886253cdeb3 100644
--- a/gnovm/pkg/transpiler/transpiler_test.go
+++ b/gnovm/pkg/transpiler/transpiler_test.go
@@ -344,13 +344,13 @@ func Float32bits(i float32) uint32
 
 func testfunc() {
 	println(Float32bits(3.14159))
-	std.GetChainID()
+	std.ChainID()
 }
 
 func otherFunc() {
 	std := 1
 	// This is (incorrectly) changed for now.
-	std.GetChainID()
+	std.ChainID()
 }
 `,
 			expectedOutput: `
@@ -363,13 +363,13 @@ import "github.com/gnolang/gno/gnovm/stdlibs/std"
 
 func testfunc() {
 	println(Float32bits(3.14159))
-	std.GetChainID(nil)
+	std.ChainID(nil)
 }
 
 func otherFunc() {
 	std := 1
 	// This is (incorrectly) changed for now.
-	std.GetChainID(nil)
+	std.ChainID(nil)
 }
 `,
 			expectedImports: []*ast.ImportSpec{
@@ -388,12 +388,12 @@ func otherFunc() {
 			source: `
 package std
 
-func GetChainID()
-func origCaller() string
+func ChainID()
+func originCaller() string
 
 func testfunc() {
-	GetChainID()
-	println(origCaller())
+	ChainID()
+	println(originCaller())
 }
 `,
 			expectedOutput: `
@@ -403,8 +403,8 @@ func testfunc() {
 package std
 
 func testfunc() {
-	GetChainID(nil)
-	println(X_origCaller(nil))
+	ChainID(nil)
+	println(X_originCaller(nil))
 }
 `,
 		},
diff --git a/gnovm/stdlibs/generated.go b/gnovm/stdlibs/generated.go
index 01e5d1831dd..25d9b974e85 100644
--- a/gnovm/stdlibs/generated.go
+++ b/gnovm/stdlibs/generated.go
@@ -430,14 +430,14 @@ var nativeFuncs = [...]NativeFunc{
 	},
 	{
 		"std",
-		"GetChainID",
+		"ChainID",
 		[]gno.FieldTypeExpr{},
 		[]gno.FieldTypeExpr{
 			{Name: gno.N("r0"), Type: gno.X("string")},
 		},
 		true,
 		func(m *gno.Machine) {
-			r0 := libs_std.GetChainID(
+			r0 := libs_std.ChainID(
 				m,
 			)
 
@@ -450,14 +450,14 @@ var nativeFuncs = [...]NativeFunc{
 	},
 	{
 		"std",
-		"GetChainDomain",
+		"ChainDomain",
 		[]gno.FieldTypeExpr{},
 		[]gno.FieldTypeExpr{
 			{Name: gno.N("r0"), Type: gno.X("string")},
 		},
 		true,
 		func(m *gno.Machine) {
-			r0 := libs_std.GetChainDomain(
+			r0 := libs_std.ChainDomain(
 				m,
 			)
 
@@ -470,14 +470,14 @@ var nativeFuncs = [...]NativeFunc{
 	},
 	{
 		"std",
-		"GetHeight",
+		"ChainHeight",
 		[]gno.FieldTypeExpr{},
 		[]gno.FieldTypeExpr{
 			{Name: gno.N("r0"), Type: gno.X("int64")},
 		},
 		true,
 		func(m *gno.Machine) {
-			r0 := libs_std.GetHeight(
+			r0 := libs_std.ChainHeight(
 				m,
 			)
 
@@ -490,7 +490,7 @@ var nativeFuncs = [...]NativeFunc{
 	},
 	{
 		"std",
-		"origSend",
+		"originSend",
 		[]gno.FieldTypeExpr{},
 		[]gno.FieldTypeExpr{
 			{Name: gno.N("r0"), Type: gno.X("[]string")},
@@ -498,7 +498,7 @@ var nativeFuncs = [...]NativeFunc{
 		},
 		true,
 		func(m *gno.Machine) {
-			r0, r1 := libs_std.X_origSend(
+			r0, r1 := libs_std.X_originSend(
 				m,
 			)
 
@@ -516,14 +516,14 @@ var nativeFuncs = [...]NativeFunc{
 	},
 	{
 		"std",
-		"origCaller",
+		"originCaller",
 		[]gno.FieldTypeExpr{},
 		[]gno.FieldTypeExpr{
 			{Name: gno.N("r0"), Type: gno.X("string")},
 		},
 		true,
 		func(m *gno.Machine) {
-			r0 := libs_std.X_origCaller(
+			r0 := libs_std.X_originCaller(
 				m,
 			)
 
@@ -536,14 +536,14 @@ var nativeFuncs = [...]NativeFunc{
 	},
 	{
 		"std",
-		"origPkgAddr",
+		"originPkgAddr",
 		[]gno.FieldTypeExpr{},
 		[]gno.FieldTypeExpr{
 			{Name: gno.N("r0"), Type: gno.X("string")},
 		},
 		true,
 		func(m *gno.Machine) {
-			r0 := libs_std.X_origPkgAddr(
+			r0 := libs_std.X_originPkgAddr(
 				m,
 			)
 
diff --git a/gnovm/stdlibs/std/banker.gno b/gnovm/stdlibs/std/banker.gno
index 4c20e8d4b61..9db914e6a4f 100644
--- a/gnovm/stdlibs/std/banker.gno
+++ b/gnovm/stdlibs/std/banker.gno
@@ -5,7 +5,7 @@ import (
 	"strings"
 )
 
-// Realm functions can call std.GetBanker(options) to get
+// Realm functions can call std.NewBanker(options) to get
 // a banker instance. Banker objects cannot be persisted,
 // but can be passed onto other functions to be transacted
 // on. A banker instance can be passed onto other realm
@@ -28,7 +28,7 @@ type Banker interface {
 }
 
 // BankerType represents the "permission level" requested for a banker,
-// retrievable through [GetBanker].
+// retrievable through [NewBanker].
 type BankerType uint8
 
 // Available types of banker.
@@ -36,7 +36,7 @@ const (
 	// Can only read state.
 	BankerTypeReadonly BankerType = iota
 	// Can only send from tx send.
-	BankerTypeOrigSend
+	BankerTypeOriginSend
 	// Can send from all realm coins.
 	BankerTypeRealmSend
 	// Can issue and remove realm coins.
@@ -49,8 +49,8 @@ func (b BankerType) String() string {
 	switch b {
 	case BankerTypeReadonly:
 		return "BankerTypeReadonly"
-	case BankerTypeOrigSend:
-		return "BankerTypeOrigSend"
+	case BankerTypeOriginSend:
+		return "BankerTypeOriginSend"
 	case BankerTypeRealmSend:
 		return "BankerTypeRealmSend"
 	case BankerTypeRealmIssue:
@@ -63,22 +63,22 @@ func (b BankerType) String() string {
 //----------------------------------------
 // adapter for native banker
 
-// GetBanker returns a new Banker, with its capabilities matching the given
+// NewBanker returns a new Banker, with its capabilities matching the given
 // [BankerType].
-func GetBanker(bt BankerType) Banker {
+func NewBanker(bt BankerType) Banker {
 	assertCallerIsRealm()
 	if bt >= maxBanker {
 		panic("invalid banker type")
 	}
 
 	var pkgAddr Address
-	if bt == BankerTypeOrigSend {
-		pkgAddr = GetOrigPkgAddr()
-		if pkgAddr != CurrentRealm().Addr() {
-			panic("banker with type BankerTypeOrigSend can only be instantiated by the origin package")
+	if bt == BankerTypeOriginSend {
+		pkgAddr = OriginPkgAddress()
+		if pkgAddr != CurrentRealm().Address() {
+			panic("banker with type BankerTypeOriginSend can only be instantiated by the origin package")
 		}
 	} else if bt == BankerTypeRealmSend || bt == BankerTypeRealmIssue {
-		pkgAddr = CurrentRealm().Addr()
+		pkgAddr = CurrentRealm().Address()
 	}
 	return banker{
 		bt,
diff --git a/gnovm/stdlibs/std/banker.go b/gnovm/stdlibs/std/banker.go
index c57ba8529ed..ee02b0cfad0 100644
--- a/gnovm/stdlibs/std/banker.go
+++ b/gnovm/stdlibs/std/banker.go
@@ -25,7 +25,7 @@ const (
 	// Can only read state.
 	btReadonly uint8 = iota //nolint
 	// Can only send from tx send.
-	btOrigSend
+	btOriginSend
 	// Can send from all realm coins.
 	btRealmSend
 	// Can issue and remove realm coins.
@@ -45,19 +45,19 @@ func X_bankerSendCoins(m *gno.Machine, bt uint8, fromS, toS string, denoms []str
 	from, to := crypto.Bech32Address(fromS), crypto.Bech32Address(toS)
 
 	switch bt {
-	case btOrigSend:
+	case btOriginSend:
 		// indirection allows us to "commit" in a second phase
-		spent := (*ctx.OrigSendSpent).Add(amt)
-		if !ctx.OrigSend.IsAllGTE(spent) {
+		spent := (*ctx.OriginSendSpent).Add(amt)
+		if !ctx.OriginSend.IsAllGTE(spent) {
 			m.Panic(typedString(
 				fmt.Sprintf(
 					`cannot send "%v", limit "%v" exceeded with "%v" already spent`,
-					amt, ctx.OrigSend, *ctx.OrigSendSpent),
+					amt, ctx.OriginSend, *ctx.OriginSendSpent),
 			))
 			return
 		}
 		ctx.Banker.SendCoins(from, to, amt)
-		*ctx.OrigSendSpent = spent
+		*ctx.OriginSendSpent = spent
 	case btRealmSend, btRealmIssue:
 		ctx.Banker.SendCoins(from, to, amt)
 	default:
diff --git a/gnovm/stdlibs/std/context.go b/gnovm/stdlibs/std/context.go
index a8ef500c346..37d246b0f1a 100644
--- a/gnovm/stdlibs/std/context.go
+++ b/gnovm/stdlibs/std/context.go
@@ -8,18 +8,18 @@ import (
 )
 
 type ExecContext struct {
-	ChainID       string
-	ChainDomain   string
-	Height        int64
-	Timestamp     int64 // seconds
-	TimestampNano int64 // nanoseconds, only used for testing.
-	OrigCaller    crypto.Bech32Address
-	OrigPkgAddr   crypto.Bech32Address
-	OrigSend      std.Coins
-	OrigSendSpent *std.Coins // mutable
-	Banker        BankerInterface
-	Params        ParamsInterface
-	EventLogger   *sdk.EventLogger
+	ChainID         string
+	ChainDomain     string
+	Height          int64
+	Timestamp       int64 // seconds
+	TimestampNano   int64 // nanoseconds, only used for testing.
+	OriginCaller    crypto.Bech32Address
+	OriginPkgAddr   crypto.Bech32Address
+	OriginSend      std.Coins
+	OriginSendSpent *std.Coins // mutable
+	Banker          BankerInterface
+	Params          ParamsInterface
+	EventLogger     *sdk.EventLogger
 }
 
 // GetContext returns the execution context.
diff --git a/gnovm/stdlibs/std/emit_event.go b/gnovm/stdlibs/std/emit_event.go
index 10b00d62cfc..6e8f00ee3e8 100644
--- a/gnovm/stdlibs/std/emit_event.go
+++ b/gnovm/stdlibs/std/emit_event.go
@@ -18,7 +18,7 @@ func X_emit(m *gno.Machine, typ string, attrs []string) {
 	}
 
 	_, pkgPath := currentRealm(m)
-	fnIdent := getPrevFunctionNameFromTarget(m, "Emit")
+	fnIdent := getPreviousFunctionNameFromTarget(m, "Emit")
 
 	ctx := GetContext(m)
 
diff --git a/gnovm/stdlibs/std/frame.gno b/gnovm/stdlibs/std/frame.gno
index 1709f8cb8b5..bcffa458043 100644
--- a/gnovm/stdlibs/std/frame.gno
+++ b/gnovm/stdlibs/std/frame.gno
@@ -5,7 +5,7 @@ type Realm struct {
 	pkgPath string
 }
 
-func (r Realm) Addr() Address {
+func (r Realm) Address() Address {
 	return r.addr
 }
 
diff --git a/gnovm/stdlibs/std/native.gno b/gnovm/stdlibs/std/native.gno
index 2baa1f92f48..1b15bc21c29 100644
--- a/gnovm/stdlibs/std/native.gno
+++ b/gnovm/stdlibs/std/native.gno
@@ -5,13 +5,13 @@ package std
 // is invoked by another method (even from the same realm or package).
 // It also panic every time when the transaction is broadcasted via
 // MsgRun.
-func AssertOriginCall()      // injected
-func GetChainID() string     // injected
-func GetChainDomain() string // injected
-func GetHeight() int64       // injected
+func AssertOriginCall()   // injected
+func ChainID() string     // injected
+func ChainDomain() string // injected
+func ChainHeight() int64  // injected
 
-func GetOrigSend() Coins {
-	den, amt := origSend()
+func OriginSend() Coins {
+	den, amt := originSend()
 	coins := make(Coins, len(den))
 	for i := range coins {
 		coins[i] = Coin{Denom: den[i], Amount: amt[i]}
@@ -19,8 +19,8 @@ func GetOrigSend() Coins {
 	return coins
 }
 
-func GetOrigCaller() Address {
-	return Address(origCaller())
+func OriginCaller() Address {
+	return Address(originCaller())
 }
 
 func CurrentRealm() Realm {
@@ -28,23 +28,23 @@ func CurrentRealm() Realm {
 	return Realm{Address(addr), path}
 }
 
-func PrevRealm() Realm {
+func PreviousRealm() Realm {
 	addr, path := getRealm(1)
 	return Realm{Address(addr), path}
 }
 
-func GetOrigPkgAddr() Address {
-	return Address(origPkgAddr())
+func OriginPkgAddress() Address {
+	return Address(originPkgAddr())
 }
 
-func GetCallerAt(n int) Address {
+func CallerAt(n int) Address {
 	return Address(callerAt(n))
 }
 
 // Variations which don't use named types.
-func origSend() (denoms []string, amounts []int64)
-func origCaller() string
-func origPkgAddr() string
+func originSend() (denoms []string, amounts []int64)
+func originCaller() string
+func originPkgAddr() string
 func callerAt(n int) string
 func getRealm(height int) (address string, pkgPath string)
 func assertCallerIsRealm()
diff --git a/gnovm/stdlibs/std/native.go b/gnovm/stdlibs/std/native.go
index 68f4542f689..b226ca03afa 100644
--- a/gnovm/stdlibs/std/native.go
+++ b/gnovm/stdlibs/std/native.go
@@ -22,29 +22,29 @@ func isOriginCall(m *gno.Machine) bool {
 	return n <= 2 && isMsgCall
 }
 
-func GetChainID(m *gno.Machine) string {
+func ChainID(m *gno.Machine) string {
 	return GetContext(m).ChainID
 }
 
-func GetChainDomain(m *gno.Machine) string {
+func ChainDomain(m *gno.Machine) string {
 	return GetContext(m).ChainDomain
 }
 
-func GetHeight(m *gno.Machine) int64 {
+func ChainHeight(m *gno.Machine) int64 {
 	return GetContext(m).Height
 }
 
-// getPrevFunctionNameFromTarget returns the last called function name (identifier) from the call stack.
-func getPrevFunctionNameFromTarget(m *gno.Machine, targetFunc string) string {
-	targetIndex := findTargetFuncIndex(m, targetFunc)
+// getPreviousFunctionNameFromTarget returns the last called function name (identifier) from the call stack.
+func getPreviousFunctionNameFromTarget(m *gno.Machine, targetFunc string) string {
+	targetIndex := findTargetFunctionIndex(m, targetFunc)
 	if targetIndex == -1 {
 		return ""
 	}
-	return findPrevFuncName(m, targetIndex)
+	return findPreviousFunctionName(m, targetIndex)
 }
 
-// findTargetFuncIndex finds and returns the index of the target function in the call stack.
-func findTargetFuncIndex(m *gno.Machine, targetFunc string) int {
+// findTargetFunctionIndex finds and returns the index of the target function in the call stack.
+func findTargetFunctionIndex(m *gno.Machine, targetFunc string) int {
 	for i := len(m.Frames) - 1; i >= 0; i-- {
 		currFunc := m.Frames[i].Func
 		if currFunc != nil && currFunc.Name == gno.Name(targetFunc) {
@@ -54,8 +54,8 @@ func findTargetFuncIndex(m *gno.Machine, targetFunc string) int {
 	return -1
 }
 
-// findPrevFuncName returns the function name before the given index in the call stack.
-func findPrevFuncName(m *gno.Machine, targetIndex int) string {
+// findPreviousFunctionName returns the function name before the given index in the call stack.
+func findPreviousFunctionName(m *gno.Machine, targetIndex int) string {
 	for i := targetIndex - 1; i >= 0; i-- {
 		currFunc := m.Frames[i].Func
 		if currFunc != nil {
@@ -66,25 +66,25 @@ func findPrevFuncName(m *gno.Machine, targetIndex int) string {
 	panic("function name not found")
 }
 
-func X_origSend(m *gno.Machine) (denoms []string, amounts []int64) {
-	os := GetContext(m).OrigSend
+func X_originSend(m *gno.Machine) (denoms []string, amounts []int64) {
+	os := GetContext(m).OriginSend
 	return ExpandCoins(os)
 }
 
-func X_origCaller(m *gno.Machine) string {
-	return string(GetContext(m).OrigCaller)
+func X_originCaller(m *gno.Machine) string {
+	return string(GetContext(m).OriginCaller)
 }
 
-func X_origPkgAddr(m *gno.Machine) string {
-	return string(GetContext(m).OrigPkgAddr)
+func X_originPkgAddr(m *gno.Machine) string {
+	return string(GetContext(m).OriginPkgAddr)
 }
 
 func X_callerAt(m *gno.Machine, n int) string {
 	if n <= 0 {
-		m.Panic(typedString("GetCallerAt requires positive arg"))
+		m.Panic(typedString("CallerAt requires positive arg"))
 		return ""
 	}
-	// Add 1 to n to account for the GetCallerAt (gno fn) frame.
+	// Add 1 to n to account for the CallerAt (gno fn) frame.
 	n++
 	if n > m.NumFrames() {
 		// NOTE: the last frame's LastPackage
@@ -94,9 +94,9 @@ func X_callerAt(m *gno.Machine, n int) string {
 		return ""
 	}
 	if n == m.NumFrames() {
-		// This makes it consistent with GetOrigCaller.
+		// This makes it consistent with OriginCaller.
 		ctx := GetContext(m)
-		return string(ctx.OrigCaller)
+		return string(ctx.OriginCaller)
 	}
 	return string(m.MustLastCallFrame(n).LastPackage.GetPkgAddr().Bech32())
 }
@@ -131,8 +131,8 @@ func X_getRealm(m *gno.Machine, height int) (address, pkgPath string) {
 		}
 	}
 
-	// Fallback case: return OrigCaller.
-	return string(ctx.OrigCaller), ""
+	// Fallback case: return OriginCaller.
+	return string(ctx.OriginCaller), ""
 }
 
 // currentRealm retrieves the current realm's address and pkgPath.
diff --git a/gnovm/stdlibs/std/native_test.go b/gnovm/stdlibs/std/native_test.go
index acbd22055d6..e51badd4e2e 100644
--- a/gnovm/stdlibs/std/native_test.go
+++ b/gnovm/stdlibs/std/native_test.go
@@ -9,11 +9,11 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 )
 
-func TestPrevRealmIsOrigin(t *testing.T) {
+func TestPreviousRealmIsOrigin(t *testing.T) {
 	var (
 		user = gno.DerivePkgAddr("user1.gno").Bech32()
 		ctx  = ExecContext{
-			OrigCaller: user,
+			OriginCaller: user,
 		}
 		msgCallFrame = &gno.Frame{LastPackage: &gno.PackageValue{PkgPath: "main"}}
 		msgRunFrame  = &gno.Frame{LastPackage: &gno.PackageValue{PkgPath: "gno.land/r/g1337/run"}}
diff --git a/gnovm/tests/files/std10.gno b/gnovm/tests/files/std10.gno
index 7caf534c5ca..b549387feaa 100644
--- a/gnovm/tests/files/std10.gno
+++ b/gnovm/tests/files/std10.gno
@@ -7,8 +7,8 @@ func main() {
 		// assert panic is recoverable
 		println(recover())
 	}()
-	std.GetCallerAt(0)
+	std.CallerAt(0)
 }
 
 // Output:
-// GetCallerAt requires positive arg
+// CallerAt requires positive arg
diff --git a/gnovm/tests/files/std11.gno b/gnovm/tests/files/std11.gno
index ce02fa11ec3..70668fe443b 100644
--- a/gnovm/tests/files/std11.gno
+++ b/gnovm/tests/files/std11.gno
@@ -7,7 +7,7 @@ func main() {
 		// assert panic is recoverable
 		println(recover())
 	}()
-	std.GetCallerAt(42)
+	std.CallerAt(42)
 }
 
 // Output:
diff --git a/gnovm/tests/files/std2.gno b/gnovm/tests/files/std2.gno
index fe218f8b34a..71865fdf97d 100644
--- a/gnovm/tests/files/std2.gno
+++ b/gnovm/tests/files/std2.gno
@@ -3,7 +3,7 @@ package main
 import "std"
 
 func main() {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	println(caller)
 }
 
diff --git a/gnovm/tests/files/std3.gno b/gnovm/tests/files/std3.gno
index e8d4bc31a12..a95c7395664 100644
--- a/gnovm/tests/files/std3.gno
+++ b/gnovm/tests/files/std3.gno
@@ -6,8 +6,8 @@ import (
 )
 
 func main() {
-	caller := std.GetOrigCaller()
-	caller2 := std.GetOrigCaller()
+	caller := std.OriginCaller()
+	caller2 := std.OriginCaller()
 	cmp := bytes.Compare([]byte(caller), []byte(caller2))
 	println(cmp)
 }
diff --git a/gnovm/tests/files/std4.gno b/gnovm/tests/files/std4.gno
index d09bc6251c0..aef32507b08 100644
--- a/gnovm/tests/files/std4.gno
+++ b/gnovm/tests/files/std4.gno
@@ -5,7 +5,7 @@ import (
 )
 
 func main() {
-	caller1 := std.GetCallerAt(1)
+	caller1 := std.CallerAt(1)
 	println(caller1)
 }
 
diff --git a/gnovm/tests/files/std5.gno b/gnovm/tests/files/std5.gno
index 1f1d013c3df..81e066c3762 100644
--- a/gnovm/tests/files/std5.gno
+++ b/gnovm/tests/files/std5.gno
@@ -5,9 +5,9 @@ import (
 )
 
 func main() {
-	caller1 := std.GetCallerAt(1)
+	caller1 := std.CallerAt(1)
 	println(caller1)
-	caller2 := std.GetCallerAt(2)
+	caller2 := std.CallerAt(2)
 	println(caller2)
 }
 
@@ -15,7 +15,7 @@ func main() {
 // panic: frame not found
 // callerAt<VPBlock(3,52)>(n<VPBlock(1,0)>)
 //     gonative:std.callerAt
-// std<VPBlock(2,0)>.GetCallerAt(2)
+// std<VPBlock(2,0)>.CallerAt(2)
 //     std/native.gno:41
 // main<VPBlock(1,0)>()
 //     main/files/std5.gno:10
diff --git a/gnovm/tests/files/std6.gno b/gnovm/tests/files/std6.gno
index 20943f47d28..27c64503b13 100644
--- a/gnovm/tests/files/std6.gno
+++ b/gnovm/tests/files/std6.gno
@@ -3,9 +3,9 @@ package main
 import "std"
 
 func inner() {
-	caller1 := std.GetCallerAt(1)
+	caller1 := std.CallerAt(1)
 	println(caller1)
-	caller2 := std.GetCallerAt(2)
+	caller2 := std.CallerAt(2)
 	println(caller2)
 }
 
diff --git a/gnovm/tests/files/std7.gno b/gnovm/tests/files/std7.gno
index 9d602cc2039..ce767fe59e9 100644
--- a/gnovm/tests/files/std7.gno
+++ b/gnovm/tests/files/std7.gno
@@ -7,11 +7,11 @@ import (
 )
 
 func inner() {
-	caller1 := std.GetCallerAt(1)
+	caller1 := std.CallerAt(1)
 	println(caller1)
-	caller2 := std.GetCallerAt(2)
+	caller2 := std.CallerAt(2)
 	println(caller2)
-	caller3 := std.GetCallerAt(3)
+	caller3 := std.CallerAt(3)
 	println(caller3)
 }
 
diff --git a/gnovm/tests/files/std8.gno b/gnovm/tests/files/std8.gno
index 3d0e4a7085e..509da757e87 100644
--- a/gnovm/tests/files/std8.gno
+++ b/gnovm/tests/files/std8.gno
@@ -7,13 +7,13 @@ import (
 )
 
 func inner() {
-	caller1 := std.GetCallerAt(1)
+	caller1 := std.CallerAt(1)
 	println(caller1)
-	caller2 := std.GetCallerAt(2)
+	caller2 := std.CallerAt(2)
 	println(caller2)
-	caller3 := std.GetCallerAt(3)
+	caller3 := std.CallerAt(3)
 	println(caller3)
-	caller4 := std.GetCallerAt(4)
+	caller4 := std.CallerAt(4)
 	println(caller4)
 }
 
@@ -25,7 +25,7 @@ func main() {
 // panic: frame not found
 // callerAt<VPBlock(3,52)>(n<VPBlock(1,0)>)
 //     gonative:std.callerAt
-// std<VPBlock(2,0)>.GetCallerAt(4)
+// std<VPBlock(2,0)>.CallerAt(4)
 //     std/native.gno:41
 // fn<VPBlock(1,0)>()
 //     main/files/std8.gno:16
diff --git a/gnovm/tests/files/zrealm_crossrealm11.gno b/gnovm/tests/files/zrealm_crossrealm11.gno
index 5936743ddc6..29295e99d10 100644
--- a/gnovm/tests/files/zrealm_crossrealm11.gno
+++ b/gnovm/tests/files/zrealm_crossrealm11.gno
@@ -9,8 +9,8 @@ import (
 	rtests "gno.land/r/demo/tests"
 )
 
-func getPrevRealm() std.Realm {
-	return std.PrevRealm()
+func getPreviousRealm() std.Realm {
+	return std.PreviousRealm()
 }
 
 func Exec(fn func()) {
@@ -29,7 +29,7 @@ func main() {
 	}
 
 	assertRealm := func(r std.Realm) {
-		pkgPath := callersByAddr[r.Addr()]
+		pkgPath := callersByAddr[r.Address()]
 		if r.IsUser() && pkgPath != "user1.gno" {
 			panic(ufmt.Sprintf("ERROR: expected: 'user1.gno', got:'%s'", pkgPath))
 		} else if !r.IsUser() && pkgPath != r.PkgPath() {
@@ -43,51 +43,51 @@ func main() {
 	}{
 		{
 			callStackAdd: "",
-			callerFn:     std.PrevRealm,
+			callerFn:     std.PreviousRealm,
 		},
 		{
-			callStackAdd: " -> r/crossrealm_test.getPrevRealm",
-			callerFn:     getPrevRealm,
+			callStackAdd: " -> r/crossrealm_test.getPreviousRealm",
+			callerFn:     getPreviousRealm,
 		},
 		{
 			callStackAdd: " -> p/demo/tests",
-			callerFn:     ptests.GetPrevRealm,
+			callerFn:     ptests.GetPreviousRealm,
 		},
 		{
 			callStackAdd: " -> p/demo/tests -> p/demo/tests/subtests",
-			callerFn:     ptests.GetPSubtestsPrevRealm,
+			callerFn:     ptests.GetPSubtestsPreviousRealm,
 		},
 		{
 			callStackAdd: " -> r/demo/tests",
-			callerFn:     rtests.GetPrevRealm,
+			callerFn:     rtests.GetPreviousRealm,
 		},
 		{
 			callStackAdd: " -> r/demo/tests -> r/demo/tests/subtests",
-			callerFn:     rtests.GetRSubtestsPrevRealm,
+			callerFn:     rtests.GetRSubtestsPreviousRealm,
 		},
 	}
 
 	println("---") // needed to have space prefixes
-	printColumns("STACK", "std.PrevRealm")
+	printColumns("STACK", "std.PreviousRealm")
 	printColumns("-----", "------------------")
 
 	baseCallStack := "user1.gno -> r/crossrealm_test.main"
 	for i, tt := range tests {
-		printColumns(baseCallStack+tt.callStackAdd, callersByAddr[tt.callerFn().Addr()])
+		printColumns(baseCallStack+tt.callStackAdd, callersByAddr[tt.callerFn().Address()])
 		Exec(func() {
 			r := tt.callerFn()
 			assertRealm(r)
-			printColumns(baseCallStack+" -> r/crossrealm_test.Exec"+tt.callStackAdd, callersByAddr[r.Addr()])
+			printColumns(baseCallStack+" -> r/crossrealm_test.Exec"+tt.callStackAdd, callersByAddr[r.Address()])
 		})
 		rtests.Exec(func() {
 			r := tt.callerFn()
 			assertRealm(r)
-			printColumns(baseCallStack+" -> r/demo/tests.Exec"+tt.callStackAdd, callersByAddr[r.Addr()])
+			printColumns(baseCallStack+" -> r/demo/tests.Exec"+tt.callStackAdd, callersByAddr[r.Address()])
 		})
 		ptests.Exec(func() {
 			r := tt.callerFn()
 			assertRealm(r)
-			printColumns(baseCallStack+" -> p/demo/tests.Exec"+tt.callStackAdd, callersByAddr[r.Addr()])
+			printColumns(baseCallStack+" -> p/demo/tests.Exec"+tt.callStackAdd, callersByAddr[r.Address()])
 		})
 	}
 }
@@ -111,16 +111,16 @@ func printColumns(left, right string) {
 
 // Output:
 // ---
-//                                                                                                     STACK = std.PrevRealm
+//                                                                                                     STACK = std.PreviousRealm
 //                                                                                                     ----- = ------------------
 //                                                                       user1.gno -> r/crossrealm_test.main = user1.gno
 //                                             user1.gno -> r/crossrealm_test.main -> r/crossrealm_test.Exec = user1.gno
 //                                                  user1.gno -> r/crossrealm_test.main -> r/demo/tests.Exec = gno.land/r/demo/tests
 //                                                  user1.gno -> r/crossrealm_test.main -> p/demo/tests.Exec = user1.gno
-//                                     user1.gno -> r/crossrealm_test.main -> r/crossrealm_test.getPrevRealm = user1.gno
-//           user1.gno -> r/crossrealm_test.main -> r/crossrealm_test.Exec -> r/crossrealm_test.getPrevRealm = user1.gno
-//                user1.gno -> r/crossrealm_test.main -> r/demo/tests.Exec -> r/crossrealm_test.getPrevRealm = gno.land/r/demo/tests
-//                user1.gno -> r/crossrealm_test.main -> p/demo/tests.Exec -> r/crossrealm_test.getPrevRealm = user1.gno
+//                                 user1.gno -> r/crossrealm_test.main -> r/crossrealm_test.getPreviousRealm = user1.gno
+//       user1.gno -> r/crossrealm_test.main -> r/crossrealm_test.Exec -> r/crossrealm_test.getPreviousRealm = user1.gno
+//            user1.gno -> r/crossrealm_test.main -> r/demo/tests.Exec -> r/crossrealm_test.getPreviousRealm = gno.land/r/demo/tests
+//            user1.gno -> r/crossrealm_test.main -> p/demo/tests.Exec -> r/crossrealm_test.getPreviousRealm = user1.gno
 //                                                       user1.gno -> r/crossrealm_test.main -> p/demo/tests = user1.gno
 //                             user1.gno -> r/crossrealm_test.main -> r/crossrealm_test.Exec -> p/demo/tests = user1.gno
 //                                  user1.gno -> r/crossrealm_test.main -> r/demo/tests.Exec -> p/demo/tests = gno.land/r/demo/tests
diff --git a/gnovm/tests/files/zrealm_crossrealm12.gno b/gnovm/tests/files/zrealm_crossrealm12.gno
index f2f229cd5de..5ae4d69879a 100644
--- a/gnovm/tests/files/zrealm_crossrealm12.gno
+++ b/gnovm/tests/files/zrealm_crossrealm12.gno
@@ -21,13 +21,13 @@ func main() {
 	for _, test := range tests {
 		r := test.fn()
 
-		if std.DerivePkgAddr(r.PkgPath()) != r.Addr() {
+		if std.DerivePkgAddr(r.PkgPath()) != r.Address() {
 			panic(fmt.Sprintf("ERROR: expected: %v, got: %v",
-				std.DerivePkgAddr(r.PkgPath()), r.Addr(),
+				std.DerivePkgAddr(r.PkgPath()), r.Address(),
 			))
 		}
 
-		println(r.PkgPath(), r.Addr())
+		println(r.PkgPath(), r.Address())
 	}
 }
 
diff --git a/gnovm/tests/files/zrealm_crossrealm13.gno b/gnovm/tests/files/zrealm_crossrealm13.gno
index 4daeb6de366..53504d095ec 100644
--- a/gnovm/tests/files/zrealm_crossrealm13.gno
+++ b/gnovm/tests/files/zrealm_crossrealm13.gno
@@ -7,15 +7,15 @@ import (
 func main() {
 	PrintRealm()
 	println(pad("CurrentRealm:"), std.CurrentRealm())
-	println(pad("PrevRealm:"), std.PrevRealm())
+	println(pad("PreviousRealm:"), std.PreviousRealm())
 	std.TestSetRealm(std.NewUserRealm("g1user"))
 	PrintRealm()
 	println(pad("CurrentRealm:"), std.CurrentRealm())
-	println(pad("PrevRealm:"), std.PrevRealm())
+	println(pad("PreviousRealm:"), std.PreviousRealm())
 	std.TestSetRealm(std.NewCodeRealm("gno.land/r/demo/users"))
 	PrintRealm()
 	println(pad("CurrentRealm:"), std.CurrentRealm())
-	println(pad("PrevRealm:"), std.PrevRealm())
+	println(pad("PreviousRealm:"), std.PreviousRealm())
 }
 
 func pad(s string) string {
@@ -27,7 +27,7 @@ func pad(s string) string {
 
 func PrintRealm() {
 	println(pad("PrintRealm: CurrentRealm:"), std.CurrentRealm())
-	println(pad("PrintRealm: PrevRealm:"), std.PrevRealm())
+	println(pad("PrintRealm: PreviousRealm:"), std.PreviousRealm())
 }
 
 // Because this is the context of a package, using PrintRealm()
@@ -35,14 +35,14 @@ func PrintRealm() {
 
 // Output:
 // PrintRealm: CurrentRealm:  (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
-// PrintRealm: PrevRealm:     (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
+// PrintRealm: PreviousRealm: (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
 // CurrentRealm:              (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
-// PrevRealm:                 (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
+// PreviousRealm:             (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
 // PrintRealm: CurrentRealm:  (struct{("g1user" std.Address),("" string)} std.Realm)
-// PrintRealm: PrevRealm:     (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
+// PrintRealm: PreviousRealm: (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
 // CurrentRealm:              (struct{("g1user" std.Address),("" string)} std.Realm)
-// PrevRealm:                 (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
+// PreviousRealm:             (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
 // PrintRealm: CurrentRealm:  (struct{("g17m4ga9t9dxn8uf06p3cahdavzfexe33ecg8v2s" std.Address),("gno.land/r/demo/users" string)} std.Realm)
-// PrintRealm: PrevRealm:     (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
+// PrintRealm: PreviousRealm: (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
 // CurrentRealm:              (struct{("g17m4ga9t9dxn8uf06p3cahdavzfexe33ecg8v2s" std.Address),("gno.land/r/demo/users" string)} std.Realm)
-// PrevRealm:                 (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
+// PreviousRealm:             (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
diff --git a/gnovm/tests/files/zrealm_crossrealm13a.gno b/gnovm/tests/files/zrealm_crossrealm13a.gno
index 2fc37804fce..0434a0b6538 100644
--- a/gnovm/tests/files/zrealm_crossrealm13a.gno
+++ b/gnovm/tests/files/zrealm_crossrealm13a.gno
@@ -8,15 +8,15 @@ import (
 func main() {
 	PrintRealm()
 	println(pad("CurrentRealm:"), std.CurrentRealm())
-	println(pad("PrevRealm:"), std.PrevRealm())
+	println(pad("PreviousRealm:"), std.PreviousRealm())
 	std.TestSetRealm(std.NewUserRealm("g1user"))
 	PrintRealm()
 	println(pad("CurrentRealm:"), std.CurrentRealm())
-	println(pad("PrevRealm:"), std.PrevRealm())
+	println(pad("PreviousRealm:"), std.PreviousRealm())
 	std.TestSetRealm(std.NewCodeRealm("gno.land/r/demo/users"))
 	PrintRealm()
 	println(pad("CurrentRealm:"), std.CurrentRealm())
-	println(pad("PrevRealm:"), std.PrevRealm())
+	println(pad("PreviousRealm:"), std.PreviousRealm())
 }
 
 func pad(s string) string {
@@ -28,19 +28,19 @@ func pad(s string) string {
 
 func PrintRealm() {
 	println(pad("PrintRealm: CurrentRealm:"), std.CurrentRealm())
-	println(pad("PrintRealm: PrevRealm:"), std.PrevRealm())
+	println(pad("PrintRealm: PreviousRealm:"), std.PreviousRealm())
 }
 
 // Output:
 // PrintRealm: CurrentRealm:  (struct{("g1r0mlnkc05z0fv49km99z60qnp95tengyqfdr02" std.Address),("gno.land/r/demo/groups" string)} std.Realm)
-// PrintRealm: PrevRealm:     (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
+// PrintRealm: PreviousRealm: (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
 // CurrentRealm:              (struct{("g1r0mlnkc05z0fv49km99z60qnp95tengyqfdr02" std.Address),("gno.land/r/demo/groups" string)} std.Realm)
-// PrevRealm:                 (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
+// PreviousRealm:             (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
 // PrintRealm: CurrentRealm:  (struct{("g1r0mlnkc05z0fv49km99z60qnp95tengyqfdr02" std.Address),("gno.land/r/demo/groups" string)} std.Realm)
-// PrintRealm: PrevRealm:     (struct{("g1user" std.Address),("" string)} std.Realm)
+// PrintRealm: PreviousRealm: (struct{("g1user" std.Address),("" string)} std.Realm)
 // CurrentRealm:              (struct{("g1user" std.Address),("" string)} std.Realm)
-// PrevRealm:                 (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
+// PreviousRealm:             (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
 // PrintRealm: CurrentRealm:  (struct{("g1r0mlnkc05z0fv49km99z60qnp95tengyqfdr02" std.Address),("gno.land/r/demo/groups" string)} std.Realm)
-// PrintRealm: PrevRealm:     (struct{("g17m4ga9t9dxn8uf06p3cahdavzfexe33ecg8v2s" std.Address),("gno.land/r/demo/users" string)} std.Realm)
+// PrintRealm: PreviousRealm: (struct{("g17m4ga9t9dxn8uf06p3cahdavzfexe33ecg8v2s" std.Address),("gno.land/r/demo/users" string)} std.Realm)
 // CurrentRealm:              (struct{("g17m4ga9t9dxn8uf06p3cahdavzfexe33ecg8v2s" std.Address),("gno.land/r/demo/users" string)} std.Realm)
-// PrevRealm:                 (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
+// PreviousRealm:             (struct{("g1wymu47drhr0kuq2098m792lytgtj2nyx77yrsm" std.Address),("" string)} std.Realm)
diff --git a/gnovm/tests/files/zrealm_initctx.gno b/gnovm/tests/files/zrealm_initctx.gno
index 2fda65e7681..4fc05a6e59c 100644
--- a/gnovm/tests/files/zrealm_initctx.gno
+++ b/gnovm/tests/files/zrealm_initctx.gno
@@ -10,8 +10,8 @@ var addr = std.Address("test")
 var addrInit = std.Address("addrInit")
 
 func init() {
-	addr = std.GetOrigCaller()
-	addrInit = tests.InitOrigCaller()
+	addr = std.OriginCaller()
+	addrInit = tests.InitOriginCaller()
 }
 
 func main() {
diff --git a/gnovm/tests/files/zrealm_natbind0.gno b/gnovm/tests/files/zrealm_natbind0.gno
index 6f8045107dc..5df7446d18c 100644
--- a/gnovm/tests/files/zrealm_natbind0.gno
+++ b/gnovm/tests/files/zrealm_natbind0.gno
@@ -8,16 +8,16 @@ import (
 var node interface{}
 
 func init() {
-	node = std.GetHeight
+	node = std.ChainHeight
 }
 
 func main() {
-	// NOTE: this test uses GetHeight and GetChainID, which are "pure"
+	// NOTE: this test uses ChainHeight and ChainID, which are "pure"
 	// natively bound functions (ie. not indirections through a wrapper fn,
 	// to convert the types to builtin go/gno identifiers).
 	f := node.(func() int64)
 	println(f())
-	node = std.GetChainID
+	node = std.ChainID
 	g := node.(func() string)
 	println(g())
 }
diff --git a/gnovm/tests/files/zrealm_natbind1_stdlibs.gno b/gnovm/tests/files/zrealm_natbind1_stdlibs.gno
index f44b6ab4fcf..2011624b186 100644
--- a/gnovm/tests/files/zrealm_natbind1_stdlibs.gno
+++ b/gnovm/tests/files/zrealm_natbind1_stdlibs.gno
@@ -6,7 +6,7 @@ import (
 )
 
 func main() {
-	println(std.GetChainDomain())
+	println(std.ChainDomain())
 }
 
 // Output:
diff --git a/gnovm/tests/files/zrealm_std0.gno b/gnovm/tests/files/zrealm_std0.gno
index 3f6bdae2537..fff6d6882b8 100644
--- a/gnovm/tests/files/zrealm_std0.gno
+++ b/gnovm/tests/files/zrealm_std0.gno
@@ -6,7 +6,7 @@ import (
 )
 
 func main() {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	println(caller)
 }
 
diff --git a/gnovm/tests/files/zrealm_std1.gno b/gnovm/tests/files/zrealm_std1.gno
index d75a2c60b71..8206b7b4097 100644
--- a/gnovm/tests/files/zrealm_std1.gno
+++ b/gnovm/tests/files/zrealm_std1.gno
@@ -8,14 +8,14 @@ import (
 var aset *std.AddressList
 
 func init() {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	aset = std.NewAddressList()
 	aset.AddAddress(caller)
 }
 
 func main() {
 	println(*aset)
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	err := aset.AddAddress(caller)
 	println("error:", err)
 	has := aset.HasAddress(caller)
diff --git a/gnovm/tests/files/zrealm_std2.gno b/gnovm/tests/files/zrealm_std2.gno
index 810210c6160..15d137bf556 100644
--- a/gnovm/tests/files/zrealm_std2.gno
+++ b/gnovm/tests/files/zrealm_std2.gno
@@ -9,14 +9,14 @@ import (
 var aset std.AddressSet
 
 func init() {
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	aset = std.NewAddressList()
 	aset.AddAddress(caller)
 }
 
 func main() {
 	println(*(aset.(*std.AddressList)))
-	caller := std.GetOrigCaller()
+	caller := std.OriginCaller()
 	err := aset.AddAddress(caller)
 	println("error:", err)
 	has := aset.HasAddress(caller)
diff --git a/gnovm/tests/files/zrealm_std6.gno b/gnovm/tests/files/zrealm_std6.gno
index 17a79c1d43b..b2ab6432d13 100644
--- a/gnovm/tests/files/zrealm_std6.gno
+++ b/gnovm/tests/files/zrealm_std6.gno
@@ -6,7 +6,7 @@ import (
 )
 
 var (
-	realmAddr std.Address = std.GetOrigPkgAddr()
+	realmAddr std.Address = std.OriginPkgAddress()
 )
 
 func main() {
diff --git a/gnovm/tests/integ/context/context.gno b/gnovm/tests/integ/context/context.gno
index 92a9cc632b7..58274b8e5d4 100644
--- a/gnovm/tests/integ/context/context.gno
+++ b/gnovm/tests/integ/context/context.gno
@@ -7,5 +7,5 @@ import (
 
 func Context() {
 	// This requires a Context to work; it will fail ugly if the Context isn't available.
-	fmt.Printf("Context worked: %d\n", std.GetHeight())
+	fmt.Printf("Context worked: %d\n", std.ChainHeight())
 }
diff --git a/gnovm/tests/stdlibs/generated.go b/gnovm/tests/stdlibs/generated.go
index d7417b0c77d..c731a2569a3 100644
--- a/gnovm/tests/stdlibs/generated.go
+++ b/gnovm/tests/stdlibs/generated.go
@@ -97,7 +97,7 @@ var nativeFuncs = [...]NativeFunc{
 	},
 	{
 		"std",
-		"testSetOrigCaller",
+		"testSetOriginCaller",
 		[]gno.FieldTypeExpr{
 			{Name: gno.N("p0"), Type: gno.X("string")},
 		},
@@ -112,14 +112,14 @@ var nativeFuncs = [...]NativeFunc{
 
 			gno.Gno2GoValue(b.GetPointerTo(nil, gno.NewValuePathBlock(1, 0, "")).TV, rp0)
 
-			testlibs_std.X_testSetOrigCaller(
+			testlibs_std.X_testSetOriginCaller(
 				m,
 				p0)
 		},
 	},
 	{
 		"std",
-		"testSetOrigPkgAddr",
+		"testSetOriginPkgAddr",
 		[]gno.FieldTypeExpr{
 			{Name: gno.N("p0"), Type: gno.X("string")},
 		},
@@ -134,7 +134,7 @@ var nativeFuncs = [...]NativeFunc{
 
 			gno.Gno2GoValue(b.GetPointerTo(nil, gno.NewValuePathBlock(1, 0, "")).TV, rp0)
 
-			testlibs_std.X_testSetOrigPkgAddr(
+			testlibs_std.X_testSetOriginPkgAddr(
 				m,
 				p0)
 		},
@@ -167,7 +167,7 @@ var nativeFuncs = [...]NativeFunc{
 	},
 	{
 		"std",
-		"testSetOrigSend",
+		"testSetOriginSend",
 		[]gno.FieldTypeExpr{
 			{Name: gno.N("p0"), Type: gno.X("[]string")},
 			{Name: gno.N("p1"), Type: gno.X("[]int64")},
@@ -194,7 +194,7 @@ var nativeFuncs = [...]NativeFunc{
 			gno.Gno2GoValue(b.GetPointerTo(nil, gno.NewValuePathBlock(1, 2, "")).TV, rp2)
 			gno.Gno2GoValue(b.GetPointerTo(nil, gno.NewValuePathBlock(1, 3, "")).TV, rp3)
 
-			testlibs_std.X_testSetOrigSend(
+			testlibs_std.X_testSetOriginSend(
 				m,
 				p0, p1, p2, p3)
 		},
diff --git a/gnovm/tests/stdlibs/std/std.gno b/gnovm/tests/stdlibs/std/std.gno
index c30071313fe..8f1cf27d734 100644
--- a/gnovm/tests/stdlibs/std/std.gno
+++ b/gnovm/tests/stdlibs/std/std.gno
@@ -3,20 +3,20 @@ package std
 func AssertOriginCall()           // injected
 func TestSkipHeights(count int64) // injected
 
-func TestSetOrigCaller(addr Address)  { testSetOrigCaller(string(addr)) }
-func TestSetOrigPkgAddr(addr Address) { testSetOrigPkgAddr(string(addr)) }
+func TestSetOriginCaller(addr Address)     { testSetOriginCaller(string(addr)) }
+func TestSetOriginPkgAddress(addr Address) { testSetOriginPkgAddr(string(addr)) }
 
 // TestSetRealm sets the realm for the current frame.
 // After calling TestSetRealm, calling CurrentRealm() in the test function will yield the value of
-// rlm, while if a realm function is called, using PrevRealm() will yield rlm.
+// rlm, while if a realm function is called, using PreviousRealm() will yield rlm.
 func TestSetRealm(rlm Realm) {
 	testSetRealm(string(rlm.addr), rlm.pkgPath)
 }
 
-func TestSetOrigSend(sent, spent Coins) {
+func TestSetOriginSend(sent, spent Coins) {
 	sentDenom, sentAmt := sent.expandNative()
 	spentDenom, spentAmt := spent.expandNative()
-	testSetOrigSend(sentDenom, sentAmt, spentDenom, spentAmt)
+	testSetOriginSend(sentDenom, sentAmt, spentDenom, spentAmt)
 }
 
 func TestIssueCoins(addr Address, coins Coins) {
@@ -24,14 +24,14 @@ func TestIssueCoins(addr Address, coins Coins) {
 	testIssueCoins(string(addr), denom, amt)
 }
 
-// GetCallerAt calls callerAt, which we overwrite
+// CallerAt calls callerAt, which we overwrite
 func callerAt(n int) string
 
 // native bindings
-func testSetOrigCaller(s string)
-func testSetOrigPkgAddr(s string)
+func testSetOriginCaller(s string)
+func testSetOriginPkgAddr(s string)
 func testSetRealm(addr, pkgPath string)
-func testSetOrigSend(
+func testSetOriginSend(
 	sentDenom []string, sentAmt []int64,
 	spentDenom []string, spentAmt []int64)
 func testIssueCoins(addr string, denom []string, amt []int64)
diff --git a/gnovm/tests/stdlibs/std/std.go b/gnovm/tests/stdlibs/std/std.go
index eac51c5fb0e..b6fcf23f048 100644
--- a/gnovm/tests/stdlibs/std/std.go
+++ b/gnovm/tests/stdlibs/std/std.go
@@ -14,7 +14,7 @@ import (
 type TestExecContext struct {
 	std.ExecContext
 
-	// These are used to set up the result of CurrentRealm() and PrevRealm().
+	// These are used to set up the result of CurrentRealm() and PreviousRealm().
 	RealmFrames map[*gno.Frame]RealmOverride
 }
 
@@ -71,10 +71,10 @@ func TestSkipHeights(m *gno.Machine, count int64) {
 
 func X_callerAt(m *gno.Machine, n int) string {
 	if n <= 0 {
-		m.Panic(typedString("GetCallerAt requires positive arg"))
+		m.Panic(typedString("CallerAt requires positive arg"))
 		return ""
 	}
-	// Add 1 to n to account for the GetCallerAt (gno fn) frame.
+	// Add 1 to n to account for the CallerAt (gno fn) frame.
 	n++
 	if n > m.NumFrames()-1 {
 		// NOTE: the last frame's LastPackage
@@ -84,22 +84,22 @@ func X_callerAt(m *gno.Machine, n int) string {
 		return ""
 	}
 	if n == m.NumFrames()-1 {
-		// This makes it consistent with GetOrigCaller and TestSetOrigCaller.
+		// This makes it consistent with OriginCaller and TestSetOriginCaller.
 		ctx := m.Context.(*TestExecContext)
-		return string(ctx.OrigCaller)
+		return string(ctx.OriginCaller)
 	}
 	return string(m.MustLastCallFrame(n).LastPackage.GetPkgAddr().Bech32())
 }
 
-func X_testSetOrigCaller(m *gno.Machine, addr string) {
+func X_testSetOriginCaller(m *gno.Machine, addr string) {
 	ctx := m.Context.(*TestExecContext)
-	ctx.OrigCaller = crypto.Bech32Address(addr)
+	ctx.OriginCaller = crypto.Bech32Address(addr)
 	m.Context = ctx
 }
 
-func X_testSetOrigPkgAddr(m *gno.Machine, addr string) {
+func X_testSetOriginPkgAddr(m *gno.Machine, addr string) {
 	ctx := m.Context.(*TestExecContext)
-	ctx.OrigPkgAddr = crypto.Bech32Address(addr)
+	ctx.OriginPkgAddr = crypto.Bech32Address(addr)
 	m.Context = ctx
 }
 
@@ -160,22 +160,22 @@ func X_getRealm(m *gno.Machine, height int) (address string, pkgPath string) {
 		}
 	}
 
-	// Fallback case: return OrigCaller.
-	return string(ctx.OrigCaller), ""
+	// Fallback case: return OriginCaller.
+	return string(ctx.OriginCaller), ""
 }
 
 func X_isRealm(m *gno.Machine, pkgPath string) bool {
 	return gno.IsRealmPath(pkgPath)
 }
 
-func X_testSetOrigSend(m *gno.Machine,
+func X_testSetOriginSend(m *gno.Machine,
 	sentDenom []string, sentAmt []int64,
 	spentDenom []string, spentAmt []int64,
 ) {
 	ctx := m.Context.(*TestExecContext)
-	ctx.OrigSend = std.CompactCoins(sentDenom, sentAmt)
+	ctx.OriginSend = std.CompactCoins(sentDenom, sentAmt)
 	spent := std.CompactCoins(spentDenom, spentAmt)
-	ctx.OrigSendSpent = &spent
+	ctx.OriginSendSpent = &spent
 	m.Context = ctx
 }
 

From 955e1cadfe47b0a299382019681182cfc6182709 Mon Sep 17 00:00:00 2001
From: Emmanuel T Odeke <emmanuel@orijtech.com>
Date: Wed, 19 Feb 2025 20:07:17 +0200
Subject: [PATCH 30/47] feat(gnolang): make panics from Go2Gno produce
 lineno:column information (#3748)

With this change, panics from Go2Gno now have the line-number and column
information attached which will greatly aid in debugging.

Fixes #3747

---------

Co-authored-by: Morgan <morgan@morganbaz.com>
---
 gnovm/pkg/gnolang/go2gno.go      | 30 +++++++++++++++++++-----------
 gnovm/tests/files/parse_err0.gno |  2 +-
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/gnovm/pkg/gnolang/go2gno.go b/gnovm/pkg/gnolang/go2gno.go
index 1ef23a0079e..b98136b13b5 100644
--- a/gnovm/pkg/gnolang/go2gno.go
+++ b/gnovm/pkg/gnolang/go2gno.go
@@ -149,6 +149,13 @@ func Go2Gno(fs *token.FileSet, gon ast.Node) (n Node) {
 			}
 		}()
 	}
+
+	panicWithPos := func(fmtStr string, args ...any) {
+		pos := fs.Position(gon.Pos())
+		loc := fmt.Sprintf("%s:%d:%d", pos.Filename, pos.Line, pos.Column)
+		panic(fmt.Errorf("%s: %v", loc, fmt.Sprintf(fmtStr, args...)))
+	}
+
 	switch gon := gon.(type) {
 	case *ast.ParenExpr:
 		return toExpr(fs, gon.X)
@@ -245,10 +252,10 @@ func Go2Gno(fs *token.FileSet, gon ast.Node) (n Node) {
 				Tag:  toExpr(fs, gon.Tag),
 			}
 		} else {
-			panic(fmt.Sprintf(
+			panicWithPos(
 				"expected a Go Field with 1 name but got %v.\n"+
 					"maybe call toFields",
-				gon.Names))
+				gon.Names)
 		}
 	case *ast.ArrayType:
 		if _, ok := gon.Len.(*ast.Ellipsis); ok {
@@ -330,7 +337,7 @@ func Go2Gno(fs *token.FileSet, gon ast.Node) (n Node) {
 		if cx, ok := gon.X.(*ast.CallExpr); ok {
 			if ix, ok := cx.Fun.(*ast.Ident); ok && ix.Name == "panic" {
 				if len(cx.Args) != 1 {
-					panic("expected panic statement to have single exception value")
+					panicWithPos("expected panic statement to have single exception value")
 				}
 				return &PanicStmt{
 					Exception: toExpr(fs, cx.Args[0]),
@@ -412,9 +419,8 @@ func Go2Gno(fs *token.FileSet, gon ast.Node) (n Node) {
 				VarName:      "",
 			}
 		default:
-			panic(fmt.Sprintf(
-				"unexpected *ast.TypeSwitchStmt.Assign type %s",
-				reflect.TypeOf(gon.Assign).String()))
+			panicWithPos("unexpected *ast.TypeSwitchStmt.Assign type %s",
+				reflect.TypeOf(gon.Assign).String())
 		}
 	case *ast.SwitchStmt:
 		x := toExpr(fs, gon.Tag)
@@ -433,10 +439,10 @@ func Go2Gno(fs *token.FileSet, gon ast.Node) (n Node) {
 		recv := FieldTypeExpr{}
 		if isMethod {
 			if len(gon.Recv.List) > 1 {
-				panic("method has multiple receivers")
+				panicWithPos("method has multiple receivers")
 			}
 			if len(gon.Recv.List) == 0 {
-				panic("method has no receiver")
+				panicWithPos("method has no receiver")
 			}
 			recv = *Go2Gno(fs, gon.Recv.List[0]).(*FieldTypeExpr)
 		}
@@ -454,7 +460,7 @@ func Go2Gno(fs *token.FileSet, gon ast.Node) (n Node) {
 			Body:     body,
 		}
 	case *ast.GenDecl:
-		panic("unexpected *ast.GenDecl; use toDecls(fs,) instead")
+		panicWithPos("unexpected *ast.GenDecl; use toDecls(fs,) instead")
 	case *ast.File:
 		pkgName := Name(gon.Name.Name)
 		decls := make([]Decl, 0, len(gon.Decls))
@@ -473,11 +479,13 @@ func Go2Gno(fs *token.FileSet, gon ast.Node) (n Node) {
 	case *ast.EmptyStmt:
 		return &EmptyStmt{}
 	default:
-		panic(fmt.Sprintf("unknown Go type %v: %s\n",
+		panicWithPos("unknown Go type %v: %s\n",
 			reflect.TypeOf(gon),
 			spew.Sdump(gon),
-		))
+		)
 	}
+
+	return
 }
 
 //----------------------------------------
diff --git a/gnovm/tests/files/parse_err0.gno b/gnovm/tests/files/parse_err0.gno
index 88a8e0df132..71b310c6644 100644
--- a/gnovm/tests/files/parse_err0.gno
+++ b/gnovm/tests/files/parse_err0.gno
@@ -7,4 +7,4 @@ func () A()
 func main() {}
 
 // Error:
-// method has no receiver
+// files/parse_err0.gno:5:1: method has no receiver

From 0fb25b547aa0e763acffedf4c4096f1bd7a80b4a Mon Sep 17 00:00:00 2001
From: Marc Vertes <marc.vertes@tendermint.com>
Date: Thu, 20 Feb 2025 10:56:58 +0100
Subject: [PATCH 31/47] feat(gnovm): enable debugger for gno test (#3380)

This change brings interactive debugging to gno tests, using -debug
flag.

New debugger commands have also been added:
- next, to step over the next source line
- stepout, to step out of the current function

Usage example, from the clone root dir:

```console
$ go run ./gnovm/cmd/gno test -v -debug  ./examples/gno.land/p/demo/diff -run TestMyersDiff/Case_sensitivity
Welcome to the Gnovm debugger. Type 'help' for list of commands.
dbg> break gno.land/p/demo/diff/diff.gno:60
Breakpoint 0 at gno.land/p/demo/diff gno.land/p/demo/diff/diff.gno:60:0
dbg> c
=== RUN   TestMyersDiff
=== RUN   TestMyersDiff/Case_sensitivity
> diff.MyersDiff() gno.land/p/demo/diff/diff.gno:60:10
     55: //
     56: // Returns:
     57: //   - A slice of Edit operations representing the minimum difference between the two strings.
     58: func MyersDiff(old, new string) []Edit {
     59: 	oldRunes, newRunes := []rune(old), []rune(new)
=>   60: 	n, m := len(oldRunes), len(newRunes)
     61:
     62: 	if n == 0 && m == 0 {
     63: 		return []Edit{}
     64: 	}
dbg> p oldRunes
(slice[(97 int32),(98 int32),(99 int32)] []int32)
dbg> stack
0	in gno.land/p/demo/diff.MyersDiff
	at gno.land/p/demo/diff/diff.gno:60:10
1	in gno.land/p/demo/diff.
	at gno.land/p/demo/diff/diff_test.gno:176:4
2	in testing.tRunner
	at testing/testing.gno:364:2
3	in testing.(*testing.T).Run
	at testing/testing.gno:171:2
4	in gno.land/p/demo/diff.TestMyersDiff
	at gno.land/p/demo/diff/diff_test.gno:175:3
5	in testing.tRunner
	at testing/testing.gno:364:2
6	in testing.RunTest
	at testing/testing.gno:298:2
dbg>
```
---
 gnovm/cmd/gno/test.go              | 17 ++++++
 gnovm/cmd/gno/tool_lint.go         |  3 +-
 gnovm/pkg/gnolang/debugger.go      | 98 +++++++++++++++++++++++-------
 gnovm/pkg/gnolang/debugger_test.go |  3 +
 gnovm/pkg/repl/repl.go             |  2 +-
 gnovm/pkg/test/filetest.go         |  1 +
 gnovm/pkg/test/test.go             | 29 +++++++--
 7 files changed, 125 insertions(+), 28 deletions(-)

diff --git a/gnovm/cmd/gno/test.go b/gnovm/cmd/gno/test.go
index ae67d69bc90..67cba458aa7 100644
--- a/gnovm/cmd/gno/test.go
+++ b/gnovm/cmd/gno/test.go
@@ -26,6 +26,8 @@ type testCfg struct {
 	updateGoldenTests   bool
 	printRuntimeMetrics bool
 	printEvents         bool
+	debug               bool
+	debugAddr           string
 }
 
 func newTestCmd(io commands.IO) *commands.Command {
@@ -143,6 +145,20 @@ func (c *testCfg) RegisterFlags(fs *flag.FlagSet) {
 		false,
 		"print emitted events",
 	)
+
+	fs.BoolVar(
+		&c.debug,
+		"debug",
+		false,
+		"enable interactive debugger using stdin and stdout",
+	)
+
+	fs.StringVar(
+		&c.debugAddr,
+		"debug-addr",
+		"",
+		"enable interactive debugger using tcp address in the form [host]:port",
+	)
 }
 
 func execTest(cfg *testCfg, args []string, io commands.IO) error {
@@ -189,6 +205,7 @@ func execTest(cfg *testCfg, args []string, io commands.IO) error {
 	opts.Verbose = cfg.verbose
 	opts.Metrics = cfg.printRuntimeMetrics
 	opts.Events = cfg.printEvents
+	opts.Debug = cfg.debug
 
 	buildErrCount := 0
 	testErrCount := 0
diff --git a/gnovm/cmd/gno/tool_lint.go b/gnovm/cmd/gno/tool_lint.go
index 6983175cea0..812a2baf103 100644
--- a/gnovm/cmd/gno/tool_lint.go
+++ b/gnovm/cmd/gno/tool_lint.go
@@ -159,7 +159,8 @@ func execLint(cfg *lintCfg, args []string, io commands.IO) error {
 				io.ErrPrintfln("%s: module is draft, skipping type check", pkgPath)
 			}
 
-			tm := test.Machine(gs, goio.Discard, memPkg.Path)
+			tm := test.Machine(gs, goio.Discard, memPkg.Path, false)
+
 			defer tm.Release()
 
 			// Check test files
diff --git a/gnovm/pkg/gnolang/debugger.go b/gnovm/pkg/gnolang/debugger.go
index f047a176af7..6b7b2f77175 100644
--- a/gnovm/pkg/gnolang/debugger.go
+++ b/gnovm/pkg/gnolang/debugger.go
@@ -10,11 +10,14 @@ import (
 	"io"
 	"net"
 	"os"
+	"path"
 	"path/filepath"
 	"sort"
 	"strconv"
 	"strings"
 	"unicode"
+
+	"github.com/gnolang/gno/gnovm/pkg/gnoenv"
 )
 
 // DebugState is the state of the machine debugger, defined by a finite state
@@ -43,24 +46,28 @@ type Debugger struct {
 	out     io.Writer      // debugger output, defaults to Stdout
 	scanner *bufio.Scanner // to parse input per line
 
-	state       DebugState          // current state of debugger
-	lastCmd     string              // last debugger command
-	lastArg     string              // last debugger command arguments
-	loc         Location            // source location of the current machine instruction
-	prevLoc     Location            // source location of the previous machine instruction
-	breakpoints []Location          // list of breakpoints set by user, as source locations
-	call        []Location          // for function tracking, ideally should be provided by machine frame
-	frameLevel  int                 // frame level of the current machine instruction
-	getSrc      func(string) string // helper to access source from repl or others
+	state       DebugState                  // current state of debugger
+	lastCmd     string                      // last debugger command
+	lastArg     string                      // last debugger command arguments
+	loc         Location                    // source location of the current machine instruction
+	prevLoc     Location                    // source location of the previous machine instruction
+	nextLoc     Location                    // source location at the 'next' command
+	breakpoints []Location                  // list of breakpoints set by user, as source locations
+	call        []Location                  // for function tracking, ideally should be provided by machine frame
+	frameLevel  int                         // frame level of the current machine instruction
+	nextDepth   int                         // function call depth at the 'next' command
+	getSrc      func(string, string) string // helper to access source from repl or others
+	rootDir     string
 }
 
 // Enable makes the debugger d active, using in as input reader, out as output writer and f as a source helper.
-func (d *Debugger) Enable(in io.Reader, out io.Writer, f func(string) string) {
+func (d *Debugger) Enable(in io.Reader, out io.Writer, f func(string, string) string) {
 	d.in = in
 	d.out = out
 	d.enabled = true
 	d.state = DebugAtInit
 	d.getSrc = f
+	d.rootDir = gnoenv.RootDir()
 }
 
 // Disable makes the debugger d inactive.
@@ -92,11 +99,11 @@ func init() {
 		"list":        {debugList, listUsage, listShort, listLong},
 		"print":       {debugPrint, printUsage, printShort, ""},
 		"stack":       {debugStack, stackUsage, stackShort, ""},
-		// NOTE: the difference between continue, step and stepi is handled within
-		// the main Debug() loop.
-		"step":  {debugContinue, stepUsage, stepShort, ""},
-		"stepi": {debugContinue, stepiUsage, stepiShort, ""},
-		"up":    {debugUp, upUsage, upShort, ""},
+		"next":        {debugContinue, nextUsage, nextShort, ""},
+		"step":        {debugContinue, stepUsage, stepShort, ""},
+		"stepi":       {debugContinue, stepiUsage, stepiShort, ""},
+		"stepout":     {debugContinue, stepoutUsage, stepoutShort, ""},
+		"up":          {debugUp, upUsage, upShort, ""},
 	}
 
 	// Sort command names for help.
@@ -113,11 +120,13 @@ func init() {
 	debugCmds["c"] = debugCmds["continue"]
 	debugCmds["h"] = debugCmds["help"]
 	debugCmds["l"] = debugCmds["list"]
+	debugCmds["n"] = debugCmds["next"]
 	debugCmds["p"] = debugCmds["print"]
 	debugCmds["quit"] = debugCmds["exit"]
 	debugCmds["q"] = debugCmds["exit"]
 	debugCmds["s"] = debugCmds["step"]
 	debugCmds["si"] = debugCmds["stepi"]
+	debugCmds["so"] = debugCmds["stepout"]
 }
 
 // Debug is the debug callback invoked at each VM execution step. It implements the DebugState FSA.
@@ -135,6 +144,9 @@ loop:
 				fmt.Fprintln(m.Debugger.out, "Command failed:", err)
 			}
 		case DebugAtRun:
+			if !m.Debugger.enabled {
+				break loop
+			}
 			switch m.Debugger.lastCmd {
 			case "si", "stepi":
 				m.Debugger.state = DebugAtCmd
@@ -146,6 +158,21 @@ loop:
 					debugList(m, "")
 					continue loop
 				}
+			case "n", "next":
+				if m.Debugger.loc != m.Debugger.prevLoc && m.Debugger.loc.File != "" &&
+					(m.Debugger.nextDepth == 0 || !sameLine(m.Debugger.loc, m.Debugger.nextLoc) && callDepth(m) <= m.Debugger.nextDepth) {
+					m.Debugger.state = DebugAtCmd
+					m.Debugger.prevLoc = m.Debugger.loc
+					debugList(m, "")
+					continue loop
+				}
+			case "stepout", "so":
+				if callDepth(m) < m.Debugger.nextDepth {
+					m.Debugger.state = DebugAtCmd
+					m.Debugger.prevLoc = m.Debugger.loc
+					debugList(m, "")
+					continue loop
+				}
 			default:
 				if atBreak(m) {
 					m.Debugger.state = DebugAtCmd
@@ -172,6 +199,23 @@ loop:
 	}
 }
 
+// callDepth returns the function call depth.
+func callDepth(m *Machine) int {
+	n := 0
+	for _, f := range m.Frames {
+		if f.Func == nil {
+			continue
+		}
+		n++
+	}
+	return n
+}
+
+// sameLine returns true if both arguments are at the same line.
+func sameLine(loc1, loc2 Location) bool {
+	return loc1.PkgPath == loc2.PkgPath && loc1.File == loc2.File && loc1.Line == loc2.Line
+}
+
 // atBreak returns true if current machine location matches a breakpoint, false otherwise.
 func atBreak(m *Machine) bool {
 	loc := m.Debugger.loc
@@ -317,7 +361,14 @@ func parseLocSpec(m *Machine, arg string) (loc Location, err error) {
 			if loc.File, err = filepath.Abs(strs[0]); err != nil {
 				return loc, err
 			}
-			loc.File = filepath.Clean(loc.File)
+			loc.File = path.Clean(loc.File)
+			if m.Debugger.rootDir != "" && strings.HasPrefix(loc.File, m.Debugger.rootDir) {
+				loc.File = strings.TrimPrefix(loc.File, m.Debugger.rootDir+"/gnovm/stdlibs/")
+				loc.File = strings.TrimPrefix(loc.File, m.Debugger.rootDir+"/examples/")
+				loc.File = strings.TrimPrefix(loc.File, m.Debugger.rootDir+"/")
+				loc.PkgPath = path.Dir(loc.File)
+				loc.File = path.Base(loc.File)
+			}
 		}
 		if line, err = strconv.Atoi(strs[1]); err != nil {
 			return loc, err
@@ -378,24 +429,29 @@ func debugClear(m *Machine, arg string) error {
 }
 
 // ---------------------------------------
+// NOTE: the difference between continue, next, step, stepi and stepout is handled within the Debug() loop.
 const (
 	continueUsage = `continue|c`
 	continueShort = `Run until breakpoint or program termination.`
-)
 
-const (
+	nextUsage = `next|n`
+	nextShort = `Step over to next source line.`
+
 	stepUsage = `step|s`
 	stepShort = `Single step through program.`
-)
 
-const (
 	stepiUsage = `stepi|si`
 	stepiShort = `Single step a single VM instruction.`
+
+	stepoutUsage = `stepout|so`
+	stepoutShort = `Step out of the current function.`
 )
 
 func debugContinue(m *Machine, arg string) error {
 	m.Debugger.state = DebugAtRun
 	m.Debugger.frameLevel = 0
+	m.Debugger.nextDepth = callDepth(m)
+	m.Debugger.nextLoc = m.Debugger.loc
 	return nil
 }
 
@@ -505,7 +561,7 @@ func debugList(m *Machine, arg string) (err error) {
 	if err != nil {
 		// Use optional getSrc helper as fallback to get source.
 		if m.Debugger.getSrc != nil {
-			src = m.Debugger.getSrc(loc.File)
+			src = m.Debugger.getSrc(loc.PkgPath, loc.File)
 		}
 		if src == "" {
 			return err
diff --git a/gnovm/pkg/gnolang/debugger_test.go b/gnovm/pkg/gnolang/debugger_test.go
index a9e0a4834d5..a4282225324 100644
--- a/gnovm/pkg/gnolang/debugger_test.go
+++ b/gnovm/pkg/gnolang/debugger_test.go
@@ -143,6 +143,9 @@ func TestDebug(t *testing.T) {
 		{in: "b 27\nc\np b\n", out: `("!zero" string)`},
 		{in: "b 22\nc\np t.A[3]\n", out: "Command failed: &{(\"slice index out of bounds: 3 (len=3)\" string) <nil> }"},
 		{in: "b 43\nc\nc\nc\np i\ndetach\n", out: "(1 int)"},
+		{in: "b 37\nc\nnext\n", out: "=>   39:"},
+		{in: "b 40\nc\nnext\n", out: "=>   41:"},
+		{in: "b 22\nc\nstepout\n", out: "=>   40:"},
 	})
 
 	runDebugTest(t, "../../tests/files/a1.gno", []dtest{
diff --git a/gnovm/pkg/repl/repl.go b/gnovm/pkg/repl/repl.go
index fff80d672dc..56c8b4a53f3 100644
--- a/gnovm/pkg/repl/repl.go
+++ b/gnovm/pkg/repl/repl.go
@@ -156,7 +156,7 @@ func (r *Repl) Process(input string) (out string, err error) {
 	r.state.id++
 
 	if r.debug {
-		r.state.machine.Debugger.Enable(os.Stdin, os.Stdout, func(file string) string {
+		r.state.machine.Debugger.Enable(os.Stdin, os.Stdout, func(ppath, file string) string {
 			return r.state.files[file]
 		})
 		r.debug = false
diff --git a/gnovm/pkg/test/filetest.go b/gnovm/pkg/test/filetest.go
index c24c014a9ba..61e6084aa23 100644
--- a/gnovm/pkg/test/filetest.go
+++ b/gnovm/pkg/test/filetest.go
@@ -63,6 +63,7 @@ func (opts *TestOptions) runFiletest(filename string, source []byte) (string, er
 		Store:         opts.TestStore.BeginTransaction(cw, cw, nil),
 		Context:       ctx,
 		MaxAllocBytes: maxAlloc,
+		Debug:         opts.Debug,
 	})
 	defer m.Release()
 	result := opts.runTest(m, pkgPath, filename, source)
diff --git a/gnovm/pkg/test/test.go b/gnovm/pkg/test/test.go
index 71ec3bb2568..f9b7f47dd29 100644
--- a/gnovm/pkg/test/test.go
+++ b/gnovm/pkg/test/test.go
@@ -70,11 +70,12 @@ func Context(pkgPath string, send std.Coins) *teststd.TestExecContext {
 }
 
 // Machine is a minimal machine, set up with just the Store, Output and Context.
-func Machine(testStore gno.Store, output io.Writer, pkgPath string) *gno.Machine {
+func Machine(testStore gno.Store, output io.Writer, pkgPath string, debug bool) *gno.Machine {
 	return gno.NewMachineWithOptions(gno.MachineOptions{
 		Store:   testStore,
 		Output:  output,
 		Context: Context(pkgPath, nil),
+		Debug:   debug,
 	})
 }
 
@@ -107,6 +108,8 @@ type TestOptions struct {
 	Output io.Writer
 	// Used for os.Stderr, and for printing errors.
 	Error io.Writer
+	// Debug enables the interactive debugger on gno tests.
+	Debug bool
 
 	// Not set by NewTestOptions:
 
@@ -289,9 +292,8 @@ func (opts *TestOptions) runTestFiles(
 	// reset store ops, if any - we only need them for some filetests.
 	opts.TestStore.SetLogStoreOps(false)
 
-	// Check if we already have the package - it may have been eagerly
-	// loaded.
-	m = Machine(gs, opts.WriterForStore(), memPkg.Path)
+	// Check if we already have the package - it may have been eagerly loaded.
+	m = Machine(gs, opts.WriterForStore(), memPkg.Path, opts.Debug)
 	m.Alloc = alloc
 	if opts.TestStore.GetMemPackage(memPkg.Path) == nil {
 		m.RunMemPackage(memPkg, true)
@@ -311,7 +313,7 @@ func (opts *TestOptions) runTestFiles(
 		// - Run the test files before this for loop (but persist it to store;
 		//   RunFiles doesn't do that currently)
 		// - Wrap here.
-		m = Machine(gs, opts.Output, memPkg.Path)
+		m = Machine(gs, opts.Output, memPkg.Path, opts.Debug)
 		m.Alloc = alloc.Reset()
 		m.SetActivePackage(pv)
 
@@ -319,6 +321,23 @@ func (opts *TestOptions) runTestFiles(
 		testingtv := gno.TypedValue{T: &gno.PackageType{}, V: testingpv}
 		testingcx := &gno.ConstExpr{TypedValue: testingtv}
 
+		if opts.Debug {
+			fileContent := func(ppath, name string) string {
+				p := filepath.Join(opts.RootDir, ppath, name)
+				b, err := os.ReadFile(p)
+				if err != nil {
+					p = filepath.Join(opts.RootDir, "gnovm", "stdlibs", ppath, name)
+					b, err = os.ReadFile(p)
+				}
+				if err != nil {
+					p = filepath.Join(opts.RootDir, "examples", ppath, name)
+					b, err = os.ReadFile(p)
+				}
+				return string(b)
+			}
+			m.Debugger.Enable(os.Stdin, os.Stdout, fileContent)
+		}
+
 		eval := m.Eval(gno.Call(
 			gno.Sel(testingcx, "RunTest"),            // Call testing.RunTest
 			gno.Str(opts.RunFlag),                    // run flag

From b04ca6c590c91395a9c74a8d2c71e593ee58fa47 Mon Sep 17 00:00:00 2001
From: Morgan <morgan@morganbaz.com>
Date: Thu, 20 Feb 2025 16:06:49 +0100
Subject: [PATCH 32/47] build: use go1.23.6 (#3767)

Seeing as Go is now at version 1.24, making this PR to bump to the
latest patch version of 1.23. This will also fix the CI on master.

Changes aside from go.mod concern updating a few methods in `txlog`
which were always intended to use 1.23 iterators, but couldn't until
now.

There is a language change (the aforementioned range funcs), but it
shouldn't impact existing code. Pinging those who I think could verify
this in the reviewers.

Fixes #3033.
---
 .github/ISSUE_TEMPLATE/BUG-REPORT.md          |  4 +--
 .github/workflows/examples.yml                |  2 +-
 .github/workflows/gnofmt_template.yml         |  2 +-
 .github/workflows/main_template.yml           |  1 -
 CONTRIBUTING.md                               |  3 +--
 Dockerfile                                    |  4 +--
 contribs/github-bot/go.mod                    |  4 +--
 contribs/gnodev/go.mod                        |  4 +--
 contribs/gnofaucet/go.mod                     |  4 +--
 contribs/gnogenesis/go.mod                    |  4 +--
 contribs/gnohealth/go.mod                     |  2 +-
 contribs/gnokeykc/go.mod                      |  4 +--
 contribs/gnomigrate/go.mod                    |  4 +--
 .../local-setup/installation.md               |  2 +-
 .../validators/connect-to-existing-chain.md   |  2 +-
 .../validators/setting-up-a-new-chain.md      |  2 +-
 gnovm/cmd/gno/bug.go                          |  2 +-
 gnovm/pkg/gnolang/internal/txlog/txlog.go     | 25 ++++++++++++-------
 .../pkg/gnolang/internal/txlog/txlog_test.go  | 21 ++++++++--------
 gnovm/pkg/gnolang/store.go                    | 10 +++-----
 go.mod                                        |  4 +--
 misc/autocounterd/go.mod                      |  4 +--
 misc/docs-linter/go.mod                       |  4 +--
 misc/loop/go.mod                              |  4 +--
 misc/stdlib_diff/go.mod                       |  4 +--
 25 files changed, 54 insertions(+), 72 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/BUG-REPORT.md b/.github/ISSUE_TEMPLATE/BUG-REPORT.md
index 3aca60cdbb7..3f2fe8452b5 100644
--- a/.github/ISSUE_TEMPLATE/BUG-REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG-REPORT.md
@@ -13,7 +13,7 @@ Describe your issue in as much detail as possible here
 
 ### Your environment
 
-* Go version (example: go1.23.4)
+* Go version (example: go1.23.6)
 * OS and CPU architecture (example: linux/amd64)
 * Gno commit hash causing the issue (example: f24690e7ebf325bffcfaf9e328c3df8e6b21e50c)
 
@@ -37,4 +37,4 @@ Please paste any logs here that demonstrate the issue, if they exist
 
 ### Proposed solution
 
-If you have an idea of how to fix this issue, please write it down here, so we can begin discussing it
\ No newline at end of file
+If you have an idea of how to fix this issue, please write it down here, so we can begin discussing it
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
index 09c0ee0bbd9..ee18c864236 100644
--- a/.github/workflows/examples.yml
+++ b/.github/workflows/examples.yml
@@ -89,7 +89,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ "1.23.x" ]
+        go-version: ["1.23.x"]
         # unittests: TODO: matrix with contracts
     runs-on: ubuntu-latest
     timeout-minutes: 10
diff --git a/.github/workflows/gnofmt_template.yml b/.github/workflows/gnofmt_template.yml
index c47ef35efd7..edf9311f480 100644
--- a/.github/workflows/gnofmt_template.yml
+++ b/.github/workflows/gnofmt_template.yml
@@ -30,4 +30,4 @@ jobs:
 
       - name: Check for unformatted code
         run: |
-          git diff --exit-code || (echo "Some gno files are not formatted, please run 'make fmt'." && exit 1)
\ No newline at end of file
+          git diff --exit-code || (echo "Some gno files are not formatted, please run 'make fmt'." && exit 1)
diff --git a/.github/workflows/main_template.yml b/.github/workflows/main_template.yml
index 260c983e871..6b62a176cae 100644
--- a/.github/workflows/main_template.yml
+++ b/.github/workflows/main_template.yml
@@ -39,4 +39,3 @@ jobs:
       tests-extra-args: ${{ inputs.tests-extra-args }}
     secrets:
       codecov-token: ${{ secrets.codecov-token }}
-    
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 9562a531227..2e0e989ccac 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -56,7 +56,7 @@ The gno repository is primarily based on Go (Golang) and Gno.
 
 The primary tech stack for working on the repository:
 
-- Go (version 1.22+)
+- Go (version 1.23+)
 - make (for using Makefile configurations)
 
 It is recommended to work on a Unix environment, as most of the tooling is built around ready-made tools in Unix (WSL2
@@ -514,4 +514,3 @@ automatic label management.
 | info needed      | Issue is lacking information needed for resolving |
 | investigating    | Issue is still being investigated by the team     |
 | question         | Issue starts a discussion or raises a question    |
-
diff --git a/Dockerfile b/Dockerfile
index effc30ca32f..057d4388415 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # build gno
-FROM        golang:1.22-alpine AS build-gno
+FROM        golang:1.23-alpine AS build-gno
 RUN         go env -w GOMODCACHE=/root/.cache/go-build
 WORKDIR     /gnoroot
 ENV         GNOROOT="/gnoroot"
@@ -11,7 +11,7 @@ RUN         --mount=type=cache,target=/root/.cache/go-build       go build -o ./
 RUN         --mount=type=cache,target=/root/.cache/go-build       go build -o ./build/gno       ./gnovm/cmd/gno
 
 # build misc binaries
-FROM        golang:1.22-alpine AS build-misc
+FROM        golang:1.23-alpine AS build-misc
 RUN         go env -w GOMODCACHE=/root/.cache/go-build
 WORKDIR     /gnoroot
 ENV         GNOROOT="/gnoroot"
diff --git a/contribs/github-bot/go.mod b/contribs/github-bot/go.mod
index f8914819d54..e3072115c95 100644
--- a/contribs/github-bot/go.mod
+++ b/contribs/github-bot/go.mod
@@ -1,8 +1,6 @@
 module github.com/gnolang/gno/contribs/github-bot
 
-go 1.22.0
-
-toolchain go1.23.2
+go 1.23.6
 
 replace github.com/gnolang/gno => ../..
 
diff --git a/contribs/gnodev/go.mod b/contribs/gnodev/go.mod
index 9aea08c4a30..f520e2fbb79 100644
--- a/contribs/gnodev/go.mod
+++ b/contribs/gnodev/go.mod
@@ -1,8 +1,6 @@
 module github.com/gnolang/gno/contribs/gnodev
 
-go 1.22.0
-
-toolchain go1.22.10
+go 1.23.6
 
 replace github.com/gnolang/gno => ../..
 
diff --git a/contribs/gnofaucet/go.mod b/contribs/gnofaucet/go.mod
index 88c05e0d778..0a862162331 100644
--- a/contribs/gnofaucet/go.mod
+++ b/contribs/gnofaucet/go.mod
@@ -1,8 +1,6 @@
 module github.com/gnolang/gno/contribs/gnofaucet
 
-go 1.22.0
-
-toolchain go1.22.10
+go 1.23.6
 
 require (
 	github.com/gnolang/faucet v0.3.2
diff --git a/contribs/gnogenesis/go.mod b/contribs/gnogenesis/go.mod
index 8af370f8169..e03ad1dde42 100644
--- a/contribs/gnogenesis/go.mod
+++ b/contribs/gnogenesis/go.mod
@@ -1,8 +1,6 @@
 module github.com/gnolang/contribs/gnogenesis
 
-go 1.22.0
-
-toolchain go1.22.10
+go 1.23.6
 
 require (
 	github.com/gnolang/gno v0.0.0-00010101000000-000000000000
diff --git a/contribs/gnohealth/go.mod b/contribs/gnohealth/go.mod
index 76d7cd9c437..81c0ae7325b 100644
--- a/contribs/gnohealth/go.mod
+++ b/contribs/gnohealth/go.mod
@@ -1,6 +1,6 @@
 module github.com/gnolang/gno/contribs/gnohealth
 
-go 1.22.4
+go 1.23.6
 
 replace github.com/gnolang/gno => ../..
 
diff --git a/contribs/gnokeykc/go.mod b/contribs/gnokeykc/go.mod
index 3abcf3d834f..0ecc7b34cf3 100644
--- a/contribs/gnokeykc/go.mod
+++ b/contribs/gnokeykc/go.mod
@@ -1,8 +1,6 @@
 module github.com/gnolang/gno/contribs/gnokeykc
 
-go 1.22.0
-
-toolchain go1.22.10
+go 1.23.6
 
 replace github.com/gnolang/gno => ../..
 
diff --git a/contribs/gnomigrate/go.mod b/contribs/gnomigrate/go.mod
index 96f6dc9bdc6..0381c6acd01 100644
--- a/contribs/gnomigrate/go.mod
+++ b/contribs/gnomigrate/go.mod
@@ -1,8 +1,6 @@
 module github.com/gnolang/gnomigrate
 
-go 1.22.0
-
-toolchain go1.22.10
+go 1.23.6
 
 require (
 	github.com/gnolang/gno v0.0.0-00010101000000-000000000000
diff --git a/docs/getting-started/local-setup/installation.md b/docs/getting-started/local-setup/installation.md
index e05c2f9b205..2d091d6bf44 100644
--- a/docs/getting-started/local-setup/installation.md
+++ b/docs/getting-started/local-setup/installation.md
@@ -13,7 +13,7 @@ to run on your machine.
 ## Prerequisites
 - **Git**
 - **`make` (for running Makefiles)**
-- **Go 1.22+**
+- **Go 1.23+**
 - **Go Environment Setup**:
   - Make sure `$GOPATH` is well-defined, and `$GOPATH/bin` is added to your `$PATH` variable.
   - To do this, you can add the following line to your `.bashrc`, `.zshrc` or other config file:
diff --git a/docs/gno-infrastructure/validators/connect-to-existing-chain.md b/docs/gno-infrastructure/validators/connect-to-existing-chain.md
index f15f6bb59e2..82adeb557c4 100644
--- a/docs/gno-infrastructure/validators/connect-to-existing-chain.md
+++ b/docs/gno-infrastructure/validators/connect-to-existing-chain.md
@@ -12,7 +12,7 @@ In this tutorial, you will learn how to start a local Gno node and connect to an
 
 - **Git**
 - **`make` (for running Makefiles)**
-- **Go 1.22+**
+- **Go 1.23+**
 - **Go Environment Setup**: Ensure you have Go set up as outlined in
   the [Go official installation documentation](https://go.dev/doc/install) for your environment
 
diff --git a/docs/gno-infrastructure/validators/setting-up-a-new-chain.md b/docs/gno-infrastructure/validators/setting-up-a-new-chain.md
index 5db8a7f1a59..58ae7e011b8 100644
--- a/docs/gno-infrastructure/validators/setting-up-a-new-chain.md
+++ b/docs/gno-infrastructure/validators/setting-up-a-new-chain.md
@@ -13,7 +13,7 @@ Additionally, you will see the different options you can use to make your Gno in
 
 - **Git**
 - **`make` (for running Makefiles)**
-- **Go 1.22+**
+- **Go 1.23+**
 - **Go Environment Setup**: Ensure you have Go set up as outlined in
   the [Go official installation documentation](https://go.dev/doc/install) for your environment
 
diff --git a/gnovm/cmd/gno/bug.go b/gnovm/cmd/gno/bug.go
index 6f4f78410d6..fd5f907bc40 100644
--- a/gnovm/cmd/gno/bug.go
+++ b/gnovm/cmd/gno/bug.go
@@ -69,7 +69,7 @@ func newBugCmd(io commands.IO) *commands.Command {
 The new issue body is prefilled for you with the following information:
 
 - Gno version (the output of "gno version")
-- Go version (example: go1.22.4)
+- Go version (example: go1.23.4)
 - OS and CPU architecture (example: linux/amd64)
 - Gno commit hash causing the issue (example: f24690e7ebf325bffcfaf9e328c3df8e6b21e50c)
 
diff --git a/gnovm/pkg/gnolang/internal/txlog/txlog.go b/gnovm/pkg/gnolang/internal/txlog/txlog.go
index cda11083672..0c5e8640bf7 100644
--- a/gnovm/pkg/gnolang/internal/txlog/txlog.go
+++ b/gnovm/pkg/gnolang/internal/txlog/txlog.go
@@ -7,12 +7,14 @@
 // when calling [MapCommitter.Commit].
 package txlog
 
+import "iter"
+
 // Map is a generic interface to a key/value map, like Go's builtin map.
 type Map[K comparable, V any] interface {
 	Get(K) (V, bool)
 	Set(K, V)
 	Delete(K)
-	Iterate() func(yield func(K, V) bool)
+	Iterate() iter.Seq2[K, V]
 }
 
 // MapCommitter is a Map which also implements a Commit() method, which writes
@@ -47,7 +49,7 @@ func (m GoMap[K, V]) Delete(k K) {
 }
 
 // Iterate implements [Map].
-func (m GoMap[K, V]) Iterate() func(yield func(K, V) bool) {
+func (m GoMap[K, V]) Iterate() iter.Seq2[K, V] {
 	return func(yield func(K, V) bool) {
 		for k, v := range m {
 			if !yield(k, v) {
@@ -103,21 +105,26 @@ func (b txLog[K, V]) Delete(k K) {
 	b.dirty[k] = deletable[V]{deleted: true}
 }
 
-func (b txLog[K, V]) Iterate() func(yield func(K, V) bool) {
+func (b txLog[K, V]) Iterate() iter.Seq2[K, V] {
 	return func(yield func(K, V) bool) {
 		// go through b.source; skip deleted values, and use updated values
 		// for those which exist in b.dirty.
-		b.source.Iterate()(func(k K, v V) bool {
+		for k, v := range b.source.Iterate() {
 			if dirty, ok := b.dirty[k]; ok {
 				if dirty.deleted {
-					return true
+					continue
+				}
+				if !yield(k, dirty.v) {
+					return
 				}
-				return yield(k, dirty.v)
+				continue
 			}
 
 			// not in dirty
-			return yield(k, v)
-		})
+			if !yield(k, v) {
+				return
+			}
+		}
 
 		// iterate over all "new" values (ie. exist in b.dirty but not b.source).
 		for k, v := range b.dirty {
@@ -129,7 +136,7 @@ func (b txLog[K, V]) Iterate() func(yield func(K, V) bool) {
 				continue
 			}
 			if !yield(k, v.v) {
-				break
+				return
 			}
 		}
 	}
diff --git a/gnovm/pkg/gnolang/internal/txlog/txlog_test.go b/gnovm/pkg/gnolang/internal/txlog/txlog_test.go
index b0780fc8380..fd2a2597194 100644
--- a/gnovm/pkg/gnolang/internal/txlog/txlog_test.go
+++ b/gnovm/pkg/gnolang/internal/txlog/txlog_test.go
@@ -51,17 +51,17 @@ func ExampleWrap() {
 func Test_txLog(t *testing.T) {
 	t.Parallel()
 
-	type Value = struct{}
+	type Value = struct{ b byte }
 
 	// Full "integration test" of the txLog + mapwrapper.
 	source := GoMap[int, *Value](map[int]*Value{})
 
 	// create 4 empty values (we'll just use the pointers)
 	vs := [...]*Value{
-		{},
-		{},
-		{},
-		{},
+		{0},
+		{1},
+		{2},
+		{3},
 	}
 	source.Set(0, vs[0])
 	source.Set(1, vs[1])
@@ -121,8 +121,8 @@ func Test_txLog(t *testing.T) {
 		assert.Equal(t, saved, txm.source)
 
 		// double-check on the iterators.
-		verifyHashMapValues(t, source, map[int]*Value{1: vs[1], 2: vs[0]})
-		verifyHashMapValues(t, txm, map[int]*Value{2: vs[2], 3: vs[3]})
+		verifyHashMapValues(t, source, map[int]*Value{1: vs[1], 2: vs[2]})
+		verifyHashMapValues(t, txm, map[int]*Value{2: vs[0], 3: vs[3]})
 	}
 
 	{
@@ -146,17 +146,16 @@ func Test_txLog(t *testing.T) {
 	}
 }
 
-func verifyHashMapValues(t *testing.T, m Map[int, *struct{}], expectedReadonly map[int]*struct{}) {
+func verifyHashMapValues(t *testing.T, m Map[int, *struct{ b byte }], expectedReadonly map[int]*struct{ b byte }) {
 	t.Helper()
 
 	expected := maps.Clone(expectedReadonly)
-	m.Iterate()(func(k int, v *struct{}) bool {
+	for k, v := range m.Iterate() {
 		ev, eok := expected[k]
 		_ = assert.True(t, eok, "mapping %d:%v should exist in expected map", k, v) &&
 			assert.Equal(t, ev, v, "values should match")
 		delete(expected, k)
-		return true
-	})
+	}
 	assert.Empty(t, expected, "(some) expected values not found in the Map")
 }
 
diff --git a/gnovm/pkg/gnolang/store.go b/gnovm/pkg/gnolang/store.go
index 84625bd92c1..1ddc97ed0d0 100644
--- a/gnovm/pkg/gnolang/store.go
+++ b/gnovm/pkg/gnolang/store.go
@@ -246,14 +246,12 @@ func CopyFromCachedStore(destStore, cachedStore Store, cachedBase, cachedIavl st
 		ds.iavlStore.Set(iter.Key(), iter.Value())
 	}
 
-	ss.cacheTypes.Iterate()(func(k TypeID, v Type) bool {
+	for k, v := range ss.cacheTypes.Iterate() {
 		ds.cacheTypes.Set(k, v)
-		return true
-	})
-	ss.cacheNodes.Iterate()(func(k Location, v BlockNode) bool {
+	}
+	for k, v := range ss.cacheNodes.Iterate() {
 		ds.cacheNodes.Set(k, v)
-		return true
-	})
+	}
 }
 
 func (ds *defaultStore) GetAllocator() *Allocator {
diff --git a/go.mod b/go.mod
index 027ba6359bc..026351cec77 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
 module github.com/gnolang/gno
 
-go 1.22.0
+go 1.23
 
-toolchain go1.22.10
+toolchain go1.23.6
 
 require (
 	dario.cat/mergo v1.0.1
diff --git a/misc/autocounterd/go.mod b/misc/autocounterd/go.mod
index 972975d4fb0..7d9def2b3cc 100644
--- a/misc/autocounterd/go.mod
+++ b/misc/autocounterd/go.mod
@@ -1,8 +1,6 @@
 module autocounterd
 
-go 1.22.0
-
-toolchain go1.22.10
+go 1.23.6
 
 require github.com/gnolang/gno v0.0.0-00010101000000-000000000000
 
diff --git a/misc/docs-linter/go.mod b/misc/docs-linter/go.mod
index 2951bcbef54..a98f8115b1c 100644
--- a/misc/docs-linter/go.mod
+++ b/misc/docs-linter/go.mod
@@ -1,8 +1,6 @@
 module linter
 
-go 1.22.0
-
-toolchain go1.23.2
+go 1.23.6
 
 require (
 	github.com/gnolang/gno v0.0.0-00010101000000-000000000000
diff --git a/misc/loop/go.mod b/misc/loop/go.mod
index 4c5a3f41839..7d0252da82c 100644
--- a/misc/loop/go.mod
+++ b/misc/loop/go.mod
@@ -1,8 +1,6 @@
 module loop
 
-go 1.22.0
-
-toolchain go1.22.10
+go 1.23.6
 
 require (
 	github.com/docker/docker v25.0.6+incompatible
diff --git a/misc/stdlib_diff/go.mod b/misc/stdlib_diff/go.mod
index f2ddffba2b2..7ec537a127e 100644
--- a/misc/stdlib_diff/go.mod
+++ b/misc/stdlib_diff/go.mod
@@ -1,7 +1,5 @@
 module github.com/gnolang/gno/misc/stdlib_diff
 
-go 1.22.0
-
-toolchain go1.22.10
+go 1.23.6
 
 require github.com/hexops/gotextdiff v1.0.3

From de3e4e5668c64ee58bb76e455cfcf99061d7a56f Mon Sep 17 00:00:00 2001
From: Morgan <morgan@morganbaz.com>
Date: Thu, 20 Feb 2025 17:00:42 +0100
Subject: [PATCH 33/47] feat(gnovm): disallow internal imports (#3774)

#2190

This PR disables support for importing /internal/ subdirectories, for
packages outside of the root of the internal package.

It remains undecided whether we should allow `maketx call` on the
internal package (currently possible on a r/ path)
---
 docs/concepts/effective-gno.md                | 40 ++++++++++++++-----
 examples/gno.land/p/demo/flow/io_test.gno     |  2 +-
 .../p/demo/tamagotchi/z0_filetest.gno         |  3 +-
 examples/no_cycles_test.go                    |  2 +-
 gnovm/pkg/gnolang/preprocess.go               | 20 ++++++++--
 gnovm/pkg/test/imports.go                     |  2 +-
 .../tests/files/extern/foo/internal/aa/aa.gno |  3 ++
 .../files/extern/foo/internal/internal.gno    |  8 ++++
 gnovm/tests/files/import12.gno                | 14 +++++++
 gnovm/tests/files/import13.gno                | 14 +++++++
 gnovm/tests/files/import13b.gno               | 14 +++++++
 gnovm/tests/files/import14.gno                | 17 ++++++++
 12 files changed, 121 insertions(+), 18 deletions(-)
 create mode 100644 gnovm/tests/files/extern/foo/internal/aa/aa.gno
 create mode 100644 gnovm/tests/files/extern/foo/internal/internal.gno
 create mode 100644 gnovm/tests/files/import12.gno
 create mode 100644 gnovm/tests/files/import13.gno
 create mode 100644 gnovm/tests/files/import13b.gno
 create mode 100644 gnovm/tests/files/import14.gno

diff --git a/docs/concepts/effective-gno.md b/docs/concepts/effective-gno.md
index 74886a8e515..5b0f5a75323 100644
--- a/docs/concepts/effective-gno.md
+++ b/docs/concepts/effective-gno.md
@@ -102,7 +102,7 @@ everything and not save wrong changes.
 In Gno, the use of `panic()` and `error` should be context-dependent to ensure
 clarity and proper error handling:
 - Use `panic()` to immediately halt execution and roll back the transaction when
-  encountering critical issues or invalid inputs that cannot be recovered from. 
+  encountering critical issues or invalid inputs that cannot be recovered from.
 - Return an `error` when the situation allows for the possibility of recovery or
   when the caller should decide how to handle the error.
 
@@ -199,7 +199,7 @@ code readability and trust.
 
 A Gno contract is not just its lines of code, but also the imports it uses. More
 importantly, Gno contracts are not just for developers. For the first time, it
-makes sense for users to see what functionality they are executing too. Code simplicity, transparency, 
+makes sense for users to see what functionality they are executing too. Code simplicity, transparency,
 explicitness, and trustability are paramount.
 
 Another good reason for creating simple, focused libraries is the composability
@@ -402,10 +402,30 @@ just to have internal libraries that you created to centralize your helpers and
 don't expect that other people will use your helpers, then you should probably
 use subdirectories like `p/NAMESPACE/DAPP/foo/bar/baz`.
 
+Packages which contain `internal` as an element of the path (ie. at the end, or
+in between, like `gno.land/p/demo/seqid/internal`, or
+`gno.land/p/demo/seqid/internal/base32`) can only be imported by packages
+sharing the same root as the `internal` package. That is, given a package
+structure as follows:
+
+```
+gno.land/p/demo/seqid
+├── generator
+└── internal
+    ├── base32
+    └── cford32
+```
+
+The `seqid/internal`, `seqid/internal/base32` and `seqid/internal/cford32`
+packages can only be imported by `seqid` and `seqid/generator`.
+
+This works for both realm and packages, and can be used to create entirely
+restricted packages and realms that are not meant for outside consumption.
+
 ### Define types and interfaces in pure packages (p/)
 
 In Gno, it's common to create `p/NAMESPACE/DAPP` for defining types and
-interfaces, and `r/NAMESPACE/DAPP` for the runtime, especially when the goal 
+interfaces, and `r/NAMESPACE/DAPP` for the runtime, especially when the goal
 for the realm is to become a standard that could be imported by `p/`.
 
 The reason for this is that `p/` can only import `p/`, while `r/` can import
@@ -465,19 +485,19 @@ checks.
 
 ### Emit Gno events to make life off-chain easier
 
-Gno provides users the ability to log specific occurrences that happened in their 
+Gno provides users the ability to log specific occurrences that happened in their
 on-chain apps. An `event` log is stored in the ABCI results of each block, and
-these logs can be indexed, filtered, and searched by external services, allowing 
+these logs can be indexed, filtered, and searched by external services, allowing
 them to monitor the behaviour of on-chain apps.
 
-It is good practice to emit events when any major action in your code is 
+It is good practice to emit events when any major action in your code is
 triggered. For example, good times to emit an event is after a balance transfer,
 ownership change, profile created, etc. Alternatively, you can view event emission
-as a way to include data for monitoring purposes, given the indexable nature of 
+as a way to include data for monitoring purposes, given the indexable nature of
 events.
 
 Events consist of a type and a slice of strings representing `key:value` pairs.
-They are emitted with the `Emit()` function, contained in the `std` package in 
+They are emitted with the `Emit()` function, contained in the `std` package in
 the Gno standard library:
 
 ```go
@@ -499,7 +519,7 @@ func ChangeOwner(newOwner std.Address) {
 	if caller != owner {
 		panic("access denied")
 	}
-	
+
 	owner = newOwner
 	std.Emit("OwnershipChange", "newOwner", newOwner.String())
 }
@@ -701,7 +721,7 @@ func (s *MySafeStruct) Inc() {
 Then, you can register this object in another or several other realms so other
 realms can access the object, but still following your own rules.
 
-```go 
+```go
 import "gno.land/r/otherrealm"
 
 func init() {
diff --git a/examples/gno.land/p/demo/flow/io_test.gno b/examples/gno.land/p/demo/flow/io_test.gno
index e881854b7a1..6b64a29431f 100644
--- a/examples/gno.land/p/demo/flow/io_test.gno
+++ b/examples/gno.land/p/demo/flow/io_test.gno
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	ios_test "internal/os_test"
+	ios_test "os_test"
 )
 
 // XXX ugh, I can't even sleep milliseconds.
diff --git a/examples/gno.land/p/demo/tamagotchi/z0_filetest.gno b/examples/gno.land/p/demo/tamagotchi/z0_filetest.gno
index 17d6c466ed5..2aebd9d4aae 100644
--- a/examples/gno.land/p/demo/tamagotchi/z0_filetest.gno
+++ b/examples/gno.land/p/demo/tamagotchi/z0_filetest.gno
@@ -1,10 +1,9 @@
 package main
 
 import (
+	"os_test"
 	"time"
 
-	"internal/os_test"
-
 	"gno.land/p/demo/tamagotchi"
 )
 
diff --git a/examples/no_cycles_test.go b/examples/no_cycles_test.go
index 7cc6fbfd183..4c89c112178 100644
--- a/examples/no_cycles_test.go
+++ b/examples/no_cycles_test.go
@@ -19,7 +19,7 @@ import (
 
 // XXX: move this into `gno lint`
 
-var injectedTestingLibs = []string{"encoding/json", "fmt", "os", "internal/os_test"}
+var injectedTestingLibs = []string{"encoding/json", "fmt", "os", "os_test"}
 
 // TestNoCycles checks that there is no import cycles in stdlibs and non-draft examples
 func TestNoCycles(t *testing.T) {
diff --git a/gnovm/pkg/gnolang/preprocess.go b/gnovm/pkg/gnolang/preprocess.go
index e30f02b1b87..14beec0d6e7 100644
--- a/gnovm/pkg/gnolang/preprocess.go
+++ b/gnovm/pkg/gnolang/preprocess.go
@@ -4674,7 +4674,7 @@ func predefineNow2(store Store, last BlockNode, d Decl, stack *[]Name) (Decl, bo
 
 	// recursively predefine dependencies.
 	for {
-		un := tryPredefine(store, last, d)
+		un := tryPredefine(store, pkg, last, d)
 		if un != "" {
 			// check circularity.
 			for _, n := range *stack {
@@ -4801,7 +4801,7 @@ func predefineNow2(store Store, last BlockNode, d Decl, stack *[]Name) (Decl, bo
 // side effects.  This function works for all block nodes and
 // must be called for name declarations within (non-file,
 // non-package) stmt bodies.
-func tryPredefine(store Store, last BlockNode, d Decl) (un Name) {
+func tryPredefine(store Store, pkg *PackageNode, last BlockNode, d Decl) (un Name) {
 	if d.GetAttribute(ATTR_PREDEFINED) == true {
 		panic(fmt.Sprintf("decl node already predefined! %v", d))
 	}
@@ -4817,6 +4817,21 @@ func tryPredefine(store Store, last BlockNode, d Decl) (un Name) {
 	// so value paths cannot be used here.
 	switch d := d.(type) {
 	case *ImportDecl:
+		// stdlib internal package
+		if strings.HasPrefix(d.PkgPath, "internal/") && !IsStdlib(pkg.PkgPath) {
+			panic("cannot import stdlib internal/ package outside of standard library")
+		}
+
+		// Restrict imports to /internal packages to a package rooted at base.
+		base, suff, isInternal := strings.Cut(d.PkgPath, "/internal")
+		// /internal should be either at the end, or be a part: /internal/
+		isInternal = isInternal && (suff == "" || suff[0] == '/')
+		if isInternal &&
+			pkg.PkgPath != base &&
+			!strings.HasPrefix(pkg.PkgPath, base+"/") {
+			panic("internal/ packages can only be imported by packages rooted at the parent of \"internal\"")
+		}
+
 		pv := store.GetPackage(d.PkgPath, true)
 		if pv == nil {
 			panic(fmt.Sprintf(
@@ -4980,7 +4995,6 @@ func tryPredefine(store Store, last BlockNode, d Decl) (un Name) {
 			}
 			// define package-level function.
 			ft := &FuncType{}
-			pkg := skipFile(last).(*PackageNode)
 			// define a FuncValue w/ above type as d.Name.
 			// fill in later during *FuncDecl:BLOCK.
 			// The body may get altered during preprocessing later.
diff --git a/gnovm/pkg/test/imports.go b/gnovm/pkg/test/imports.go
index 95302ecffb0..b7744b08178 100644
--- a/gnovm/pkg/test/imports.go
+++ b/gnovm/pkg/test/imports.go
@@ -131,7 +131,7 @@ func StoreWithOptions(
 			pkg.DefineGoNativeValue("Unmarshal", json.Unmarshal)
 			pkg.DefineGoNativeValue("Marshal", json.Marshal)
 			return pkg, pkg.NewPackage()
-		case "internal/os_test":
+		case "os_test":
 			pkg := gno.NewPackageNode("os_test", pkgPath, nil)
 			pkg.DefineNative("Sleep",
 				gno.Flds( // params
diff --git a/gnovm/tests/files/extern/foo/internal/aa/aa.gno b/gnovm/tests/files/extern/foo/internal/aa/aa.gno
new file mode 100644
index 00000000000..477b3b21412
--- /dev/null
+++ b/gnovm/tests/files/extern/foo/internal/aa/aa.gno
@@ -0,0 +1,3 @@
+package aa
+
+const A = 456
diff --git a/gnovm/tests/files/extern/foo/internal/internal.gno b/gnovm/tests/files/extern/foo/internal/internal.gno
new file mode 100644
index 00000000000..646402b1242
--- /dev/null
+++ b/gnovm/tests/files/extern/foo/internal/internal.gno
@@ -0,0 +1,8 @@
+package internal
+
+import "github.com/gnolang/gno/_test/foo/internal/aa"
+
+const (
+	A = 123
+	B = aa.A
+)
diff --git a/gnovm/tests/files/import12.gno b/gnovm/tests/files/import12.gno
new file mode 100644
index 00000000000..a3f3fe4fbf6
--- /dev/null
+++ b/gnovm/tests/files/import12.gno
@@ -0,0 +1,14 @@
+// PKGPATH: gno.land/p/demo
+
+package demo
+
+import (
+	"internal/bytealg"
+)
+
+func main() {
+	println(bytealg.PrimeRK)
+}
+
+// Error:
+// gno.land/p/demo/files/import12.gno:6:2: cannot import stdlib internal/ package outside of standard library
diff --git a/gnovm/tests/files/import13.gno b/gnovm/tests/files/import13.gno
new file mode 100644
index 00000000000..c0aa0e28a01
--- /dev/null
+++ b/gnovm/tests/files/import13.gno
@@ -0,0 +1,14 @@
+// PKGPATH: gno.land/p/demo
+
+package demo
+
+import (
+	"github.com/gnolang/gno/_test/foo/internal/aa"
+)
+
+func main() {
+	println(aa.A)
+}
+
+// Error:
+// gno.land/p/demo/files/import13.gno:6:2: internal/ packages can only be imported by packages rooted at the parent of "internal"
diff --git a/gnovm/tests/files/import13b.gno b/gnovm/tests/files/import13b.gno
new file mode 100644
index 00000000000..bedebb89b2f
--- /dev/null
+++ b/gnovm/tests/files/import13b.gno
@@ -0,0 +1,14 @@
+// PKGPATH: gno.land/p/demo
+
+package demo
+
+import (
+	"github.com/gnolang/gno/_test/foo/internal"
+)
+
+func main() {
+	println(internal.A)
+}
+
+// Error:
+// gno.land/p/demo/files/import13b.gno:6:2: internal/ packages can only be imported by packages rooted at the parent of "internal"
diff --git a/gnovm/tests/files/import14.gno b/gnovm/tests/files/import14.gno
new file mode 100644
index 00000000000..07b57240bd1
--- /dev/null
+++ b/gnovm/tests/files/import14.gno
@@ -0,0 +1,17 @@
+// PKGPATH: github.com/gnolang/gno/_test/foo
+
+package foo
+
+import (
+	"github.com/gnolang/gno/_test/foo/internal"
+	"github.com/gnolang/gno/_test/foo/internal/aa"
+)
+
+func main() {
+	println(internal.A, internal.B)
+	println(aa.A)
+}
+
+// Output:
+// 123 456
+// 456

From 8591793819bdfa1aa65dcd88638bebf1b4a91845 Mon Sep 17 00:00:00 2001
From: Sergio Maria Matone <sergio.matone@tendermint.com>
Date: Fri, 21 Feb 2025 09:59:13 +0100
Subject: [PATCH 34/47] chore: Adding Stdlib to Gnodev Docker image (#3798)

Adding Stdlib to Gnodev Docker image
---
 .github/goreleaser.yaml | 6 ++++--
 Dockerfile.release      | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/goreleaser.yaml b/.github/goreleaser.yaml
index 186bac6f31a..a411484520d 100644
--- a/.github/goreleaser.yaml
+++ b/.github/goreleaser.yaml
@@ -339,9 +339,10 @@ dockers:
     ids:
       - gnodev
     extra_files:
-      - examples
       - gno.land/genesis/genesis_balances.txt
       - gno.land/genesis/genesis_txs.jsonl
+      - examples
+      - gnovm/stdlibs
   - use: buildx
     dockerfile: Dockerfile.release
     goos: linux
@@ -359,9 +360,10 @@ dockers:
     ids:
       - gnodev
     extra_files:
-      - examples
       - gno.land/genesis/genesis_balances.txt
       - gno.land/genesis/genesis_txs.jsonl
+      - examples
+      - gnovm/stdlibs
 
   # gnocontribs
   - use: buildx
diff --git a/Dockerfile.release b/Dockerfile.release
index 69a508000aa..ddca77a5ebf 100644
--- a/Dockerfile.release
+++ b/Dockerfile.release
@@ -50,6 +50,7 @@ FROM base as gnodev
 
 COPY       ./gnodev /usr/bin/gnodev
 COPY       ./examples                              /gnoroot/examples/
+COPY       ./gnovm/stdlibs                         /gnoroot/gnovm/stdlibs/
 COPY       ./gno.land/genesis/genesis_balances.txt /gnoroot/gno.land/genesis/genesis_balances.txt
 COPY       ./gno.land/genesis/genesis_txs.jsonl    /gnoroot/gno.land/genesis/genesis_txs.jsonl
 # gnoweb exposed by default

From bf2e03fc0e6387e484ee637c2dda93b9f9d54654 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 21 Feb 2025 11:03:42 +0100
Subject: [PATCH 35/47] chore(deps): bump sigstore/cosign-installer from 3.8.0
 to 3.8.1 in the actions group (#3796)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bumps the actions group with 1 update:
[sigstore/cosign-installer](https://github.com/sigstore/cosign-installer).

Updates `sigstore/cosign-installer` from 3.8.0 to 3.8.1
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/sigstore/cosign-installer/releases">sigstore/cosign-installer's
releases</a>.</em></p>
<blockquote>
<h2>v3.8.1</h2>
<h2>What's Changed</h2>
<ul>
<li>use cosign 2.4.3 and other updates by <a
href="https://github.com/cpanato"><code>@​cpanato</code></a> in <a
href="https://redirect.github.com/sigstore/cosign-installer/pull/182">sigstore/cosign-installer#182</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/sigstore/cosign-installer/compare/v3...v3.8.1">https://github.com/sigstore/cosign-installer/compare/v3...v3.8.1</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="https://github.com/sigstore/cosign-installer/commit/d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a"><code>d7d6bc7</code></a>
use cosign 2.4.3 and other updates (<a
href="https://redirect.github.com/sigstore/cosign-installer/issues/182">#182</a>)</li>
<li>See full diff in <a
href="https://github.com/sigstore/cosign-installer/compare/v3.8.0...v3.8.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=sigstore/cosign-installer&package-manager=github_actions&previous-version=3.8.0&new-version=3.8.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)

---

<details>
<summary>Dependabot commands and options</summary>
<br />

You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show <dependency name> ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore <dependency name> major version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's major version (unless you unignore this specific
dependency's major version or upgrade to it yourself)
- `@dependabot ignore <dependency name> minor version` will close this
group update PR and stop Dependabot creating any more for the specific
dependency's minor version (unless you unignore this specific
dependency's minor version or upgrade to it yourself)
- `@dependabot ignore <dependency name>` will close this group update PR
and stop Dependabot creating any more for the specific dependency
(unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore <dependency name>` will remove all of the ignore
conditions of the specified dependency
- `@dependabot unignore <dependency name> <ignore condition>` will
remove the ignore condition of the specified dependency and ignore
conditions


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/releaser-master.yml  | 2 +-
 .github/workflows/releaser-nightly.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/releaser-master.yml b/.github/workflows/releaser-master.yml
index 5b6f76a9135..e8ae0a5777c 100644
--- a/.github/workflows/releaser-master.yml
+++ b/.github/workflows/releaser-master.yml
@@ -29,7 +29,7 @@ jobs:
           go-version-file: go.mod
           cache: true
 
-      - uses: sigstore/cosign-installer@v3.8.0
+      - uses: sigstore/cosign-installer@v3.8.1
       - uses: anchore/sbom-action/download-syft@v0.18.0
 
       - uses: docker/login-action@v3
diff --git a/.github/workflows/releaser-nightly.yml b/.github/workflows/releaser-nightly.yml
index 62066db24a1..73f9515521f 100644
--- a/.github/workflows/releaser-nightly.yml
+++ b/.github/workflows/releaser-nightly.yml
@@ -23,7 +23,7 @@ jobs:
           go-version-file: go.mod
           cache: true
 
-      - uses: sigstore/cosign-installer@v3.8.0
+      - uses: sigstore/cosign-installer@v3.8.1
       - uses: anchore/sbom-action/download-syft@v0.18.0
 
       - uses: docker/login-action@v3

From 2c2c018d5320d85b6180e3790571d0a9004f7e40 Mon Sep 17 00:00:00 2001
From: Leon Hudak <33522493+leohhhn@users.noreply.github.com>
Date: Fri, 21 Feb 2025 16:16:24 +0100
Subject: [PATCH 36/47] fix(docs): originpkgaddr type (#3804)

## Description

Fixes wrong type in the ref docs. h/t @ajnavarro
---
 docs/reference/stdlibs/std/chain.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/reference/stdlibs/std/chain.md b/docs/reference/stdlibs/std/chain.md
index 9129cd17665..2ec9741595f 100644
--- a/docs/reference/stdlibs/std/chain.md
+++ b/docs/reference/stdlibs/std/chain.md
@@ -91,7 +91,7 @@ caller := std.OriginCaller()
 
 ## OriginPkgAddress
 ```go
-func OriginPkgAddress() string
+func OriginPkgAddress() Address
 ```
 Returns the address of the first (entry point) realm/package in a sequence of realm/package calls.
 

From 85b3c0b7957e57fee0bba1e8fe030bf64931e19e Mon Sep 17 00:00:00 2001
From: Marc Vertes <marc.vertes@tendermint.com>
Date: Fri, 21 Feb 2025 17:46:41 +0100
Subject: [PATCH 37/47] fix(gnovm): protect TypedValue stringer against deep
 recursivity (#3790)

The protectedStringer is improved by limiting the successive number of
nested calls when constructing the string representation of a deeply
recursive value.

Fixes #3471.

---------

Co-authored-by: ltzmaxwell <ltz.maxwell@gmail.com>
---
 gnovm/pkg/gnolang/values_string.go | 16 +++++++++++++---
 gnovm/tests/files/recurse1.gno     | 12 ++++++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 gnovm/tests/files/recurse1.gno

diff --git a/gnovm/pkg/gnolang/values_string.go b/gnovm/pkg/gnolang/values_string.go
index b18bdb0dddc..18a1ece679f 100644
--- a/gnovm/pkg/gnolang/values_string.go
+++ b/gnovm/pkg/gnolang/values_string.go
@@ -12,11 +12,17 @@ type protectedStringer interface {
 	ProtectedString(*seenValues) string
 }
 
-// This indicates the maximum anticipated depth of the stack when printing a Value type.
-const defaultSeenValuesSize = 32
+const (
+	// defaultSeenValuesSize indicates the maximum anticipated depth of the stack when printing a Value type.
+	defaultSeenValuesSize = 32
+
+	// nestedLimit indicates the maximum nested level when printing a deeply recursive value.
+	nestedLimit = 10
+)
 
 type seenValues struct {
 	values []Value
+	nc     int // nested counter, to limit recursivity
 }
 
 func (sv *seenValues) Put(v Value) {
@@ -46,7 +52,7 @@ func (sv *seenValues) Pop() {
 }
 
 func newSeenValues() *seenValues {
-	return &seenValues{values: make([]Value, 0, defaultSeenValuesSize)}
+	return &seenValues{values: make([]Value, 0, defaultSeenValuesSize), nc: nestedLimit}
 }
 
 func (v StringValue) String() string {
@@ -74,6 +80,10 @@ func (av *ArrayValue) ProtectedString(seen *seenValues) string {
 		return fmt.Sprintf("%p", av)
 	}
 
+	seen.nc--
+	if seen.nc < 0 {
+		return "..."
+	}
 	seen.Put(av)
 	defer seen.Pop()
 
diff --git a/gnovm/tests/files/recurse1.gno b/gnovm/tests/files/recurse1.gno
new file mode 100644
index 00000000000..1d5f1c7fc72
--- /dev/null
+++ b/gnovm/tests/files/recurse1.gno
@@ -0,0 +1,12 @@
+package main
+
+func main() {
+	var x interface{}
+	for i := 0; i < 10000; i++ {
+		x = [1]interface{}{x}
+	}
+	println(x)
+}
+
+// Output:
+// array[(array[(array[(array[(array[(array[(array[(array[(array[(array[(... [1]interface{})] [1]interface{})] [1]interface{})] [1]interface{})] [1]interface{})] [1]interface{})] [1]interface{})] [1]interface{})] [1]interface{})] [1]interface{})]

From a4b5c9cb70812ffb62451d41b6423992eb1e9805 Mon Sep 17 00:00:00 2001
From: Marc Vertes <marc.vertes@tendermint.com>
Date: Mon, 24 Feb 2025 14:51:12 +0100
Subject: [PATCH 38/47] fix(gnovm): allow private struct fields to be set
 (#3814)

Go reflect doesn't allow to set unexported struct fields. We use
`unsafe` to override this limitation.

Fixes #1155, fixes #3802
---
 gnovm/pkg/gnolang/gonative.go  |  8 +++++++-
 gnovm/tests/files/struct59.gno | 15 +++++++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 gnovm/tests/files/struct59.gno

diff --git a/gnovm/pkg/gnolang/gonative.go b/gnovm/pkg/gnolang/gonative.go
index 2fbf34ed1b1..cd0e3b9ce9f 100644
--- a/gnovm/pkg/gnolang/gonative.go
+++ b/gnovm/pkg/gnolang/gonative.go
@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math"
 	"reflect"
+	"unsafe"
 
 	"github.com/gnolang/gno/gnovm/pkg/gnolang/internal/softfloat"
 )
@@ -1133,7 +1134,12 @@ func gno2GoValue(tv *TypedValue, rv reflect.Value) (ret reflect.Value) {
 			if ftv.IsUndefined() {
 				continue
 			}
-			gno2GoValue(ftv, rv.Field(i))
+			fv := rv.Field(i)
+			if !fv.CanSet() {
+				// Normally private fields can not bet set via reflect. Override this limitation.
+				fv = reflect.NewAt(fv.Type(), unsafe.Pointer(fv.UnsafeAddr())).Elem()
+			}
+			gno2GoValue(ftv, fv)
 		}
 	case *MapType:
 		// If uninitialized map, return zero value.
diff --git a/gnovm/tests/files/struct59.gno b/gnovm/tests/files/struct59.gno
new file mode 100644
index 00000000000..6c26978a808
--- /dev/null
+++ b/gnovm/tests/files/struct59.gno
@@ -0,0 +1,15 @@
+package main
+
+import "fmt"
+
+type X struct {
+	v string
+}
+
+func main() {
+	x := X{v: "a"}
+	fmt.Printf("test %#v\n", x)
+}
+
+// Output:
+// test struct { v string }{v:"a"}

From 27fd12dffb2101a05788bcf29d08f933ee3e527f Mon Sep 17 00:00:00 2001
From: Leon Hudak <33522493+leohhhn@users.noreply.github.com>
Date: Mon, 24 Feb 2025 16:04:18 +0100
Subject: [PATCH 39/47] docs: archive test4 (#3810)

## Description

Deprecates test4 in the docs.

---------

Co-authored-by: Jeff Thompson <jeff@berty.tech>
---
 docs/concepts/namespaces.md      |  6 +++---
 docs/concepts/testnets.md        | 22 +++++++---------------
 docs/reference/network-config.md |  1 -
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/docs/concepts/namespaces.md b/docs/concepts/namespaces.md
index c7f03ec1f0a..7e16dd9c48b 100644
--- a/docs/concepts/namespaces.md
+++ b/docs/concepts/namespaces.md
@@ -9,7 +9,7 @@ similar to GitHub's user and organization model.
 
 :::warning Not enabled
 
-This feature isn't enabled by default on the portal loop chain and is currently available only on test4.gno.land.
+This feature isn't enabled by default on the Portal Loop chain and is currently available only on test5.gno.land.
 
 :::
 
@@ -56,7 +56,7 @@ $ gnokey maketx call -pkgpath gno.land/r/demo/users \
     -func Register \
     -gas-fee 1000000ugnot -gas-wanted 2000000 \
     -broadcast \
-    -chainid=test4 \
+    -chainid=test5 \
     -send=20000000ugnot \
     -args '' \
     -args 'patrick' \
@@ -86,6 +86,6 @@ $ gnokey maketx addpkg \
     --gas-fee 1000000ugnot \
     --gas-wanted 2000000 \
     --broadcast \
-    --chainid test4 \
+    --chainid test5 \
     test1
 ```
diff --git a/docs/concepts/testnets.md b/docs/concepts/testnets.md
index b5286eaec57..9769c8f873f 100644
--- a/docs/concepts/testnets.md
+++ b/docs/concepts/testnets.md
@@ -63,21 +63,6 @@ Test5 was launched in November 2024.
 - **Versioning strategy**:
   - Test5 is to be release-based, following releases of the Gno tech stack.
 
-## Test4
-
-Test4 is the first permanent multi-node testnet, launched in July 2024.
-
-- **Persistence of state:**
-  - State is fully persisted unless there are breaking changes in a new release,
-    where persistence partly depends on implementing a migration strategy
-- **Timeliness of code:**
-  - Versioning mechanisms for packages & realms will be implemented for test4
-- **Intended purpose**
-  - Running a full node, testing validator coordination, deploying stable Gno
-    dApps, creating tools that require persisted state & transaction history
-- **Versioning strategy**:
-  - Test4 is the first gno.land testnet to be release-based, following releases
-of the Gno tech stack.
 
 ## Staging
 
@@ -98,6 +83,13 @@ Staging is a testnet that is reset once every 60 minutes.
 
 These testnets are deprecated and currently serve as archives of previous progress.
 
+## Test4
+
+Test4 is the first permanent multi-node testnet. Archived data for test4 can be found [here](https://github.com/gnolang/tx-exports/tree/main/test4.gno.land).
+
+Launch date: July 10th 2024
+Release commit: [194903d](https://github.com/gnolang/gno/commit/194903db0350ace7d57910e6c34125d3aa9817da)
+
 ### Test3 (archive)
 
 The third Gno testnet. Archived data for test3 can be found [here](https://github.com/gnolang/tx-exports/tree/main/test3.gno.land).
diff --git a/docs/reference/network-config.md b/docs/reference/network-config.md
index 45a56b772ae..1e50864372b 100644
--- a/docs/reference/network-config.md
+++ b/docs/reference/network-config.md
@@ -8,7 +8,6 @@ id: network-config
 |-------------|----------------------------------|---------------|
 | Portal Loop | https://rpc.gno.land:443         | `portal-loop` |
 | Test5       | https://rpc.test5.gno.land:443   | `test5`       |
-| Test4       | https://rpc.test4.gno.land:443   | `test4`       |
 | Staging     | https://rpc.staging.gno.land:443 | `staging`     |
 
 ### WebSocket endpoints

From 300dcfde8de225ddf8366220a0837ff821cbf355 Mon Sep 17 00:00:00 2001
From: Morgan <morgan@morganbaz.com>
Date: Mon, 24 Feb 2025 16:32:06 +0100
Subject: [PATCH 40/47] feat(sdk/vm): disallow calling internal realms (#3794)

continuation of #3774, fixes #2190.
---
 gno.land/pkg/sdk/vm/msgs.go                      |  3 +++
 .../pkg/sdk/vm/{msg_test.go => msgs_test.go}     | 14 ++++++++++++++
 gnovm/pkg/gnolang/helpers.go                     | 16 ++++++++++++++++
 gnovm/pkg/gnolang/preprocess.go                  |  5 +----
 4 files changed, 34 insertions(+), 4 deletions(-)
 rename gno.land/pkg/sdk/vm/{msg_test.go => msgs_test.go} (95%)

diff --git a/gno.land/pkg/sdk/vm/msgs.go b/gno.land/pkg/sdk/vm/msgs.go
index 38f35ab7110..51d573837fc 100644
--- a/gno.land/pkg/sdk/vm/msgs.go
+++ b/gno.land/pkg/sdk/vm/msgs.go
@@ -120,6 +120,9 @@ func (msg MsgCall) ValidateBasic() error {
 	if !gno.IsRealmPath(msg.PkgPath) {
 		return ErrInvalidPkgPath("pkgpath must be of a realm")
 	}
+	if _, isInt := gno.IsInternalPath(msg.PkgPath); isInt {
+		return ErrInvalidPkgPath("pkgpath must not be of an internal package")
+	}
 	if msg.Func == "" { // XXX
 		return ErrInvalidExpr("missing function to call")
 	}
diff --git a/gno.land/pkg/sdk/vm/msg_test.go b/gno.land/pkg/sdk/vm/msgs_test.go
similarity index 95%
rename from gno.land/pkg/sdk/vm/msg_test.go
rename to gno.land/pkg/sdk/vm/msgs_test.go
index 684dc21e9f2..56b3931ef8d 100644
--- a/gno.land/pkg/sdk/vm/msg_test.go
+++ b/gno.land/pkg/sdk/vm/msgs_test.go
@@ -164,6 +164,20 @@ func TestMsgCall_ValidateBasic(t *testing.T) {
 			},
 			expectErr: InvalidPkgPathError{},
 		},
+		{
+			name: "pkgPath should not be an internal path",
+			msg: MsgCall{
+				Caller:  caller,
+				PkgPath: "gno.land/r/demo/avl/internal/sort",
+				Func:    funcName,
+				Args:    args,
+				Send: std.Coins{std.Coin{
+					Denom:  "ugnot",
+					Amount: 1000,
+				}},
+			},
+			expectErr: InvalidPkgPathError{},
+		},
 		{
 			name: "missing function name to call",
 			msg: MsgCall{
diff --git a/gnovm/pkg/gnolang/helpers.go b/gnovm/pkg/gnolang/helpers.go
index ddc1fd2fa55..5f0064cc4d9 100644
--- a/gnovm/pkg/gnolang/helpers.go
+++ b/gnovm/pkg/gnolang/helpers.go
@@ -28,6 +28,22 @@ func IsRealmPath(pkgPath string) bool {
 		!ReGnoRunPath.MatchString(pkgPath)
 }
 
+// IsInternalPath determines whether the given pkgPath refers to an internal
+// package, that may not be called directly or imported by packages that don't
+// share the same root.
+//
+// If isInternal is true, base will be set to the root of the internal package,
+// which must also be an ancestor or the same path that imports the given
+// internal package.
+func IsInternalPath(pkgPath string) (base string, isInternal bool) {
+	// Restrict imports to /internal packages to a package rooted at base.
+	var suff string
+	base, suff, isInternal = strings.Cut(pkgPath, "/internal")
+	// /internal should be either at the end, or be a part: /internal/
+	isInternal = isInternal && (suff == "" || suff[0] == '/')
+	return
+}
+
 // IsPurePackagePath determines whether the given pkgpath is for a published Gno package.
 // It only considers "pure" those starting with gno.land/p/, so it returns false for
 // stdlib packages and MsgRun paths.
diff --git a/gnovm/pkg/gnolang/preprocess.go b/gnovm/pkg/gnolang/preprocess.go
index 14beec0d6e7..100f555b145 100644
--- a/gnovm/pkg/gnolang/preprocess.go
+++ b/gnovm/pkg/gnolang/preprocess.go
@@ -4822,10 +4822,7 @@ func tryPredefine(store Store, pkg *PackageNode, last BlockNode, d Decl) (un Nam
 			panic("cannot import stdlib internal/ package outside of standard library")
 		}
 
-		// Restrict imports to /internal packages to a package rooted at base.
-		base, suff, isInternal := strings.Cut(d.PkgPath, "/internal")
-		// /internal should be either at the end, or be a part: /internal/
-		isInternal = isInternal && (suff == "" || suff[0] == '/')
+		base, isInternal := IsInternalPath(d.PkgPath)
 		if isInternal &&
 			pkg.PkgPath != base &&
 			!strings.HasPrefix(pkg.PkgPath, base+"/") {

From 41a43baa6456fe38840eea4cc6c0896ffcc49f8d Mon Sep 17 00:00:00 2001
From: Manfred Touron <94029+moul@users.noreply.github.com>
Date: Mon, 24 Feb 2025 17:07:46 +0100
Subject: [PATCH 41/47] feat(examples): add p/moul/fifo (#3736)

Signed-off-by: moul <94029+moul@users.noreply.github.com>

---------

Signed-off-by: moul <94029+moul@users.noreply.github.com>
---
 examples/gno.land/p/moul/fifo/fifo.gno      | 246 ++++++++++++++++
 examples/gno.land/p/moul/fifo/fifo_test.gno | 294 ++++++++++++++++++++
 examples/gno.land/p/moul/fifo/gno.mod       |   1 +
 3 files changed, 541 insertions(+)
 create mode 100644 examples/gno.land/p/moul/fifo/fifo.gno
 create mode 100644 examples/gno.land/p/moul/fifo/fifo_test.gno
 create mode 100644 examples/gno.land/p/moul/fifo/gno.mod

diff --git a/examples/gno.land/p/moul/fifo/fifo.gno b/examples/gno.land/p/moul/fifo/fifo.gno
new file mode 100644
index 00000000000..d0291a941c0
--- /dev/null
+++ b/examples/gno.land/p/moul/fifo/fifo.gno
@@ -0,0 +1,246 @@
+// Package fifo implements a fixed-size FIFO (First-In-First-Out) list data structure
+// using a singly-linked list. The implementation prioritizes storage efficiency by minimizing
+// storage operations - each add/remove operation only updates 1-2 pointers, regardless of
+// list size.
+//
+// Key features:
+// - Fixed-size with automatic removal of oldest entries when full
+// - Support for both prepend (add at start) and append (add at end) operations
+// - Constant storage usage through automatic pruning
+// - O(1) append operations and latest element access
+// - Iterator support for sequential access
+// - Dynamic size adjustment via SetMaxSize
+//
+// This implementation is optimized for frequent updates, as insertions and deletions only
+// require updating 1-2 pointers. However, random access operations are O(n) as they require
+// traversing the list. For use cases where writes are rare, a slice-based
+// implementation might be more suitable.
+//
+// The linked list structure is equally efficient for storing both small values (like pointers)
+// and larger data structures, as each node maintains a single next-pointer regardless of the
+// stored value's size.
+//
+// Example usage:
+//
+//	list := fifo.New(3)        // Create a new list with max size 3
+//	list.Append("a")           // List: [a]
+//	list.Append("b")           // List: [a b]
+//	list.Append("c")           // List: [a b c]
+//	list.Append("d")           // List: [b c d] (oldest element "a" was removed)
+//	latest := list.Latest()    // Returns "d"
+//	all := list.Entries()      // Returns ["b", "c", "d"]
+package fifo
+
+// node represents a single element in the linked list
+type node struct {
+	value interface{}
+	next  *node
+}
+
+// List represents a fixed-size FIFO list
+type List struct {
+	head    *node
+	tail    *node
+	size    int
+	maxSize int
+}
+
+// New creates a new FIFO list with the specified maximum size
+func New(maxSize int) *List {
+	return &List{
+		maxSize: maxSize,
+	}
+}
+
+// Prepend adds a new entry at the start of the list. If the list exceeds maxSize,
+// the last entry is automatically removed.
+func (l *List) Prepend(entry interface{}) {
+	if l.maxSize == 0 {
+		return
+	}
+
+	newNode := &node{value: entry}
+
+	if l.head == nil {
+		l.head = newNode
+		l.tail = newNode
+		l.size = 1
+		return
+	}
+
+	newNode.next = l.head
+	l.head = newNode
+
+	if l.size < l.maxSize {
+		l.size++
+	} else {
+		// Remove last element by traversing to second-to-last
+		if l.size == 1 {
+			// Special case: if size is 1, just update both pointers
+			l.head = newNode
+			l.tail = newNode
+			newNode.next = nil
+		} else {
+			// Find second-to-last node
+			current := l.head
+			for current.next != l.tail {
+				current = current.next
+			}
+			current.next = nil
+			l.tail = current
+		}
+	}
+}
+
+// Append adds a new entry at the end of the list. If the list exceeds maxSize,
+// the first entry is automatically removed.
+func (l *List) Append(entry interface{}) {
+	if l.maxSize == 0 {
+		return
+	}
+
+	newNode := &node{value: entry}
+
+	if l.head == nil {
+		l.head = newNode
+		l.tail = newNode
+		l.size = 1
+		return
+	}
+
+	l.tail.next = newNode
+	l.tail = newNode
+
+	if l.size < l.maxSize {
+		l.size++
+	} else {
+		l.head = l.head.next
+	}
+}
+
+// Get returns the entry at the specified index.
+// Index 0 is the oldest entry, Size()-1 is the newest.
+func (l *List) Get(index int) interface{} {
+	if index < 0 || index >= l.size {
+		return nil
+	}
+
+	current := l.head
+	for i := 0; i < index; i++ {
+		current = current.next
+	}
+	return current.value
+}
+
+// Size returns the current number of entries in the list
+func (l *List) Size() int {
+	return l.size
+}
+
+// MaxSize returns the maximum size configured for this list
+func (l *List) MaxSize() int {
+	return l.maxSize
+}
+
+// Entries returns all current entries as a slice
+func (l *List) Entries() []interface{} {
+	entries := make([]interface{}, l.size)
+	current := l.head
+	for i := 0; i < l.size; i++ {
+		entries[i] = current.value
+		current = current.next
+	}
+	return entries
+}
+
+// Iterator returns a function that can be used to iterate over the entries
+// from oldest to newest. Returns nil when there are no more entries.
+func (l *List) Iterator() func() interface{} {
+	current := l.head
+	return func() interface{} {
+		if current == nil {
+			return nil
+		}
+		value := current.value
+		current = current.next
+		return value
+	}
+}
+
+// Latest returns the most recent entry.
+// Returns nil if the list is empty.
+func (l *List) Latest() interface{} {
+	if l.tail == nil {
+		return nil
+	}
+	return l.tail.value
+}
+
+// SetMaxSize updates the maximum size of the list.
+// If the new maxSize is smaller than the current size,
+// the oldest entries are removed to fit the new size.
+func (l *List) SetMaxSize(maxSize int) {
+	if maxSize < 0 {
+		maxSize = 0
+	}
+
+	// If new maxSize is smaller than current size,
+	// remove oldest entries until we fit
+	if maxSize < l.size {
+		// Special case: if new maxSize is 0, clear the list
+		if maxSize == 0 {
+			l.head = nil
+			l.tail = nil
+			l.size = 0
+		} else {
+			// Keep the newest entries by moving head forward
+			diff := l.size - maxSize
+			for i := 0; i < diff; i++ {
+				l.head = l.head.next
+			}
+			l.size = maxSize
+		}
+	}
+
+	l.maxSize = maxSize
+}
+
+// Delete removes the element at the specified index.
+// Returns true if an element was removed, false if the index was invalid.
+func (l *List) Delete(index int) bool {
+	if index < 0 || index >= l.size {
+		return false
+	}
+
+	// Special case: deleting the only element
+	if l.size == 1 {
+		l.head = nil
+		l.tail = nil
+		l.size = 0
+		return true
+	}
+
+	// Special case: deleting first element
+	if index == 0 {
+		l.head = l.head.next
+		l.size--
+		return true
+	}
+
+	// Find the node before the one to delete
+	current := l.head
+	for i := 0; i < index-1; i++ {
+		current = current.next
+	}
+
+	// Special case: deleting last element
+	if index == l.size-1 {
+		l.tail = current
+		current.next = nil
+	} else {
+		current.next = current.next.next
+	}
+
+	l.size--
+	return true
+}
diff --git a/examples/gno.land/p/moul/fifo/fifo_test.gno b/examples/gno.land/p/moul/fifo/fifo_test.gno
new file mode 100644
index 00000000000..1e3d27509c1
--- /dev/null
+++ b/examples/gno.land/p/moul/fifo/fifo_test.gno
@@ -0,0 +1,294 @@
+package fifo
+
+import (
+	"testing"
+
+	"gno.land/p/demo/uassert"
+)
+
+func TestNew(t *testing.T) {
+	l := New(5)
+	uassert.Equal(t, 5, l.MaxSize())
+	uassert.Equal(t, 0, l.Size())
+}
+
+func TestAppend(t *testing.T) {
+	l := New(3)
+
+	// Test adding within capacity
+	l.Append(1)
+	l.Append(2)
+	uassert.Equal(t, 2, l.Size())
+	uassert.Equal(t, 1, l.Get(0))
+	uassert.Equal(t, 2, l.Get(1))
+
+	// Test overflow behavior
+	l.Append(3)
+	l.Append(4)
+	uassert.Equal(t, 3, l.Size())
+	uassert.Equal(t, 2, l.Get(0))
+	uassert.Equal(t, 3, l.Get(1))
+	uassert.Equal(t, 4, l.Get(2))
+}
+
+func TestPrepend(t *testing.T) {
+	l := New(3)
+
+	// Test adding within capacity
+	l.Prepend(1)
+	l.Prepend(2)
+	uassert.Equal(t, 2, l.Size())
+	uassert.Equal(t, 2, l.Get(0))
+	uassert.Equal(t, 1, l.Get(1))
+
+	// Test overflow behavior
+	l.Prepend(3)
+	l.Prepend(4)
+	uassert.Equal(t, 3, l.Size())
+	uassert.Equal(t, 4, l.Get(0))
+	uassert.Equal(t, 3, l.Get(1))
+	uassert.Equal(t, 2, l.Get(2))
+}
+
+func TestGet(t *testing.T) {
+	l := New(3)
+	l.Append(1)
+	l.Append(2)
+	l.Append(3)
+
+	// Test valid indices
+	uassert.Equal(t, 1, l.Get(0))
+	uassert.Equal(t, 2, l.Get(1))
+	uassert.Equal(t, 3, l.Get(2))
+
+	// Test invalid indices
+	uassert.True(t, l.Get(-1) == nil)
+	uassert.True(t, l.Get(3) == nil)
+}
+
+func TestEntries(t *testing.T) {
+	l := New(3)
+	l.Append(1)
+	l.Append(2)
+	l.Append(3)
+
+	entries := l.Entries()
+	uassert.Equal(t, 3, len(entries))
+	uassert.Equal(t, 1, entries[0])
+	uassert.Equal(t, 2, entries[1])
+	uassert.Equal(t, 3, entries[2])
+}
+
+func TestLatest(t *testing.T) {
+	l := New(5)
+
+	// Test empty list
+	uassert.True(t, l.Latest() == nil)
+
+	// Test single entry
+	l.Append(1)
+	uassert.Equal(t, 1, l.Latest())
+
+	// Test multiple entries
+	l.Append(2)
+	l.Append(3)
+	uassert.Equal(t, 3, l.Latest())
+
+	// Test after overflow
+	l.Append(4)
+	l.Append(5)
+	l.Append(6)
+	uassert.Equal(t, 6, l.Latest())
+}
+
+func TestIterator(t *testing.T) {
+	l := New(3)
+	l.Append(1)
+	l.Append(2)
+	l.Append(3)
+
+	iter := l.Iterator()
+	uassert.Equal(t, 1, iter())
+	uassert.Equal(t, 2, iter())
+	uassert.Equal(t, 3, iter())
+	uassert.True(t, iter() == nil)
+}
+
+func TestMixedOperations(t *testing.T) {
+	l := New(3)
+
+	// Mix of append and prepend operations
+	l.Append(1)  // [1]
+	l.Prepend(2) // [2,1]
+	l.Append(3)  // [2,1,3]
+	l.Prepend(4) // [4,2,1]
+
+	entries := l.Entries()
+	uassert.Equal(t, 3, len(entries))
+	uassert.Equal(t, 4, entries[0])
+	uassert.Equal(t, 2, entries[1])
+	uassert.Equal(t, 1, entries[2])
+}
+
+func TestEmptyList(t *testing.T) {
+	l := New(3)
+
+	// Test operations on empty list
+	uassert.Equal(t, 0, l.Size())
+	uassert.True(t, l.Get(0) == nil)
+	uassert.Equal(t, 0, len(l.Entries()))
+	uassert.True(t, l.Latest() == nil)
+
+	iter := l.Iterator()
+	uassert.True(t, iter() == nil)
+}
+
+func TestEdgeCases(t *testing.T) {
+	// Test zero-size list
+	l := New(0)
+	uassert.Equal(t, 0, l.MaxSize())
+	l.Append(1) // Should be no-op
+	uassert.Equal(t, 0, l.Size())
+
+	// Test single-element list
+	l = New(1)
+	l.Append(1)
+	l.Append(2) // Should replace 1
+	uassert.Equal(t, 1, l.Size())
+	uassert.Equal(t, 2, l.Latest())
+
+	// Test rapid append/prepend alternation
+	l = New(3)
+	l.Append(1)  // [1]
+	l.Prepend(2) // [2,1]
+	l.Append(3)  // [2,1,3]
+	l.Prepend(4) // [4,2,1]
+	l.Append(5)  // [2,1,5]
+	uassert.Equal(t, 3, l.Size())
+	entries := l.Entries()
+	uassert.Equal(t, 2, entries[0])
+	uassert.Equal(t, 1, entries[1])
+	uassert.Equal(t, 5, entries[2])
+
+	// Test nil values
+	l = New(2)
+	l.Append(nil)
+	l.Prepend(nil)
+	uassert.Equal(t, 2, l.Size())
+	uassert.True(t, l.Get(0) == nil)
+	uassert.True(t, l.Get(1) == nil)
+
+	// Test index bounds
+	l = New(3)
+	l.Append(1)
+	uassert.True(t, l.Get(-1) == nil)
+	uassert.True(t, l.Get(1) == nil)
+
+	// Test iterator exhaustion
+	l = New(2)
+	l.Append(1)
+	l.Append(2)
+	iter := l.Iterator()
+	uassert.Equal(t, 1, iter())
+	uassert.Equal(t, 2, iter())
+	uassert.True(t, iter() == nil)
+	uassert.True(t, iter() == nil)
+
+	// Test prepend on full list
+	l = New(2)
+	l.Append(1)
+	l.Append(2)  // [1,2]
+	l.Prepend(3) // [3,1]
+	uassert.Equal(t, 2, l.Size())
+	entries = l.Entries()
+	uassert.Equal(t, 3, entries[0])
+	uassert.Equal(t, 1, entries[1])
+}
+
+func TestSetMaxSize(t *testing.T) {
+	l := New(5)
+
+	// Fill the list
+	l.Append(1)
+	l.Append(2)
+	l.Append(3)
+	l.Append(4)
+	l.Append(5)
+
+	// Test increasing maxSize
+	l.SetMaxSize(7)
+	uassert.Equal(t, 7, l.MaxSize())
+	uassert.Equal(t, 5, l.Size())
+
+	// Test reducing maxSize
+	l.SetMaxSize(3)
+	uassert.Equal(t, 3, l.Size())
+	entries := l.Entries()
+	uassert.Equal(t, 3, entries[0])
+	uassert.Equal(t, 4, entries[1])
+	uassert.Equal(t, 5, entries[2])
+
+	// Test setting to zero
+	l.SetMaxSize(0)
+	uassert.Equal(t, 0, l.Size())
+	uassert.True(t, l.head == nil)
+	uassert.True(t, l.tail == nil)
+
+	// Test negative maxSize
+	l.SetMaxSize(-1)
+	uassert.Equal(t, 0, l.MaxSize())
+
+	// Test setting back to positive
+	l.SetMaxSize(2)
+	l.Append(1)
+	l.Append(2)
+	l.Append(3)
+	uassert.Equal(t, 2, l.Size())
+	entries = l.Entries()
+	uassert.Equal(t, 2, entries[0])
+	uassert.Equal(t, 3, entries[1])
+}
+
+func TestDelete(t *testing.T) {
+	l := New(5)
+
+	// Test delete on empty list
+	uassert.False(t, l.Delete(0))
+	uassert.False(t, l.Delete(-1))
+
+	// Fill list
+	l.Append(1)
+	l.Append(2)
+	l.Append(3)
+	l.Append(4)
+
+	// Test invalid indices
+	uassert.False(t, l.Delete(-1))
+	uassert.False(t, l.Delete(4))
+
+	// Test deleting from middle
+	uassert.True(t, l.Delete(1))
+	uassert.Equal(t, 3, l.Size())
+	entries := l.Entries()
+	uassert.Equal(t, 1, entries[0])
+	uassert.Equal(t, 3, entries[1])
+	uassert.Equal(t, 4, entries[2])
+
+	// Test deleting from head
+	uassert.True(t, l.Delete(0))
+	uassert.Equal(t, 2, l.Size())
+	entries = l.Entries()
+	uassert.Equal(t, 3, entries[0])
+	uassert.Equal(t, 4, entries[1])
+
+	// Test deleting from tail
+	uassert.True(t, l.Delete(1))
+	uassert.Equal(t, 1, l.Size())
+	uassert.Equal(t, 3, l.Latest())
+
+	// Test deleting last element
+	uassert.True(t, l.Delete(0))
+	uassert.Equal(t, 0, l.Size())
+	uassert.True(t, l.head == nil)
+	uassert.True(t, l.tail == nil)
+}
diff --git a/examples/gno.land/p/moul/fifo/gno.mod b/examples/gno.land/p/moul/fifo/gno.mod
new file mode 100644
index 00000000000..dccbc39453b
--- /dev/null
+++ b/examples/gno.land/p/moul/fifo/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/moul/fifo

From c3c6e66b2557c0ebc66c4505bba33e24a1ac9a90 Mon Sep 17 00:00:00 2001
From: Emmanuel T Odeke <emmanuel@orijtech.com>
Date: Mon, 24 Feb 2025 18:38:23 +0200
Subject: [PATCH 42/47] fix(gnolang): prescriptively reject
 *ast.(IndexListExpr, GoStmt) as unrecognized for Gno (#3752)

The *ast.IndexListExpr is used for generics but in assignment operations
it is illegal to use. This change returns a proper error and matches
Go's output.
Also *ast.GoStmt is for spawning Go routines but those are forbidden
in Gno, hence reject them prescriptively instead of just spewing
out the raw ast type.

Fixes #3731
Updates #3751

---------

Co-authored-by: Morgan <morgan@morganbaz.com>
---
 gnovm/pkg/gnolang/go2gno.go      |  7 +++++++
 gnovm/tests/files/parse_err1.gno | 16 ++++++++++++++++
 gnovm/tests/files/parse_err2.gno | 16 ++++++++++++++++
 3 files changed, 39 insertions(+)
 create mode 100644 gnovm/tests/files/parse_err1.gno
 create mode 100644 gnovm/tests/files/parse_err2.gno

diff --git a/gnovm/pkg/gnolang/go2gno.go b/gnovm/pkg/gnolang/go2gno.go
index b98136b13b5..8379bfef425 100644
--- a/gnovm/pkg/gnolang/go2gno.go
+++ b/gnovm/pkg/gnolang/go2gno.go
@@ -478,6 +478,13 @@ func Go2Gno(fs *token.FileSet, gon ast.Node) (n Node) {
 		}
 	case *ast.EmptyStmt:
 		return &EmptyStmt{}
+	case *ast.IndexListExpr:
+		if len(gon.Indices) > 1 {
+			panicWithPos("invalid operation: more than one index")
+		}
+		panicWithPos("invalid operation: indexList is not permitted in Gno")
+	case *ast.GoStmt:
+		panicWithPos("goroutines are not permitted")
 	default:
 		panicWithPos("unknown Go type %v: %s\n",
 			reflect.TypeOf(gon),
diff --git a/gnovm/tests/files/parse_err1.gno b/gnovm/tests/files/parse_err1.gno
new file mode 100644
index 00000000000..efa21e883b0
--- /dev/null
+++ b/gnovm/tests/files/parse_err1.gno
@@ -0,0 +1,16 @@
+// https://github.com/gnolang/gno/issues/3731
+
+package main
+
+type node struct {
+	r []int
+}
+
+func (n *node) foo(targ, wndex int) {
+	_ = n.r[targ, wndex]
+}
+
+func main() {}
+
+// Error:
+// files/parse_err1.gno:10:6: invalid operation: more than one index
diff --git a/gnovm/tests/files/parse_err2.gno b/gnovm/tests/files/parse_err2.gno
new file mode 100644
index 00000000000..3e0f79d6935
--- /dev/null
+++ b/gnovm/tests/files/parse_err2.gno
@@ -0,0 +1,16 @@
+// https://github.com/gnolang/gno/issues/3751
+
+package math
+
+import "testing"
+
+func Add(a, b int) int {
+	return a + b
+}
+
+func TestAdd(t *testing.T) {
+	go Add(1, 1)
+}
+
+// Error:
+// files/parse_err2.gno:12:2: goroutines are not permitted

From 6803b7741ce6862d2704ffc1d4de280d518b16e7 Mon Sep 17 00:00:00 2001
From: Morgan <morgan@morganbaz.com>
Date: Mon, 24 Feb 2025 17:43:37 +0100
Subject: [PATCH 43/47] fix(gnovm): remove `preprocessing` variable (#3728)

This PR removes the `preprocessing` global variable.

This was only used in one function; now that we have `PreprocessingMode`
in the machine, we can move this check out of the specific function and
into the places where we need to check it
---
 gnovm/pkg/gnolang/op_assign.go          |  6 ++++
 gnovm/pkg/gnolang/op_decl.go            | 44 +++++++++++--------------
 gnovm/pkg/gnolang/uverse.go             |  3 ++
 gnovm/pkg/gnolang/values_conversions.go | 14 --------
 4 files changed, 29 insertions(+), 38 deletions(-)

diff --git a/gnovm/pkg/gnolang/op_assign.go b/gnovm/pkg/gnolang/op_assign.go
index 5e841fb18fd..b42bb4744c0 100644
--- a/gnovm/pkg/gnolang/op_assign.go
+++ b/gnovm/pkg/gnolang/op_assign.go
@@ -20,6 +20,9 @@ func (m *Machine) doOpDefine() {
 				}
 			}
 		}
+		if !m.PreprocessorMode && isUntyped(rvs[i].T) && rvs[i].T.Kind() != BoolKind {
+			panic("untyped conversion should not happen at runtime")
+		}
 		ptr.Assign2(m.Alloc, m.Store, m.Realm, rvs[i], true)
 	}
 }
@@ -41,6 +44,9 @@ func (m *Machine) doOpAssign() {
 				}
 			}
 		}
+		if !m.PreprocessorMode && isUntyped(rvs[i].T) && rvs[i].T.Kind() != BoolKind {
+			panic("untyped conversion should not happen at runtime")
+		}
 		lv.Assign2(m.Alloc, m.Store, m.Realm, rvs[i], true)
 	}
 }
diff --git a/gnovm/pkg/gnolang/op_decl.go b/gnovm/pkg/gnolang/op_decl.go
index c9c04ccf76d..6dbae2d3edf 100644
--- a/gnovm/pkg/gnolang/op_decl.go
+++ b/gnovm/pkg/gnolang/op_decl.go
@@ -29,35 +29,31 @@ func (m *Machine) doOpValueDecl() {
 		} else {
 			tv = rvs[i]
 		}
-		if nt != nil {
-			if nt.Kind() == InterfaceKind {
-				if isUntyped(tv.T) {
-					ConvertUntypedTo(&tv, nil)
-				} else {
-					// keep type as is.
+
+		if isUntyped(tv.T) {
+			if !s.Const {
+				if !m.PreprocessorMode && rvs[i].T.Kind() != BoolKind {
+					panic("untyped conversion should not happen at runtime")
 				}
-			} else {
-				if isUntyped(tv.T) {
-					ConvertUntypedTo(&tv, nt)
-				} else {
-					if debug {
-						if nt.TypeID() != tv.T.TypeID() &&
-							baseOf(nt).TypeID() != tv.T.TypeID() {
-							panic(fmt.Sprintf(
-								"type mismatch: %s vs %s",
-								nt.TypeID(),
-								tv.T.TypeID(),
-							))
-						}
+				ConvertUntypedTo(&tv, nil)
+			}
+		} else if nt != nil {
+			// if nt.T is an interface, maintain tv.T as-is.
+			if nt.Kind() != InterfaceKind {
+				if debug {
+					if nt.TypeID() != tv.T.TypeID() &&
+						baseOf(nt).TypeID() != tv.T.TypeID() {
+						panic(fmt.Sprintf(
+							"type mismatch: %s vs %s",
+							nt.TypeID(),
+							tv.T.TypeID(),
+						))
 					}
-					tv.T = nt
 				}
+				tv.T = nt
 			}
-		} else if s.Const {
-			// leave untyped as is.
-		} else if isUntyped(tv.T) {
-			ConvertUntypedTo(&tv, nil)
 		}
+
 		nx := &s.NameExprs[i]
 		ptr := lb.GetPointerToMaybeHeapDefine(m.Store, nx)
 		ptr.Assign2(m.Alloc, m.Store, m.Realm, tv, false)
diff --git a/gnovm/pkg/gnolang/uverse.go b/gnovm/pkg/gnolang/uverse.go
index 55791ba4900..074f7a51b66 100644
--- a/gnovm/pkg/gnolang/uverse.go
+++ b/gnovm/pkg/gnolang/uverse.go
@@ -1050,6 +1050,9 @@ func makeUverseNode() {
 				}
 			}
 
+			if isUntyped(exception.Value.T) {
+				ConvertUntypedTo(&exception.Value, nil)
+			}
 			m.PushValue(exception.Value)
 			// Recover complete; remove exceptions.
 			m.Exceptions = nil
diff --git a/gnovm/pkg/gnolang/values_conversions.go b/gnovm/pkg/gnolang/values_conversions.go
index 920ed655ec9..ce256680de6 100644
--- a/gnovm/pkg/gnolang/values_conversions.go
+++ b/gnovm/pkg/gnolang/values_conversions.go
@@ -1316,28 +1316,14 @@ func ConvertUntypedTo(tv *TypedValue, t Type) {
 	}
 	switch tv.T {
 	case UntypedBoolType:
-		if debug {
-			if t.Kind() != BoolKind {
-				panic("untyped bool can only be converted to bool kind")
-			}
-		}
 		tv.T = t
 	case UntypedRuneType:
 		ConvertUntypedRuneTo(tv, t)
 	case UntypedBigintType:
-		if preprocessing.Load() == 0 {
-			panic("untyped Bigint conversion should not happen during interpretation")
-		}
 		ConvertUntypedBigintTo(tv, tv.V.(BigintValue), t)
 	case UntypedBigdecType:
-		if preprocessing.Load() == 0 {
-			panic("untyped Bigdec conversion should not happen during interpretation")
-		}
 		ConvertUntypedBigdecTo(tv, tv.V.(BigdecValue), t)
 	case UntypedStringType:
-		if preprocessing.Load() == 0 {
-			panic("untyped String conversion should not happen during interpretation")
-		}
 		if t.Kind() == StringKind {
 			tv.T = t
 			return

From 83c83f9e7b5fdf04b3ac5f3fd3d0fba47563f13e Mon Sep 17 00:00:00 2001
From: Manfred Touron <94029+moul@users.noreply.github.com>
Date: Mon, 24 Feb 2025 21:05:10 +0100
Subject: [PATCH 44/47] feat(examples): add p/moul/authz (#3700)

We should probably replace most of the current Ownable-based contracts
with this option. This way, we can start with a central admin and later
transition to a DAO.

---------

Signed-off-by: moul <94029+moul@users.noreply.github.com>
---
 examples/gno.land/p/moul/authz/authz.gno      | 261 ++++++++++++
 examples/gno.land/p/moul/authz/authz_test.gno | 384 ++++++++++++++++++
 .../gno.land/p/moul/authz/example_test.gno    |  88 ++++
 examples/gno.land/p/moul/authz/gno.mod        |   1 +
 examples/gno.land/p/moul/once/gno.mod         |   1 +
 examples/gno.land/p/moul/once/once.gno        | 100 +++++
 examples/gno.land/p/moul/once/once_test.gno   | 231 +++++++++++
 .../pkg/integration/testdata/moul_authz.txtar |  82 ++++
 8 files changed, 1148 insertions(+)
 create mode 100644 examples/gno.land/p/moul/authz/authz.gno
 create mode 100644 examples/gno.land/p/moul/authz/authz_test.gno
 create mode 100644 examples/gno.land/p/moul/authz/example_test.gno
 create mode 100644 examples/gno.land/p/moul/authz/gno.mod
 create mode 100644 examples/gno.land/p/moul/once/gno.mod
 create mode 100644 examples/gno.land/p/moul/once/once.gno
 create mode 100644 examples/gno.land/p/moul/once/once_test.gno
 create mode 100644 gno.land/pkg/integration/testdata/moul_authz.txtar

diff --git a/examples/gno.land/p/moul/authz/authz.gno b/examples/gno.land/p/moul/authz/authz.gno
new file mode 100644
index 00000000000..059d1234b10
--- /dev/null
+++ b/examples/gno.land/p/moul/authz/authz.gno
@@ -0,0 +1,261 @@
+// Package authz provides flexible authorization control for privileged actions.
+//
+// # Authorization Strategies
+//
+// The package supports multiple authorization strategies:
+//   - Member-based: Single user or team of users
+//   - Contract-based: Async authorization (e.g., via DAO)
+//   - Auto-accept: Allow all actions
+//   - Drop: Deny all actions
+//
+// Core Components
+//
+//   - Authority interface: Base interface implemented by all authorities
+//   - Authorizer: Main wrapper object for authority management
+//   - MemberAuthority: Manages authorized addresses
+//   - ContractAuthority: Delegates to another contract
+//   - AutoAcceptAuthority: Accepts all actions
+//   - DroppedAuthority: Denies all actions
+//
+// Quick Start
+//
+//	// Initialize with contract deployer as authority
+//	var auth = authz.New()
+//
+//	// Create functions that require authorization
+//	func UpdateConfig(newValue string) error {
+//	    return auth.Do("update_config", func() error {
+//	        config = newValue
+//	        return nil
+//	    })
+//	}
+//
+// See example_test.gno for more usage examples.
+package authz
+
+import (
+	"errors"
+	"std"
+
+	"gno.land/p/demo/avl"
+	"gno.land/p/demo/avl/rotree"
+	"gno.land/p/demo/ufmt"
+	"gno.land/p/moul/addrset"
+	"gno.land/p/moul/once"
+)
+
+// Authorizer is the main wrapper object that handles authority management
+type Authorizer struct {
+	current Authority
+}
+
+// Authority represents an entity that can authorize privileged actions
+type Authority interface {
+	// Authorize executes a privileged action if the caller is authorized
+	// Additional args can be provided for context (e.g., for proposal creation)
+	Authorize(title string, action PrivilegedAction, args ...interface{}) error
+
+	// String returns a human-readable description of the authority
+	String() string
+}
+
+// PrivilegedAction defines a function that performs a privileged action.
+type PrivilegedAction func() error
+
+// PrivilegedActionHandler is called by contract-based authorities to handle
+// privileged actions.
+type PrivilegedActionHandler func(title string, action PrivilegedAction) error
+
+// New creates a new Authorizer with the current realm's address as authority
+func New() *Authorizer {
+	return &Authorizer{
+		current: NewMemberAuthority(std.PreviousRealm().Address()),
+	}
+}
+
+// NewWithAuthority creates a new Authorizer with a specific authority
+func NewWithAuthority(authority Authority) *Authorizer {
+	return &Authorizer{
+		current: authority,
+	}
+}
+
+// Current returns the current authority implementation
+func (a *Authorizer) Current() Authority {
+	return a.current
+}
+
+// Transfer changes the current authority after validation
+func (a *Authorizer) Transfer(newAuthority Authority) error {
+	// Ask current authority to validate the transfer
+	return a.current.Authorize("transfer_authority", func() error {
+		a.current = newAuthority
+		return nil
+	})
+}
+
+// Do executes a privileged action through the current authority
+func (a *Authorizer) Do(title string, action PrivilegedAction, args ...interface{}) error {
+	return a.current.Authorize(title, action, args...)
+}
+
+// String returns a string representation of the current authority
+func (a *Authorizer) String() string {
+	return a.current.String()
+}
+
+// MemberAuthority is the default implementation using addrset for member management
+type MemberAuthority struct {
+	members addrset.Set
+}
+
+func NewMemberAuthority(members ...std.Address) *MemberAuthority {
+	auth := &MemberAuthority{}
+	for _, addr := range members {
+		auth.members.Add(addr)
+	}
+	return auth
+}
+
+func (a *MemberAuthority) Authorize(title string, action PrivilegedAction, args ...interface{}) error {
+	caller := std.PreviousRealm().Address()
+	if !a.members.Has(caller) {
+		return errors.New("unauthorized")
+	}
+
+	if err := action(); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (a *MemberAuthority) String() string {
+	return ufmt.Sprintf("member_authority[size=%d]", a.members.Size())
+}
+
+// AddMember adds a new member to the authority
+func (a *MemberAuthority) AddMember(addr std.Address) error {
+	return a.Authorize("add_member", func() error {
+		a.members.Add(addr)
+		return nil
+	})
+}
+
+// RemoveMember removes a member from the authority
+func (a *MemberAuthority) RemoveMember(addr std.Address) error {
+	return a.Authorize("remove_member", func() error {
+		a.members.Remove(addr)
+		return nil
+	})
+}
+
+// Tree returns a read-only view of the members tree
+func (a *MemberAuthority) Tree() *rotree.ReadOnlyTree {
+	tree := a.members.Tree().(*avl.Tree)
+	return rotree.Wrap(tree, nil)
+}
+
+// Has checks if the given address is a member of the authority
+func (a *MemberAuthority) Has(addr std.Address) bool {
+	return a.members.Has(addr)
+}
+
+// ContractAuthority implements async contract-based authority
+type ContractAuthority struct {
+	contractPath    string
+	contractAddr    std.Address
+	contractHandler PrivilegedActionHandler
+	proposer        Authority // controls who can create proposals
+	executionOnce   once.Once
+}
+
+func NewContractAuthority(path string, handler PrivilegedActionHandler) *ContractAuthority {
+	return &ContractAuthority{
+		contractPath:    path,
+		contractAddr:    std.DerivePkgAddr(path),
+		contractHandler: handler,
+		proposer:        NewAutoAcceptAuthority(), // default: anyone can propose
+		executionOnce:   once.Once{},              // initialize execution once
+	}
+}
+
+// NewRestrictedContractAuthority creates a new contract authority with a proposer restriction
+func NewRestrictedContractAuthority(path string, handler PrivilegedActionHandler, proposer Authority) Authority {
+	if path == "" {
+		panic("contract path cannot be empty")
+	}
+	if handler == nil {
+		panic("contract handler cannot be nil")
+	}
+	if proposer == nil {
+		panic("proposer cannot be nil")
+	}
+	return &ContractAuthority{
+		contractPath:    path,
+		contractAddr:    std.DerivePkgAddr(path),
+		contractHandler: handler,
+		proposer:        proposer,
+		executionOnce:   once.Once{},
+	}
+}
+
+func (a *ContractAuthority) Authorize(title string, action PrivilegedAction, args ...interface{}) error {
+	if a.contractHandler == nil {
+		return errors.New("contract handler is not set")
+	}
+
+	// Wrap the action to ensure it can only be executed by the contract
+	wrappedAction := func() error {
+		caller := std.PreviousRealm().Address()
+		if caller != a.contractAddr {
+			return errors.New("action can only be executed by the contract")
+		}
+		return a.executionOnce.DoErr(func() error {
+			return action()
+		})
+	}
+
+	// Use the proposer authority to control who can create proposals
+	return a.proposer.Authorize(title+"_proposal", func() error {
+		if err := a.contractHandler(title, wrappedAction); err != nil {
+			return err
+		}
+		return nil
+	}, args...)
+}
+
+func (a *ContractAuthority) String() string {
+	return ufmt.Sprintf("contract_authority[contract=%s]", a.contractPath)
+}
+
+// AutoAcceptAuthority implements an authority that accepts all actions
+// AutoAcceptAuthority is a simple authority that automatically accepts all actions.
+// It can be used as a proposer authority to allow anyone to create proposals.
+type AutoAcceptAuthority struct{}
+
+func NewAutoAcceptAuthority() *AutoAcceptAuthority {
+	return &AutoAcceptAuthority{}
+}
+
+func (a *AutoAcceptAuthority) Authorize(title string, action PrivilegedAction, args ...interface{}) error {
+	return action()
+}
+
+func (a *AutoAcceptAuthority) String() string {
+	return "auto_accept_authority"
+}
+
+// droppedAuthority implements an authority that denies all actions
+type droppedAuthority struct{}
+
+func NewDroppedAuthority() Authority {
+	return &droppedAuthority{}
+}
+
+func (a *droppedAuthority) Authorize(title string, action PrivilegedAction, args ...interface{}) error {
+	return errors.New("dropped authority: all actions are denied")
+}
+
+func (a *droppedAuthority) String() string {
+	return "dropped_authority"
+}
diff --git a/examples/gno.land/p/moul/authz/authz_test.gno b/examples/gno.land/p/moul/authz/authz_test.gno
new file mode 100644
index 00000000000..f8915cc2448
--- /dev/null
+++ b/examples/gno.land/p/moul/authz/authz_test.gno
@@ -0,0 +1,384 @@
+package authz
+
+import (
+	"errors"
+	"std"
+	"testing"
+
+	"gno.land/p/demo/testutils"
+	"gno.land/p/demo/uassert"
+	"gno.land/p/demo/ufmt"
+)
+
+func TestNew(t *testing.T) {
+	testAddr := testutils.TestAddress("alice")
+	std.TestSetOriginCaller(testAddr)
+
+	auth := New()
+
+	// Check that the current authority is a MemberAuthority
+	memberAuth, ok := auth.Current().(*MemberAuthority)
+	uassert.True(t, ok, "expected MemberAuthority")
+
+	// Check that the caller is a member
+	uassert.True(t, memberAuth.Has(testAddr), "caller should be a member")
+
+	// Check string representation
+	expected := ufmt.Sprintf("member_authority[size=%d]", 1)
+	uassert.Equal(t, expected, auth.String())
+}
+
+func TestNewWithAuthority(t *testing.T) {
+	testAddr := testutils.TestAddress("alice")
+	memberAuth := NewMemberAuthority(testAddr)
+
+	auth := NewWithAuthority(memberAuth)
+
+	// Check that the current authority is the one we provided
+	uassert.True(t, auth.Current() == memberAuth, "expected provided authority")
+}
+
+func TestAuthorizerAuthorize(t *testing.T) {
+	testAddr := testutils.TestAddress("alice")
+	std.TestSetOriginCaller(testAddr)
+
+	auth := New()
+
+	// Test successful action with args
+	executed := false
+	args := []interface{}{"test_arg", 123}
+	err := auth.Do("test_action", func() error {
+		executed = true
+		return nil
+	}, args...)
+
+	uassert.True(t, err == nil, "expected no error")
+	uassert.True(t, executed, "action should have been executed")
+
+	// Test unauthorized action with args
+	std.TestSetOriginCaller(testutils.TestAddress("bob"))
+
+	executed = false
+	err = auth.Do("test_action", func() error {
+		executed = true
+		return nil
+	}, "unauthorized_arg")
+
+	uassert.True(t, err != nil, "expected error")
+	uassert.False(t, executed, "action should not have been executed")
+
+	// Test action returning error
+	std.TestSetOriginCaller(testAddr)
+	expectedErr := errors.New("test error")
+
+	err = auth.Do("test_action", func() error {
+		return expectedErr
+	})
+
+	uassert.True(t, err == expectedErr, "expected specific error")
+}
+
+func TestAuthorizerTransfer(t *testing.T) {
+	testAddr := testutils.TestAddress("alice")
+	std.TestSetOriginCaller(testAddr)
+
+	auth := New()
+
+	// Test transfer to new member authority
+	newAddr := testutils.TestAddress("bob")
+	newAuth := NewMemberAuthority(newAddr)
+
+	err := auth.Transfer(newAuth)
+	uassert.True(t, err == nil, "expected no error")
+	uassert.True(t, auth.Current() == newAuth, "expected new authority")
+
+	// Test unauthorized transfer
+	std.TestSetOriginCaller(testutils.TestAddress("carol"))
+
+	err = auth.Transfer(NewMemberAuthority(testAddr))
+	uassert.True(t, err != nil, "expected error")
+
+	// Test transfer to contract authority
+	std.TestSetOriginCaller(newAddr)
+
+	contractAuth := NewContractAuthority("gno.land/r/test", func(title string, action PrivilegedAction) error {
+		return action()
+	})
+
+	err = auth.Transfer(contractAuth)
+	uassert.True(t, err == nil, "expected no error")
+	uassert.True(t, auth.Current() == contractAuth, "expected contract authority")
+}
+
+func TestAuthorizerTransferChain(t *testing.T) {
+	testAddr := testutils.TestAddress("alice")
+	std.TestSetOriginCaller(testAddr)
+
+	// Create a chain of transfers
+	auth := New()
+
+	// First transfer to a new member authority
+	newAddr := testutils.TestAddress("bob")
+	memberAuth := NewMemberAuthority(newAddr)
+
+	err := auth.Transfer(memberAuth)
+	uassert.True(t, err == nil, "unexpected error in first transfer")
+
+	// Then transfer to a contract authority
+	contractAuth := NewContractAuthority("gno.land/r/test", func(title string, action PrivilegedAction) error {
+		return action()
+	})
+
+	std.TestSetOriginCaller(newAddr)
+	err = auth.Transfer(contractAuth)
+	uassert.True(t, err == nil, "unexpected error in second transfer")
+
+	// Finally transfer to an auto-accept authority
+	autoAuth := NewAutoAcceptAuthority()
+
+	std.TestSetOriginCaller(std.DerivePkgAddr("gno.land/r/test"))
+	err = auth.Transfer(autoAuth)
+	uassert.True(t, err == nil, "unexpected error in final transfer")
+	uassert.True(t, auth.Current() == autoAuth, "expected auto-accept authority")
+}
+
+func TestAuthorizerWithDroppedAuthority(t *testing.T) {
+	testAddr := testutils.TestAddress("alice")
+	std.TestSetOriginCaller(testAddr)
+
+	auth := New()
+
+	// Transfer to dropped authority
+	err := auth.Transfer(NewDroppedAuthority())
+	uassert.True(t, err == nil, "expected no error")
+
+	// Try to execute action
+	err = auth.Do("test_action", func() error {
+		return nil
+	})
+	uassert.True(t, err != nil, "expected error from dropped authority")
+
+	// Try to transfer again
+	err = auth.Transfer(NewMemberAuthority(testAddr))
+	uassert.True(t, err != nil, "expected error when transferring from dropped authority")
+}
+
+func TestContractAuthorityExecutionOnce(t *testing.T) {
+	attempts := 0
+	executed := 0
+	var capturedArgs []interface{}
+
+	contractAuth := NewContractAuthority("gno.land/r/test", func(title string, action PrivilegedAction) error {
+		// Try to execute the action twice in the same handler
+		if err := action(); err != nil {
+			return err
+		}
+		attempts++
+
+		// Second execution should fail
+		if err := action(); err != nil {
+			return err
+		}
+		attempts++
+		return nil
+	})
+
+	// Set caller to contract address
+	std.TestSetOriginCaller(std.DerivePkgAddr("gno.land/r/test"))
+
+	testArgs := []interface{}{"proposal_id", 42, "metadata", map[string]string{"key": "value"}}
+	err := contractAuth.Authorize("test_action", func() error {
+		executed++
+		return nil
+	}, testArgs...)
+
+	uassert.True(t, err == nil, "handler execution should succeed")
+	uassert.True(t, attempts == 2, "handler should have attempted execution twice")
+	uassert.True(t, executed == 1, "handler should have executed once")
+}
+
+func TestContractAuthorityWithProposer(t *testing.T) {
+	testAddr := testutils.TestAddress("alice")
+	memberAuth := NewMemberAuthority(testAddr)
+
+	handlerCalled := false
+	actionExecuted := false
+
+	contractAuth := NewRestrictedContractAuthority("gno.land/r/test", func(title string, action PrivilegedAction) error {
+		handlerCalled = true
+		// Set caller to contract address before executing action
+		std.TestSetOriginCaller(std.DerivePkgAddr("gno.land/r/test"))
+		return action()
+	}, memberAuth)
+
+	// Test authorized member
+	std.TestSetOriginCaller(testAddr)
+	testArgs := []interface{}{"proposal_metadata", "test value"}
+	err := contractAuth.Authorize("test_action", func() error {
+		actionExecuted = true
+		return nil
+	}, testArgs...)
+
+	uassert.True(t, err == nil, "authorized member should be able to propose")
+	uassert.True(t, handlerCalled, "contract handler should be called")
+	uassert.True(t, actionExecuted, "action should be executed")
+
+	// Reset flags for unauthorized test
+	handlerCalled = false
+	actionExecuted = false
+
+	// Test unauthorized proposer
+	std.TestSetOriginCaller(testutils.TestAddress("bob"))
+	err = contractAuth.Authorize("test_action", func() error {
+		actionExecuted = true
+		return nil
+	}, testArgs...)
+
+	uassert.True(t, err != nil, "unauthorized member should not be able to propose")
+	uassert.False(t, handlerCalled, "contract handler should not be called for unauthorized proposer")
+	uassert.False(t, actionExecuted, "action should not be executed for unauthorized proposer")
+}
+
+func TestAutoAcceptAuthority(t *testing.T) {
+	auth := NewAutoAcceptAuthority()
+
+	// Test that any action is authorized
+	executed := false
+	err := auth.Authorize("test_action", func() error {
+		executed = true
+		return nil
+	})
+
+	uassert.True(t, err == nil, "auto-accept should not return error")
+	uassert.True(t, executed, "action should have been executed")
+
+	// Test with different caller
+	std.TestSetOriginCaller(testutils.TestAddress("random"))
+	executed = false
+	err = auth.Authorize("test_action", func() error {
+		executed = true
+		return nil
+	})
+
+	uassert.True(t, err == nil, "auto-accept should not care about caller")
+	uassert.True(t, executed, "action should have been executed")
+}
+
+func TestAutoAcceptAuthorityWithArgs(t *testing.T) {
+	auth := NewAutoAcceptAuthority()
+
+	// Test that any action is authorized with args
+	executed := false
+	testArgs := []interface{}{"arg1", 42, "arg3"}
+	err := auth.Authorize("test_action", func() error {
+		executed = true
+		return nil
+	}, testArgs...)
+
+	uassert.True(t, err == nil, "auto-accept should not return error")
+	uassert.True(t, executed, "action should have been executed")
+}
+
+func TestMemberAuthorityMultipleMembers(t *testing.T) {
+	alice := testutils.TestAddress("alice")
+	bob := testutils.TestAddress("bob")
+	carol := testutils.TestAddress("carol")
+
+	// Create authority with multiple members
+	auth := NewMemberAuthority(alice, bob)
+
+	// Test that both members can execute actions
+	for _, member := range []std.Address{alice, bob} {
+		std.TestSetOriginCaller(member)
+		err := auth.Authorize("test_action", func() error {
+			return nil
+		})
+		uassert.True(t, err == nil, "member should be authorized")
+	}
+
+	// Test that non-member cannot execute
+	std.TestSetOriginCaller(carol)
+	err := auth.Authorize("test_action", func() error {
+		return nil
+	})
+	uassert.True(t, err != nil, "non-member should not be authorized")
+
+	// Test Tree() functionality
+	tree := auth.Tree()
+	uassert.True(t, tree.Size() == 2, "tree should have 2 members")
+
+	// Verify both members are in the tree
+	found := make(map[std.Address]bool)
+	tree.Iterate("", "", func(key string, _ interface{}) bool {
+		found[std.Address(key)] = true
+		return false
+	})
+	uassert.True(t, found[alice], "alice should be in the tree")
+	uassert.True(t, found[bob], "bob should be in the tree")
+	uassert.False(t, found[carol], "carol should not be in the tree")
+
+	// Test read-only nature of the tree
+	defer func() {
+		r := recover()
+		uassert.True(t, r != nil, "modifying read-only tree should panic")
+	}()
+	tree.Set(string(carol), nil) // This should panic
+}
+
+func TestAuthorizerCurrentNeverNil(t *testing.T) {
+	auth := New()
+
+	// Current should never be nil after initialization
+	uassert.True(t, auth.Current() != nil, "current authority should not be nil")
+
+	// Current should not be nil after transfer
+	err := auth.Transfer(NewAutoAcceptAuthority())
+	uassert.True(t, err == nil, "transfer should succeed")
+	uassert.True(t, auth.Current() != nil, "current authority should not be nil after transfer")
+}
+
+func TestAuthorizerString(t *testing.T) {
+	auth := New()
+
+	// Test initial string representation
+	str := auth.String()
+	uassert.True(t, str != "", "string representation should not be empty")
+
+	// Test string after transfer
+	autoAuth := NewAutoAcceptAuthority()
+	err := auth.Transfer(autoAuth)
+	uassert.True(t, err == nil, "transfer should succeed")
+
+	newStr := auth.String()
+	uassert.True(t, newStr != "", "string representation should not be empty")
+	uassert.True(t, newStr != str, "string should change after transfer")
+}
+
+func TestContractAuthorityValidation(t *testing.T) {
+	// Test empty path
+	auth := NewContractAuthority("", nil)
+	std.TestSetOriginCaller(std.DerivePkgAddr(""))
+	err := auth.Authorize("test", func() error {
+		return nil
+	})
+	uassert.True(t, err != nil, "empty path authority should fail to authorize")
+
+	// Test nil handler
+	auth = NewContractAuthority("gno.land/r/test", nil)
+	std.TestSetOriginCaller(std.DerivePkgAddr("gno.land/r/test"))
+	err = auth.Authorize("test", func() error {
+		return nil
+	})
+	uassert.True(t, err != nil, "nil handler authority should fail to authorize")
+
+	// Test valid configuration
+	handler := func(title string, action PrivilegedAction) error {
+		return nil
+	}
+	contractAuth := NewContractAuthority("gno.land/r/test", handler)
+	std.TestSetOriginCaller(std.DerivePkgAddr("gno.land/r/test"))
+	err = contractAuth.Authorize("test", func() error {
+		return nil
+	})
+	uassert.True(t, err == nil, "valid contract authority should authorize successfully")
+}
diff --git a/examples/gno.land/p/moul/authz/example_test.gno b/examples/gno.land/p/moul/authz/example_test.gno
new file mode 100644
index 00000000000..a283204dfc2
--- /dev/null
+++ b/examples/gno.land/p/moul/authz/example_test.gno
@@ -0,0 +1,88 @@
+package authz
+
+import (
+	"std"
+)
+
+// Example_basic demonstrates initializing and using a basic member authority
+func Example_basic() {
+	// Initialize with contract deployer as authority
+	auth := New()
+
+	// Use the authority to perform a privileged action
+	auth.Do("update_config", func() error {
+		// config = newValue
+		return nil
+	})
+}
+
+// Example_addingMembers demonstrates how to add new members to a member authority
+func Example_addingMembers() {
+	// Initialize with contract deployer as authority
+	auth := New()
+
+	// Add a new member to the authority
+	memberAuth := auth.Current().(*MemberAuthority)
+	memberAuth.AddMember(std.Address("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5"))
+}
+
+// Example_contractAuthority demonstrates using a contract-based authority
+func Example_contractAuthority() {
+	// Initialize with contract authority (e.g., DAO)
+	auth := NewWithAuthority(
+		NewContractAuthority(
+			"gno.land/r/demo/dao",
+			mockDAOHandler, // defined elsewhere for example
+		),
+	)
+
+	// Privileged actions will be handled by the contract
+	auth.Do("update_params", func() error {
+		// Executes after DAO approval
+		return nil
+	})
+}
+
+// Example_restrictedContractAuthority demonstrates a contract authority with member-only proposals
+func Example_restrictedContractAuthority() {
+	// Initialize member authority for proposers
+	proposerAuth := NewMemberAuthority(
+		std.Address("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5"), // admin1
+		std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj"), // admin2
+	)
+
+	// Create contract authority with restricted proposers
+	auth := NewWithAuthority(
+		NewRestrictedContractAuthority(
+			"gno.land/r/demo/dao",
+			mockDAOHandler,
+			proposerAuth,
+		),
+	)
+
+	// Only members can propose, and contract must approve
+	auth.Do("update_params", func() error {
+		// Executes after:
+		// 1. Proposer initiates
+		// 2. DAO approves
+		return nil
+	})
+}
+
+// Example_switchingAuthority demonstrates switching from member to contract authority
+func Example_switchingAuthority() {
+	// Start with member authority (deployer)
+	auth := New()
+
+	// Create and switch to contract authority
+	daoAuthority := NewContractAuthority(
+		"gno.land/r/demo/dao",
+		mockDAOHandler,
+	)
+	auth.Transfer(daoAuthority)
+}
+
+// Mock handler for examples
+func mockDAOHandler(title string, action PrivilegedAction) error {
+	return action()
+}
diff --git a/examples/gno.land/p/moul/authz/gno.mod b/examples/gno.land/p/moul/authz/gno.mod
new file mode 100644
index 00000000000..2ae057d875b
--- /dev/null
+++ b/examples/gno.land/p/moul/authz/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/moul/authz
diff --git a/examples/gno.land/p/moul/once/gno.mod b/examples/gno.land/p/moul/once/gno.mod
new file mode 100644
index 00000000000..29afe6841b2
--- /dev/null
+++ b/examples/gno.land/p/moul/once/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/moul/once
diff --git a/examples/gno.land/p/moul/once/once.gno b/examples/gno.land/p/moul/once/once.gno
new file mode 100644
index 00000000000..b9b6054c037
--- /dev/null
+++ b/examples/gno.land/p/moul/once/once.gno
@@ -0,0 +1,100 @@
+// Package once provides utilities for one-time execution patterns.
+// It extends the concept of sync.Once with error handling and panic options.
+package once
+
+import (
+	"errors"
+)
+
+// Once represents a one-time execution guard
+type Once struct {
+	done    bool
+	err     error
+	paniced bool
+	value   interface{} // stores the result of the execution
+}
+
+// New creates a new Once instance
+func New() *Once {
+	return &Once{}
+}
+
+// Do executes fn only once and returns nil on subsequent calls
+func (o *Once) Do(fn func()) {
+	if o.done {
+		return
+	}
+	defer func() { o.done = true }()
+	fn()
+}
+
+// DoErr executes fn only once and returns the same error on subsequent calls
+func (o *Once) DoErr(fn func() error) error {
+	if o.done {
+		return o.err
+	}
+	defer func() { o.done = true }()
+	o.err = fn()
+	return o.err
+}
+
+// DoOrPanic executes fn only once and panics on subsequent calls
+func (o *Once) DoOrPanic(fn func()) {
+	if o.done {
+		panic("once: multiple execution attempted")
+	}
+	defer func() { o.done = true }()
+	fn()
+}
+
+// DoValue executes fn only once and returns its value, subsequent calls return the cached value
+func (o *Once) DoValue(fn func() interface{}) interface{} {
+	if o.done {
+		return o.value
+	}
+	defer func() { o.done = true }()
+	o.value = fn()
+	return o.value
+}
+
+// DoValueErr executes fn only once and returns its value and error
+// Subsequent calls return the cached value and error
+func (o *Once) DoValueErr(fn func() (interface{}, error)) (interface{}, error) {
+	if o.done {
+		return o.value, o.err
+	}
+	defer func() { o.done = true }()
+	o.value, o.err = fn()
+	return o.value, o.err
+}
+
+// Reset resets the Once instance to its initial state
+// This is mainly useful for testing purposes
+func (o *Once) Reset() {
+	o.done = false
+	o.err = nil
+	o.paniced = false
+	o.value = nil
+}
+
+// IsDone returns whether the Once has been executed
+func (o *Once) IsDone() bool {
+	return o.done
+}
+
+// Error returns the error from the last execution if any
+func (o *Once) Error() error {
+	return o.err
+}
+
+var (
+	ErrNotExecuted = errors.New("once: not executed yet")
+)
+
+// Value returns the stored value and an error if not executed yet
+func (o *Once) Value() (interface{}, error) {
+	if !o.done {
+		return nil, ErrNotExecuted
+	}
+	return o.value, nil
+}
diff --git a/examples/gno.land/p/moul/once/once_test.gno b/examples/gno.land/p/moul/once/once_test.gno
new file mode 100644
index 00000000000..7d6114f4a5a
--- /dev/null
+++ b/examples/gno.land/p/moul/once/once_test.gno
@@ -0,0 +1,231 @@
+package once
+
+import (
+	"errors"
+	"testing"
+)
+
+func TestOnce_Do(t *testing.T) {
+	counter := 0
+	once := New()
+
+	increment := func() {
+		counter++
+	}
+
+	// First call should execute
+	once.Do(increment)
+	if counter != 1 {
+		t.Errorf("expected counter to be 1, got %d", counter)
+	}
+
+	// Second call should not execute
+	once.Do(increment)
+	if counter != 1 {
+		t.Errorf("expected counter to still be 1, got %d", counter)
+	}
+}
+
+func TestOnce_DoErr(t *testing.T) {
+	once := New()
+	expectedErr := errors.New("test error")
+
+	fn := func() error {
+		return expectedErr
+	}
+
+	// First call should return error
+	if err := once.DoErr(fn); err != expectedErr {
+		t.Errorf("expected error %v, got %v", expectedErr, err)
+	}
+
+	// Second call should return same error
+	if err := once.DoErr(fn); err != expectedErr {
+		t.Errorf("expected error %v, got %v", expectedErr, err)
+	}
+}
+
+func TestOnce_DoOrPanic(t *testing.T) {
+	once := New()
+	executed := false
+
+	fn := func() {
+		executed = true
+	}
+
+	// First call should execute
+	once.DoOrPanic(fn)
+	if !executed {
+		t.Error("function should have executed")
+	}
+
+	// Second call should panic
+	defer func() {
+		if r := recover(); r == nil {
+			t.Error("expected panic on second execution")
+		}
+	}()
+	once.DoOrPanic(fn)
+}
+
+func TestOnce_DoValue(t *testing.T) {
+	once := New()
+	expected := "test value"
+	counter := 0
+
+	fn := func() interface{} {
+		counter++
+		return expected
+	}
+
+	// First call should return value
+	if result := once.DoValue(fn); result != expected {
+		t.Errorf("expected %v, got %v", expected, result)
+	}
+
+	// Second call should return cached value
+	if result := once.DoValue(fn); result != expected {
+		t.Errorf("expected %v, got %v", expected, result)
+	}
+
+	if counter != 1 {
+		t.Errorf("function should have executed only once, got %d executions", counter)
+	}
+}
+
+func TestOnce_DoValueErr(t *testing.T) {
+	once := New()
+	expectedVal := "test value"
+	expectedErr := errors.New("test error")
+	counter := 0
+
+	fn := func() (interface{}, error) {
+		counter++
+		return expectedVal, expectedErr
+	}
+
+	// First call should return value and error
+	val, err := once.DoValueErr(fn)
+	if val != expectedVal || err != expectedErr {
+		t.Errorf("expected (%v, %v), got (%v, %v)", expectedVal, expectedErr, val, err)
+	}
+
+	// Second call should return cached value and error
+	val, err = once.DoValueErr(fn)
+	if val != expectedVal || err != expectedErr {
+		t.Errorf("expected (%v, %v), got (%v, %v)", expectedVal, expectedErr, val, err)
+	}
+
+	if counter != 1 {
+		t.Errorf("function should have executed only once, got %d executions", counter)
+	}
+}
+
+func TestOnce_Reset(t *testing.T) {
+	once := New()
+	counter := 0
+
+	fn := func() {
+		counter++
+	}
+
+	once.Do(fn)
+	if counter != 1 {
+		t.Errorf("expected counter to be 1, got %d", counter)
+	}
+
+	once.Reset()
+	once.Do(fn)
+	if counter != 2 {
+		t.Errorf("expected counter to be 2 after reset, got %d", counter)
+	}
+}
+
+func TestOnce_IsDone(t *testing.T) {
+	once := New()
+
+	if once.IsDone() {
+		t.Error("new Once instance should not be done")
+	}
+
+	once.Do(func() {})
+
+	if !once.IsDone() {
+		t.Error("Once instance should be done after execution")
+	}
+}
+
+func TestOnce_Error(t *testing.T) {
+	once := New()
+	expectedErr := errors.New("test error")
+
+	if err := once.Error(); err != nil {
+		t.Errorf("expected nil error, got %v", err)
+	}
+
+	once.DoErr(func() error {
+		return expectedErr
+	})
+
+	if err := once.Error(); err != expectedErr {
+		t.Errorf("expected error %v, got %v", expectedErr, err)
+	}
+}
+
+func TestOnce_Value(t *testing.T) {
+	once := New()
+
+	// Test unexecuted state
+	val, err := once.Value()
+	if err != ErrNotExecuted {
+		t.Errorf("expected ErrNotExecuted, got %v", err)
+	}
+	if val != nil {
+		t.Errorf("expected nil value, got %v", val)
+	}
+
+	// Test after execution
+	expected := "test value"
+	once.DoValue(func() interface{} {
+		return expected
+	})
+
+	val, err = once.Value()
+	if err != nil {
+		t.Errorf("expected nil error, got %v", err)
+	}
+	if val != expected {
+		t.Errorf("expected value %v, got %v", expected, val)
+	}
+}
+
+func TestOnce_DoValueErr_Panic_MarkedDone(t *testing.T) {
+	once := New()
+	count := 0
+	fn := func() (interface{}, error) {
+		count++
+		panic("panic")
+	}
+	var r interface{}
+	func() {
+		defer func() { r = recover() }()
+		once.DoValueErr(fn)
+	}()
+	if r == nil {
+		t.Error("expected panic on first call")
+	}
+	if !once.IsDone() {
+		t.Error("expected once to be marked as done after panic")
+	}
+	r = nil
+	func() {
+		defer func() { r = recover() }()
+		once.DoValueErr(fn)
+	}()
+	if r != nil {
+		t.Error("expected no panic on subsequent call")
+	}
+	if count != 1 {
+		t.Errorf("expected count to be 1, got %d", count)
+	}
+}
diff --git a/gno.land/pkg/integration/testdata/moul_authz.txtar b/gno.land/pkg/integration/testdata/moul_authz.txtar
new file mode 100644
index 00000000000..d0da3f535e8
--- /dev/null
+++ b/gno.land/pkg/integration/testdata/moul_authz.txtar
@@ -0,0 +1,82 @@
+loadpkg gno.land/p/moul/authz
+loadpkg gno.land/r/testing/admin $WORK/admin
+loadpkg gno.land/r/testing/resource $WORK/resource
+
+adduserfrom alice 'smooth crawl poverty trumpet glare useful curtain annual pluck lunar example merge ready forum better verb rescue rule mechanic dynamic drift bench release weekend'
+stdout 'g1rfznvu6qfa0sc76cplk5wpqexvefqccjunady0'
+
+gnoland start
+
+gnokey maketx call -pkgpath gno.land/r/testing/resource -func Edit -args edited -gas-fee 100000ugnot -gas-wanted 2000000 -broadcast -chainid tendermint_test alice
+
+gnokey maketx call -pkgpath gno.land/r/testing/admin -func ExecuteAction -args 0 -gas-fee 100000ugnot -gas-wanted 2000000 -broadcast -chainid tendermint_test alice
+
+gnokey maketx call -pkgpath gno.land/r/testing/resource -func Value -gas-fee 100000ugnot -gas-wanted 2000000 -broadcast -chainid tendermint_test alice
+stdout 'edited'
+
+
+-- admin/gno.mod --
+module gno.land/r/testing/admin
+
+-- admin/admin.gno --
+package admin
+
+import (
+    "std"
+    "errors"
+    "gno.land/p/moul/authz"
+)
+
+type prop struct {
+    title string
+    action authz.PrivilegedAction
+}
+
+var props []*prop
+
+func HandlePrivilegedAction(title string, action authz.PrivilegedAction) error {
+    if std.PreviousRealm().PkgPath() != "gno.land/r/testing/resource" {
+        return errors.New("unauthorized proposer")
+    }
+    props = append(props, &prop{title: title, action: action})
+    return nil
+}
+
+func ExecuteAction(index int) {
+    if std.PreviousRealm().Address() != "g1rfznvu6qfa0sc76cplk5wpqexvefqccjunady0" {
+        panic(errors.New("not alice"))
+    }
+    if err := props[index].action(); err != nil {
+        panic(err)
+    }
+}
+
+-- resource/gno.mod --
+module gno.land/r/testing/resource
+
+-- resource/resource.gno --
+package resource
+
+import (
+    "gno.land/p/moul/authz"
+    "gno.land/r/testing/admin"
+)
+
+var a *authz.Authorizer = authz.NewWithAuthority(authz.NewContractAuthority("gno.land/r/testing/admin", admin.HandlePrivilegedAction))
+
+var value = "init"
+
+func Value() string {
+    return value
+}
+
+func Edit(newValue string) {
+    doEdit := func() error {
+        value = newValue
+        return nil
+    }
+    if err := a.Do("Edit", doEdit); err != nil {
+        panic(err)
+    }
+}
+

From 3288fe82f77afb475796a6ebbe395975ee6f9f0f Mon Sep 17 00:00:00 2001
From: Alexis Colin <alexis@jaunebleu.co>
Date: Tue, 25 Feb 2025 17:25:07 +0900
Subject: [PATCH 45/47] fix: CSP to allow pixel gif from simple analytics
 (#3822)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Related to #3619

This PR updates the Content Security Policy (CSP) to allow Simple
Analytics to function correctly. The img-src directive now includes
https://sa.gno.services, enabling the tracking pixel to load without
being blocked.

The tracking pixel (a 1×1 GIF) is essential for Simple Analytics to
collect pageview data without requiring JavaScript. When loaded, it
sends necessary metadata (e.g., page URL, referrer, user-agent) via the
request, allowing privacy-friendly analytics to work. Without this fix,
Simple Analytics is unable to capture visits.
---
 gno.land/cmd/gnoweb/main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gno.land/cmd/gnoweb/main.go b/gno.land/cmd/gnoweb/main.go
index 0bd38489ff6..8e0b64122a6 100644
--- a/gno.land/cmd/gnoweb/main.go
+++ b/gno.land/cmd/gnoweb/main.go
@@ -242,7 +242,7 @@ func SecureHeadersMiddleware(next http.Handler, strict bool) http.Handler {
 			// - 'self' allows resources from the same origin.
 			// - 'data:' allows inline images (e.g., base64-encoded images).
 			// - 'https://gnolang.github.io' allows images from this specific domain - used by gno.land. TODO: use a proper generic whitelisted service
-			w.Header().Set("Content-Security-Policy", "default-src 'self'; script-src 'self' https://sa.gno.services; style-src 'self'; img-src 'self' data: https://gnolang.github.io; font-src 'self'")
+			w.Header().Set("Content-Security-Policy", "default-src 'self'; script-src 'self' https://sa.gno.services; style-src 'self'; img-src 'self' data: https://gnolang.github.io  https://sa.gno.services; font-src 'self'")
 
 			// Enforce HTTPS by telling browsers to only access the site over HTTPS
 			// for a specified duration (1 year in this case). This also applies to

From 6bf3889b69bd46139abe8a308beec3deda679d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jer=C3=B3nimo=20Albi?= <jeronimo.albi@gmail.com>
Date: Tue, 25 Feb 2025 17:35:24 +0100
Subject: [PATCH 46/47] feat(examples): add `p/jeronimoalbi/pager` package
 (#3806)

Package implements a way to support paging in generic cases that don't
use an AVL trees.
---
 .../gno.land/p/jeronimoalbi/pager/gno.mod     |   1 +
 .../gno.land/p/jeronimoalbi/pager/pager.gno   | 204 ++++++++++++++++++
 .../p/jeronimoalbi/pager/pager_options.gno    |  33 +++
 .../p/jeronimoalbi/pager/pager_test.gno       | 204 ++++++++++++++++++
 4 files changed, 442 insertions(+)
 create mode 100644 examples/gno.land/p/jeronimoalbi/pager/gno.mod
 create mode 100644 examples/gno.land/p/jeronimoalbi/pager/pager.gno
 create mode 100644 examples/gno.land/p/jeronimoalbi/pager/pager_options.gno
 create mode 100644 examples/gno.land/p/jeronimoalbi/pager/pager_test.gno

diff --git a/examples/gno.land/p/jeronimoalbi/pager/gno.mod b/examples/gno.land/p/jeronimoalbi/pager/gno.mod
new file mode 100644
index 00000000000..e775954b9fe
--- /dev/null
+++ b/examples/gno.land/p/jeronimoalbi/pager/gno.mod
@@ -0,0 +1 @@
+module gno.land/p/jeronimoalbi/pager
diff --git a/examples/gno.land/p/jeronimoalbi/pager/pager.gno b/examples/gno.land/p/jeronimoalbi/pager/pager.gno
new file mode 100644
index 00000000000..7b8a1948b3b
--- /dev/null
+++ b/examples/gno.land/p/jeronimoalbi/pager/pager.gno
@@ -0,0 +1,204 @@
+// Package pager provides pagination functionality through a generic pager implementation.
+//
+// Example usage:
+//
+//	import (
+//	    "strconv"
+//	    "strings"
+//
+//	    "gno.land/p/jeronimoalbi/pager"
+//	)
+//
+//	func Render(path string) string {
+//	    // Define the items to paginate
+//	    items := []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10}
+//
+//	    // Create a pager that paginates 4 items at a time
+//	    p, err := pager.New(path, len(items), pager.WithPageSize(4))
+//	    if err != nil {
+//	        panic(err)
+//	    }
+//
+//	    // Render items for the current page
+//	    var output strings.Builder
+//	    p.Iterate(func(i int) bool {
+//	        output.WriteString("- " + strconv.Itoa(items[i]) + "\n")
+//	        return false
+//	    })
+//
+//	    // Render page picker
+//	    if p.HasPages() {
+//	        output.WriteString("\n" + pager.Picker(p))
+//	    }
+//
+//	    return output.String()
+//	}
+package pager
+
+import (
+	"errors"
+	"math"
+	"net/url"
+	"strconv"
+	"strings"
+)
+
+var ErrInvalidPageNumber = errors.New("invalid page number")
+
+// PagerIterFn defines a callback to iterate page items.
+type PagerIterFn func(index int) (stop bool)
+
+// New creates a new pager.
+func New(rawURL string, totalItems int, options ...PagerOption) (Pager, error) {
+	u, err := url.Parse(rawURL)
+	if err != nil {
+		return Pager{}, err
+	}
+
+	p := Pager{
+		query:          u.RawQuery,
+		pageQueryParam: DefaultPageQueryParam,
+		pageSize:       DefaultPageSize,
+		page:           1,
+		totalItems:     totalItems,
+	}
+	for _, apply := range options {
+		apply(&p)
+	}
+
+	p.pageCount = int(math.Ceil(float64(p.totalItems) / float64(p.pageSize)))
+
+	rawPage := u.Query().Get(p.pageQueryParam)
+	if rawPage != "" {
+		p.page, _ = strconv.Atoi(rawPage)
+		if p.page == 0 || p.page > p.pageCount {
+			return Pager{}, ErrInvalidPageNumber
+		}
+	}
+
+	return p, nil
+}
+
+// MustNew creates a new pager or panics if there is an error.
+func MustNew(rawURL string, totalItems int, options ...PagerOption) Pager {
+	p, err := New(rawURL, totalItems, options...)
+	if err != nil {
+		panic(err)
+	}
+	return p
+}
+
+// Pager allows paging items.
+type Pager struct {
+	query, pageQueryParam                 string
+	pageSize, page, pageCount, totalItems int
+}
+
+// TotalItems returns the total number of items to paginate.
+func (p Pager) TotalItems() int {
+	return p.totalItems
+}
+
+// PageSize returns the size of each page.
+func (p Pager) PageSize() int {
+	return p.pageSize
+}
+
+// Page returns the current page number.
+func (p Pager) Page() int {
+	return p.page
+}
+
+// PageCount returns the number pages.
+func (p Pager) PageCount() int {
+	return p.pageCount
+}
+
+// Offset returns the index of the first page item.
+func (p Pager) Offset() int {
+	return (p.page - 1) * p.pageSize
+}
+
+// HasPages checks if pager has more than one page.
+func (p Pager) HasPages() bool {
+	return p.pageCount > 1
+}
+
+// GetPageURI returns the URI for a page.
+// An empty string is returned when page doesn't exist.
+func (p Pager) GetPageURI(page int) string {
+	if page < 1 || page > p.PageCount() {
+		return ""
+	}
+
+	values, _ := url.ParseQuery(p.query)
+	values.Set(p.pageQueryParam, strconv.Itoa(page))
+	return "?" + values.Encode()
+}
+
+// PrevPageURI returns the URI path to the previous page.
+// An empty string is returned when current page is the first page.
+func (p Pager) PrevPageURI() string {
+	if p.page == 1 || !p.HasPages() {
+		return ""
+	}
+	return p.GetPageURI(p.page - 1)
+}
+
+// NextPageURI returns the URI path to the next page.
+// An empty string is returned when current page is the last page.
+func (p Pager) NextPageURI() string {
+	if p.page == p.pageCount {
+		// Current page is the last page
+		return ""
+	}
+	return p.GetPageURI(p.page + 1)
+}
+
+// Iterate allows iterating page items.
+func (p Pager) Iterate(fn PagerIterFn) bool {
+	if p.totalItems == 0 {
+		return true
+	}
+
+	start := p.Offset()
+	end := start + p.PageSize()
+	if end > p.totalItems {
+		end = p.totalItems
+	}
+
+	for i := start; i < end; i++ {
+		if fn(i) {
+			return true
+		}
+	}
+	return false
+}
+
+// TODO: Support different types of pickers (ex. with clickable page numbers)
+
+// Picker returns a string with the pager as Markdown.
+// An empty string is returned when the pager has no pages.
+func Picker(p Pager) string {
+	if !p.HasPages() {
+		return ""
+	}
+
+	var out strings.Builder
+
+	if s := p.PrevPageURI(); s != "" {
+		out.WriteString("[«](" + s + ") | ")
+	} else {
+		out.WriteString("\\- | ")
+	}
+
+	out.WriteString("page " + strconv.Itoa(p.Page()) + " of " + strconv.Itoa(p.PageCount()))
+
+	if s := p.NextPageURI(); s != "" {
+		out.WriteString(" | [»](" + s + ")")
+	} else {
+		out.WriteString(" | \\-")
+	}
+
+	return out.String()
+}
diff --git a/examples/gno.land/p/jeronimoalbi/pager/pager_options.gno b/examples/gno.land/p/jeronimoalbi/pager/pager_options.gno
new file mode 100644
index 00000000000..3feb467682b
--- /dev/null
+++ b/examples/gno.land/p/jeronimoalbi/pager/pager_options.gno
@@ -0,0 +1,33 @@
+package pager
+
+import "strings"
+
+const (
+	DefaultPageSize       = 50
+	DefaultPageQueryParam = "page"
+)
+
+// PagerOption configures the pager.
+type PagerOption func(*Pager)
+
+// WithPageSize assigns a page size to a pager.
+func WithPageSize(size int) PagerOption {
+	return func(p *Pager) {
+		if size < 1 {
+			p.pageSize = DefaultPageSize
+		} else {
+			p.pageSize = size
+		}
+	}
+}
+
+// WithPageQueryParam assigns the name of the URL query param for the page value.
+func WithPageQueryParam(name string) PagerOption {
+	return func(p *Pager) {
+		name = strings.TrimSpace(name)
+		if name == "" {
+			name = DefaultPageQueryParam
+		}
+		p.pageQueryParam = name
+	}
+}
diff --git a/examples/gno.land/p/jeronimoalbi/pager/pager_test.gno b/examples/gno.land/p/jeronimoalbi/pager/pager_test.gno
new file mode 100644
index 00000000000..f498079cad3
--- /dev/null
+++ b/examples/gno.land/p/jeronimoalbi/pager/pager_test.gno
@@ -0,0 +1,204 @@
+package pager
+
+import (
+	"testing"
+
+	"gno.land/p/demo/uassert"
+	"gno.land/p/demo/urequire"
+)
+
+func TestPager(t *testing.T) {
+	cases := []struct {
+		name, uri, prevPath, nextPath, param string
+		offset, pageSize, page, pageCount    int
+		hasPages                             bool
+		items                                []int
+		err                                  error
+	}{
+		{
+			name:      "page 1",
+			uri:       "gno.land/r/demo/test:foo/bar?page=1&foo=bar",
+			items:     []int{1, 2, 3, 4, 5, 6},
+			hasPages:  true,
+			nextPath:  "?foo=bar&page=2",
+			pageSize:  5,
+			page:      1,
+			pageCount: 2,
+		},
+		{
+			name:      "page 2",
+			uri:       "gno.land/r/demo/test:foo/bar?page=2&foo=bar",
+			items:     []int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10},
+			hasPages:  true,
+			prevPath:  "?foo=bar&page=1",
+			nextPath:  "",
+			offset:    5,
+			pageSize:  5,
+			page:      2,
+			pageCount: 2,
+		},
+		{
+			name:      "custom query param",
+			uri:       "gno.land/r/demo/test:foo/bar?current=2&foo=bar",
+			items:     []int{1, 2, 3},
+			param:     "current",
+			hasPages:  true,
+			prevPath:  "?current=1&foo=bar",
+			nextPath:  "",
+			offset:    2,
+			pageSize:  2,
+			page:      2,
+			pageCount: 2,
+		},
+		{
+			name: "missing page",
+			uri:  "gno.land/r/demo/test:foo/bar?page=3&foo=bar",
+			err:  ErrInvalidPageNumber,
+		},
+		{
+			name: "invalid page zero",
+			uri:  "gno.land/r/demo/test:foo/bar?page=0",
+			err:  ErrInvalidPageNumber,
+		},
+		{
+			name: "invalid page number",
+			uri:  "gno.land/r/demo/test:foo/bar?page=foo",
+			err:  ErrInvalidPageNumber,
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			// Act
+			p, err := New(tc.uri, len(tc.items), WithPageSize(tc.pageSize), WithPageQueryParam(tc.param))
+
+			// Assert
+			if tc.err != nil {
+				urequire.ErrorIs(t, err, tc.err, "expected an error")
+				return
+			}
+
+			urequire.NoError(t, err, "expect no error")
+			uassert.Equal(t, len(tc.items), p.TotalItems(), "total items")
+			uassert.Equal(t, tc.page, p.Page(), "page number")
+			uassert.Equal(t, tc.pageCount, p.PageCount(), "number of pages")
+			uassert.Equal(t, tc.pageSize, p.PageSize(), "page size")
+			uassert.Equal(t, tc.prevPath, p.PrevPageURI(), "prev URL page")
+			uassert.Equal(t, tc.nextPath, p.NextPageURI(), "next URL page")
+			uassert.Equal(t, tc.hasPages, p.HasPages(), "has pages")
+			uassert.Equal(t, tc.offset, p.Offset(), "item offset")
+		})
+	}
+}
+
+func TestPagerIterate(t *testing.T) {
+	cases := []struct {
+		name, uri   string
+		items, page []int
+		stop        bool
+	}{
+		{
+			name:  "page 1",
+			uri:   "gno.land/r/demo/test:foo/bar?page=1",
+			items: []int{1, 2, 3, 4, 5, 6, 7},
+			page:  []int{1, 2, 3},
+		},
+		{
+			name:  "page 2",
+			uri:   "gno.land/r/demo/test:foo/bar?page=2",
+			items: []int{1, 2, 3, 4, 5, 6, 7},
+			page:  []int{4, 5, 6},
+		},
+		{
+			name:  "page 3",
+			uri:   "gno.land/r/demo/test:foo/bar?page=3",
+			items: []int{1, 2, 3, 4, 5, 6, 7},
+			page:  []int{7},
+		},
+		{
+			name:  "stop iteration",
+			uri:   "gno.land/r/demo/test:foo/bar?page=1",
+			items: []int{1, 2, 3},
+			stop:  true,
+		},
+	}
+
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			// Arrange
+			var (
+				items []int
+				p     = MustNew(tc.uri, len(tc.items), WithPageSize(3))
+			)
+
+			// Act
+			stopped := p.Iterate(func(i int) bool {
+				if tc.stop {
+					return true
+				}
+
+				items = append(items, tc.items[i])
+				return false
+			})
+
+			// Assert
+			uassert.Equal(t, tc.stop, stopped)
+			urequire.Equal(t, len(tc.page), len(items), "expect iteration of the right number of items")
+
+			for i, v := range items {
+				urequire.Equal(t, tc.page[i], v, "expect iterated items to match")
+			}
+		})
+	}
+}
+
+func TestPicker(t *testing.T) {
+	pageSize := 3
+	cases := []struct {
+		name, uri, output string
+		totalItems        int
+	}{
+		{
+			name:       "one page",
+			uri:        "gno.land/r/demo/test:foo/bar?page=1",
+			totalItems: 3,
+			output:     "",
+		},
+		{
+			name:       "two pages",
+			uri:        "gno.land/r/demo/test:foo/bar?page=1",
+			totalItems: 4,
+			output:     "\\- | page 1 of 2 | [»](?page=2)",
+		},
+		{
+			name:       "three pages",
+			uri:        "gno.land/r/demo/test:foo/bar?page=1",
+			totalItems: 7,
+			output:     "\\- | page 1 of 3 | [»](?page=2)",
+		},
+		{
+			name:       "three pages second page",
+			uri:        "gno.land/r/demo/test:foo/bar?page=2",
+			totalItems: 7,
+			output:     "[«](?page=1) | page 2 of 3 | [»](?page=3)",
+		},
+		{
+			name:       "three pages third page",
+			uri:        "gno.land/r/demo/test:foo/bar?page=3",
+			totalItems: 7,
+			output:     "[«](?page=2) | page 3 of 3 | \\-",
+		},
+	}
+	for _, tc := range cases {
+		t.Run(tc.name, func(t *testing.T) {
+			// Arrange
+			p := MustNew(tc.uri, tc.totalItems, WithPageSize(pageSize))
+
+			// Act
+			output := Picker(p)
+
+			// Assert
+			uassert.Equal(t, tc.output, output)
+		})
+	}
+}

From c433aa0c4049fababb0f2c95b7d94105cf81aa7a Mon Sep 17 00:00:00 2001
From: Leon Hudak <33522493+leohhhn@users.noreply.github.com>
Date: Tue, 25 Feb 2025 17:56:48 +0100
Subject: [PATCH 47/47] chore(docs): rm mentions of staging testnet (#3828)

## Description

Removes `staging` from the docs.
---
 docs/concepts/testnets.md                        | 16 ----------------
 docs/reference/gno-js-client/gno-provider.md     |  4 ++--
 docs/reference/network-config.md                 |  1 -
 .../tm2-js-client/Provider/json-rpc-provider.md  |  2 +-
 .../tm2-js-client/Provider/ws-provider.md        | 10 +++++-----
 5 files changed, 8 insertions(+), 25 deletions(-)

diff --git a/docs/concepts/testnets.md b/docs/concepts/testnets.md
index 9769c8f873f..40cf22ed7f0 100644
--- a/docs/concepts/testnets.md
+++ b/docs/concepts/testnets.md
@@ -63,22 +63,6 @@ Test5 was launched in November 2024.
 - **Versioning strategy**:
   - Test5 is to be release-based, following releases of the Gno tech stack.
 
-
-## Staging
-
-Staging is a testnet that is reset once every 60 minutes.
-
-- **Persistence of state:**
-  - State is fully discarded
-- **Timeliness of code:**
-  - With every reset, the latest commit of the Gno tech stack is applied, including
-  the demo packages and realms
-- **Intended purpose**
-  - Demoing, single-use code in a staging environment, testing automation which
-  uploads code to the chain, etc.
-- **Versioning strategy**:
-  - Staging is reset every 60 minutes to match the latest monorepo commit
-
 ## TestX
 
 These testnets are deprecated and currently serve as archives of previous progress.
diff --git a/docs/reference/gno-js-client/gno-provider.md b/docs/reference/gno-js-client/gno-provider.md
index c76bfebfe31..cef6e04eb4a 100644
--- a/docs/reference/gno-js-client/gno-provider.md
+++ b/docs/reference/gno-js-client/gno-provider.md
@@ -20,7 +20,7 @@ Same as [`tm2-js-client` `WSProvider`](../tm2-js-client/Provider/ws-provider.md)
 #### Usage
 
 ```ts
-new GnoWSProvider('ws://staging.gno.land:26657/ws');
+new GnoWSProvider('ws://gno.land:443/ws');
 // provider with WS connection is created
 ```
 
@@ -35,7 +35,7 @@ Same as [`tm2-js-client` `JSONRPCProvider`](../tm2-js-client/Provider/json-rpc-p
 #### Usage
 
 ```ts
-new GnoJSONRPCProvider('http://staging.gno.land:36657');
+new GnoJSONRPCProvider('https://gno.land:443');
 // provider is created
 ```
 
diff --git a/docs/reference/network-config.md b/docs/reference/network-config.md
index 1e50864372b..025f9f3171f 100644
--- a/docs/reference/network-config.md
+++ b/docs/reference/network-config.md
@@ -8,7 +8,6 @@ id: network-config
 |-------------|----------------------------------|---------------|
 | Portal Loop | https://rpc.gno.land:443         | `portal-loop` |
 | Test5       | https://rpc.test5.gno.land:443   | `test5`       |
-| Staging     | https://rpc.staging.gno.land:443 | `staging`     |
 
 ### WebSocket endpoints
 All networks follow the same pattern for websocket connections: 
diff --git a/docs/reference/tm2-js-client/Provider/json-rpc-provider.md b/docs/reference/tm2-js-client/Provider/json-rpc-provider.md
index b7700e1d97c..284b383bd1c 100644
--- a/docs/reference/tm2-js-client/Provider/json-rpc-provider.md
+++ b/docs/reference/tm2-js-client/Provider/json-rpc-provider.md
@@ -17,6 +17,6 @@ Creates a new instance of the JSON-RPC Provider
 #### Usage
 
 ```ts
-new JSONRPCProvider('http://staging.gno.land:36657');
+new JSONRPCProvider('https://gno.land:443');
 // provider is created
 ```
diff --git a/docs/reference/tm2-js-client/Provider/ws-provider.md b/docs/reference/tm2-js-client/Provider/ws-provider.md
index 9d4f2390c28..a2c4fa1d0c0 100644
--- a/docs/reference/tm2-js-client/Provider/ws-provider.md
+++ b/docs/reference/tm2-js-client/Provider/ws-provider.md
@@ -18,7 +18,7 @@ Creates a new instance of the WebSocket Provider
 #### Usage
 
 ```ts
-new WSProvider('ws://staging.gno.land:26657/ws');
+new WSProvider('ws://gno.land:443/ws');
 // provider with WS connection is created
 ```
 
@@ -30,7 +30,7 @@ with the WS provider
 #### Usage
 
 ```ts
-const wsProvider = new WSProvider('ws://staging.gno.land:26657/ws');
+const wsProvider = new WSProvider('ws://gno.land:443/ws');
 
 wsProvider.closeConnection();
 // WS connection is now closed
@@ -52,7 +52,7 @@ Returns **Promise<RPCResponse<Result\>>**
 ```ts
 const request: RPCRequest = // ...
 
-const wsProvider = new WSProvider('ws://staging.gno.land:26657/ws');
+const wsProvider = new WSProvider('ws://gno.land:443/ws');
 
 wsProvider.sendRequest<Result>(request);
 // request is sent over the open WS connection
@@ -73,7 +73,7 @@ Returns **Result**
 ```ts
 const response: RPCResponse = // ...
 
-const wsProvider = new WSProvider('ws://staging.gno.land:26657/ws');
+const wsProvider = new WSProvider('ws://gno.land:443/ws');
 
 wsProvider.parseResponse<Result>(response);
 // response is parsed
@@ -88,7 +88,7 @@ Returns **Promise<null\>**
 #### Usage
 
 ```ts
-const wsProvider = new WSProvider('ws://staging.gno.land:26657/ws');
+const wsProvider = new WSProvider('ws://gno.land:443/ws');
 
 await wsProvider.waitForOpenConnection()
 // status of the connection is: CONNECTED