diff --git a/examples/gno.land/r/demo/grc20reg/grc20reg.gno b/examples/gno.land/r/demo/grc20reg/grc20reg.gno index 56a2969a525..f09063ee6bd 100644 --- a/examples/gno.land/r/demo/grc20reg/grc20reg.gno +++ b/examples/gno.land/r/demo/grc20reg/grc20reg.gno @@ -24,7 +24,7 @@ func Register(tokenGetter grc20.TokenGetter, slug string) { } func RegisterWithTokenhub(tokenGetter grc20.TokenGetter, key string) { - prevRealmPath := std.PrevRealm().PkgPath() + prevRealmPath := std.PreviousRealm().PkgPath() if prevRealmPath != "gno.land/r/matijamarjanovic/tokenhub" { return } diff --git a/examples/gno.land/r/matijamarjanovic/gnoxchange/gnoxchange_test.gno b/examples/gno.land/r/matijamarjanovic/gnoxchange/gnoxchange_test.gno index 63102c6650e..53c9ef5a087 100644 --- a/examples/gno.land/r/matijamarjanovic/gnoxchange/gnoxchange_test.gno +++ b/examples/gno.land/r/matijamarjanovic/gnoxchange/gnoxchange_test.gno @@ -19,8 +19,8 @@ func TestCreatePool(t *testing.T) { tokenhub.RegisterToken(tokenA.Getter(), "test_token_a") tokenhub.RegisterToken(tokenB.Getter(), "test_token_b") - ledgerA.Mint(std.CurrentRealm().Addr(), 10000) - ledgerB.Mint(std.CurrentRealm().Addr(), 10000) + ledgerA.Mint(std.CurrentRealm().Address(), 10000) + ledgerB.Mint(std.CurrentRealm().Address(), 10000) _, err := CreatePool("gno.land/r/test/pools.test_token_a", "gno.land/r/test/pools.test_token_b", 1000, 1000) uassert.Error(t, err, "Should fail with identical tokens") @@ -58,8 +58,8 @@ func TestAddLiquidity(t *testing.T) { tokenhub.RegisterToken(tokenA.Getter(), "test_token_a2") tokenhub.RegisterToken(tokenB.Getter(), "test_token_b2") - ledgerA.Mint(std.CurrentRealm().Addr(), 10000) - ledgerB.Mint(std.CurrentRealm().Addr(), 10000) + ledgerA.Mint(std.CurrentRealm().Address(), 10000) + ledgerB.Mint(std.CurrentRealm().Address(), 10000) tellerA := tokenA.CallerTeller() tellerB := tokenB.CallerTeller() @@ -102,8 +102,8 @@ func TestWithdrawLiquidity(t *testing.T) { tokenhub.RegisterToken(tokenA.Getter(), "test_token_a3") tokenhub.RegisterToken(tokenB.Getter(), "test_token_b3") - ledgerA.Mint(std.CurrentRealm().Addr(), 10000) - ledgerB.Mint(std.CurrentRealm().Addr(), 10000) + ledgerA.Mint(std.CurrentRealm().Address(), 10000) + ledgerB.Mint(std.CurrentRealm().Address(), 10000) tellerA := tokenA.CallerTeller() tellerB := tokenB.CallerTeller() @@ -120,7 +120,7 @@ func TestWithdrawLiquidity(t *testing.T) { urequire.True(t, exists, "Pool should exist") pool := poolInterface.(*Pool) - initialLPBalance := pool.GetLPBalance(std.CurrentRealm().Addr()) + initialLPBalance := pool.GetLPBalance(std.CurrentRealm().Address()) uassert.True(t, initialLPBalance > 0, "Should have LP tokens") _, _, err = WithdrawLiquidity(poolKey, initialLPBalance+1) @@ -131,7 +131,7 @@ func TestWithdrawLiquidity(t *testing.T) { uassert.Equal(t, uint64(500), amountA) uassert.Equal(t, uint64(500), amountB) - newLPBalance := pool.GetLPBalance(std.CurrentRealm().Addr()) + newLPBalance := pool.GetLPBalance(std.CurrentRealm().Address()) uassert.Equal(t, initialLPBalance/2, newLPBalance) } @@ -143,8 +143,8 @@ func TestPoolRegistry(t *testing.T) { tokenhub.RegisterToken(tokenA.Getter(), "test_token_a4") tokenhub.RegisterToken(tokenB.Getter(), "test_token_b4") - ledgerA.Mint(std.CurrentRealm().Addr(), 10000) - ledgerB.Mint(std.CurrentRealm().Addr(), 10000) + ledgerA.Mint(std.CurrentRealm().Address(), 10000) + ledgerB.Mint(std.CurrentRealm().Address(), 10000) tellerA := tokenA.CallerTeller() tellerB := tokenB.CallerTeller() @@ -216,7 +216,7 @@ func TestCreateTokenToCoinTicket(t *testing.T) { token, ledger := grc20.NewToken("Test Token", "TT", 6) tokenhub.RegisterToken(token.Getter(), "test_token") - ledger.Mint(std.CurrentRealm().Addr(), 10000) + ledger.Mint(std.CurrentRealm().Address(), 10000) _, err := CreateTokenToCoinTicket("gno.land/r/test/tickets.test_token", "ugnot", 1000, 1000, 24) uassert.Error(t, err, "Should fail without approval") @@ -243,7 +243,7 @@ func TestCreateTokenToTokenTicket(t *testing.T) { tokenhub.RegisterToken(tokenA.Getter(), "test_token_a") tokenhub.RegisterToken(tokenB.Getter(), "test_token_b") - ledgerA.Mint(std.CurrentRealm().Addr(), 10000) + ledgerA.Mint(std.CurrentRealm().Address(), 10000) tellerA := tokenA.CallerTeller() err := tellerA.Approve(std.DerivePkgAddr("gno.land/r/matijamarjanovic/gnoxchange"), 1000) @@ -272,8 +272,8 @@ func TestFulfillTicket(t *testing.T) { tokenhub.RegisterToken(tokenA.Getter(), "test_token_a") tokenhub.RegisterToken(tokenB.Getter(), "test_token_b") - ledgerA.Mint(std.CurrentRealm().Addr(), 10000) - ledgerB.Mint(std.CurrentRealm().Addr(), 10000) + ledgerA.Mint(std.CurrentRealm().Address(), 10000) + ledgerB.Mint(std.CurrentRealm().Address(), 10000) tellerA := tokenA.CallerTeller() err := tellerA.Approve(std.DerivePkgAddr("gno.land/r/matijamarjanovic/gnoxchange"), 1000) @@ -289,8 +289,8 @@ func TestFulfillTicket(t *testing.T) { urequire.NoError(t, err) std.TestSetRealm(std.NewCodeRealm("gno.land/r/test/tickets2")) - ledgerA.Mint(std.CurrentRealm().Addr(), 10000) - ledgerB.Mint(std.CurrentRealm().Addr(), 10000) + ledgerA.Mint(std.CurrentRealm().Address(), 10000) + ledgerB.Mint(std.CurrentRealm().Address(), 10000) err = tellerA.Approve(std.DerivePkgAddr("gno.land/r/matijamarjanovic/gnoxchange"), 1000) err = FulfillTicket(ticketID, 500) @@ -313,7 +313,7 @@ func TestCancelTicket(t *testing.T) { token, ledger := grc20.NewToken("Test Token", "TT", 6) tokenhub.RegisterToken(token.Getter(), "test_token") - ledger.Mint(std.CurrentRealm().Addr(), 10000) + ledger.Mint(std.CurrentRealm().Address(), 10000) teller := token.CallerTeller() err := teller.Approve(std.DerivePkgAddr("gno.land/r/matijamarjanovic/gnoxchange"), 1000) @@ -358,7 +358,7 @@ func TestCreateNFTToTokenTicket(t *testing.T) { } { - err := nft.Mint(std.CurrentRealm().Addr(), "2") + err := nft.Mint(std.CurrentRealm().Address(), "2") urequire.NoError(t, err) _, err = CreateNFTToTokenTicket( @@ -397,7 +397,7 @@ func TestCreateNFTToCoinTicket(t *testing.T) { } { - err := nft.Mint(std.CurrentRealm().Addr(), "2") + err := nft.Mint(std.CurrentRealm().Address(), "2") tokenhub.RegisterNFT(nft.Getter(), "test_nft", "2") urequire.NoError(t, err) @@ -435,7 +435,7 @@ func TestBuyNFT(t *testing.T) { contractAddr := std.DerivePkgAddr("gno.land/r/matijamarjanovic/gnoxchange") - err := nft.Mint(std.CurrentRealm().Addr(), "1") + err := nft.Mint(std.CurrentRealm().Address(), "1") tokenhub.RegisterNFT(nft.Getter(), "test_nft", "1") urequire.NoError(t, err) @@ -458,7 +458,7 @@ func TestBuyNFT(t *testing.T) { } { - ledger.Mint(std.CurrentRealm().Addr(), 2000) + ledger.Mint(std.CurrentRealm().Address(), 2000) teller := token.CallerTeller() err = teller.Approve(contractAddr, 1000) urequire.NoError(t, err) @@ -468,7 +468,7 @@ func TestBuyNFT(t *testing.T) { owner, err := nft.OwnerOf("1") urequire.NoError(t, err) - uassert.Equal(t, std.CurrentRealm().Addr(), owner, "NFT should be transferred to buyer") + uassert.Equal(t, std.CurrentRealm().Address(), owner, "NFT should be transferred to buyer") ticket, err := GetTicket(ticketID) urequire.NoError(t, err) diff --git a/examples/gno.land/r/matijamarjanovic/gnoxchange/nftmarket.gno b/examples/gno.land/r/matijamarjanovic/gnoxchange/nftmarket.gno index fa4bd798185..c6af6ddc9df 100644 --- a/examples/gno.land/r/matijamarjanovic/gnoxchange/nftmarket.gno +++ b/examples/gno.land/r/matijamarjanovic/gnoxchange/nftmarket.gno @@ -19,7 +19,7 @@ func CreateNFTToTokenTicket( minAmountOut uint64, // minimum amount of tokens to receive expiryHours int64, ) (string, error) { - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() parts := strings.Split(nftFullPath, ".") if len(parts) < 4 { @@ -46,7 +46,7 @@ func CreateNFTToTokenTicket( return "", errors.New("token not found: " + tokenKey) } - if err := nft.TransferFrom(caller, std.CurrentRealm().Addr(), grc721.TokenID(tokenID)); err != nil { + if err := nft.TransferFrom(caller, std.CurrentRealm().Address(), grc721.TokenID(tokenID)); err != nil { return "", errors.New("failed to transfer NFT: " + err.Error()) } @@ -76,7 +76,7 @@ func CreateNFTToCoinTicket( minAmountOut uint64, // minimum amount of coins to receive expiryHours int64, ) (string, error) { - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() parts := strings.Split(nftFullPath, ".") if len(parts) < 4 { @@ -98,7 +98,7 @@ func CreateNFTToCoinTicket( return "", errors.New("caller is not the owner of the NFT") } - if err := nft.TransferFrom(caller, std.CurrentRealm().Addr(), grc721.TokenID(tokenID)); err != nil { + if err := nft.TransferFrom(caller, std.CurrentRealm().Address(), grc721.TokenID(tokenID)); err != nil { return "", errors.New("failed to transfer NFT: " + err.Error()) } @@ -124,7 +124,7 @@ func CreateNFTToCoinTicket( // BuyNFT allows a user to fulfill an NFT ticket by paying with tokens or coins. // It functions on the same principle as the fulfillTicket function. func BuyNFT(ticketID string, amountOut uint64) error { - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() ticketInterface, exists := ticketRegistry.openNFTTickets.Get(ticketID) if !exists { @@ -152,13 +152,13 @@ func BuyNFT(ticketID string, amountOut uint64) error { } if ticket.AssetOut.Type == AssetTypeCoin { - sent := std.GetOrigSend() + sent := std.OriginSend() if len(sent) != 1 || sent[0].Denom != ticket.AssetOut.Denom || uint64(sent[0].Amount) != amountOut { return errors.New("sent coins don't match payment parameters") } - banker := std.GetBanker(std.BankerTypeRealmSend) - banker.SendCoins(std.CurrentRealm().Addr(), ticket.Creator, sent) + banker := std.NewBanker(std.BankerTypeRealmSend) + banker.SendCoins(std.CurrentRealm().Address(), ticket.Creator, sent) } else { tokenOut := tokenhub.GetToken(ticket.AssetOut.Token) if tokenOut == nil { @@ -173,7 +173,7 @@ func BuyNFT(ticketID string, amountOut uint64) error { nftKeyParts := strings.Split(ticket.AssetIn.NFTPath, ".") tokenID := nftKeyParts[len(nftKeyParts)-1] - if err := nft.TransferFrom(std.CurrentRealm().Addr(), caller, grc721.TokenID(tokenID)); err != nil { + if err := nft.TransferFrom(std.CurrentRealm().Address(), caller, grc721.TokenID(tokenID)); err != nil { panic(ufmt.Sprintf("CRITICAL: payment processed but NFT transfer failed: %v", err)) } diff --git a/examples/gno.land/r/matijamarjanovic/gnoxchange/pools.gno b/examples/gno.land/r/matijamarjanovic/gnoxchange/pools.gno index 6e813157875..5023d1a7a68 100644 --- a/examples/gno.land/r/matijamarjanovic/gnoxchange/pools.gno +++ b/examples/gno.land/r/matijamarjanovic/gnoxchange/pools.gno @@ -20,7 +20,7 @@ var ( // is the lowest ammount of the one with less decimals. // If the pool creation is successful, the pool key is returned. func CreatePool(tokenA, tokenB string, initialAmountA, initialAmountB uint64) (string, error) { - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() if tokenA == tokenB { return "", errors.New("identical tokens") @@ -69,12 +69,12 @@ func CreatePool(tokenA, tokenB string, initialAmountA, initialAmountB uint64) (s return "", errors.New("pool already exists") } - allowanceA := tokenAInstance.Allowance(caller, std.CurrentRealm().Addr()) + allowanceA := tokenAInstance.Allowance(caller, std.CurrentRealm().Address()) if allowanceA < initialAmountA { return "", errors.New(ufmt.Sprintf("insufficient allowance for token %s: have %d, need %d", tokenA, allowanceA, initialAmountA)) } - allowanceB := tokenBInstance.Allowance(caller, std.CurrentRealm().Addr()) + allowanceB := tokenBInstance.Allowance(caller, std.CurrentRealm().Address()) if allowanceB < initialAmountB { return "", errors.New(ufmt.Sprintf("insufficient allowance for token %s: have %d, need %d", tokenB, allowanceB, initialAmountB)) } @@ -94,7 +94,7 @@ func AddLiquidity(poolKey string, amountA, amountB uint64) error { return errors.New("pool not found") } - return pool.(*Pool).addLiquidity(std.PrevRealm().Addr(), amountA, amountB) + return pool.(*Pool).addLiquidity(std.PreviousRealm().Address(), amountA, amountB) } // WithdrawLiquidity is a public function that allows the caller to withdraw liquidity from the pool. @@ -114,7 +114,7 @@ func WithdrawLiquidity(poolKey string, lpAmount uint64) (uint64, uint64, error) return 0, 0, errors.New("cannot withdraw zero liquidity") } - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() lpBalance := pool.GetLPBalance(caller) if lpBalance < lpAmount { return 0, 0, errors.New("insufficient LP token balance") @@ -167,12 +167,12 @@ func (p *Pool) addLiquidity(provider std.Address, amountA, amountB uint64) error } } - allowanceA := tokenAInstance.Allowance(provider, std.CurrentRealm().Addr()) + allowanceA := tokenAInstance.Allowance(provider, std.CurrentRealm().Address()) if allowanceA < amountA { return errors.New(ufmt.Sprintf("insufficient allowance for token %s: have %d, need %d", p.tokenA, allowanceA, amountA)) } - allowanceB := tokenBInstance.Allowance(provider, std.CurrentRealm().Addr()) + allowanceB := tokenBInstance.Allowance(provider, std.CurrentRealm().Address()) if allowanceB < amountB { return errors.New(ufmt.Sprintf("insufficient allowance for token %s: have %d, need %d", p.tokenB, allowanceB, amountB)) } @@ -180,7 +180,7 @@ func (p *Pool) addLiquidity(provider std.Address, amountA, amountB uint64) error tellerA := tokenAInstance.RealmTeller() if err := tellerA.TransferFrom( provider, - std.CurrentRealm().Addr(), + std.CurrentRealm().Address(), amountA, ); err != nil { return errors.New(ufmt.Sprintf("failed to transfer token %s: %v", p.tokenA, err)) @@ -189,7 +189,7 @@ func (p *Pool) addLiquidity(provider std.Address, amountA, amountB uint64) error tellerB := tokenBInstance.RealmTeller() if err := tellerB.TransferFrom( provider, - std.CurrentRealm().Addr(), + std.CurrentRealm().Address(), amountB, ); err != nil { // if second transfer fails, we need to refund the first transfer @@ -282,7 +282,7 @@ func createPool(creator std.Address, tokenA, tokenB string, initialAmountA, init tellerA := tokenAInstance.RealmTeller() if err := tellerA.TransferFrom( creator, - std.CurrentRealm().Addr(), + std.CurrentRealm().Address(), initialAmountA, ); err != nil { return errors.New(ufmt.Sprintf("failed to transfer token %s: %v", tokenA, err)) @@ -291,7 +291,7 @@ func createPool(creator std.Address, tokenA, tokenB string, initialAmountA, init tellerB := tokenBInstance.RealmTeller() if err := tellerB.TransferFrom( creator, - std.CurrentRealm().Addr(), + std.CurrentRealm().Address(), initialAmountB, ); err != nil { if refundErr := tellerA.Transfer(creator, initialAmountA); refundErr != nil { diff --git a/examples/gno.land/r/matijamarjanovic/gnoxchange/swap.gno b/examples/gno.land/r/matijamarjanovic/gnoxchange/swap.gno index 70fa080b54d..12e4f4d270e 100644 --- a/examples/gno.land/r/matijamarjanovic/gnoxchange/swap.gno +++ b/examples/gno.land/r/matijamarjanovic/gnoxchange/swap.gno @@ -71,9 +71,9 @@ func Swap(poolKey string, tokenInKey string, amountIn uint64, minAmountOut uint6 return 0, errors.New(ufmt.Sprintf("insufficient output amount: expected minimum %d, got %d", minAmountOut, amountOut)) } - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() - allowance := tokenIn.Allowance(caller, std.CurrentRealm().Addr()) + allowance := tokenIn.Allowance(caller, std.CurrentRealm().Address()) if allowance < amountIn { return 0, errors.New(ufmt.Sprintf("insufficient allowance for token %s: have %d, need %d", tokenInKey, allowance, amountIn)) } @@ -81,7 +81,7 @@ func Swap(poolKey string, tokenInKey string, amountIn uint64, minAmountOut uint6 tellerIn := tokenIn.RealmTeller() if err := tellerIn.TransferFrom( caller, - std.CurrentRealm().Addr(), + std.CurrentRealm().Address(), amountIn, ); err != nil { return 0, errors.New(ufmt.Sprintf("failed to transfer input token: %v", err)) diff --git a/examples/gno.land/r/matijamarjanovic/gnoxchange/tickets.gno b/examples/gno.land/r/matijamarjanovic/gnoxchange/tickets.gno index 7c1dab2ffa3..bcac9af6a5b 100644 --- a/examples/gno.land/r/matijamarjanovic/gnoxchange/tickets.gno +++ b/examples/gno.land/r/matijamarjanovic/gnoxchange/tickets.gno @@ -32,9 +32,9 @@ func CreateCoinToTokenTicket( minAmountOut uint64, // minimum amount of tokens to receive expiryHours int64, ) (string, error) { - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() - sent := std.GetOrigSend() + sent := std.OriginSend() if len(sent) != 1 || sent[0].Denom != coinDenom { return "", errors.New("sent coins don't match ticket parameters") } @@ -91,7 +91,7 @@ func CreateTokenToCoinTicket( minAmountOut uint64, // minimum amount of coins to receive expiryHours int64, ) (string, error) { - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() tokenIn := tokenhub.GetToken(tokenKey) if tokenIn == nil { @@ -117,7 +117,7 @@ func CreateTokenToCoinTicket( } tellerIn := tokenIn.RealmTeller() - if err := tellerIn.TransferFrom(caller, std.CurrentRealm().Addr(), amountIn); err != nil { + if err := tellerIn.TransferFrom(caller, std.CurrentRealm().Address(), amountIn); err != nil { return "", errors.New("failed to transfer tokens: " + err.Error()) } @@ -149,7 +149,7 @@ func CreateTokenToTokenTicket( minAmountOut uint64, // minimum amount of tokens to receive expiryHours int64, ) (string, error) { - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() tokenIn := tokenhub.GetToken(tokenInKey) if tokenIn == nil { @@ -190,7 +190,7 @@ func CreateTokenToTokenTicket( } tellerIn := tokenIn.RealmTeller() - if err := tellerIn.TransferFrom(caller, std.CurrentRealm().Addr(), amountIn); err != nil { + if err := tellerIn.TransferFrom(caller, std.CurrentRealm().Address(), amountIn); err != nil { return "", errors.New("failed to transfer tokens: " + err.Error()) } @@ -218,7 +218,7 @@ func CreateTokenToTokenTicket( // // note: If the ticket is asking for coins, the amountOut must be the exact amount of coins sent. func FulfillTicket(ticketID string, amountOut uint64) error { - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() ticketInterface, exists := ticketRegistry.allTickets.Get(ticketID) if !exists { @@ -241,17 +241,17 @@ func FulfillTicket(ticketID string, amountOut uint64) error { } if ticket.AssetOut.Type == AssetTypeCoin { - sent := std.GetOrigSend() + sent := std.OriginSend() if len(sent) != 1 || sent[0].Denom != ticket.AssetOut.Denom || uint64(sent[0].Amount) != amountOut { return errors.New("sent coins don't match fulfillment parameters") } - banker := std.GetBanker(std.BankerTypeRealmSend) - banker.SendCoins(std.CurrentRealm().Addr(), ticket.Creator, sent) + banker := std.NewBanker(std.BankerTypeRealmSend) + banker.SendCoins(std.CurrentRealm().Address(), ticket.Creator, sent) if ticket.AssetIn.Type == AssetTypeCoin { banker.SendCoins( - std.CurrentRealm().Addr(), + std.CurrentRealm().Address(), caller, std.Coins{{ticket.AssetIn.Denom, int64(ticket.AmountIn)}}, ) @@ -274,9 +274,9 @@ func FulfillTicket(ticketID string, amountOut uint64) error { } if ticket.AssetIn.Type == AssetTypeCoin { - banker := std.GetBanker(std.BankerTypeRealmSend) + banker := std.NewBanker(std.BankerTypeRealmSend) banker.SendCoins( - std.CurrentRealm().Addr(), + std.CurrentRealm().Address(), caller, std.Coins{{ticket.AssetIn.Denom, int64(ticket.AmountIn)}}, ) @@ -295,7 +295,7 @@ func FulfillTicket(ticketID string, amountOut uint64) error { // CancelTicket allows the creator to cancel their ticket and withdraw the tokens/coins before the ticket is expired. func CancelTicket(ticketID string) error { - caller := std.PrevRealm().Addr() + caller := std.PreviousRealm().Address() ticketInterface, exists := ticketRegistry.allTickets.Get(ticketID) if !exists { @@ -313,9 +313,9 @@ func CancelTicket(ticketID string) error { } if ticket.AssetIn.Type == AssetTypeCoin { - banker := std.GetBanker(std.BankerTypeRealmSend) + banker := std.NewBanker(std.BankerTypeRealmSend) banker.SendCoins( - std.CurrentRealm().Addr(), + std.CurrentRealm().Address(), ticket.Creator, std.Coins{{ticket.AssetIn.Denom, int64(ticket.AmountIn)}}, ) @@ -328,7 +328,7 @@ func CancelTicket(ticketID string) error { parts := strings.Split(ticket.AssetIn.NFTPath, ".") tokenID := parts[len(parts)-1] - if err := nft.TransferFrom(std.CurrentRealm().Addr(), ticket.Creator, grc721.TokenID(tokenID)); err != nil { + if err := nft.TransferFrom(std.CurrentRealm().Address(), ticket.Creator, grc721.TokenID(tokenID)); err != nil { return errors.New(ufmt.Sprintf("failed to return NFT: %v", err)) } } else { diff --git a/examples/gno.land/r/matijamarjanovic/tokenhub/tokenhub.gno b/examples/gno.land/r/matijamarjanovic/tokenhub/tokenhub.gno index c11627a010a..a2a7ba769fe 100644 --- a/examples/gno.land/r/matijamarjanovic/tokenhub/tokenhub.gno +++ b/examples/gno.land/r/matijamarjanovic/tokenhub/tokenhub.gno @@ -34,7 +34,7 @@ func init() { // The logic is the same as in grc20reg, but it's done here so the key path is callers pkgpath and not of this realm // After doing so, the token hub realm uses grc20reg's registry as a read-only avl.Tree func RegisterToken(tokenGetter grc20.TokenGetter, slug string) { - rlmPath := std.PrevRealm().PkgPath() + rlmPath := std.PreviousRealm().PkgPath() key := fqname.Construct(rlmPath, slug) grc20reg.RegisterWithTokenhub(tokenGetter, key) } @@ -56,7 +56,7 @@ func RegisterNFT(nftGetter grc721.NFTGetter, collection string, tokenId string) return ErrNFTtokIDNotExists } - rlmPath := std.PrevRealm().PkgPath() + rlmPath := std.PreviousRealm().PkgPath() key := rlmPath + "." + collection + "." + tokenId if registeredNFTs.Has(key) { @@ -70,7 +70,7 @@ func RegisterNFT(nftGetter grc721.NFTGetter, collection string, tokenId string) // RegisterMultiToken is a function that registers a multi-token in an avl.Tree // The avl.Tree value is a struct defined in this realm. It contains not only the getter (like other token types) but also the tokenID func RegisterMultiToken(mtGetter grc1155.MultiTokenGetter, tokenID string) error { - rlmPath := std.PrevRealm().PkgPath() + rlmPath := std.PreviousRealm().PkgPath() key := rlmPath + "." + tokenID diff --git a/examples/gno.land/r/matijamarjanovic/tokenhub/tokenhub_test.gno b/examples/gno.land/r/matijamarjanovic/tokenhub/tokenhub_test.gno index 83454e7eaf9..43bf1011329 100644 --- a/examples/gno.land/r/matijamarjanovic/tokenhub/tokenhub_test.gno +++ b/examples/gno.land/r/matijamarjanovic/tokenhub/tokenhub_test.gno @@ -29,7 +29,7 @@ func TestNFTRegistration(t *testing.T) { std.TestSetRealm(std.NewCodeRealm("gno.land/r/matijamarjanovic/home")) nft := grc721.NewBasicNFT("Test NFT", "TNFT") - nft.Mint(std.CurrentRealm().Addr(), grc721.TokenID("1")) + nft.Mint(std.CurrentRealm().Address(), grc721.TokenID("1")) err := RegisterNFT(nft.Getter(), "test_nft", "1") urequire.NoError(t, err, "Should register NFT without error") @@ -63,22 +63,22 @@ func TestBalanceRetrieval(t *testing.T) { token, ledger := grc20.NewToken("Test Token", "TEST", 6) RegisterToken(token.Getter(), "test_tokenn") - ledger.Mint(std.CurrentRealm().Addr(), 1000) + ledger.Mint(std.CurrentRealm().Address(), 1000) mt := grc1155.NewBasicGRC1155Token("test-uri") RegisterMultiToken(mt.Getter(), "11") - mt.SafeMint(std.CurrentRealm().Addr(), grc1155.TokenID("11"), 5) + mt.SafeMint(std.CurrentRealm().Address(), grc1155.TokenID("11"), 5) - balances := GetUserTokenBalances(std.CurrentRealm().Addr().String()) + balances := GetUserTokenBalances(std.CurrentRealm().Address().String()) uassert.True(t, strings.Contains(balances, "Token:gno.land/r/matijamarjanovic/home.test_tokenn:1000"), "Should show correct GRC20 balance") - balances = GetUserNFTBalances(std.CurrentRealm().Addr().String()) + balances = GetUserNFTBalances(std.CurrentRealm().Address().String()) uassert.True(t, strings.Contains(balances, "NFT:gno.land/r/matijamarjanovic/home.test_nft.1"), "Should show correct NFT balance") //already minted in test register - balances = GetUserMultiTokenBalances(std.CurrentRealm().Addr().String()) + balances = GetUserMultiTokenBalances(std.CurrentRealm().Address().String()) uassert.True(t, strings.Contains(balances, "MultiToken:gno.land/r/matijamarjanovic/home.11:5"), "Should show multi-token balance") - nonZeroBalances := GetUserTokenBalancesNonZero(std.CurrentRealm().Addr().String()) + nonZeroBalances := GetUserTokenBalancesNonZero(std.CurrentRealm().Address().String()) uassert.True(t, strings.Contains(nonZeroBalances, "Token:gno.land/r/matijamarjanovic/home.test_tokenn:1000"), "Should show non-zero GRC20 balance") } @@ -151,7 +151,7 @@ func TestMustGetFunctions(t *testing.T) { MustGetToken("non_existent_token") nft := grc721.NewBasicNFT("Must NFT", "MNFT") - nft.Mint(std.CurrentRealm().Addr(), grc721.TokenID("1")) + nft.Mint(std.CurrentRealm().Address(), grc721.TokenID("1")) RegisterNFT(nft.Getter(), "must_nft", "1") retrievedNFT := MustGetNFT("gno.land/r/matijamarjanovic/home.must_nft.1")