diff --git a/CHANGELOG.md b/CHANGELOG.md index ccd0833c5..1ac58c0d1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 0.11.1 (October 29, 2018) + +IMPROVEMENTS + +- Uses GoAmino v0.14 + ## 0.11.0 (September 7, 2018) BREAKING CHANGES diff --git a/Gopkg.lock b/Gopkg.lock index 7e398a5dd..3ea626f0e 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -130,15 +130,15 @@ revision = "6b91fda63f2e36186f1c9d0e48578defb69c5d43" [[projects]] - digest = "1:2c971a45c89ca2ccc735af50919cdee05fbdc54d4bf50625073693300e31ead8" + digest = "1:10b3a599325740c84a7c81f3f3cb2e1fdb70b3ea01b7fa28495567a2519df431" name = "github.com/tendermint/go-amino" packages = ["."] pruneopts = "UT" - revision = "faa6e731944e2b7b6a46ad202902851e8ce85bee" - version = "v0.12.0" + revision = "6dcc6ddc143e116455c94b25c1004c99e0d0ca12" + version = "v0.14.0" [[projects]] - digest = "1:46606869f7275e78e2f86c9e521429eb2c84663229376626d83bd2c6843fe0a9" + digest = "1:7708275e1b9592bc7f8fb891708108bab6fda505eec6f8ce24f623445b60fbef" name = "github.com/tendermint/tendermint" packages = [ "crypto/merkle", @@ -150,8 +150,8 @@ "libs/test", ] pruneopts = "UT" - revision = "37928cb9907a60ae79d5b387d1d89ffc43dc07d8" - version = "v0.26.0-dev0" + revision = "bc0d672b26dbbd6858e97a570c87e3c20cbf199e" + version = "v0.26.0-rc0" [[projects]] branch = "master" diff --git a/Gopkg.toml b/Gopkg.toml index b7d4a1cc4..7a6358eae 100644 --- a/Gopkg.toml +++ b/Gopkg.toml @@ -4,11 +4,11 @@ [[constraint]] name = "github.com/tendermint/go-amino" - version = "^0.12.0-rc0" + version = "v0.14.0" [[constraint]] name = "github.com/tendermint/tendermint" - version = "^v0.26.0-dev0" + version = "=v0.26.0-rc0" [prune] go-tests = true diff --git a/proof_iavl_absence.go b/proof_iavl_absence.go index 09349814b..88a6587ae 100644 --- a/proof_iavl_absence.go +++ b/proof_iavl_absence.go @@ -37,7 +37,7 @@ func IAVLAbsenceOpDecoder(pop merkle.ProofOp) (merkle.ProofOperator, error) { return nil, cmn.NewError("unexpected ProofOp.Type; got %v, want %v", pop.Type, ProofOpIAVLAbsence) } var op IAVLAbsenceOp // a bit strange as we'll discard this, but it works. - err := cdc.UnmarshalBinary(pop.Data, &op) + err := cdc.UnmarshalBinaryLengthPrefixed(pop.Data, &op) if err != nil { return nil, cmn.ErrorWrap(err, "decoding ProofOp.Data into IAVLAbsenceOp") } @@ -45,7 +45,7 @@ func IAVLAbsenceOpDecoder(pop merkle.ProofOp) (merkle.ProofOperator, error) { } func (op IAVLAbsenceOp) ProofOp() merkle.ProofOp { - bz := cdc.MustMarshalBinary(op) + bz := cdc.MustMarshalBinaryLengthPrefixed(op) return merkle.ProofOp{ Type: ProofOpIAVLAbsence, Key: op.key, diff --git a/proof_iavl_value.go b/proof_iavl_value.go index 7d678ec89..df3c905ef 100644 --- a/proof_iavl_value.go +++ b/proof_iavl_value.go @@ -38,7 +38,7 @@ func IAVLValueOpDecoder(pop merkle.ProofOp) (merkle.ProofOperator, error) { return nil, cmn.NewError("unexpected ProofOp.Type; got %v, want %v", pop.Type, ProofOpIAVLValue) } var op IAVLValueOp // a bit strange as we'll discard this, but it works. - err := cdc.UnmarshalBinary(pop.Data, &op) + err := cdc.UnmarshalBinaryLengthPrefixed(pop.Data, &op) if err != nil { return nil, cmn.ErrorWrap(err, "decoding ProofOp.Data into IAVLValueOp") } @@ -46,7 +46,7 @@ func IAVLValueOpDecoder(pop merkle.ProofOp) (merkle.ProofOperator, error) { } func (op IAVLValueOp) ProofOp() merkle.ProofOp { - bz := cdc.MustMarshalBinary(op) + bz := cdc.MustMarshalBinaryLengthPrefixed(op) return merkle.ProofOp{ Type: ProofOpIAVLValue, Key: op.key, diff --git a/proof_test.go b/proof_test.go index 501556343..185b8ea76 100644 --- a/proof_test.go +++ b/proof_test.go @@ -208,21 +208,21 @@ func verifyProof(t *testing.T, proof *RangeProof, root []byte) { // Write/Read then verify. cdc := amino.NewCodec() - proofBytes := cdc.MustMarshalBinary(proof) + proofBytes := cdc.MustMarshalBinaryLengthPrefixed(proof) var proof2 = new(RangeProof) - err := cdc.UnmarshalBinary(proofBytes, proof2) + err := cdc.UnmarshalBinaryLengthPrefixed(proofBytes, proof2) require.Nil(t, err, "Failed to read KeyExistsProof from bytes: %v", err) // Random mutations must not verify for i := 0; i < 1e4; i++ { badProofBytes := test.MutateByteSlice(proofBytes) var badProof = new(RangeProof) - err := cdc.UnmarshalBinary(badProofBytes, badProof) + err := cdc.UnmarshalBinaryLengthPrefixed(badProofBytes, badProof) if err != nil { continue // couldn't even decode. } // re-encode to make sure it's actually different. - badProofBytes2 := cdc.MustMarshalBinary(badProof) + badProofBytes2 := cdc.MustMarshalBinaryLengthPrefixed(badProof) if bytes.Equal(proofBytes, badProofBytes2) { continue // didn't mutate successfully. } diff --git a/version.go b/version.go index aa993f09b..b5055f9c6 100644 --- a/version.go +++ b/version.go @@ -1,4 +1,4 @@ package iavl // Version of iavl. -const Version = "0.11.0" +const Version = "0.11.1"