Merge branch 'master' into hariom/gno-test-patterns

.github/workflows/gnoland.yml

@@ -29,6 +29,7 @@ jobs:
           - gnokey
           - gnoweb
           - gnofaucet
+          - gnotxsync 
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:

.github/workflows/tm2.yml

@@ -22,7 +22,7 @@ jobs:
         go-version: [ "1.19.x", "1.20.x" ]
         goarch: [ "amd64" ]
         goos: [ "linux" ]
-        program: [ "./cmd/tm2txsync", "./pkg/amino/cmd/aminoscan", "./pkg/amino/cmd/goscan", "./pkg/autofile/cmd", "./pkg/iavl/cmd/iaviewer" ]
+        program: [ "./pkg/amino/cmd/aminoscan", "./pkg/amino/cmd/goscan", "./pkg/autofile/cmd", "./pkg/iavl/cmd/iaviewer" ]
     runs-on: ubuntu-latest
     timeout-minutes: 5
     steps:
@@ -44,7 +44,6 @@ jobs:
           - _test.pkg.amino
           - _test.pkg.bft
           - _test.pkg.others
-          - _test.cmds
     runs-on: ubuntu-latest
     timeout-minutes: 15
     steps:

Dockerfile

@@ -10,7 +10,7 @@ RUN         go build -o ./build/gnokey    ./gno.land/cmd/gnokey
 RUN         go build -o ./build/gnofaucet ./gno.land/cmd/gnofaucet
 RUN         go build -o ./build/gnoweb    ./gno.land/cmd/gnoweb
 RUN         go build -o ./build/gno       ./gnovm/cmd/gno
-RUN         go build -o ./build/tm2txsync  ./tm2/cmd/tm2txsync
+RUN         go build -o ./build/gnotxsync  ./gno.land/cmd/gnotxsync
 RUN         ls -la ./build
 ADD         . /opt/gno/src/
 RUN         rm -rf /opt/gno/src/.git
@@ -42,9 +42,9 @@ COPY        --from=build /opt/build/build/gnofaucet /opt/gno/bin/
 ENTRYPOINT  ["gnofaucet"]
 EXPOSE      5050
 
-FROM        runtime-tls AS tm2txsync-slim
-COPY        --from=build /opt/build/build/tm2txsync /opt/gno/bin/
-ENTRYPOINT  ["tm2txsync"]
+FROM        runtime-tls AS gnotxsync-slim
+COPY        --from=build /opt/build/build/gnotxsync /opt/gno/bin/
+ENTRYPOINT  ["gnotxsync"]
 
 FROM        runtime-tls AS gnoweb-slim
 COPY        --from=build /opt/build/build/gnoweb /opt/gno/bin/

README.md

