Merge pull request #696 from cosmos/bucky/dep

Bucky/dep

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## unrealease 
+## 0.12.0 (TBD)
 
 BREAKING CHANGES
 
@@ -9,6 +9,7 @@ BREAKING CHANGES
 * [types] ErrBadNonce -> ErrInvalidSequence
 * [types] Replace tx.GetFeePayer with FeePayer(tx) - returns the first signer
 * [types] NewStdTx takes the Fee
+* [types] ParseAccount -> AccountDecoder; ErrTxParse -> ErrTxDecoder
 * [auth] AnteHandler deducts fees
 * [bank] Move some errors to `types`
 * [bank] Remove sequence and signature from Input
@@ -24,6 +25,7 @@ FEATURES
 * [types] StdFee, and StdTx takes the StdFee
 * [specs] Progression of MVPs for IBC
 * [x/ibc] Initial shell of IBC functionality (no proofs)
+* [x/staking] Simple staking module with bonding/unbonding
 
 IMPROVEMENTS
 
@@ -36,6 +38,7 @@ BUG FIXES
 * [auth] Fix setting pubkey on new account
 * [auth] Require signatures to include the sequences
 * [baseapp] Dont panic on nil handler
+* [basecoin] Check for empty bytes in account and tx
 
 ## 0.11.0 (March 1, 2017)
 

Gopkg.toml

@@ -26,58 +26,55 @@
 
 [[constraint]]
   name = "github.com/bgentry/speakeasy"
-  version = "0.1.0"
+  version = "~0.1.0"
 
 [[constraint]]
   name = "github.com/golang/protobuf"
-  version = "1.0.0"
+  version = "~1.0.0"
 
 [[constraint]]
   name = "github.com/mattn/go-isatty"
-  version = "0.0.3"
+  version = "~0.0.3"
 
 [[constraint]]
   name = "github.com/pkg/errors"
-  version = "0.8.0"
+  version = "~0.8.0"
 
 [[constraint]]
   name = "github.com/spf13/cobra"
-  version = "0.0.1"
+  version = "~0.0.1"
 
 [[constraint]]
   name = "github.com/spf13/viper"
-  version = "1.0.0"
+  version = "~1.0.0"
 
 [[constraint]]
   name = "github.com/stretchr/testify"
-  version = "1.2.1"
+  version = "~1.2.1"
 
 [[constraint]]
-  branch = "develop"
+  version = "~0.10.2"
   name = "github.com/tendermint/abci"
 
 [[constraint]]
-  branch = "master"
+  version = "~0.5.0"
   name = "github.com/tendermint/go-crypto"
 
-[[override]]
-  branch = "master"
+[[constraint]]
+  version = "~0.7.3"
+  source = "github.com/tendermint/go-amino"
   name = "github.com/tendermint/go-wire"
 
-[[override]]
-  branch = "develop"
-  name = "github.com/tendermint/go-amino"
-
 [[constraint]]
-  branch = "master"
+  version = "~0.7.0"
   name = "github.com/tendermint/iavl"
 
 [[constraint]]
-  branch = "develop"
+  branch = "bucky/dep"
   name = "github.com/tendermint/tendermint"
 
-[[override]]
-  branch = "rigel/cli-refactor"
+[[constraint]]
+  version = "~0.7.1"
   name = "github.com/tendermint/tmlibs"
 
 [prune]

store/iavlstore.go

@@ -19,7 +19,7 @@ const (
 
 func LoadIAVLStore(db dbm.DB, id CommitID) (CommitStore, error) {
 	tree := iavl.NewVersionedTree(db, defaultIAVLCacheSize)
-	err := tree.LoadVersion(id.Version)
+	_, err := tree.LoadVersion(id.Version)
 	if err != nil {
 		return nil, err
 	}