diff --git a/examples/gno.land/p/demo/grc/exts/vault/vault.gno b/examples/gno.land/p/demo/grc/exts/vault/vault.gno index 47aa70f483e..a06bc813640 100644 --- a/examples/gno.land/p/demo/grc/exts/vault/vault.gno +++ b/examples/gno.land/p/demo/grc/exts/vault/vault.gno @@ -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, @@ -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 @@ -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). diff --git a/examples/gno.land/p/demo/grc/exts/vault/vault_filetest.gno b/examples/gno.land/p/demo/grc/exts/vault/vault_filetest.gno index d888a3b5f93..5579b96da62 100644 --- a/examples/gno.land/p/demo/grc/exts/vault/vault_filetest.gno +++ b/examples/gno.land/p/demo/grc/exts/vault/vault_filetest.gno @@ -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) @@ -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(), )) } diff --git a/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token.gno b/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token.gno index f152ee90e79..8b03a99a645 100644 --- a/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token.gno +++ b/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token.gno @@ -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) } @@ -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 } @@ -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 } @@ -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 { @@ -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 { @@ -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 { @@ -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 { @@ -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++ { @@ -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++ { @@ -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++ { diff --git a/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno b/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno index 43298cb1136..f991eeb9647 100644 --- a/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno +++ b/examples/gno.land/p/demo/grc/grc1155/basic_grc1155_token_test.gno @@ -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) @@ -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") @@ -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") diff --git a/examples/gno.land/p/demo/grc/grc20/user_token.gno b/examples/gno.land/p/demo/grc/grc20/user_token.gno index 560934dd537..751f7b03201 100644 --- a/examples/gno.land/p/demo/grc/grc20/user_token.gno +++ b/examples/gno.land/p/demo/grc/grc20/user_token.gno @@ -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) } @@ -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 } diff --git a/examples/gno.land/p/demo/grc/grc721/basic_nft.gno b/examples/gno.land/p/demo/grc/grc721/basic_nft.gno index cbce05d379c..db65378977b 100644 --- a/examples/gno.land/p/demo/grc/grc721/basic_nft.gno +++ b/examples/gno.land/p/demo/grc/grc721/basic_nft.gno @@ -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 } @@ -123,7 +123,7 @@ func (s *basicNFT) SetApprovalForAll(operator std.Address, approved bool) error return ErrInvalidAddress } - caller := std.GetOrigCaller() + caller := std.OrigCaller() return s.setApprovalForAll(caller, operator, approved) } @@ -131,7 +131,7 @@ func (s *basicNFT) SetApprovalForAll(operator std.Address, approved bool) error // 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 } @@ -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 } diff --git a/examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno b/examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno index a831096e8f3..12efa98a0f0 100644 --- a/examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno +++ b/examples/gno.land/p/demo/grc/grc721/basic_nft_test.gno @@ -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()) @@ -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")) @@ -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")) @@ -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")) diff --git a/examples/gno.land/p/demo/rand/rand.gno b/examples/gno.land/p/demo/rand/rand.gno index 2fa16d627be..465c3ae096a 100644 --- a/examples/gno.land/p/demo/rand/rand.gno +++ b/examples/gno.land/p/demo/rand/rand.gno @@ -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) } diff --git a/examples/gno.land/p/demo/testutils/misc.gno b/examples/gno.land/p/demo/testutils/misc.gno index d48304ad441..60dd611ef49 100644 --- a/examples/gno.land/p/demo/testutils/misc.gno +++ b/examples/gno.land/p/demo/testutils/misc.gno @@ -1,6 +1,6 @@ package testutils -// For testing std.GetCallerAt(). +// For testing std.CallerAt(). func WrapCall(fn func()) { fn() } diff --git a/examples/gno.land/r/demo/art/gnoface/gnoface.gno b/examples/gno.land/r/demo/art/gnoface/gnoface.gno index 95493b52bf5..b02a3c9ece2 100644 --- a/examples/gno.land/r/demo/art/gnoface/gnoface.gno +++ b/examples/gno.land/r/demo/art/gnoface/gnoface.gno @@ -10,7 +10,7 @@ import ( ) func Render(path string) string { - seed := std.GetHeight() + seed := std.Height() path = strings.TrimSpace(path) if path != "" { diff --git a/examples/gno.land/r/demo/banktest/README.md b/examples/gno.land/r/demo/banktest/README.md index 4182bfcfe0c..46601f57640 100644 --- a/examples/gno.land/r/demo/banktest/README.md +++ b/examples/gno.land/r/demo/banktest/README.md @@ -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}} ``` @@ -64,7 +64,7 @@ message. // record activity act := &activity{ caller: caller, - sent: std.GetOrigSend(), + sent: std.OrigSend(), returned: send, time: time.Now(), } @@ -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!" @@ -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 := "" diff --git a/examples/gno.land/r/demo/banktest/banktest.gno b/examples/gno.land/r/demo/banktest/banktest.gno index 29c479dd025..518a6c5196a 100644 --- a/examples/gno.land/r/demo/banktest/banktest.gno +++ b/examples/gno.land/r/demo/banktest/banktest.gno @@ -24,12 +24,12 @@ var latest [10]*activity // 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}} // record activity act := &activity{ caller: caller, - sent: std.GetOrigSend(), + sent: std.OrigSend(), returned: send, time: time.Now(), } @@ -39,8 +39,8 @@ func Deposit(returnDenom string, returnAmount int64) string { latest[0] = act // return if any. if returnAmount > 0 { - banker := std.GetBanker(std.BankerTypeOrigSend) - pkgaddr := std.GetOrigPkgAddr() + banker := std.Banker(std.BankerTypeOrigSend) + pkgaddr := std.OrigPkgAddr() // TODO: use std.Coins constructors, this isn't generally safe. banker.SendCoins(pkgaddr, caller, send) return "returned!" @@ -51,8 +51,8 @@ func Deposit(returnDenom string, returnAmount int64) string { 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 := "" diff --git a/examples/gno.land/r/demo/banktest/z_0_filetest.gno b/examples/gno.land/r/demo/banktest/z_0_filetest.gno index 80cb0cf299c..e4c3897b2cf 100644 --- a/examples/gno.land/r/demo/banktest/z_0_filetest.gno +++ b/examples/gno.land/r/demo/banktest/z_0_filetest.gno @@ -16,8 +16,8 @@ func main() { mainaddr := std.DerivePkgAddr("main") std.TestSetOrigCaller(mainaddr) - banker := std.GetBanker(std.BankerTypeReadonly) - mainbal := banker.GetCoins(mainaddr) + banker := std.Banker(std.BankerTypeReadonly) + mainbal := banker.Coins(mainaddr) println("main before:", mainbal) // plus OrigSend equals 300. // simulate a Deposit call. @@ -28,7 +28,7 @@ func main() { println("Deposit():", res) // print main balance after. - mainbal = banker.GetCoins(mainaddr) + mainbal = banker.Coins(mainaddr) println("main after:", mainbal) // still 300. // simulate a Render(). diff --git a/examples/gno.land/r/demo/banktest/z_2_filetest.gno b/examples/gno.land/r/demo/banktest/z_2_filetest.gno index a0280e0d75b..bcbc9ea7637 100644 --- a/examples/gno.land/r/demo/banktest/z_2_filetest.gno +++ b/examples/gno.land/r/demo/banktest/z_2_filetest.gno @@ -13,8 +13,8 @@ func main() { mainaddr := std.DerivePkgAddr("main") std.TestSetOrigCaller(mainaddr) - banker := std.GetBanker(std.BankerTypeReadonly) - mainbal := banker.GetCoins(mainaddr) + banker := std.Banker(std.BankerTypeReadonly) + mainbal := banker.Coins(mainaddr) println("main before:", mainbal) // plus OrigSend equals 300. // simulate a Deposit call. @@ -25,7 +25,7 @@ func main() { println("Deposit():", res) // print main balance after. - mainbal = banker.GetCoins(mainaddr) + mainbal = banker.Coins(mainaddr) println("main after:", mainbal) // now 255. // simulate a Render(). diff --git a/examples/gno.land/r/demo/boards/public.gno b/examples/gno.land/r/demo/boards/public.gno index 6643c863cec..3c7801a2968 100644 --- a/examples/gno.land/r/demo/boards/public.gno +++ b/examples/gno.land/r/demo/boards/public.gno @@ -19,7 +19,7 @@ func GetBoardIDFromName(name string) (BoardID, bool) { func CreateBoard(name string) BoardID { std.AssertOriginCall() bid := incGetBoardID() - caller := std.GetOrigCaller() + caller := std.OrigCaller() if usernameOf(caller) == "" { panic("unauthorized") } @@ -32,7 +32,7 @@ func CreateBoard(name string) BoardID { } func checkAnonFee() bool { - sent := std.GetOrigSend() + sent := std.OrigSend() anonFeeCoin := std.Coin{"ugnot", int64(gDefaultAnonFee)} if len(sent) == 1 && sent[0].IsGTE(anonFeeCoin) { return true @@ -42,7 +42,7 @@ func checkAnonFee() bool { func CreateThread(bid BoardID, title string, body string) PostID { std.AssertOriginCall() - caller := std.GetOrigCaller() + caller := std.OrigCaller() if usernameOf(caller) == "" { if !checkAnonFee() { panic("please register, otherwise minimum fee " + strconv.Itoa(gDefaultAnonFee) + " is required if anonymous") @@ -58,7 +58,7 @@ func CreateThread(bid BoardID, title string, body string) PostID { func CreateReply(bid BoardID, threadid, postid PostID, body string) PostID { std.AssertOriginCall() - caller := std.GetOrigCaller() + caller := std.OrigCaller() if usernameOf(caller) == "" { if !checkAnonFee() { panic("please register, otherwise minimum fee " + strconv.Itoa(gDefaultAnonFee) + " is required if anonymous") @@ -86,7 +86,7 @@ func CreateReply(bid BoardID, threadid, postid PostID, body string) PostID { // If board specified by bid is private, panics. func CreateRepost(bid BoardID, postid PostID, title string, body string, dstBoardID BoardID) PostID { std.AssertOriginCall() - caller := std.GetOrigCaller() + caller := std.OrigCaller() if usernameOf(caller) == "" { // TODO: allow with gDefaultAnonFee payment. if !checkAnonFee() { @@ -114,7 +114,7 @@ func CreateRepost(bid BoardID, postid PostID, title string, body string, dstBoar func DeletePost(bid BoardID, threadid, postid PostID, reason string) { std.AssertOriginCall() - caller := std.GetOrigCaller() + caller := std.OrigCaller() board := getBoard(bid) if board == nil { panic("board not exist") @@ -144,7 +144,7 @@ func DeletePost(bid BoardID, threadid, postid PostID, reason string) { func EditPost(bid BoardID, threadid, postid PostID, title, body string) { std.AssertOriginCall() - caller := std.GetOrigCaller() + caller := std.OrigCaller() board := getBoard(bid) if board == nil { panic("board not exist") diff --git a/examples/gno.land/r/demo/foo1155/foo1155.gno b/examples/gno.land/r/demo/foo1155/foo1155.gno index c3fbf389434..0b8abf0dbd5 100644 --- a/examples/gno.land/r/demo/foo1155/foo1155.gno +++ b/examples/gno.land/r/demo/foo1155/foo1155.gno @@ -80,7 +80,7 @@ func BatchTransferFrom(from, to users.AddressOrName, batch []grc1155.TokenID, am // Admin func Mint(to users.AddressOrName, tid grc1155.TokenID, amount uint64) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() assertIsAdmin(caller) err := foo.SafeMint(to.Resolve(), tid, amount) if err != nil { @@ -89,7 +89,7 @@ func Mint(to users.AddressOrName, tid grc1155.TokenID, amount uint64) { } func MintBatch(to users.AddressOrName, batch []grc1155.TokenID, amounts []uint64) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() assertIsAdmin(caller) err := foo.SafeBatchMint(to.Resolve(), batch, amounts) if err != nil { @@ -98,7 +98,7 @@ func MintBatch(to users.AddressOrName, batch []grc1155.TokenID, amounts []uint64 } func Burn(from users.AddressOrName, tid grc1155.TokenID, amount uint64) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() assertIsAdmin(caller) err := foo.Burn(from.Resolve(), tid, amount) if err != nil { @@ -107,7 +107,7 @@ func Burn(from users.AddressOrName, tid grc1155.TokenID, amount uint64) { } func BurnBatch(from users.AddressOrName, batch []grc1155.TokenID, amounts []uint64) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() assertIsAdmin(caller) err := foo.BatchBurn(from.Resolve(), batch, amounts) if err != nil { diff --git a/examples/gno.land/r/demo/foo20/foo20.gno b/examples/gno.land/r/demo/foo20/foo20.gno index 9053b1932cd..8499f6053da 100644 --- a/examples/gno.land/r/demo/foo20/foo20.gno +++ b/examples/gno.land/r/demo/foo20/foo20.gno @@ -48,17 +48,17 @@ func Allowance(owner, spender users.AddressOrName) uint64 { // setters. func Transfer(to users.AddressOrName, amount uint64) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() foo.Transfer(caller, to.Resolve(), amount) } func Approve(spender users.AddressOrName, amount uint64) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() foo.Approve(caller, spender.Resolve(), amount) } func TransferFrom(from, to users.AddressOrName, amount uint64) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() foo.TransferFrom(caller, from.Resolve(), to.Resolve(), amount) } @@ -67,20 +67,20 @@ func TransferFrom(from, to users.AddressOrName, amount uint64) { func Faucet() { // FIXME: add limits? // FIXME: add payment in gnot? - caller := std.GetOrigCaller() + caller := std.OrigCaller() foo.Mint(caller, 1000*10000) // 1k } // administration. func Mint(address users.AddressOrName, amount uint64) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() assertIsAdmin(caller) foo.Mint(address.Resolve(), amount) } func Burn(address users.AddressOrName, amount uint64) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() assertIsAdmin(caller) foo.Burn(address.Resolve(), amount) } diff --git a/examples/gno.land/r/demo/foo721/foo721.gno b/examples/gno.land/r/demo/foo721/foo721.gno index 0d229737569..de6a1a1bd7c 100644 --- a/examples/gno.land/r/demo/foo721/foo721.gno +++ b/examples/gno.land/r/demo/foo721/foo721.gno @@ -85,7 +85,7 @@ func TransferFrom(from, to users.AddressOrName, tid grc721.TokenID) { // Admin func Mint(to users.AddressOrName, tid grc721.TokenID) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() assertIsAdmin(caller) err := foo.Mint(to.Resolve(), tid) if err != nil { @@ -94,7 +94,7 @@ func Mint(to users.AddressOrName, tid grc721.TokenID) { } func Burn(tid grc721.TokenID) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() assertIsAdmin(caller) err := foo.Burn(tid) if err != nil { diff --git a/examples/gno.land/r/demo/groups/public.gno b/examples/gno.land/r/demo/groups/public.gno index 33e7dbdcf35..2d3d164eae7 100644 --- a/examples/gno.land/r/demo/groups/public.gno +++ b/examples/gno.land/r/demo/groups/public.gno @@ -19,7 +19,7 @@ func GetGroupIDFromName(name string) (GroupID, bool) { func CreateGroup(name string) GroupID { std.AssertOriginCall() - caller := std.GetOrigCaller() + caller := std.OrigCaller() usernameOf(caller) url := "/r/demo/groups:" + name group := newGroup(url, name, caller) @@ -31,7 +31,7 @@ func CreateGroup(name string) GroupID { func AddMember(gid GroupID, address string, weight int, metadata string) MemberID { std.AssertOriginCall() - caller := std.GetOrigCaller() + caller := std.OrigCaller() usernameOf(caller) group := getGroup(gid) if !group.HasPermission(caller, EditPermission) { @@ -52,7 +52,7 @@ func AddMember(gid GroupID, address string, weight int, metadata string) MemberI func DeleteGroup(gid GroupID) { std.AssertOriginCall() - caller := std.GetOrigCaller() + caller := std.OrigCaller() group := getGroup(gid) if !group.HasPermission(caller, DeletePermission) { panic("unauthorized to delete group") @@ -62,7 +62,7 @@ func DeleteGroup(gid GroupID) { func DeleteMember(gid GroupID, mid MemberID) { std.AssertOriginCall() - caller := std.GetOrigCaller() + caller := std.OrigCaller() group := getGroup(gid) if !group.HasPermission(caller, DeletePermission) { panic("unauthorized to delete member") diff --git a/examples/gno.land/r/demo/groups/z_1_a_filetest.gno b/examples/gno.land/r/demo/groups/z_1_a_filetest.gno index 460fb79afbb..651dd7a5791 100644 --- a/examples/gno.land/r/demo/groups/z_1_a_filetest.gno +++ b/examples/gno.land/r/demo/groups/z_1_a_filetest.gno @@ -17,7 +17,7 @@ var gid groups.GroupID const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main users.Register("", "gnouser0", "my profile 1") std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/groups/z_2_a_filetest.gno b/examples/gno.land/r/demo/groups/z_2_a_filetest.gno index f4a96905fc8..f8e7b9c0659 100644 --- a/examples/gno.land/r/demo/groups/z_2_a_filetest.gno +++ b/examples/gno.land/r/demo/groups/z_2_a_filetest.gno @@ -17,7 +17,7 @@ var gid groups.GroupID const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main users.Register("", "gnouser0", "my profile 1") std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/nft/nft.gno b/examples/gno.land/r/demo/nft/nft.gno index f4340d6d2a9..fe328a5be17 100644 --- a/examples/gno.land/r/demo/nft/nft.gno +++ b/examples/gno.land/r/demo/nft/nft.gno @@ -74,7 +74,7 @@ func (grc *token) SafeTransferFrom(from, to std.Address, tid grc721.TokenID) { } func (grc *token) TransferFrom(from, to std.Address, tid grc721.TokenID) { - caller := std.GetCallerAt(2) + caller := std.CallerAt(2) token, ok := grc.getToken(tid) // Throws if `_tokenId` is not a valid NFT. if !ok { @@ -101,7 +101,7 @@ func (grc *token) TransferFrom(from, to std.Address, tid grc721.TokenID) { } func (grc *token) Approve(approved std.Address, tid grc721.TokenID) { - caller := std.GetCallerAt(2) + caller := std.CallerAt(2) token, ok := grc.getToken(tid) // Throws if `_tokenId` is not a valid NFT. if !ok { @@ -121,7 +121,7 @@ func (grc *token) Approve(approved std.Address, tid grc721.TokenID) { // XXX make it work for set of operators. func (grc *token) SetApprovalForAll(operator std.Address, approved bool) { - caller := std.GetCallerAt(2) + caller := std.CallerAt(2) grc.operators.Set(caller.String(), operator) } diff --git a/examples/gno.land/r/demo/nft/z_2_filetest.gno b/examples/gno.land/r/demo/nft/z_2_filetest.gno index 00d6eb0c0f0..815e20d1435 100644 --- a/examples/gno.land/r/demo/nft/z_2_filetest.gno +++ b/examples/gno.land/r/demo/nft/z_2_filetest.gno @@ -9,7 +9,7 @@ import ( ) func main() { - caller := std.GetCallerAt(1) + caller := std.CallerAt(1) addr1 := testutils.TestAddress("addr1") // addr2 := testutils.TestAddress("addr2") grc721 := nft.GetToken() diff --git a/examples/gno.land/r/demo/nft/z_3_filetest.gno b/examples/gno.land/r/demo/nft/z_3_filetest.gno index 00a4d00291b..483d776564b 100644 --- a/examples/gno.land/r/demo/nft/z_3_filetest.gno +++ b/examples/gno.land/r/demo/nft/z_3_filetest.gno @@ -9,7 +9,7 @@ import ( ) func main() { - caller := std.GetCallerAt(1) + caller := std.CallerAt(1) addr1 := testutils.TestAddress("addr1") addr2 := testutils.TestAddress("addr2") grc721 := nft.GetToken() diff --git a/examples/gno.land/r/demo/nft/z_4_filetest.gno b/examples/gno.land/r/demo/nft/z_4_filetest.gno index 773444ff8fa..e3094f44dc3 100644 --- a/examples/gno.land/r/demo/nft/z_4_filetest.gno +++ b/examples/gno.land/r/demo/nft/z_4_filetest.gno @@ -9,7 +9,7 @@ import ( ) func main() { - caller := std.GetCallerAt(1) + caller := std.CallerAt(1) addr1 := testutils.TestAddress("addr1") addr2 := testutils.TestAddress("addr2") grc721 := nft.GetToken() diff --git a/examples/gno.land/r/demo/releases_example/example.gno b/examples/gno.land/r/demo/releases_example/example.gno index a2713687d28..3f5c39d7236 100644 --- a/examples/gno.land/r/demo/releases_example/example.gno +++ b/examples/gno.land/r/demo/releases_example/example.gno @@ -17,7 +17,7 @@ func init() { } func NewRelease(name, url, notes string) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() if caller != admin { panic("restricted area") } @@ -25,7 +25,7 @@ func NewRelease(name, url, notes string) { } func UpdateAdmin(address std.Address) { - caller := std.GetOrigCaller() + caller := std.OrigCaller() if caller != admin { panic("restricted area") } diff --git a/examples/gno.land/r/demo/users/users.gno b/examples/gno.land/r/demo/users/users.gno index 5f492f1662f..5ca9fa85547 100644 --- a/examples/gno.land/r/demo/users/users.gno +++ b/examples/gno.land/r/demo/users/users.gno @@ -58,14 +58,14 @@ func Register(inviter std.Address, name string, profile string) { // assert CallTx call. std.AssertOriginCall() // assert invited or paid. - caller := std.GetCallerAt(2) - if caller != std.GetOrigCaller() { + caller := std.CallerAt(2) + if caller != std.OrigCaller() { panic("should not happen") // because std.AssertOrigCall(). } - sentCoins := std.GetOrigSend() + sentCoins := std.OrigSend() minCoin := std.Coin{"ugnot", minFee} if inviter == "" { - // banker := std.GetBanker(std.BankerTypeOrigSend) + // banker := std.Banker(std.BankerTypeOrigSend) if len(sentCoins) == 1 && sentCoins[0].IsGTE(minCoin) { if sentCoins[0].Amount > minFee*maxFeeMult { panic("payment must not be greater than " + strconv.Itoa(int(minFee*maxFeeMult))) @@ -124,8 +124,8 @@ func Invite(invitee string) { // assert CallTx call. std.AssertOriginCall() // get caller/inviter. - caller := std.GetCallerAt(2) - if caller != std.GetOrigCaller() { + caller := std.CallerAt(2) + if caller != std.OrigCaller() { panic("should not happen") // because std.AssertOrigCall(). } lines := strings.Split(invitee, "\n") @@ -163,8 +163,8 @@ func GrantInvites(invites string) { // assert CallTx call. std.AssertOriginCall() // assert admin. - caller := std.GetCallerAt(2) - if caller != std.GetOrigCaller() { + caller := std.CallerAt(2) + if caller != std.OrigCaller() { panic("should not happen") // because std.AssertOrigCall(). } if caller != admin { @@ -214,7 +214,7 @@ func SetMinFee(newMinFee int64) { // assert CallTx call. std.AssertOriginCall() // assert admin caller. - caller := std.GetCallerAt(2) + caller := std.CallerAt(2) if caller != admin { panic("unauthorized") } @@ -227,7 +227,7 @@ func SetMaxFeeMultiple(newMaxFeeMult int64) { // assert CallTx call. std.AssertOriginCall() // assert admin caller. - caller := std.GetCallerAt(2) + caller := std.CallerAt(2) if caller != admin { panic("unauthorized") } diff --git a/examples/gno.land/r/demo/users/z_10_filetest.gno b/examples/gno.land/r/demo/users/z_10_filetest.gno index 0065d907e47..2c3062f142c 100644 --- a/examples/gno.land/r/demo/users/z_10_filetest.gno +++ b/examples/gno.land/r/demo/users/z_10_filetest.gno @@ -11,7 +11,7 @@ import ( const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func init() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main test2 := testutils.TestAddress("test2") // as admin, invite gnouser and test2 std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/users/z_2_filetest.gno b/examples/gno.land/r/demo/users/z_2_filetest.gno index a99e8fd12ee..306ec3bf5a1 100644 --- a/examples/gno.land/r/demo/users/z_2_filetest.gno +++ b/examples/gno.land/r/demo/users/z_2_filetest.gno @@ -12,7 +12,7 @@ import ( const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main users.Register("", "gnouser", "my profile") // as admin, grant invites to gnouser std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/users/z_3_filetest.gno b/examples/gno.land/r/demo/users/z_3_filetest.gno index 1cd3886152a..e0d480a2587 100644 --- a/examples/gno.land/r/demo/users/z_3_filetest.gno +++ b/examples/gno.land/r/demo/users/z_3_filetest.gno @@ -12,7 +12,7 @@ import ( const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main users.Register("", "gnouser", "my profile") // as admin, grant invites to gnouser std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/users/z_4_filetest.gno b/examples/gno.land/r/demo/users/z_4_filetest.gno index 51bd255e3e7..46efd2bc64d 100644 --- a/examples/gno.land/r/demo/users/z_4_filetest.gno +++ b/examples/gno.land/r/demo/users/z_4_filetest.gno @@ -12,7 +12,7 @@ import ( const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main users.Register("", "gnouser", "my profile") // as admin, grant invites to gnouser std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/users/z_5_filetest.gno b/examples/gno.land/r/demo/users/z_5_filetest.gno index 5a96eec5322..85e059957c4 100644 --- a/examples/gno.land/r/demo/users/z_5_filetest.gno +++ b/examples/gno.land/r/demo/users/z_5_filetest.gno @@ -12,7 +12,7 @@ import ( const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main users.Register("", "gnouser", "my profile") // as admin, grant invites to gnouser std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/users/z_6_filetest.gno b/examples/gno.land/r/demo/users/z_6_filetest.gno index bc6d747ebbe..160db4497e9 100644 --- a/examples/gno.land/r/demo/users/z_6_filetest.gno +++ b/examples/gno.land/r/demo/users/z_6_filetest.gno @@ -10,7 +10,7 @@ import ( const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() + caller := std.OrigCaller() // as admin, grant invites to unregistered user. std.TestSetOrigCaller(admin) users.GrantInvites(caller.String() + ":1") diff --git a/examples/gno.land/r/demo/users/z_7_filetest.gno b/examples/gno.land/r/demo/users/z_7_filetest.gno index 60efc3b91ea..7c4f34f8142 100644 --- a/examples/gno.land/r/demo/users/z_7_filetest.gno +++ b/examples/gno.land/r/demo/users/z_7_filetest.gno @@ -12,7 +12,7 @@ import ( const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main users.Register("", "gnouser", "my profile") // as admin, grant invites to gnouser std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/users/z_7b_filetest.gno b/examples/gno.land/r/demo/users/z_7b_filetest.gno index 81f1076b3d1..a4adfbb1c32 100644 --- a/examples/gno.land/r/demo/users/z_7b_filetest.gno +++ b/examples/gno.land/r/demo/users/z_7b_filetest.gno @@ -12,7 +12,7 @@ import ( const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main users.Register("", "gnouser", "my profile") // as admin, grant invites to gnouser std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/users/z_8_filetest.gno b/examples/gno.land/r/demo/users/z_8_filetest.gno index 56c13862257..1d7f640474d 100644 --- a/examples/gno.land/r/demo/users/z_8_filetest.gno +++ b/examples/gno.land/r/demo/users/z_8_filetest.gno @@ -12,7 +12,7 @@ import ( const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main users.Register("", "gnouser", "my profile") // as admin, grant invites to gnouser std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/users/z_9_filetest.gno b/examples/gno.land/r/demo/users/z_9_filetest.gno index e77a68d7ff9..541559720f5 100644 --- a/examples/gno.land/r/demo/users/z_9_filetest.gno +++ b/examples/gno.land/r/demo/users/z_9_filetest.gno @@ -10,7 +10,7 @@ import ( const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj") func main() { - caller := std.GetOrigCaller() // main + caller := std.OrigCaller() // main test2 := testutils.TestAddress("test2") // as admin, invite gnouser and test2 std.TestSetOrigCaller(admin) diff --git a/examples/gno.land/r/demo/x/upgrade/upgrade-b/v1/v1.gno b/examples/gno.land/r/demo/x/upgrade/upgrade-b/v1/v1.gno index 1298b2539be..4f75044a856 100644 --- a/examples/gno.land/r/demo/x/upgrade/upgrade-b/v1/v1.gno +++ b/examples/gno.land/r/demo/x/upgrade/upgrade-b/v1/v1.gno @@ -24,8 +24,8 @@ func SetNextVersion(addr string) { // assert CallTx call. std.AssertOriginCall() // assert admin. - caller := std.GetCallerAt(2) - if caller != std.GetOrigCaller() { + caller := std.CallerAt(2) + if caller != std.OrigCaller() { panic("should not happen") // because std.AssertOrigCall(). } if caller != admin { diff --git a/examples/gno.land/r/demo/x/upgrade/upgrade-b/v2/v2.gno b/examples/gno.land/r/demo/x/upgrade/upgrade-b/v2/v2.gno index 883f535a9b4..7e12e5d3641 100644 --- a/examples/gno.land/r/demo/x/upgrade/upgrade-b/v2/v2.gno +++ b/examples/gno.land/r/demo/x/upgrade/upgrade-b/v2/v2.gno @@ -28,8 +28,8 @@ func SetNextVersion(addr string) { // assert CallTx call. std.AssertOriginCall() // assert admin. - caller := std.GetCallerAt(2) - if caller != std.GetOrigCaller() { + caller := std.CallerAt(2) + if caller != std.OrigCaller() { panic("should not happen") // because std.AssertOrigCall(). } if caller != admin { diff --git a/examples/gno.land/r/gnoland/blog/admin.gno b/examples/gno.land/r/gnoland/blog/admin.gno index 14ac6373552..f4dbad6c8b8 100644 --- a/examples/gno.land/r/gnoland/blog/admin.gno +++ b/examples/gno.land/r/gnoland/blog/admin.gno @@ -15,7 +15,7 @@ var ( ) func init() { - // adminAddr = std.GetOrigCaller() // FIXME: find a way to use this from the main's genesis. + // adminAddr = std.OrigCaller() // FIXME: find a way to use this from the main's genesis. adminAddr = "g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq" } @@ -41,7 +41,7 @@ func AdminRemoveModerator(addr std.Address) { func ModAddPost(slug, title, body, tags string) { assertIsModerator() - caller := std.GetOrigCaller() + caller := std.OrigCaller() tagList := strings.Split(tags, ",") err := b.NewPost(caller, slug, title, body, tagList) checkErr(err) @@ -87,14 +87,14 @@ func isCommenter(addr std.Address) bool { } func assertIsAdmin() { - caller := std.GetOrigCaller() + caller := std.OrigCaller() if !isAdmin(caller) { panic("access restricted.") } } func assertIsModerator() { - caller := std.GetOrigCaller() + caller := std.OrigCaller() if isAdmin(caller) || isModerator(caller) { return } @@ -102,7 +102,7 @@ func assertIsModerator() { } func assertIsCommenter() { - caller := std.GetOrigCaller() + caller := std.OrigCaller() if isAdmin(caller) || isModerator(caller) || isCommenter(caller) { return } diff --git a/examples/gno.land/r/gnoland/blog/gnoblog.gno b/examples/gno.land/r/gnoland/blog/gnoblog.gno index 2982ea88489..9390af37ea7 100644 --- a/examples/gno.land/r/gnoland/blog/gnoblog.gno +++ b/examples/gno.land/r/gnoland/blog/gnoblog.gno @@ -15,7 +15,7 @@ func AddComment(postSlug, comment string) { assertIsCommenter() assertNotInPause() - caller := std.GetOrigCaller() + caller := std.OrigCaller() err := b.GetPost(postSlug).AddComment(caller, comment) checkErr(err) } diff --git a/examples/gno.land/r/gnoland/blog/gnoblog_test.gno b/examples/gno.land/r/gnoland/blog/gnoblog_test.gno index 46dfecd4494..679d0698f8e 100644 --- a/examples/gno.land/r/gnoland/blog/gnoblog_test.gno +++ b/examples/gno.land/r/gnoland/blog/gnoblog_test.gno @@ -9,7 +9,7 @@ import ( func TestPackage(t *testing.T) { std.TestSetOrigCaller(std.Address("g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq")) - author := std.GetOrigCaller() + author := std.OrigCaller() // by default, no posts. { diff --git a/examples/gno.land/r/gnoland/faucet/admin.gno b/examples/gno.land/r/gnoland/faucet/admin.gno index a4916c5af02..2c824eab365 100644 --- a/examples/gno.land/r/gnoland/faucet/admin.gno +++ b/examples/gno.land/r/gnoland/faucet/admin.gno @@ -79,7 +79,7 @@ func AdminRemoveController(addr std.Address) string { } func assertIsAdmin() error { - caller := std.GetOrigCaller() + caller := std.OrigCaller() if caller != gAdminAddr { return errors.New("restricted for admin") } diff --git a/examples/gno.land/r/gnoland/faucet/faucet.gno b/examples/gno.land/r/gnoland/faucet/faucet.gno index c9d8ed503d0..b603c58d4e2 100644 --- a/examples/gno.land/r/gnoland/faucet/faucet.gno +++ b/examples/gno.land/r/gnoland/faucet/faucet.gno @@ -42,8 +42,8 @@ func Transfer(to std.Address, send int64) string { gTotalTransferred = gTotalTransferred.Add(sendCoins) gTotalTransfers++ - banker := std.GetBanker(std.BankerTypeRealmSend) - pkgaddr := std.GetOrigPkgAddr() + banker := std.Banker(std.BankerTypeRealmSend) + pkgaddr := std.OrigPkgAddr() banker.SendCoins(pkgaddr, to, sendCoins) return "" } @@ -53,8 +53,8 @@ func GetPerTransferLimit() int64 { } func Render(_ string) string { - banker := std.GetBanker(std.BankerTypeRealmSend) - balance := banker.GetCoins(std.GetOrigPkgAddr()) + banker := std.Banker(std.BankerTypeRealmSend) + balance := banker.Coins(std.OrigPkgAddr()) output := gMessage if gInPause { @@ -65,7 +65,7 @@ func Render(_ string) string { output += ufmt.Sprintf("Balance: %s.\n", balance.String()) output += ufmt.Sprintf("Total transfers: %s (in %d times).\n\n", gTotalTransferred.String(), gTotalTransfers) - output += "Package address: " + std.GetOrigPkgAddr().String() + "\n\n" + output += "Package address: " + std.OrigPkgAddr().String() + "\n\n" output += ufmt.Sprintf("Admin: %s\n\n ", gAdminAddr.String()) output += ufmt.Sprintf("Controllers:\n\n ") @@ -81,7 +81,7 @@ func Render(_ string) string { } func assertIsController() error { - caller := std.GetOrigCaller() + caller := std.OrigCaller() ok := gControllers.Has(caller.String()) if !ok { diff --git a/examples/gno.land/r/gnoland/faucet/faucet_test.gno b/examples/gno.land/r/gnoland/faucet/faucet_test.gno index c1202e09611..a910f414288 100644 --- a/examples/gno.land/r/gnoland/faucet/faucet_test.gno +++ b/examples/gno.land/r/gnoland/faucet/faucet_test.gno @@ -108,8 +108,8 @@ func assertNoErr(t *testing.T, err string) { func assertBalance(t *testing.T, addr std.Address, expectedBal int64) { t.Helper() - banker := std.GetBanker(std.BankerTypeReadonly) - coins := banker.GetCoins(addr) + banker := std.Banker(std.BankerTypeReadonly) + coins := banker.Coins(addr) got := coins.AmountOf("ugnot") if expectedBal != got { diff --git a/gno.land/genesis/genesis_txs.txt b/gno.land/genesis/genesis_txs.txt index 33257380260..4e500ee0275 100644 --- a/gno.land/genesis/genesis_txs.txt +++ b/gno.land/genesis/genesis_txs.txt @@ -10,7 +10,7 @@ {"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateBoard","args":["testboard"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"A+FhNtsXHjLfSJk1lB8FbiL4mGPjc50Kt81J7EKDnJ2y"},"signature":"vzlSxEFh5jOkaSdv3rsV91v/OJKEF2qSuoCpri1u5tRWq62T7xr3KHRCF5qFnn4aQX/yE8g8f/Y//WPOCUGhJw=="}],"memo":""} {"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","Hello World","This is a demo of Gno smart contract programming. This document was\nconstructed by Gno onto a smart contract hosted on the data Realm \nname [\"gno.land/r/demo/boards\"](https://gno.land/r/demo/boards/)\n([github](https://github.com/gnolang/gno/tree/master/examples/gno.land/r/demo/boards)).\n\n## Starting the `gnoland` node node/validator.\n\nNOTE: Where you see `--remote %%REMOTE%%` here, that flag can be replaced\nwith `--remote localhost:26657` for local testnets.\n\n### build gnoland.\n\n```bash\ngit clone git@github.com:gnolang/gno.git\ncd ./gno\nmake \n```\n\n### add test account.\n\n```bash\n./build/gnokey add test1 --recover\n```\n\nUse this mnemonic:\n\u003e source bonus chronic canvas draft south burst lottery vacant surface solve popular case indicate oppose farm nothing bullet exhibit title speed wink action roast\n\n### start gnoland validator node.\n\n```bash\n./build/gnoland\n```\n\n(This can be reset with `make reset`).\n\n### start gnoland web server (optional).\n\n```bash\ngo run ./gnoland/website\n```\n\n## Signing and broadcasting transactions.\n\n### publish the \"gno.land/p/demo/avl\" package.\n\n```bash\n./build/gnokey maketx addpkg test1 --pkgpath \"gno.land/p/demo/avl\" --pkgdir \"examples/gno.land/p/demo/avl\" --deposit 100ugnot --gas-fee 1ugnot --gas-wanted 2000000 \u003e addpkg.avl.unsigned.txt\n./build/gnokey query \"auth/accounts/g1jg8mtutu9khhfwc4nxmuhcpftf0pajdhfvsqf5\"\n./build/gnokey sign test1 --txpath addpkg.avl.unsigned.txt --chainid \"%%CHAINID%%\" --number 0 --sequence 0 \u003e addpkg.avl.signed.txt\n./build/gnokey broadcast addpkg.avl.signed.txt --remote %%REMOTE%%\n```\n\n### publish the \"gno.land/r/demo/boards\" realm package.\n\n```bash\n./build/gnokey maketx addpkg test1 --pkgpath \"gno.land/r/demo/boards\" --pkgdir \"examples/gno.land/r/demo/boards\" --deposit 100ugnot --gas-fee 1ugnot --gas-wanted 300000000 \u003e addpkg.boards.unsigned.txt\n./build/gnokey sign test1 --txpath addpkg.boards.unsigned.txt --chainid \"%%CHAINID%%\" --number 0 --sequence 1 \u003e addpkg.boards.signed.txt\n./build/gnokey broadcast addpkg.boards.signed.txt --remote %%REMOTE%%\n```\n\n### create a board with a smart contract call.\n\n```bash\n./build/gnokey maketx call test1 --pkgpath \"gno.land/r/demo/boards\" --func CreateBoard --args \"testboard\" --gas-fee 1ugnot --gas-wanted 2000000 \u003e createboard.unsigned.txt\n./build/gnokey sign test1 --txpath createboard.unsigned.txt --chainid \"%%CHAINID%%\" --number 0 --sequence 2 \u003e createboard.signed.txt\n./build/gnokey broadcast createboard.signed.txt --remote %%REMOTE%%\n```\nNext, query for the permanent board ID by querying (you need this to create a new post):\n\n```bash\n./build/gnokey query \"vm/qeval\" --data \"gno.land/r/demo/boards\nGetBoardIDFromName(\\\"testboard\\\")\"\n```\n\n### create a post of a board with a smart contract call.\n\n```bash\n./build/gnokey maketx call test1 --pkgpath \"gno.land/r/demo/boards\" --func CreatePost --args 1 --args \"Hello World\" --args#file \"./examples/gno.land/r/demo/boards/README.md\" --gas-fee 1ugnot --gas-wanted 2000000 \u003e createpost.unsigned.txt\n./build/gnokey sign test1 --txpath createpost.unsigned.txt --chainid \"%%CHAINID%%\" --number 0 --sequence 3 \u003e createpost.signed.txt\n./build/gnokey broadcast createpost.signed.txt --remote %%REMOTE%%\n```\n\n### create a comment to a post.\n\n```bash\n./build/gnokey maketx call test1 --pkgpath \"gno.land/r/demo/boards\" --func CreateReply --args 1 --args 1 --args \"A comment\" --gas-fee 1ugnot --gas-wanted 2000000 \u003e createcomment.unsigned.txt\n./build/gnokey sign test1 --txpath createcomment.unsigned.txt --chainid \"%%CHAINID%%\" --number 0 --sequence 4 \u003e createcomment.signed.txt\n./build/gnokey broadcast createcomment.signed.txt --remote %%REMOTE%%\n```\n\n```bash\n./build/gnokey query \"vm/qrender\" --data \"gno.land/r/demo/boards\ntestboard/1\"\n```\n\n### render page with optional path expression.\n\nThe contents of `https://gno.land/r/demo/boards:` and `https://gno.land/r/demo/boards:testboard` are rendered by calling\nthe `Render(path string)` function like so:\n\n```bash\n./build/gnokey query \"vm/qrender\" --data \"gno.land/r/demo/boards\ntestboard\"\n```\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"A+FhNtsXHjLfSJk1lB8FbiL4mGPjc50Kt81J7EKDnJ2y"},"signature":"V43B1waFxhzheW9TfmCpjLdrC4dC1yjUGES5y3J6QsNar6hRpNz4G1thzWmWK7xXhg8u1PCIpxLxGczKQYhuPw=="}],"memo":""} {"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","NFT example","NFT's are all the rage these days, for various reasons.\n\nI read over EIP-721 which appears to be the de-facto NFT standard on Ethereum. Then, made a sample implementation of EIP-721 (let's here called GRC-721). The implementation isn't complete, but it demonstrates the main functionality.\n\n - [EIP-721](https://eips.ethereum.org/EIPS/eip-721)\n - [gno.land/r/demo/nft/nft.gno](https://gno.land/r/demo/nft/nft.gno)\n - [zrealm_nft3.gno test](https://github.com/gnolang/gno/blob/master/examples/gno.land/r/demo/nft/z_3_filetest.gno)\n\nIn short, this demonstrates how to implement Ethereum contract interfaces in Gno.land; by using only standard Go language features.\n\nPlease leave a comment ([guide](https://gno.land/r/demo/boards:testboard/1)).\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"A+FhNtsXHjLfSJk1lB8FbiL4mGPjc50Kt81J7EKDnJ2y"},"signature":"ZXfrTiHxPFQL8uSm+Tv7WXIHPMca9okhm94RAlC6YgNbB1VHQYYpoP4w+cnL3YskVzGrOZxensXa9CAZ+cNNeg=="}],"memo":""} -{"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","Simple echo example with coins","This is a simple test realm contract that demonstrates how to use the banker.\n\nSee [gno.land/r/demo/banktest/banktest.gno](/r/banktest/banktest.gno) to see the original contract code.\n\nThis article will go through each line to explain how it works.\n\n```go\npackage banktest\n```\n\nThis package is locally named \"banktest\" (could be anything).\n\n```go\nimport (\n\t\"std\"\n)\n```\n\nThe \"std\" package is defined by the gno code in stdlibs/std/. \u003c/br\u003e\nSelf explanatory; and you'll see more usage from std later.\n\n```go\ntype activity struct {\n\tcaller std.Address\n\tsent std.Coins\n\treturned std.Coins\n\ttime std.Time\n}\n\nfunc (act *activity) String() string {\n\treturn act.caller.String() + \" \" +\n\t\tact.sent.String() + \" sent, \" +\n\t\tact.returned.String() + \" returned, at \" +\n\t\tstd.FormatTimestamp(act.time, \"2006-01-02 3:04pm MST\")\n}\n\nvar latest [10]*activity\n```\n\nThis is just maintaining a list of recent activity to this contract.\nNotice that the \"latest\" variable is defined \"globally\" within\nthe context of the realm with path \"gno.land/r/demo/banktest\".\n\nThis means that calls to functions defined within this package\nare encapsulated within this \"data realm\", where the data is \nmutated based on transactions that can potentially cross many\nrealm and non-realm packge boundaries (in the call stack).\n\n```go\n// Deposit will take the coins (to the realm's pkgaddr) or return them to user.\nfunc Deposit(returnDenom string, returnAmount int64) string {\n\tstd.AssertOriginCall()\n\tcaller := std.GetOrigCaller()\n\tsend := std.Coins{{returnDenom, returnAmount}}\n```\n\nThis is the beginning of the definition of the contract function named\n\"Deposit\". `std.AssertOriginCall() asserts that this function was called by a\ngno transactional Message. The caller is the user who signed off on this\ntransactional message. Send is the amount of deposit sent along with this\nmessage.\n\n```go\n\t// record activity\n\tact := \u0026activity{\n\t\tcaller: caller,\n\t\tsent: std.GetOrigSend(),\n\t\treturned: send,\n\t\ttime: std.GetTimestamp(),\n\t}\n\tfor i := len(latest) - 2; i \u003e= 0; i-- {\n\t\tlatest[i+1] = latest[i] // shift by +1.\n\t}\n\tlatest[0] = act\n```\n\nUpdating the \"latest\" array for viewing at gno.land/r/demo/banktest: (w/ trailing colon).\n\n```go\n\t// return if any.\n\tif returnAmount \u003e 0 {\n```\n\nIf the user requested the return of coins...\n\n```go\n\t\tbanker := std.GetBanker(std.BankerTypeOrigSend)\n```\n\nuse a std.Banker instance to return any deposited coins to the original sender.\n\n```go\n\t\tpkgaddr := std.GetOrigPkgAddr()\n\t\t// TODO: use std.Coins constructors, this isn't generally safe.\n\t\tbanker.SendCoins(pkgaddr, caller, send)\n\t\treturn \"returned!\"\n```\n\nNotice that each realm package has an associated Cosmos address.\n\n\nFinally, the results are rendered via an ABCI query call when you visit [/r/banktest:](/r/banktest:).\n\n```go\nfunc Render(path string) string {\n\t// get realm coins.\n\tbanker := std.GetBanker(std.BankerTypeReadonly)\n\tcoins := banker.GetCoins(std.GetOrigPkgAddr())\n\n\t// render\n\tres := \"\"\n\tres += \"## recent activity\\n\"\n\tres += \"\\n\"\n\tfor _, act := range latest {\n\t\tif act == nil {\n\t\t\tbreak\n\t\t}\n\t\tres += \" * \" + act.String() + \"\\n\"\n\t}\n\tres += \"\\n\"\n\tres += \"## total deposits\\n\"\n\tres += coins.String()\n\treturn res\n}\n```\n\nYou can call this contract yourself, by vistiing [/r/banktest](/r/banktest) and the [quickstart guide](/r/boards:testboard/4).\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"A+FhNtsXHjLfSJk1lB8FbiL4mGPjc50Kt81J7EKDnJ2y"},"signature":"iZX/llZlNTdZMLv1goCTgK2bWqzT8enlTq56wMTCpVxJGA0BTvuEM5Nnt9vrnlG6Taqj2GuTrmEnJBkDFTmt9g=="}],"memo":""} +{"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","Simple echo example with coins","This is a simple test realm contract that demonstrates how to use the banker.\n\nSee [gno.land/r/demo/banktest/banktest.gno](/r/banktest/banktest.gno) to see the original contract code.\n\nThis article will go through each line to explain how it works.\n\n```go\npackage banktest\n```\n\nThis package is locally named \"banktest\" (could be anything).\n\n```go\nimport (\n\t\"std\"\n)\n```\n\nThe \"std\" package is defined by the gno code in stdlibs/std/. \u003c/br\u003e\nSelf explanatory; and you'll see more usage from std later.\n\n```go\ntype activity struct {\n\tcaller std.Address\n\tsent std.Coins\n\treturned std.Coins\n\ttime std.Time\n}\n\nfunc (act *activity) String() string {\n\treturn act.caller.String() + \" \" +\n\t\tact.sent.String() + \" sent, \" +\n\t\tact.returned.String() + \" returned, at \" +\n\t\tstd.FormatTimestamp(act.time, \"2006-01-02 3:04pm MST\")\n}\n\nvar latest [10]*activity\n```\n\nThis is just maintaining a list of recent activity to this contract.\nNotice that the \"latest\" variable is defined \"globally\" within\nthe context of the realm with path \"gno.land/r/demo/banktest\".\n\nThis means that calls to functions defined within this package\nare encapsulated within this \"data realm\", where the data is \nmutated based on transactions that can potentially cross many\nrealm and non-realm packge boundaries (in the call stack).\n\n```go\n// Deposit will take the coins (to the realm's pkgaddr) or return them to user.\nfunc Deposit(returnDenom string, returnAmount int64) string {\n\tstd.AssertOriginCall()\n\tcaller := std.OrigCaller()\n\tsend := std.Coins{{returnDenom, returnAmount}}\n```\n\nThis is the beginning of the definition of the contract function named\n\"Deposit\". `std.AssertOriginCall() asserts that this function was called by a\ngno transactional Message. The caller is the user who signed off on this\ntransactional message. Send is the amount of deposit sent along with this\nmessage.\n\n```go\n\t// record activity\n\tact := \u0026activity{\n\t\tcaller: caller,\n\t\tsent: std.OrigSend(),\n\t\treturned: send,\n\t\ttime: std.Timestamp(),\n\t}\n\tfor i := len(latest) - 2; i \u003e= 0; i-- {\n\t\tlatest[i+1] = latest[i] // shift by +1.\n\t}\n\tlatest[0] = act\n```\n\nUpdating the \"latest\" array for viewing at gno.land/r/demo/banktest: (w/ trailing colon).\n\n```go\n\t// return if any.\n\tif returnAmount \u003e 0 {\n```\n\nIf the user requested the return of coins...\n\n```go\n\t\tbanker := std.Banker(std.BankerTypeOrigSend)\n```\n\nuse a std.Banker instance to return any deposited coins to the original sender.\n\n```go\n\t\tpkgaddr := std.OrigPkgAddr()\n\t\t// TODO: use std.Coins constructors, this isn't generally safe.\n\t\tbanker.SendCoins(pkgaddr, caller, send)\n\t\treturn \"returned!\"\n```\n\nNotice that each realm package has an associated Cosmos address.\n\n\nFinally, the results are rendered via an ABCI query call when you visit [/r/banktest:](/r/banktest:).\n\n```go\nfunc Render(path string) string {\n\t// get realm coins.\n\tbanker := std.Banker(std.BankerTypeReadonly)\n\tcoins := banker.Coins(std.OrigPkgAddr())\n\n\t// render\n\tres := \"\"\n\tres += \"## recent activity\\n\"\n\tres += \"\\n\"\n\tfor _, act := range latest {\n\t\tif act == nil {\n\t\t\tbreak\n\t\t}\n\t\tres += \" * \" + act.String() + \"\\n\"\n\t}\n\tres += \"\\n\"\n\tres += \"## total deposits\\n\"\n\tres += coins.String()\n\treturn res\n}\n```\n\nYou can call this contract yourself, by vistiing [/r/banktest](/r/banktest) and the [quickstart guide](/r/boards:testboard/4).\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"A+FhNtsXHjLfSJk1lB8FbiL4mGPjc50Kt81J7EKDnJ2y"},"signature":"iZX/llZlNTdZMLv1goCTgK2bWqzT8enlTq56wMTCpVxJGA0BTvuEM5Nnt9vrnlG6Taqj2GuTrmEnJBkDFTmt9g=="}],"memo":""} {"msg":[{"@type":"/vm.m_call","caller":"g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","TASK: Describe in your words","Describe in an essay (250+ words), on your favorite medium, why you are interested in gno.land and gnolang.\n\nReply here with a URL link to your written piece as a comment, for rewards.\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"AmG6kzznyo1uNqWPAYU6wDpsmzQKDaEOrVRaZ08vOyX0"},"signature":"4HBNtrta8HdeHj4JTN56PBTRK8GOe31NMRRXDiyYtjozuyRdWfOGEsGjGgHWcoBUJq6DepBgD4FetdqfhZ6TNQ=="}],"memo":""} {"msg":[{"@type":"/vm.m_call","caller":"g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq","send":"","pkg_path":"gno.land/r/demo/boards","func":"CreateThread","args":["1","Getting Started","This is a demo of Gno smart contract programming. This document was\nconstructed by Gno onto a smart contract hosted on the data Realm\nname [\"gno.land/r/demo/boards\"](https://gno.land/r/demo/boards/)\n([github](https://github.com/gnolang/gno/tree/master/examples/gno.land/r/demo/boards)).\n\n\n\n## Build `gnokey`, create your account, and interact with Gno.\n\nNOTE: Where you see `--remote %%REMOTE%%` here, that flag can be replaced\nwith `--remote localhost:26657` for local testnets.\n\n### Build `gnokey`.\n\n```bash\ngit clone git@github.com:gnolang/gno.git\ncd ./gno\nmake\n```\n\n### Generate a seed/mnemonic code.\n\n```bash\n./build/gnokey generate\n```\n\nNOTE: You can generate 24 words with any good bip39 generator.\n\n### Create a new account using your mnemonic.\n\n```bash\n./build/gnokey add KEYNAME --recover\n```\n\nNOTE: `KEYNAME` is your key identifier, and should be changed.\n\n### Verify that you can see your account locally.\n\n```bash\n./build/gnokey list\n```\n\n## Interact with the blockchain:\n\n### Get your current balance, account number, and sequence number.\n\n```bash\n./build/gnokey query auth/accounts/ACCOUNT_ADDR --remote %%REMOTE%%\n```\n\nNOTE: you can retrieve your `ACCOUNT_ADDR` with `./build/gnokey list`.\n\n### Acquire testnet tokens using the official faucet.\n\nGo to https://gno.land/faucet\n\n### Create a board with a smart contract call.\n\nNOTE: `BOARDNAME` will be the slug of the board, and should be changed.\n\n```bash\n./build/gnokey maketx call KEYNAME --pkgpath \"gno.land/r/demo/boards\" --func \"CreateBoard\" --args \"BOARDNAME\" --gas-fee \"1000000ugnot\" --gas-wanted \"2000000\" --broadcast true --chainid %%CHAINID%% --remote %%REMOTE%%\n```\n\nInteractive documentation: https://gno.land/r/demo/boards?help\u0026__func=CreateBoard\n\nNext, query for the permanent board ID by querying (you need this to create a new post):\n\n```bash\n./build/gnokey query \"vm/qeval\" --data \"gno.land/r/demo/boards\nGetBoardIDFromName(\\\"BOARDNAME\\\")\" --remote %%REMOTE%%\n```\n\n### Create a post of a board with a smart contract call.\n\nNOTE: If a board was created successfully, your SEQUENCE_NUMBER would have increased.\n\n```bash\n./build/gnokey maketx call KEYNAME --pkgpath \"gno.land/r/demo/boards\" --func \"CreateThread\" --args BOARD_ID --args \"Hello gno.land\" --args\\#file \"./examples/gno.land/r/demo/boards/example_post.md\" --gas-fee 1000000ugnot --gas-wanted 2000000 --broadcast true --chainid %%CHAINID%% --remote %%REMOTE%%\n```\n\nInteractive documentation: https://gno.land/r/demo/boards?help\u0026__func=CreateThread\n\n### Create a comment to a post.\n\n```bash\n./build/gnokey maketx call KEYNAME --pkgpath \"gno.land/r/demo/boards\" --func \"CreateReply\" --args \"BOARD_ID\" --args \"1\" --args \"1\" --args \"Nice to meet you too.\" --gas-fee 1000000ugnot --gas-wanted 2000000 --broadcast true --chainid %%CHAINID%% --remote %%REMOTE%%\n```\n\nInteractive documentation: https://gno.land/r/demo/boards?help\u0026__func=CreateReply\n\n```bash\n./build/gnokey query \"vm/qrender\" --data \"gno.land/r/demo/boards\nBOARDNAME/1\" --remote %%REMOTE%%\n```\n\n### Render page with optional path expression.\n\nThe contents of `https://gno.land/r/demo/boards:` and `https://gno.land/r/demo/boards:gnolang` are rendered by calling\nthe `Render(path string)` function like so:\n\n```bash\n./build/gnokey query \"vm/qrender\" --data \"gno.land/r/demo/boards\ngnolang\"\n```\n\n## Starting a local `gnoland` node:\n\n### Add test account.\n\n```bash\n./build/gnokey add test1 --recover\n```\n\nUse this mneonic:\n\u003e source bonus chronic canvas draft south burst lottery vacant surface solve popular case indicate oppose farm nothing bullet exhibit title speed wink action roast\n\n### Start `gnoland` node.\n\n```bash\n./build/gnoland\n```\n\nNOTE: This can be reset with `make reset`\n\n### Publish the \"gno.land/p/demo/avl\" package.\n\n```bash\n./build/gnokey maketx addpkg test1 --pkgpath \"gno.land/p/demo/avl\" --pkgdir \"examples/gno.land/p/demo/avl\" --deposit 100000000ugnot --gas-fee 1000000ugnot --gas-wanted 2000000 --broadcast true --chainid %%CHAINID%% --remote localhost:26657\n```\n\n### Publish the \"gno.land/r/demo/boards\" realm package.\n\n```bash\n./build/gnokey maketx addpkg test1 --pkgpath \"gno.land/r/demo/boards\" --pkgdir \"examples/gno.land/r/demo/boards\" --deposit 100000000ugnot --gas-fee 1000000ugnot --gas-wanted 300000000 --broadcast true --chainid %%CHAINID%% --remote localhost:26657\n```\n"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"AnK+a6mcFDjY6b/v6p7r8QFW1M1PgIoQxBgrwOoyY7v3"},"signature":"sHjOGXZEi9wt2FSXFHmkDDoVQyepvFHKRDDU0zgedHYnCYPx5/YndyihsDD5Y2Z7/RgNYBh4JlJwDMGFNStzBQ=="}],"memo":""} {"msg":[{"@type":"/vm.m_call","caller":"g1u7y667z64x2h7vc6fmpcprgey4ck233jaww9zq","send":"","pkg_path":"gno.land/r/gnoland/blog","func":"ModAddPost","args":["post1","First post","Lorem Ipsum", "tag1,tag2"]}],"fee":{"gas_wanted":"2000000","gas_fee":"1000000ugnot"},"signatures":[{"pub_key":{"@type":"/tm.PubKeySecp256k1","value":"AnK+a6mcFDjY6b/v6p7r8QFW1M1PgIoQxBgrwOoyY7v3"},"signature":"sHjOGXZEi9wt2FSXFHmkDDoVQyepvFHKRDDU0zgedHYnCYPx5/YndyihsDD5Y2Z7/RgNYBh4JlJwDMGFNStzBQ=="}],"memo":""} diff --git a/gnovm/stdlibs/banker.go b/gnovm/stdlibs/banker.go index 82bf1bad42a..ea9233c45e2 100644 --- a/gnovm/stdlibs/banker.go +++ b/gnovm/stdlibs/banker.go @@ -13,14 +13,14 @@ import ( // becomes available in Gno that implements // stdlibs/std.Banker. type Banker interface { - GetCoins(addr crypto.Bech32Address) (dst std.Coins) + Coins(addr crypto.Bech32Address) (dst std.Coins) SendCoins(from, to crypto.Bech32Address, amt std.Coins) TotalCoin(denom string) int64 IssueCoin(addr crypto.Bech32Address, denom string, amount int64) RemoveCoin(addr crypto.Bech32Address, denom string, amount int64) } -// Used in std.GetBanker(options). +// Used in std.Banker(options). // Also available as Gno in stdlibs/std/banker.go type BankerType uint8 @@ -47,8 +47,8 @@ func NewReadonlyBanker(banker Banker) ReadonlyBanker { return ReadonlyBanker{banker} } -func (rb ReadonlyBanker) GetCoins(addr crypto.Bech32Address) (dst std.Coins) { - return rb.banker.GetCoins(addr) +func (rb ReadonlyBanker) Coins(addr crypto.Bech32Address) (dst std.Coins) { + return rb.banker.Coins(addr) } func (rb ReadonlyBanker) SendCoins(from, to crypto.Bech32Address, amt std.Coins) { @@ -89,8 +89,8 @@ func NewOrigSendBanker(banker Banker, pkgAddr crypto.Bech32Address, origSend std } } -func (osb OrigSendBanker) GetCoins(addr crypto.Bech32Address) (dst std.Coins) { - return osb.banker.GetCoins(addr) +func (osb OrigSendBanker) Coins(addr crypto.Bech32Address) (dst std.Coins) { + return osb.banker.Coins(addr) } func (osb OrigSendBanker) SendCoins(from, to crypto.Bech32Address, amt std.Coins) { @@ -136,8 +136,8 @@ func NewRealmSendBanker(banker Banker, pkgAddr crypto.Bech32Address) RealmSendBa } } -func (rsb RealmSendBanker) GetCoins(addr crypto.Bech32Address) (dst std.Coins) { - return rsb.banker.GetCoins(addr) +func (rsb RealmSendBanker) Coins(addr crypto.Bech32Address) (dst std.Coins) { + return rsb.banker.Coins(addr) } func (rsb RealmSendBanker) SendCoins(from, to crypto.Bech32Address, amt std.Coins) { diff --git a/gnovm/stdlibs/std/banker.gno b/gnovm/stdlibs/std/banker.gno index 44e611b780f..710addda5ba 100644 --- a/gnovm/stdlibs/std/banker.gno +++ b/gnovm/stdlibs/std/banker.gno @@ -1,6 +1,6 @@ package std -// Realm functions can call std.GetBanker(options) to get +// Realm functions can call std.Banker(options) to get // a banker instance. Banker objects cannot be persisted, // but can be passed onto other functions to be transacted // on. A banker instance can be passed onto other realm @@ -15,7 +15,7 @@ package std // type, and those can't return non-primitive objects // (without confusion). type Banker interface { - GetCoins(addr Address) (dst Coins) + Coins(addr Address) (dst Coins) SendCoins(from, to Address, amt Coins) TotalCoin(denom string) int64 IssueCoin(addr Address, denom string, amount int64) @@ -44,9 +44,9 @@ type bankAdapter struct { nativeBanker Banker } -func (ba bankAdapter) GetCoins(addr Address) (dst Coins) { +func (ba bankAdapter) Coins(addr Address) (dst Coins) { // convert native -> gno - coins := ba.nativeBanker.GetCoins(addr) + coins := ba.nativeBanker.Coins(addr) for _, coin := range coins { dst = append(dst, (Coin)(coin)) } diff --git a/gnovm/stdlibs/std/context.gno b/gnovm/stdlibs/std/context.gno index 878c963b22b..e39af0cbd0b 100644 --- a/gnovm/stdlibs/std/context.gno +++ b/gnovm/stdlibs/std/context.gno @@ -1,4 +1,4 @@ package std // ExecContext is not exposed, -// use native injections std.GetChainID(), std.GetHeight() etc instead. +// use native injections std.ChainID(), std.Height() etc instead. diff --git a/gnovm/stdlibs/stdlibs.go b/gnovm/stdlibs/stdlibs.go index 95803558d06..c04750b99e7 100644 --- a/gnovm/stdlibs/stdlibs.go +++ b/gnovm/stdlibs/stdlibs.go @@ -213,7 +213,7 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) { m.PushValue(res0) }, ) - pn.DefineNative("GetChainID", + pn.DefineNative("ChainID", gno.Flds( // params ), gno.Flds( // results @@ -229,7 +229,7 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) { m.PushValue(res0) }, ) - pn.DefineNative("GetHeight", + pn.DefineNative("Height", gno.Flds( // params ), gno.Flds( // results @@ -245,7 +245,7 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) { m.PushValue(res0) }, ) - pn.DefineNative("GetOrigSend", + pn.DefineNative("OrigSend", gno.Flds( // params ), gno.Flds( // results @@ -268,7 +268,7 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) { m.PushValue(res0) }, ) - pn.DefineNative("GetOrigCaller", + pn.DefineNative("OrigCaller", gno.Flds( // params ), gno.Flds( // results @@ -286,7 +286,7 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) { m.PushValue(res0) }, ) - pn.DefineNative("GetOrigPkgAddr", + pn.DefineNative("OrigPkgAddr", gno.Flds( // params ), gno.Flds( // results @@ -304,7 +304,7 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) { m.PushValue(res0) }, ) - pn.DefineNative("GetCallerAt", + pn.DefineNative("CallerAt", gno.Flds( // params "n", "int", ), @@ -315,7 +315,7 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) { arg0 := m.LastBlock().GetParams1().TV n := arg0.GetInt() if n <= 0 { - m.Panic(typedString("GetCallerAt requires positive arg")) + m.Panic(typedString("CallerAt requires positive arg")) return } if n > m.NumFrames() { @@ -327,7 +327,7 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) { } var pkgAddr string if n == m.NumFrames() { - // This makes it consistent with GetOrigCaller. + // This makes it consistent with OrigCaller. ctx := m.Context.(ExecContext) pkgAddr = string(ctx.OrigCaller) } else { @@ -343,7 +343,7 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) { m.PushValue(res0) }, ) - pn.DefineNative("GetBanker", + pn.DefineNative("Banker", gno.Flds( // params "bankerType", "BankerType", ), @@ -380,7 +380,7 @@ func InjectPackage(store gno.Store, pn *gno.PackageNode) { }, ) // XXX DEPRECATED, use stdlibs/time instead - pn.DefineNative("GetTimestamp", + pn.DefineNative("Timestamp", gno.Flds( // params ), gno.Flds( // results diff --git a/gnovm/stdlibs/stdshim/banker.gno b/gnovm/stdlibs/stdshim/banker.gno index 44e611b780f..710addda5ba 100644 --- a/gnovm/stdlibs/stdshim/banker.gno +++ b/gnovm/stdlibs/stdshim/banker.gno @@ -1,6 +1,6 @@ package std -// Realm functions can call std.GetBanker(options) to get +// Realm functions can call std.Banker(options) to get // a banker instance. Banker objects cannot be persisted, // but can be passed onto other functions to be transacted // on. A banker instance can be passed onto other realm @@ -15,7 +15,7 @@ package std // type, and those can't return non-primitive objects // (without confusion). type Banker interface { - GetCoins(addr Address) (dst Coins) + Coins(addr Address) (dst Coins) SendCoins(from, to Address, amt Coins) TotalCoin(denom string) int64 IssueCoin(addr Address, denom string, amount int64) @@ -44,9 +44,9 @@ type bankAdapter struct { nativeBanker Banker } -func (ba bankAdapter) GetCoins(addr Address) (dst Coins) { +func (ba bankAdapter) Coins(addr Address) (dst Coins) { // convert native -> gno - coins := ba.nativeBanker.GetCoins(addr) + coins := ba.nativeBanker.Coins(addr) for _, coin := range coins { dst = append(dst, (Coin)(coin)) } diff --git a/gnovm/stdlibs/stdshim/context.gno b/gnovm/stdlibs/stdshim/context.gno index 878c963b22b..e39af0cbd0b 100644 --- a/gnovm/stdlibs/stdshim/context.gno +++ b/gnovm/stdlibs/stdshim/context.gno @@ -1,4 +1,4 @@ package std // ExecContext is not exposed, -// use native injections std.GetChainID(), std.GetHeight() etc instead. +// use native injections std.ChainID(), std.Height() etc instead. diff --git a/gnovm/stdlibs/stdshim/stdshim.gno b/gnovm/stdlibs/stdshim/stdshim.gno index 3cea10d572d..affcde590bc 100644 --- a/gnovm/stdlibs/stdshim/stdshim.gno +++ b/gnovm/stdlibs/stdshim/stdshim.gno @@ -21,42 +21,42 @@ func CurrentRealmPath() string { return "" } -func GetChainID() string { +func ChainID() string { panic(shimWarn) return "" } -func GetHeight() int64 { +func Height() int64 { panic(shimWarn) return -1 } -func GetOrigSend() Coins { +func OrigSend() Coins { panic(shimWarn) return Coins{} } -func GetOrigCaller() Address { +func OrigCaller() Address { panic(shimWarn) return Address("") } -func GetOrigPkgAddr() Address { +func OrigPkgAddr() Address { panic(shimWarn) return Address("") } -func GetCallerAt(n int) Address { +func CallerAt(n int) Address { panic(shimWarn) return Address("") } -func GetBanker(bankerType BankerType) Banker { +func Banker(bankerType BankerType) Banker { panic(shimWarn) return nil } -func GetTimestamp() Time { +func Timestamp() Time { panic(shimWarn) return 0 } diff --git a/gnovm/tests/file.go b/gnovm/tests/file.go index 51917633158..06fb8c7ca83 100644 --- a/gnovm/tests/file.go +++ b/gnovm/tests/file.go @@ -499,7 +499,7 @@ func newTestBanker(args ...interface{}) *testBanker { } } -func (tb *testBanker) GetCoins(addr crypto.Bech32Address) (dst std.Coins) { +func (tb *testBanker) Coins(addr crypto.Bech32Address) (dst std.Coins) { return tb.coinTable[addr] } diff --git a/gnovm/tests/files/std1.gno b/gnovm/tests/files/std1.gno index 0326dce5e81..d38c752f5de 100644 --- a/gnovm/tests/files/std1.gno +++ b/gnovm/tests/files/std1.gno @@ -3,7 +3,7 @@ package main import "std" func main() { - timestamp := std.GetTimestamp() + timestamp := std.Timestamp() result := std.FormatTimestamp(timestamp, "Jan 2, 2006 at 3:04pm (MST)") println(result) } diff --git a/gnovm/tests/files/std10.gno b/gnovm/tests/files/std10.gno index 7caf534c5ca..b549387feaa 100644 --- a/gnovm/tests/files/std10.gno +++ b/gnovm/tests/files/std10.gno @@ -7,8 +7,8 @@ func main() { // assert panic is recoverable println(recover()) }() - std.GetCallerAt(0) + std.CallerAt(0) } // Output: -// GetCallerAt requires positive arg +// CallerAt requires positive arg diff --git a/gnovm/tests/files/std11.gno b/gnovm/tests/files/std11.gno index ce02fa11ec3..70668fe443b 100644 --- a/gnovm/tests/files/std11.gno +++ b/gnovm/tests/files/std11.gno @@ -7,7 +7,7 @@ func main() { // assert panic is recoverable println(recover()) }() - std.GetCallerAt(42) + std.CallerAt(42) } // Output: diff --git a/gnovm/tests/files/std2.gno b/gnovm/tests/files/std2.gno index fe218f8b34a..6698b9ae976 100644 --- a/gnovm/tests/files/std2.gno +++ b/gnovm/tests/files/std2.gno @@ -3,7 +3,7 @@ package main import "std" func main() { - caller := std.GetOrigCaller() + caller := std.OrigCaller() println(caller) } diff --git a/gnovm/tests/files/std3.gno b/gnovm/tests/files/std3.gno index e8d4bc31a12..d002a46b683 100644 --- a/gnovm/tests/files/std3.gno +++ b/gnovm/tests/files/std3.gno @@ -6,8 +6,8 @@ import ( ) func main() { - caller := std.GetOrigCaller() - caller2 := std.GetOrigCaller() + caller := std.OrigCaller() + caller2 := std.OrigCaller() cmp := bytes.Compare([]byte(caller), []byte(caller2)) println(cmp) } diff --git a/gnovm/tests/files/std4.gno b/gnovm/tests/files/std4.gno index d09bc6251c0..aef32507b08 100644 --- a/gnovm/tests/files/std4.gno +++ b/gnovm/tests/files/std4.gno @@ -5,7 +5,7 @@ import ( ) func main() { - caller1 := std.GetCallerAt(1) + caller1 := std.CallerAt(1) println(caller1) } diff --git a/gnovm/tests/files/std5.gno b/gnovm/tests/files/std5.gno index d8de58518f1..0bd08ac9651 100644 --- a/gnovm/tests/files/std5.gno +++ b/gnovm/tests/files/std5.gno @@ -5,9 +5,9 @@ import ( ) func main() { - caller1 := std.GetCallerAt(1) + caller1 := std.CallerAt(1) println(caller1) - caller2 := std.GetCallerAt(2) + caller2 := std.CallerAt(2) println(caller2) } diff --git a/gnovm/tests/files/std6.gno b/gnovm/tests/files/std6.gno index 20943f47d28..27c64503b13 100644 --- a/gnovm/tests/files/std6.gno +++ b/gnovm/tests/files/std6.gno @@ -3,9 +3,9 @@ package main import "std" func inner() { - caller1 := std.GetCallerAt(1) + caller1 := std.CallerAt(1) println(caller1) - caller2 := std.GetCallerAt(2) + caller2 := std.CallerAt(2) println(caller2) } diff --git a/gnovm/tests/files/std7.gno b/gnovm/tests/files/std7.gno index 9d602cc2039..ce767fe59e9 100644 --- a/gnovm/tests/files/std7.gno +++ b/gnovm/tests/files/std7.gno @@ -7,11 +7,11 @@ import ( ) func inner() { - caller1 := std.GetCallerAt(1) + caller1 := std.CallerAt(1) println(caller1) - caller2 := std.GetCallerAt(2) + caller2 := std.CallerAt(2) println(caller2) - caller3 := std.GetCallerAt(3) + caller3 := std.CallerAt(3) println(caller3) } diff --git a/gnovm/tests/files/std8.gno b/gnovm/tests/files/std8.gno index 6964cec1d3d..89279761c5e 100644 --- a/gnovm/tests/files/std8.gno +++ b/gnovm/tests/files/std8.gno @@ -7,13 +7,13 @@ import ( ) func inner() { - caller1 := std.GetCallerAt(1) + caller1 := std.CallerAt(1) println(caller1) - caller2 := std.GetCallerAt(2) + caller2 := std.CallerAt(2) println(caller2) - caller3 := std.GetCallerAt(3) + caller3 := std.CallerAt(3) println(caller3) - caller4 := std.GetCallerAt(4) + caller4 := std.CallerAt(4) println(caller4) } diff --git a/gnovm/tests/files/zrealm_std0.gno b/gnovm/tests/files/zrealm_std0.gno index 3f6bdae2537..02672de6937 100644 --- a/gnovm/tests/files/zrealm_std0.gno +++ b/gnovm/tests/files/zrealm_std0.gno @@ -6,7 +6,7 @@ import ( ) func main() { - caller := std.GetOrigCaller() + caller := std.OrigCaller() println(caller) } diff --git a/gnovm/tests/files/zrealm_std1.gno b/gnovm/tests/files/zrealm_std1.gno index 85391bd26b1..b16ffb42b86 100644 --- a/gnovm/tests/files/zrealm_std1.gno +++ b/gnovm/tests/files/zrealm_std1.gno @@ -8,14 +8,14 @@ import ( var aset *std.AddressList func init() { - caller := std.GetOrigCaller() + caller := std.OrigCaller() aset = std.NewAddressList() aset.AddAddress(caller) } func main() { println(*aset) - caller := std.GetOrigCaller() + caller := std.OrigCaller() err := aset.AddAddress(caller) println("error:", err) has := aset.HasAddress(caller) diff --git a/gnovm/tests/files/zrealm_std2.gno b/gnovm/tests/files/zrealm_std2.gno index 68c09a741d8..ee298007994 100644 --- a/gnovm/tests/files/zrealm_std2.gno +++ b/gnovm/tests/files/zrealm_std2.gno @@ -9,14 +9,14 @@ import ( var aset std.AddressSet func init() { - caller := std.GetOrigCaller() + caller := std.OrigCaller() aset = std.NewAddressList() aset.AddAddress(caller) } func main() { println(*(aset.(*std.AddressList))) - caller := std.GetOrigCaller() + caller := std.OrigCaller() err := aset.AddAddress(caller) println("error:", err) has := aset.HasAddress(caller) diff --git a/gnovm/tests/files/zrealm_std6.gno b/gnovm/tests/files/zrealm_std6.gno index fb9e0f825a2..1871a18d16e 100644 --- a/gnovm/tests/files/zrealm_std6.gno +++ b/gnovm/tests/files/zrealm_std6.gno @@ -6,7 +6,7 @@ import ( ) var ( - realmAddr std.Address = std.GetOrigPkgAddr() + realmAddr std.Address = std.OrigPkgAddr() ) func main() { diff --git a/gnovm/tests/imports.go b/gnovm/tests/imports.go index 7999160dd97..3fa97a15a9a 100644 --- a/gnovm/tests/imports.go +++ b/gnovm/tests/imports.go @@ -510,7 +510,7 @@ func testPackageInjector(store gno.Store, pn *gno.PackageNode) { m.PushValue(res0) }, ) - pn.DefineNativeOverride("GetCallerAt", + pn.DefineNativeOverride("CallerAt", /* gno.Flds( // params "n", "int", @@ -523,7 +523,7 @@ func testPackageInjector(store gno.Store, pn *gno.PackageNode) { arg0 := m.LastBlock().GetParams1().TV n := arg0.GetInt() if n <= 0 { - m.Panic(typedString("GetCallerAt requires positive arg")) + m.Panic(typedString("CallerAt requires positive arg")) return } if n > m.NumFrames()-1 { @@ -535,7 +535,7 @@ func testPackageInjector(store gno.Store, pn *gno.PackageNode) { } var pkgAddr string if n == m.NumFrames()-1 { - // This makes it consistent with GetOrigCaller and TestSetOrigCaller. + // This makes it consistent with OrigCaller and TestSetOrigCaller. ctx := m.Context.(stdlibs.ExecContext) pkgAddr = string(ctx.OrigCaller) } else { diff --git a/tm2/pkg/bft/abci/types/mock_types.go b/tm2/pkg/bft/abci/types/mock_types.go index 9133747075d..4e205f2a8ef 100644 --- a/tm2/pkg/bft/abci/types/mock_types.go +++ b/tm2/pkg/bft/abci/types/mock_types.go @@ -16,11 +16,11 @@ type MockHeader struct { func (MockHeader) AssertABCIHeader() {} -func (mh MockHeader) GetChainID() string { +func (mh MockHeader) ChainID() string { return mh.ChainID } -func (mh MockHeader) GetHeight() int64 { +func (mh MockHeader) Height() int64 { return mh.Height } diff --git a/tm2/pkg/bft/abci/types/types.go b/tm2/pkg/bft/abci/types/types.go index 637d09b92a3..6e2e0affdaf 100644 --- a/tm2/pkg/bft/abci/types/types.go +++ b/tm2/pkg/bft/abci/types/types.go @@ -197,8 +197,8 @@ type Event interface { } type Header interface { - GetChainID() string - GetHeight() int64 + ChainID() string + Height() int64 GetTime() time.Time AssertABCIHeader() } diff --git a/tm2/pkg/bft/consensus/reactor.go b/tm2/pkg/bft/consensus/reactor.go index ab7f3b55e92..449b0373f53 100644 --- a/tm2/pkg/bft/consensus/reactor.go +++ b/tm2/pkg/bft/consensus/reactor.go @@ -936,9 +936,9 @@ func (ps *PeerState) ToJSON() ([]byte, error) { return amino.MarshalJSON(ps) } -// GetHeight returns an atomic snapshot of the PeerRoundState's height +// Height returns an atomic snapshot of the PeerRoundState's height // used by the mempool to ensure peers are caught up before broadcasting new txs -func (ps *PeerState) GetHeight() int64 { +func (ps *PeerState) Height() int64 { ps.mtx.Lock() defer ps.mtx.Unlock() return ps.PRS.Height diff --git a/tm2/pkg/bft/mempool/reactor.go b/tm2/pkg/bft/mempool/reactor.go index f6ee67b3fc4..326e1ab1f41 100644 --- a/tm2/pkg/bft/mempool/reactor.go +++ b/tm2/pkg/bft/mempool/reactor.go @@ -175,7 +175,7 @@ func (memR *Reactor) Receive(chID byte, src p2p.Peer, msgBytes []byte) { // PeerState describes the state of a peer. type PeerState interface { - GetHeight() int64 + Height() int64 } // Send new mempool txs to peer. @@ -220,7 +220,7 @@ func (memR *Reactor) broadcastTxRoutine(peer p2p.Peer) { time.Sleep(peerCatchupSleepIntervalMS * time.Millisecond) continue } - if peerState.GetHeight() < memTx.Height()-1 { // Allow for a lag of 1 block + if peerState.Height() < memTx.Height()-1 { // Allow for a lag of 1 block time.Sleep(peerCatchupSleepIntervalMS * time.Millisecond) continue } diff --git a/tm2/pkg/bft/mempool/reactor_test.go b/tm2/pkg/bft/mempool/reactor_test.go index c3b77fb46df..00c4dff3208 100644 --- a/tm2/pkg/bft/mempool/reactor_test.go +++ b/tm2/pkg/bft/mempool/reactor_test.go @@ -26,7 +26,7 @@ type peerState struct { height int64 } -func (ps peerState) GetHeight() int64 { +func (ps peerState) Height() int64 { return ps.height } diff --git a/tm2/pkg/bft/types/block.go b/tm2/pkg/bft/types/block.go index b9ca0e405df..26d30b17fdc 100644 --- a/tm2/pkg/bft/types/block.go +++ b/tm2/pkg/bft/types/block.go @@ -256,8 +256,8 @@ type Header struct { // Implements abci.Header func (h *Header) AssertABCIHeader() {} -func (h *Header) GetChainID() string { return h.ChainID } -func (h *Header) GetHeight() int64 { return h.Height } +func (h *Header) ChainID() string { return h.ChainID } +func (h *Header) Height() int64 { return h.Height } func (h *Header) GetTime() time.Time { return h.Time } // MakeBlock returns a new block with an empty header, except what can be diff --git a/tm2/pkg/sdk/auth/ante.go b/tm2/pkg/sdk/auth/ante.go index c00a98df4d3..a1673c46e58 100644 --- a/tm2/pkg/sdk/auth/ante.go +++ b/tm2/pkg/sdk/auth/ante.go @@ -346,7 +346,7 @@ func consumeMultisignatureVerificationGas(meter store.GasMeter, // NOTE: We could use the CoinKeeper (in addition to the AccountKeeper, because // the CoinKeeper doesn't give us accounts), but it seems easier to do this. func DeductFees(bank BankKeeperI, ctx sdk.Context, acc std.Account, fees std.Coins) sdk.Result { - coins := acc.GetCoins() + coins := acc.Coins() if !fees.IsValid() { return abciResult(std.ErrInsufficientFee(fmt.Sprintf("invalid fee amount: %s", fees))) diff --git a/tm2/pkg/sdk/auth/ante_test.go b/tm2/pkg/sdk/auth/ante_test.go index 2dc3ec08176..22146ed76b3 100644 --- a/tm2/pkg/sdk/auth/ante_test.go +++ b/tm2/pkg/sdk/auth/ante_test.go @@ -329,14 +329,14 @@ func TestAnteHandlerFees(t *testing.T) { collector := env.bank.(DummyBankKeeper).acck.GetAccount(ctx, FeeCollectorAddress()) require.Nil(t, collector) - require.Equal(t, env.acck.GetAccount(ctx, addr1).GetCoins().AmountOf("atom"), int64(149)) + require.Equal(t, env.acck.GetAccount(ctx, addr1).Coins().AmountOf("atom"), int64(149)) acc1.SetCoins(std.NewCoins(std.NewCoin("atom", 150))) env.acck.SetAccount(ctx, acc1) checkValidTx(t, anteHandler, ctx, tx, false) - require.Equal(t, env.bank.(DummyBankKeeper).acck.GetAccount(ctx, FeeCollectorAddress()).GetCoins().AmountOf("atom"), int64(150)) - require.Equal(t, env.acck.GetAccount(ctx, addr1).GetCoins().AmountOf("atom"), int64(0)) + require.Equal(t, env.bank.(DummyBankKeeper).acck.GetAccount(ctx, FeeCollectorAddress()).Coins().AmountOf("atom"), int64(150)) + require.Equal(t, env.acck.GetAccount(ctx, addr1).Coins().AmountOf("atom"), int64(0)) } // Test logic around memo gas consumption. diff --git a/tm2/pkg/sdk/auth/test_common.go b/tm2/pkg/sdk/auth/test_common.go index a51c8576bad..bd29ff1ca86 100644 --- a/tm2/pkg/sdk/auth/test_common.go +++ b/tm2/pkg/sdk/auth/test_common.go @@ -95,11 +95,11 @@ func (bank DummyBankKeeper) SendCoins(ctx sdk.Context, fromAddr crypto.Address, toAcc = bank.acck.NewAccountWithAddress(ctx, toAddr) } - newFromCoins := fromAcc.GetCoins().SubUnsafe(amt) + newFromCoins := fromAcc.Coins().SubUnsafe(amt) if !newFromCoins.IsValid() { - return std.ErrInsufficientCoins(fromAcc.GetCoins().String()) + return std.ErrInsufficientCoins(fromAcc.Coins().String()) } - newToCoins := toAcc.GetCoins().Add(amt) + newToCoins := toAcc.Coins().Add(amt) if err := fromAcc.SetCoins(newFromCoins); err != nil { return std.ErrInternal(err.Error()) } diff --git a/tm2/pkg/sdk/bank/handler.go b/tm2/pkg/sdk/bank/handler.go index b151af11064..d2f7e50f42a 100644 --- a/tm2/pkg/sdk/bank/handler.go +++ b/tm2/pkg/sdk/bank/handler.go @@ -124,7 +124,7 @@ func (bh bankHandler) queryBalance(ctx sdk.Context, req abci.RequestQuery) (res } // get coins from addr. - bz, err := amino.MarshalJSONIndent(bh.bank.GetCoins(ctx, addr), "", " ") + bz, err := amino.MarshalJSONIndent(bh.bank.Coins(ctx, addr), "", " ") if err != nil { res = sdk.ABCIResponseQueryFromError( std.ErrInternal(fmt.Sprintf("could not marshal result to JSON: %s", err.Error()))) diff --git a/tm2/pkg/sdk/bank/invariants.go b/tm2/pkg/sdk/bank/invariants.go index 5bdc483ee9d..261cae7f334 100644 --- a/tm2/pkg/sdk/bank/invariants.go +++ b/tm2/pkg/sdk/bank/invariants.go @@ -21,7 +21,7 @@ func NonnegativeBalanceInvariant(acck auth.AccountKeeper) sdk.Invariant { accts := acck.GetAllAccounts(ctx) for _, acc := range accts { - coins := acc.GetCoins() + coins := acc.Coins() if coins.IsAnyNegative() { count++ msg += fmt.Sprintf("\t%s has a negative denomination of %s\n", diff --git a/tm2/pkg/sdk/bank/keeper.go b/tm2/pkg/sdk/bank/keeper.go index dfbef78f016..12ec1efa40a 100644 --- a/tm2/pkg/sdk/bank/keeper.go +++ b/tm2/pkg/sdk/bank/keeper.go @@ -124,7 +124,7 @@ func (bank BankKeeper) SubtractCoins(ctx sdk.Context, addr crypto.Address, amt s oldCoins := std.NewCoins() acc := bank.acck.GetAccount(ctx, addr) if acc != nil { - oldCoins = acc.GetCoins() + oldCoins = acc.Coins() } newCoins := oldCoins.SubUnsafe(amt) @@ -145,7 +145,7 @@ func (bank BankKeeper) AddCoins(ctx sdk.Context, addr crypto.Address, amt std.Co return nil, std.ErrInvalidCoins(amt.String()) } - oldCoins := bank.GetCoins(ctx, addr) + oldCoins := bank.Coins(ctx, addr) newCoins := oldCoins.Add(amt) if !newCoins.IsValid() { @@ -184,7 +184,7 @@ func (bank BankKeeper) SetCoins(ctx sdk.Context, addr crypto.Address, amt std.Co // ViewKeeperI defines a module interface that facilitates read only access to // account balances. type ViewKeeperI interface { - GetCoins(ctx sdk.Context, addr crypto.Address) std.Coins + Coins(ctx sdk.Context, addr crypto.Address) std.Coins HasCoins(ctx sdk.Context, addr crypto.Address, amt std.Coins) bool } @@ -205,16 +205,16 @@ func (view ViewKeeper) Logger(ctx sdk.Context) log.Logger { return ctx.Logger().With("module", fmt.Sprintf("x/%s", ModuleName)) } -// GetCoins returns the coins at the addr. -func (view ViewKeeper) GetCoins(ctx sdk.Context, addr crypto.Address) std.Coins { +// Coins returns the coins at the addr. +func (view ViewKeeper) Coins(ctx sdk.Context, addr crypto.Address) std.Coins { acc := view.acck.GetAccount(ctx, addr) if acc == nil { return std.NewCoins() } - return acc.GetCoins() + return acc.Coins() } // HasCoins returns whether or not an account has at least amt coins. func (view ViewKeeper) HasCoins(ctx sdk.Context, addr crypto.Address, amt std.Coins) bool { - return view.GetCoins(ctx, addr).IsAllGTE(amt) + return view.Coins(ctx, addr).IsAllGTE(amt) } diff --git a/tm2/pkg/sdk/bank/keeper_test.go b/tm2/pkg/sdk/bank/keeper_test.go index d4e230330d5..8a21052c925 100644 --- a/tm2/pkg/sdk/bank/keeper_test.go +++ b/tm2/pkg/sdk/bank/keeper_test.go @@ -19,12 +19,12 @@ func TestKeeper(t *testing.T) { addr3 := crypto.AddressFromPreimage([]byte("addr3")) acc := env.acck.NewAccountWithAddress(ctx, addr) - // Test GetCoins/SetCoins + // Test Coins/SetCoins env.acck.SetAccount(ctx, acc) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins())) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins())) env.bank.SetCoins(ctx, addr, std.NewCoins(std.NewCoin("foocoin", 10))) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) // Test HasCoins require.True(t, env.bank.HasCoins(ctx, addr, std.NewCoins(std.NewCoin("foocoin", 10)))) @@ -34,43 +34,43 @@ func TestKeeper(t *testing.T) { // Test AddCoins env.bank.AddCoins(ctx, addr, std.NewCoins(std.NewCoin("foocoin", 15))) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 25)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 25)))) env.bank.AddCoins(ctx, addr, std.NewCoins(std.NewCoin("barcoin", 15))) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 15), std.NewCoin("foocoin", 25)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 15), std.NewCoin("foocoin", 25)))) // Test SubtractCoins env.bank.SubtractCoins(ctx, addr, std.NewCoins(std.NewCoin("foocoin", 10))) env.bank.SubtractCoins(ctx, addr, std.NewCoins(std.NewCoin("barcoin", 5))) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 15)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 15)))) env.bank.SubtractCoins(ctx, addr, std.NewCoins(std.NewCoin("barcoin", 11))) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 15)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 15)))) env.bank.SubtractCoins(ctx, addr, std.NewCoins(std.NewCoin("barcoin", 10))) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 15)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 15)))) require.False(t, env.bank.HasCoins(ctx, addr, std.NewCoins(std.NewCoin("barcoin", 1)))) // Test SendCoins env.bank.SendCoins(ctx, addr, addr2, std.NewCoins(std.NewCoin("foocoin", 5))) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) - require.True(t, env.bank.GetCoins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("foocoin", 5)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) + require.True(t, env.bank.Coins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("foocoin", 5)))) _ = env.bank.SendCoins(ctx, addr, addr2, std.NewCoins(std.NewCoin("foocoin", 50))) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) - require.True(t, env.bank.GetCoins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("foocoin", 5)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) + require.True(t, env.bank.Coins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("foocoin", 5)))) env.bank.AddCoins(ctx, addr, std.NewCoins(std.NewCoin("barcoin", 30))) env.bank.SendCoins(ctx, addr, addr2, std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 5))) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 20), std.NewCoin("foocoin", 5)))) - require.True(t, env.bank.GetCoins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 10)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 20), std.NewCoin("foocoin", 5)))) + require.True(t, env.bank.Coins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 10)))) // Test InputOutputCoins input1 := NewInput(addr2, std.NewCoins(std.NewCoin("foocoin", 2))) output1 := NewOutput(addr, std.NewCoins(std.NewCoin("foocoin", 2))) env.bank.InputOutputCoins(ctx, []Input{input1}, []Output{output1}) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 20), std.NewCoin("foocoin", 7)))) - require.True(t, env.bank.GetCoins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 8)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 20), std.NewCoin("foocoin", 7)))) + require.True(t, env.bank.Coins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 8)))) inputs := []Input{ NewInput(addr, std.NewCoins(std.NewCoin("foocoin", 3))), @@ -82,9 +82,9 @@ func TestKeeper(t *testing.T) { NewOutput(addr3, std.NewCoins(std.NewCoin("barcoin", 2), std.NewCoin("foocoin", 5))), } env.bank.InputOutputCoins(ctx, inputs, outputs) - require.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 21), std.NewCoin("foocoin", 4)))) - require.True(t, env.bank.GetCoins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("barcoin", 7), std.NewCoin("foocoin", 6)))) - require.True(t, env.bank.GetCoins(ctx, addr3).IsEqual(std.NewCoins(std.NewCoin("barcoin", 2), std.NewCoin("foocoin", 5)))) + require.True(t, env.bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 21), std.NewCoin("foocoin", 4)))) + require.True(t, env.bank.Coins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("barcoin", 7), std.NewCoin("foocoin", 6)))) + require.True(t, env.bank.Coins(ctx, addr3).IsEqual(std.NewCoins(std.NewCoin("barcoin", 2), std.NewCoin("foocoin", 5)))) } func TestBankKeeper(t *testing.T) { @@ -97,12 +97,12 @@ func TestBankKeeper(t *testing.T) { addr2 := crypto.AddressFromPreimage([]byte("addr2")) acc := env.acck.NewAccountWithAddress(ctx, addr) - // Test GetCoins/SetCoins + // Test Coins/SetCoins env.acck.SetAccount(ctx, acc) - require.True(t, bank.GetCoins(ctx, addr).IsEqual(std.NewCoins())) + require.True(t, bank.Coins(ctx, addr).IsEqual(std.NewCoins())) env.bank.SetCoins(ctx, addr, std.NewCoins(std.NewCoin("foocoin", 10))) - require.True(t, bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) + require.True(t, bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) // Test HasCoins require.True(t, bank.HasCoins(ctx, addr, std.NewCoins(std.NewCoin("foocoin", 10)))) @@ -114,17 +114,17 @@ func TestBankKeeper(t *testing.T) { // Test SendCoins bank.SendCoins(ctx, addr, addr2, std.NewCoins(std.NewCoin("foocoin", 5))) - require.True(t, bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) - require.True(t, bank.GetCoins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("foocoin", 5)))) + require.True(t, bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) + require.True(t, bank.Coins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("foocoin", 5)))) err := bank.SendCoins(ctx, addr, addr2, std.NewCoins(std.NewCoin("foocoin", 50))) - require.True(t, bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) - require.True(t, bank.GetCoins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("foocoin", 5)))) + require.True(t, bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) + require.True(t, bank.Coins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("foocoin", 5)))) env.bank.AddCoins(ctx, addr, std.NewCoins(std.NewCoin("barcoin", 30))) bank.SendCoins(ctx, addr, addr2, std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 5))) - require.True(t, bank.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 20), std.NewCoin("foocoin", 5)))) - require.True(t, bank.GetCoins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 10)))) + require.True(t, bank.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("barcoin", 20), std.NewCoin("foocoin", 5)))) + require.True(t, bank.Coins(ctx, addr2).IsEqual(std.NewCoins(std.NewCoin("barcoin", 10), std.NewCoin("foocoin", 10)))) // validate coins with invalid denoms or negative values cannot be sent // NOTE: We must use the Coin literal as the constructor does not allow @@ -141,12 +141,12 @@ func TestViewKeeper(t *testing.T) { addr := crypto.AddressFromPreimage([]byte("addr1")) acc := env.acck.NewAccountWithAddress(ctx, addr) - // Test GetCoins/SetCoins + // Test Coins/SetCoins env.acck.SetAccount(ctx, acc) - require.True(t, view.GetCoins(ctx, addr).IsEqual(std.NewCoins())) + require.True(t, view.Coins(ctx, addr).IsEqual(std.NewCoins())) env.bank.SetCoins(ctx, addr, std.NewCoins(std.NewCoin("foocoin", 10))) - require.True(t, view.GetCoins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) + require.True(t, view.Coins(ctx, addr).IsEqual(std.NewCoins(std.NewCoin("foocoin", 10)))) // Test HasCoins require.True(t, view.HasCoins(ctx, addr, std.NewCoins(std.NewCoin("foocoin", 10)))) diff --git a/tm2/pkg/sdk/baseapp.go b/tm2/pkg/sdk/baseapp.go index 1d356f7ad65..1c1a867d06f 100644 --- a/tm2/pkg/sdk/baseapp.go +++ b/tm2/pkg/sdk/baseapp.go @@ -498,13 +498,13 @@ func handleQueryCustom(app *BaseApp, path []string, req abci.RequestQuery) (res } func (app *BaseApp) validateHeight(req abci.RequestBeginBlock) error { - if req.Header.GetHeight() < 1 { - return fmt.Errorf("invalid height: %d", req.Header.GetHeight()) + if req.Header.Height() < 1 { + return fmt.Errorf("invalid height: %d", req.Header.Height()) } prevHeight := app.LastBlockHeight() - if req.Header.GetHeight() != prevHeight+1 { - return fmt.Errorf("invalid height: %d; expected: %d", req.Header.GetHeight(), prevHeight+1) + if req.Header.Height() != prevHeight+1 { + return fmt.Errorf("invalid height: %d; expected: %d", req.Header.Height(), prevHeight+1) } return nil @@ -858,7 +858,7 @@ func (app *BaseApp) Commit() (res abci.ResponseCommit) { var halt bool switch { - case app.haltHeight > 0 && uint64(header.GetHeight()) >= app.haltHeight: + case app.haltHeight > 0 && uint64(header.Height()) >= app.haltHeight: halt = true case app.haltTime > 0 && header.GetTime().Unix() >= int64(app.haltTime): diff --git a/tm2/pkg/sdk/context.go b/tm2/pkg/sdk/context.go index 6e33cb1f419..57e516e830e 100644 --- a/tm2/pkg/sdk/context.go +++ b/tm2/pkg/sdk/context.go @@ -42,7 +42,7 @@ type Request = Context func (c Context) Context() context.Context { return c.ctx } func (c Context) Mode() RunTxMode { return c.mode } func (c Context) MultiStore() store.MultiStore { return c.ms } -func (c Context) BlockHeight() int64 { return c.header.GetHeight() } +func (c Context) BlockHeight() int64 { return c.header.Height() } func (c Context) BlockTime() time.Time { return c.header.GetTime() } func (c Context) ChainID() string { return c.chainID } func (c Context) TxBytes() []byte { return c.txBytes } @@ -66,7 +66,7 @@ func (c Context) ConsensusParams() *abci.ConsensusParams { // create a new context func NewContext(mode RunTxMode, ms store.MultiStore, header abci.Header, logger log.Logger) Context { - if header.GetChainID() == "" { + if header.ChainID() == "" { panic("header chain id cannot be empty") } return Context{ @@ -74,7 +74,7 @@ func NewContext(mode RunTxMode, ms store.MultiStore, header abci.Header, logger mode: mode, ms: ms, header: header, - chainID: header.GetChainID(), + chainID: header.ChainID(), logger: logger, gasMeter: store.NewInfiniteGasMeter(), minGasPrices: nil, diff --git a/tm2/pkg/sdk/vm/builtins.go b/tm2/pkg/sdk/vm/builtins.go index 3e846f32288..7d5e13e33ed 100644 --- a/tm2/pkg/sdk/vm/builtins.go +++ b/tm2/pkg/sdk/vm/builtins.go @@ -91,9 +91,9 @@ func NewSDKBanker(vmk *VMKeeper, ctx sdk.Context) *SDKBanker { } } -func (bnk *SDKBanker) GetCoins(b32addr crypto.Bech32Address) (dst std.Coins) { +func (bnk *SDKBanker) Coins(b32addr crypto.Bech32Address) (dst std.Coins) { addr := crypto.MustAddressFromString(string(b32addr)) - coins := bnk.vmk.bank.GetCoins(bnk.ctx, addr) + coins := bnk.vmk.bank.Coins(bnk.ctx, addr) return coins } diff --git a/tm2/pkg/sdk/vm/invariants.go b/tm2/pkg/sdk/vm/invariants.go index 003d0dcc8ac..7b445c47beb 100644 --- a/tm2/pkg/sdk/vm/invariants.go +++ b/tm2/pkg/sdk/vm/invariants.go @@ -19,7 +19,7 @@ func NonnegativeBalanceInvariant(acck auth.AccountKeeper) sdk.Invariant { accts := acck.GetAllAccounts(ctx) for _, acc := range accts { - coins := acc.GetCoins() + coins := acc.Coins() if coins.IsAnyNegative() { count++ msg += fmt.Sprintf("\t%s has a negative denomination of %s\n", diff --git a/tm2/pkg/sdk/vm/keeper_test.go b/tm2/pkg/sdk/vm/keeper_test.go index 07cdbfdf20d..7380e69d0cc 100644 --- a/tm2/pkg/sdk/vm/keeper_test.go +++ b/tm2/pkg/sdk/vm/keeper_test.go @@ -23,7 +23,7 @@ func TestVMKeeperOrigSend1(t *testing.T) { acc := env.acck.NewAccountWithAddress(ctx, addr) env.acck.SetAccount(ctx, acc) env.bank.SetCoins(ctx, addr, std.MustParseCoins("10000000ugnot")) - assert.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) + assert.True(t, env.bank.Coins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) // Create test package. files := []*std.MemFile{ @@ -36,10 +36,10 @@ func init() { } func Echo(msg string) string { - addr := std.GetOrigCaller() - pkgAddr := std.GetOrigPkgAddr() - send := std.GetOrigSend() - banker := std.GetBanker(std.BankerTypeOrigSend) + addr := std.OrigCaller() + pkgAddr := std.OrigPkgAddr() + send := std.OrigSend() + banker := std.Banker(std.BankerTypeOrigSend) banker.SendCoins(pkgAddr, addr, send) // send back return "echo:"+msg }`}, @@ -68,7 +68,7 @@ func TestVMKeeperOrigSend2(t *testing.T) { acc := env.acck.NewAccountWithAddress(ctx, addr) env.acck.SetAccount(ctx, acc) env.bank.SetCoins(ctx, addr, std.MustParseCoins("10000000ugnot")) - assert.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) + assert.True(t, env.bank.Coins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) // Create test package. files := []*std.MemFile{ @@ -80,14 +80,14 @@ import "std" var admin std.Address func init() { - admin = std.GetOrigCaller() + admin = std.OrigCaller() } func Echo(msg string) string { - addr := std.GetOrigCaller() - pkgAddr := std.GetOrigPkgAddr() - send := std.GetOrigSend() - banker := std.GetBanker(std.BankerTypeOrigSend) + addr := std.OrigCaller() + pkgAddr := std.OrigPkgAddr() + send := std.OrigSend() + banker := std.Banker(std.BankerTypeOrigSend) banker.SendCoins(pkgAddr, addr, send) // send back return "echo:"+msg } @@ -122,7 +122,7 @@ func TestVMKeeperOrigSend3(t *testing.T) { acc := env.acck.NewAccountWithAddress(ctx, addr) env.acck.SetAccount(ctx, acc) env.bank.SetCoins(ctx, addr, std.MustParseCoins("10000000ugnot")) - assert.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) + assert.True(t, env.bank.Coins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) // Create test package. files := []*std.MemFile{ @@ -135,10 +135,10 @@ func init() { } func Echo(msg string) string { - addr := std.GetOrigCaller() - pkgAddr := std.GetOrigPkgAddr() + addr := std.OrigCaller() + pkgAddr := std.OrigPkgAddr() send := std.Coins{{"ugnot", 10000000}} - banker := std.GetBanker(std.BankerTypeOrigSend) + banker := std.Banker(std.BankerTypeOrigSend) banker.SendCoins(pkgAddr, addr, send) // send back return "echo:"+msg }`}, @@ -166,7 +166,7 @@ func TestVMKeeperRealmSend1(t *testing.T) { acc := env.acck.NewAccountWithAddress(ctx, addr) env.acck.SetAccount(ctx, acc) env.bank.SetCoins(ctx, addr, std.MustParseCoins("10000000ugnot")) - assert.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) + assert.True(t, env.bank.Coins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) // Create test package. files := []*std.MemFile{ @@ -179,10 +179,10 @@ func init() { } func Echo(msg string) string { - addr := std.GetOrigCaller() - pkgAddr := std.GetOrigPkgAddr() + addr := std.OrigCaller() + pkgAddr := std.OrigPkgAddr() send := std.Coins{{"ugnot", 10000000}} - banker := std.GetBanker(std.BankerTypeRealmSend) + banker := std.Banker(std.BankerTypeRealmSend) banker.SendCoins(pkgAddr, addr, send) // send back return "echo:"+msg }`}, @@ -210,7 +210,7 @@ func TestVMKeeperRealmSend2(t *testing.T) { acc := env.acck.NewAccountWithAddress(ctx, addr) env.acck.SetAccount(ctx, acc) env.bank.SetCoins(ctx, addr, std.MustParseCoins("10000000ugnot")) - assert.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) + assert.True(t, env.bank.Coins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) // Create test package. files := []*std.MemFile{ @@ -223,10 +223,10 @@ func init() { } func Echo(msg string) string { - addr := std.GetOrigCaller() - pkgAddr := std.GetOrigPkgAddr() + addr := std.OrigCaller() + pkgAddr := std.OrigPkgAddr() send := std.Coins{{"ugnot", 10000000}} - banker := std.GetBanker(std.BankerTypeRealmSend) + banker := std.Banker(std.BankerTypeRealmSend) banker.SendCoins(pkgAddr, addr, send) // send back return "echo:"+msg }`}, @@ -254,7 +254,7 @@ func TestVMKeeperOrigCallerInit(t *testing.T) { acc := env.acck.NewAccountWithAddress(ctx, addr) env.acck.SetAccount(ctx, acc) env.bank.SetCoins(ctx, addr, std.MustParseCoins("10000000ugnot")) - assert.True(t, env.bank.GetCoins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) + assert.True(t, env.bank.Coins(ctx, addr).IsEqual(std.MustParseCoins("10000000ugnot"))) // Create test package. files := []*std.MemFile{ @@ -266,14 +266,14 @@ import "std" var admin std.Address func init() { - admin = std.GetOrigCaller() + admin = std.OrigCaller() } func Echo(msg string) string { - addr := std.GetOrigCaller() - pkgAddr := std.GetOrigPkgAddr() - send := std.GetOrigSend() - banker := std.GetBanker(std.BankerTypeOrigSend) + addr := std.OrigCaller() + pkgAddr := std.OrigPkgAddr() + send := std.OrigSend() + banker := std.Banker(std.BankerTypeOrigSend) banker.SendCoins(pkgAddr, addr, send) // send back return "echo:"+msg } diff --git a/tm2/pkg/std/account.go b/tm2/pkg/std/account.go index 604444b4046..0351a2b2675 100644 --- a/tm2/pkg/std/account.go +++ b/tm2/pkg/std/account.go @@ -26,7 +26,7 @@ type Account interface { GetSequence() uint64 SetSequence(uint64) error - GetCoins() Coins + Coins() Coins SetCoins(Coins) error // Ensure that account implements stringer @@ -114,8 +114,8 @@ func (acc *BaseAccount) SetPubKey(pubKey crypto.PubKey) error { return nil } -// GetCoins - Implements Account. -func (acc *BaseAccount) GetCoins() Coins { +// Coins - Implements Account. +func (acc *BaseAccount) Coins() Coins { return acc.Coins }