chore: bump gno (#18)

* chore: bump gno Signed-off-by: Manfred Touron <94029+moul@users.noreply.github.com> * chore: fix deps Signed-off-by: Manfred Touron <94029+moul@users.noreply.github.com> * chore: bump contracts Signed-off-by: Manfred Touron <94029+moul@users.noreply.github.com> * chore: update pkgpaths + readmes Signed-off-by: Manfred Touron <94029+moul@users.noreply.github.com> Signed-off-by: Manfred Touron <94029+moul@users.noreply.github.com>
moul · Nov 7, 2022 · 1635a7d · 1635a7d
1 parent 7acda6a
commit 1635a7d
Show file tree

Hide file tree

Showing 31 changed files with 159 additions and 173 deletions.
diff --git a/001-hello/README.md b/001-hello/README.md
@@ -1,15 +1,17 @@
-# [r/moul_basics_hello_v1](https://test2.gno.land/r/moul_basics_hello_v1)
+# [r/moul/basics/hello/v1](https://test3.gno.land/r/moul/basics/hello/v1)
 _`README.md` generated by "make integration"._
 
 ## Examples
 
 ```console
-foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee 1ugnot --broadcast true --chainid "test2" --remote  \
-> "test2.gno.land:36657" --gas-wanted 500000 --pkgpath gno.land/r/moul_basics_hello_v1 --func Hello
+foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/hello/v1  \
+> --func Hello
 ("Hello World!" string)
 OK!
 GAS WANTED: 500000
-GAS USED:   70660
+GAS USED:   71092
 ```
 
 ## `gnodev test`
@@ -18,13 +20,12 @@ GAS USED:   70660
 foo@bar:~$ gnodev test . --verbose
 === RUN   Test
 --- PASS: Test (0.00s)
-ok      ./. 	2.96s
+ok      ./. 	2.87s
 ```
 
 ## How to publish locally
 
-```console
-foo@bar:~$ gnokey maketx addpkg "MYWALLET" --gas-fee "1ugnot" --gas-wanted "5000000" --pkgdir "." \
-> --broadcast true --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul_basics_hello_v1"
+```sh
+gnokey maketx addpkg "MYWALLET" --deposit "1ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast "true" --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul/basics/hello/v1" --pkgdir "."
 ```
 
diff --git a/001-hello/pkgpath.txt b/001-hello/pkgpath.txt
@@ -1 +1 @@
-r/moul_basics_hello_v1
+r/moul/basics/hello/v1
diff --git a/002-args/README.md b/002-args/README.md
@@ -1,24 +1,28 @@
-# [r/moul_basics_args_v1](https://test2.gno.land/r/moul_basics_args_v1)
+# [r/moul/basics/args/v1](https://test3.gno.land/r/moul/basics/args/v1)
 _`README.md` generated by "make integration"._
 
 ## Examples
 
 ```console
-foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee 1ugnot --broadcast true --chainid "test2" --remote  \
-> "test2.gno.land:36657" --gas-wanted 500000 --pkgpath gno.land/r/moul_basics_args_v1 --func Hello --args Universe
+foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/args/v1 --func  \
+> Hello --args Universe
 ("Hello Universe!" string)
 OK!
 GAS WANTED: 500000
-GAS USED:   69835
+GAS USED:   70267
 ```
 
 ```console
-foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee 1ugnot --broadcast true --chainid "test2" --remote  \
-> "test2.gno.land:36657" --gas-wanted 500000 --pkgpath gno.land/r/moul_basics_args_v1 --func Hello --args Multiverse
+foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/args/v1 --func  \
+> Hello --args Multiverse
 ("Hello Multiverse!" string)
 OK!
 GAS WANTED: 500000
-GAS USED:   69855
+GAS USED:   70287
 ```
 
 ## `gnodev test`
@@ -27,12 +31,12 @@ GAS USED:   69855
 foo@bar:~$ gnodev test . --verbose
 === RUN   Test
 --- PASS: Test (0.00s)
-ok      ./. 	2.89s
+ok      ./. 	2.92s
 ```
 
 ## How to publish locally
 
 ```sh
-gnokey maketx addpkg "MYWALLET" --deposit "ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast true --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul_basics_args_v1" --pkgdir "."
+gnokey maketx addpkg "MYWALLET" --deposit "1ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast "true" --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul/basics/args/v1" --pkgdir "."
 ```
 
diff --git a/002-args/pkgpath.txt b/002-args/pkgpath.txt
@@ -1 +1 @@
-r/moul_basics_args_v1
+r/moul/basics/args/v1
diff --git a/003-data/README.md b/003-data/README.md
@@ -1,28 +1,28 @@
-# [r/moul_basics_data_v1](https://test2.gno.land/r/moul_basics_data_v1)
+# [r/moul/basics/data/v1](https://test3.gno.land/r/moul/basics/data/v1)
 _`README.md` generated by "make integration"._
 
 ## Examples
 
 ```console
 foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
-> --broadcast "true" --chainid "test2" --remote "test2.gno.land:36657"  \
-> --gas-wanted "500000" --pkgpath gno.land/r/moul_basics_data_v1 --func  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/data/v1 --func  \
 > Add --args 42
 (1042 int)
 OK!
 GAS WANTED: 500000
-GAS USED:   105135
+GAS USED:   105567
 ```
 
 ```console
 foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
-> --broadcast "true" --chainid "test2" --remote "test2.gno.land:36657"  \
-> --gas-wanted "500000" --pkgpath gno.land/r/moul_basics_data_v1 --func  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/data/v1 --func  \
 > Add --args 295
 (1337 int)
 OK!
 GAS WANTED: 500000
-GAS USED:   105151
+GAS USED:   105583
 ```
 
 ## `gnodev test`
@@ -31,12 +31,12 @@ GAS USED:   105151
 foo@bar:~$ gnodev test . --verbose
 === RUN   Test
 --- PASS: Test (0.00s)
-ok      ./. 	2.94s
+ok      ./. 	2.92s
 ```
 
 ## How to publish locally
 
 ```sh
-gnokey maketx addpkg "MYWALLET" --deposit "1ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast "true" --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul_basics_data_v1" --pkgdir "."
+gnokey maketx addpkg "MYWALLET" --deposit "1ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast "true" --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul/basics/data/v1" --pkgdir "."
 ```
 
diff --git a/003-data/pkgpath.txt b/003-data/pkgpath.txt
@@ -1 +1 @@
-r/moul_basics_data_v1
+r/moul/basics/data/v1
diff --git a/004-render/README.md b/004-render/README.md
@@ -1,24 +1,28 @@
-# [r/moul_basics_render_v1](https://test2.gno.land/r/moul_basics_render_v1)
+# [r/moul/basics/render/v1](https://test3.gno.land/r/moul/basics/render/v1)
 _`README.md` generated by "make integration"._
 
 ## Examples
 
 ```console
-foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee 1ugnot --broadcast true --chainid "test2" --remote  \
-> "test2.gno.land:36657" --gas-wanted 500000 --pkgpath gno.land/r/moul_basics_render_v1 --func Render --args hello
+foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/render/v1  \
+> --func Render --args hello
 ("Hello World!" string)
 OK!
 GAS WANTED: 500000
-GAS USED:   72697
+GAS USED:   73129
 ```
 
 ```console
-foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee 1ugnot --broadcast true --chainid "test2" --remote  \
-> "test2.gno.land:36657" --gas-wanted 500000 --pkgpath gno.land/r/moul_basics_render_v1 --func Render --args foobar
+foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/render/v1  \
+> --func Render --args foobar
 ("404" string)
 OK!
 GAS WANTED: 500000
-GAS USED:   202920
+GAS USED:   203352
 ```
 
 ## `gnodev test`
@@ -27,12 +31,12 @@ GAS USED:   202920
 foo@bar:~$ gnodev test . --verbose
 === RUN   Test
 --- PASS: Test (0.00s)
-ok      ./. 	3.03s
+ok      ./. 	2.94s
 ```
 
 ## How to publish locally
 
 ```sh
-gnokey maketx addpkg "MYWALLET" --deposit "ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast true --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul_basics_render_v1" --pkgdir "."
+gnokey maketx addpkg "MYWALLET" --deposit "1ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast "true" --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul/basics/render/v1" --pkgdir "."
 ```
 
diff --git a/004-render/pkgpath.txt b/004-render/pkgpath.txt
@@ -1 +1 @@
-r/moul_basics_render_v1
+r/moul/basics/render/v1
diff --git a/005-import/Makefile b/005-import/Makefile
@@ -7,4 +7,4 @@ build:
 # install gno.land/p/dom if not yet existing
 publish: publish-dom publish-default
 publish-dom:
-	$(call publish_pkg,gno.land/p/dom,"${GNO_ROOT}/examples/gno.land/p/dom")
+	$(call publish_pkg,gno.land/p/demo/dom,"${GNO_ROOT}/examples/gno.land/p/demo/dom")
diff --git a/005-import/README.md b/005-import/README.md
@@ -1,15 +1,17 @@
-# [r/moul_basics_import_v1](https://test2.gno.land/r/moul_basics_import_v1)
+# [r/moul/basics/import/v1](https://test3.gno.land/r/moul/basics/import/v1)
 _`README.md` generated by "make integration"._
 
 ## Examples
 
 ```console
-foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee 1ugnot --broadcast true --chainid "test2" --remote  \
-> "test2.gno.land:36657" --gas-wanted 500000 --pkgpath gno.land/r/moul_basics_import_v1 --func Render --args 
+foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/import/v1  \
+> --func Render --args 
 ("# [plot] Hello!\n\n## Foo\nfoo foo foo\n## Bar\nbar bar bar" string)
 OK!
 GAS WANTED: 500000
-GAS USED:   150874
+GAS USED:   154636
 ```
 
 ## `gnodev test`
@@ -18,12 +20,12 @@ GAS USED:   150874
 foo@bar:~$ gnodev test . --verbose
 === RUN   Test
 --- PASS: Test (0.00s)
-ok      ./. 	3.05s
+ok      ./. 	2.99s
 ```
 
 ## How to publish locally
 
 ```sh
-gnokey maketx addpkg "MYWALLET" --deposit "ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast true --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul_basics_import_v1" --pkgdir "."
+gnokey maketx addpkg "MYWALLET" --deposit "1ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast "true" --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul/basics/import/v1" --pkgdir "."
 ```
 
diff --git a/005-import/contract.gno b/005-import/contract.gno
@@ -1,8 +1,8 @@
 package demo
 
 import (
-	"gno.land/p/avl"
-	"gno.land/p/dom"
+	"gno.land/p/demo/avl"
+	"gno.land/p/demo/dom"
 )
 
 func Render(path string) string {

diff --git a/005-import/pkgpath.txt b/005-import/pkgpath.txt
@@ -1 +1 @@
-r/moul_basics_import_v1
+r/moul/basics/import/v1
diff --git a/006-grc20/README.md b/006-grc20/README.md
@@ -1,17 +1,17 @@
-# [r/moul_basics_grc20_v1](https://test2.gno.land/r/moul_basics_grc20_v1)
+# [r/moul/basics/grc20/v1](https://test3.gno.land/r/moul/basics/grc20/v1)
 _`README.md` generated by "make integration"._
 
 ## Examples
 
 ```console
 foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
-> --broadcast "true" --chainid "test2" --remote "test2.gno.land:36657"  \
-> --gas-wanted "500000" --pkgpath gno.land/r/moul_basics_grc20_v1  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/grc20/v1  \
 > --func MyBalance
-(100000000 uint64)
+(0 uint64)
 OK!
 GAS WANTED: 500000
-GAS USED:   289953
+GAS USED:   298656
 ```
 
 ## `gnodev test`
@@ -20,12 +20,12 @@ GAS USED:   289953
 foo@bar:~$ gnodev test . --verbose
 === RUN   Test
 --- PASS: Test (0.00s)
-ok      ./. 	3.07s
+ok      ./. 	3.02s
 ```
 
 ## How to publish locally
 
 ```sh
-gnokey maketx addpkg "MYWALLET" --deposit "1ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast "true" --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul_basics_grc20_v1" --pkgdir "."
+gnokey maketx addpkg "MYWALLET" --deposit "1ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast "true" --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul/basics/grc20/v1" --pkgdir "."
 ```
 
diff --git a/006-grc20/contract.gno b/006-grc20/contract.gno
@@ -3,7 +3,7 @@ package demo
 import (
 	"std"
 
-	"gno.land/p/grc/grc20"
+	"gno.land/p/demo/grc/grc20"
 )
 
 // FooToken is exported. Other contracts can interact with it.

diff --git a/006-grc20/contract_test.gno b/006-grc20/contract_test.gno
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"gno.land/p/testutils"
+	"gno.land/p/demo/testutils"
 )
 
 func Test(t *testing.T) {

diff --git a/006-grc20/pkgpath.txt b/006-grc20/pkgpath.txt
@@ -1 +1 @@
-r/moul_basics_grc20_v1
+r/moul/basics/grc20/v1
diff --git a/007-vault/Makefile b/007-vault/Makefile
@@ -6,4 +6,4 @@ build:
 # install missing packages.
 publish: publish-vault publish-default
 publish-vault:
-	$(call publish_pkg,gno.land/p/grc/exts/vault,"${GNO_ROOT}/examples/gno.land/p/grc/exts/vault")
+	$(call publish_pkg,gno.land/p/demo/grc/exts/vault,"${GNO_ROOT}/examples/gno.land/p/demo/grc/exts/vault")
diff --git a/007-vault/README.md b/007-vault/README.md
@@ -1,24 +1,28 @@
-# [r/moul_basics_vault_v1](https://test2.gno.land/r/moul_basics_vault_v1)
+# [r/moul/basics/vault/v1](https://test3.gno.land/r/moul/basics/vault/v1)
 _`README.md` generated by "make integration"._
 
 ## Examples
 
 ```console
 foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
-> --broadcast "true" --chainid "test2" --remote "test2.gno.land:36657"  \
-> --gas-wanted "500000" --pkgpath gno.land/r/moul_basics_vault_v1  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/vault/v1  \
 > --func Deposit --args 10000 --args g1myrecoveryaddress
+
+OK!
+GAS WANTED: 500000
+GAS USED:   333907
 ```
 
 ```console
 foo@bar:~$ gnokey maketx call "MYWALLET" --gas-fee "1ugnot"  \
-> --broadcast "true" --chainid "test2" --remote "test2.gno.land:36657"  \
-> --gas-wanted "500000" --pkgpath gno.land/r/moul_basics_vault_v1  \
+> --broadcast "true" --chainid "test3" --remote "test3.gno.land:36657"  \
+> --gas-wanted "500000" --pkgpath gno.land/r/moul/basics/vault/v1  \
 > --func MyBalance
-(100000000 uint64)
+(0 uint64)
 OK!
 GAS WANTED: 500000
-GAS USED:   296160
+GAS USED:   304908
 ```
 
 ## `gnodev test`
@@ -27,12 +31,12 @@ GAS USED:   296160
 foo@bar:~$ gnodev test . --verbose
 === RUN   Test
 --- PASS: Test (0.00s)
-ok      ./. 	3.14s
+ok      ./. 	2.97s
 ```
 
 ## How to publish locally
 
 ```sh
-gnokey maketx addpkg "MYWALLET" --deposit "1ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast "true" --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul_basics_vault_v1" --pkgdir "."
+gnokey maketx addpkg "MYWALLET" --deposit "1ugnot" --gas-fee "1ugnot" --gas-wanted "5000000" --broadcast "true" --remote "localhost:26657" --chainid "dev" --pkgpath "gno.land/r/moul/basics/vault/v1" --pkgdir "."
 ```
 
diff --git a/007-vault/contract.gno b/007-vault/contract.gno
@@ -3,8 +3,8 @@ package demo
 import (
 	"std"
 
-	"gno.land/p/grc/exts/vault"
-	"gno.land/p/grc/grc20"
+	"gno.land/p/demo/grc/exts/vault"
+	"gno.land/p/demo/grc/grc20"
 )
 
 // FooToken and FooVault are exported. Other contracts can interact with them.

diff --git a/007-vault/contract_test.gno b/007-vault/contract_test.gno
@@ -5,7 +5,7 @@ import (
 	"strings"
 	"testing"
 
-	"gno.land/p/testutils"
+	"gno.land/p/demo/testutils"
 )
 
 func Test(t *testing.T) {

diff --git a/007-vault/pkgpath.txt b/007-vault/pkgpath.txt
@@ -1 +1 @@
-r/moul_basics_vault_v1
+r/moul/basics/vault/v1