chore: use std.PrevRealm() in grc20 and grc721 (gnolang#895)

Doozers · Aug 31, 2023 · f1724e1 · f1724e1
1 parent 04e22fc
commit f1724e1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/examples/gno.land/p/demo/grc/grc20/user_token.gno b/examples/gno.land/p/demo/grc/grc20/user_token.gno
@@ -27,21 +27,21 @@ func (t *userToken) BalanceOf(owner std.Address) (uint64, error) {
 }
 
 func (t *userToken) Transfer(to std.Address, amount uint64) error {
-	owner := std.GetOrigCaller()
-	return t.admin.transfer(owner, to, amount)
+	caller := std.PrevRealm().Addr()
+	return t.admin.transfer(caller, to, amount)
 }
 
 func (t *userToken) Allowance(owner, spender std.Address) (uint64, error) {
 	return t.admin.allowance(owner, spender)
 }
 
 func (t *userToken) Approve(spender std.Address, amount uint64) error {
-	owner := std.GetOrigCaller()
-	return t.admin.approve(owner, spender, amount)
+	caller := std.PrevRealm().Addr()
+	return t.admin.approve(caller, spender, amount)
 }
 
 func (t *userToken) TransferFrom(from, to std.Address, amount uint64) error {
-	spender := std.GetOrigCaller()
+	spender := std.PrevRealm().Addr()
 	if err := t.admin.spendAllowance(from, spender, amount); err != nil {
 		return err
 	}

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
@@ -156,7 +156,7 @@ func TestSetApprovalForAll(t *testing.T) {
 		t.Errorf("should not be nil")
 	}
 
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	isApprovedForAll := dummy.IsApprovedForAll(caller, addr.Resolve())
@@ -193,7 +193,7 @@ func TestApprove(t *testing.T) {
 		t.Errorf("should not be nil")
 	}
 
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	dummy.mint(caller, TokenID("1"))
@@ -223,7 +223,7 @@ func TestTransferFrom(t *testing.T) {
 		t.Errorf("should not be nil")
 	}
 
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	dummy.mint(caller, TokenID("1"))
@@ -268,7 +268,7 @@ func TestSafeTransferFrom(t *testing.T) {
 		t.Errorf("should not be nil")
 	}
 
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")
 
 	dummy.mint(caller, TokenID("1"))

diff --git a/examples/gno.land/r/demo/foo20/foo20.gno b/examples/gno.land/r/demo/foo20/foo20.gno
@@ -48,17 +48,17 @@ func Allowance(owner, spender users.AddressOrName) uint64 {
 // setters.
 
 func Transfer(to users.AddressOrName, amount uint64) {
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	foo.Transfer(caller, to.Resolve(), amount)
 }
 
 func Approve(spender users.AddressOrName, amount uint64) {
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	foo.Approve(caller, spender.Resolve(), amount)
 }
 
 func TransferFrom(from, to users.AddressOrName, amount uint64) {
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	foo.TransferFrom(caller, from.Resolve(), to.Resolve(), amount)
 }
 
@@ -67,20 +67,20 @@ func TransferFrom(from, to users.AddressOrName, amount uint64) {
 func Faucet() {
 	// FIXME: add limits?
 	// FIXME: add payment in gnot?
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	foo.Mint(caller, 1000*10000) // 1k
 }
 
 // administration.
 
 func Mint(address users.AddressOrName, amount uint64) {
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	assertIsAdmin(caller)
 	foo.Mint(address.Resolve(), amount)
 }
 
 func Burn(address users.AddressOrName, amount uint64) {
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	assertIsAdmin(caller)
 	foo.Burn(address.Resolve(), amount)
 }

diff --git a/examples/gno.land/r/demo/foo721/foo721.gno b/examples/gno.land/r/demo/foo721/foo721.gno
@@ -85,7 +85,7 @@ func TransferFrom(from, to users.AddressOrName, tid grc721.TokenID) {
 // Admin
 
 func Mint(to users.AddressOrName, tid grc721.TokenID) {
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	assertIsAdmin(caller)
 	err := foo.Mint(to.Resolve(), tid)
 	if err != nil {
@@ -94,7 +94,7 @@ func Mint(to users.AddressOrName, tid grc721.TokenID) {
 }
 
 func Burn(tid grc721.TokenID) {
-	caller := std.GetOrigCaller()
+	caller := std.PrevRealm().Addr()
 	assertIsAdmin(caller)
 	err := foo.Burn(tid)
 	if err != nil {