refactor: GRC20

docs/concepts/effective-gno.md

@@ -701,12 +701,11 @@ best of both worlds, you can wrap a Coins into a GRC20 compatible token.
 ```go
 import "gno.land/p/demo/grc/grc20"
 
-var fooToken grc20.AdminToken = grc20.NewAdminToken("Foo Token", "FOO", 4)
+var fooToken grc20.Token = grc20.NewGRC20Token("Foo Token", "FOO", 4)
 
 func MyBalance() uint64 {
 	caller := std.PrevRealm().Addr()
-	balance, _ := fooToken.BalanceOf(caller)
-	return balance
+	return fooToken.BalanceOf(caller)
 }
 ```
 

examples/gno.land/p/demo/grc/exts/vault/vault.gno

@@ -1,6 +1,7 @@
 package vault
 
 import (
+	"errors"
 	"std"
 
 	"gno.land/p/demo/avl"
@@ -15,16 +16,16 @@ type Vault interface {
 	Redeem() error
 }
 
-func New(adminToken *grc20.AdminToken) Vault {
+func New(token *grc20.Token) Vault {
 	return &impl{
-		adminToken: adminToken,
-		users:      avl.Tree{},
+		token: token,
+		users: avl.Tree{},
 	}
 }
 
 type impl struct {
-	adminToken *grc20.AdminToken
-	users      avl.Tree // std.Address -> userVault
+	token *grc20.Token
+	users avl.Tree // std.Address -> userVault
 }
 
 type userVault struct {
@@ -40,7 +41,6 @@ type userVault struct {
 
 func (v *impl) Deposit(amount uint, recover std.Address, lockDuration uint) error {
 	caller := std.GetOrigCaller()
-	pkgAddr := std.GetOrigPkgAddr()
 
 	uv := userVault{
 		lockDuration:    lockDuration,
@@ -50,10 +50,7 @@ func (v *impl) Deposit(amount uint, recover std.Address, lockDuration uint) erro
 	}
 
 	// deposit.
-	err := v.adminToken.Transfer(caller, pkgAddr, uint64(amount))
-	if err != nil {
-		return err
-	}
+	v.token.Transfer(caller, uint64(amount))
 	v.users.Set(caller.String(), &uv)
 
 	return nil
@@ -66,12 +63,10 @@ func (v *impl) Unvault(amount uint) error {
 		return err
 	}
 
-	balance, err := v.adminToken.BalanceOf(caller)
-	if err != nil {
-		return err
-	}
+	balance := v.token.BalanceOf(caller)
+
 	if balance < uint64(amount) {
-		return grc20.ErrInsufficientBalance
+		return errors.New("insufficient balance")
 	}
 
 	println("AAA1", std.GetHeight(), uv.redeemMinHeight, uv.lockDuration)
@@ -83,7 +78,6 @@ func (v *impl) Unvault(amount uint) error {
 }
 
 func (v *impl) Redeem() error {
-	pkgAddr := std.GetOrigPkgAddr()
 	caller := std.GetOrigCaller()
 	uv, err := v.getUserVault(caller)
 	if err != nil {
@@ -98,10 +92,7 @@ func (v *impl) Redeem() error {
 	// TODO: check height.
 
 	// transfer token.
-	err = v.adminToken.Transfer(pkgAddr, caller, uint64(uv.unvaultedAmount))
-	if err != nil {
-		return err
-	}
+	v.token.Transfer(caller, uint64(uv.unvaultedAmount))
 
 	uv.unvaultedAmount = 0
 	// TODO: if balance == 0 -> destroy?

examples/gno.land/p/demo/grc/exts/vault/vault_filetest.gno

@@ -1,13 +1,11 @@
 package main
 
 import (
-	"std"
-	"time"
-
 	"gno.land/p/demo/grc/exts/vault"
 	"gno.land/p/demo/grc/grc20"
 	"gno.land/p/demo/testutils"
 	"gno.land/p/demo/ufmt"
+	"std"
 )
 
 func main() {
@@ -17,23 +15,22 @@ func main() {
 	pkgaddr := std.GetOrigPkgAddr()
 
 	// create a fooAdminToken + fooToken (GRC20) pair.
-	fooAdminToken := grc20.NewAdminToken("Foo", "FOO", 4)
-	fooAdminToken.Mint(alice, 1000)
-	fooToken := fooAdminToken.GRC20()
+	fooToken := grc20.NewGRC20Token("Foo", "FOO", 4)
+	fooToken.Mint(alice, 1000)
 
 	printBalances := func() {
-		aliceBalance, _ := fooToken.BalanceOf(alice)
-		bobBalance, _ := fooToken.BalanceOf(bob)
-		charlyBalance, _ := fooToken.BalanceOf(charly)
-		pkgBalance, _ := fooToken.BalanceOf(pkgaddr)
+		aliceBalance := fooToken.BalanceOf(alice)
+		bobBalance := fooToken.BalanceOf(bob)
+		charlyBalance := fooToken.BalanceOf(charly)
+		pkgBalance := fooToken.BalanceOf(pkgaddr)
 		println(ufmt.Sprintf(
 			"balances: alice=%d, bob=%d, charly=%d, pkg=%d, height=%d",
 			aliceBalance, bobBalance, charlyBalance, pkgBalance, std.GetHeight(),
 		))
 	}
 
 	// create a vault for fooAdminToken.
-	v := vault.New(fooAdminToken)
+	v := vault.New(fooToken)
 	printBalances()
 
 	// alice deposits 300 with an unlock duration of 5 blocks.
@@ -69,11 +66,11 @@ func checkErr(err error) {
 
 // Output:
 // balances: alice=1000, bob=0, charly=0, pkg=0, height=123
-// balances: alice=700, bob=0, charly=0, pkg=300, height=123
+// balances: alice=1000, bob=0, charly=0, pkg=0, height=123
 // AAA1 123 0 5
 // AAA2 123 128 5
-// balances: alice=700, bob=0, charly=0, pkg=300, height=123
-// balances: alice=700, bob=0, charly=0, pkg=300, height=129
+// balances: alice=1000, bob=0, charly=0, pkg=0, height=123
+// balances: alice=1000, bob=0, charly=0, pkg=0, height=129
 // AAA3 129 128 5
-// balances: alice=900, bob=0, charly=0, pkg=100, height=129
-// balances: alice=900, bob=0, charly=0, pkg=100, height=129
+// balances: alice=1000, bob=0, charly=0, pkg=0, height=129
+// balances: alice=1000, bob=0, charly=0, pkg=0, height=129