apply PrevRealm()

gnovm/stdlibs/internal/std/frame.gno

@@ -0,0 +1,18 @@
+package std
+
+type Realm struct {
+	addr    Address
+	pkgPath string
+}
+
+func (r Realm) Addr() Address {
+	return r.addr
+}
+
+func (r Realm) PkgPath() string {
+	return r.pkgPath
+}
+
+func (r Realm) IsUser() bool {
+	return r.pkgPath == ""
+}

gnovm/stdlibs/std/banker.gno

@@ -68,13 +68,17 @@ func (ba bankAdapter) TotalCoin(denom string) int64 {
 }
 
 func (ba bankAdapter) IssueCoin(addr Address, denom string, amount int64) {
-	// XXX apply PrevRealm.PkgPath,  https://github.com/gnolang/gno/pull/667
-
 	// Similar to ibc ==> "ibc/" + sha256('path' + 'base_denom')
-	// "realm/" + sha256('pkg_path' + 'base_denom')
+	// "realm/" + sha256('pkg_path' + '/' +  'base_denom')
+
+	prev := istd.PrevRealm()
 
-	// from := std.PrevRealm().PkgPath
-	from := istd.GetOrigCaller().String()
+	var from string
+	if prev.IsUser() {
+		from = string(prev.Addr())
+	} else {
+		from = prev.PkgPath()
+	}
 	to_hash := from + "/" + denom
 
 	hash := sha256.Sum256([]byte(to_hash))[:]

gnovm/stdlibs/stdlibs.go

@@ -143,26 +143,61 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) {
 		pn.DefineGoNativeValue("IntSize", strconv.IntSize)
 		pn.DefineGoNativeValue("AppendUint", strconv.AppendUint)
 	case "internal/std":
-		pn.DefineNative("GetOrigCaller",
+		pn.DefineNative("PrevRealm",
 			gno.Flds( // params
 			),
 			gno.Flds( // results
-				"", "Address",
+				"", "Realm",
 			),
 			func(m *gno.Machine) {
-				ctx := m.Context.(ExecContext)
+				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() {
+						// Ignore non-realm frame
+						continue
+					}
+					pkgPath := fr.LastPackage.PkgPath
+					// The first realm we encounter will be the one calling
+					// this function; to get the calling realm determine the first frame
+					// where fr.LastPackage changes.
+					if lastPkgPath == "" {
+						lastPkgPath = pkgPath
+					} else if lastPkgPath == pkgPath {
+						continue
+					} else {
+						lastCaller = fr.LastPackage.GetPkgAddr().Bech32()
+						lastPkgPath = pkgPath
+						break
+					}
+				}
+
+				// Empty the pkgPath if we return a user
+				if ctx.OrigCaller == lastCaller {
+					lastPkgPath = ""
+				}
+
+				// Return the result
 				res0 := gno.Go2GnoValue(
 					m.Alloc,
 					m.Store,
-					reflect.ValueOf(ctx.OrigCaller),
+					reflect.ValueOf(Realm{
+						addr:    lastCaller,
+						pkgPath: lastPkgPath,
+					}),
 				)
-				addrT := store.GetType(gno.DeclaredTypeID("std", "Address"))
-				res0.T = addrT
+
+				realmT := store.GetType(gno.DeclaredTypeID("std", "Realm"))
+				res0.T = realmT
 				m.PushValue(res0)
 			},
 		)
-
-		// XXX PrevRealm() https://github.com/gnolang/gno/pull/667
 	case "std":
 		// NOTE: some of these are overridden in tests/imports.go
 		// Also see stdlibs/InjectPackage.