chore: move tendermint2 pkgs into tendermint2/pkgs

Signed-off-by: Manfred Touron <94029+moul@users.noreply.github.com>

LICENSE.md

@@ -58,6 +58,6 @@ This license is subject to change at any time by the Project owner.  Your
 continued access to or use of this Project or any works available through this
 Project shall be subject to the then-current version of this license.
 
-This license applies to github.com/gnolang/gno/pkgs/gnolang and all code except
-the other common libraries under github.com/gnolang/gno/pkgs/ which are
+This license applies to github.com/gnolang/gno/t2/pkg/gnolang and all code except
+the other common libraries under github.com/gnolang/gno/t2/pkg/ which are
 published under the Apache2.0 license.

Makefile

@@ -84,7 +84,7 @@ examples.build: install_gnodev examples.precompile
 .PHONY: fmt
 fmt:
 	go run -modfile ./misc/devdeps/go.mod mvdan.cc/gofumpt -w .
-	go run -modfile ./misc/devdeps/go.mod mvdan.cc/gofumpt -w `find stdlibs examples -name "*.gno"`
+	go run -modfile ./misc/devdeps/go.mod mvdan.cc/gofumpt -w `find gnovm/pkg/stdlibs examples -name "*.gno"`
 
 .PHONY: lint
 lint:

README.md

@@ -37,3 +37,23 @@ See [./cmd/gnodev](./cmd/gnodev#readme) for instructions.
  * Gnoland: https://gno.land/r/demo/boards:testboard
  * Telegram: https://t.me/gnoland
  * Twitter: https://twitter.com/_gnoland
+
+<details><summary>Short doc about all the commands</summary>
+
+  _Note: please keep in sync with Makefile for now._
+
+  User commands:
+
+  * gnokey - key manipulation, also general interaction with gnoland
+  * gnoland - runs the blockchain node
+  * gnotxport - importing/exporting transactions from local blockchain node storage
+  * website - serves gno website, along with user-defined content
+  * logos - intended to be used as a browser
+
+  Developer commands:
+
+  * goscan - dumps imports from specified file’s AST
+  * genproto - helper for generating .proto implementations
+  * gnofaucet - serves GNOT faucet
+  * gnodev - handy tool for developing gno packages & realms
+</details>

examples/gno.land/r/demo/groups/group.gno

@@ -1,13 +1,14 @@
 package groups
 
 import (
-	"gno.land/p/demo/avl"
 	"std"
 	"strconv"
 	"time"
+
+	"gno.land/p/demo/avl"
 )
 
-type GroupID  uint64
+type GroupID uint64
 
 func (gid GroupID) String() string {
 	return strconv.Itoa(int(gid))
@@ -54,10 +55,10 @@ func (group *Group) newMember(id MemberID, address std.Address, weight int, meta
 }
 
 func (group *Group) HasPermission(addr std.Address, perm Permission) bool {
-    if group.creator != addr {
-        return false
-    }
-    return isValidPermission(perm)
+	if group.creator != addr {
+		return false
+	}
+	return isValidPermission(perm)
 }
 
 func (group *Group) RenderGroup() string {
@@ -83,7 +84,6 @@ func (group *Group) deleteGroup() {
 		panic("group does not exist with id " + group.id.String())
 	}
 	gGroupsByName.Remove(group.name)
-
 }
 
 func (group *Group) deleteMember(mid MemberID) {

examples/gno.land/r/demo/groups/member.gno

@@ -24,4 +24,4 @@ func (member *Member) getMemberStr() string {
 	memberDataStr := ""
 	memberDataStr += "\t\t\t[" + memberIDKey(member.id) + ", " + member.address.String() + ", " + strconv.Itoa(member.weight) + ", " + member.metadata + ", " + member.createdAt.String() + "],\n\n"
 	return memberDataStr
-}
+}

examples/gno.land/r/demo/groups/misc.gno

@@ -4,6 +4,7 @@ import (
 	"std"
 	"strconv"
 	"strings"
+
 	"gno.land/r/demo/users"
 )
 
@@ -15,7 +16,7 @@ func getGroup(gid GroupID) *Group {
 	gidkey := groupIDKey(gid)
 	group_, exists := gGroups.Get(gidkey)
 	if !exists {
-		panic("group id ("+gid.String()+") does not exists")
+		panic("group id (" + gid.String() + ") does not exists")
 	}
 	group := group_.(*Group)
 	return group
@@ -29,17 +30,16 @@ func incGetGroupID() GroupID {
 func padLeft(str string, length int) string {
 	if len(str) >= length {
 		return str
-	} 
+	}
 	return strings.Repeat(" ", length-len(str)) + str
 }
 
 func padZero(u64 uint64, length int) string {
 	str := strconv.Itoa(int(u64))
 	if len(str) >= length {
 		return str
-	} 
+	}
 	return strings.Repeat("0", length-len(str)) + str
-
 }
 
 func groupIDKey(gid GroupID) string {
@@ -79,19 +79,18 @@ func displayAddressMD(addr std.Address) string {
 	user := users.GetUserByAddress(addr)
 	if user == nil {
 		return "[" + addr.String() + "](/r/users:" + addr.String() + ")"
-	} 
+	}
 	return "[@" + user.Name() + "](/r/users:" + user.Name() + ")"
 }
 
 func usernameOf(addr std.Address) string {
 	user := users.GetUserByAddress(addr)
 	if user == nil {
 		panic("user not found")
-	} 
+	}
 	return user.Name()
-
 }
 
 func isValidPermission(perm Permission) bool {
 	return perm == EditPermission || perm == DeletePermission
-}
+}

