Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: improve the std API #848

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions examples/gno.land/p/demo/grc/exts/vault/vault.gno
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ type userVault struct {
}

func (v *impl) Deposit(amount uint, recover std.Address, lockDuration uint) error {
caller := std.GetOrigCaller()
pkgAddr := std.GetOrigPkgAddr()
caller := std.OrigCaller()
pkgAddr := std.OrigPkgAddr()

uv := userVault{
lockDuration: lockDuration,
Expand All @@ -60,7 +60,7 @@ func (v *impl) Deposit(amount uint, recover std.Address, lockDuration uint) erro
}

func (v *impl) Unvault(amount uint) error {
caller := std.GetOrigCaller()
caller := std.OrigCaller()
uv, err := v.getUserVault(caller)
if err != nil {
return err
Expand All @@ -74,24 +74,24 @@ func (v *impl) Unvault(amount uint) error {
return grc20.ErrInsufficientBalance
}

println("AAA1", std.GetHeight(), uv.redeemMinHeight, uv.lockDuration)
uv.redeemMinHeight = std.GetHeight() + int64(uv.lockDuration)
println("AAA1", std.Height(), uv.redeemMinHeight, uv.lockDuration)
uv.redeemMinHeight = std.Height() + int64(uv.lockDuration)
uv.unvaultedAmount += amount
v.users.Set(caller.String(), uv)
println("AAA2", std.GetHeight(), uv.redeemMinHeight, uv.lockDuration)
println("AAA2", std.Height(), uv.redeemMinHeight, uv.lockDuration)
return nil
}

func (v *impl) Redeem() error {
pkgAddr := std.GetOrigPkgAddr()
caller := std.GetOrigCaller()
pkgAddr := std.OrigPkgAddr()
caller := std.OrigCaller()
uv, err := v.getUserVault(caller)
if err != nil {
return err
}

println("AAA3", std.GetHeight(), uv.redeemMinHeight, uv.lockDuration)
if std.GetHeight() < uv.redeemMinHeight {
println("AAA3", std.Height(), uv.redeemMinHeight, uv.lockDuration)
if std.Height() < uv.redeemMinHeight {
return ErrTooEarlyToRedeem
}
// TODO: check balance. (should be optional, but let's be sure).
Expand Down
4 changes: 2 additions & 2 deletions examples/gno.land/p/demo/grc/exts/vault/vault_filetest.gno
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ func main() {
alice := testutils.TestAddress("alice")
bob := testutils.TestAddress("bob") // recovery request address (cold wallet).
charly := testutils.TestAddress("charly") // recovery dest.
pkgaddr := std.GetOrigPkgAddr()
pkgaddr := std.OrigPkgAddr()

// create a fooAdminToken + fooToken (GRC20) pair.
fooAdminToken := grc20.NewAdminToken("Foo", "FOO", 4)
Expand All @@ -28,7 +28,7 @@ func main() {
pkgBalance, _ := fooToken.BalanceOf(pkgaddr)
println(ufmt.Sprintf(
"balances: alice=%d, bob=%d, charly=%d, pkg=%d, height=%d",
aliceBalance, bobBalance, charlyBalance, pkgBalance, std.GetHeight(),
aliceBalance, bobBalance, charlyBalance, pkgBalance, std.Height(),
))
}

Expand Down
20 changes: 10 additions & 10 deletions examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token.gno
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (s *basicGRC1155Token) SetApprovalForAll(operator std.Address, approved boo
return ErrInvalidAddress
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
return s.setApprovalForAll(caller, operator, approved)
}

Expand All @@ -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.OrigCaller()
if !s.IsApprovedForAll(caller, from) {
return ErrCallerIsNotOwnerOrApproved
}
Expand All @@ -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.OrigCaller()
if !s.IsApprovedForAll(caller, from) {
return ErrCallerIsNotOwnerOrApproved
}
Expand All @@ -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.OrigCaller()

err := s.mintBatch(to, []TokenID{tid}, []uint64{amount})
if err != nil {
Expand All @@ -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.OrigCaller()

err := s.mintBatch(to, batch, amounts)
if err != nil {
Expand All @@ -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.OrigCaller()

err := s.burnBatch(from, []TokenID{tid}, []uint64{amount})
if err != nil {
Expand All @@ -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.OrigCaller()

err := s.burnBatch(from, batch, amounts)
if err != nil {
Expand Down Expand Up @@ -225,7 +225,7 @@ func (s *basicGRC1155Token) safeBatchTransferFrom(from, to std.Address, batch []
return ErrCannotTransferToSelf
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
s.beforeTokenTransfer(caller, from, to, batch, amounts)

for i := 0; i < len(batch); i++ {
Expand Down Expand Up @@ -265,7 +265,7 @@ func (s *basicGRC1155Token) mintBatch(to std.Address, batch []TokenID, amounts [
return ErrInvalidAddress
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
s.beforeTokenTransfer(caller, zeroAddress, to, batch, amounts)

for i := 0; i < len(batch); i++ {
Expand Down Expand Up @@ -294,7 +294,7 @@ func (s *basicGRC1155Token) burnBatch(from std.Address, batch []TokenID, amounts
return ErrInvalidAddress
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
s.beforeTokenTransfer(caller, from, zeroAddress, batch, amounts)

for i := 0; i < len(batch); i++ {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func TestSetApprovalForAll(t *testing.T) {
t.Errorf("should not be nil")
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()

isApprovedForAll := dummy.IsApprovedForAll(caller, addr)
Expand Down Expand Up @@ -176,7 +176,7 @@ func TestSafeTransferFrom(t *testing.T) {
t.Errorf("should not be nil")
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()

tid := TokenID("1")
Expand Down Expand Up @@ -223,7 +223,7 @@ func TestSafeBatchTransferFrom(t *testing.T) {
t.Errorf("should not be nil")
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm").Resolve()

tid1 := TokenID("1")
Expand Down
6 changes: 3 additions & 3 deletions examples/gno.land/p/demo/grc/grc20/user_token.gno
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ func (t *userToken) BalanceOf(owner std.Address) (uint64, error) {
}

func (t *userToken) Transfer(to std.Address, amount uint64) error {
owner := std.GetOrigCaller()
owner := std.OrigCaller()
return t.admin.transfer(owner, to, amount)
}

Expand All @@ -36,12 +36,12 @@ func (t *userToken) Allowance(owner, spender std.Address) (uint64, error) {
}

func (t *userToken) Approve(spender std.Address, amount uint64) error {
owner := std.GetOrigCaller()
owner := std.OrigCaller()
return t.admin.approve(owner, spender, amount)
}

func (t *userToken) TransferFrom(from, to std.Address, amount uint64) error {
spender := std.GetOrigCaller()
spender := std.OrigCaller()
if err := t.admin.spendAllowance(from, spender, amount); err != nil {
return err
}
Expand Down
8 changes: 4 additions & 4 deletions examples/gno.land/p/demo/grc/grc721/basic_nft.gno
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ func (s *basicNFT) Approve(to std.Address, tid TokenID) error {
return ErrApprovalToCurrentOwner
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
if caller != owner && !s.IsApprovedForAll(owner, caller) {
return ErrCallerIsNotOwnerOrApproved
}
Expand Down Expand Up @@ -123,15 +123,15 @@ func (s *basicNFT) SetApprovalForAll(operator std.Address, approved bool) error
return ErrInvalidAddress
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
return s.setApprovalForAll(caller, operator, approved)
}

// Safely transfers `tokenId` token from `from` to `to`, checking that
// 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.GetOrigCaller()
caller := std.OrigCaller()
if !s.isApprovedOrOwner(caller, tid) {
return ErrCallerIsNotOwnerOrApproved
}
Expand All @@ -150,7 +150,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.GetOrigCaller()
caller := std.OrigCaller()
if !s.isApprovedOrOwner(caller, tid) {
return ErrCallerIsNotOwnerOrApproved
}
Expand Down
8 changes: 4 additions & 4 deletions examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ func TestSetApprovalForAll(t *testing.T) {
t.Errorf("should not be nil")
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")

isApprovedForAll := dummy.IsApprovedForAll(caller, addr.Resolve())
Expand Down Expand Up @@ -193,7 +193,7 @@ func TestApprove(t *testing.T) {
t.Errorf("should not be nil")
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")

dummy.mint(caller, TokenID("1"))
Expand Down Expand Up @@ -223,7 +223,7 @@ func TestTransferFrom(t *testing.T) {
t.Errorf("should not be nil")
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")

dummy.mint(caller, TokenID("1"))
Expand Down Expand Up @@ -268,7 +268,7 @@ func TestSafeTransferFrom(t *testing.T) {
t.Errorf("should not be nil")
}

caller := std.GetOrigCaller()
caller := std.OrigCaller()
addr := users.AddressOrName("g1var589z07ppjsjd24ukm4uguzwdt0tw7g47cgm")

dummy.mint(caller, TokenID("1"))
Expand Down
6 changes: 3 additions & 3 deletions examples/gno.land/p/demo/rand/rand.gno
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,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.Height()
i.djb2Int64(height)
}

Expand Down
2 changes: 1 addition & 1 deletion examples/gno.land/p/demo/testutils/misc.gno
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package testutils

// For testing std.GetCallerAt().
// For testing std.CallerAt().
func WrapCall(fn func()) {
fn()
}
2 changes: 1 addition & 1 deletion examples/gno.land/r/demo/art/gnoface/gnoface.gno
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
)

func Render(path string) string {
seed := std.GetHeight()
seed := std.Height()

path = strings.TrimSpace(path)
if path != "" {
Expand Down
12 changes: 6 additions & 6 deletions examples/gno.land/r/demo/banktest/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ realm and non-realm package boundaries (in the call stack).
// 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.OrigCaller()
send := std.Coins{{returnDenom, returnAmount}}
```

Expand All @@ -64,7 +64,7 @@ message.
// record activity
act := &activity{
caller: caller,
sent: std.GetOrigSend(),
sent: std.OrigSend(),
returned: send,
time: time.Now(),
}
Expand All @@ -84,13 +84,13 @@ Updating the "latest" array for viewing at gno.land/r/banktest: (w/ trailing col
If the user requested the return of coins...

```go
banker := std.GetBanker(std.BankerTypeOrigSend)
banker := std.Banker(std.BankerTypeOrigSend)
```

use a std.Banker instance to return any deposited coins to the original sender.

```go
pkgaddr := std.GetOrigPkgAddr()
pkgaddr := std.OrigPkgAddr()
// TODO: use std.Coins constructors, this isn't generally safe.
banker.SendCoins(pkgaddr, caller, send)
return "returned!"
Expand All @@ -104,8 +104,8 @@ Finally, the results are rendered via an ABCI query call when you visit [/r/bank
```go
func Render(path string) string {
// get realm coins.
banker := std.GetBanker(std.BankerTypeReadonly)
coins := banker.GetCoins(std.GetOrigPkgAddr())
banker := std.Banker(std.BankerTypeReadonly)
coins := banker.Coins(std.OrigPkgAddr())

// render
res := ""
Expand Down
Loading