@@ -43,7 +43,7 @@ Also, see the [quickstart guide](https://github.com/gnolang/gno/blob/master/exam
   Developer commands:
 
   * [gno](./gnovm/cmd/gno) - handy tool for developing gno packages & realms
-  * [tm2txsync](./tm2/cmd/tm2txsync) - importing/exporting transactions from local blockchain node storage
+  * [gnotxsync](./gno.land/cmd/gnotxsync) - importing/exporting transactions from local blockchain node storage
   * [goscan](./misc/goscan) - dumps imports from specified file’s AST
   * [genproto](./misc/genproto) - helper for generating .proto implementations
   * [gnofaucet](./gno.land/cmd/gnofaucet) - serves GNOT faucet

gno.land/Makefile

@@ -6,20 +6,22 @@ help:
 rundep=go run -modfile ../misc/devdeps/go.mod
 
 .PHONY: build
-build: build.gnoland build.gnokey build.gnoweb build.gnofaucet
+build: build.gnoland build.gnokey build.gnoweb build.gnofaucet build.gnotxsync
 
 build.gnoland:;    go build -o build/gnoland   ./cmd/gnoland
 build.gnoweb:;     go build -o build/gnoweb    ./cmd/gnoweb
 build.gnofaucet:;  go build -o build/gnofaucet ./cmd/gnofaucet
 build.gnokey:;     go build -o build/gnokey    ./cmd/gnokey
+build.gnotxsync:;  go build -o build/gnotxsync  ./cmd/gnotxsync
 
 .PHONY: install
-install: install.gnoland install.gnoweb install.gnofaucet install.gnokey
+install: install.gnoland install.gnoweb install.gnofaucet install.gnokey install.gnotxsync
 
 install.gnoland:;    go install ./cmd/gnoland
 install.gnoweb:;     go install ./cmd/gnoweb
 install.gnofaucet:;  go install ./cmd/gnofaucet
 install.gnokey:;     go install ./cmd/gnokey
+install.gnotxsync:;  go install ./cmd/gnotxsync
 
 .PHONY: fclean
 fclean: clean

gno.land/cmd/gnoland/start.go

@@ -9,6 +9,7 @@ import (
 	"time"
 
 	"github.com/gnolang/gno/gno.land/pkg/gnoland"
+	vmm "github.com/gnolang/gno/gno.land/pkg/sdk/vm"
 	gno "github.com/gnolang/gno/gnovm/pkg/gnolang"
 	"github.com/gnolang/gno/gnovm/pkg/gnomod"
 	"github.com/gnolang/gno/tm2/pkg/amino"
@@ -21,7 +22,6 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/crypto"
 	"github.com/gnolang/gno/tm2/pkg/log"
 	osm "github.com/gnolang/gno/tm2/pkg/os"
-	vmm "github.com/gnolang/gno/tm2/pkg/sdk/vm"
 	"github.com/gnolang/gno/tm2/pkg/std"
 )
 

tm2/cmd/tm2txsync/export.go → gno.land/cmd/gnotxsync/export.go

@@ -15,9 +15,9 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/std"
 
+	_ "github.com/gnolang/gno/gno.land/pkg/sdk/vm"
 	_ "github.com/gnolang/gno/tm2/pkg/sdk/auth" // XXX better way?
 	_ "github.com/gnolang/gno/tm2/pkg/sdk/bank"
-	_ "github.com/gnolang/gno/tm2/pkg/sdk/vm"
 )
 
 type exportCfg struct {

tm2/cmd/tm2txsync/import.go → gno.land/cmd/gnotxsync/import.go

@@ -14,9 +14,9 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/errors"
 	"github.com/gnolang/gno/tm2/pkg/std"
 
+	_ "github.com/gnolang/gno/gno.land/pkg/sdk/vm"
 	_ "github.com/gnolang/gno/tm2/pkg/sdk/auth" // XXX better way?
 	_ "github.com/gnolang/gno/tm2/pkg/sdk/bank"
-	_ "github.com/gnolang/gno/tm2/pkg/sdk/vm"
 )
 
 type importCfg struct {

gno.land/cmd/gnoweb/main.go

@@ -24,7 +24,7 @@ import (
 	"github.com/gotuna/gotuna"
 
 	"github.com/gnolang/gno/gno.land/cmd/gnoweb/static" // for static files
-	"github.com/gnolang/gno/tm2/pkg/sdk/vm"             // for error types
+	"github.com/gnolang/gno/gno.land/pkg/sdk/vm"        // for error types
 	// "github.com/gnolang/gno/tm2/pkg/sdk"               // for baseapp (info, status)
 )
 

gno.land/pkg/gnoland/app.go

@@ -5,6 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/gnolang/gno/gno.land/pkg/sdk/vm"
 	"github.com/gnolang/gno/tm2/pkg/amino"
 	abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types"
 	"github.com/gnolang/gno/tm2/pkg/crypto"
@@ -13,7 +14,6 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/sdk"
 	"github.com/gnolang/gno/tm2/pkg/sdk/auth"
 	"github.com/gnolang/gno/tm2/pkg/sdk/bank"
-	"github.com/gnolang/gno/tm2/pkg/sdk/vm"
 	"github.com/gnolang/gno/tm2/pkg/std"
 	"github.com/gnolang/gno/tm2/pkg/store"
 	"github.com/gnolang/gno/tm2/pkg/store/dbadapter"

tm2/pkg/sdk/vm/package.go → gno.land/pkg/sdk/vm/package.go

@@ -6,7 +6,7 @@ import (
 )
 
 var Package = amino.RegisterPackage(amino.NewPackage(
-	"github.com/gnolang/gno/tm2/pkg/sdk/vm",
+	"github.com/gnolang/gno/gno.land/pkg/sdk/vm",
 	"vm",
 	amino.GetCallersDirname(),
 ).WithDependencies(

tm2/pkg/sdk/vm/vm.proto → gno.land/pkg/sdk/vm/vm.proto

@@ -1,7 +1,7 @@
 syntax = "proto3";
 package vm;
 
-option go_package = "github.com/gnolang/gno/tm2/pkg/sdk/vm/pb";
+option go_package = "github.com/gnolang/gno/gno.land/pkg/sdk/vm/pb";
 
 // imports
 import "github.com/gnolang/gno/tm2/pkg/std/std.proto";
@@ -28,4 +28,4 @@ message InvalidStmtError {
 }
 
 message InvalidExprError {
-}
+}

misc/docker-integration/integration_test.go

@@ -13,8 +13,8 @@ import (
 	"time"
 
 	"github.com/gnolang/gno/gno.land/pkg/gnoland"
+	"github.com/gnolang/gno/gno.land/pkg/sdk/vm"
 	"github.com/gnolang/gno/tm2/pkg/amino"
-	"github.com/gnolang/gno/tm2/pkg/sdk/vm"
 	"github.com/gnolang/gno/tm2/pkg/std"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v3"

misc/genproto/genproto.go

@@ -11,6 +11,7 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/commands"
 
 	// TODO: move these out.
+	"github.com/gnolang/gno/gno.land/pkg/sdk/vm"
 	gno "github.com/gnolang/gno/gnovm/pkg/gnolang"
 	abci "github.com/gnolang/gno/tm2/pkg/bft/abci/types"
 	"github.com/gnolang/gno/tm2/pkg/bft/blockchain"
@@ -25,7 +26,6 @@ import (
 	"github.com/gnolang/gno/tm2/pkg/crypto/multisig"
 	"github.com/gnolang/gno/tm2/pkg/sdk"
 	"github.com/gnolang/gno/tm2/pkg/sdk/bank"
-	"github.com/gnolang/gno/tm2/pkg/sdk/vm"
 	"github.com/gnolang/gno/tm2/pkg/std"
 )
 

tm2/Makefile

@@ -7,18 +7,16 @@ help:
 rundep=go run -modfile ../misc/devdeps/go.mod
 
 .PHONY: build
-build: _build.tm2txsync
 _build.tools: _build.aminoscan _build.goscan _build.logjack _build.iaviewer
 
-_build.tm2txsync:;  go build -o build/tm2txsync  ./cmd/tm2txsync
 _build.aminoscan:;  go build -o build/aminoscan  ./pkg/amino/cmd/aminoscan
 _build.goscan:;     go build -o build/goscan     ./pkg/amino/cmd/goscan
 _build.logjack:;    go build -o build/logjack    ./pkg/autofile/cmd
 _build.iaviewer:;   go build -o build/iaviewer   ./pkg/iavl/cmd/iaviewer
 
 .PHONY: install
 install:
-	go install ./cmd/...
+#	go install ./cmd/...
 
 .PHONY: clean
 clean:
@@ -36,7 +34,7 @@ lint:
 ########################################
 # Test suite
 .PHONY: test
-test: _test.pkg.amino _test.pkg.bft _test.pkg.others _test.flappy _test.cmds
+test: _test.pkg.amino _test.pkg.bft _test.pkg.others _test.flappy
 
 _test.flappy:
 	# flappy tests should work "sometimes" (at least once).
@@ -48,4 +46,3 @@ GOTEST_FLAGS ?= -v -p 1 -timeout=30m
 _test.pkg.others:;  go test $(GOTEST_FLAGS) `go list ./pkg/... | grep -v pkg/amino/ | grep -v pkg/bft/`
 _test.pkg.amino:;   go test $(GOTEST_FLAGS) ./pkg/amino/...
 _test.pkg.bft:;	    go test $(GOTEST_FLAGS) ./pkg/bft/...
-_test.cmds:;        go test $(GOTEST_FLAGS) ./cmd/...

tm2/pkg/commands/utils.go

@@ -2,8 +2,8 @@ package commands
 
 import (
 	"errors"
+	"os"
 	"strings"
-	"syscall"
 
 	"golang.org/x/term"
 )
@@ -39,7 +39,7 @@ func (io *IO) readLine() (string, error) {
 // readPassword reads the password from a terminal
 // without local echo
 func readPassword() (string, error) {
-	fd := syscall.Stdin
+	fd := int(os.Stdin.Fd())
 
 	inputPass, err := term.ReadPassword(fd)
 	if err != nil {

tm2/pkg/crypto/keys/client/addpkg.go

@@ -7,12 +7,12 @@ import (
 	"flag"
 	"fmt"
 
+	"github.com/gnolang/gno/gno.land/pkg/sdk/vm"
 	gno "github.com/gnolang/gno/gnovm/pkg/gnolang"
 	"github.com/gnolang/gno/tm2/pkg/amino"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/crypto/keys"
 	"github.com/gnolang/gno/tm2/pkg/errors"
-	"github.com/gnolang/gno/tm2/pkg/sdk/vm"
 	"github.com/gnolang/gno/tm2/pkg/std"
 )
 

tm2/pkg/crypto/keys/client/call.go

@@ -5,11 +5,11 @@ import (
 	"flag"
 	"fmt"
 
+	"github.com/gnolang/gno/gno.land/pkg/sdk/vm"
 	"github.com/gnolang/gno/tm2/pkg/amino"
 	"github.com/gnolang/gno/tm2/pkg/commands"
 	"github.com/gnolang/gno/tm2/pkg/crypto/keys"
 	"github.com/gnolang/gno/tm2/pkg/errors"
-	"github.com/gnolang/gno/tm2/pkg/sdk/vm"
 	"github.com/gnolang/gno/tm2/pkg/std"
 )