Skip to content

Commit

Permalink
update pr to match new names from std (0a239e1)
Browse files Browse the repository at this point in the history
  • Loading branch information
@matijamarjanovic
matijamarjanovic committed Feb 20, 2025
1 parent 3097ea4 commit 2e4e782
Show file tree
Hide file tree
Showing 8 changed files with 74 additions and 74 deletions.
2 changes: 1 addition & 1 deletion examples/gno.land/r/demo/grc20reg/grc20reg.gno
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down
44 changes: 22 additions & 22 deletions examples/gno.land/r/matijamarjanovic/gnoxchange/gnoxchange_test.gno
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand All @@ -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)
Expand All @@ -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)
}

Expand All @@ -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()
Expand Down Expand Up @@ -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")
Expand All @@ -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)
Expand Down Expand Up @@ -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)
Expand All @@ -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)
Expand All @@ -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)
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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)

Expand All @@ -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)
Expand All @@ -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)
Expand Down
18 changes: 9 additions & 9 deletions examples/gno.land/r/matijamarjanovic/gnoxchange/nftmarket.gno
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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())
}

Expand Down Expand Up @@ -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 {
Expand All @@ -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())
}

Expand All @@ -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 {
Expand Down Expand Up @@ -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 {
Expand All @@ -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))
}

Expand Down
22 changes: 11 additions & 11 deletions examples/gno.land/r/matijamarjanovic/gnoxchange/pools.gno
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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))
}
Expand All @@ -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.
Expand All @@ -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")
Expand Down Expand Up @@ -167,20 +167,20 @@ 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))
}

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))
Expand All @@ -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
Expand Down Expand Up @@ -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))
Expand All @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions examples/gno.land/r/matijamarjanovic/gnoxchange/swap.gno
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,17 +71,17 @@ 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))
}

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))
Expand Down
Loading

0 comments on commit 2e4e782

Please sign in to comment.