diff --git a/Gopkg.lock b/Gopkg.lock index 0b6fe7873..96ae8479f 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -1,6 +1,12 @@ # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. +[[projects]] + name = "github.com/bgentry/speakeasy" + packages = ["."] + revision = "4aabc24848ce5fd31929f7d1e4ea74d3709c14cd" + version = "v0.1.0" + [[projects]] name = "github.com/btcsuite/btcd" packages = ["btcec"] @@ -12,6 +18,12 @@ revision = "346938d642f2ec3594ed81d874461961cd0faa76" version = "v1.1.0" +[[projects]] + branch = "master" + name = "github.com/ebuchman/fail-test" + packages = ["."] + revision = "95f809107225be108efcf10a3509e4ea6ceef3c4" + [[projects]] name = "github.com/fsnotify/fsnotify" packages = ["."] @@ -71,6 +83,12 @@ packages = ["."] revision = "553a641470496b2327abcac10b36396bd98e45c9" +[[projects]] + name = "github.com/gorilla/websocket" + packages = ["."] + revision = "ea4d1f681babbce9545c9c5f3d5194a789c89f5b" + version = "v1.2.0" + [[projects]] branch = "master" name = "github.com/hashicorp/hcl" @@ -87,6 +105,12 @@ ] revision = "23c074d0eceb2b8a5bfdbb271ab780cde70f05a8" +[[projects]] + branch = "master" + name = "github.com/howeyc/crc16" + packages = ["."] + revision = "2b2a61e366a66d3efb279e46176e7291001e0354" + [[projects]] name = "github.com/inconshreveable/mousetrap" packages = ["."] @@ -110,6 +134,12 @@ packages = ["."] revision = "49d762b9817ba1c2e9d0c69183c2b4a8b8f1d934" +[[projects]] + name = "github.com/mattn/go-isatty" + packages = ["."] + revision = "0360b2af4f38e8d38c7fce2a9f4e702702d73a39" + version = "v0.0.3" + [[projects]] name = "github.com/mitchellh/mapstructure" packages = ["."] @@ -133,6 +163,12 @@ revision = "792786c7400a136282c1664665ae0a8db921c6c2" version = "v1.0.0" +[[projects]] + branch = "master" + name = "github.com/rcrowley/go-metrics" + packages = ["."] + revision = "8732c616f52954686704c8645fe1a9d59e9df7c1" + [[projects]] branch = "master" name = "github.com/rigelrozanski/common" @@ -209,6 +245,9 @@ branch = "develop" name = "github.com/tendermint/abci" packages = [ + "client", + "example/code", + "example/dummy", "server", "types" ] @@ -227,7 +266,13 @@ [[projects]] branch = "develop" name = "github.com/tendermint/go-crypto" - packages = ["."] + packages = [ + ".", + "keys", + "keys/bcrypt", + "keys/words", + "keys/words/wordlist" + ] revision = "4fc3055dbd17aa1203d0abc64b9293f378da22ec" [[projects]] @@ -242,21 +287,71 @@ packages = ["."] revision = "1a59ec0c82dc940c25339dd7c834df5cb76a95cb" +[[projects]] + branch = "breaking/wire-sdk2" + name = "github.com/tendermint/tendermint" + packages = [ + "blockchain", + "cmd/tendermint/commands", + "config", + "consensus", + "consensus/types", + "evidence", + "lite", + "lite/client", + "lite/errors", + "lite/files", + "lite/proxy", + "mempool", + "node", + "p2p", + "p2p/conn", + "p2p/pex", + "p2p/trust", + "p2p/upnp", + "proxy", + "rpc/client", + "rpc/core", + "rpc/core/types", + "rpc/grpc", + "rpc/lib", + "rpc/lib/client", + "rpc/lib/server", + "rpc/lib/types", + "state", + "state/txindex", + "state/txindex/kv", + "state/txindex/null", + "types", + "version", + "wire" + ] + revision = "c330b9e43c93351a5c3040333d7d0c7c27859a20" + [[projects]] branch = "develop" name = "github.com/tendermint/tmlibs" packages = [ + "autofile", "cli", + "cli/flags", + "clist", "common", "db", + "flowrate", "log", - "merkle" + "merkle", + "pubsub", + "pubsub/query" ] revision = "a0f652dc2e131be86fc8d9e4e2beec9831a8a6ec" [[projects]] name = "golang.org/x/crypto" packages = [ + "blowfish", + "curve25519", + "nacl/box", "nacl/secretbox", "openpgp/armor", "openpgp/errors", @@ -342,6 +437,6 @@ [solve-meta] analyzer-name = "dep" analyzer-version = 1 - inputs-digest = "74f3444e7f0d4ffdeb4454fbbf10064b2cb87f44a5b94cffd19fc6c459ddeef6" + inputs-digest = "6809513d36f723a32757edb501a56fb86e3318af871c77fd65891d11d39437f1" solver-name = "gps-cdcl" solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml index f13991a61..53227ce15 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -25,10 +25,18 @@ # unused-packages = true +[[constraint]] + name = "github.com/bgentry/speakeasy" + version = "0.1.0" + [[constraint]] name = "github.com/golang/protobuf" version = "1.0.0" +[[constraint]] + name = "github.com/mattn/go-isatty" + version = "0.0.3" + [[constraint]] name = "github.com/pkg/errors" version = "0.8.0" @@ -41,6 +49,10 @@ name = "github.com/spf13/cobra" version = "0.0.1" +[[constraint]] + name = "github.com/spf13/viper" + version = "1.0.0" + [[constraint]] name = "github.com/stretchr/testify" version = "1.2.1" @@ -61,6 +73,10 @@ branch = "develop" name = "github.com/tendermint/iavl" +[[constraint]] + branch = "breaking/wire-sdk2" + name = "github.com/tendermint/tendermint" + [[constraint]] branch = "develop" name = "github.com/tendermint/tmlibs" @@ -68,3 +84,4 @@ [prune] go-tests = true unused-packages = true + diff --git a/Makefile b/Makefile index 9315a5bb8..fa46a38c8 100644 --- a/Makefile +++ b/Makefile @@ -29,10 +29,10 @@ dist: ### Tools & dependencies check_tools: - cd tools && $(MAKE) check + cd tools && $(MAKE) check_tools update_tools: - cd tools && $(MAKE) dep_update + cd tools && $(MAKE) update_tools get_tools: cd tools && $(MAKE) @@ -40,7 +40,7 @@ get_tools: get_vendor_deps: @rm -rf vendor/ @echo "--> Running dep ensure" - @dep ensure + @dep ensure -v draw_deps: @# requires brew install graphviz or apt-get install graphviz diff --git a/tools/Makefile b/tools/Makefile index a3cfd5908..6dbf64af4 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ -all: install_dep check get_vendor_deps install +all: install ######################################## @@ -7,22 +7,22 @@ all: install_dep check get_vendor_deps install DEP = github.com/golang/dep/cmd/dep DEP_CHECK := $(shell command -v dep 2> /dev/null) -check: +check_tools: ifndef DEP_CHECK - @echo "No dep in path. Install with 'make install_dep'." + @echo "No dep in path. Install with 'make get_tools'." else @echo "Found dep in path." endif -install_dep: +install_tools: ifdef DEP_CHECK - @echo "Dep is already installed. Run 'make update_dep' to update." + @echo "Dep is already installed. Run 'make update_tools' to update." else @echo "$(ansi_grn)Installing dep$(ansi_end)" go get -v $(DEP) endif -update_dep: +update_tools: @echo "$(ansi_grn)Updating dep$(ansi_end)" go get -u -v $(DEP) @@ -31,10 +31,10 @@ update_dep: ### Install tools -get_vendor_deps: check +get_vendor_deps: check_tools @rm -rf vendor/ @echo "--> Running dep ensure" - @dep ensure + @dep ensure -v install: get_vendor_deps @echo "$(ansi_grn)Installing tools$(ansi_end)" @@ -62,4 +62,4 @@ ansi_end=\033[0m # To avoid unintended conflicts with file names, always add to .PHONY # unless there is a reason not to. # https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html -.PHONY: check install_dep update_dep get_vendor_deps install +.PHONY: check_tools install_tools update_tools get_vendor_deps install