diff --git a/examples/basecoin/account.go b/examples/basecoin/account.go index 0668c86d4..7985b3eb1 100644 --- a/examples/basecoin/account.go +++ b/examples/basecoin/account.go @@ -7,10 +7,10 @@ import ( // AppAccount - coin account structure type AppAccount struct { - Address_ types.Address `json:"address"` - Coins types.Coins `json:"coins"` - PubKey_ crypto.PubKey `json:"public_key"` // can't conflict with PubKey() - Sequence int64 `json:"sequence"` + Address_ crypto.Address `json:"address"` + Coins types.Coins `json:"coins"` + PubKey_ crypto.PubKey `json:"public_key"` // can't conflict with PubKey() + Sequence int64 `json:"sequence"` } // Implements auth.Account diff --git a/glide.lock b/glide.lock index b2a9eef33..e12e7616c 100644 --- a/glide.lock +++ b/glide.lock @@ -1,22 +1,12 @@ -hash: fbfdd03c0367bb0785ceb81ed34059df219e55d5a9c71c12597e505fbce14165 -updated: 2017-10-25T19:24:51.90002008+02:00 +hash: 4be2e3865e5582ef762c8aab865808b647be8b333ae7d329f3f80215d3ca91b1 +updated: 2018-01-06T16:06:32.617293876-05:00 imports: -- name: github.com/bgentry/speakeasy - version: 4aabc24848ce5fd31929f7d1e4ea74d3709c14cd - name: github.com/btcsuite/btcd version: c7588cbf7690cd9f047a28efa2dcd8f2435a4e5e subpackages: - btcec -- name: github.com/BurntSushi/toml - version: a368813c5e648fee92e5f6c30e3944ff9d5e8895 - name: github.com/ebuchman/fail-test version: 95f809107225be108efcf10a3509e4ea6ceef3c4 -- name: github.com/ethanfrey/ledger - version: 5e432577be582bd18a3b4a9cd75dae7a317ade36 -- name: github.com/flynn/hid - version: ed06a31c6245d4552e8dbba7e32e5b010b875d65 -- name: github.com/fsnotify/fsnotify - version: 4da3e2cfbabc9f751898f250b49f2439785783a1 - name: github.com/go-kit/kit version: e2b298466b32c7cd5579a9b9b07e968fc9d9452c subpackages: @@ -25,14 +15,17 @@ imports: - log/term - name: github.com/go-logfmt/logfmt version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5 -- name: github.com/go-playground/locales - version: e4cbcb5d0652150d40ad0646651076b6bd2be4f6 - subpackages: - - currency -- name: github.com/go-playground/universal-translator - version: 71201497bace774495daed26a3874fd339e0b538 - name: github.com/go-stack/stack version: 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf +- name: github.com/gogo/protobuf + version: 342cbe0a04158f6dcb03ca0079991a51a4248c02 + subpackages: + - gogoproto + - jsonpb + - proto + - protoc-gen-gogo/descriptor + - sortkeys + - types - name: github.com/golang/protobuf version: 1643683e1b54a9e88ad26d98f81400c8c9d9f4f9 subpackages: @@ -43,55 +36,18 @@ imports: - ptypes/timestamp - name: github.com/golang/snappy version: 553a641470496b2327abcac10b36396bd98e45c9 -- name: github.com/gorilla/context - version: 08b5f424b9271eedf6f9f0ce86cb9396ed337a42 -- name: github.com/gorilla/mux - version: 24fca303ac6da784b9e8269f724ddeb0b2eea5e7 - name: github.com/gorilla/websocket version: 71fa72d4842364bc5f74185f4161e0099ea3624a -- name: github.com/hashicorp/hcl - version: 23c074d0eceb2b8a5bfdbb271ab780cde70f05a8 - subpackages: - - hcl/ast - - hcl/parser - - hcl/scanner - - hcl/strconv - - hcl/token - - json/parser - - json/scanner - - json/token -- name: github.com/howeyc/crc16 - version: 96a97a1abb579c7ff1a8ffa77f2e72d1c314b57f -- name: github.com/inconshreveable/mousetrap - version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75 - name: github.com/jmhodges/levigo version: c42d9e0ca023e2198120196f842701bb4c55d7b9 - name: github.com/kr/logfmt version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 -- name: github.com/magiconair/properties - version: 8d7837e64d3c1ee4e54a880c5a920ab4316fc90a -- name: github.com/mattn/go-isatty - version: a5cdd64afdee435007ee3e9f6ed4684af949d568 -- name: github.com/mitchellh/mapstructure - version: 06020f85339e21b2478f756a78e295255ffa4d6a -- name: github.com/pelletier/go-buffruneio - version: c37440a7cf42ac63b919c752ca73a85067e05992 -- name: github.com/pelletier/go-toml - version: 13d49d4606eb801b8f01ae542b4afc4c6ee3d84a - name: github.com/pkg/errors version: 645ef00459ed84a119197bfb8d8205042c6df63d - name: github.com/rcrowley/go-metrics version: 1f30fe9094a513ce4c700b9a54458bbb0c96996c -- name: github.com/spf13/afero - version: 5660eeed305fe5f69c8fc6cf899132a459a97064 - subpackages: - - mem -- name: github.com/spf13/cast - version: acbeb36b902d72a7a4c18e8f3241075e7ab763e4 - name: github.com/spf13/cobra version: 7b2c5ac9fc04fc5efafb60700713d4fa609b777b -- name: github.com/spf13/jwalterweatherman - version: 12bd96e66386c1960ab0f74ced1362f66f552f7b - name: github.com/spf13/pflag version: 97afa5e7ca8a08a383cb259e06636b5e2cc7897f - name: github.com/spf13/viper @@ -112,9 +68,10 @@ imports: - leveldb/table - leveldb/util - name: github.com/tendermint/abci - version: 8f87efd7f86c2bae9df69aff69d715593d5d79f7 + version: 2bd556205d1679683fddcd5a91eeccf37a8a1007 subpackages: - client + - example/code - example/dummy - server - types @@ -124,62 +81,43 @@ imports: - edwards25519 - extra25519 - name: github.com/tendermint/go-crypto - version: 0a5b1d979a1bc86200c9ff829fbbcd575799a1b6 + version: 67a47e6a0bf474a76f6a8f09b39cfdf382f39b90 subpackages: - - bcrypt - keys - - keys/wordlist - - nano - name: github.com/tendermint/go-wire - version: 078a95fc9117752ced2590cb4632efdf48e41c84 + version: 27be46e25124ddf775e23317a83647ce62a93f6b subpackages: - data - - data/base58 + - nowriter/tmlegacy - name: github.com/tendermint/iavl - version: 887bb9097d50cad4d5dc209a0b8f0aca0955831b + version: ed0bbf0acc51e75f72c76099293113c2d67199b9 - name: github.com/tendermint/light-client version: 76313d625e662ed7b284d066d68ff71edd7a9fac subpackages: - certifiers - certifiers/client - - certifiers/errors - certifiers/files - proofs - name: github.com/tendermint/tendermint - version: b2d5546cf8f71e0e168072e118d9836862384e6c + version: 36b543de49f7e60c61c6a290bae6da1d04055d3c subpackages: - - blockchain - - cmd/tendermint/commands - config - - consensus - consensus/types - - mempool - node - p2p - p2p/upnp - proxy - rpc/client - - rpc/core - rpc/core/types - - rpc/grpc - - rpc/lib - rpc/lib/client - - rpc/lib/server - rpc/lib/types - - rpc/test - state - - state/txindex - - state/txindex/kv - - state/txindex/null - types - - version - name: github.com/tendermint/tmlibs - version: b25df389db3c98f4b964bd39511c199f02d07715 + version: 1afc0340069d38e71f137bc9e4fa4fadf12f76df subpackages: - - autofile - cli - cli/flags - - clist - common - db - events @@ -187,10 +125,11 @@ imports: - log - logger - merkle + - pubsub + - pubsub/query - name: golang.org/x/crypto version: edd5e9b0879d13ee6970a50153d85b8fec9f7686 subpackages: - - blowfish - curve25519 - nacl/box - nacl/secretbox @@ -209,10 +148,6 @@ imports: - internal/timeseries - lex/httplex - trace -- name: golang.org/x/sys - version: 8dbc5d05d6edcc104950cc299a1ce6641235bc86 - subpackages: - - unix - name: golang.org/x/text version: c01e4764d870b77f8abe5096ee19ad20d80e8075 subpackages: @@ -225,10 +160,9 @@ imports: subpackages: - googleapis/rpc/status - name: google.golang.org/grpc - version: a5986a5c88227370a9c0a82e5277167229c034cd + version: 401e0e00e4bb830a10496d64cd95e068c5bf50de subpackages: - balancer - - balancer/roundrobin - codes - connectivity - credentials @@ -240,16 +174,10 @@ imports: - naming - peer - resolver - - resolver/dns - - resolver/passthrough - stats - status - tap - transport -- name: gopkg.in/go-playground/validator.v9 - version: 1304298bf10d085adec514b076772a79c9cadb6b -- name: gopkg.in/yaml.v2 - version: eb3733d160e74a9c7e442f435eb3bea458e1d19f testImports: - name: github.com/davecgh/go-spew version: 04cdfd42973bb9c8589fd6a731800cf222fde1a9 diff --git a/glide.yaml b/glide.yaml index f7d095714..592ae421a 100644 --- a/glide.yaml +++ b/glide.yaml @@ -7,12 +7,12 @@ import: - package: github.com/spf13/pflag - package: github.com/spf13/viper - package: github.com/tendermint/abci - version: develop + version: sdk2 subpackages: - server - types - package: github.com/tendermint/go-crypto - version: sdk2 + version: develop subpackages: - keys - package: github.com/tendermint/go-wire @@ -29,7 +29,7 @@ import: - package: github.com/tendermint/iavl version: sdk2 - package: github.com/tendermint/tendermint - version: develop + version: sdk2 subpackages: - config - node @@ -40,7 +40,7 @@ import: - rpc/lib/types - types - package: github.com/tendermint/tmlibs - version: sdk2 + version: develop subpackages: - cli - cli/flags diff --git a/types/account.go b/types/account.go index ebd17f82d..f25bc1d48 100644 --- a/types/account.go +++ b/types/account.go @@ -1,16 +1,10 @@ package types import ( - "encoding/hex" - crypto "github.com/tendermint/go-crypto" ) -type Address []byte // TODO: cmn.HexBytes - -func (a Address) String() string { - return hex.EncodeToString(a) -} +type Address = crypto.Address type Account interface { Address() Address