Skip to content

Commit

Permalink
Merge branch 'master' into dev/moul/tidy-rec
Browse files Browse the repository at this point in the history
  • Loading branch information
moul authored Jul 5, 2024
2 parents a66d2ca + 1c162de commit 2f56693
Show file tree
Hide file tree
Showing 19 changed files with 51 additions and 26 deletions.
1 change: 1 addition & 0 deletions .github/goreleaser-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -500,3 +500,4 @@ nightly:
tag_name: master
publish_release: true
keep_single_release: true
name_template: "{{ incpatch .Version }}-{{ .ShortCommit }}-master"
1 change: 1 addition & 0 deletions .github/goreleaser-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -499,3 +499,4 @@ nightly:
tag_name: nightly
publish_release: true
keep_single_release: true
name_template: "{{ incpatch .Version }}-{{ .ShortCommit }}-nightly"
7 changes: 1 addition & 6 deletions .github/goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -493,9 +493,4 @@ release:
You can find all docker images at:
https://github.com/orgs/gnolang/packages?repo_name={{ .ProjectName }}
nightly:
tag_name: nightly
publish_release: true
keep_single_release: true
https://github.com/orgs/gnolang/packages?repo_name={{ .ProjectName }}
4 changes: 2 additions & 2 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ You should have received a copy of the GNO Network General Public License along
with this program. If not, see <https://gno.land/license>.

Attached below are the terms of the GNO Network General Public License, Version
4 (a fork of the GNU Afferro General Public License 3).
4 (a fork of the GNU Affero General Public License 3).

## Additional Terms

Expand Down Expand Up @@ -409,7 +409,7 @@ that material) supplement the terms of this License with terms:
- g) Requiring strong attribution such as notices on any user interfaces
that run or convey any covered work, such as a prominent link to a URL
on the header of a website, such that all users of the covered work may
become aware of the the notice, for a period no longer than 20 years.
become aware of the notice, for a period no longer than 20 years.

All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
Expand Down
2 changes: 1 addition & 1 deletion contribs/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ help:
@echo "Available make commands:"
@cat Makefile | grep '^[a-z][^:]*:' | cut -d: -f1 | sort | sed 's/^/ /'

programs=gnodev gnofaucet
programs=$(wildcard */)

# command to run dependency utilities, like goimports.
rundep=go run -modfile ../misc/devdeps/go.mod
Expand Down
2 changes: 2 additions & 0 deletions contribs/gnodev/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

`gnodev` is designed to be a robust and user-friendly tool in your realm package development journey, streamlining your workflow and enhancing productivity.

We will only give a quick overview below. You may find the official documentation at [docs/gno-tooling/gnodev.md](../../docs/gno-tooling/cli/gnodev.md).

### Synopsis
**gnodev** [**-minimal**] [**-no-watch**] [**PKG_PATH ...**]

Expand Down
8 changes: 5 additions & 3 deletions contribs/gnodev/cmd/gnodev/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -309,11 +309,13 @@ func execDev(cfg *devCfg, args []string, io commands.IO) (err error) {
return runEventLoop(ctx, logger, book, rt, devNode, watcher)
}

