Merge branch 'master' of github.com:cosmos/cosmos-sdk into aaronc/x-g…

…ov-proto-any

crypto/types/types.proto

@@ -0,0 +1,19 @@
+syntax = "proto3";
+package cosmos_sdk.crypto.v1;
+
+//import "third_party/proto/gogoproto/gogo.proto";
+
+option go_package = "github.com/cosmos/cosmos-sdk/crypto/types";
+
+// CompactBitArray is an implementation of a space efficient bit array.
+// This is used to ensure that the encoded data takes up a minimal amount of
+// space after proto encoding.
+// This is not thread safe, and is not intended for concurrent usage.
+message CompactBitArray {
+    //  TODO: re-enable these when the actual implementation is added
+    //  option (gogoproto.sizer)            = false;
+    //  option (gogoproto.goproto_stringer) = false;
+
+    uint32 extra_bits_stored = 1;
+    bytes  elems             = 2;
+}

scripts/protocgen.sh

@@ -8,5 +8,5 @@ for dir in $proto_dirs; do
   -I. \
   --gocosmos_out=plugins=interfacetype,paths=source_relative,\
 Mgoogle/protobuf/any.proto=github.com/cosmos/cosmos-sdk/codec/types:. \
-  $(find "${dir}" -name '*.proto')
+  $(find "${dir}" -depth 1 -name '*.proto')
 done