Skip to content

Commit

Permalink
Merge branch 'gnolang:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
omarsy authored Oct 10, 2024
2 parents 1e6d8c6 + 912a5db commit a2cdf5f
Show file tree
Hide file tree
Showing 14 changed files with 22 additions and 32 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/benchmark-master-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
max-items-in-chart: 100
# Show alert with commit comment on detecting possible performance regression
alert-threshold: "120%"
fail-on-alert: true
fail-on-alert: false
comment-on-alert: true
alert-comment-cc-users: "@ajnavarro,@thehowl,@zivkovicmilos"
# Enable Job Summary for PRs
Expand Down
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
3 changes: 0 additions & 3 deletions examples/gno.land/p/demo/json/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ The converted `Node` type allows you to modify the JSON data or search and extra
package main

import (
"fmt"
"gno.land/p/demo/json"
"gno.land/p/demo/ufmt"
)
Expand All @@ -100,7 +99,6 @@ Encoding (or Marshaling) is the functionality that converts JSON data represente
package main

import (
"fmt"
"gno.land/p/demo/json"
"gno.land/p/demo/ufmt"
)
Expand Down Expand Up @@ -133,7 +131,6 @@ Here is an example of finding data with a specific key. For more examples, pleas
package main

import (
"fmt"
"gno.land/p/demo/json"
"gno.land/p/demo/ufmt"
)
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
2 changes: 1 addition & 1 deletion examples/gno.land/r/gnoland/pages/page_contribute.gno
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ _[3XL]_ \* | $ 32000
The gno.land grants program is to encourage and support the growth of the gno.land contributor community, and build out the usability of the platform and smart contract library. The program provides financial resources to contributors to explore the Gno tech stack, and build dApps, tooling, infrastructure, products, and smart contract libraries in gno.land.
<!-- TODO: Add link to new repo -->
For more details on gno.land grants, suggested topics, and how to apply, visit our grants [repository](https://github.com/gnolang/grants).
## Join Game of Realms
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 gno.land/pkg/gnoweb/views/realm_help.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<br />
These are the realm's exposed functions ("public smart contracts").<br />
<br />
My address: <input id="my_address" placeholder="ADDRESS" width="40" /> (see <a href="https://docs.gno.land/gno-tooling/cli/gno-tooling-gnokey/#list-all-known-keys" target="_blank">`gnokey list`</a>)<br />
My address: <input id="my_address" placeholder="ADDRESS" width="40" /> (see <a href="https://docs.gno.land/gno-tooling/cli/gnokey/working-with-key-pairs#listing-available-keys" target="_blank">`gnokey list`</a>)<br />
<br />
<br />
{{ template "func_specs" . }}
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 a2cdf5f

Please sign in to comment.