examples/gno.land/r/demo/groups/z_1_a_filetest.gno

@@ -17,7 +17,6 @@ var gid groups.GroupID
 const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj")
 
 func main() {
-
 	caller := std.GetOrigCaller() // main
 	users.Register("", "gnouser0", "my profile 1")
 

examples/gno.land/r/demo/groups/z_2_a_filetest.gno

@@ -17,7 +17,6 @@ var gid groups.GroupID
 const admin = std.Address("g1us8428u2a5satrlxzagqqa5m6vmuze025anjlj")
 
 func main() {
-
 	caller := std.GetOrigCaller() // main
 	users.Register("", "gnouser0", "my profile 1")
 

cmd/gnofaucet/main.go → gno.land/cmd/gnofaucet/main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gnolang/gno/pkgs/commands"
+	"github.com/gnolang/gno/t2/pkg/commands"
 )
 
 func main() {

cmd/gnofaucet/serve.go → gno.land/cmd/gnofaucet/serve.go

@@ -10,16 +10,16 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gnolang/gno/gnoland"
-	"github.com/gnolang/gno/pkgs/amino"
-	rpcclient "github.com/gnolang/gno/pkgs/bft/rpc/client"
-	"github.com/gnolang/gno/pkgs/commands"
-	"github.com/gnolang/gno/pkgs/crypto"
-	"github.com/gnolang/gno/pkgs/crypto/keys"
-	"github.com/gnolang/gno/pkgs/crypto/keys/client"
-	"github.com/gnolang/gno/pkgs/errors"
-	"github.com/gnolang/gno/pkgs/sdk/bank"
-	"github.com/gnolang/gno/pkgs/std"
+	"github.com/gnolang/gno/gno.land/pkg/gnoland"
+	"github.com/gnolang/gno/t2/pkg/amino"
+	rpcclient "github.com/gnolang/gno/t2/pkg/bft/rpc/client"
+	"github.com/gnolang/gno/t2/pkg/commands"
+	"github.com/gnolang/gno/t2/pkg/crypto"
+	"github.com/gnolang/gno/t2/pkg/crypto/keys"
+	"github.com/gnolang/gno/t2/pkg/crypto/keys/client"
+	"github.com/gnolang/gno/t2/pkg/errors"
+	"github.com/gnolang/gno/t2/pkg/sdk/bank"
+	"github.com/gnolang/gno/t2/pkg/std"
 )
 
 // url & struct for verify captcha

cmd/gnofaucet/throttle.go → gno.land/cmd/gnofaucet/throttle.go

@@ -4,7 +4,7 @@ import (
 	"net"
 	"time"
 
-	"github.com/gnolang/gno/pkgs/service"
+	"github.com/gnolang/gno/t2/pkg/service"
 )
 
 type SubnetThrottler struct {

cmd/gnokey/main.go → gno.land/cmd/gnokey/main.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/gnolang/gno/pkgs/crypto/keys/client"
+	"github.com/gnolang/gno/t2/pkg/crypto/keys/client"
 )
 
 func main() {

cmd/gnoland/main.go → gno.land/cmd/gnoland/main.go

@@ -9,20 +9,20 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gnolang/gno/gnoland"
-	"github.com/gnolang/gno/pkgs/amino"
-	abci "github.com/gnolang/gno/pkgs/bft/abci/types"
-	"github.com/gnolang/gno/pkgs/bft/config"
-	"github.com/gnolang/gno/pkgs/bft/node"
-	"github.com/gnolang/gno/pkgs/bft/privval"
-	bft "github.com/gnolang/gno/pkgs/bft/types"
-	"github.com/gnolang/gno/pkgs/commands"
-	"github.com/gnolang/gno/pkgs/crypto"
-	gno "github.com/gnolang/gno/pkgs/gnolang"
-	"github.com/gnolang/gno/pkgs/log"
-	osm "github.com/gnolang/gno/pkgs/os"
-	vmm "github.com/gnolang/gno/pkgs/sdk/vm"
-	"github.com/gnolang/gno/pkgs/std"
+	"github.com/gnolang/gno/gno.land/pkg/gnoland"
+	gno "github.com/gnolang/gno/gnovm/pkg/gnolang"
+	"github.com/gnolang/gno/t2/pkg/amino"
+	abci "github.com/gnolang/gno/t2/pkg/bft/abci/types"
+	"github.com/gnolang/gno/t2/pkg/bft/config"
+	"github.com/gnolang/gno/t2/pkg/bft/node"
+	"github.com/gnolang/gno/t2/pkg/bft/privval"
+	bft "github.com/gnolang/gno/t2/pkg/bft/types"
+	"github.com/gnolang/gno/t2/pkg/commands"
+	"github.com/gnolang/gno/t2/pkg/crypto"
+	"github.com/gnolang/gno/t2/pkg/log"
+	osm "github.com/gnolang/gno/t2/pkg/os"
+	vmm "github.com/gnolang/gno/t2/pkg/sdk/vm"
+	"github.com/gnolang/gno/t2/pkg/std"
 )
 
 type gnolandCfg struct {

cmd/gnoland/main_test.go → gno.land/cmd/gnoland/main_test.go

@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gnolang/gno/pkgs/commands"
-	"github.com/gnolang/gno/pkgs/testutils"
+	"github.com/gnolang/gno/t2/pkg/commands"
+	"github.com/gnolang/gno/t2/pkg/testutils"
 	"github.com/stretchr/testify/require"
 )
 

gnoland/website/main.go → gno.land/cmd/gnoweb/main.go

@@ -15,17 +15,17 @@ import (
 	"strings"
 	"time"
 
-	"github.com/gnolang/gno/pkgs/amino"
-	abci "github.com/gnolang/gno/pkgs/bft/abci/types"
-	"github.com/gnolang/gno/pkgs/bft/rpc/client"
-	osm "github.com/gnolang/gno/pkgs/os"
-	"github.com/gnolang/gno/pkgs/std"
+	"github.com/gnolang/gno/t2/pkg/amino"
+	abci "github.com/gnolang/gno/t2/pkg/bft/abci/types"
+	"github.com/gnolang/gno/t2/pkg/bft/rpc/client"
+	osm "github.com/gnolang/gno/t2/pkg/os"
+	"github.com/gnolang/gno/t2/pkg/std"
 	"github.com/gorilla/mux"
 	"github.com/gotuna/gotuna"
 
-	"github.com/gnolang/gno/gnoland/website/static" // for static files
-	"github.com/gnolang/gno/pkgs/sdk/vm"            // for error types
-	// "github.com/gnolang/gno/pkgs/sdk"               // for baseapp (info, status)
+	"github.com/gnolang/gno/gno.land/cmd/gnoweb/static" // for static files
+	"github.com/gnolang/gno/t2/pkg/sdk/vm"              // for error types
+	// "github.com/gnolang/gno/t2/pkg/sdk"               // for baseapp (info, status)
 )
 
 const (

gnoland/app.go → gno.land/pkg/gnoland/app.go

@@ -5,19 +5,19 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/gnolang/gno/pkgs/amino"
-	abci "github.com/gnolang/gno/pkgs/bft/abci/types"
-	"github.com/gnolang/gno/pkgs/crypto"
-	dbm "github.com/gnolang/gno/pkgs/db"
-	"github.com/gnolang/gno/pkgs/log"
-	"github.com/gnolang/gno/pkgs/sdk"
-	"github.com/gnolang/gno/pkgs/sdk/auth"
-	"github.com/gnolang/gno/pkgs/sdk/bank"
-	"github.com/gnolang/gno/pkgs/sdk/vm"
-	"github.com/gnolang/gno/pkgs/std"
-	"github.com/gnolang/gno/pkgs/store"
-	"github.com/gnolang/gno/pkgs/store/dbadapter"
-	"github.com/gnolang/gno/pkgs/store/iavl"
+	"github.com/gnolang/gno/t2/pkg/amino"
+	abci "github.com/gnolang/gno/t2/pkg/bft/abci/types"
+	"github.com/gnolang/gno/t2/pkg/crypto"
+	dbm "github.com/gnolang/gno/t2/pkg/db"
+	"github.com/gnolang/gno/t2/pkg/log"
+	"github.com/gnolang/gno/t2/pkg/sdk"
+	"github.com/gnolang/gno/t2/pkg/sdk/auth"
+	"github.com/gnolang/gno/t2/pkg/sdk/bank"
+	"github.com/gnolang/gno/t2/pkg/sdk/vm"
+	"github.com/gnolang/gno/t2/pkg/std"
+	"github.com/gnolang/gno/t2/pkg/store"
+	"github.com/gnolang/gno/t2/pkg/store/dbadapter"
+	"github.com/gnolang/gno/t2/pkg/store/iavl"
 )
 
 // NewApp creates the GnoLand application.

gnoland/package.go → gno.land/pkg/gnoland/package.go

@@ -1,7 +1,7 @@
 package gnoland
 
 import (
-	"github.com/gnolang/gno/pkgs/amino"
+	"github.com/gnolang/gno/t2/pkg/amino"
 )
 
 var Package = amino.RegisterPackage(amino.NewPackage(

gnoland/types.go → gno.land/pkg/gnoland/types.go

@@ -1,7 +1,7 @@
 package gnoland
 
 import (
-	"github.com/gnolang/gno/pkgs/std"
+	"github.com/gnolang/gno/t2/pkg/std"
 )
 
 type GnoAccount struct {