From 2cc6fe2bac5605f6ca9bbdcb3b188bb7ac37feae Mon Sep 17 00:00:00 2001 From: n3wbie Date: Mon, 19 Feb 2024 16:06:46 +0900 Subject: [PATCH] chore: more comments --- _setup/gnft/gnft.gno | 16 ++++++++-------- _setup/gns/gns.gno | 6 +++--- consts/consts.gno | 9 ++++++++- router/_TEST_INIT_basic_test.gno | 2 +- router/router_register.gno | 8 ++++---- 5 files changed, 24 insertions(+), 17 deletions(-) diff --git a/_setup/gnft/gnft.gno b/_setup/gnft/gnft.gno index 9d8e122fd..e14f804c8 100644 --- a/_setup/gnft/gnft.gno +++ b/_setup/gnft/gnft.gno @@ -33,7 +33,7 @@ func mintNNFT(owner std.Address, n uint64) { func BalanceOf(user users.AddressOrName) uint64 { balance, err := nft.BalanceOf(user.Resolve()) if err != nil { - panic(err) + panic(err.Error()) } return balance @@ -42,7 +42,7 @@ func BalanceOf(user users.AddressOrName) uint64 { func OwnerOf(tid grc721.TokenID) std.Address { owner, err := nft.OwnerOf(tid) if err != nil { - panic(err) + panic(err.Error()) } return owner @@ -56,7 +56,7 @@ func GetApproved(tid grc721.TokenID) (std.Address, bool) { addr, err := nft.GetApproved(tid) if err != nil { return "", false - // panic(err) + // panic(err.Error()) } return addr, true @@ -67,21 +67,21 @@ func GetApproved(tid grc721.TokenID) (std.Address, bool) { func Approve(user users.AddressOrName, tid grc721.TokenID) { err := nft.Approve(user.Resolve(), tid) if err != nil { - panic(err) + panic(err.Error()) } } func SetApprovalForAll(user users.AddressOrName, approved bool) { err := nft.SetApprovalForAll(user.Resolve(), approved) if err != nil { - panic(err) + panic(err.Error()) } } func TransferFrom(from, to users.AddressOrName, tid grc721.TokenID) { err := nft.TransferFrom(from.Resolve(), to.Resolve(), tid) if err != nil { - panic(err) + panic(err.Error()) } } @@ -93,7 +93,7 @@ func Mint(to users.AddressOrName, tid grc721.TokenID) { assertIsAdmin(caller) err := nft.Mint(to.Resolve(), tid) if err != nil { - panic(err) + panic(err.Error()) } } @@ -103,7 +103,7 @@ func Burn(tid grc721.TokenID) { assertIsAdmin(caller) err := nft.Burn(tid) if err != nil { - panic(err) + panic(err.Error()) } } diff --git a/_setup/gns/gns.gno b/_setup/gns/gns.gno index 434a854ed..40a5e9e7e 100644 --- a/_setup/gns/gns.gno +++ b/_setup/gns/gns.gno @@ -15,8 +15,8 @@ var ( ) const ( - admin std.Address = "g12l9splsyngcgefrwa52x5a7scc29e9v086m6p4" // r3v4_xxx: CHANGE WHEN DEPLOYING TO OFFICIAL NETWORK - INTERNAL_REWARD_ACCOUNT std.Address = "g1paqttvcjcluuya9n9twyw7yacv54mt7ld3gvzm" // r3v4_xxx: CHANGE WHEN DEPLOYING TO OFFICIAL NETWORK + admin std.Address = "g12l9splsyngcgefrwa52x5a7scc29e9v086m6p4" // GSA, r3v4_xxx: CHANGE WHEN DEPLOYING TO OFFICIAL NETWORK + INTERNAL_REWARD_ACCOUNT std.Address = "g1paqttvcjcluuya9n9twyw7yacv54mt7ld3gvzm" // IRA, r3v4_xxx: CHANGE WHEN DEPLOYING TO OFFICIAL NETWORK ) func init() { @@ -27,7 +27,7 @@ func init() { gns.Mint(INTERNAL_REWARD_ACCOUNT, 400_000_000_000_000) // @INTERNAL_REWARD_ACCOUNT gns.Mint(std.Address("g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5"), 100_000_000_000) // default test1 - stakerAddr := std.DerivePkgAddr("gno.land/r/demo/staker") + stakerAddr := std.DerivePkgAddr("gno.land/r/demo/staker") // r3v4_xxx: CHANGE WHEN DEPLOYING TO OFFICIAL NETWORK admins = append(admins, string(stakerAddr)) admins = append(admins, string(admin)) diff --git a/consts/consts.gno b/consts/consts.gno index 8442e7cb2..443903b29 100644 --- a/consts/consts.gno +++ b/consts/consts.gno @@ -6,7 +6,8 @@ import ( // GNOSWAP SERVICE const ( - GNOSWAP_ADMIN std.Address = "g12l9splsyngcgefrwa52x5a7scc29e9v086m6p4" + GNOSWAP_ADMIN std.Address = "g12l9splsyngcgefrwa52x5a7scc29e9v086m6p4" // GSA, r3v4_xxx: CHANGE WHEN DEPLOYING TO OFFICIAL NETWORK + INTERNAL_REWARD_ACCOUNT std.Address = "g1paqttvcjcluuya9n9twyw7yacv54mt7ld3gvzm" // 500 GNS as creation fee (r3v4_xxx: 500 or 500_000_000) POOL_CREATION_FEE uint64 = 500 @@ -35,6 +36,12 @@ const ( GOV_PATH string = "gno.land/r/demo/gov" GOV_ADDR std.Address = std.DerivePkgAddr(GOV_PATH) + + GNS_PATH string = "gno.land/r/demo/gns" + GNS_ADDR std.Address = std.DerivePkgAddr(GNS_PATH) + + GNFT_PATH string = "gno.land/r/demo/gnft" + GNFT_ADDR std.Address = std.DerivePkgAddr(GNFT_PATH) ) // NUMBER diff --git a/router/_TEST_INIT_basic_test.gno b/router/_TEST_INIT_basic_test.gno index 9888cbc64..a91aafa2f 100644 --- a/router/_TEST_INIT_basic_test.gno +++ b/router/_TEST_INIT_basic_test.gno @@ -58,7 +58,7 @@ func init() { wugnot.Approve(a2u(poolAddr), 500_000_000_000_000) - std.TestSetPrevAddr(std.Address("g1paqttvcjcluuya9n9twyw7yacv54mt7ld3gvzm")) // r3v4_xxx: CHANGE WHEN DEPLOYING TO OFFICIAL NETWORK + std.TestSetPrevAddr(std.Address("g1paqttvcjcluuya9n9twyw7yacv54mt7ld3gvzm")) // IRA, r3v4_xxx: CHANGE WHEN DEPLOYING TO OFFICIAL NETWORK gns.Approve(a2u(stakerAddr), 500_000_000_000_000) // to create internal incentive } diff --git a/router/router_register.gno b/router/router_register.gno index b0e6b2731..12f1e4c1f 100644 --- a/router/router_register.gno +++ b/router/router_register.gno @@ -4,9 +4,9 @@ import ( "std" "gno.land/r/demo/users" -) -const APPROVED_CALLER = "g12l9splsyngcgefrwa52x5a7scc29e9v086m6p4" // r3v4_xxx: CHANGE WHEN DEPLOYING TO OFFICIAL NETWORK + "gno.land/r/demo/consts" +) var registered = []GRC20Pair{} @@ -51,7 +51,7 @@ func RegisterGRC20Interface(pkgPath string, igrc20 GRC20Interface) { // r3v4_xxx: however must be used in production // caller := std.GetOrigCaller() - // if caller != APPROVED_CALLER { + // if caller != consts.GNOSWAP_ADMIN { // panic("unauthorized address to register") // } @@ -67,7 +67,7 @@ func UnregisterGRC20Interface(pkgPath string) { // only admin can unregister caller := std.GetOrigCaller() - if caller != APPROVED_CALLER { + if caller != consts.GNOSWAP_ADMIN { panic("unauthorized address to unregister") }