diff --git a/.github/workflows/gnoland.yml b/.github/workflows/gnoland.yml index 8b92a198ec8..6d2ea67b3da 100644 --- a/.github/workflows/gnoland.yml +++ b/.github/workflows/gnoland.yml @@ -29,6 +29,7 @@ jobs: - gnokey - gnoweb - gnofaucet + - gnotxsync runs-on: ubuntu-latest timeout-minutes: 5 steps: diff --git a/.github/workflows/tm2.yml b/.github/workflows/tm2.yml index ba543c2b596..ee85c369c65 100644 --- a/.github/workflows/tm2.yml +++ b/.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: diff --git a/Dockerfile b/Dockerfile index bb23e8cb0c6..a492f982ea5 100644 --- a/Dockerfile +++ b/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/ diff --git a/README.md b/README.md index d81576f50d8..99634f90a0d 100644 --- a/README.md +++ b/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 diff --git a/gno.land/Makefile b/gno.land/Makefile index 3e4d6ee8c8e..117de18fc46 100644 --- a/gno.land/Makefile +++ b/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 diff --git a/gno.land/cmd/gnoland/start.go b/gno.land/cmd/gnoland/start.go index e2a2b2e58d7..3280f7b9178 100644 --- a/gno.land/cmd/gnoland/start.go +++ b/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" ) diff --git a/tm2/cmd/tm2txsync/README.md b/gno.land/cmd/gnotxsync/README.md similarity index 100% rename from tm2/cmd/tm2txsync/README.md rename to gno.land/cmd/gnotxsync/README.md diff --git a/tm2/cmd/tm2txsync/export.go b/gno.land/cmd/gnotxsync/export.go similarity index 98% rename from tm2/cmd/tm2txsync/export.go rename to gno.land/cmd/gnotxsync/export.go index 1d7585256e0..f22a4cd22f4 100644 --- a/tm2/cmd/tm2txsync/export.go +++ b/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 { diff --git a/tm2/cmd/tm2txsync/import.go b/gno.land/cmd/gnotxsync/import.go similarity index 98% rename from tm2/cmd/tm2txsync/import.go rename to gno.land/cmd/gnotxsync/import.go index 5938496bdd0..3369b5378b5 100644 --- a/tm2/cmd/tm2txsync/import.go +++ b/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 { diff --git a/tm2/cmd/tm2txsync/main.go b/gno.land/cmd/gnotxsync/main.go similarity index 100% rename from tm2/cmd/tm2txsync/main.go rename to gno.land/cmd/gnotxsync/main.go diff --git a/gno.land/cmd/gnoweb/main.go b/gno.land/cmd/gnoweb/main.go index 149db7b292a..e8a2feac0d7 100644 --- a/gno.land/cmd/gnoweb/main.go +++ b/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) ) diff --git a/gno.land/pkg/gnoland/app.go b/gno.land/pkg/gnoland/app.go index e33be9c04fe..b10f251b115 100644 --- a/gno.land/pkg/gnoland/app.go +++ b/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" diff --git a/tm2/pkg/sdk/vm/builtins.go b/gno.land/pkg/sdk/vm/builtins.go similarity index 100% rename from tm2/pkg/sdk/vm/builtins.go rename to gno.land/pkg/sdk/vm/builtins.go diff --git a/tm2/pkg/sdk/vm/common_test.go b/gno.land/pkg/sdk/vm/common_test.go similarity index 100% rename from tm2/pkg/sdk/vm/common_test.go rename to gno.land/pkg/sdk/vm/common_test.go diff --git a/tm2/pkg/sdk/vm/consts.go b/gno.land/pkg/sdk/vm/consts.go similarity index 100% rename from tm2/pkg/sdk/vm/consts.go rename to gno.land/pkg/sdk/vm/consts.go diff --git a/tm2/pkg/sdk/vm/convert.go b/gno.land/pkg/sdk/vm/convert.go similarity index 100% rename from tm2/pkg/sdk/vm/convert.go rename to gno.land/pkg/sdk/vm/convert.go diff --git a/tm2/pkg/sdk/vm/errors.go b/gno.land/pkg/sdk/vm/errors.go similarity index 100% rename from tm2/pkg/sdk/vm/errors.go rename to gno.land/pkg/sdk/vm/errors.go diff --git a/tm2/pkg/sdk/vm/handler.go b/gno.land/pkg/sdk/vm/handler.go similarity index 100% rename from tm2/pkg/sdk/vm/handler.go rename to gno.land/pkg/sdk/vm/handler.go diff --git a/tm2/pkg/sdk/vm/handler_test.go b/gno.land/pkg/sdk/vm/handler_test.go similarity index 100% rename from tm2/pkg/sdk/vm/handler_test.go rename to gno.land/pkg/sdk/vm/handler_test.go diff --git a/tm2/pkg/sdk/vm/invariants.go b/gno.land/pkg/sdk/vm/invariants.go similarity index 100% rename from tm2/pkg/sdk/vm/invariants.go rename to gno.land/pkg/sdk/vm/invariants.go diff --git a/tm2/pkg/sdk/vm/keeper.go b/gno.land/pkg/sdk/vm/keeper.go similarity index 100% rename from tm2/pkg/sdk/vm/keeper.go rename to gno.land/pkg/sdk/vm/keeper.go diff --git a/tm2/pkg/sdk/vm/keeper_test.go b/gno.land/pkg/sdk/vm/keeper_test.go similarity index 100% rename from tm2/pkg/sdk/vm/keeper_test.go rename to gno.land/pkg/sdk/vm/keeper_test.go diff --git a/tm2/pkg/sdk/vm/msgs.go b/gno.land/pkg/sdk/vm/msgs.go similarity index 100% rename from tm2/pkg/sdk/vm/msgs.go rename to gno.land/pkg/sdk/vm/msgs.go diff --git a/tm2/pkg/sdk/vm/package.go b/gno.land/pkg/sdk/vm/package.go similarity index 90% rename from tm2/pkg/sdk/vm/package.go rename to gno.land/pkg/sdk/vm/package.go index e7d1144ffaa..5d05c108bd0 100644 --- a/tm2/pkg/sdk/vm/package.go +++ b/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( diff --git a/tm2/pkg/sdk/vm/types.go b/gno.land/pkg/sdk/vm/types.go similarity index 100% rename from tm2/pkg/sdk/vm/types.go rename to gno.land/pkg/sdk/vm/types.go diff --git a/tm2/pkg/sdk/vm/vm.proto b/gno.land/pkg/sdk/vm/vm.proto similarity index 85% rename from tm2/pkg/sdk/vm/vm.proto rename to gno.land/pkg/sdk/vm/vm.proto index 262583869c7..27e68042bdf 100644 --- a/tm2/pkg/sdk/vm/vm.proto +++ b/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 { -} \ No newline at end of file +} diff --git a/misc/docker-integration/integration_test.go b/misc/docker-integration/integration_test.go index 3af32226c96..6ae0ea1d36e 100644 --- a/misc/docker-integration/integration_test.go +++ b/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" diff --git a/misc/genproto/genproto.go b/misc/genproto/genproto.go index 9c5c6443071..fd5c4e4e2e4 100644 --- a/misc/genproto/genproto.go +++ b/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" ) diff --git a/tm2/Makefile b/tm2/Makefile index cf27bb07e7c..a5a8b8ade0d 100644 --- a/tm2/Makefile +++ b/tm2/Makefile @@ -7,10 +7,8 @@ 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 @@ -18,7 +16,7 @@ _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/... diff --git a/tm2/pkg/crypto/keys/client/addpkg.go b/tm2/pkg/crypto/keys/client/addpkg.go index 106d6867e74..538136244fc 100644 --- a/tm2/pkg/crypto/keys/client/addpkg.go +++ b/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" ) diff --git a/tm2/pkg/crypto/keys/client/call.go b/tm2/pkg/crypto/keys/client/call.go index fa445860e5a..bcb7be3e550 100644 --- a/tm2/pkg/crypto/keys/client/call.go +++ b/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" )