var helper string = `
var helper string = `For more in-depth documentation, visit the GNO Tooling CLI documentation:
https://docs.gno.land/gno-tooling/cli/gno-tooling-gnodev
A Accounts - Display known accounts and balances
H Help - Display this message
R Reload - Reload all packages to take change into account.
Ctrl+R Reset - Reset application state.
R Reload - Reload all packages to take change into account
Ctrl+R Reset - Reset application state
Ctrl+C Exit - Exit the application
`

Expand Down
6 changes: 6 additions & 0 deletions contribs/gnofaucet/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,9 @@ install:
.PHONY: build
build:
go build -o build/gnofaucet .

test:
@echo "XXX: add tests"

lint:
@echo "XXX: add lint"
8 changes: 8 additions & 0 deletions contribs/gnokeykc/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
install:
go install .

test:
@echo "XXX: add tests"

lint:
@echo "XXX: add lint"
8 changes: 8 additions & 0 deletions contribs/gnomd/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
install:
go install .

test:
@echo "XXX: add tests"

lint:
@echo "XXX: add lint"
2 changes: 1 addition & 1 deletion docs/concepts/effective-gno.md
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,7 @@ In this example, `GetPost` is a function that retrieves a post from the
loading any other posts.

In the future, we plan to add built-in "map" support that will match the
efficienty of an `avl.Tree` while offering a more intuitive API. Until then, if
efficiency of an `avl.Tree` while offering a more intuitive API. Until then, if
you're dealing with a compact dataset, it's probably best to use slices.
For larger datasets where you need to quickly retrieve elements by keys,
`avl.Tree` is the way to go.
Expand Down
2 changes: 1 addition & 1 deletion docs/concepts/stdlibs/gnopher-hole.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ id: gnopher-hole-stdlib

## Native bindings

Gno has support for "natively-defined" functions exclusively within the standard
Gno has support for "natively-defined" functions exclusively within the standard
libraries. These are functions which are _declared_ in Gno code, but only _defined_
in Go. There are generally three reasons why a function should be natively
defined:
Expand Down
4 changes: 2 additions & 2 deletions docs/gno-infrastructure/validators/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,14 @@ network.
### What stage is the Gno.land project in?

Gno.land is currently in Testnet 3, the single-node testnet stage. The next version, Testnet 4, is scheduled to go live
in Q2 2024, which will include a validator set implementation for a multinode environment.
in Q3 2024, which will include a validator set implementation for a multinode environment.

## Becoming a Validator

### How do I join the testnet as a validator?

Out of many official Gno testnets, Testnet4 (`test4`) is the purpose-built network for testing the multi-node validator
environment prior to mainnet launch. Testnet4 is scheduled to go live in Q2 2024 with genesis validators consisting of
environment prior to mainnet launch. Testnet4 is scheduled to go live in Q3 2024 with genesis validators consisting of
the Gno Core Team, partners, and external contributors.

For more information about joining testnet4,
Expand Down
4 changes: 2 additions & 2 deletions docs/how-to-guides/creating-grc20.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Our **GRC20** Realm will have the following functionality:

## 1. Importing token package
For this realm, we import the `grc20` package, as this includes
the main functionality of our token realm. The package can be found the
the main functionality of our token realm. The package can be found at the
`gno.land/p/demo/grc/grc20` path.

[embedmd]:# (../assets/how-to-guides/creating-grc20/mytoken-1.gno go)
Expand Down Expand Up @@ -55,7 +55,7 @@ The code snippet above does the following:
pointer to the GRC20 token type, `grc20.AdminToken`,
- Defines and sets the value of `admin` with a type of `std.Address` to contain
the address of the deployer
- Initializes `mytoken` as a new GRC20 token, and set its name, symbol, and
- Initializes `mytoken` as a new GRC20 token, and sets its name, symbol, and
decimal values,
- Mint 1 million units of `My Token` and assign them to the admin's address.

Expand Down
4 changes: 2 additions & 2 deletions examples/gno.land/p/demo/uassert/uassert.gno
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func PanicsWithMessage(t TestingT, msg string, f func(), msgs ...string) bool {
}

if panicValue != msg {
return fail(t, msgs, "func should panic with message:\t%s\n\tPanic value:\t%s", panicValue, msg)
return fail(t, msgs, "func should panic with message:\t%s\n\tPanic value:\t%s", msg, panicValue)
}
return true
}
Expand Down Expand Up @@ -126,7 +126,7 @@ func Equal(t TestingT, expected, actual interface{}, msgs ...string) bool {
if av, ok := actual.(string); ok {
equal = ev == av
ok_ = true
es, as = ev, as
es, as = ev, av
}
case std.Address:
if av, ok := actual.(std.Address); ok {
Expand Down
4 changes: 2 additions & 2 deletions examples/gno.land/p/demo/uassert/uassert_test.gno
Original file line number Diff line number Diff line change
Expand Up @@ -89,14 +89,14 @@ func TestPanicsWithMessage(t *testing.T) {
}) {
t.Error("PanicsWithMessage should return false")
}
mockT.equals(t, "error: func should panic with message:\tpanic\n\tPanic value:\tat the disco")
mockT.equals(t, "error: func should panic with message:\tat the disco\n\tPanic value:\tpanic")

if PanicsWithMessage(mockT, "Panic!", func() {
panic("panic")
}) {
t.Error("PanicsWithMessage should return false")
}
mockT.equals(t, "error: func should panic with message:\tpanic\n\tPanic value:\tPanic!")
mockT.equals(t, "error: func should panic with message:\tPanic!\n\tPanic value:\tpanic")
}

func TestNotPanics(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion examples/gno.land/r/gnoland/home/home.gno
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,8 @@ func packageStaffPicks() ui.Element {
ui.Link{URL: "r/demo/microblog"},
ui.Link{URL: "r/demo/nft"},
ui.Link{URL: "r/demo/types"},
ui.Link{URL: "r/demo/art"},
ui.Link{URL: "r/demo/art/gnoface"},
ui.Link{URL: "r/demo/art/millipede"},
ui.Link{URL: "r/demo/groups"},
ui.Text("..."),
},
Expand Down
3 changes: 2 additions & 1 deletion examples/gno.land/r/gnoland/home/home_filetest.gno
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@ func main() {
// - [r/demo/microblog](r/demo/microblog)
// - [r/demo/nft](r/demo/nft)
// - [r/demo/types](r/demo/types)
// - [r/demo/art](r/demo/art)
// - [r/demo/art/gnoface](r/demo/art/gnoface)
// - [r/demo/art/millipede](r/demo/art/millipede)
// - [r/demo/groups](r/demo/groups)
// - ...
//
Expand Down
4 changes: 2 additions & 2 deletions examples/gno.land/r/gnoland/pages/page_license.gno
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ You should have received a copy of the GNO Network General Public License along
with this program. If not, see <https://gno.land/license>.
Attached below are the terms of the GNO Network General Public License, Version
4 (a fork of the GNU Afferro General Public License 3).
4 (a fork of the GNU Affero General Public License 3).
## Additional Terms
Expand Down Expand Up @@ -409,7 +409,7 @@ that material) supplement the terms of this License with terms:
- g) Requiring strong attribution such as notices on any user interfaces
that run or convey any covered work, such as a prominent link to a URL
on the header of a website, such that all users of the covered work may
become aware of the the notice, for a period no longer than 20 years.
become aware of the notice, for a period no longer than 20 years.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
Expand Down

0 comments on commit 2f56693

Please sign in to comment.