feat: std.CurrentRealm

gnolang · Jun 16, 2023 · 2937a4c · 2937a4c
1 parent b6dc190
commit 2937a4c
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 4 deletions.
diff --git a/examples/gno.land/p/demo/tests/subtests/subtests.gno b/examples/gno.land/p/demo/tests/subtests/subtests.gno
@@ -4,8 +4,8 @@ import (
 	"std"
 )
 
-func CurrentRealmPath() string {
-	return std.CurrentRealmPath()
+func GetCurrentRealm() std.Realm {
+	return std.CurrentRealm()
 }
 
 func GetPrevRealm() std.Realm {

diff --git a/examples/gno.land/r/demo/tests/subtests/subtests.gno b/examples/gno.land/r/demo/tests/subtests/subtests.gno
@@ -4,8 +4,8 @@ import (
 	"std"
 )
 
-func CurrentRealmPath() string {
-	return std.CurrentRealmPath()
+func GetCurrentRealm() std.Realm {
+	return std.CurrentRealm()
 }
 
 func GetPrevRealm() std.Realm {

diff --git a/gnovm/stdlibs/stdlibs.go b/gnovm/stdlibs/stdlibs.go
@@ -263,6 +263,44 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) {
 				m.PushValue(res0)
 			},
 		)
+		pn.DefineNative("CurrentRealm",
+			gno.Flds( // params
+			),
+			gno.Flds( // results
+				"", "Realm",
+			),
+			func(m *gno.Machine) {
+				var (
+					ctx = m.Context.(ExecContext)
+					// Default lastCaller is OrigCaller, the signer of the tx
+					lastCaller  = ctx.OrigCaller
+					lastPkgPath = ""
+				)
+
+				for i := m.NumFrames() - 1; i > 0; i-- {
+					fr := m.Frames[i]
+					if fr.LastPackage != nil && fr.LastPackage.IsRealm() {
+						lastCaller = fr.LastPackage.GetPkgAddr().Bech32()
+						lastPkgPath = fr.LastPackage.PkgPath
+						break
+					}
+				}
+
+				// Return the result
+				res0 := gno.Go2GnoValue(
+					m.Alloc,
+					m.Store,
+					reflect.ValueOf(Realm{
+						addr:    lastCaller,
+						pkgPath: lastPkgPath,
+					}),
+				)
+
+				realmT := store.GetType(gno.DeclaredTypeID("std", "Realm"))
+				res0.T = realmT
+				m.PushValue(res0)
+			},
+		)
 		pn.DefineNative("PrevRealm",
 			gno.Flds( // params
 			),

diff --git a/gnovm/stdlibs/stdshim/stdshim.gno b/gnovm/stdlibs/stdshim/stdshim.gno
@@ -36,6 +36,14 @@ func GetOrigSend() Coins {
 	return Coins{}
 }
 
+func CurrentRealm() Realm {
+	panic(shimWarn)
+	return Realm{
+		addr:    Address(""),
+		pkgPath: "",
+	}
+}
+
 func PrevRealm() Realm {
 	panic(shimWarn)
 	return Realm{

diff --git a/gnovm/tests/files/zrealm_crossrealm12.gno b/gnovm/tests/files/zrealm_crossrealm12.gno
@@ -0,0 +1,37 @@
+// PKGPATH: gno.land/r/crossrealm_test
+package crossrealm_test
+
+import (
+	"std"
+	"fmt"
+
+	psubtests "gno.land/p/demo/tests/subtests"
+	rsubtests "gno.land/r/demo/tests/subtests"
+)
+
+func main() {
+	tests := []struct{
+		fn func() std.Realm
+	}{
+		{ std.CurrentRealm },
+		{ psubtests.GetCurrentRealm },
+		{ rsubtests.GetCurrentRealm },
+	}
+
+	for _, test := range tests {
+		r := test.fn()
+
+		if std.DerivePkgAddr(r.PkgPath()) != r.Addr() {
+			panic(fmt.Sprintf("ERROR: expected: %v, got: %v",
+				std.DerivePkgAddr(r.PkgPath()), r.Addr(),
+			))
+		}
+
+		println(r.PkgPath(), r.Addr())
+	}
+}
+
+// Output:
+// gno.land/r/crossrealm_test g1vla5mffzum6060t99u4xhm8mnhgxr0sz4k574p
+// gno.land/r/crossrealm_test g1vla5mffzum6060t99u4xhm8mnhgxr0sz4k574p
+// gno.land/r/demo/tests/subtests g13g48xnr7lzxsrvny0uf6lhx0cfaxy4n0n5geuf