Skip to content

Commit

Permalink
Merge branch 'master' into dev/moul/pagination
Browse files Browse the repository at this point in the history
  • Loading branch information
moul authored Oct 5, 2024
2 parents 79ffd7d + d3049ae commit adf95c0
Show file tree
Hide file tree
Showing 10 changed files with 19 additions and 26 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ If you haven't already, take a moment to check out our [website](https://gno.lan

> The website is a deployment of our [gnoweb](./gno.land/cmd/gnoweb) frontend; you
> can use it to check out
> [some](https://test3.gno.land/r/demo/boards)
> [example](https://test3.gno.land/r/gnoland/blog)
> [contracts](https://test3.gno.land/r/demo/users).
> [some](https://gno.land/r/demo/boards)
> [example](https://gno.land/r/gnoland/blog)
> [contracts](https://gno.land/r/demo/users).
>
> Use the `[source]` button in the header to inspect the program's source; use
> the `[help]` button to view how you can use [`gnokey`](./gno.land/cmd/gnokey)
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/gnovm.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ GnoVM is a virtual machine that interprets Gno, a custom version of Go optimized
It works with Tendermint2 and enables smarter, more modular, and transparent appchains with embedded smart-contracts.
It can be adapted for use in TendermintCore, forks, and non-Cosmos blockchains.

Read the ["Intro to Gnoland"](https://test3.gno.land/r/gnoland/blog:p/intro) blogpost.
Read the ["Intro to Gnoland"](https://gno.land/r/gnoland/blog:p/intro) blogpost.

This folder focuses on the VM, language, stdlibs, tests, and tools, independent of the blockchain.
This enables non-web3 developers to contribute without requiring an understanding of the broader context.
Expand Down
12 changes: 6 additions & 6 deletions examples/gno.land/r/demo/boards/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ name ["gno.land/r/demo/boards"](https://gno.land/r/demo/boards/)
## Build `gnokey`, create your account, and interact with Gno.

NOTE: Where you see `-remote localhost:26657` here, that flag can be replaced
with `-remote test3.gno.land:26657` if you have $GNOT on the testnet.
(To use the testnet, also replace `-chainid dev` with `-chainid test3` .)
with `-remote gno.land:26657` if you have $GNOT on the testnet.
(To use the testnet, also replace `-chainid dev` with `-chainid portal-loop` .)

### Build `gnokey` (and other tools).

Expand Down Expand Up @@ -85,15 +85,15 @@ The `USERNAME` for posting can different than your `KEYNAME`. It is internally l
./build/gnokey maketx call -pkgpath "gno.land/r/demo/users" -func "Register" -args "" -args "USERNAME" -args "Profile description" -gas-fee "10000000ugnot" -gas-wanted "2000000" -send "200000000ugnot" -broadcast -chainid dev -remote 127.0.0.1:26657 KEYNAME
```

Interactive documentation: https://test3.gno.land/r/demo/users?help&__func=Register
Interactive documentation: https://gno.land/r/demo/users?help&__func=Register

### Create a board with a smart contract call.

```bash
./build/gnokey maketx call -pkgpath "gno.land/r/demo/boards" -func "CreateBoard" -args "BOARDNAME" -gas-fee "1000000ugnot" -gas-wanted "10000000" -broadcast -chainid dev -remote localhost:26657 KEYNAME
```

Interactive documentation: https://test3.gno.land/r/demo/boards?help&__func=CreateBoard
Interactive documentation: https://gno.land/r/demo/boards?help&__func=CreateBoard

Next, query for the permanent board ID by querying (you need this to create a new post):

Expand All @@ -109,15 +109,15 @@ NOTE: If a board was created successfully, your SEQUENCE_NUMBER would have incre
./build/gnokey maketx call -pkgpath "gno.land/r/demo/boards" -func "CreateThread" -args BOARD_ID -args "Hello gno.land" -args "Text of the post" -gas-fee 1000000ugnot -gas-wanted 2000000 -broadcast -chainid dev -remote localhost:26657 KEYNAME
```

Interactive documentation: https://test3.gno.land/r/demo/boards?help&__func=CreateThread
Interactive documentation: https://gno.land/r/demo/boards?help&__func=CreateThread

### Create a comment to a post.

```bash
./build/gnokey maketx call -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 -chainid dev -remote localhost:26657 KEYNAME
```

Interactive documentation: https://test3.gno.land/r/demo/boards?help&__func=CreateReply
Interactive documentation: https://gno.land/r/demo/boards?help&__func=CreateReply

```bash
./build/gnokey query "vm/qrender" -data "gno.land/r/demo/boards:BOARDNAME/1" -remote localhost:26657
Expand Down
4 changes: 1 addition & 3 deletions examples/gno.land/r/gnoland/home/home.gno
Original file line number Diff line number Diff line change
Expand Up @@ -269,9 +269,7 @@ func discoverLinks() ui.Element {
- [Discover demo packages](https://github.com/gnolang/gno/tree/master/examples)
- [Gnoscan](https://gnoscan.io)
- [Portal Loop](https://docs.gno.land/concepts/portal-loop)
- [Testnet 4](https://test4.gno.land/) (Launched July 2024!)
- [Testnet 3](https://test3.gno.land/) (archive)
- [Testnet 2](https://test2.gno.land/) (archive)
- [Testnet 4](https://test4.gno.land/)
- Testnet Faucet Hub (soon)
</div><!-- end column-->
Expand Down
4 changes: 1 addition & 3 deletions examples/gno.land/r/gnoland/home/home_filetest.gno
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,7 @@ func main() {
// - [Discover demo packages](https://github.com/gnolang/gno/tree/master/examples)
// - [Gnoscan](https://gnoscan.io)
// - [Portal Loop](https://docs.gno.land/concepts/portal-loop)
// - [Testnet 4](https://test4.gno.land/) (Launched July 2024!)
// - [Testnet 3](https://test3.gno.land/) (archive)
// - [Testnet 2](https://test2.gno.land/) (archive)
// - [Testnet 4](https://test4.gno.land/)
// - Testnet Faucet Hub (soon)
//
// </div><!-- end column-->
Expand Down
5 changes: 1 addition & 4 deletions examples/gno.land/r/gnoland/pages/page_testnets.gno
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ func init() {
body := `
- [Portal Loop](https://docs.gno.land/concepts/portal-loop) - a rolling testnet
- [staging.gno.land](https://staging.gno.land) - wiped every commit to monorepo master
- test4.gno.land (upcoming)
- _[test3.gno.land](https://test3.gno.land) (latest)_
- _[test2.gno.land](https://test2.gno.land) (archive)_
- _[test1.gno.land](https://test1.gno.land) (archive)_
- _[test4.gno.land](https://test4.gno.land) (latest)_
For a list of RPC endpoints, see the [reference documentation](https://docs.gno.land/reference/rpc-endpoints).
Expand Down
2 changes: 1 addition & 1 deletion gno.land/cmd/gnoweb/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

The gno.land web interface.

Live demo: https://test3.gno.land/
Live demo: https://gno.land/

## Install `gnoweb`

Expand Down
2 changes: 1 addition & 1 deletion gnovm/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ GnoVM is a virtual machine that interprets Gnolang, a custom version of Golang o
It works with Tendermint2 and enables smarter, more modular, and transparent appchains with embedded smart-contracts.
It can be used in TendermintCore, forks, and non-Cosmos blockchains.

Read the ["Intro to Gnoland"](https://test3.gno.land/r/gnoland/blog:p/intro) blogpost.
Read the ["Intro to Gnoland"](https://gno.land/r/gnoland/blog:p/intro) blogpost.

This folder focuses on the VM, language, stdlibs, tests, and tools, independent of the blockchain.
This enables non-web3 developers to contribute without requiring an understanding of the broader context.
Expand Down
2 changes: 1 addition & 1 deletion gnovm/cmd/gno/mod.go
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ func (c *modDownloadCfg) RegisterFlags(fs *flag.FlagSet) {
fs.StringVar(
&c.remote,
"remote",
"test3.gno.land:26657",
"gno.land:26657",
"remote for fetching gno modules",
)

Expand Down
6 changes: 3 additions & 3 deletions gnovm/pkg/gnomod/file_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"golang.org/x/mod/module"
)

const testRemote string = "test3.gno.land:26657"
const testRemote string = "gno.land:26657" // XXX(race condition): test with a local node so that this test is consistent with git and not with a deploy

func TestFetchDeps(t *testing.T) {
for _, tc := range []struct {
Expand Down Expand Up @@ -68,7 +68,7 @@ func TestFetchDeps(t *testing.T) {
"cached gno.land/p/demo/avl",
},
}, {
desc: "fetch_gno.land/p/demo/blog",
desc: "fetch_gno.land/p/demo/blog6",
modFile: File{
Module: &modfile.Module{
Mod: module.Version{
Expand All @@ -84,7 +84,7 @@ func TestFetchDeps(t *testing.T) {
},
},
},
requirements: []string{"avl", "blog", "ufmt"},
requirements: []string{"avl", "blog", "ufmt", "mux"},
stdOutContains: []string{
"fetching gno.land/p/demo/blog",
"fetching gno.land/p/demo/avl // indirect",
Expand Down

0 comments on commit adf95c0

Please sign in to comment.