From 16d98c51388545e0fa1506d2b530f74f2c02e806 Mon Sep 17 00:00:00 2001 From: piux2 <> Date: Mon, 15 May 2023 20:13:29 -0700 Subject: [PATCH 1/3] tm2 clean up --- gno.land/Makefile | 3 ++- gno.land/cmd/gnoland/main.go | 2 +- gno.land/cmd/gnoweb/main.go | 2 +- {tm2 => gno.land}/cmd/tm2txsync/README.md | 0 {tm2 => gno.land}/cmd/tm2txsync/export.go | 2 +- {tm2 => gno.land}/cmd/tm2txsync/import.go | 2 +- {tm2 => gno.land}/cmd/tm2txsync/main.go | 0 gno.land/pkg/gnoland/app.go | 2 +- {tm2 => gnovm}/pkg/sdk/vm/builtins.go | 0 {tm2 => gnovm}/pkg/sdk/vm/common_test.go | 0 {tm2 => gnovm}/pkg/sdk/vm/consts.go | 0 {tm2 => gnovm}/pkg/sdk/vm/convert.go | 0 {tm2 => gnovm}/pkg/sdk/vm/errors.go | 0 {tm2 => gnovm}/pkg/sdk/vm/handler.go | 0 {tm2 => gnovm}/pkg/sdk/vm/handler_test.go | 0 {tm2 => gnovm}/pkg/sdk/vm/invariants.go | 0 {tm2 => gnovm}/pkg/sdk/vm/keeper.go | 0 {tm2 => gnovm}/pkg/sdk/vm/keeper_test.go | 0 {tm2 => gnovm}/pkg/sdk/vm/msgs.go | 0 {tm2 => gnovm}/pkg/sdk/vm/package.go | 2 +- {tm2 => gnovm}/pkg/sdk/vm/types.go | 0 {tm2 => gnovm}/pkg/sdk/vm/vm.proto | 2 +- misc/docker-integration/integration_test.go | 2 +- misc/genproto/genproto.go | 2 +- tm2/Makefile | 2 -- tm2/pkg/crypto/keys/client/addpkg.go | 2 +- tm2/pkg/crypto/keys/client/call.go | 2 +- 27 files changed, 13 insertions(+), 14 deletions(-) rename {tm2 => gno.land}/cmd/tm2txsync/README.md (100%) rename {tm2 => gno.land}/cmd/tm2txsync/export.go (98%) rename {tm2 => gno.land}/cmd/tm2txsync/import.go (98%) rename {tm2 => gno.land}/cmd/tm2txsync/main.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/builtins.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/common_test.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/consts.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/convert.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/errors.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/handler.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/handler_test.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/invariants.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/keeper.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/keeper_test.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/msgs.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/package.go (91%) rename {tm2 => gnovm}/pkg/sdk/vm/types.go (100%) rename {tm2 => gnovm}/pkg/sdk/vm/vm.proto (86%) diff --git a/gno.land/Makefile b/gno.land/Makefile index 669a8dff064..b3944834db6 100644 --- a/gno.land/Makefile +++ b/gno.land/Makefile @@ -6,12 +6,13 @@ 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.tm2txsync 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.tm2txsync:; go build -o build/tm2txsync ./cmd/tm2txsync .PHONY: install install: install.gnoland install.gnoweb install.gnofaucet install.gnokey diff --git a/gno.land/cmd/gnoland/main.go b/gno.land/cmd/gnoland/main.go index 9a2c11146e8..39f2619d01f 100644 --- a/gno.land/cmd/gnoland/main.go +++ b/gno.land/cmd/gnoland/main.go @@ -21,7 +21,7 @@ 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" + vmm "github.com/gnolang/gno/gnovm/pkg/sdk/vm" "github.com/gnolang/gno/tm2/pkg/std" ) diff --git a/gno.land/cmd/gnoweb/main.go b/gno.land/cmd/gnoweb/main.go index 295e4cdd2db..c69314d7660 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/gnovm/pkg/sdk/vm" // for error types // "github.com/gnolang/gno/tm2/pkg/sdk" // for baseapp (info, status) ) diff --git a/tm2/cmd/tm2txsync/README.md b/gno.land/cmd/tm2txsync/README.md similarity index 100% rename from tm2/cmd/tm2txsync/README.md rename to gno.land/cmd/tm2txsync/README.md diff --git a/tm2/cmd/tm2txsync/export.go b/gno.land/cmd/tm2txsync/export.go similarity index 98% rename from tm2/cmd/tm2txsync/export.go rename to gno.land/cmd/tm2txsync/export.go index 1d7585256e0..0621cd53125 100644 --- a/tm2/cmd/tm2txsync/export.go +++ b/gno.land/cmd/tm2txsync/export.go @@ -17,7 +17,7 @@ import ( _ "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" + _ "github.com/gnolang/gno/gnovm/pkg/sdk/vm" ) type exportCfg struct { diff --git a/tm2/cmd/tm2txsync/import.go b/gno.land/cmd/tm2txsync/import.go similarity index 98% rename from tm2/cmd/tm2txsync/import.go rename to gno.land/cmd/tm2txsync/import.go index 5938496bdd0..dd7dc313842 100644 --- a/tm2/cmd/tm2txsync/import.go +++ b/gno.land/cmd/tm2txsync/import.go @@ -16,7 +16,7 @@ import ( _ "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" + _ "github.com/gnolang/gno/gnovm/pkg/sdk/vm" ) type importCfg struct { diff --git a/tm2/cmd/tm2txsync/main.go b/gno.land/cmd/tm2txsync/main.go similarity index 100% rename from tm2/cmd/tm2txsync/main.go rename to gno.land/cmd/tm2txsync/main.go diff --git a/gno.land/pkg/gnoland/app.go b/gno.land/pkg/gnoland/app.go index 95fe9d2df8d..304959ceb5e 100644 --- a/gno.land/pkg/gnoland/app.go +++ b/gno.land/pkg/gnoland/app.go @@ -13,7 +13,7 @@ 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/gnovm/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/gnovm/pkg/sdk/vm/builtins.go similarity index 100% rename from tm2/pkg/sdk/vm/builtins.go rename to gnovm/pkg/sdk/vm/builtins.go diff --git a/tm2/pkg/sdk/vm/common_test.go b/gnovm/pkg/sdk/vm/common_test.go similarity index 100% rename from tm2/pkg/sdk/vm/common_test.go rename to gnovm/pkg/sdk/vm/common_test.go diff --git a/tm2/pkg/sdk/vm/consts.go b/gnovm/pkg/sdk/vm/consts.go similarity index 100% rename from tm2/pkg/sdk/vm/consts.go rename to gnovm/pkg/sdk/vm/consts.go diff --git a/tm2/pkg/sdk/vm/convert.go b/gnovm/pkg/sdk/vm/convert.go similarity index 100% rename from tm2/pkg/sdk/vm/convert.go rename to gnovm/pkg/sdk/vm/convert.go diff --git a/tm2/pkg/sdk/vm/errors.go b/gnovm/pkg/sdk/vm/errors.go similarity index 100% rename from tm2/pkg/sdk/vm/errors.go rename to gnovm/pkg/sdk/vm/errors.go diff --git a/tm2/pkg/sdk/vm/handler.go b/gnovm/pkg/sdk/vm/handler.go similarity index 100% rename from tm2/pkg/sdk/vm/handler.go rename to gnovm/pkg/sdk/vm/handler.go diff --git a/tm2/pkg/sdk/vm/handler_test.go b/gnovm/pkg/sdk/vm/handler_test.go similarity index 100% rename from tm2/pkg/sdk/vm/handler_test.go rename to gnovm/pkg/sdk/vm/handler_test.go diff --git a/tm2/pkg/sdk/vm/invariants.go b/gnovm/pkg/sdk/vm/invariants.go similarity index 100% rename from tm2/pkg/sdk/vm/invariants.go rename to gnovm/pkg/sdk/vm/invariants.go diff --git a/tm2/pkg/sdk/vm/keeper.go b/gnovm/pkg/sdk/vm/keeper.go similarity index 100% rename from tm2/pkg/sdk/vm/keeper.go rename to gnovm/pkg/sdk/vm/keeper.go diff --git a/tm2/pkg/sdk/vm/keeper_test.go b/gnovm/pkg/sdk/vm/keeper_test.go similarity index 100% rename from tm2/pkg/sdk/vm/keeper_test.go rename to gnovm/pkg/sdk/vm/keeper_test.go diff --git a/tm2/pkg/sdk/vm/msgs.go b/gnovm/pkg/sdk/vm/msgs.go similarity index 100% rename from tm2/pkg/sdk/vm/msgs.go rename to gnovm/pkg/sdk/vm/msgs.go diff --git a/tm2/pkg/sdk/vm/package.go b/gnovm/pkg/sdk/vm/package.go similarity index 91% rename from tm2/pkg/sdk/vm/package.go rename to gnovm/pkg/sdk/vm/package.go index e7d1144ffaa..37fd6327d8b 100644 --- a/tm2/pkg/sdk/vm/package.go +++ b/gnovm/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/gnovm/pkg/sdk/vm", "vm", amino.GetCallersDirname(), ).WithDependencies( diff --git a/tm2/pkg/sdk/vm/types.go b/gnovm/pkg/sdk/vm/types.go similarity index 100% rename from tm2/pkg/sdk/vm/types.go rename to gnovm/pkg/sdk/vm/types.go diff --git a/tm2/pkg/sdk/vm/vm.proto b/gnovm/pkg/sdk/vm/vm.proto similarity index 86% rename from tm2/pkg/sdk/vm/vm.proto rename to gnovm/pkg/sdk/vm/vm.proto index 262583869c7..323378cd3d7 100644 --- a/tm2/pkg/sdk/vm/vm.proto +++ b/gnovm/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/gnovm/pkg/sdk/vm/pb"; // imports import "github.com/gnolang/gno/tm2/pkg/std/std.proto"; diff --git a/misc/docker-integration/integration_test.go b/misc/docker-integration/integration_test.go index ac9d5443c3e..595333ec63c 100644 --- a/misc/docker-integration/integration_test.go +++ b/misc/docker-integration/integration_test.go @@ -14,7 +14,7 @@ import ( "github.com/gnolang/gno/gno.land/pkg/gnoland" "github.com/gnolang/gno/tm2/pkg/amino" - "github.com/gnolang/gno/tm2/pkg/sdk/vm" + "github.com/gnolang/gno/gnovm/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 7bb0af2c79b..41f4df4da25 100644 --- a/misc/genproto/genproto.go +++ b/misc/genproto/genproto.go @@ -25,7 +25,7 @@ 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/gnovm/pkg/sdk/vm" "github.com/gnolang/gno/tm2/pkg/std" ) diff --git a/tm2/Makefile b/tm2/Makefile index 081ec8afab8..5f7f416283f 100644 --- a/tm2/Makefile +++ b/tm2/Makefile @@ -6,10 +6,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 diff --git a/tm2/pkg/crypto/keys/client/addpkg.go b/tm2/pkg/crypto/keys/client/addpkg.go index 106d6867e74..febe9b2a060 100644 --- a/tm2/pkg/crypto/keys/client/addpkg.go +++ b/tm2/pkg/crypto/keys/client/addpkg.go @@ -12,7 +12,7 @@ import ( "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/gnovm/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..96b0c04e0ae 100644 --- a/tm2/pkg/crypto/keys/client/call.go +++ b/tm2/pkg/crypto/keys/client/call.go @@ -9,7 +9,7 @@ import ( "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/gnovm/pkg/sdk/vm" "github.com/gnolang/gno/tm2/pkg/std" ) From 9aa0c405b9ecd3e0c7c40470377083db79fbfbfd Mon Sep 17 00:00:00 2001 From: piux2 <> Date: Mon, 22 May 2023 12:16:56 -0700 Subject: [PATCH 2/3] move pkg/sdk/vm from gnovm to gno.land --- .github/workflows/gnoland.yml | 1 + .github/workflows/tm2.yml | 2 +- gno.land/cmd/gnoland/main.go | 2 +- gno.land/cmd/gnoweb/main.go | 2 +- gno.land/cmd/tm2txsync/export.go | 2 +- gno.land/cmd/tm2txsync/import.go | 2 +- gno.land/pkg/gnoland/app.go | 2 +- {gnovm => gno.land}/pkg/sdk/vm/builtins.go | 0 {gnovm => gno.land}/pkg/sdk/vm/common_test.go | 0 {gnovm => gno.land}/pkg/sdk/vm/consts.go | 0 {gnovm => gno.land}/pkg/sdk/vm/convert.go | 0 {gnovm => gno.land}/pkg/sdk/vm/errors.go | 0 {gnovm => gno.land}/pkg/sdk/vm/handler.go | 0 {gnovm => gno.land}/pkg/sdk/vm/handler_test.go | 0 {gnovm => gno.land}/pkg/sdk/vm/invariants.go | 0 {gnovm => gno.land}/pkg/sdk/vm/keeper.go | 0 {gnovm => gno.land}/pkg/sdk/vm/keeper_test.go | 0 {gnovm => gno.land}/pkg/sdk/vm/msgs.go | 0 {gnovm => gno.land}/pkg/sdk/vm/package.go | 2 +- {gnovm => gno.land}/pkg/sdk/vm/types.go | 0 {gnovm => gno.land}/pkg/sdk/vm/vm.proto | 2 +- misc/docker-integration/integration_test.go | 2 +- misc/genproto/genproto.go | 2 +- tm2/pkg/crypto/keys/client/addpkg.go | 2 +- tm2/pkg/crypto/keys/client/call.go | 2 +- 25 files changed, 13 insertions(+), 12 deletions(-) rename {gnovm => gno.land}/pkg/sdk/vm/builtins.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/common_test.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/consts.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/convert.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/errors.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/handler.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/handler_test.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/invariants.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/keeper.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/keeper_test.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/msgs.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/package.go (90%) rename {gnovm => gno.land}/pkg/sdk/vm/types.go (100%) rename {gnovm => gno.land}/pkg/sdk/vm/vm.proto (85%) diff --git a/.github/workflows/gnoland.yml b/.github/workflows/gnoland.yml index 75a6ebd7011..48208f103b6 100644 --- a/.github/workflows/gnoland.yml +++ b/.github/workflows/gnoland.yml @@ -25,6 +25,7 @@ jobs: - gnokey - gnoweb - gnofaucet + - tm2txsync runs-on: ubuntu-latest timeout-minutes: 5 steps: diff --git a/.github/workflows/tm2.yml b/.github/workflows/tm2.yml index 8f588e5ae4d..819411482f3 100644 --- a/.github/workflows/tm2.yml +++ b/.github/workflows/tm2.yml @@ -18,7 +18,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: diff --git a/gno.land/cmd/gnoland/main.go b/gno.land/cmd/gnoland/main.go index 39f2619d01f..272c6384fdc 100644 --- a/gno.land/cmd/gnoland/main.go +++ b/gno.land/cmd/gnoland/main.go @@ -21,7 +21,7 @@ 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/gnovm/pkg/sdk/vm" + vmm "github.com/gnolang/gno/gno.land/pkg/sdk/vm" "github.com/gnolang/gno/tm2/pkg/std" ) diff --git a/gno.land/cmd/gnoweb/main.go b/gno.land/cmd/gnoweb/main.go index c69314d7660..7a8c5c49b08 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/gnovm/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/cmd/tm2txsync/export.go b/gno.land/cmd/tm2txsync/export.go index 0621cd53125..b7cc6d292f1 100644 --- a/gno.land/cmd/tm2txsync/export.go +++ b/gno.land/cmd/tm2txsync/export.go @@ -17,7 +17,7 @@ import ( _ "github.com/gnolang/gno/tm2/pkg/sdk/auth" // XXX better way? _ "github.com/gnolang/gno/tm2/pkg/sdk/bank" - _ "github.com/gnolang/gno/gnovm/pkg/sdk/vm" + _ "github.com/gnolang/gno/gno.land/pkg/sdk/vm" ) type exportCfg struct { diff --git a/gno.land/cmd/tm2txsync/import.go b/gno.land/cmd/tm2txsync/import.go index dd7dc313842..c1da67182ad 100644 --- a/gno.land/cmd/tm2txsync/import.go +++ b/gno.land/cmd/tm2txsync/import.go @@ -16,7 +16,7 @@ import ( _ "github.com/gnolang/gno/tm2/pkg/sdk/auth" // XXX better way? _ "github.com/gnolang/gno/tm2/pkg/sdk/bank" - _ "github.com/gnolang/gno/gnovm/pkg/sdk/vm" + _ "github.com/gnolang/gno/gno.land/pkg/sdk/vm" ) type importCfg struct { diff --git a/gno.land/pkg/gnoland/app.go b/gno.land/pkg/gnoland/app.go index 304959ceb5e..9199ebae828 100644 --- a/gno.land/pkg/gnoland/app.go +++ b/gno.land/pkg/gnoland/app.go @@ -13,7 +13,7 @@ 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/gnovm/pkg/sdk/vm" + "github.com/gnolang/gno/gno.land/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/gnovm/pkg/sdk/vm/builtins.go b/gno.land/pkg/sdk/vm/builtins.go similarity index 100% rename from gnovm/pkg/sdk/vm/builtins.go rename to gno.land/pkg/sdk/vm/builtins.go diff --git a/gnovm/pkg/sdk/vm/common_test.go b/gno.land/pkg/sdk/vm/common_test.go similarity index 100% rename from gnovm/pkg/sdk/vm/common_test.go rename to gno.land/pkg/sdk/vm/common_test.go diff --git a/gnovm/pkg/sdk/vm/consts.go b/gno.land/pkg/sdk/vm/consts.go similarity index 100% rename from gnovm/pkg/sdk/vm/consts.go rename to gno.land/pkg/sdk/vm/consts.go diff --git a/gnovm/pkg/sdk/vm/convert.go b/gno.land/pkg/sdk/vm/convert.go similarity index 100% rename from gnovm/pkg/sdk/vm/convert.go rename to gno.land/pkg/sdk/vm/convert.go diff --git a/gnovm/pkg/sdk/vm/errors.go b/gno.land/pkg/sdk/vm/errors.go similarity index 100% rename from gnovm/pkg/sdk/vm/errors.go rename to gno.land/pkg/sdk/vm/errors.go diff --git a/gnovm/pkg/sdk/vm/handler.go b/gno.land/pkg/sdk/vm/handler.go similarity index 100% rename from gnovm/pkg/sdk/vm/handler.go rename to gno.land/pkg/sdk/vm/handler.go diff --git a/gnovm/pkg/sdk/vm/handler_test.go b/gno.land/pkg/sdk/vm/handler_test.go similarity index 100% rename from gnovm/pkg/sdk/vm/handler_test.go rename to gno.land/pkg/sdk/vm/handler_test.go diff --git a/gnovm/pkg/sdk/vm/invariants.go b/gno.land/pkg/sdk/vm/invariants.go similarity index 100% rename from gnovm/pkg/sdk/vm/invariants.go rename to gno.land/pkg/sdk/vm/invariants.go diff --git a/gnovm/pkg/sdk/vm/keeper.go b/gno.land/pkg/sdk/vm/keeper.go similarity index 100% rename from gnovm/pkg/sdk/vm/keeper.go rename to gno.land/pkg/sdk/vm/keeper.go diff --git a/gnovm/pkg/sdk/vm/keeper_test.go b/gno.land/pkg/sdk/vm/keeper_test.go similarity index 100% rename from gnovm/pkg/sdk/vm/keeper_test.go rename to gno.land/pkg/sdk/vm/keeper_test.go diff --git a/gnovm/pkg/sdk/vm/msgs.go b/gno.land/pkg/sdk/vm/msgs.go similarity index 100% rename from gnovm/pkg/sdk/vm/msgs.go rename to gno.land/pkg/sdk/vm/msgs.go diff --git a/gnovm/pkg/sdk/vm/package.go b/gno.land/pkg/sdk/vm/package.go similarity index 90% rename from gnovm/pkg/sdk/vm/package.go rename to gno.land/pkg/sdk/vm/package.go index 37fd6327d8b..5d05c108bd0 100644 --- a/gnovm/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/gnovm/pkg/sdk/vm", + "github.com/gnolang/gno/gno.land/pkg/sdk/vm", "vm", amino.GetCallersDirname(), ).WithDependencies( diff --git a/gnovm/pkg/sdk/vm/types.go b/gno.land/pkg/sdk/vm/types.go similarity index 100% rename from gnovm/pkg/sdk/vm/types.go rename to gno.land/pkg/sdk/vm/types.go diff --git a/gnovm/pkg/sdk/vm/vm.proto b/gno.land/pkg/sdk/vm/vm.proto similarity index 85% rename from gnovm/pkg/sdk/vm/vm.proto rename to gno.land/pkg/sdk/vm/vm.proto index 323378cd3d7..a2323ab4fc7 100644 --- a/gnovm/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/gnovm/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"; diff --git a/misc/docker-integration/integration_test.go b/misc/docker-integration/integration_test.go index 595333ec63c..06737c1594c 100644 --- a/misc/docker-integration/integration_test.go +++ b/misc/docker-integration/integration_test.go @@ -14,7 +14,7 @@ import ( "github.com/gnolang/gno/gno.land/pkg/gnoland" "github.com/gnolang/gno/tm2/pkg/amino" - "github.com/gnolang/gno/gnovm/pkg/sdk/vm" + "github.com/gnolang/gno/gno.land/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 41f4df4da25..ae03a1c1996 100644 --- a/misc/genproto/genproto.go +++ b/misc/genproto/genproto.go @@ -25,7 +25,7 @@ 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/gnovm/pkg/sdk/vm" + "github.com/gnolang/gno/gno.land/pkg/sdk/vm" "github.com/gnolang/gno/tm2/pkg/std" ) diff --git a/tm2/pkg/crypto/keys/client/addpkg.go b/tm2/pkg/crypto/keys/client/addpkg.go index febe9b2a060..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/gnovm/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 96b0c04e0ae..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/gnovm/pkg/sdk/vm" "github.com/gnolang/gno/tm2/pkg/std" ) From 3a39b97f81d126aa71dc74f83ec51e31dcaa36e5 Mon Sep 17 00:00:00 2001 From: piux2 <> Date: Mon, 29 May 2023 09:17:39 -0700 Subject: [PATCH 3/3] replace tm2txsync with gnotxsync --- .github/workflows/gnoland.yml | 2 +- Dockerfile | 8 ++++---- README.md | 2 +- gno.land/Makefile | 4 ++-- gno.land/cmd/{tm2txsync => gnotxsync}/README.md | 0 gno.land/cmd/{tm2txsync => gnotxsync}/export.go | 0 gno.land/cmd/{tm2txsync => gnotxsync}/import.go | 0 gno.land/cmd/{tm2txsync => gnotxsync}/main.go | 0 8 files changed, 8 insertions(+), 8 deletions(-) rename gno.land/cmd/{tm2txsync => gnotxsync}/README.md (100%) rename gno.land/cmd/{tm2txsync => gnotxsync}/export.go (100%) rename gno.land/cmd/{tm2txsync => gnotxsync}/import.go (100%) rename gno.land/cmd/{tm2txsync => gnotxsync}/main.go (100%) diff --git a/.github/workflows/gnoland.yml b/.github/workflows/gnoland.yml index 48208f103b6..5b7044dfc1e 100644 --- a/.github/workflows/gnoland.yml +++ b/.github/workflows/gnoland.yml @@ -25,7 +25,7 @@ jobs: - gnokey - gnoweb - gnofaucet - - tm2txsync + - gnotxsync runs-on: ubuntu-latest timeout-minutes: 5 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 6df89d9d9a9..e9570aeb6e2 100644 --- a/README.md +++ b/README.md @@ -43,7 +43,7 @@ Also, see the [quickstart guide](https://test3.gno.land/r/demo/boards:testboard/ 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](./tm2/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 b3944834db6..37fdff0ccde 100644 --- a/gno.land/Makefile +++ b/gno.land/Makefile @@ -6,13 +6,13 @@ help: rundep=go run -modfile ../misc/devdeps/go.mod .PHONY: build -build: build.gnoland build.gnokey build.gnoweb build.gnofaucet _build.tm2txsync +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.tm2txsync:; go build -o build/tm2txsync ./cmd/tm2txsync +_build.gnotxsync:; go build -o build/gnotxsync ./cmd/gnotxsync .PHONY: install install: install.gnoland install.gnoweb install.gnofaucet install.gnokey diff --git a/gno.land/cmd/tm2txsync/README.md b/gno.land/cmd/gnotxsync/README.md similarity index 100% rename from gno.land/cmd/tm2txsync/README.md rename to gno.land/cmd/gnotxsync/README.md diff --git a/gno.land/cmd/tm2txsync/export.go b/gno.land/cmd/gnotxsync/export.go similarity index 100% rename from gno.land/cmd/tm2txsync/export.go rename to gno.land/cmd/gnotxsync/export.go diff --git a/gno.land/cmd/tm2txsync/import.go b/gno.land/cmd/gnotxsync/import.go similarity index 100% rename from gno.land/cmd/tm2txsync/import.go rename to gno.land/cmd/gnotxsync/import.go diff --git a/gno.land/cmd/tm2txsync/main.go b/gno.land/cmd/gnotxsync/main.go similarity index 100% rename from gno.land/cmd/tm2txsync/main.go rename to gno.land/cmd/gnotxsync/main.go