move wallet jsonschema

add comments to supports

README.md

@@ -1,39 +1,11 @@
 # LBRY Types
 
-Cross-language definitions for standard LBRY types. 
+Cross-language definitions for standard LBRY types.
 
-## Using LBRY types in your code
+`v1/` contains the old proto2 files. `v2/` contains the new proto3 files. See the README.md file in each dir for instructions on using each.
 
-### Go
+`jsonschema/` contains the definition of the wallet file.
 
-```go
-package main
-
-import pb "github.com/lbryio/types/go"
-import "fmt"
-
-func main() {
-    title := "Coherence"
-    metadata := pb.Metadata{Title:&title}
-    fmt.Printf("Let's watch %s on LBRY!\n", metadata.GetTitle())
-}
-
-```
-
-### Python
-
-todo
-
-### Javascript
-
-todo
-
-## Compiling types
-
-You only need to do this if you're modifying the types themselves.
-
-- Download [the protoc binary](https://github.com/google/protobuf/releases) and put it in your path. Make sure you get the one starting with `protoc`, not `protobuf`.
-- `./build.sh`
 
 ## License
 

cpp/claim.pb.cc

@@ -1,678 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: claim.proto
-
-#include "claim.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// This is a temporary google only hack
-#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
-#include "third_party/protobuf/version.h"
-#endif
-// @@protoc_insertion_point(includes)
-
-namespace protobuf_certificate_2eproto {
-extern PROTOBUF_INTERNAL_EXPORT_protobuf_certificate_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Certificate;
-}  // namespace protobuf_certificate_2eproto
-namespace protobuf_signature_2eproto {
-extern PROTOBUF_INTERNAL_EXPORT_protobuf_signature_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Signature;
-}  // namespace protobuf_signature_2eproto
-namespace protobuf_stream_2eproto {
-extern PROTOBUF_INTERNAL_EXPORT_protobuf_stream_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_Stream;
-}  // namespace protobuf_stream_2eproto
-namespace pb {
-class ClaimDefaultTypeInternal {
- public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Claim>
-      _instance;
-} _Claim_default_instance_;
-}  // namespace pb
-namespace protobuf_claim_2eproto {
-static void InitDefaultsClaim() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  {
-    void* ptr = &::pb::_Claim_default_instance_;
-    new (ptr) ::pb::Claim();
-    ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
-  }
-  ::pb::Claim::InitAsDefaultInstance();
-}
-
-::google::protobuf::internal::SCCInfo<3> scc_info_Claim =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsClaim}, {
-      &protobuf_stream_2eproto::scc_info_Stream.base,
-      &protobuf_certificate_2eproto::scc_info_Certificate.base,
-      &protobuf_signature_2eproto::scc_info_Signature.base,}};
-
-void InitDefaults() {
-  ::google::protobuf::internal::InitSCC(&scc_info_Claim.base);
-}
-
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, claimtype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, stream_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, certificate_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Claim, publishersignature_),
-  3,
-  4,
-  0,
-  1,
-  2,
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 10, sizeof(::pb::Claim)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Claim_default_instance_),
-};
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  AssignDescriptors(
-      "claim.proto", schemas, file_default_instances, TableStruct::offsets,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\013claim.proto\022\002pb\032\014stream.proto\032\021certifi"
-      "cate.proto\032\017signature.proto\"\266\002\n\005Claim\022\"\n"
-      "\007version\030\001 \002(\0162\021.pb.Claim.Version\022&\n\tcla"
-      "imType\030\002 \002(\0162\023.pb.Claim.ClaimType\022\032\n\006str"
-      "eam\030\003 \001(\0132\n.pb.Stream\022$\n\013certificate\030\004 \001"
-      "(\0132\017.pb.Certificate\022)\n\022publisherSignatur"
-      "e\030\005 \001(\0132\r.pb.Signature\"*\n\007Version\022\023\n\017UNK"
-      "NOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\"H\n\tClaimType\022"
-      "\026\n\022UNKNOWN_CLAIM_TYPE\020\000\022\016\n\nstreamType\020\001\022"
-      "\023\n\017certificateType\020\002"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 380);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "claim.proto", &protobuf_RegisterTypes);
-  ::protobuf_stream_2eproto::AddDescriptors();
-  ::protobuf_certificate_2eproto::AddDescriptors();
-  ::protobuf_signature_2eproto::AddDescriptors();
-}
-
-void AddDescriptors() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-}  // namespace protobuf_claim_2eproto
-namespace pb {
-const ::google::protobuf::EnumDescriptor* Claim_Version_descriptor() {
-  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_claim_2eproto::file_level_enum_descriptors[0];
-}
-bool Claim_Version_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const Claim_Version Claim::UNKNOWN_VERSION;
-const Claim_Version Claim::_0_0_1;
-const Claim_Version Claim::Version_MIN;
-const Claim_Version Claim::Version_MAX;
-const int Claim::Version_ARRAYSIZE;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-const ::google::protobuf::EnumDescriptor* Claim_ClaimType_descriptor() {
-  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_claim_2eproto::file_level_enum_descriptors[1];
-}
-bool Claim_ClaimType_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-    case 2:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const Claim_ClaimType Claim::UNKNOWN_CLAIM_TYPE;
-const Claim_ClaimType Claim::streamType;
-const Claim_ClaimType Claim::certificateType;
-const Claim_ClaimType Claim::ClaimType_MIN;
-const Claim_ClaimType Claim::ClaimType_MAX;
-const int Claim::ClaimType_ARRAYSIZE;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-// ===================================================================
-
-void Claim::InitAsDefaultInstance() {
-  ::pb::_Claim_default_instance_._instance.get_mutable()->stream_ = const_cast< ::pb::Stream*>(
-      ::pb::Stream::internal_default_instance());
-  ::pb::_Claim_default_instance_._instance.get_mutable()->certificate_ = const_cast< ::pb::Certificate*>(
-      ::pb::Certificate::internal_default_instance());
-  ::pb::_Claim_default_instance_._instance.get_mutable()->publishersignature_ = const_cast< ::pb::Signature*>(
-      ::pb::Signature::internal_default_instance());
-}
-void Claim::clear_stream() {
-  if (stream_ != NULL) stream_->Clear();
-  clear_has_stream();
-}
-void Claim::clear_certificate() {
-  if (certificate_ != NULL) certificate_->Clear();
-  clear_has_certificate();
-}
-void Claim::clear_publishersignature() {
-  if (publishersignature_ != NULL) publishersignature_->Clear();
-  clear_has_publishersignature();
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Claim::kVersionFieldNumber;
-const int Claim::kClaimTypeFieldNumber;
-const int Claim::kStreamFieldNumber;
-const int Claim::kCertificateFieldNumber;
-const int Claim::kPublisherSignatureFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Claim::Claim()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  ::google::protobuf::internal::InitSCC(
-      &protobuf_claim_2eproto::scc_info_Claim.base);
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Claim)
-}
-Claim::Claim(const Claim& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _has_bits_(from._has_bits_) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_stream()) {
-    stream_ = new ::pb::Stream(*from.stream_);
-  } else {
-    stream_ = NULL;
-  }
-  if (from.has_certificate()) {
-    certificate_ = new ::pb::Certificate(*from.certificate_);
-  } else {
-    certificate_ = NULL;
-  }
-  if (from.has_publishersignature()) {
-    publishersignature_ = new ::pb::Signature(*from.publishersignature_);
-  } else {
-    publishersignature_ = NULL;
-  }
-  ::memcpy(&version_, &from.version_,
-    static_cast<size_t>(reinterpret_cast<char*>(&claimtype_) -
-    reinterpret_cast<char*>(&version_)) + sizeof(claimtype_));
-  // @@protoc_insertion_point(copy_constructor:pb.Claim)
-}
-
-void Claim::SharedCtor() {
-  ::memset(&stream_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&claimtype_) -
-      reinterpret_cast<char*>(&stream_)) + sizeof(claimtype_));
-}
-
-Claim::~Claim() {
-  // @@protoc_insertion_point(destructor:pb.Claim)
-  SharedDtor();
-}
-
-void Claim::SharedDtor() {
-  if (this != internal_default_instance()) delete stream_;
-  if (this != internal_default_instance()) delete certificate_;
-  if (this != internal_default_instance()) delete publishersignature_;
-}
-
-void Claim::SetCachedSize(int size) const {
-  _cached_size_.Set(size);
-}
-const ::google::protobuf::Descriptor* Claim::descriptor() {
-  ::protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Claim& Claim::default_instance() {
-  ::google::protobuf::internal::InitSCC(&protobuf_claim_2eproto::scc_info_Claim.base);
-  return *internal_default_instance();
-}
-
-
-void Claim::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Claim)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _has_bits_[0];
-  if (cached_has_bits & 7u) {
-    if (cached_has_bits & 0x00000001u) {
-      GOOGLE_DCHECK(stream_ != NULL);
-      stream_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      GOOGLE_DCHECK(certificate_ != NULL);
-      certificate_->Clear();
-    }
-    if (cached_has_bits & 0x00000004u) {
-      GOOGLE_DCHECK(publishersignature_ != NULL);
-      publishersignature_->Clear();
-    }
-  }
-  if (cached_has_bits & 24u) {
-    ::memset(&version_, 0, static_cast<size_t>(
-        reinterpret_cast<char*>(&claimtype_) -
-        reinterpret_cast<char*>(&version_)) + sizeof(claimtype_));
-  }
-  _has_bits_.Clear();
-  _internal_metadata_.Clear();
-}
-
-bool Claim::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Claim)
-  for (;;) {
-    ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Claim.Version version = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::pb::Claim_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Claim_Version >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(
-                1, static_cast< ::google::protobuf::uint64>(value));
-          }
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // required .pb.Claim.ClaimType claimType = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::pb::Claim_ClaimType_IsValid(value)) {
-            set_claimtype(static_cast< ::pb::Claim_ClaimType >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(
-                2, static_cast< ::google::protobuf::uint64>(value));
-          }
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // optional .pb.Stream stream = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-               input, mutable_stream()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // optional .pb.Certificate certificate = 4;
-      case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-               input, mutable_certificate()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // optional .pb.Signature publisherSignature = 5;
-      case 5: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-               input, mutable_publishersignature()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:pb.Claim)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:pb.Claim)
-  return false;
-#undef DO_
-}
-
-void Claim::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Claim)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _has_bits_[0];
-  // required .pb.Claim.Version version = 1;
-  if (cached_has_bits & 0x00000008u) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->version(), output);
-  }
-
-  // required .pb.Claim.ClaimType claimType = 2;
-  if (cached_has_bits & 0x00000010u) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      2, this->claimtype(), output);
-  }
-
-  // optional .pb.Stream stream = 3;
-  if (cached_has_bits & 0x00000001u) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->_internal_stream(), output);
-  }
-
-  // optional .pb.Certificate certificate = 4;
-  if (cached_has_bits & 0x00000002u) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->_internal_certificate(), output);
-  }
-
-  // optional .pb.Signature publisherSignature = 5;
-  if (cached_has_bits & 0x00000004u) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->_internal_publishersignature(), output);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:pb.Claim)
-}
-
-::google::protobuf::uint8* Claim::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Claim)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _has_bits_[0];
-  // required .pb.Claim.Version version = 1;
-  if (cached_has_bits & 0x00000008u) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->version(), target);
-  }
-
-  // required .pb.Claim.ClaimType claimType = 2;
-  if (cached_has_bits & 0x00000010u) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      2, this->claimtype(), target);
-  }
-
-  // optional .pb.Stream stream = 3;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageToArray(
-        3, this->_internal_stream(), deterministic, target);
-  }
-
-  // optional .pb.Certificate certificate = 4;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageToArray(
-        4, this->_internal_certificate(), deterministic, target);
-  }
-
-  // optional .pb.Signature publisherSignature = 5;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageToArray(
-        5, this->_internal_publishersignature(), deterministic, target);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Claim)
-  return target;
-}
-
-size_t Claim::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Claim)
-  size_t total_size = 0;
-
-  if (has_version()) {
-    // required .pb.Claim.Version version = 1;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
-  }
-
-  if (has_claimtype()) {
-    // required .pb.Claim.ClaimType claimType = 2;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->claimtype());
-  }
-
-  return total_size;
-}
-size_t Claim::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Claim)
-  size_t total_size = 0;
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
-  }
-  if (((_has_bits_[0] & 0x00000018) ^ 0x00000018) == 0) {  // All required fields are present.
-    // required .pb.Claim.Version version = 1;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
-
-    // required .pb.Claim.ClaimType claimType = 2;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->claimtype());
-
-  } else {
-    total_size += RequiredFieldsByteSizeFallback();
-  }
-  if (_has_bits_[0 / 32] & 7u) {
-    // optional .pb.Stream stream = 3;
-    if (has_stream()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSize(
-          *stream_);
-    }
-
-    // optional .pb.Certificate certificate = 4;
-    if (has_certificate()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSize(
-          *certificate_);
-    }
-
-    // optional .pb.Signature publisherSignature = 5;
-    if (has_publishersignature()) {
-      total_size += 1 +
-        ::google::protobuf::internal::WireFormatLite::MessageSize(
-          *publishersignature_);
-    }
-
-  }
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  SetCachedSize(cached_size);
-  return total_size;
-}
-
-void Claim::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Claim)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Claim* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Claim>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Claim)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Claim)
-    MergeFrom(*source);
-  }
-}
-
-void Claim::MergeFrom(const Claim& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Claim)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 31u) {
-    if (cached_has_bits & 0x00000001u) {
-      mutable_stream()->::pb::Stream::MergeFrom(from.stream());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      mutable_certificate()->::pb::Certificate::MergeFrom(from.certificate());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      mutable_publishersignature()->::pb::Signature::MergeFrom(from.publishersignature());
-    }
-    if (cached_has_bits & 0x00000008u) {
-      version_ = from.version_;
-    }
-    if (cached_has_bits & 0x00000010u) {
-      claimtype_ = from.claimtype_;
-    }
-    _has_bits_[0] |= cached_has_bits;
-  }
-}
-
-void Claim::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Claim)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Claim::CopyFrom(const Claim& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Claim)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Claim::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000018) != 0x00000018) return false;
-  if (has_stream()) {
-    if (!this->stream_->IsInitialized()) return false;
-  }
-  if (has_certificate()) {
-    if (!this->certificate_->IsInitialized()) return false;
-  }
-  if (has_publishersignature()) {
-    if (!this->publishersignature_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void Claim::Swap(Claim* other) {
-  if (other == this) return;
-  InternalSwap(other);
-}
-void Claim::InternalSwap(Claim* other) {
-  using std::swap;
-  swap(stream_, other->stream_);
-  swap(certificate_, other->certificate_);
-  swap(publishersignature_, other->publishersignature_);
-  swap(version_, other->version_);
-  swap(claimtype_, other->claimtype_);
-  swap(_has_bits_[0], other->_has_bits_[0]);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-}
-
-::google::protobuf::Metadata Claim::GetMetadata() const {
-  protobuf_claim_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_claim_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
-namespace google {
-namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Claim* Arena::CreateMaybeMessage< ::pb::Claim >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Claim >(arena);
-}
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)

cpp/stream.pb.cc

@@ -1,540 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: stream.proto
-
-#include "stream.pb.h"
-
-#include <algorithm>
-
-#include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/wire_format_lite_inl.h>
-#include <google/protobuf/descriptor.h>
-#include <google/protobuf/generated_message_reflection.h>
-#include <google/protobuf/reflection_ops.h>
-#include <google/protobuf/wire_format.h>
-// This is a temporary google only hack
-#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
-#include "third_party/protobuf/version.h"
-#endif
-// @@protoc_insertion_point(includes)
-
-namespace protobuf_metadata_2eproto {
-extern PROTOBUF_INTERNAL_EXPORT_protobuf_metadata_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Metadata;
-}  // namespace protobuf_metadata_2eproto
-namespace protobuf_source_2eproto {
-extern PROTOBUF_INTERNAL_EXPORT_protobuf_source_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Source;
-}  // namespace protobuf_source_2eproto
-namespace pb {
-class StreamDefaultTypeInternal {
- public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Stream>
-      _instance;
-} _Stream_default_instance_;
-}  // namespace pb
-namespace protobuf_stream_2eproto {
-static void InitDefaultsStream() {
-  GOOGLE_PROTOBUF_VERIFY_VERSION;
-
-  {
-    void* ptr = &::pb::_Stream_default_instance_;
-    new (ptr) ::pb::Stream();
-    ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
-  }
-  ::pb::Stream::InitAsDefaultInstance();
-}
-
-::google::protobuf::internal::SCCInfo<2> scc_info_Stream =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsStream}, {
-      &protobuf_metadata_2eproto::scc_info_Metadata.base,
-      &protobuf_source_2eproto::scc_info_Source.base,}};
-
-void InitDefaults() {
-  ::google::protobuf::internal::InitSCC(&scc_info_Stream.base);
-}
-
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
-
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, _internal_metadata_),
-  ~0u,  // no _extensions_
-  ~0u,  // no _oneof_case_
-  ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, metadata_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Stream, source_),
-  2,
-  0,
-  1,
-};
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 8, sizeof(::pb::Stream)},
-};
-
-static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Stream_default_instance_),
-};
-
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  AssignDescriptors(
-      "stream.proto", schemas, file_default_instances, TableStruct::offsets,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
-
-void protobuf_AssignDescriptorsOnce() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors);
-}
-
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\014stream.proto\022\002pb\032\016metadata.proto\032\014sour"
-      "ce.proto\"\225\001\n\006Stream\022#\n\007version\030\001 \002(\0162\022.p"
-      "b.Stream.Version\022\036\n\010metadata\030\002 \002(\0132\014.pb."
-      "Metadata\022\032\n\006source\030\003 \002(\0132\n.pb.Source\"*\n\007"
-      "Version\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001"
-  };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 200);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "stream.proto", &protobuf_RegisterTypes);
-  ::protobuf_metadata_2eproto::AddDescriptors();
-  ::protobuf_source_2eproto::AddDescriptors();
-}
-
-void AddDescriptors() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-}  // namespace protobuf_stream_2eproto
-namespace pb {
-const ::google::protobuf::EnumDescriptor* Stream_Version_descriptor() {
-  protobuf_stream_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_stream_2eproto::file_level_enum_descriptors[0];
-}
-bool Stream_Version_IsValid(int value) {
-  switch (value) {
-    case 0:
-    case 1:
-      return true;
-    default:
-      return false;
-  }
-}
-
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const Stream_Version Stream::UNKNOWN_VERSION;
-const Stream_Version Stream::_0_0_1;
-const Stream_Version Stream::Version_MIN;
-const Stream_Version Stream::Version_MAX;
-const int Stream::Version_ARRAYSIZE;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-// ===================================================================
-
-void Stream::InitAsDefaultInstance() {
-  ::pb::_Stream_default_instance_._instance.get_mutable()->metadata_ = const_cast< ::pb::Metadata*>(
-      ::pb::Metadata::internal_default_instance());
-  ::pb::_Stream_default_instance_._instance.get_mutable()->source_ = const_cast< ::pb::Source*>(
-      ::pb::Source::internal_default_instance());
-}
-void Stream::clear_metadata() {
-  if (metadata_ != NULL) metadata_->Clear();
-  clear_has_metadata();
-}
-void Stream::clear_source() {
-  if (source_ != NULL) source_->Clear();
-  clear_has_source();
-}
-#if !defined(_MSC_VER) || _MSC_VER >= 1900
-const int Stream::kVersionFieldNumber;
-const int Stream::kMetadataFieldNumber;
-const int Stream::kSourceFieldNumber;
-#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
-
-Stream::Stream()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  ::google::protobuf::internal::InitSCC(
-      &protobuf_stream_2eproto::scc_info_Stream.base);
-  SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Stream)
-}
-Stream::Stream(const Stream& from)
-  : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
-      _has_bits_(from._has_bits_) {
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  if (from.has_metadata()) {
-    metadata_ = new ::pb::Metadata(*from.metadata_);
-  } else {
-    metadata_ = NULL;
-  }
-  if (from.has_source()) {
-    source_ = new ::pb::Source(*from.source_);
-  } else {
-    source_ = NULL;
-  }
-  version_ = from.version_;
-  // @@protoc_insertion_point(copy_constructor:pb.Stream)
-}
-
-void Stream::SharedCtor() {
-  ::memset(&metadata_, 0, static_cast<size_t>(
-      reinterpret_cast<char*>(&version_) -
-      reinterpret_cast<char*>(&metadata_)) + sizeof(version_));
-}
-
-Stream::~Stream() {
-  // @@protoc_insertion_point(destructor:pb.Stream)
-  SharedDtor();
-}
-
-void Stream::SharedDtor() {
-  if (this != internal_default_instance()) delete metadata_;
-  if (this != internal_default_instance()) delete source_;
-}
-
-void Stream::SetCachedSize(int size) const {
-  _cached_size_.Set(size);
-}
-const ::google::protobuf::Descriptor* Stream::descriptor() {
-  ::protobuf_stream_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_stream_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
-const Stream& Stream::default_instance() {
-  ::google::protobuf::internal::InitSCC(&protobuf_stream_2eproto::scc_info_Stream.base);
-  return *internal_default_instance();
-}
-
-
-void Stream::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Stream)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  // Prevent compiler warnings about cached_has_bits being unused
-  (void) cached_has_bits;
-
-  cached_has_bits = _has_bits_[0];
-  if (cached_has_bits & 3u) {
-    if (cached_has_bits & 0x00000001u) {
-      GOOGLE_DCHECK(metadata_ != NULL);
-      metadata_->Clear();
-    }
-    if (cached_has_bits & 0x00000002u) {
-      GOOGLE_DCHECK(source_ != NULL);
-      source_->Clear();
-    }
-  }
-  version_ = 0;
-  _has_bits_.Clear();
-  _internal_metadata_.Clear();
-}
-
-bool Stream::MergePartialFromCodedStream(
-    ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
-  ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Stream)
-  for (;;) {
-    ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
-    tag = p.first;
-    if (!p.second) goto handle_unusual;
-    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Stream.Version version = 1;
-      case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
-          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
-                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
-                 input, &value)));
-          if (::pb::Stream_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Stream_Version >(value));
-          } else {
-            mutable_unknown_fields()->AddVarint(
-                1, static_cast< ::google::protobuf::uint64>(value));
-          }
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // required .pb.Metadata metadata = 2;
-      case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-               input, mutable_metadata()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      // required .pb.Source source = 3;
-      case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
-          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
-               input, mutable_source()));
-        } else {
-          goto handle_unusual;
-        }
-        break;
-      }
-
-      default: {
-      handle_unusual:
-        if (tag == 0) {
-          goto success;
-        }
-        DO_(::google::protobuf::internal::WireFormat::SkipField(
-              input, tag, _internal_metadata_.mutable_unknown_fields()));
-        break;
-      }
-    }
-  }
-success:
-  // @@protoc_insertion_point(parse_success:pb.Stream)
-  return true;
-failure:
-  // @@protoc_insertion_point(parse_failure:pb.Stream)
-  return false;
-#undef DO_
-}
-
-void Stream::SerializeWithCachedSizes(
-    ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Stream)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _has_bits_[0];
-  // required .pb.Stream.Version version = 1;
-  if (cached_has_bits & 0x00000004u) {
-    ::google::protobuf::internal::WireFormatLite::WriteEnum(
-      1, this->version(), output);
-  }
-
-  // required .pb.Metadata metadata = 2;
-  if (cached_has_bits & 0x00000001u) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->_internal_metadata(), output);
-  }
-
-  // required .pb.Source source = 3;
-  if (cached_has_bits & 0x00000002u) {
-    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->_internal_source(), output);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
-        _internal_metadata_.unknown_fields(), output);
-  }
-  // @@protoc_insertion_point(serialize_end:pb.Stream)
-}
-
-::google::protobuf::uint8* Stream::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Stream)
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = _has_bits_[0];
-  // required .pb.Stream.Version version = 1;
-  if (cached_has_bits & 0x00000004u) {
-    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
-      1, this->version(), target);
-  }
-
-  // required .pb.Metadata metadata = 2;
-  if (cached_has_bits & 0x00000001u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageToArray(
-        2, this->_internal_metadata(), deterministic, target);
-  }
-
-  // required .pb.Source source = 3;
-  if (cached_has_bits & 0x00000002u) {
-    target = ::google::protobuf::internal::WireFormatLite::
-      InternalWriteMessageToArray(
-        3, this->_internal_source(), deterministic, target);
-  }
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
-        _internal_metadata_.unknown_fields(), target);
-  }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Stream)
-  return target;
-}
-
-size_t Stream::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Stream)
-  size_t total_size = 0;
-
-  if (has_metadata()) {
-    // required .pb.Metadata metadata = 2;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *metadata_);
-  }
-
-  if (has_source()) {
-    // required .pb.Source source = 3;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *source_);
-  }
-
-  if (has_version()) {
-    // required .pb.Stream.Version version = 1;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
-  }
-
-  return total_size;
-}
-size_t Stream::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Stream)
-  size_t total_size = 0;
-
-  if (_internal_metadata_.have_unknown_fields()) {
-    total_size +=
-      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
-        _internal_metadata_.unknown_fields());
-  }
-  if (((_has_bits_[0] & 0x00000007) ^ 0x00000007) == 0) {  // All required fields are present.
-    // required .pb.Metadata metadata = 2;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *metadata_);
-
-    // required .pb.Source source = 3;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::MessageSize(
-        *source_);
-
-    // required .pb.Stream.Version version = 1;
-    total_size += 1 +
-      ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
-
-  } else {
-    total_size += RequiredFieldsByteSizeFallback();
-  }
-  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
-  SetCachedSize(cached_size);
-  return total_size;
-}
-
-void Stream::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Stream)
-  GOOGLE_DCHECK_NE(&from, this);
-  const Stream* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Stream>(
-          &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Stream)
-    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
-  } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Stream)
-    MergeFrom(*source);
-  }
-}
-
-void Stream::MergeFrom(const Stream& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Stream)
-  GOOGLE_DCHECK_NE(&from, this);
-  _internal_metadata_.MergeFrom(from._internal_metadata_);
-  ::google::protobuf::uint32 cached_has_bits = 0;
-  (void) cached_has_bits;
-
-  cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 7u) {
-    if (cached_has_bits & 0x00000001u) {
-      mutable_metadata()->::pb::Metadata::MergeFrom(from.metadata());
-    }
-    if (cached_has_bits & 0x00000002u) {
-      mutable_source()->::pb::Source::MergeFrom(from.source());
-    }
-    if (cached_has_bits & 0x00000004u) {
-      version_ = from.version_;
-    }
-    _has_bits_[0] |= cached_has_bits;
-  }
-}
-
-void Stream::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Stream)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-void Stream::CopyFrom(const Stream& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Stream)
-  if (&from == this) return;
-  Clear();
-  MergeFrom(from);
-}
-
-bool Stream::IsInitialized() const {
-  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
-  if (has_metadata()) {
-    if (!this->metadata_->IsInitialized()) return false;
-  }
-  if (has_source()) {
-    if (!this->source_->IsInitialized()) return false;
-  }
-  return true;
-}
-
-void Stream::Swap(Stream* other) {
-  if (other == this) return;
-  InternalSwap(other);
-}
-void Stream::InternalSwap(Stream* other) {
-  using std::swap;
-  swap(metadata_, other->metadata_);
-  swap(source_, other->source_);
-  swap(version_, other->version_);
-  swap(_has_bits_[0], other->_has_bits_[0]);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
-}
-
-::google::protobuf::Metadata Stream::GetMetadata() const {
-  protobuf_stream_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_stream_2eproto::file_level_metadata[kIndexInFileMessages];
-}
-
-
-// @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
-namespace google {
-namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Stream* Arena::CreateMaybeMessage< ::pb::Stream >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Stream >(arena);
-}
-}  // namespace protobuf
-}  // namespace google
-
-// @@protoc_insertion_point(global_scope)

go/certificate.pb.go

@@ -1,174 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: certificate.proto
-
-/*
-Package pb is a generated protocol buffer package.
-
-It is generated from these files:
-	certificate.proto
-	claim.proto
-	fee.proto
-	metadata.proto
-	signature.proto
-	source.proto
-	stream.proto
-
-It has these top-level messages:
-	Certificate
-	Claim
-	Fee
-	Metadata
-	Signature
-	Source
-	Stream
-*/
-package pb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type KeyType int32
-
-const (
-	KeyType_UNKNOWN_PUBLIC_KEY_TYPE KeyType = 0
-	KeyType_NIST256p                KeyType = 1
-	KeyType_NIST384p                KeyType = 2
-	KeyType_SECP256k1               KeyType = 3
-)
-
-var KeyType_name = map[int32]string{
-	0: "UNKNOWN_PUBLIC_KEY_TYPE",
-	1: "NIST256p",
-	2: "NIST384p",
-	3: "SECP256k1",
-}
-var KeyType_value = map[string]int32{
-	"UNKNOWN_PUBLIC_KEY_TYPE": 0,
-	"NIST256p":                1,
-	"NIST384p":                2,
-	"SECP256k1":               3,
-}
-
-func (x KeyType) Enum() *KeyType {
-	p := new(KeyType)
-	*p = x
-	return p
-}
-func (x KeyType) String() string {
-	return proto.EnumName(KeyType_name, int32(x))
-}
-func (x *KeyType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(KeyType_value, data, "KeyType")
-	if err != nil {
-		return err
-	}
-	*x = KeyType(value)
-	return nil
-}
-func (KeyType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type Certificate_Version int32
-
-const (
-	Certificate_UNKNOWN_VERSION Certificate_Version = 0
-	Certificate__0_0_1          Certificate_Version = 1
-)
-
-var Certificate_Version_name = map[int32]string{
-	0: "UNKNOWN_VERSION",
-	1: "_0_0_1",
-}
-var Certificate_Version_value = map[string]int32{
-	"UNKNOWN_VERSION": 0,
-	"_0_0_1":          1,
-}
-
-func (x Certificate_Version) Enum() *Certificate_Version {
-	p := new(Certificate_Version)
-	*p = x
-	return p
-}
-func (x Certificate_Version) String() string {
-	return proto.EnumName(Certificate_Version_name, int32(x))
-}
-func (x *Certificate_Version) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Certificate_Version_value, data, "Certificate_Version")
-	if err != nil {
-		return err
-	}
-	*x = Certificate_Version(value)
-	return nil
-}
-func (Certificate_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
-
-type Certificate struct {
-	Version          *Certificate_Version `protobuf:"varint,1,req,name=version,enum=pb.Certificate_Version" json:"version,omitempty"`
-	KeyType          *KeyType             `protobuf:"varint,2,req,name=keyType,enum=pb.KeyType" json:"keyType,omitempty"`
-	PublicKey        []byte               `protobuf:"bytes,4,req,name=publicKey" json:"publicKey,omitempty"`
-	XXX_unrecognized []byte               `json:"-"`
-}
-
-func (m *Certificate) Reset()                    { *m = Certificate{} }
-func (m *Certificate) String() string            { return proto.CompactTextString(m) }
-func (*Certificate) ProtoMessage()               {}
-func (*Certificate) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *Certificate) GetVersion() Certificate_Version {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return Certificate_UNKNOWN_VERSION
-}
-
-func (m *Certificate) GetKeyType() KeyType {
-	if m != nil && m.KeyType != nil {
-		return *m.KeyType
-	}
-	return KeyType_UNKNOWN_PUBLIC_KEY_TYPE
-}
-
-func (m *Certificate) GetPublicKey() []byte {
-	if m != nil {
-		return m.PublicKey
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Certificate)(nil), "pb.Certificate")
-	proto.RegisterEnum("pb.KeyType", KeyType_name, KeyType_value)
-	proto.RegisterEnum("pb.Certificate_Version", Certificate_Version_name, Certificate_Version_value)
-}
-
-func init() { proto.RegisterFile("certificate.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 238 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4c, 0x4e, 0x2d, 0x2a,
-	0xc9, 0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a,
-	0x48, 0x52, 0xda, 0xc8, 0xc8, 0xc5, 0xed, 0x8c, 0x90, 0x11, 0x32, 0xe4, 0x62, 0x2f, 0x4b, 0x2d,
-	0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x33, 0x12, 0xd7, 0x2b, 0x48, 0xd2,
-	0x43, 0x52, 0xa1, 0x17, 0x06, 0x91, 0x0e, 0x82, 0xa9, 0x13, 0x52, 0xe5, 0x62, 0xcf, 0x4e, 0xad,
-	0x0c, 0xa9, 0x2c, 0x48, 0x95, 0x60, 0x02, 0x6b, 0xe1, 0x06, 0x69, 0xf1, 0x86, 0x08, 0x05, 0xc1,
-	0xe4, 0x84, 0x64, 0xb8, 0x38, 0x0b, 0x4a, 0x93, 0x72, 0x32, 0x93, 0xbd, 0x53, 0x2b, 0x25, 0x58,
-	0x14, 0x98, 0x34, 0x78, 0x82, 0x10, 0x02, 0x4a, 0x5a, 0x5c, 0xec, 0x50, 0x83, 0x85, 0x84, 0xb9,
-	0xf8, 0x43, 0xfd, 0xbc, 0xfd, 0xfc, 0xc3, 0xfd, 0xe2, 0xc3, 0x5c, 0x83, 0x82, 0x3d, 0xfd, 0xfd,
-	0x04, 0x18, 0x84, 0xb8, 0xb8, 0xd8, 0xe2, 0x0d, 0xe2, 0x0d, 0xe2, 0x0d, 0x05, 0x18, 0xb5, 0x02,
-	0xb9, 0xd8, 0xa1, 0xa6, 0x0b, 0x49, 0x73, 0x89, 0xc3, 0xd4, 0x06, 0x84, 0x3a, 0xf9, 0x78, 0x3a,
-	0xc7, 0x7b, 0xbb, 0x46, 0xc6, 0x87, 0x44, 0x06, 0xb8, 0x0a, 0x30, 0x08, 0xf1, 0x70, 0x71, 0xf8,
-	0x79, 0x06, 0x87, 0x18, 0x99, 0x9a, 0x15, 0x08, 0x30, 0xc2, 0x78, 0xc6, 0x16, 0x26, 0x05, 0x02,
-	0x4c, 0x42, 0xbc, 0x5c, 0x9c, 0xc1, 0xae, 0xce, 0x01, 0x46, 0xa6, 0x66, 0xd9, 0x86, 0x02, 0xcc,
-	0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbf, 0xd0, 0xba, 0x16, 0x1e, 0x01, 0x00, 0x00,
-}

go/claim.pb.go

@@ -1,163 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: claim.proto
-
-package pb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Claim_Version int32
-
-const (
-	Claim_UNKNOWN_VERSION Claim_Version = 0
-	Claim__0_0_1          Claim_Version = 1
-)
-
-var Claim_Version_name = map[int32]string{
-	0: "UNKNOWN_VERSION",
-	1: "_0_0_1",
-}
-var Claim_Version_value = map[string]int32{
-	"UNKNOWN_VERSION": 0,
-	"_0_0_1":          1,
-}
-
-func (x Claim_Version) Enum() *Claim_Version {
-	p := new(Claim_Version)
-	*p = x
-	return p
-}
-func (x Claim_Version) String() string {
-	return proto.EnumName(Claim_Version_name, int32(x))
-}
-func (x *Claim_Version) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Claim_Version_value, data, "Claim_Version")
-	if err != nil {
-		return err
-	}
-	*x = Claim_Version(value)
-	return nil
-}
-func (Claim_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} }
-
-type Claim_ClaimType int32
-
-const (
-	Claim_UNKNOWN_CLAIM_TYPE Claim_ClaimType = 0
-	Claim_streamType         Claim_ClaimType = 1
-	Claim_certificateType    Claim_ClaimType = 2
-)
-
-var Claim_ClaimType_name = map[int32]string{
-	0: "UNKNOWN_CLAIM_TYPE",
-	1: "streamType",
-	2: "certificateType",
-}
-var Claim_ClaimType_value = map[string]int32{
-	"UNKNOWN_CLAIM_TYPE": 0,
-	"streamType":         1,
-	"certificateType":    2,
-}
-
-func (x Claim_ClaimType) Enum() *Claim_ClaimType {
-	p := new(Claim_ClaimType)
-	*p = x
-	return p
-}
-func (x Claim_ClaimType) String() string {
-	return proto.EnumName(Claim_ClaimType_name, int32(x))
-}
-func (x *Claim_ClaimType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Claim_ClaimType_value, data, "Claim_ClaimType")
-	if err != nil {
-		return err
-	}
-	*x = Claim_ClaimType(value)
-	return nil
-}
-func (Claim_ClaimType) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 1} }
-
-type Claim struct {
-	Version            *Claim_Version   `protobuf:"varint,1,req,name=version,enum=pb.Claim_Version" json:"version,omitempty"`
-	ClaimType          *Claim_ClaimType `protobuf:"varint,2,req,name=claimType,enum=pb.Claim_ClaimType" json:"claimType,omitempty"`
-	Stream             *Stream          `protobuf:"bytes,3,opt,name=stream" json:"stream,omitempty"`
-	Certificate        *Certificate     `protobuf:"bytes,4,opt,name=certificate" json:"certificate,omitempty"`
-	PublisherSignature *Signature       `protobuf:"bytes,5,opt,name=publisherSignature" json:"publisherSignature,omitempty"`
-	XXX_unrecognized   []byte           `json:"-"`
-}
-
-func (m *Claim) Reset()                    { *m = Claim{} }
-func (m *Claim) String() string            { return proto.CompactTextString(m) }
-func (*Claim) ProtoMessage()               {}
-func (*Claim) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-func (m *Claim) GetVersion() Claim_Version {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return Claim_UNKNOWN_VERSION
-}
-
-func (m *Claim) GetClaimType() Claim_ClaimType {
-	if m != nil && m.ClaimType != nil {
-		return *m.ClaimType
-	}
-	return Claim_UNKNOWN_CLAIM_TYPE
-}
-
-func (m *Claim) GetStream() *Stream {
-	if m != nil {
-		return m.Stream
-	}
-	return nil
-}
-
-func (m *Claim) GetCertificate() *Certificate {
-	if m != nil {
-		return m.Certificate
-	}
-	return nil
-}
-
-func (m *Claim) GetPublisherSignature() *Signature {
-	if m != nil {
-		return m.PublisherSignature
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Claim)(nil), "pb.Claim")
-	proto.RegisterEnum("pb.Claim_Version", Claim_Version_name, Claim_Version_value)
-	proto.RegisterEnum("pb.Claim_ClaimType", Claim_ClaimType_name, Claim_ClaimType_value)
-}
-
-func init() { proto.RegisterFile("claim.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 283 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0xc1, 0x4a, 0xf3, 0x40,
-	0x14, 0x85, 0x9b, 0xfc, 0x7f, 0x5b, 0x7a, 0xa3, 0x4d, 0x7a, 0x0b, 0x12, 0xba, 0x2a, 0x59, 0x15,
-	0x85, 0xd0, 0x74, 0xef, 0x42, 0x42, 0xc1, 0xa2, 0xa6, 0x32, 0xa9, 0x15, 0x57, 0x21, 0x09, 0xa3,
-	0x0e, 0xd4, 0x26, 0x4c, 0xa6, 0x82, 0xcf, 0xed, 0x0b, 0x48, 0x26, 0x33, 0x26, 0x0b, 0xb7, 0xdf,
-	0xf9, 0xe6, 0xce, 0x39, 0x60, 0xe5, 0x87, 0x94, 0x7d, 0xf8, 0x25, 0x2f, 0x44, 0x81, 0x66, 0x99,
-	0xcd, 0xce, 0x2a, 0xc1, 0x69, 0xaa, 0xc8, 0x6c, 0x92, 0x53, 0x2e, 0xd8, 0x2b, 0xcb, 0x53, 0x41,
-	0x15, 0xb2, 0x2b, 0xf6, 0x76, 0x4c, 0xc5, 0x89, 0x2b, 0xe0, 0x7d, 0x9b, 0xd0, 0x0f, 0xeb, 0x2b,
-	0x78, 0x05, 0xc3, 0x4f, 0xca, 0x2b, 0x56, 0x1c, 0x5d, 0x63, 0x6e, 0x2e, 0xc6, 0xab, 0x89, 0x5f,
-	0x66, 0xbe, 0xcc, 0xfc, 0x7d, 0x13, 0x10, 0x6d, 0x60, 0x00, 0x23, 0xf9, 0xf7, 0xee, 0xab, 0xa4,
-	0xae, 0x29, 0xf5, 0x69, 0xab, 0x87, 0x3a, 0x22, 0xad, 0x85, 0x1e, 0x0c, 0x9a, 0x76, 0xee, 0xbf,
-	0xb9, 0xb1, 0xb0, 0x56, 0x50, 0xfb, 0xb1, 0x24, 0x44, 0x25, 0x18, 0x80, 0xd5, 0xe9, 0xec, 0xfe,
-	0x97, 0xa2, 0x2d, 0x0f, 0xb7, 0x98, 0x74, 0x1d, 0xbc, 0x06, 0x2c, 0x4f, 0xd9, 0x81, 0x55, 0xef,
-	0x94, 0xc7, 0x7a, 0x9c, 0xdb, 0x97, 0x2f, 0xcf, 0xe5, 0x17, 0x1a, 0x92, 0x3f, 0x44, 0xef, 0x12,
-	0x86, 0x6a, 0x1c, 0x4e, 0xc1, 0x7e, 0x8a, 0xee, 0xa2, 0xed, 0x73, 0x94, 0xec, 0xd7, 0x24, 0xde,
-	0x6c, 0x23, 0xa7, 0x87, 0x00, 0x83, 0x64, 0x99, 0x2c, 0x93, 0xc0, 0x31, 0xbc, 0x5b, 0x18, 0xfd,
-	0x2e, 0xc3, 0x0b, 0x40, 0x6d, 0x87, 0xf7, 0x37, 0x9b, 0x87, 0x64, 0xf7, 0xf2, 0xb8, 0x76, 0x7a,
-	0x38, 0x06, 0x68, 0xc6, 0xd4, 0x96, 0x63, 0xd4, 0x57, 0x3b, 0x75, 0x25, 0x34, 0x7f, 0x02, 0x00,
-	0x00, 0xff, 0xff, 0x06, 0xd3, 0xca, 0xd4, 0xb9, 0x01, 0x00, 0x00,
-}

go/fee.pb.go

@@ -1,154 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: fee.proto
-
-package pb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Fee_Version int32
-
-const (
-	Fee_UNKNOWN_VERSION Fee_Version = 0
-	Fee__0_0_1          Fee_Version = 1
-)
-
-var Fee_Version_name = map[int32]string{
-	0: "UNKNOWN_VERSION",
-	1: "_0_0_1",
-}
-var Fee_Version_value = map[string]int32{
-	"UNKNOWN_VERSION": 0,
-	"_0_0_1":          1,
-}
-
-func (x Fee_Version) Enum() *Fee_Version {
-	p := new(Fee_Version)
-	*p = x
-	return p
-}
-func (x Fee_Version) String() string {
-	return proto.EnumName(Fee_Version_name, int32(x))
-}
-func (x *Fee_Version) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Fee_Version_value, data, "Fee_Version")
-	if err != nil {
-		return err
-	}
-	*x = Fee_Version(value)
-	return nil
-}
-func (Fee_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} }
-
-type Fee_Currency int32
-
-const (
-	Fee_UNKNOWN_CURRENCY Fee_Currency = 0
-	Fee_LBC              Fee_Currency = 1
-	Fee_BTC              Fee_Currency = 2
-	Fee_USD              Fee_Currency = 3
-)
-
-var Fee_Currency_name = map[int32]string{
-	0: "UNKNOWN_CURRENCY",
-	1: "LBC",
-	2: "BTC",
-	3: "USD",
-}
-var Fee_Currency_value = map[string]int32{
-	"UNKNOWN_CURRENCY": 0,
-	"LBC":              1,
-	"BTC":              2,
-	"USD":              3,
-}
-
-func (x Fee_Currency) Enum() *Fee_Currency {
-	p := new(Fee_Currency)
-	*p = x
-	return p
-}
-func (x Fee_Currency) String() string {
-	return proto.EnumName(Fee_Currency_name, int32(x))
-}
-func (x *Fee_Currency) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Fee_Currency_value, data, "Fee_Currency")
-	if err != nil {
-		return err
-	}
-	*x = Fee_Currency(value)
-	return nil
-}
-func (Fee_Currency) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 1} }
-
-type Fee struct {
-	Version          *Fee_Version  `protobuf:"varint,1,req,name=version,enum=pb.Fee_Version" json:"version,omitempty"`
-	Currency         *Fee_Currency `protobuf:"varint,2,req,name=currency,enum=pb.Fee_Currency" json:"currency,omitempty"`
-	Address          []byte        `protobuf:"bytes,3,req,name=address" json:"address,omitempty"`
-	Amount           *float32      `protobuf:"fixed32,4,req,name=amount" json:"amount,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
-}
-
-func (m *Fee) Reset()                    { *m = Fee{} }
-func (m *Fee) String() string            { return proto.CompactTextString(m) }
-func (*Fee) ProtoMessage()               {}
-func (*Fee) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} }
-
-func (m *Fee) GetVersion() Fee_Version {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return Fee_UNKNOWN_VERSION
-}
-
-func (m *Fee) GetCurrency() Fee_Currency {
-	if m != nil && m.Currency != nil {
-		return *m.Currency
-	}
-	return Fee_UNKNOWN_CURRENCY
-}
-
-func (m *Fee) GetAddress() []byte {
-	if m != nil {
-		return m.Address
-	}
-	return nil
-}
-
-func (m *Fee) GetAmount() float32 {
-	if m != nil && m.Amount != nil {
-		return *m.Amount
-	}
-	return 0
-}
-
-func init() {
-	proto.RegisterType((*Fee)(nil), "pb.Fee")
-	proto.RegisterEnum("pb.Fee_Version", Fee_Version_name, Fee_Version_value)
-	proto.RegisterEnum("pb.Fee_Currency", Fee_Currency_name, Fee_Currency_value)
-}
-
-func init() { proto.RegisterFile("fee.proto", fileDescriptor2) }
-
-var fileDescriptor2 = []byte{
-	// 224 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x3c, 0x8d, 0xcf, 0x4b, 0xc3, 0x30,
-	0x14, 0xc7, 0xd7, 0x54, 0xd6, 0xf9, 0x10, 0xf7, 0x78, 0x8a, 0xe4, 0x58, 0x7a, 0xaa, 0x22, 0x61,
-	0x7a, 0xf5, 0xb6, 0xb8, 0x81, 0x28, 0x19, 0x64, 0x76, 0xe2, 0x29, 0xec, 0xc7, 0x13, 0x3c, 0xd8,
-	0x94, 0x74, 0x13, 0xfc, 0xd3, 0xbd, 0x49, 0xb5, 0xf1, 0xf6, 0xfd, 0xf1, 0x81, 0x0f, 0x1c, 0xbf,
-	0x31, 0xab, 0x26, 0xf8, 0xbd, 0x27, 0xd1, 0x6c, 0x8a, 0xef, 0x04, 0xd2, 0x39, 0x33, 0x5d, 0x42,
-	0xf6, 0xc9, 0xa1, 0x7d, 0xf7, 0xb5, 0x4c, 0x72, 0x51, 0x9e, 0xde, 0x8e, 0x55, 0xb3, 0x51, 0x73,
-	0x66, 0xb5, 0xfa, 0x9b, 0x6d, 0xfc, 0xe9, 0x1a, 0x46, 0xdb, 0x43, 0x08, 0x5c, 0x6f, 0xbf, 0xa4,
-	0xf8, 0x65, 0x31, 0xb2, 0xba, 0xdf, 0xed, 0x3f, 0x41, 0x12, 0xb2, 0xf5, 0x6e, 0x17, 0xb8, 0x6d,
-	0x65, 0x9a, 0x8b, 0xf2, 0xc4, 0xc6, 0x4a, 0x17, 0x30, 0x5c, 0x7f, 0xf8, 0x43, 0xbd, 0x97, 0x47,
-	0xb9, 0x28, 0x85, 0xed, 0x5b, 0x71, 0x05, 0x59, 0xef, 0xa4, 0x33, 0x18, 0x57, 0xe6, 0xd1, 0x2c,
-	0x5e, 0x8c, 0x5b, 0xcd, 0xec, 0xf2, 0x61, 0x61, 0x70, 0x40, 0x00, 0x43, 0x37, 0x71, 0x13, 0x77,
-	0x83, 0x49, 0x71, 0x07, 0xa3, 0xe8, 0xa4, 0x73, 0xc0, 0x08, 0xeb, 0xca, 0xda, 0x99, 0xd1, 0xaf,
-	0x38, 0xa0, 0x0c, 0xd2, 0xa7, 0xa9, 0xc6, 0xa4, 0x0b, 0xd3, 0x67, 0x8d, 0xa2, 0x0b, 0xd5, 0xf2,
-	0x1e, 0xd3, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x36, 0x82, 0x6b, 0xf7, 0x0b, 0x01, 0x00, 0x00,
-}

go/signature.pb.go

@@ -1,111 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: signature.proto
-
-package pb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Signature_Version int32
-
-const (
-	Signature_UNKNOWN_VERSION Signature_Version = 0
-	Signature__0_0_1          Signature_Version = 1
-)
-
-var Signature_Version_name = map[int32]string{
-	0: "UNKNOWN_VERSION",
-	1: "_0_0_1",
-}
-var Signature_Version_value = map[string]int32{
-	"UNKNOWN_VERSION": 0,
-	"_0_0_1":          1,
-}
-
-func (x Signature_Version) Enum() *Signature_Version {
-	p := new(Signature_Version)
-	*p = x
-	return p
-}
-func (x Signature_Version) String() string {
-	return proto.EnumName(Signature_Version_name, int32(x))
-}
-func (x *Signature_Version) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Signature_Version_value, data, "Signature_Version")
-	if err != nil {
-		return err
-	}
-	*x = Signature_Version(value)
-	return nil
-}
-func (Signature_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []int{0, 0} }
-
-type Signature struct {
-	Version          *Signature_Version `protobuf:"varint,1,req,name=version,enum=pb.Signature_Version" json:"version,omitempty"`
-	SignatureType    *KeyType           `protobuf:"varint,2,req,name=signatureType,enum=pb.KeyType" json:"signatureType,omitempty"`
-	Signature        []byte             `protobuf:"bytes,3,req,name=signature" json:"signature,omitempty"`
-	CertificateId    []byte             `protobuf:"bytes,4,req,name=certificateId" json:"certificateId,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *Signature) Reset()                    { *m = Signature{} }
-func (m *Signature) String() string            { return proto.CompactTextString(m) }
-func (*Signature) ProtoMessage()               {}
-func (*Signature) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} }
-
-func (m *Signature) GetVersion() Signature_Version {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return Signature_UNKNOWN_VERSION
-}
-
-func (m *Signature) GetSignatureType() KeyType {
-	if m != nil && m.SignatureType != nil {
-		return *m.SignatureType
-	}
-	return KeyType_UNKNOWN_PUBLIC_KEY_TYPE
-}
-
-func (m *Signature) GetSignature() []byte {
-	if m != nil {
-		return m.Signature
-	}
-	return nil
-}
-
-func (m *Signature) GetCertificateId() []byte {
-	if m != nil {
-		return m.CertificateId
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Signature)(nil), "pb.Signature")
-	proto.RegisterEnum("pb.Signature_Version", Signature_Version_name, Signature_Version_value)
-}
-
-func init() { proto.RegisterFile("signature.proto", fileDescriptor4) }
-
-var fileDescriptor4 = []byte{
-	// 192 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2f, 0xce, 0x4c, 0xcf,
-	0x4b, 0x2c, 0x29, 0x2d, 0x4a, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x92,
-	0x12, 0x4c, 0x4e, 0x2d, 0x2a, 0xc9, 0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0x81, 0x0a, 0x2b, 0xdd, 0x67,
-	0xe4, 0xe2, 0x0c, 0x86, 0x29, 0x15, 0xd2, 0xe7, 0x62, 0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf,
-	0x93, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x33, 0x12, 0xd5, 0x2b, 0x48, 0xd2, 0x83, 0xcb, 0xeb, 0x85,
-	0x41, 0x24, 0x83, 0x60, 0xaa, 0x84, 0x0c, 0xb9, 0x78, 0xe1, 0x16, 0x85, 0x54, 0x16, 0xa4, 0x4a,
-	0x30, 0x81, 0xb5, 0x71, 0x83, 0xb4, 0x79, 0xa7, 0x56, 0x82, 0x84, 0x82, 0x50, 0x55, 0x08, 0xc9,
-	0x70, 0x71, 0xc2, 0x05, 0x24, 0x98, 0x15, 0x98, 0x34, 0x78, 0x82, 0x10, 0x02, 0x42, 0x2a, 0x5c,
-	0xbc, 0x48, 0x8e, 0xf4, 0x4c, 0x91, 0x60, 0x01, 0xab, 0x40, 0x15, 0x54, 0xd2, 0xe2, 0x62, 0x87,
-	0x3a, 0x45, 0x48, 0x98, 0x8b, 0x3f, 0xd4, 0xcf, 0xdb, 0xcf, 0x3f, 0xdc, 0x2f, 0x3e, 0xcc, 0x35,
-	0x28, 0xd8, 0xd3, 0xdf, 0x4f, 0x80, 0x41, 0x88, 0x8b, 0x8b, 0x2d, 0xde, 0x20, 0xde, 0x20, 0xde,
-	0x50, 0x80, 0x11, 0x10, 0x00, 0x00, 0xff, 0xff, 0x50, 0x35, 0x0d, 0x49, 0x0a, 0x01, 0x00, 0x00,
-}

go/source.pb.go

@@ -1,148 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: source.proto
-
-package pb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Source_Version int32
-
-const (
-	Source_UNKNOWN_VERSION Source_Version = 0
-	Source__0_0_1          Source_Version = 1
-)
-
-var Source_Version_name = map[int32]string{
-	0: "UNKNOWN_VERSION",
-	1: "_0_0_1",
-}
-var Source_Version_value = map[string]int32{
-	"UNKNOWN_VERSION": 0,
-	"_0_0_1":          1,
-}
-
-func (x Source_Version) Enum() *Source_Version {
-	p := new(Source_Version)
-	*p = x
-	return p
-}
-func (x Source_Version) String() string {
-	return proto.EnumName(Source_Version_name, int32(x))
-}
-func (x *Source_Version) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Source_Version_value, data, "Source_Version")
-	if err != nil {
-		return err
-	}
-	*x = Source_Version(value)
-	return nil
-}
-func (Source_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{0, 0} }
-
-type Source_SourceTypes int32
-
-const (
-	Source_UNKNOWN_SOURCE_TYPE Source_SourceTypes = 0
-	Source_lbry_sd_hash        Source_SourceTypes = 1
-)
-
-var Source_SourceTypes_name = map[int32]string{
-	0: "UNKNOWN_SOURCE_TYPE",
-	1: "lbry_sd_hash",
-}
-var Source_SourceTypes_value = map[string]int32{
-	"UNKNOWN_SOURCE_TYPE": 0,
-	"lbry_sd_hash":        1,
-}
-
-func (x Source_SourceTypes) Enum() *Source_SourceTypes {
-	p := new(Source_SourceTypes)
-	*p = x
-	return p
-}
-func (x Source_SourceTypes) String() string {
-	return proto.EnumName(Source_SourceTypes_name, int32(x))
-}
-func (x *Source_SourceTypes) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Source_SourceTypes_value, data, "Source_SourceTypes")
-	if err != nil {
-		return err
-	}
-	*x = Source_SourceTypes(value)
-	return nil
-}
-func (Source_SourceTypes) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{0, 1} }
-
-type Source struct {
-	Version          *Source_Version     `protobuf:"varint,1,req,name=version,enum=pb.Source_Version" json:"version,omitempty"`
-	SourceType       *Source_SourceTypes `protobuf:"varint,2,req,name=sourceType,enum=pb.Source_SourceTypes" json:"sourceType,omitempty"`
-	Source           []byte              `protobuf:"bytes,3,req,name=source" json:"source,omitempty"`
-	ContentType      *string             `protobuf:"bytes,4,req,name=contentType" json:"contentType,omitempty"`
-	XXX_unrecognized []byte              `json:"-"`
-}
-
-func (m *Source) Reset()                    { *m = Source{} }
-func (m *Source) String() string            { return proto.CompactTextString(m) }
-func (*Source) ProtoMessage()               {}
-func (*Source) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} }
-
-func (m *Source) GetVersion() Source_Version {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return Source_UNKNOWN_VERSION
-}
-
-func (m *Source) GetSourceType() Source_SourceTypes {
-	if m != nil && m.SourceType != nil {
-		return *m.SourceType
-	}
-	return Source_UNKNOWN_SOURCE_TYPE
-}
-
-func (m *Source) GetSource() []byte {
-	if m != nil {
-		return m.Source
-	}
-	return nil
-}
-
-func (m *Source) GetContentType() string {
-	if m != nil && m.ContentType != nil {
-		return *m.ContentType
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*Source)(nil), "pb.Source")
-	proto.RegisterEnum("pb.Source_Version", Source_Version_name, Source_Version_value)
-	proto.RegisterEnum("pb.Source_SourceTypes", Source_SourceTypes_name, Source_SourceTypes_value)
-}
-
-func init() { proto.RegisterFile("source.proto", fileDescriptor5) }
-
-var fileDescriptor5 = []byte{
-	// 224 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0xce, 0x2f, 0x2d,
-	0x4a, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0xea, 0x63, 0xe2,
-	0x62, 0x0b, 0x06, 0x0b, 0x0a, 0xe9, 0x70, 0xb1, 0x97, 0xa5, 0x16, 0x15, 0x67, 0xe6, 0xe7, 0x49,
-	0x30, 0x2a, 0x30, 0x69, 0xf0, 0x19, 0x09, 0xe9, 0x15, 0x24, 0xe9, 0x41, 0x24, 0xf5, 0xc2, 0x20,
-	0x32, 0x41, 0x30, 0x25, 0x42, 0x66, 0x5c, 0x5c, 0x10, 0xc3, 0x42, 0x2a, 0x0b, 0x52, 0x25, 0x98,
-	0xc0, 0x1a, 0xc4, 0x90, 0x34, 0x04, 0xc3, 0x25, 0x8b, 0x83, 0x90, 0x54, 0x0a, 0x89, 0x71, 0xb1,
-	0x41, 0x78, 0x12, 0xcc, 0x0a, 0x4c, 0x1a, 0x3c, 0x41, 0x50, 0x9e, 0x90, 0x02, 0x17, 0x77, 0x72,
-	0x7e, 0x5e, 0x49, 0x6a, 0x5e, 0x09, 0xd8, 0x40, 0x16, 0x05, 0x26, 0x0d, 0xce, 0x20, 0x64, 0x21,
-	0x25, 0x2d, 0x2e, 0x76, 0xa8, 0x2b, 0x84, 0x84, 0xb9, 0xf8, 0x43, 0xfd, 0xbc, 0xfd, 0xfc, 0xc3,
-	0xfd, 0xe2, 0xc3, 0x5c, 0x83, 0x82, 0x3d, 0xfd, 0xfd, 0x04, 0x18, 0x84, 0xb8, 0xb8, 0xd8, 0xe2,
-	0x0d, 0xe2, 0x0d, 0xe2, 0x0d, 0x05, 0x18, 0x95, 0x2c, 0xb8, 0xb8, 0x91, 0x1c, 0x20, 0x24, 0xce,
-	0x25, 0x0c, 0x53, 0x1f, 0xec, 0x1f, 0x1a, 0xe4, 0xec, 0x1a, 0x1f, 0x12, 0x19, 0xe0, 0x2a, 0xc0,
-	0x20, 0x24, 0xc0, 0xc5, 0x93, 0x93, 0x54, 0x54, 0x19, 0x5f, 0x9c, 0x12, 0x9f, 0x91, 0x58, 0x9c,
-	0x21, 0xc0, 0x08, 0x08, 0x00, 0x00, 0xff, 0xff, 0xcb, 0x07, 0x54, 0x9d, 0x23, 0x01, 0x00, 0x00,
-}

go/stream.pb.go

@@ -1,103 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: stream.proto
-
-package pb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Stream_Version int32
-
-const (
-	Stream_UNKNOWN_VERSION Stream_Version = 0
-	Stream__0_0_1          Stream_Version = 1
-)
-
-var Stream_Version_name = map[int32]string{
-	0: "UNKNOWN_VERSION",
-	1: "_0_0_1",
-}
-var Stream_Version_value = map[string]int32{
-	"UNKNOWN_VERSION": 0,
-	"_0_0_1":          1,
-}
-
-func (x Stream_Version) Enum() *Stream_Version {
-	p := new(Stream_Version)
-	*p = x
-	return p
-}
-func (x Stream_Version) String() string {
-	return proto.EnumName(Stream_Version_name, int32(x))
-}
-func (x *Stream_Version) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Stream_Version_value, data, "Stream_Version")
-	if err != nil {
-		return err
-	}
-	*x = Stream_Version(value)
-	return nil
-}
-func (Stream_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor6, []int{0, 0} }
-
-type Stream struct {
-	Version          *Stream_Version `protobuf:"varint,1,req,name=version,enum=pb.Stream_Version" json:"version,omitempty"`
-	Metadata         *Metadata       `protobuf:"bytes,2,req,name=metadata" json:"metadata,omitempty"`
-	Source           *Source         `protobuf:"bytes,3,req,name=source" json:"source,omitempty"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *Stream) Reset()                    { *m = Stream{} }
-func (m *Stream) String() string            { return proto.CompactTextString(m) }
-func (*Stream) ProtoMessage()               {}
-func (*Stream) Descriptor() ([]byte, []int) { return fileDescriptor6, []int{0} }
-
-func (m *Stream) GetVersion() Stream_Version {
-	if m != nil && m.Version != nil {
-		return *m.Version
-	}
-	return Stream_UNKNOWN_VERSION
-}
-
-func (m *Stream) GetMetadata() *Metadata {
-	if m != nil {
-		return m.Metadata
-	}
-	return nil
-}
-
-func (m *Stream) GetSource() *Source {
-	if m != nil {
-		return m.Source
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Stream)(nil), "pb.Stream")
-	proto.RegisterEnum("pb.Stream_Version", Stream_Version_name, Stream_Version_value)
-}
-
-func init() { proto.RegisterFile("stream.proto", fileDescriptor6) }
-
-var fileDescriptor6 = []byte{
-	// 183 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x2e, 0x29, 0x4a,
-	0x4d, 0xcc, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x92, 0xe2, 0xcb, 0x4d,
-	0x2d, 0x49, 0x4c, 0x49, 0x2c, 0x49, 0x84, 0x88, 0x49, 0xf1, 0x14, 0xe7, 0x97, 0x16, 0x25, 0xa7,
-	0x42, 0x78, 0x4a, 0x1b, 0x18, 0xb9, 0xd8, 0x82, 0xc1, 0x5a, 0x84, 0x74, 0xb8, 0xd8, 0xcb, 0x52,
-	0x8b, 0x8a, 0x33, 0xf3, 0xf3, 0x24, 0x18, 0x15, 0x98, 0x34, 0xf8, 0x8c, 0x84, 0xf4, 0x0a, 0x92,
-	0xf4, 0x20, 0x92, 0x7a, 0x61, 0x10, 0x99, 0x20, 0x98, 0x12, 0x21, 0x0d, 0x2e, 0x0e, 0x98, 0xc1,
-	0x12, 0x4c, 0x0a, 0x4c, 0x1a, 0xdc, 0x46, 0x3c, 0x20, 0xe5, 0xbe, 0x50, 0xb1, 0x20, 0xb8, 0xac,
-	0x90, 0x12, 0x17, 0x1b, 0xc4, 0x4a, 0x09, 0x66, 0xb0, 0x3a, 0x2e, 0xb0, 0xb1, 0x60, 0x91, 0x20,
-	0xa8, 0x8c, 0x92, 0x16, 0x17, 0x3b, 0xd4, 0x06, 0x21, 0x61, 0x2e, 0xfe, 0x50, 0x3f, 0x6f, 0x3f,
-	0xff, 0x70, 0xbf, 0xf8, 0x30, 0xd7, 0xa0, 0x60, 0x4f, 0x7f, 0x3f, 0x01, 0x06, 0x21, 0x2e, 0x2e,
-	0xb6, 0x78, 0x83, 0x78, 0x83, 0x78, 0x43, 0x01, 0x46, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd8,
-	0x68, 0x9c, 0xe3, 0xe3, 0x00, 0x00, 0x00,
-}

jsonschema/wallet.json

@@ -0,0 +1,139 @@
+{
+  "title": "Wallet",
+  "description": "An LBC wallet",
+  "type": "object",
+  "required": ["name", "version", "accounts", "preferences"],
+  "additionalProperties": false,
+  "properties": {
+    "name": {
+      "description": "Human readable name for this wallet",
+      "type": "string"
+    },
+    "version": {
+      "description": "Wallet spec version",
+      "type": "integer",
+      "$comment": "Should this be a string? We may need some sort of decimal type if we want exact decimal versions."
+    },
+    "accounts": {
+      "description": "Accounts associated with this wallet",
+      "type": "array",
+      "items": {
+        "type": "object",
+        "required": ["address_generator", "certificates", "encrypted", "ledger", "modified_on", "name", "private_key", "public_key", "seed"],
+        "additionalProperties": false,
+        "properties": {
+          "address_generator": {
+            "description": "Higher level manager of either singular or deterministically generated addresses",
+            "type": "object",
+            "oneOf": [
+              {
+                "required": ["name", "change", "receiving"],
+                "additionalProperties": false,
+                "properties": {
+                  "name": {
+                    "description": "type of address generator: a deterministic chain of addresses",
+                    "enum": ["deterministic-chain"],
+                    "type": "string"
+                  },
+                  "change": {
+                    "$ref": "#/$defs/address_manager",
+                    "description": "Manager for deterministically generated change address (not used for single address)"
+                  },
+                  "receiving": {
+                    "$ref": "#/$defs/address_manager",
+                    "description": "Manager for deterministically generated receiving address (not used for single address)"
+                  }
+                }
+              }, {
+                "required": ["name"],
+                "additionalProperties": false,
+                "properties": {
+                  "name": {
+                    "description": "type of address generator: a single address",
+                    "enum": ["single-address"],
+                    "type": "string"
+                  }
+                }
+              }
+            ]
+          },
+          "certificates": {
+            "type": "object",
+            "description": "Channel keys. Mapping from public key address to pem-formatted private key.",
+            "additionalProperties": {"type": "string"}
+          },
+          "encrypted": {
+            "type": "boolean",
+            "description": "Whether private key and seed are encrypted with a password"
+          },
+          "ledger": {
+            "description": "Which network to use",
+            "type": "string",
+            "examples": [
+              "lbc_mainnet",
+              "lbc_testnet"
+            ]
+          },
+          "modified_on": {
+            "description": "last modified time in Unix Time",
+            "type": "integer"
+          },
+          "name": {
+            "description": "Name for account, possibly human readable",
+            "type": "string"
+          },
+          "private_key": {
+            "description": "Private key for address if `address_generator` is a single address. Root of chain of private keys for addresses if `address_generator` is a deterministic chain of addresses. Encrypted if `encrypted` is true.",
+            "type": "string"
+          },
+          "public_key": {
+            "description": "Public key for address if `address_generator` is a single address. Root of chain of public keys for addresses if `address_generator` is a deterministic chain of addresses.",
+            "type": "string"
+          },
+          "seed": {
+            "description": "Human readable representation of `private_key`. encrypted if `encrypted` is set to `true`",
+            "type": "string"
+          }
+        }
+      }
+    },
+    "preferences": {
+      "description": "Timestamped application-level preferences. Values can be objects or of a primitive type.",
+      "$comment": "enable-sync is seen in example wallet. encrypt-on-disk is seen in example wallet. they both have a boolean `value` field. Do we want them explicitly defined here? local and shared seem to have at least a similar structure (type, value [yes, again], version), value being the free-form part. Should we define those here? Or can there be any key under preferences, and `value` be literally be anything in any form?",
+      "type": "object",
+      "additionalProperties": {
+        "type": "object",
+        "required": ["ts", "value"],
+        "additionalProperties": false,
+        "properties": {
+          "ts": {
+            "type": "number",
+            "description": "When the item was set, in Unix time format.",
+            "$comment": "Do we want a string (decimal)?"
+          },
+          "value": {
+            "$comment": "Sometimes this has been an object, sometimes just a boolean. I don't want to prescribe anything."
+          }
+        }
+      }
+    }
+  },
+  "$defs": {
+    "address_manager": {
+      "description": "Manager for deterministically generated addresses",
+      "type": "object",
+      "required": ["gap", "maximum_uses_per_address"],
+      "additionalProperties": false,
+      "properties": {
+        "gap": {
+          "description": "Maximum allowed consecutive generated addresses with no transactions",
+          "type": "integer"
+        },
+        "maximum_uses_per_address": {
+          "description": "Maximum number of uses for each generated address",
+          "type": "integer"
+        }
+      }
+    }
+  }
+}

v1/README.md

@@ -0,0 +1,32 @@
+# Using LBRY types in your code
+
+## Go
+
+```go
+package main
+
+import pb "github.com/lbryio/types/go"
+import "fmt"
+
+func main() {
+    title := "Coherence"
+    metadata := pb.Metadata{Title:&title}
+    fmt.Printf("Let's watch %s on LBRY!\n", metadata.GetTitle())
+}
+
+```
+
+## Python
+
+todo
+
+## Javascript
+
+todo
+
+# Compiling types
+
+You only need to do this if you're modifying the types themselves.
+
+- Download [the protoc binary](https://github.com/google/protobuf/releases) and put it in your path. Make sure you get the one starting with `protoc`, not `protobuf`.
+- `./build.sh`

v1/cpp/certificate.pb.cc

@@ -6,119 +6,99 @@
 #include <algorithm>
 
 #include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
 #include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/extension_set.h>
 #include <google/protobuf/wire_format_lite_inl.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
-// This is a temporary google only hack
-#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
-#include "third_party/protobuf/version.h"
-#endif
 // @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
 
-namespace pb {
+namespace legacy_pb {
 class CertificateDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Certificate>
-      _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Certificate> _instance;
 } _Certificate_default_instance_;
-}  // namespace pb
-namespace protobuf_certificate_2eproto {
-static void InitDefaultsCertificate() {
+}  // namespace legacy_pb
+static void InitDefaultsCertificate_certificate_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Certificate_default_instance_;
-    new (ptr) ::pb::Certificate();
+    void* ptr = &::legacy_pb::_Certificate_default_instance_;
+    new (ptr) ::legacy_pb::Certificate();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Certificate::InitAsDefaultInstance();
+  ::legacy_pb::Certificate::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<0> scc_info_Certificate =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsCertificate}, {}};
+::google::protobuf::internal::SCCInfo<0> scc_info_Certificate_certificate_2eproto =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsCertificate_certificate_2eproto}, {}};
 
-void InitDefaults() {
-  ::google::protobuf::internal::InitSCC(&scc_info_Certificate.base);
+void InitDefaults_certificate_2eproto() {
+  ::google::protobuf::internal::InitSCC(&scc_info_Certificate_certificate_2eproto.base);
 }
 
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
+::google::protobuf::Metadata file_level_metadata_certificate_2eproto[1];
+const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_certificate_2eproto[2];
+constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_certificate_2eproto = nullptr;
 
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Certificate, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Certificate, _internal_metadata_),
+const ::google::protobuf::uint32 TableStruct_certificate_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Certificate, _has_bits_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Certificate, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Certificate, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Certificate, keytype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Certificate, publickey_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Certificate, version_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Certificate, keytype_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Certificate, publickey_),
   1,
   2,
   0,
 };
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 8, sizeof(::pb::Certificate)},
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  { 0, 8, sizeof(::legacy_pb::Certificate)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Certificate_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Certificate_default_instance_),
 };
 
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  AssignDescriptors(
-      "certificate.proto", schemas, file_default_instances, TableStruct::offsets,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
+::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_certificate_2eproto = {
+  {}, AddDescriptors_certificate_2eproto, "certificate.proto", schemas,
+  file_default_instances, TableStruct_certificate_2eproto::offsets,
+  file_level_metadata_certificate_2eproto, 1, file_level_enum_descriptors_certificate_2eproto, file_level_service_descriptors_certificate_2eproto,
+};
 
-void protobuf_AssignDescriptorsOnce() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors);
-}
+const char descriptor_table_protodef_certificate_2eproto[] =
+  "\n\021certificate.proto\022\tlegacy_pb\"\242\001\n\013Certi"
+  "ficate\022/\n\007version\030\001 \002(\0162\036.legacy_pb.Cert"
+  "ificate.Version\022#\n\007keyType\030\002 \002(\0162\022.legac"
+  "y_pb.KeyType\022\021\n\tpublicKey\030\004 \002(\014\"*\n\007Versi"
+  "on\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001*Q\n\007K"
+  "eyType\022\033\n\027UNKNOWN_PUBLIC_KEY_TYPE\020\000\022\014\n\010N"
+  "IST256p\020\001\022\014\n\010NIST384p\020\002\022\r\n\tSECP256k1\020\003"
+  ;
+::google::protobuf::internal::DescriptorTable descriptor_table_certificate_2eproto = {
+  false, InitDefaults_certificate_2eproto, 
+  descriptor_table_protodef_certificate_2eproto,
+  "certificate.proto", &assign_descriptors_table_certificate_2eproto, 278,
+};
 
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\021certificate.proto\022\002pb\"\224\001\n\013Certificate\022"
-      "(\n\007version\030\001 \002(\0162\027.pb.Certificate.Versio"
-      "n\022\034\n\007keyType\030\002 \002(\0162\013.pb.KeyType\022\021\n\tpubli"
-      "cKey\030\004 \002(\014\"*\n\007Version\022\023\n\017UNKNOWN_VERSION"
-      "\020\000\022\n\n\006_0_0_1\020\001*Q\n\007KeyType\022\033\n\027UNKNOWN_PUB"
-      "LIC_KEY_TYPE\020\000\022\014\n\010NIST256p\020\001\022\014\n\010NIST384p"
-      "\020\002\022\r\n\tSECP256k1\020\003"
+void AddDescriptors_certificate_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[1] =
+  {
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 257);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "certificate.proto", &protobuf_RegisterTypes);
+ ::google::protobuf::internal::AddDescriptors(&descriptor_table_certificate_2eproto, deps, 0);
 }
 
-void AddDescriptors() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-}  // namespace protobuf_certificate_2eproto
-namespace pb {
+// Force running AddDescriptors() at dynamic initialization time.
+static bool dynamic_init_dummy_certificate_2eproto = []() { AddDescriptors_certificate_2eproto(); return true; }();
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Certificate_Version_descriptor() {
-  protobuf_certificate_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_certificate_2eproto::file_level_enum_descriptors[0];
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_certificate_2eproto);
+  return file_level_enum_descriptors_certificate_2eproto[0];
 }
 bool Certificate_Version_IsValid(int value) {
   switch (value) {
@@ -138,8 +118,8 @@ const Certificate_Version Certificate::Version_MAX;
 const int Certificate::Version_ARRAYSIZE;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 const ::google::protobuf::EnumDescriptor* KeyType_descriptor() {
-  protobuf_certificate_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_certificate_2eproto::file_level_enum_descriptors[1];
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_certificate_2eproto);
+  return file_level_enum_descriptors_certificate_2eproto[1];
 }
 bool KeyType_IsValid(int value) {
   switch (value) {
@@ -158,6 +138,19 @@ bool KeyType_IsValid(int value) {
 
 void Certificate::InitAsDefaultInstance() {
 }
+class Certificate::HasBitSetters {
+ public:
+  static void set_has_version(Certificate* msg) {
+    msg->_has_bits_[0] |= 0x00000002u;
+  }
+  static void set_has_keytype(Certificate* msg) {
+    msg->_has_bits_[0] |= 0x00000004u;
+  }
+  static void set_has_publickey(Certificate* msg) {
+    msg->_has_bits_[0] |= 0x00000001u;
+  }
+};
+
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Certificate::kVersionFieldNumber;
 const int Certificate::kKeyTypeFieldNumber;
@@ -165,15 +158,13 @@ const int Certificate::kPublicKeyFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Certificate::Certificate()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  ::google::protobuf::internal::InitSCC(
-      &protobuf_certificate_2eproto::scc_info_Certificate.base);
+  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Certificate)
+  // @@protoc_insertion_point(constructor:legacy_pb.Certificate)
 }
 Certificate::Certificate(const Certificate& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
+      _internal_metadata_(nullptr),
       _has_bits_(from._has_bits_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   publickey_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -183,10 +174,12 @@ Certificate::Certificate(const Certificate& from)
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&keytype_) -
     reinterpret_cast<char*>(&version_)) + sizeof(keytype_));
-  // @@protoc_insertion_point(copy_constructor:pb.Certificate)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Certificate)
 }
 
 void Certificate::SharedCtor() {
+  ::google::protobuf::internal::InitSCC(
+      &scc_info_Certificate_certificate_2eproto.base);
   publickey_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&version_, 0, static_cast<size_t>(
       reinterpret_cast<char*>(&keytype_) -
@@ -194,7 +187,7 @@ void Certificate::SharedCtor() {
 }
 
 Certificate::~Certificate() {
-  // @@protoc_insertion_point(destructor:pb.Certificate)
+  // @@protoc_insertion_point(destructor:legacy_pb.Certificate)
   SharedDtor();
 }
 
@@ -205,19 +198,14 @@ void Certificate::SharedDtor() {
 void Certificate::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
-const ::google::protobuf::Descriptor* Certificate::descriptor() {
-  ::protobuf_certificate_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_certificate_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
 const Certificate& Certificate::default_instance() {
-  ::google::protobuf::internal::InitSCC(&protobuf_certificate_2eproto::scc_info_Certificate.base);
+  ::google::protobuf::internal::InitSCC(&::scc_info_Certificate_certificate_2eproto.base);
   return *internal_default_instance();
 }
 
 
 void Certificate::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Certificate)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Certificate)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -226,7 +214,7 @@ void Certificate::Clear() {
   if (cached_has_bits & 0x00000001u) {
     publickey_.ClearNonDefaultToEmptyNoArena();
   }
-  if (cached_has_bits & 6u) {
+  if (cached_has_bits & 0x00000006u) {
     ::memset(&version_, 0, static_cast<size_t>(
         reinterpret_cast<char*>(&keytype_) -
         reinterpret_cast<char*>(&version_)) + sizeof(keytype_));
@@ -235,29 +223,104 @@ void Certificate::Clear() {
   _internal_metadata_.Clear();
 }
 
+#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+const char* Certificate::_InternalParse(const char* begin, const char* end, void* object,
+                  ::google::protobuf::internal::ParseContext* ctx) {
+  auto msg = static_cast<Certificate*>(object);
+  ::google::protobuf::int32 size; (void)size;
+  int depth; (void)depth;
+  ::google::protobuf::uint32 tag;
+  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
+  auto ptr = begin;
+  while (ptr < end) {
+    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
+    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+    switch (tag >> 3) {
+      // required .legacy_pb.Certificate.Version version = 1;
+      case 1: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::Certificate_Version_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(1, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_version(static_cast<::legacy_pb::Certificate_Version>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required .legacy_pb.KeyType keyType = 2;
+      case 2: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::KeyType_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(2, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_keytype(static_cast<::legacy_pb::KeyType>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required bytes publicKey = 4;
+      case 4: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        object = msg->mutable_publickey();
+        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
+          parser_till_end = ::google::protobuf::internal::GreedyStringParser;
+          goto string_till_end;
+        }
+        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheck(ptr, size, ctx));
+        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
+        ptr += size;
+        break;
+      }
+      default: {
+      handle_unusual:
+        if ((tag & 7) == 4 || tag == 0) {
+          ctx->EndGroup(tag);
+          return ptr;
+        }
+        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
+          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
+        ptr = res.first;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
+        if (res.second) return ptr;
+      }
+    }  // switch
+  }  // while
+  return ptr;
+string_till_end:
+  static_cast<::std::string*>(object)->clear();
+  static_cast<::std::string*>(object)->reserve(size);
+  goto len_delim_till_end;
+len_delim_till_end:
+  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
+                               {parser_till_end, object}, size);
+}
+#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 bool Certificate::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
+#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Certificate)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Certificate)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Certificate.Version version = 1;
+      // required .legacy_pb.Certificate.Version version = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
+        if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
+          int value = 0;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Certificate_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Certificate_Version >(value));
+          if (::legacy_pb::Certificate_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Certificate_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
-                1, static_cast< ::google::protobuf::uint64>(value));
+                1, static_cast<::google::protobuf::uint64>(value));
           }
         } else {
           goto handle_unusual;
@@ -265,19 +328,18 @@ bool Certificate::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.KeyType keyType = 2;
+      // required .legacy_pb.KeyType keyType = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-          int value;
+        if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) {
+          int value = 0;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::KeyType_IsValid(value)) {
-            set_keytype(static_cast< ::pb::KeyType >(value));
+          if (::legacy_pb::KeyType_IsValid(value)) {
+            set_keytype(static_cast< ::legacy_pb::KeyType >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
-                2, static_cast< ::google::protobuf::uint64>(value));
+                2, static_cast<::google::protobuf::uint64>(value));
           }
         } else {
           goto handle_unusual;
@@ -287,8 +349,7 @@ bool Certificate::MergePartialFromCodedStream(
 
       // required bytes publicKey = 4;
       case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
                 input, this->mutable_publickey()));
         } else {
@@ -309,28 +370,29 @@ bool Certificate::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Certificate)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Certificate)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Certificate)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Certificate)
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Certificate::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Certificate)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Certificate)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Certificate.Version version = 1;
+  // required .legacy_pb.Certificate.Version version = 1;
   if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.KeyType keyType = 2;
+  // required .legacy_pb.KeyType keyType = 2;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->keytype(), output);
@@ -346,24 +408,23 @@ void Certificate::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Certificate)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Certificate)
 }
 
 ::google::protobuf::uint8* Certificate::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Certificate)
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Certificate)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Certificate.Version version = 1;
+  // required .legacy_pb.Certificate.Version version = 1;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.KeyType keyType = 2;
+  // required .legacy_pb.KeyType keyType = 2;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->keytype(), target);
@@ -380,12 +441,12 @@ void Certificate::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Certificate)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Certificate)
   return target;
 }
 
 size_t Certificate::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Certificate)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Certificate)
   size_t total_size = 0;
 
   if (has_publickey()) {
@@ -396,13 +457,13 @@ size_t Certificate::RequiredFieldsByteSizeFallback() const {
   }
 
   if (has_version()) {
-    // required .pb.Certificate.Version version = 1;
+    // required .legacy_pb.Certificate.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
 
   if (has_keytype()) {
-    // required .pb.KeyType keyType = 2;
+    // required .legacy_pb.KeyType keyType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->keytype());
   }
@@ -410,7 +471,7 @@ size_t Certificate::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Certificate::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Certificate)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Certificate)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -424,48 +485,52 @@ size_t Certificate::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormatLite::BytesSize(
         this->publickey());
 
-    // required .pb.Certificate.Version version = 1;
+    // required .legacy_pb.Certificate.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
-    // required .pb.KeyType keyType = 2;
+    // required .legacy_pb.KeyType keyType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->keytype());
 
   } else {
     total_size += RequiredFieldsByteSizeFallback();
   }
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   SetCachedSize(cached_size);
   return total_size;
 }
 
 void Certificate::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Certificate)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Certificate)
   GOOGLE_DCHECK_NE(&from, this);
   const Certificate* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Certificate>(
+      ::google::protobuf::DynamicCastToGenerated<Certificate>(
           &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Certificate)
+  if (source == nullptr) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Certificate)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Certificate)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Certificate)
     MergeFrom(*source);
   }
 }
 
 void Certificate::MergeFrom(const Certificate& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Certificate)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Certificate)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 7u) {
+  if (cached_has_bits & 0x00000007u) {
     if (cached_has_bits & 0x00000001u) {
-      set_has_publickey();
+      _has_bits_[0] |= 0x00000001u;
       publickey_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.publickey_);
     }
     if (cached_has_bits & 0x00000002u) {
@@ -479,14 +544,14 @@ void Certificate::MergeFrom(const Certificate& from) {
 }
 
 void Certificate::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Certificate)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Certificate)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Certificate::CopyFrom(const Certificate& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Certificate)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Certificate)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -503,28 +568,29 @@ void Certificate::Swap(Certificate* other) {
 }
 void Certificate::InternalSwap(Certificate* other) {
   using std::swap;
+  _internal_metadata_.Swap(&other->_internal_metadata_);
+  swap(_has_bits_[0], other->_has_bits_[0]);
   publickey_.Swap(&other->publickey_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   swap(version_, other->version_);
   swap(keytype_, other->keytype_);
-  swap(_has_bits_[0], other->_has_bits_[0]);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Certificate::GetMetadata() const {
-  protobuf_certificate_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_certificate_2eproto::file_level_metadata[kIndexInFileMessages];
+  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_certificate_2eproto);
+  return ::file_level_metadata_certificate_2eproto[kIndexInFileMessages];
 }
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Certificate* Arena::CreateMaybeMessage< ::pb::Certificate >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Certificate >(arena);
+template<> PROTOBUF_NOINLINE ::legacy_pb::Certificate* Arena::CreateMaybeMessage< ::legacy_pb::Certificate >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Certificate >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
 
 // @@protoc_insertion_point(global_scope)
+#include <google/protobuf/port_undef.inc>

v1/cpp/certificate.pb.h

@@ -4,21 +4,22 @@
 #ifndef PROTOBUF_INCLUDED_certificate_2eproto
 #define PROTOBUF_INCLUDED_certificate_2eproto
 
+#include <limits>
 #include <string>
 
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#include <google/protobuf/port_def.inc>
+#if PROTOBUF_VERSION < 3007000
 #error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
+#error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
+#error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.
 #endif
 
+#include <google/protobuf/port_undef.inc>
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
@@ -32,31 +33,33 @@
 #include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
 // @@protoc_insertion_point(includes)
-#define PROTOBUF_INTERNAL_EXPORT_protobuf_certificate_2eproto 
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_certificate_2eproto
 
-namespace protobuf_certificate_2eproto {
 // Internal implementation detail -- do not use these members.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[1];
+struct TableStruct_certificate_2eproto {
+  static const ::google::protobuf::internal::ParseTableField entries[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::AuxillaryParseTableField aux[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::ParseTable schema[1]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
   static const ::google::protobuf::internal::FieldMetadata field_metadata[];
   static const ::google::protobuf::internal::SerializationTable serialization_table[];
   static const ::google::protobuf::uint32 offsets[];
 };
-void AddDescriptors();
-}  // namespace protobuf_certificate_2eproto
-namespace pb {
+void AddDescriptors_certificate_2eproto();
+namespace legacy_pb {
 class Certificate;
 class CertificateDefaultTypeInternal;
 extern CertificateDefaultTypeInternal _Certificate_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Certificate* Arena::CreateMaybeMessage<::pb::Certificate>(Arena*);
+template<> ::legacy_pb::Certificate* Arena::CreateMaybeMessage<::legacy_pb::Certificate>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Certificate_Version {
   Certificate_Version_UNKNOWN_VERSION = 0,
@@ -100,7 +103,8 @@ inline bool KeyType_Parse(
 }
 // ===================================================================
 
-class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Certificate) */ {
+class Certificate final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Certificate) */ {
  public:
   Certificate();
   virtual ~Certificate();
@@ -133,7 +137,9 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
     return _internal_metadata_.mutable_unknown_fields();
   }
 
-  static const ::google::protobuf::Descriptor* descriptor();
+  static const ::google::protobuf::Descriptor* descriptor() {
+    return default_instance().GetDescriptor();
+  }
   static const Certificate& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -152,7 +158,7 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
   // implements Message ----------------------------------------------
 
   inline Certificate* New() const final {
-    return CreateMaybeMessage<Certificate>(NULL);
+    return CreateMaybeMessage<Certificate>(nullptr);
   }
 
   Certificate* New(::google::protobuf::Arena* arena) const final {
@@ -162,16 +168,21 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Certificate& from);
   void MergeFrom(const Certificate& from);
-  void Clear() final;
+  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
+  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
+  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
+  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
+  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const final;
+      ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -181,10 +192,10 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
   void InternalSwap(Certificate* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return NULL;
+    return nullptr;
   }
   inline void* MaybeArenaPtr() const {
-    return NULL;
+    return nullptr;
   }
   public:
 
@@ -235,28 +246,23 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
   ::std::string* release_publickey();
   void set_allocated_publickey(::std::string* publickey);
 
-  // required .pb.Certificate.Version version = 1;
+  // required .legacy_pb.Certificate.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Certificate_Version version() const;
-  void set_version(::pb::Certificate_Version value);
+  ::legacy_pb::Certificate_Version version() const;
+  void set_version(::legacy_pb::Certificate_Version value);
 
-  // required .pb.KeyType keyType = 2;
+  // required .legacy_pb.KeyType keyType = 2;
   bool has_keytype() const;
   void clear_keytype();
   static const int kKeyTypeFieldNumber = 2;
-  ::pb::KeyType keytype() const;
-  void set_keytype(::pb::KeyType value);
+  ::legacy_pb::KeyType keytype() const;
+  void set_keytype(::legacy_pb::KeyType value);
 
-  // @@protoc_insertion_point(class_scope:pb.Certificate)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Certificate)
  private:
-  void set_has_version();
-  void clear_has_version();
-  void set_has_keytype();
-  void clear_has_keytype();
-  void set_has_publickey();
-  void clear_has_publickey();
+  class HasBitSetters;
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -267,7 +273,7 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
   ::google::protobuf::internal::ArenaStringPtr publickey_;
   int version_;
   int keytype_;
-  friend struct ::protobuf_certificate_2eproto::TableStruct;
+  friend struct ::TableStruct_certificate_2eproto;
 };
 // ===================================================================
 
@@ -280,120 +286,102 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
 #endif  // __GNUC__
 // Certificate
 
-// required .pb.Certificate.Version version = 1;
+// required .legacy_pb.Certificate.Version version = 1;
 inline bool Certificate::has_version() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Certificate::set_has_version() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void Certificate::clear_has_version() {
-  _has_bits_[0] &= ~0x00000002u;
-}
 inline void Certificate::clear_version() {
   version_ = 0;
-  clear_has_version();
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline ::pb::Certificate_Version Certificate::version() const {
-  // @@protoc_insertion_point(field_get:pb.Certificate.version)
-  return static_cast< ::pb::Certificate_Version >(version_);
+inline ::legacy_pb::Certificate_Version Certificate::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Certificate.version)
+  return static_cast< ::legacy_pb::Certificate_Version >(version_);
 }
-inline void Certificate::set_version(::pb::Certificate_Version value) {
-  assert(::pb::Certificate_Version_IsValid(value));
-  set_has_version();
+inline void Certificate::set_version(::legacy_pb::Certificate_Version value) {
+  assert(::legacy_pb::Certificate_Version_IsValid(value));
+  _has_bits_[0] |= 0x00000002u;
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Certificate.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Certificate.version)
 }
 
-// required .pb.KeyType keyType = 2;
+// required .legacy_pb.KeyType keyType = 2;
 inline bool Certificate::has_keytype() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Certificate::set_has_keytype() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void Certificate::clear_has_keytype() {
-  _has_bits_[0] &= ~0x00000004u;
-}
 inline void Certificate::clear_keytype() {
   keytype_ = 0;
-  clear_has_keytype();
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline ::pb::KeyType Certificate::keytype() const {
-  // @@protoc_insertion_point(field_get:pb.Certificate.keyType)
-  return static_cast< ::pb::KeyType >(keytype_);
+inline ::legacy_pb::KeyType Certificate::keytype() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Certificate.keyType)
+  return static_cast< ::legacy_pb::KeyType >(keytype_);
 }
-inline void Certificate::set_keytype(::pb::KeyType value) {
-  assert(::pb::KeyType_IsValid(value));
-  set_has_keytype();
+inline void Certificate::set_keytype(::legacy_pb::KeyType value) {
+  assert(::legacy_pb::KeyType_IsValid(value));
+  _has_bits_[0] |= 0x00000004u;
   keytype_ = value;
-  // @@protoc_insertion_point(field_set:pb.Certificate.keyType)
+  // @@protoc_insertion_point(field_set:legacy_pb.Certificate.keyType)
 }
 
 // required bytes publicKey = 4;
 inline bool Certificate::has_publickey() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Certificate::set_has_publickey() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Certificate::clear_has_publickey() {
-  _has_bits_[0] &= ~0x00000001u;
-}
 inline void Certificate::clear_publickey() {
   publickey_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_publickey();
+  _has_bits_[0] &= ~0x00000001u;
 }
 inline const ::std::string& Certificate::publickey() const {
-  // @@protoc_insertion_point(field_get:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_get:legacy_pb.Certificate.publicKey)
   return publickey_.GetNoArena();
 }
 inline void Certificate::set_publickey(const ::std::string& value) {
-  set_has_publickey();
+  _has_bits_[0] |= 0x00000001u;
   publickey_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_set:legacy_pb.Certificate.publicKey)
 }
 #if LANG_CXX11
 inline void Certificate::set_publickey(::std::string&& value) {
-  set_has_publickey();
+  _has_bits_[0] |= 0x00000001u;
   publickey_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Certificate.publicKey)
 }
 #endif
 inline void Certificate::set_publickey(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_publickey();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000001u;
   publickey_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Certificate.publicKey)
 }
 inline void Certificate::set_publickey(const void* value, size_t size) {
-  set_has_publickey();
+  _has_bits_[0] |= 0x00000001u;
   publickey_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Certificate.publicKey)
 }
 inline ::std::string* Certificate::mutable_publickey() {
-  set_has_publickey();
-  // @@protoc_insertion_point(field_mutable:pb.Certificate.publicKey)
+  _has_bits_[0] |= 0x00000001u;
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Certificate.publicKey)
   return publickey_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Certificate::release_publickey() {
-  // @@protoc_insertion_point(field_release:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_release:legacy_pb.Certificate.publicKey)
   if (!has_publickey()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_publickey();
+  _has_bits_[0] &= ~0x00000001u;
   return publickey_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Certificate::set_allocated_publickey(::std::string* publickey) {
-  if (publickey != NULL) {
-    set_has_publickey();
+  if (publickey != nullptr) {
+    _has_bits_[0] |= 0x00000001u;
   } else {
-    clear_has_publickey();
+    _has_bits_[0] &= ~0x00000001u;
   }
   publickey_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), publickey);
-  // @@protoc_insertion_point(field_set_allocated:pb.Certificate.publicKey)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Certificate.publicKey)
 }
 
 #ifdef __GNUC__
@@ -402,20 +390,20 @@ inline void Certificate::set_allocated_publickey(::std::string* publickey) {
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Certificate_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Certificate_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Certificate_Version>() {
-  return ::pb::Certificate_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Certificate_Version>() {
+  return ::legacy_pb::Certificate_Version_descriptor();
 }
-template <> struct is_proto_enum< ::pb::KeyType> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::KeyType> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::KeyType>() {
-  return ::pb::KeyType_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::KeyType>() {
+  return ::legacy_pb::KeyType_descriptor();
 }
 
 }  // namespace protobuf
@@ -423,4 +411,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::pb::KeyType>() {
 
 // @@protoc_insertion_point(global_scope)
 
+#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_certificate_2eproto

v1/cpp/fee.pb.cc

@@ -6,120 +6,101 @@
 #include <algorithm>
 
 #include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
 #include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/extension_set.h>
 #include <google/protobuf/wire_format_lite_inl.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
-// This is a temporary google only hack
-#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
-#include "third_party/protobuf/version.h"
-#endif
 // @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
 
-namespace pb {
+namespace legacy_pb {
 class FeeDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Fee>
-      _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Fee> _instance;
 } _Fee_default_instance_;
-}  // namespace pb
-namespace protobuf_fee_2eproto {
-static void InitDefaultsFee() {
+}  // namespace legacy_pb
+static void InitDefaultsFee_fee_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Fee_default_instance_;
-    new (ptr) ::pb::Fee();
+    void* ptr = &::legacy_pb::_Fee_default_instance_;
+    new (ptr) ::legacy_pb::Fee();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Fee::InitAsDefaultInstance();
+  ::legacy_pb::Fee::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<0> scc_info_Fee =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsFee}, {}};
+::google::protobuf::internal::SCCInfo<0> scc_info_Fee_fee_2eproto =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsFee_fee_2eproto}, {}};
 
-void InitDefaults() {
-  ::google::protobuf::internal::InitSCC(&scc_info_Fee.base);
+void InitDefaults_fee_2eproto() {
+  ::google::protobuf::internal::InitSCC(&scc_info_Fee_fee_2eproto.base);
 }
 
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
+::google::protobuf::Metadata file_level_metadata_fee_2eproto[1];
+const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_fee_2eproto[2];
+constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_fee_2eproto = nullptr;
 
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, _internal_metadata_),
+const ::google::protobuf::uint32 TableStruct_fee_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Fee, _has_bits_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Fee, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, currency_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, address_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Fee, amount_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Fee, version_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Fee, currency_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Fee, address_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Fee, amount_),
   1,
   2,
   0,
   3,
 };
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 9, sizeof(::pb::Fee)},
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  { 0, 9, sizeof(::legacy_pb::Fee)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Fee_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Fee_default_instance_),
 };
 
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  AssignDescriptors(
-      "fee.proto", schemas, file_default_instances, TableStruct::offsets,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
+::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_fee_2eproto = {
+  {}, AddDescriptors_fee_2eproto, "fee.proto", schemas,
+  file_default_instances, TableStruct_fee_2eproto::offsets,
+  file_level_metadata_fee_2eproto, 1, file_level_enum_descriptors_fee_2eproto, file_level_service_descriptors_fee_2eproto,
+};
 
-void protobuf_AssignDescriptorsOnce() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors);
-}
+const char descriptor_table_protodef_fee_2eproto[] =
+  "\n\tfee.proto\022\tlegacy_pb\"\343\001\n\003Fee\022\'\n\007versio"
+  "n\030\001 \002(\0162\026.legacy_pb.Fee.Version\022)\n\010curre"
+  "ncy\030\002 \002(\0162\027.legacy_pb.Fee.Currency\022\017\n\007ad"
+  "dress\030\003 \002(\014\022\016\n\006amount\030\004 \002(\002\"*\n\007Version\022\023"
+  "\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\";\n\010Curre"
+  "ncy\022\024\n\020UNKNOWN_CURRENCY\020\000\022\007\n\003LBC\020\001\022\007\n\003BT"
+  "C\020\002\022\007\n\003USD\020\003"
+  ;
+::google::protobuf::internal::DescriptorTable descriptor_table_fee_2eproto = {
+  false, InitDefaults_fee_2eproto, 
+  descriptor_table_protodef_fee_2eproto,
+  "fee.proto", &assign_descriptors_table_fee_2eproto, 252,
+};
 
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\tfee.proto\022\002pb\"\325\001\n\003Fee\022 \n\007version\030\001 \002(\016"
-      "2\017.pb.Fee.Version\022\"\n\010currency\030\002 \002(\0162\020.pb"
-      ".Fee.Currency\022\017\n\007address\030\003 \002(\014\022\016\n\006amount"
-      "\030\004 \002(\002\"*\n\007Version\022\023\n\017UNKNOWN_VERSION\020\000\022\n"
-      "\n\006_0_0_1\020\001\";\n\010Currency\022\024\n\020UNKNOWN_CURREN"
-      "CY\020\000\022\007\n\003LBC\020\001\022\007\n\003BTC\020\002\022\007\n\003USD\020\003"
+void AddDescriptors_fee_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[1] =
+  {
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 231);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "fee.proto", &protobuf_RegisterTypes);
+ ::google::protobuf::internal::AddDescriptors(&descriptor_table_fee_2eproto, deps, 0);
 }
 
-void AddDescriptors() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-}  // namespace protobuf_fee_2eproto
-namespace pb {
+// Force running AddDescriptors() at dynamic initialization time.
+static bool dynamic_init_dummy_fee_2eproto = []() { AddDescriptors_fee_2eproto(); return true; }();
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Fee_Version_descriptor() {
-  protobuf_fee_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_fee_2eproto::file_level_enum_descriptors[0];
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_fee_2eproto);
+  return file_level_enum_descriptors_fee_2eproto[0];
 }
 bool Fee_Version_IsValid(int value) {
   switch (value) {
@@ -139,8 +120,8 @@ const Fee_Version Fee::Version_MAX;
 const int Fee::Version_ARRAYSIZE;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 const ::google::protobuf::EnumDescriptor* Fee_Currency_descriptor() {
-  protobuf_fee_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_fee_2eproto::file_level_enum_descriptors[1];
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_fee_2eproto);
+  return file_level_enum_descriptors_fee_2eproto[1];
 }
 bool Fee_Currency_IsValid(int value) {
   switch (value) {
@@ -168,6 +149,22 @@ const int Fee::Currency_ARRAYSIZE;
 
 void Fee::InitAsDefaultInstance() {
 }
+class Fee::HasBitSetters {
+ public:
+  static void set_has_version(Fee* msg) {
+    msg->_has_bits_[0] |= 0x00000002u;
+  }
+  static void set_has_currency(Fee* msg) {
+    msg->_has_bits_[0] |= 0x00000004u;
+  }
+  static void set_has_address(Fee* msg) {
+    msg->_has_bits_[0] |= 0x00000001u;
+  }
+  static void set_has_amount(Fee* msg) {
+    msg->_has_bits_[0] |= 0x00000008u;
+  }
+};
+
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Fee::kVersionFieldNumber;
 const int Fee::kCurrencyFieldNumber;
@@ -176,15 +173,13 @@ const int Fee::kAmountFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Fee::Fee()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  ::google::protobuf::internal::InitSCC(
-      &protobuf_fee_2eproto::scc_info_Fee.base);
+  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Fee)
+  // @@protoc_insertion_point(constructor:legacy_pb.Fee)
 }
 Fee::Fee(const Fee& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
+      _internal_metadata_(nullptr),
       _has_bits_(from._has_bits_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -194,10 +189,12 @@ Fee::Fee(const Fee& from)
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&amount_) -
     reinterpret_cast<char*>(&version_)) + sizeof(amount_));
-  // @@protoc_insertion_point(copy_constructor:pb.Fee)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Fee)
 }
 
 void Fee::SharedCtor() {
+  ::google::protobuf::internal::InitSCC(
+      &scc_info_Fee_fee_2eproto.base);
   address_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&version_, 0, static_cast<size_t>(
       reinterpret_cast<char*>(&amount_) -
@@ -205,7 +202,7 @@ void Fee::SharedCtor() {
 }
 
 Fee::~Fee() {
-  // @@protoc_insertion_point(destructor:pb.Fee)
+  // @@protoc_insertion_point(destructor:legacy_pb.Fee)
   SharedDtor();
 }
 
@@ -216,19 +213,14 @@ void Fee::SharedDtor() {
 void Fee::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
-const ::google::protobuf::Descriptor* Fee::descriptor() {
-  ::protobuf_fee_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_fee_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
 const Fee& Fee::default_instance() {
-  ::google::protobuf::internal::InitSCC(&protobuf_fee_2eproto::scc_info_Fee.base);
+  ::google::protobuf::internal::InitSCC(&::scc_info_Fee_fee_2eproto.base);
   return *internal_default_instance();
 }
 
 
 void Fee::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Fee)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Fee)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
@@ -237,7 +229,7 @@ void Fee::Clear() {
   if (cached_has_bits & 0x00000001u) {
     address_.ClearNonDefaultToEmptyNoArena();
   }
-  if (cached_has_bits & 14u) {
+  if (cached_has_bits & 0x0000000eu) {
     ::memset(&version_, 0, static_cast<size_t>(
         reinterpret_cast<char*>(&amount_) -
         reinterpret_cast<char*>(&version_)) + sizeof(amount_));
@@ -246,29 +238,111 @@ void Fee::Clear() {
   _internal_metadata_.Clear();
 }
 
+#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+const char* Fee::_InternalParse(const char* begin, const char* end, void* object,
+                  ::google::protobuf::internal::ParseContext* ctx) {
+  auto msg = static_cast<Fee*>(object);
+  ::google::protobuf::int32 size; (void)size;
+  int depth; (void)depth;
+  ::google::protobuf::uint32 tag;
+  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
+  auto ptr = begin;
+  while (ptr < end) {
+    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
+    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+    switch (tag >> 3) {
+      // required .legacy_pb.Fee.Version version = 1;
+      case 1: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::Fee_Version_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(1, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_version(static_cast<::legacy_pb::Fee_Version>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required .legacy_pb.Fee.Currency currency = 2;
+      case 2: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::Fee_Currency_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(2, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_currency(static_cast<::legacy_pb::Fee_Currency>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required bytes address = 3;
+      case 3: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        object = msg->mutable_address();
+        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
+          parser_till_end = ::google::protobuf::internal::GreedyStringParser;
+          goto string_till_end;
+        }
+        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheck(ptr, size, ctx));
+        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
+        ptr += size;
+        break;
+      }
+      // required float amount = 4;
+      case 4: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 37) goto handle_unusual;
+        msg->set_amount(::google::protobuf::io::UnalignedLoad<float>(ptr));
+        ptr += sizeof(float);
+        break;
+      }
+      default: {
+      handle_unusual:
+        if ((tag & 7) == 4 || tag == 0) {
+          ctx->EndGroup(tag);
+          return ptr;
+        }
+        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
+          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
+        ptr = res.first;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
+        if (res.second) return ptr;
+      }
+    }  // switch
+  }  // while
+  return ptr;
+string_till_end:
+  static_cast<::std::string*>(object)->clear();
+  static_cast<::std::string*>(object)->reserve(size);
+  goto len_delim_till_end;
+len_delim_till_end:
+  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
+                               {parser_till_end, object}, size);
+}
+#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 bool Fee::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
+#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Fee)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Fee)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Fee.Version version = 1;
+      // required .legacy_pb.Fee.Version version = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
+        if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
+          int value = 0;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Fee_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Fee_Version >(value));
+          if (::legacy_pb::Fee_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Fee_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
-                1, static_cast< ::google::protobuf::uint64>(value));
+                1, static_cast<::google::protobuf::uint64>(value));
           }
         } else {
           goto handle_unusual;
@@ -276,19 +350,18 @@ bool Fee::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.Fee.Currency currency = 2;
+      // required .legacy_pb.Fee.Currency currency = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-          int value;
+        if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) {
+          int value = 0;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Fee_Currency_IsValid(value)) {
-            set_currency(static_cast< ::pb::Fee_Currency >(value));
+          if (::legacy_pb::Fee_Currency_IsValid(value)) {
+            set_currency(static_cast< ::legacy_pb::Fee_Currency >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
-                2, static_cast< ::google::protobuf::uint64>(value));
+                2, static_cast<::google::protobuf::uint64>(value));
           }
         } else {
           goto handle_unusual;
@@ -298,8 +371,7 @@ bool Fee::MergePartialFromCodedStream(
 
       // required bytes address = 3;
       case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
                 input, this->mutable_address()));
         } else {
@@ -310,9 +382,8 @@ bool Fee::MergePartialFromCodedStream(
 
       // required float amount = 4;
       case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(37u /* 37 & 0xFF */)) {
-          set_has_amount();
+        if (static_cast< ::google::protobuf::uint8>(tag) == (37 & 0xFF)) {
+          HasBitSetters::set_has_amount(this);
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    float, ::google::protobuf::internal::WireFormatLite::TYPE_FLOAT>(
                  input, &amount_)));
@@ -334,28 +405,29 @@ bool Fee::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Fee)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Fee)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Fee)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Fee)
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Fee::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Fee)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Fee)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Fee.Version version = 1;
+  // required .legacy_pb.Fee.Version version = 1;
   if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.Fee.Currency currency = 2;
+  // required .legacy_pb.Fee.Currency currency = 2;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->currency(), output);
@@ -376,24 +448,23 @@ void Fee::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Fee)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Fee)
 }
 
 ::google::protobuf::uint8* Fee::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Fee)
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Fee)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Fee.Version version = 1;
+  // required .legacy_pb.Fee.Version version = 1;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.Fee.Currency currency = 2;
+  // required .legacy_pb.Fee.Currency currency = 2;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->currency(), target);
@@ -415,12 +486,12 @@ void Fee::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Fee)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Fee)
   return target;
 }
 
 size_t Fee::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Fee)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Fee)
   size_t total_size = 0;
 
   if (has_address()) {
@@ -431,13 +502,13 @@ size_t Fee::RequiredFieldsByteSizeFallback() const {
   }
 
   if (has_version()) {
-    // required .pb.Fee.Version version = 1;
+    // required .legacy_pb.Fee.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
 
   if (has_currency()) {
-    // required .pb.Fee.Currency currency = 2;
+    // required .legacy_pb.Fee.Currency currency = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->currency());
   }
@@ -450,7 +521,7 @@ size_t Fee::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Fee::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Fee)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Fee)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -464,11 +535,11 @@ size_t Fee::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormatLite::BytesSize(
         this->address());
 
-    // required .pb.Fee.Version version = 1;
+    // required .legacy_pb.Fee.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
-    // required .pb.Fee.Currency currency = 2;
+    // required .legacy_pb.Fee.Currency currency = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->currency());
 
@@ -478,37 +549,41 @@ size_t Fee::ByteSizeLong() const {
   } else {
     total_size += RequiredFieldsByteSizeFallback();
   }
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   SetCachedSize(cached_size);
   return total_size;
 }
 
 void Fee::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Fee)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Fee)
   GOOGLE_DCHECK_NE(&from, this);
   const Fee* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Fee>(
+      ::google::protobuf::DynamicCastToGenerated<Fee>(
           &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Fee)
+  if (source == nullptr) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Fee)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Fee)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Fee)
     MergeFrom(*source);
   }
 }
 
 void Fee::MergeFrom(const Fee& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Fee)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Fee)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 15u) {
+  if (cached_has_bits & 0x0000000fu) {
     if (cached_has_bits & 0x00000001u) {
-      set_has_address();
+      _has_bits_[0] |= 0x00000001u;
       address_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.address_);
     }
     if (cached_has_bits & 0x00000002u) {
@@ -525,14 +600,14 @@ void Fee::MergeFrom(const Fee& from) {
 }
 
 void Fee::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Fee)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Fee)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Fee::CopyFrom(const Fee& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Fee)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Fee)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -549,29 +624,30 @@ void Fee::Swap(Fee* other) {
 }
 void Fee::InternalSwap(Fee* other) {
   using std::swap;
+  _internal_metadata_.Swap(&other->_internal_metadata_);
+  swap(_has_bits_[0], other->_has_bits_[0]);
   address_.Swap(&other->address_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   swap(version_, other->version_);
   swap(currency_, other->currency_);
   swap(amount_, other->amount_);
-  swap(_has_bits_[0], other->_has_bits_[0]);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Fee::GetMetadata() const {
-  protobuf_fee_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_fee_2eproto::file_level_metadata[kIndexInFileMessages];
+  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_fee_2eproto);
+  return ::file_level_metadata_fee_2eproto[kIndexInFileMessages];
 }
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Fee* Arena::CreateMaybeMessage< ::pb::Fee >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Fee >(arena);
+template<> PROTOBUF_NOINLINE ::legacy_pb::Fee* Arena::CreateMaybeMessage< ::legacy_pb::Fee >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Fee >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
 
 // @@protoc_insertion_point(global_scope)
+#include <google/protobuf/port_undef.inc>

v1/cpp/fee.pb.h

@@ -4,21 +4,22 @@
 #ifndef PROTOBUF_INCLUDED_fee_2eproto
 #define PROTOBUF_INCLUDED_fee_2eproto
 
+#include <limits>
 #include <string>
 
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#include <google/protobuf/port_def.inc>
+#if PROTOBUF_VERSION < 3007000
 #error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
+#error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
+#error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.
 #endif
 
+#include <google/protobuf/port_undef.inc>
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
@@ -32,31 +33,33 @@
 #include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
 // @@protoc_insertion_point(includes)
-#define PROTOBUF_INTERNAL_EXPORT_protobuf_fee_2eproto 
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_fee_2eproto
 
-namespace protobuf_fee_2eproto {
 // Internal implementation detail -- do not use these members.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[1];
+struct TableStruct_fee_2eproto {
+  static const ::google::protobuf::internal::ParseTableField entries[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::AuxillaryParseTableField aux[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::ParseTable schema[1]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
   static const ::google::protobuf::internal::FieldMetadata field_metadata[];
   static const ::google::protobuf::internal::SerializationTable serialization_table[];
   static const ::google::protobuf::uint32 offsets[];
 };
-void AddDescriptors();
-}  // namespace protobuf_fee_2eproto
-namespace pb {
+void AddDescriptors_fee_2eproto();
+namespace legacy_pb {
 class Fee;
 class FeeDefaultTypeInternal;
 extern FeeDefaultTypeInternal _Fee_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Fee* Arena::CreateMaybeMessage<::pb::Fee>(Arena*);
+template<> ::legacy_pb::Fee* Arena::CreateMaybeMessage<::legacy_pb::Fee>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Fee_Version {
   Fee_Version_UNKNOWN_VERSION = 0,
@@ -100,7 +103,8 @@ inline bool Fee_Currency_Parse(
 }
 // ===================================================================
 
-class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Fee) */ {
+class Fee final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Fee) */ {
  public:
   Fee();
   virtual ~Fee();
@@ -133,7 +137,9 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
     return _internal_metadata_.mutable_unknown_fields();
   }
 
-  static const ::google::protobuf::Descriptor* descriptor();
+  static const ::google::protobuf::Descriptor* descriptor() {
+    return default_instance().GetDescriptor();
+  }
   static const Fee& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -152,7 +158,7 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
   // implements Message ----------------------------------------------
 
   inline Fee* New() const final {
-    return CreateMaybeMessage<Fee>(NULL);
+    return CreateMaybeMessage<Fee>(nullptr);
   }
 
   Fee* New(::google::protobuf::Arena* arena) const final {
@@ -162,16 +168,21 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Fee& from);
   void MergeFrom(const Fee& from);
-  void Clear() final;
+  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
+  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
+  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
+  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
+  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const final;
+      ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -181,10 +192,10 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
   void InternalSwap(Fee* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return NULL;
+    return nullptr;
   }
   inline void* MaybeArenaPtr() const {
-    return NULL;
+    return nullptr;
   }
   public:
 
@@ -265,19 +276,19 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
   ::std::string* release_address();
   void set_allocated_address(::std::string* address);
 
-  // required .pb.Fee.Version version = 1;
+  // required .legacy_pb.Fee.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Fee_Version version() const;
-  void set_version(::pb::Fee_Version value);
+  ::legacy_pb::Fee_Version version() const;
+  void set_version(::legacy_pb::Fee_Version value);
 
-  // required .pb.Fee.Currency currency = 2;
+  // required .legacy_pb.Fee.Currency currency = 2;
   bool has_currency() const;
   void clear_currency();
   static const int kCurrencyFieldNumber = 2;
-  ::pb::Fee_Currency currency() const;
-  void set_currency(::pb::Fee_Currency value);
+  ::legacy_pb::Fee_Currency currency() const;
+  void set_currency(::legacy_pb::Fee_Currency value);
 
   // required float amount = 4;
   bool has_amount() const;
@@ -286,16 +297,9 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
   float amount() const;
   void set_amount(float value);
 
-  // @@protoc_insertion_point(class_scope:pb.Fee)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Fee)
  private:
-  void set_has_version();
-  void clear_has_version();
-  void set_has_currency();
-  void clear_has_currency();
-  void set_has_address();
-  void clear_has_address();
-  void set_has_amount();
-  void clear_has_amount();
+  class HasBitSetters;
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -307,7 +311,7 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
   int version_;
   int currency_;
   float amount_;
-  friend struct ::protobuf_fee_2eproto::TableStruct;
+  friend struct ::TableStruct_fee_2eproto;
 };
 // ===================================================================
 
@@ -320,144 +324,120 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
 #endif  // __GNUC__
 // Fee
 
-// required .pb.Fee.Version version = 1;
+// required .legacy_pb.Fee.Version version = 1;
 inline bool Fee::has_version() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Fee::set_has_version() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void Fee::clear_has_version() {
-  _has_bits_[0] &= ~0x00000002u;
-}
 inline void Fee::clear_version() {
   version_ = 0;
-  clear_has_version();
+  _has_bits_[0] &= ~0x00000002u;
 }
-inline ::pb::Fee_Version Fee::version() const {
-  // @@protoc_insertion_point(field_get:pb.Fee.version)
-  return static_cast< ::pb::Fee_Version >(version_);
+inline ::legacy_pb::Fee_Version Fee::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Fee.version)
+  return static_cast< ::legacy_pb::Fee_Version >(version_);
 }
-inline void Fee::set_version(::pb::Fee_Version value) {
-  assert(::pb::Fee_Version_IsValid(value));
-  set_has_version();
+inline void Fee::set_version(::legacy_pb::Fee_Version value) {
+  assert(::legacy_pb::Fee_Version_IsValid(value));
+  _has_bits_[0] |= 0x00000002u;
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Fee.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Fee.version)
 }
 
-// required .pb.Fee.Currency currency = 2;
+// required .legacy_pb.Fee.Currency currency = 2;
 inline bool Fee::has_currency() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Fee::set_has_currency() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void Fee::clear_has_currency() {
-  _has_bits_[0] &= ~0x00000004u;
-}
 inline void Fee::clear_currency() {
   currency_ = 0;
-  clear_has_currency();
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline ::pb::Fee_Currency Fee::currency() const {
-  // @@protoc_insertion_point(field_get:pb.Fee.currency)
-  return static_cast< ::pb::Fee_Currency >(currency_);
+inline ::legacy_pb::Fee_Currency Fee::currency() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Fee.currency)
+  return static_cast< ::legacy_pb::Fee_Currency >(currency_);
 }
-inline void Fee::set_currency(::pb::Fee_Currency value) {
-  assert(::pb::Fee_Currency_IsValid(value));
-  set_has_currency();
+inline void Fee::set_currency(::legacy_pb::Fee_Currency value) {
+  assert(::legacy_pb::Fee_Currency_IsValid(value));
+  _has_bits_[0] |= 0x00000004u;
   currency_ = value;
-  // @@protoc_insertion_point(field_set:pb.Fee.currency)
+  // @@protoc_insertion_point(field_set:legacy_pb.Fee.currency)
 }
 
 // required bytes address = 3;
 inline bool Fee::has_address() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Fee::set_has_address() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Fee::clear_has_address() {
-  _has_bits_[0] &= ~0x00000001u;
-}
 inline void Fee::clear_address() {
   address_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_address();
+  _has_bits_[0] &= ~0x00000001u;
 }
 inline const ::std::string& Fee::address() const {
-  // @@protoc_insertion_point(field_get:pb.Fee.address)
+  // @@protoc_insertion_point(field_get:legacy_pb.Fee.address)
   return address_.GetNoArena();
 }
 inline void Fee::set_address(const ::std::string& value) {
-  set_has_address();
+  _has_bits_[0] |= 0x00000001u;
   address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Fee.address)
+  // @@protoc_insertion_point(field_set:legacy_pb.Fee.address)
 }
 #if LANG_CXX11
 inline void Fee::set_address(::std::string&& value) {
-  set_has_address();
+  _has_bits_[0] |= 0x00000001u;
   address_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Fee.address)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Fee.address)
 }
 #endif
 inline void Fee::set_address(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_address();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000001u;
   address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Fee.address)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Fee.address)
 }
 inline void Fee::set_address(const void* value, size_t size) {
-  set_has_address();
+  _has_bits_[0] |= 0x00000001u;
   address_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Fee.address)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Fee.address)
 }
 inline ::std::string* Fee::mutable_address() {
-  set_has_address();
-  // @@protoc_insertion_point(field_mutable:pb.Fee.address)
+  _has_bits_[0] |= 0x00000001u;
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Fee.address)
   return address_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Fee::release_address() {
-  // @@protoc_insertion_point(field_release:pb.Fee.address)
+  // @@protoc_insertion_point(field_release:legacy_pb.Fee.address)
   if (!has_address()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_address();
+  _has_bits_[0] &= ~0x00000001u;
   return address_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Fee::set_allocated_address(::std::string* address) {
-  if (address != NULL) {
-    set_has_address();
+  if (address != nullptr) {
+    _has_bits_[0] |= 0x00000001u;
   } else {
-    clear_has_address();
+    _has_bits_[0] &= ~0x00000001u;
   }
   address_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), address);
-  // @@protoc_insertion_point(field_set_allocated:pb.Fee.address)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Fee.address)
 }
 
 // required float amount = 4;
 inline bool Fee::has_amount() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void Fee::set_has_amount() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void Fee::clear_has_amount() {
-  _has_bits_[0] &= ~0x00000008u;
-}
 inline void Fee::clear_amount() {
   amount_ = 0;
-  clear_has_amount();
+  _has_bits_[0] &= ~0x00000008u;
 }
 inline float Fee::amount() const {
-  // @@protoc_insertion_point(field_get:pb.Fee.amount)
+  // @@protoc_insertion_point(field_get:legacy_pb.Fee.amount)
   return amount_;
 }
 inline void Fee::set_amount(float value) {
-  set_has_amount();
+  _has_bits_[0] |= 0x00000008u;
   amount_ = value;
-  // @@protoc_insertion_point(field_set:pb.Fee.amount)
+  // @@protoc_insertion_point(field_set:legacy_pb.Fee.amount)
 }
 
 #ifdef __GNUC__
@@ -466,20 +446,20 @@ inline void Fee::set_amount(float value) {
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Fee_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Fee_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Fee_Version>() {
-  return ::pb::Fee_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Fee_Version>() {
+  return ::legacy_pb::Fee_Version_descriptor();
 }
-template <> struct is_proto_enum< ::pb::Fee_Currency> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Fee_Currency> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Fee_Currency>() {
-  return ::pb::Fee_Currency_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Fee_Currency>() {
+  return ::legacy_pb::Fee_Currency_descriptor();
 }
 
 }  // namespace protobuf
@@ -487,4 +467,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::pb::Fee_Currency>() {
 
 // @@protoc_insertion_point(global_scope)
 
+#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_fee_2eproto

v1/cpp/legacy_claim.pb.cc

@@ -0,0 +1,779 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: legacy_claim.proto
+
+#include "legacy_claim.pb.h"
+
+#include <algorithm>
+
+#include <google/protobuf/stubs/common.h>
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/extension_set.h>
+#include <google/protobuf/wire_format_lite_inl.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/generated_message_reflection.h>
+#include <google/protobuf/reflection_ops.h>
+#include <google/protobuf/wire_format.h>
+// @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
+
+extern PROTOBUF_INTERNAL_EXPORT_certificate_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Certificate_certificate_2eproto;
+extern PROTOBUF_INTERNAL_EXPORT_signature_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Signature_signature_2eproto;
+extern PROTOBUF_INTERNAL_EXPORT_stream_2eproto ::google::protobuf::internal::SCCInfo<2> scc_info_Stream_stream_2eproto;
+namespace legacy_pb {
+class ClaimDefaultTypeInternal {
+ public:
+  ::google::protobuf::internal::ExplicitlyConstructed<Claim> _instance;
+} _Claim_default_instance_;
+}  // namespace legacy_pb
+static void InitDefaultsClaim_legacy_5fclaim_2eproto() {
+  GOOGLE_PROTOBUF_VERIFY_VERSION;
+
+  {
+    void* ptr = &::legacy_pb::_Claim_default_instance_;
+    new (ptr) ::legacy_pb::Claim();
+    ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
+  }
+  ::legacy_pb::Claim::InitAsDefaultInstance();
+}
+
+::google::protobuf::internal::SCCInfo<3> scc_info_Claim_legacy_5fclaim_2eproto =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 3, InitDefaultsClaim_legacy_5fclaim_2eproto}, {
+      &scc_info_Stream_stream_2eproto.base,
+      &scc_info_Certificate_certificate_2eproto.base,
+      &scc_info_Signature_signature_2eproto.base,}};
+
+void InitDefaults_legacy_5fclaim_2eproto() {
+  ::google::protobuf::internal::InitSCC(&scc_info_Claim_legacy_5fclaim_2eproto.base);
+}
+
+::google::protobuf::Metadata file_level_metadata_legacy_5fclaim_2eproto[1];
+const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_legacy_5fclaim_2eproto[2];
+constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_legacy_5fclaim_2eproto = nullptr;
+
+const ::google::protobuf::uint32 TableStruct_legacy_5fclaim_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Claim, _has_bits_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Claim, _internal_metadata_),
+  ~0u,  // no _extensions_
+  ~0u,  // no _oneof_case_
+  ~0u,  // no _weak_field_map_
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Claim, version_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Claim, claimtype_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Claim, stream_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Claim, certificate_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Claim, publishersignature_),
+  3,
+  4,
+  0,
+  1,
+  2,
+};
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  { 0, 10, sizeof(::legacy_pb::Claim)},
+};
+
+static ::google::protobuf::Message const * const file_default_instances[] = {
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Claim_default_instance_),
+};
+
+::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_legacy_5fclaim_2eproto = {
+  {}, AddDescriptors_legacy_5fclaim_2eproto, "legacy_claim.proto", schemas,
+  file_default_instances, TableStruct_legacy_5fclaim_2eproto::offsets,
+  file_level_metadata_legacy_5fclaim_2eproto, 1, file_level_enum_descriptors_legacy_5fclaim_2eproto, file_level_service_descriptors_legacy_5fclaim_2eproto,
+};
+
+const char descriptor_table_protodef_legacy_5fclaim_2eproto[] =
+  "\n\022legacy_claim.proto\022\tlegacy_pb\032\014stream."
+  "proto\032\021certificate.proto\032\017signature.prot"
+  "o\"\331\002\n\005Claim\022)\n\007version\030\001 \002(\0162\030.legacy_pb"
+  ".Claim.Version\022-\n\tclaimType\030\002 \002(\0162\032.lega"
+  "cy_pb.Claim.ClaimType\022!\n\006stream\030\003 \001(\0132\021."
+  "legacy_pb.Stream\022+\n\013certificate\030\004 \001(\0132\026."
+  "legacy_pb.Certificate\0220\n\022publisherSignat"
+  "ure\030\005 \001(\0132\024.legacy_pb.Signature\"*\n\007Versi"
+  "on\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\"H\n\tC"
+  "laimType\022\026\n\022UNKNOWN_CLAIM_TYPE\020\000\022\016\n\nstre"
+  "amType\020\001\022\023\n\017certificateType\020\002"
+  ;
+::google::protobuf::internal::DescriptorTable descriptor_table_legacy_5fclaim_2eproto = {
+  false, InitDefaults_legacy_5fclaim_2eproto, 
+  descriptor_table_protodef_legacy_5fclaim_2eproto,
+  "legacy_claim.proto", &assign_descriptors_table_legacy_5fclaim_2eproto, 429,
+};
+
+void AddDescriptors_legacy_5fclaim_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[3] =
+  {
+    ::AddDescriptors_stream_2eproto,
+    ::AddDescriptors_certificate_2eproto,
+    ::AddDescriptors_signature_2eproto,
+  };
+ ::google::protobuf::internal::AddDescriptors(&descriptor_table_legacy_5fclaim_2eproto, deps, 3);
+}
+
+// Force running AddDescriptors() at dynamic initialization time.
+static bool dynamic_init_dummy_legacy_5fclaim_2eproto = []() { AddDescriptors_legacy_5fclaim_2eproto(); return true; }();
+namespace legacy_pb {
+const ::google::protobuf::EnumDescriptor* Claim_Version_descriptor() {
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_legacy_5fclaim_2eproto);
+  return file_level_enum_descriptors_legacy_5fclaim_2eproto[0];
+}
+bool Claim_Version_IsValid(int value) {
+  switch (value) {
+    case 0:
+    case 1:
+      return true;
+    default:
+      return false;
+  }
+}
+
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+const Claim_Version Claim::UNKNOWN_VERSION;
+const Claim_Version Claim::_0_0_1;
+const Claim_Version Claim::Version_MIN;
+const Claim_Version Claim::Version_MAX;
+const int Claim::Version_ARRAYSIZE;
+#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
+const ::google::protobuf::EnumDescriptor* Claim_ClaimType_descriptor() {
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_legacy_5fclaim_2eproto);
+  return file_level_enum_descriptors_legacy_5fclaim_2eproto[1];
+}
+bool Claim_ClaimType_IsValid(int value) {
+  switch (value) {
+    case 0:
+    case 1:
+    case 2:
+      return true;
+    default:
+      return false;
+  }
+}
+
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+const Claim_ClaimType Claim::UNKNOWN_CLAIM_TYPE;
+const Claim_ClaimType Claim::streamType;
+const Claim_ClaimType Claim::certificateType;
+const Claim_ClaimType Claim::ClaimType_MIN;
+const Claim_ClaimType Claim::ClaimType_MAX;
+const int Claim::ClaimType_ARRAYSIZE;
+#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
+
+// ===================================================================
+
+void Claim::InitAsDefaultInstance() {
+  ::legacy_pb::_Claim_default_instance_._instance.get_mutable()->stream_ = const_cast< ::legacy_pb::Stream*>(
+      ::legacy_pb::Stream::internal_default_instance());
+  ::legacy_pb::_Claim_default_instance_._instance.get_mutable()->certificate_ = const_cast< ::legacy_pb::Certificate*>(
+      ::legacy_pb::Certificate::internal_default_instance());
+  ::legacy_pb::_Claim_default_instance_._instance.get_mutable()->publishersignature_ = const_cast< ::legacy_pb::Signature*>(
+      ::legacy_pb::Signature::internal_default_instance());
+}
+class Claim::HasBitSetters {
+ public:
+  static void set_has_version(Claim* msg) {
+    msg->_has_bits_[0] |= 0x00000008u;
+  }
+  static void set_has_claimtype(Claim* msg) {
+    msg->_has_bits_[0] |= 0x00000010u;
+  }
+  static const ::legacy_pb::Stream& stream(const Claim* msg);
+  static void set_has_stream(Claim* msg) {
+    msg->_has_bits_[0] |= 0x00000001u;
+  }
+  static const ::legacy_pb::Certificate& certificate(const Claim* msg);
+  static void set_has_certificate(Claim* msg) {
+    msg->_has_bits_[0] |= 0x00000002u;
+  }
+  static const ::legacy_pb::Signature& publishersignature(const Claim* msg);
+  static void set_has_publishersignature(Claim* msg) {
+    msg->_has_bits_[0] |= 0x00000004u;
+  }
+};
+
+const ::legacy_pb::Stream&
+Claim::HasBitSetters::stream(const Claim* msg) {
+  return *msg->stream_;
+}
+const ::legacy_pb::Certificate&
+Claim::HasBitSetters::certificate(const Claim* msg) {
+  return *msg->certificate_;
+}
+const ::legacy_pb::Signature&
+Claim::HasBitSetters::publishersignature(const Claim* msg) {
+  return *msg->publishersignature_;
+}
+void Claim::clear_stream() {
+  if (stream_ != nullptr) stream_->Clear();
+  _has_bits_[0] &= ~0x00000001u;
+}
+void Claim::clear_certificate() {
+  if (certificate_ != nullptr) certificate_->Clear();
+  _has_bits_[0] &= ~0x00000002u;
+}
+void Claim::clear_publishersignature() {
+  if (publishersignature_ != nullptr) publishersignature_->Clear();
+  _has_bits_[0] &= ~0x00000004u;
+}
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+const int Claim::kVersionFieldNumber;
+const int Claim::kClaimTypeFieldNumber;
+const int Claim::kStreamFieldNumber;
+const int Claim::kCertificateFieldNumber;
+const int Claim::kPublisherSignatureFieldNumber;
+#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
+
+Claim::Claim()
+  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
+  SharedCtor();
+  // @@protoc_insertion_point(constructor:legacy_pb.Claim)
+}
+Claim::Claim(const Claim& from)
+  : ::google::protobuf::Message(),
+      _internal_metadata_(nullptr),
+      _has_bits_(from._has_bits_) {
+  _internal_metadata_.MergeFrom(from._internal_metadata_);
+  if (from.has_stream()) {
+    stream_ = new ::legacy_pb::Stream(*from.stream_);
+  } else {
+    stream_ = nullptr;
+  }
+  if (from.has_certificate()) {
+    certificate_ = new ::legacy_pb::Certificate(*from.certificate_);
+  } else {
+    certificate_ = nullptr;
+  }
+  if (from.has_publishersignature()) {
+    publishersignature_ = new ::legacy_pb::Signature(*from.publishersignature_);
+  } else {
+    publishersignature_ = nullptr;
+  }
+  ::memcpy(&version_, &from.version_,
+    static_cast<size_t>(reinterpret_cast<char*>(&claimtype_) -
+    reinterpret_cast<char*>(&version_)) + sizeof(claimtype_));
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Claim)
+}
+
+void Claim::SharedCtor() {
+  ::google::protobuf::internal::InitSCC(
+      &scc_info_Claim_legacy_5fclaim_2eproto.base);
+  ::memset(&stream_, 0, static_cast<size_t>(
+      reinterpret_cast<char*>(&claimtype_) -
+      reinterpret_cast<char*>(&stream_)) + sizeof(claimtype_));
+}
+
+Claim::~Claim() {
+  // @@protoc_insertion_point(destructor:legacy_pb.Claim)
+  SharedDtor();
+}
+
+void Claim::SharedDtor() {
+  if (this != internal_default_instance()) delete stream_;
+  if (this != internal_default_instance()) delete certificate_;
+  if (this != internal_default_instance()) delete publishersignature_;
+}
+
+void Claim::SetCachedSize(int size) const {
+  _cached_size_.Set(size);
+}
+const Claim& Claim::default_instance() {
+  ::google::protobuf::internal::InitSCC(&::scc_info_Claim_legacy_5fclaim_2eproto.base);
+  return *internal_default_instance();
+}
+
+
+void Claim::Clear() {
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Claim)
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
+  cached_has_bits = _has_bits_[0];
+  if (cached_has_bits & 0x00000007u) {
+    if (cached_has_bits & 0x00000001u) {
+      GOOGLE_DCHECK(stream_ != nullptr);
+      stream_->Clear();
+    }
+    if (cached_has_bits & 0x00000002u) {
+      GOOGLE_DCHECK(certificate_ != nullptr);
+      certificate_->Clear();
+    }
+    if (cached_has_bits & 0x00000004u) {
+      GOOGLE_DCHECK(publishersignature_ != nullptr);
+      publishersignature_->Clear();
+    }
+  }
+  if (cached_has_bits & 0x00000018u) {
+    ::memset(&version_, 0, static_cast<size_t>(
+        reinterpret_cast<char*>(&claimtype_) -
+        reinterpret_cast<char*>(&version_)) + sizeof(claimtype_));
+  }
+  _has_bits_.Clear();
+  _internal_metadata_.Clear();
+}
+
+#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+const char* Claim::_InternalParse(const char* begin, const char* end, void* object,
+                  ::google::protobuf::internal::ParseContext* ctx) {
+  auto msg = static_cast<Claim*>(object);
+  ::google::protobuf::int32 size; (void)size;
+  int depth; (void)depth;
+  ::google::protobuf::uint32 tag;
+  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
+  auto ptr = begin;
+  while (ptr < end) {
+    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
+    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+    switch (tag >> 3) {
+      // required .legacy_pb.Claim.Version version = 1;
+      case 1: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::Claim_Version_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(1, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_version(static_cast<::legacy_pb::Claim_Version>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required .legacy_pb.Claim.ClaimType claimType = 2;
+      case 2: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::Claim_ClaimType_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(2, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_claimtype(static_cast<::legacy_pb::Claim_ClaimType>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // optional .legacy_pb.Stream stream = 3;
+      case 3: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        parser_till_end = ::legacy_pb::Stream::_InternalParse;
+        object = msg->mutable_stream();
+        if (size > end - ptr) goto len_delim_till_end;
+        ptr += size;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
+            {parser_till_end, object}, ptr - size, ptr));
+        break;
+      }
+      // optional .legacy_pb.Certificate certificate = 4;
+      case 4: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        parser_till_end = ::legacy_pb::Certificate::_InternalParse;
+        object = msg->mutable_certificate();
+        if (size > end - ptr) goto len_delim_till_end;
+        ptr += size;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
+            {parser_till_end, object}, ptr - size, ptr));
+        break;
+      }
+      // optional .legacy_pb.Signature publisherSignature = 5;
+      case 5: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 42) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        parser_till_end = ::legacy_pb::Signature::_InternalParse;
+        object = msg->mutable_publishersignature();
+        if (size > end - ptr) goto len_delim_till_end;
+        ptr += size;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
+            {parser_till_end, object}, ptr - size, ptr));
+        break;
+      }
+      default: {
+      handle_unusual:
+        if ((tag & 7) == 4 || tag == 0) {
+          ctx->EndGroup(tag);
+          return ptr;
+        }
+        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
+          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
+        ptr = res.first;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
+        if (res.second) return ptr;
+      }
+    }  // switch
+  }  // while
+  return ptr;
+len_delim_till_end:
+  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
+                               {parser_till_end, object}, size);
+}
+#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+bool Claim::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
+  ::google::protobuf::uint32 tag;
+  // @@protoc_insertion_point(parse_start:legacy_pb.Claim)
+  for (;;) {
+    ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
+    tag = p.first;
+    if (!p.second) goto handle_unusual;
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .legacy_pb.Claim.Version version = 1;
+      case 1: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
+          int value = 0;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::legacy_pb::Claim_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Claim_Version >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(
+                1, static_cast<::google::protobuf::uint64>(value));
+          }
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // required .legacy_pb.Claim.ClaimType claimType = 2;
+      case 2: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) {
+          int value = 0;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::legacy_pb::Claim_ClaimType_IsValid(value)) {
+            set_claimtype(static_cast< ::legacy_pb::Claim_ClaimType >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(
+                2, static_cast<::google::protobuf::uint64>(value));
+          }
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // optional .legacy_pb.Stream stream = 3;
+      case 3: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
+               input, mutable_stream()));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // optional .legacy_pb.Certificate certificate = 4;
+      case 4: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
+               input, mutable_certificate()));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // optional .legacy_pb.Signature publisherSignature = 5;
+      case 5: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
+               input, mutable_publishersignature()));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      default: {
+      handle_unusual:
+        if (tag == 0) {
+          goto success;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, _internal_metadata_.mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+success:
+  // @@protoc_insertion_point(parse_success:legacy_pb.Claim)
+  return true;
+failure:
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Claim)
+  return false;
+#undef DO_
+}
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+
+void Claim::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Claim)
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  (void) cached_has_bits;
+
+  cached_has_bits = _has_bits_[0];
+  // required .legacy_pb.Claim.Version version = 1;
+  if (cached_has_bits & 0x00000008u) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      1, this->version(), output);
+  }
+
+  // required .legacy_pb.Claim.ClaimType claimType = 2;
+  if (cached_has_bits & 0x00000010u) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      2, this->claimtype(), output);
+  }
+
+  // optional .legacy_pb.Stream stream = 3;
+  if (cached_has_bits & 0x00000001u) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, HasBitSetters::stream(this), output);
+  }
+
+  // optional .legacy_pb.Certificate certificate = 4;
+  if (cached_has_bits & 0x00000002u) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      4, HasBitSetters::certificate(this), output);
+  }
+
+  // optional .legacy_pb.Signature publisherSignature = 5;
+  if (cached_has_bits & 0x00000004u) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      5, HasBitSetters::publishersignature(this), output);
+  }
+
+  if (_internal_metadata_.have_unknown_fields()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        _internal_metadata_.unknown_fields(), output);
+  }
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Claim)
+}
+
+::google::protobuf::uint8* Claim::InternalSerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Claim)
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  (void) cached_has_bits;
+
+  cached_has_bits = _has_bits_[0];
+  // required .legacy_pb.Claim.Version version = 1;
+  if (cached_has_bits & 0x00000008u) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      1, this->version(), target);
+  }
+
+  // required .legacy_pb.Claim.ClaimType claimType = 2;
+  if (cached_has_bits & 0x00000010u) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      2, this->claimtype(), target);
+  }
+
+  // optional .legacy_pb.Stream stream = 3;
+  if (cached_has_bits & 0x00000001u) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      InternalWriteMessageToArray(
+        3, HasBitSetters::stream(this), target);
+  }
+
+  // optional .legacy_pb.Certificate certificate = 4;
+  if (cached_has_bits & 0x00000002u) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      InternalWriteMessageToArray(
+        4, HasBitSetters::certificate(this), target);
+  }
+
+  // optional .legacy_pb.Signature publisherSignature = 5;
+  if (cached_has_bits & 0x00000004u) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      InternalWriteMessageToArray(
+        5, HasBitSetters::publishersignature(this), target);
+  }
+
+  if (_internal_metadata_.have_unknown_fields()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        _internal_metadata_.unknown_fields(), target);
+  }
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Claim)
+  return target;
+}
+
+size_t Claim::RequiredFieldsByteSizeFallback() const {
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Claim)
+  size_t total_size = 0;
+
+  if (has_version()) {
+    // required .legacy_pb.Claim.Version version = 1;
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
+  }
+
+  if (has_claimtype()) {
+    // required .legacy_pb.Claim.ClaimType claimType = 2;
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::EnumSize(this->claimtype());
+  }
+
+  return total_size;
+}
+size_t Claim::ByteSizeLong() const {
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Claim)
+  size_t total_size = 0;
+
+  if (_internal_metadata_.have_unknown_fields()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        _internal_metadata_.unknown_fields());
+  }
+  if (((_has_bits_[0] & 0x00000018) ^ 0x00000018) == 0) {  // All required fields are present.
+    // required .legacy_pb.Claim.Version version = 1;
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
+
+    // required .legacy_pb.Claim.ClaimType claimType = 2;
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::EnumSize(this->claimtype());
+
+  } else {
+    total_size += RequiredFieldsByteSizeFallback();
+  }
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
+  cached_has_bits = _has_bits_[0];
+  if (cached_has_bits & 0x00000007u) {
+    // optional .legacy_pb.Stream stream = 3;
+    if (cached_has_bits & 0x00000001u) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSize(
+          *stream_);
+    }
+
+    // optional .legacy_pb.Certificate certificate = 4;
+    if (cached_has_bits & 0x00000002u) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSize(
+          *certificate_);
+    }
+
+    // optional .legacy_pb.Signature publisherSignature = 5;
+    if (cached_has_bits & 0x00000004u) {
+      total_size += 1 +
+        ::google::protobuf::internal::WireFormatLite::MessageSize(
+          *publishersignature_);
+    }
+
+  }
+  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
+  SetCachedSize(cached_size);
+  return total_size;
+}
+
+void Claim::MergeFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Claim)
+  GOOGLE_DCHECK_NE(&from, this);
+  const Claim* source =
+      ::google::protobuf::DynamicCastToGenerated<Claim>(
+          &from);
+  if (source == nullptr) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Claim)
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Claim)
+    MergeFrom(*source);
+  }
+}
+
+void Claim::MergeFrom(const Claim& from) {
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Claim)
+  GOOGLE_DCHECK_NE(&from, this);
+  _internal_metadata_.MergeFrom(from._internal_metadata_);
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  (void) cached_has_bits;
+
+  cached_has_bits = from._has_bits_[0];
+  if (cached_has_bits & 0x0000001fu) {
+    if (cached_has_bits & 0x00000001u) {
+      mutable_stream()->::legacy_pb::Stream::MergeFrom(from.stream());
+    }
+    if (cached_has_bits & 0x00000002u) {
+      mutable_certificate()->::legacy_pb::Certificate::MergeFrom(from.certificate());
+    }
+    if (cached_has_bits & 0x00000004u) {
+      mutable_publishersignature()->::legacy_pb::Signature::MergeFrom(from.publishersignature());
+    }
+    if (cached_has_bits & 0x00000008u) {
+      version_ = from.version_;
+    }
+    if (cached_has_bits & 0x00000010u) {
+      claimtype_ = from.claimtype_;
+    }
+    _has_bits_[0] |= cached_has_bits;
+  }
+}
+
+void Claim::CopyFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Claim)
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void Claim::CopyFrom(const Claim& from) {
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Claim)
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool Claim::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000018) != 0x00000018) return false;
+  if (has_stream()) {
+    if (!this->stream_->IsInitialized()) return false;
+  }
+  if (has_certificate()) {
+    if (!this->certificate_->IsInitialized()) return false;
+  }
+  if (has_publishersignature()) {
+    if (!this->publishersignature_->IsInitialized()) return false;
+  }
+  return true;
+}
+
+void Claim::Swap(Claim* other) {
+  if (other == this) return;
+  InternalSwap(other);
+}
+void Claim::InternalSwap(Claim* other) {
+  using std::swap;
+  _internal_metadata_.Swap(&other->_internal_metadata_);
+  swap(_has_bits_[0], other->_has_bits_[0]);
+  swap(stream_, other->stream_);
+  swap(certificate_, other->certificate_);
+  swap(publishersignature_, other->publishersignature_);
+  swap(version_, other->version_);
+  swap(claimtype_, other->claimtype_);
+}
+
+::google::protobuf::Metadata Claim::GetMetadata() const {
+  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_legacy_5fclaim_2eproto);
+  return ::file_level_metadata_legacy_5fclaim_2eproto[kIndexInFileMessages];
+}
+
+
+// @@protoc_insertion_point(namespace_scope)
+}  // namespace legacy_pb
+namespace google {
+namespace protobuf {
+template<> PROTOBUF_NOINLINE ::legacy_pb::Claim* Arena::CreateMaybeMessage< ::legacy_pb::Claim >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Claim >(arena);
+}
+}  // namespace protobuf
+}  // namespace google
+
+// @@protoc_insertion_point(global_scope)
+#include <google/protobuf/port_undef.inc>

v1/cpp/legacy_claim.pb.h

@@ -1,24 +1,25 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: claim.proto
+// source: legacy_claim.proto
 
-#ifndef PROTOBUF_INCLUDED_claim_2eproto
-#define PROTOBUF_INCLUDED_claim_2eproto
+#ifndef PROTOBUF_INCLUDED_legacy_5fclaim_2eproto
+#define PROTOBUF_INCLUDED_legacy_5fclaim_2eproto
 
+#include <limits>
 #include <string>
 
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#include <google/protobuf/port_def.inc>
+#if PROTOBUF_VERSION < 3007000
 #error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
+#error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
+#error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.
 #endif
 
+#include <google/protobuf/port_undef.inc>
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
@@ -35,31 +36,33 @@
 #include "certificate.pb.h"
 #include "signature.pb.h"
 // @@protoc_insertion_point(includes)
-#define PROTOBUF_INTERNAL_EXPORT_protobuf_claim_2eproto 
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_legacy_5fclaim_2eproto
 
-namespace protobuf_claim_2eproto {
 // Internal implementation detail -- do not use these members.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[1];
+struct TableStruct_legacy_5fclaim_2eproto {
+  static const ::google::protobuf::internal::ParseTableField entries[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::AuxillaryParseTableField aux[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::ParseTable schema[1]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
   static const ::google::protobuf::internal::FieldMetadata field_metadata[];
   static const ::google::protobuf::internal::SerializationTable serialization_table[];
   static const ::google::protobuf::uint32 offsets[];
 };
-void AddDescriptors();
-}  // namespace protobuf_claim_2eproto
-namespace pb {
+void AddDescriptors_legacy_5fclaim_2eproto();
+namespace legacy_pb {
 class Claim;
 class ClaimDefaultTypeInternal;
 extern ClaimDefaultTypeInternal _Claim_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Claim* Arena::CreateMaybeMessage<::pb::Claim>(Arena*);
+template<> ::legacy_pb::Claim* Arena::CreateMaybeMessage<::legacy_pb::Claim>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Claim_Version {
   Claim_Version_UNKNOWN_VERSION = 0,
@@ -102,7 +105,8 @@ inline bool Claim_ClaimType_Parse(
 }
 // ===================================================================
 
-class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Claim) */ {
+class Claim final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Claim) */ {
  public:
   Claim();
   virtual ~Claim();
@@ -135,7 +139,9 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
     return _internal_metadata_.mutable_unknown_fields();
   }
 
-  static const ::google::protobuf::Descriptor* descriptor();
+  static const ::google::protobuf::Descriptor* descriptor() {
+    return default_instance().GetDescriptor();
+  }
   static const Claim& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -154,7 +160,7 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
   // implements Message ----------------------------------------------
 
   inline Claim* New() const final {
-    return CreateMaybeMessage<Claim>(NULL);
+    return CreateMaybeMessage<Claim>(nullptr);
   }
 
   Claim* New(::google::protobuf::Arena* arena) const final {
@@ -164,16 +170,21 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Claim& from);
   void MergeFrom(const Claim& from);
-  void Clear() final;
+  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
+  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
+  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
+  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
+  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const final;
+      ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -183,10 +194,10 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
   void InternalSwap(Claim* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return NULL;
+    return nullptr;
   }
   inline void* MaybeArenaPtr() const {
-    return NULL;
+    return nullptr;
   }
   public:
 
@@ -250,68 +261,50 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
 
   // accessors -------------------------------------------------------
 
-  // optional .pb.Stream stream = 3;
+  // optional .legacy_pb.Stream stream = 3;
   bool has_stream() const;
   void clear_stream();
   static const int kStreamFieldNumber = 3;
-  private:
-  const ::pb::Stream& _internal_stream() const;
-  public:
-  const ::pb::Stream& stream() const;
-  ::pb::Stream* release_stream();
-  ::pb::Stream* mutable_stream();
-  void set_allocated_stream(::pb::Stream* stream);
+  const ::legacy_pb::Stream& stream() const;
+  ::legacy_pb::Stream* release_stream();
+  ::legacy_pb::Stream* mutable_stream();
+  void set_allocated_stream(::legacy_pb::Stream* stream);
 
-  // optional .pb.Certificate certificate = 4;
+  // optional .legacy_pb.Certificate certificate = 4;
   bool has_certificate() const;
   void clear_certificate();
   static const int kCertificateFieldNumber = 4;
-  private:
-  const ::pb::Certificate& _internal_certificate() const;
-  public:
-  const ::pb::Certificate& certificate() const;
-  ::pb::Certificate* release_certificate();
-  ::pb::Certificate* mutable_certificate();
-  void set_allocated_certificate(::pb::Certificate* certificate);
+  const ::legacy_pb::Certificate& certificate() const;
+  ::legacy_pb::Certificate* release_certificate();
+  ::legacy_pb::Certificate* mutable_certificate();
+  void set_allocated_certificate(::legacy_pb::Certificate* certificate);
 
-  // optional .pb.Signature publisherSignature = 5;
+  // optional .legacy_pb.Signature publisherSignature = 5;
   bool has_publishersignature() const;
   void clear_publishersignature();
   static const int kPublisherSignatureFieldNumber = 5;
-  private:
-  const ::pb::Signature& _internal_publishersignature() const;
-  public:
-  const ::pb::Signature& publishersignature() const;
-  ::pb::Signature* release_publishersignature();
-  ::pb::Signature* mutable_publishersignature();
-  void set_allocated_publishersignature(::pb::Signature* publishersignature);
+  const ::legacy_pb::Signature& publishersignature() const;
+  ::legacy_pb::Signature* release_publishersignature();
+  ::legacy_pb::Signature* mutable_publishersignature();
+  void set_allocated_publishersignature(::legacy_pb::Signature* publishersignature);
 
-  // required .pb.Claim.Version version = 1;
+  // required .legacy_pb.Claim.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Claim_Version version() const;
-  void set_version(::pb::Claim_Version value);
+  ::legacy_pb::Claim_Version version() const;
+  void set_version(::legacy_pb::Claim_Version value);
 
-  // required .pb.Claim.ClaimType claimType = 2;
+  // required .legacy_pb.Claim.ClaimType claimType = 2;
   bool has_claimtype() const;
   void clear_claimtype();
   static const int kClaimTypeFieldNumber = 2;
-  ::pb::Claim_ClaimType claimtype() const;
-  void set_claimtype(::pb::Claim_ClaimType value);
+  ::legacy_pb::Claim_ClaimType claimtype() const;
+  void set_claimtype(::legacy_pb::Claim_ClaimType value);
 
-  // @@protoc_insertion_point(class_scope:pb.Claim)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Claim)
  private:
-  void set_has_version();
-  void clear_has_version();
-  void set_has_claimtype();
-  void clear_has_claimtype();
-  void set_has_stream();
-  void clear_has_stream();
-  void set_has_certificate();
-  void clear_has_certificate();
-  void set_has_publishersignature();
-  void clear_has_publishersignature();
+  class HasBitSetters;
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -319,12 +312,12 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::internal::HasBits<1> _has_bits_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  ::pb::Stream* stream_;
-  ::pb::Certificate* certificate_;
-  ::pb::Signature* publishersignature_;
+  ::legacy_pb::Stream* stream_;
+  ::legacy_pb::Certificate* certificate_;
+  ::legacy_pb::Signature* publishersignature_;
   int version_;
   int claimtype_;
-  friend struct ::protobuf_claim_2eproto::TableStruct;
+  friend struct ::TableStruct_legacy_5fclaim_2eproto;
 };
 // ===================================================================
 
@@ -337,216 +330,177 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
 #endif  // __GNUC__
 // Claim
 
-// required .pb.Claim.Version version = 1;
+// required .legacy_pb.Claim.Version version = 1;
 inline bool Claim::has_version() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void Claim::set_has_version() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void Claim::clear_has_version() {
-  _has_bits_[0] &= ~0x00000008u;
-}
 inline void Claim::clear_version() {
   version_ = 0;
-  clear_has_version();
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline ::pb::Claim_Version Claim::version() const {
-  // @@protoc_insertion_point(field_get:pb.Claim.version)
-  return static_cast< ::pb::Claim_Version >(version_);
+inline ::legacy_pb::Claim_Version Claim::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Claim.version)
+  return static_cast< ::legacy_pb::Claim_Version >(version_);
 }
-inline void Claim::set_version(::pb::Claim_Version value) {
-  assert(::pb::Claim_Version_IsValid(value));
-  set_has_version();
+inline void Claim::set_version(::legacy_pb::Claim_Version value) {
+  assert(::legacy_pb::Claim_Version_IsValid(value));
+  _has_bits_[0] |= 0x00000008u;
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Claim.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Claim.version)
 }
 
-// required .pb.Claim.ClaimType claimType = 2;
+// required .legacy_pb.Claim.ClaimType claimType = 2;
 inline bool Claim::has_claimtype() const {
   return (_has_bits_[0] & 0x00000010u) != 0;
 }
-inline void Claim::set_has_claimtype() {
-  _has_bits_[0] |= 0x00000010u;
-}
-inline void Claim::clear_has_claimtype() {
-  _has_bits_[0] &= ~0x00000010u;
-}
 inline void Claim::clear_claimtype() {
   claimtype_ = 0;
-  clear_has_claimtype();
+  _has_bits_[0] &= ~0x00000010u;
 }
-inline ::pb::Claim_ClaimType Claim::claimtype() const {
-  // @@protoc_insertion_point(field_get:pb.Claim.claimType)
-  return static_cast< ::pb::Claim_ClaimType >(claimtype_);
+inline ::legacy_pb::Claim_ClaimType Claim::claimtype() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Claim.claimType)
+  return static_cast< ::legacy_pb::Claim_ClaimType >(claimtype_);
 }
-inline void Claim::set_claimtype(::pb::Claim_ClaimType value) {
-  assert(::pb::Claim_ClaimType_IsValid(value));
-  set_has_claimtype();
+inline void Claim::set_claimtype(::legacy_pb::Claim_ClaimType value) {
+  assert(::legacy_pb::Claim_ClaimType_IsValid(value));
+  _has_bits_[0] |= 0x00000010u;
   claimtype_ = value;
-  // @@protoc_insertion_point(field_set:pb.Claim.claimType)
+  // @@protoc_insertion_point(field_set:legacy_pb.Claim.claimType)
 }
 
-// optional .pb.Stream stream = 3;
+// optional .legacy_pb.Stream stream = 3;
 inline bool Claim::has_stream() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Claim::set_has_stream() {
-  _has_bits_[0] |= 0x00000001u;
+inline const ::legacy_pb::Stream& Claim::stream() const {
+  const ::legacy_pb::Stream* p = stream_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Claim.stream)
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Stream*>(
+      &::legacy_pb::_Stream_default_instance_);
 }
-inline void Claim::clear_has_stream() {
+inline ::legacy_pb::Stream* Claim::release_stream() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Claim.stream)
   _has_bits_[0] &= ~0x00000001u;
-}
-inline const ::pb::Stream& Claim::_internal_stream() const {
-  return *stream_;
-}
-inline const ::pb::Stream& Claim::stream() const {
-  const ::pb::Stream* p = stream_;
-  // @@protoc_insertion_point(field_get:pb.Claim.stream)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Stream*>(
-      &::pb::_Stream_default_instance_);
-}
-inline ::pb::Stream* Claim::release_stream() {
-  // @@protoc_insertion_point(field_release:pb.Claim.stream)
-  clear_has_stream();
-  ::pb::Stream* temp = stream_;
-  stream_ = NULL;
+  ::legacy_pb::Stream* temp = stream_;
+  stream_ = nullptr;
   return temp;
 }
-inline ::pb::Stream* Claim::mutable_stream() {
-  set_has_stream();
-  if (stream_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Stream>(GetArenaNoVirtual());
+inline ::legacy_pb::Stream* Claim::mutable_stream() {
+  _has_bits_[0] |= 0x00000001u;
+  if (stream_ == nullptr) {
+    auto* p = CreateMaybeMessage<::legacy_pb::Stream>(GetArenaNoVirtual());
     stream_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Claim.stream)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Claim.stream)
   return stream_;
 }
-inline void Claim::set_allocated_stream(::pb::Stream* stream) {
+inline void Claim::set_allocated_stream(::legacy_pb::Stream* stream) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
+  if (message_arena == nullptr) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(stream_);
   }
   if (stream) {
-    ::google::protobuf::Arena* submessage_arena = NULL;
+    ::google::protobuf::Arena* submessage_arena = nullptr;
     if (message_arena != submessage_arena) {
       stream = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, stream, submessage_arena);
     }
-    set_has_stream();
+    _has_bits_[0] |= 0x00000001u;
   } else {
-    clear_has_stream();
+    _has_bits_[0] &= ~0x00000001u;
   }
   stream_ = stream;
-  // @@protoc_insertion_point(field_set_allocated:pb.Claim.stream)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Claim.stream)
 }
 
-// optional .pb.Certificate certificate = 4;
+// optional .legacy_pb.Certificate certificate = 4;
 inline bool Claim::has_certificate() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Claim::set_has_certificate() {
-  _has_bits_[0] |= 0x00000002u;
+inline const ::legacy_pb::Certificate& Claim::certificate() const {
+  const ::legacy_pb::Certificate* p = certificate_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Claim.certificate)
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Certificate*>(
+      &::legacy_pb::_Certificate_default_instance_);
 }
-inline void Claim::clear_has_certificate() {
+inline ::legacy_pb::Certificate* Claim::release_certificate() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Claim.certificate)
   _has_bits_[0] &= ~0x00000002u;
-}
-inline const ::pb::Certificate& Claim::_internal_certificate() const {
-  return *certificate_;
-}
-inline const ::pb::Certificate& Claim::certificate() const {
-  const ::pb::Certificate* p = certificate_;
-  // @@protoc_insertion_point(field_get:pb.Claim.certificate)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Certificate*>(
-      &::pb::_Certificate_default_instance_);
-}
-inline ::pb::Certificate* Claim::release_certificate() {
-  // @@protoc_insertion_point(field_release:pb.Claim.certificate)
-  clear_has_certificate();
-  ::pb::Certificate* temp = certificate_;
-  certificate_ = NULL;
+  ::legacy_pb::Certificate* temp = certificate_;
+  certificate_ = nullptr;
   return temp;
 }
-inline ::pb::Certificate* Claim::mutable_certificate() {
-  set_has_certificate();
-  if (certificate_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Certificate>(GetArenaNoVirtual());
+inline ::legacy_pb::Certificate* Claim::mutable_certificate() {
+  _has_bits_[0] |= 0x00000002u;
+  if (certificate_ == nullptr) {
+    auto* p = CreateMaybeMessage<::legacy_pb::Certificate>(GetArenaNoVirtual());
     certificate_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Claim.certificate)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Claim.certificate)
   return certificate_;
 }
-inline void Claim::set_allocated_certificate(::pb::Certificate* certificate) {
+inline void Claim::set_allocated_certificate(::legacy_pb::Certificate* certificate) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
+  if (message_arena == nullptr) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(certificate_);
   }
   if (certificate) {
-    ::google::protobuf::Arena* submessage_arena = NULL;
+    ::google::protobuf::Arena* submessage_arena = nullptr;
     if (message_arena != submessage_arena) {
       certificate = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, certificate, submessage_arena);
     }
-    set_has_certificate();
+    _has_bits_[0] |= 0x00000002u;
   } else {
-    clear_has_certificate();
+    _has_bits_[0] &= ~0x00000002u;
   }
   certificate_ = certificate;
-  // @@protoc_insertion_point(field_set_allocated:pb.Claim.certificate)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Claim.certificate)
 }
 
-// optional .pb.Signature publisherSignature = 5;
+// optional .legacy_pb.Signature publisherSignature = 5;
 inline bool Claim::has_publishersignature() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Claim::set_has_publishersignature() {
-  _has_bits_[0] |= 0x00000004u;
+inline const ::legacy_pb::Signature& Claim::publishersignature() const {
+  const ::legacy_pb::Signature* p = publishersignature_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Claim.publisherSignature)
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Signature*>(
+      &::legacy_pb::_Signature_default_instance_);
 }
-inline void Claim::clear_has_publishersignature() {
+inline ::legacy_pb::Signature* Claim::release_publishersignature() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Claim.publisherSignature)
   _has_bits_[0] &= ~0x00000004u;
-}
-inline const ::pb::Signature& Claim::_internal_publishersignature() const {
-  return *publishersignature_;
-}
-inline const ::pb::Signature& Claim::publishersignature() const {
-  const ::pb::Signature* p = publishersignature_;
-  // @@protoc_insertion_point(field_get:pb.Claim.publisherSignature)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Signature*>(
-      &::pb::_Signature_default_instance_);
-}
-inline ::pb::Signature* Claim::release_publishersignature() {
-  // @@protoc_insertion_point(field_release:pb.Claim.publisherSignature)
-  clear_has_publishersignature();
-  ::pb::Signature* temp = publishersignature_;
-  publishersignature_ = NULL;
+  ::legacy_pb::Signature* temp = publishersignature_;
+  publishersignature_ = nullptr;
   return temp;
 }
-inline ::pb::Signature* Claim::mutable_publishersignature() {
-  set_has_publishersignature();
-  if (publishersignature_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Signature>(GetArenaNoVirtual());
+inline ::legacy_pb::Signature* Claim::mutable_publishersignature() {
+  _has_bits_[0] |= 0x00000004u;
+  if (publishersignature_ == nullptr) {
+    auto* p = CreateMaybeMessage<::legacy_pb::Signature>(GetArenaNoVirtual());
     publishersignature_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Claim.publisherSignature)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Claim.publisherSignature)
   return publishersignature_;
 }
-inline void Claim::set_allocated_publishersignature(::pb::Signature* publishersignature) {
+inline void Claim::set_allocated_publishersignature(::legacy_pb::Signature* publishersignature) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
+  if (message_arena == nullptr) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(publishersignature_);
   }
   if (publishersignature) {
-    ::google::protobuf::Arena* submessage_arena = NULL;
+    ::google::protobuf::Arena* submessage_arena = nullptr;
     if (message_arena != submessage_arena) {
       publishersignature = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, publishersignature, submessage_arena);
     }
-    set_has_publishersignature();
+    _has_bits_[0] |= 0x00000004u;
   } else {
-    clear_has_publishersignature();
+    _has_bits_[0] &= ~0x00000004u;
   }
   publishersignature_ = publishersignature;
-  // @@protoc_insertion_point(field_set_allocated:pb.Claim.publisherSignature)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Claim.publisherSignature)
 }
 
 #ifdef __GNUC__
@@ -555,20 +509,20 @@ inline void Claim::set_allocated_publishersignature(::pb::Signature* publishersi
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Claim_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Claim_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Claim_Version>() {
-  return ::pb::Claim_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Claim_Version>() {
+  return ::legacy_pb::Claim_Version_descriptor();
 }
-template <> struct is_proto_enum< ::pb::Claim_ClaimType> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Claim_ClaimType> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Claim_ClaimType>() {
-  return ::pb::Claim_ClaimType_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Claim_ClaimType>() {
+  return ::legacy_pb::Claim_ClaimType_descriptor();
 }
 
 }  // namespace protobuf
@@ -576,4 +530,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::pb::Claim_ClaimType>() {
 
 // @@protoc_insertion_point(global_scope)
 
-#endif  // PROTOBUF_INCLUDED_claim_2eproto
+#include <google/protobuf/port_undef.inc>
+#endif  // PROTOBUF_INCLUDED_legacy_5fclaim_2eproto

v1/cpp/signature.pb.cc

@@ -6,121 +6,101 @@
 #include <algorithm>
 
 #include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
 #include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/extension_set.h>
 #include <google/protobuf/wire_format_lite_inl.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
-// This is a temporary google only hack
-#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
-#include "third_party/protobuf/version.h"
-#endif
 // @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
 
-namespace pb {
+namespace legacy_pb {
 class SignatureDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Signature>
-      _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Signature> _instance;
 } _Signature_default_instance_;
-}  // namespace pb
-namespace protobuf_signature_2eproto {
-static void InitDefaultsSignature() {
+}  // namespace legacy_pb
+static void InitDefaultsSignature_signature_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Signature_default_instance_;
-    new (ptr) ::pb::Signature();
+    void* ptr = &::legacy_pb::_Signature_default_instance_;
+    new (ptr) ::legacy_pb::Signature();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Signature::InitAsDefaultInstance();
+  ::legacy_pb::Signature::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<0> scc_info_Signature =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsSignature}, {}};
+::google::protobuf::internal::SCCInfo<0> scc_info_Signature_signature_2eproto =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsSignature_signature_2eproto}, {}};
 
-void InitDefaults() {
-  ::google::protobuf::internal::InitSCC(&scc_info_Signature.base);
+void InitDefaults_signature_2eproto() {
+  ::google::protobuf::internal::InitSCC(&scc_info_Signature_signature_2eproto.base);
 }
 
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
+::google::protobuf::Metadata file_level_metadata_signature_2eproto[1];
+const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_signature_2eproto[1];
+constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_signature_2eproto = nullptr;
 
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, _internal_metadata_),
+const ::google::protobuf::uint32 TableStruct_signature_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Signature, _has_bits_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Signature, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, signaturetype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, signature_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Signature, certificateid_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Signature, version_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Signature, signaturetype_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Signature, signature_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Signature, certificateid_),
   2,
   3,
   0,
   1,
 };
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 9, sizeof(::pb::Signature)},
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  { 0, 9, sizeof(::legacy_pb::Signature)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Signature_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Signature_default_instance_),
 };
 
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  AssignDescriptors(
-      "signature.proto", schemas, file_default_instances, TableStruct::offsets,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
+::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_signature_2eproto = {
+  {}, AddDescriptors_signature_2eproto, "signature.proto", schemas,
+  file_default_instances, TableStruct_signature_2eproto::offsets,
+  file_level_metadata_signature_2eproto, 1, file_level_enum_descriptors_signature_2eproto, file_level_service_descriptors_signature_2eproto,
+};
 
-void protobuf_AssignDescriptorsOnce() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors);
-}
+const char descriptor_table_protodef_signature_2eproto[] =
+  "\n\017signature.proto\022\tlegacy_pb\032\021certificat"
+  "e.proto\"\273\001\n\tSignature\022-\n\007version\030\001 \002(\0162\034"
+  ".legacy_pb.Signature.Version\022)\n\rsignatur"
+  "eType\030\002 \002(\0162\022.legacy_pb.KeyType\022\021\n\tsigna"
+  "ture\030\003 \002(\014\022\025\n\rcertificateId\030\004 \002(\014\"*\n\007Ver"
+  "sion\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001"
+  ;
+::google::protobuf::internal::DescriptorTable descriptor_table_signature_2eproto = {
+  false, InitDefaults_signature_2eproto, 
+  descriptor_table_protodef_signature_2eproto,
+  "signature.proto", &assign_descriptors_table_signature_2eproto, 237,
+};
 
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\017signature.proto\022\002pb\032\021certificate.proto"
-      "\"\255\001\n\tSignature\022&\n\007version\030\001 \002(\0162\025.pb.Sig"
-      "nature.Version\022\"\n\rsignatureType\030\002 \002(\0162\013."
-      "pb.KeyType\022\021\n\tsignature\030\003 \002(\014\022\025\n\rcertifi"
-      "cateId\030\004 \002(\014\"*\n\007Version\022\023\n\017UNKNOWN_VERSI"
-      "ON\020\000\022\n\n\006_0_0_1\020\001"
+void AddDescriptors_signature_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[1] =
+  {
+    ::AddDescriptors_certificate_2eproto,
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 216);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "signature.proto", &protobuf_RegisterTypes);
-  ::protobuf_certificate_2eproto::AddDescriptors();
+ ::google::protobuf::internal::AddDescriptors(&descriptor_table_signature_2eproto, deps, 1);
 }
 
-void AddDescriptors() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-}  // namespace protobuf_signature_2eproto
-namespace pb {
+// Force running AddDescriptors() at dynamic initialization time.
+static bool dynamic_init_dummy_signature_2eproto = []() { AddDescriptors_signature_2eproto(); return true; }();
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Signature_Version_descriptor() {
-  protobuf_signature_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_signature_2eproto::file_level_enum_descriptors[0];
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_signature_2eproto);
+  return file_level_enum_descriptors_signature_2eproto[0];
 }
 bool Signature_Version_IsValid(int value) {
   switch (value) {
@@ -144,6 +124,22 @@ const int Signature::Version_ARRAYSIZE;
 
 void Signature::InitAsDefaultInstance() {
 }
+class Signature::HasBitSetters {
+ public:
+  static void set_has_version(Signature* msg) {
+    msg->_has_bits_[0] |= 0x00000004u;
+  }
+  static void set_has_signaturetype(Signature* msg) {
+    msg->_has_bits_[0] |= 0x00000008u;
+  }
+  static void set_has_signature(Signature* msg) {
+    msg->_has_bits_[0] |= 0x00000001u;
+  }
+  static void set_has_certificateid(Signature* msg) {
+    msg->_has_bits_[0] |= 0x00000002u;
+  }
+};
+
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Signature::kVersionFieldNumber;
 const int Signature::kSignatureTypeFieldNumber;
@@ -152,15 +148,13 @@ const int Signature::kCertificateIdFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Signature::Signature()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  ::google::protobuf::internal::InitSCC(
-      &protobuf_signature_2eproto::scc_info_Signature.base);
+  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Signature)
+  // @@protoc_insertion_point(constructor:legacy_pb.Signature)
 }
 Signature::Signature(const Signature& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
+      _internal_metadata_(nullptr),
       _has_bits_(from._has_bits_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   signature_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -174,10 +168,12 @@ Signature::Signature(const Signature& from)
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&signaturetype_) -
     reinterpret_cast<char*>(&version_)) + sizeof(signaturetype_));
-  // @@protoc_insertion_point(copy_constructor:pb.Signature)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Signature)
 }
 
 void Signature::SharedCtor() {
+  ::google::protobuf::internal::InitSCC(
+      &scc_info_Signature_signature_2eproto.base);
   signature_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   certificateid_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&version_, 0, static_cast<size_t>(
@@ -186,7 +182,7 @@ void Signature::SharedCtor() {
 }
 
 Signature::~Signature() {
-  // @@protoc_insertion_point(destructor:pb.Signature)
+  // @@protoc_insertion_point(destructor:legacy_pb.Signature)
   SharedDtor();
 }
 
@@ -198,25 +194,20 @@ void Signature::SharedDtor() {
 void Signature::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
-const ::google::protobuf::Descriptor* Signature::descriptor() {
-  ::protobuf_signature_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_signature_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
 const Signature& Signature::default_instance() {
-  ::google::protobuf::internal::InitSCC(&protobuf_signature_2eproto::scc_info_Signature.base);
+  ::google::protobuf::internal::InitSCC(&::scc_info_Signature_signature_2eproto.base);
   return *internal_default_instance();
 }
 
 
 void Signature::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Signature)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Signature)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  if (cached_has_bits & 3u) {
+  if (cached_has_bits & 0x00000003u) {
     if (cached_has_bits & 0x00000001u) {
       signature_.ClearNonDefaultToEmptyNoArena();
     }
@@ -224,7 +215,7 @@ void Signature::Clear() {
       certificateid_.ClearNonDefaultToEmptyNoArena();
     }
   }
-  if (cached_has_bits & 12u) {
+  if (cached_has_bits & 0x0000000cu) {
     ::memset(&version_, 0, static_cast<size_t>(
         reinterpret_cast<char*>(&signaturetype_) -
         reinterpret_cast<char*>(&version_)) + sizeof(signaturetype_));
@@ -233,29 +224,119 @@ void Signature::Clear() {
   _internal_metadata_.Clear();
 }
 
+#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+const char* Signature::_InternalParse(const char* begin, const char* end, void* object,
+                  ::google::protobuf::internal::ParseContext* ctx) {
+  auto msg = static_cast<Signature*>(object);
+  ::google::protobuf::int32 size; (void)size;
+  int depth; (void)depth;
+  ::google::protobuf::uint32 tag;
+  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
+  auto ptr = begin;
+  while (ptr < end) {
+    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
+    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+    switch (tag >> 3) {
+      // required .legacy_pb.Signature.Version version = 1;
+      case 1: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::Signature_Version_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(1, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_version(static_cast<::legacy_pb::Signature_Version>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required .legacy_pb.KeyType signatureType = 2;
+      case 2: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::KeyType_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(2, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_signaturetype(static_cast<::legacy_pb::KeyType>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required bytes signature = 3;
+      case 3: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        object = msg->mutable_signature();
+        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
+          parser_till_end = ::google::protobuf::internal::GreedyStringParser;
+          goto string_till_end;
+        }
+        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheck(ptr, size, ctx));
+        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
+        ptr += size;
+        break;
+      }
+      // required bytes certificateId = 4;
+      case 4: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        object = msg->mutable_certificateid();
+        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
+          parser_till_end = ::google::protobuf::internal::GreedyStringParser;
+          goto string_till_end;
+        }
+        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheck(ptr, size, ctx));
+        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
+        ptr += size;
+        break;
+      }
+      default: {
+      handle_unusual:
+        if ((tag & 7) == 4 || tag == 0) {
+          ctx->EndGroup(tag);
+          return ptr;
+        }
+        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
+          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
+        ptr = res.first;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
+        if (res.second) return ptr;
+      }
+    }  // switch
+  }  // while
+  return ptr;
+string_till_end:
+  static_cast<::std::string*>(object)->clear();
+  static_cast<::std::string*>(object)->reserve(size);
+  goto len_delim_till_end;
+len_delim_till_end:
+  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
+                               {parser_till_end, object}, size);
+}
+#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 bool Signature::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
+#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Signature)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Signature)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Signature.Version version = 1;
+      // required .legacy_pb.Signature.Version version = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
+        if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
+          int value = 0;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Signature_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Signature_Version >(value));
+          if (::legacy_pb::Signature_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Signature_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
-                1, static_cast< ::google::protobuf::uint64>(value));
+                1, static_cast<::google::protobuf::uint64>(value));
           }
         } else {
           goto handle_unusual;
@@ -263,19 +344,18 @@ bool Signature::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.KeyType signatureType = 2;
+      // required .legacy_pb.KeyType signatureType = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-          int value;
+        if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) {
+          int value = 0;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::KeyType_IsValid(value)) {
-            set_signaturetype(static_cast< ::pb::KeyType >(value));
+          if (::legacy_pb::KeyType_IsValid(value)) {
+            set_signaturetype(static_cast< ::legacy_pb::KeyType >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
-                2, static_cast< ::google::protobuf::uint64>(value));
+                2, static_cast<::google::protobuf::uint64>(value));
           }
         } else {
           goto handle_unusual;
@@ -285,8 +365,7 @@ bool Signature::MergePartialFromCodedStream(
 
       // required bytes signature = 3;
       case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
                 input, this->mutable_signature()));
         } else {
@@ -297,8 +376,7 @@ bool Signature::MergePartialFromCodedStream(
 
       // required bytes certificateId = 4;
       case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
                 input, this->mutable_certificateid()));
         } else {
@@ -319,28 +397,29 @@ bool Signature::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Signature)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Signature)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Signature)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Signature)
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Signature::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Signature)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Signature)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Signature.Version version = 1;
+  // required .legacy_pb.Signature.Version version = 1;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.KeyType signatureType = 2;
+  // required .legacy_pb.KeyType signatureType = 2;
   if (cached_has_bits & 0x00000008u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->signaturetype(), output);
@@ -362,24 +441,23 @@ void Signature::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Signature)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Signature)
 }
 
 ::google::protobuf::uint8* Signature::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Signature)
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Signature)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Signature.Version version = 1;
+  // required .legacy_pb.Signature.Version version = 1;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.KeyType signatureType = 2;
+  // required .legacy_pb.KeyType signatureType = 2;
   if (cached_has_bits & 0x00000008u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->signaturetype(), target);
@@ -403,12 +481,12 @@ void Signature::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Signature)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Signature)
   return target;
 }
 
 size_t Signature::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Signature)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Signature)
   size_t total_size = 0;
 
   if (has_signature()) {
@@ -426,13 +504,13 @@ size_t Signature::RequiredFieldsByteSizeFallback() const {
   }
 
   if (has_version()) {
-    // required .pb.Signature.Version version = 1;
+    // required .legacy_pb.Signature.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
 
   if (has_signaturetype()) {
-    // required .pb.KeyType signatureType = 2;
+    // required .legacy_pb.KeyType signatureType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->signaturetype());
   }
@@ -440,7 +518,7 @@ size_t Signature::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Signature::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Signature)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Signature)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -459,52 +537,56 @@ size_t Signature::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormatLite::BytesSize(
         this->certificateid());
 
-    // required .pb.Signature.Version version = 1;
+    // required .legacy_pb.Signature.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
-    // required .pb.KeyType signatureType = 2;
+    // required .legacy_pb.KeyType signatureType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->signaturetype());
 
   } else {
     total_size += RequiredFieldsByteSizeFallback();
   }
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   SetCachedSize(cached_size);
   return total_size;
 }
 
 void Signature::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Signature)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Signature)
   GOOGLE_DCHECK_NE(&from, this);
   const Signature* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Signature>(
+      ::google::protobuf::DynamicCastToGenerated<Signature>(
           &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Signature)
+  if (source == nullptr) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Signature)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Signature)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Signature)
     MergeFrom(*source);
   }
 }
 
 void Signature::MergeFrom(const Signature& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Signature)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Signature)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 15u) {
+  if (cached_has_bits & 0x0000000fu) {
     if (cached_has_bits & 0x00000001u) {
-      set_has_signature();
+      _has_bits_[0] |= 0x00000001u;
       signature_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.signature_);
     }
     if (cached_has_bits & 0x00000002u) {
-      set_has_certificateid();
+      _has_bits_[0] |= 0x00000002u;
       certificateid_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.certificateid_);
     }
     if (cached_has_bits & 0x00000004u) {
@@ -518,14 +600,14 @@ void Signature::MergeFrom(const Signature& from) {
 }
 
 void Signature::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Signature)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Signature)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Signature::CopyFrom(const Signature& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Signature)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Signature)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -542,30 +624,31 @@ void Signature::Swap(Signature* other) {
 }
 void Signature::InternalSwap(Signature* other) {
   using std::swap;
+  _internal_metadata_.Swap(&other->_internal_metadata_);
+  swap(_has_bits_[0], other->_has_bits_[0]);
   signature_.Swap(&other->signature_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   certificateid_.Swap(&other->certificateid_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   swap(version_, other->version_);
   swap(signaturetype_, other->signaturetype_);
-  swap(_has_bits_[0], other->_has_bits_[0]);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Signature::GetMetadata() const {
-  protobuf_signature_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_signature_2eproto::file_level_metadata[kIndexInFileMessages];
+  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_signature_2eproto);
+  return ::file_level_metadata_signature_2eproto[kIndexInFileMessages];
 }
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Signature* Arena::CreateMaybeMessage< ::pb::Signature >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Signature >(arena);
+template<> PROTOBUF_NOINLINE ::legacy_pb::Signature* Arena::CreateMaybeMessage< ::legacy_pb::Signature >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Signature >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
 
 // @@protoc_insertion_point(global_scope)
+#include <google/protobuf/port_undef.inc>

v1/cpp/signature.pb.h

@@ -4,21 +4,22 @@
 #ifndef PROTOBUF_INCLUDED_signature_2eproto
 #define PROTOBUF_INCLUDED_signature_2eproto
 
+#include <limits>
 #include <string>
 
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#include <google/protobuf/port_def.inc>
+#if PROTOBUF_VERSION < 3007000
 #error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
+#error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
+#error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.
 #endif
 
+#include <google/protobuf/port_undef.inc>
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
@@ -33,31 +34,33 @@
 #include <google/protobuf/unknown_field_set.h>
 #include "certificate.pb.h"
 // @@protoc_insertion_point(includes)
-#define PROTOBUF_INTERNAL_EXPORT_protobuf_signature_2eproto 
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_signature_2eproto
 
-namespace protobuf_signature_2eproto {
 // Internal implementation detail -- do not use these members.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[1];
+struct TableStruct_signature_2eproto {
+  static const ::google::protobuf::internal::ParseTableField entries[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::AuxillaryParseTableField aux[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::ParseTable schema[1]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
   static const ::google::protobuf::internal::FieldMetadata field_metadata[];
   static const ::google::protobuf::internal::SerializationTable serialization_table[];
   static const ::google::protobuf::uint32 offsets[];
 };
-void AddDescriptors();
-}  // namespace protobuf_signature_2eproto
-namespace pb {
+void AddDescriptors_signature_2eproto();
+namespace legacy_pb {
 class Signature;
 class SignatureDefaultTypeInternal;
 extern SignatureDefaultTypeInternal _Signature_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Signature* Arena::CreateMaybeMessage<::pb::Signature>(Arena*);
+template<> ::legacy_pb::Signature* Arena::CreateMaybeMessage<::legacy_pb::Signature>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Signature_Version {
   Signature_Version_UNKNOWN_VERSION = 0,
@@ -80,7 +83,8 @@ inline bool Signature_Version_Parse(
 }
 // ===================================================================
 
-class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Signature) */ {
+class Signature final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Signature) */ {
  public:
   Signature();
   virtual ~Signature();
@@ -113,7 +117,9 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
     return _internal_metadata_.mutable_unknown_fields();
   }
 
-  static const ::google::protobuf::Descriptor* descriptor();
+  static const ::google::protobuf::Descriptor* descriptor() {
+    return default_instance().GetDescriptor();
+  }
   static const Signature& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -132,7 +138,7 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
   // implements Message ----------------------------------------------
 
   inline Signature* New() const final {
-    return CreateMaybeMessage<Signature>(NULL);
+    return CreateMaybeMessage<Signature>(nullptr);
   }
 
   Signature* New(::google::protobuf::Arena* arena) const final {
@@ -142,16 +148,21 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Signature& from);
   void MergeFrom(const Signature& from);
-  void Clear() final;
+  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
+  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
+  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
+  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
+  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const final;
+      ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -161,10 +172,10 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
   void InternalSwap(Signature* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return NULL;
+    return nullptr;
   }
   inline void* MaybeArenaPtr() const {
-    return NULL;
+    return nullptr;
   }
   public:
 
@@ -230,30 +241,23 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
   ::std::string* release_certificateid();
   void set_allocated_certificateid(::std::string* certificateid);
 
-  // required .pb.Signature.Version version = 1;
+  // required .legacy_pb.Signature.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Signature_Version version() const;
-  void set_version(::pb::Signature_Version value);
+  ::legacy_pb::Signature_Version version() const;
+  void set_version(::legacy_pb::Signature_Version value);
 
-  // required .pb.KeyType signatureType = 2;
+  // required .legacy_pb.KeyType signatureType = 2;
   bool has_signaturetype() const;
   void clear_signaturetype();
   static const int kSignatureTypeFieldNumber = 2;
-  ::pb::KeyType signaturetype() const;
-  void set_signaturetype(::pb::KeyType value);
+  ::legacy_pb::KeyType signaturetype() const;
+  void set_signaturetype(::legacy_pb::KeyType value);
 
-  // @@protoc_insertion_point(class_scope:pb.Signature)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Signature)
  private:
-  void set_has_version();
-  void clear_has_version();
-  void set_has_signaturetype();
-  void clear_has_signaturetype();
-  void set_has_signature();
-  void clear_has_signature();
-  void set_has_certificateid();
-  void clear_has_certificateid();
+  class HasBitSetters;
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -265,7 +269,7 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
   ::google::protobuf::internal::ArenaStringPtr certificateid_;
   int version_;
   int signaturetype_;
-  friend struct ::protobuf_signature_2eproto::TableStruct;
+  friend struct ::TableStruct_signature_2eproto;
 };
 // ===================================================================
 
@@ -278,186 +282,162 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
 #endif  // __GNUC__
 // Signature
 
-// required .pb.Signature.Version version = 1;
+// required .legacy_pb.Signature.Version version = 1;
 inline bool Signature::has_version() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Signature::set_has_version() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void Signature::clear_has_version() {
-  _has_bits_[0] &= ~0x00000004u;
-}
 inline void Signature::clear_version() {
   version_ = 0;
-  clear_has_version();
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline ::pb::Signature_Version Signature::version() const {
-  // @@protoc_insertion_point(field_get:pb.Signature.version)
-  return static_cast< ::pb::Signature_Version >(version_);
+inline ::legacy_pb::Signature_Version Signature::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Signature.version)
+  return static_cast< ::legacy_pb::Signature_Version >(version_);
 }
-inline void Signature::set_version(::pb::Signature_Version value) {
-  assert(::pb::Signature_Version_IsValid(value));
-  set_has_version();
+inline void Signature::set_version(::legacy_pb::Signature_Version value) {
+  assert(::legacy_pb::Signature_Version_IsValid(value));
+  _has_bits_[0] |= 0x00000004u;
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Signature.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Signature.version)
 }
 
-// required .pb.KeyType signatureType = 2;
+// required .legacy_pb.KeyType signatureType = 2;
 inline bool Signature::has_signaturetype() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void Signature::set_has_signaturetype() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void Signature::clear_has_signaturetype() {
-  _has_bits_[0] &= ~0x00000008u;
-}
 inline void Signature::clear_signaturetype() {
   signaturetype_ = 0;
-  clear_has_signaturetype();
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline ::pb::KeyType Signature::signaturetype() const {
-  // @@protoc_insertion_point(field_get:pb.Signature.signatureType)
-  return static_cast< ::pb::KeyType >(signaturetype_);
+inline ::legacy_pb::KeyType Signature::signaturetype() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Signature.signatureType)
+  return static_cast< ::legacy_pb::KeyType >(signaturetype_);
 }
-inline void Signature::set_signaturetype(::pb::KeyType value) {
-  assert(::pb::KeyType_IsValid(value));
-  set_has_signaturetype();
+inline void Signature::set_signaturetype(::legacy_pb::KeyType value) {
+  assert(::legacy_pb::KeyType_IsValid(value));
+  _has_bits_[0] |= 0x00000008u;
   signaturetype_ = value;
-  // @@protoc_insertion_point(field_set:pb.Signature.signatureType)
+  // @@protoc_insertion_point(field_set:legacy_pb.Signature.signatureType)
 }
 
 // required bytes signature = 3;
 inline bool Signature::has_signature() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Signature::set_has_signature() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Signature::clear_has_signature() {
-  _has_bits_[0] &= ~0x00000001u;
-}
 inline void Signature::clear_signature() {
   signature_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_signature();
+  _has_bits_[0] &= ~0x00000001u;
 }
 inline const ::std::string& Signature::signature() const {
-  // @@protoc_insertion_point(field_get:pb.Signature.signature)
+  // @@protoc_insertion_point(field_get:legacy_pb.Signature.signature)
   return signature_.GetNoArena();
 }
 inline void Signature::set_signature(const ::std::string& value) {
-  set_has_signature();
+  _has_bits_[0] |= 0x00000001u;
   signature_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Signature.signature)
+  // @@protoc_insertion_point(field_set:legacy_pb.Signature.signature)
 }
 #if LANG_CXX11
 inline void Signature::set_signature(::std::string&& value) {
-  set_has_signature();
+  _has_bits_[0] |= 0x00000001u;
   signature_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Signature.signature)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Signature.signature)
 }
 #endif
 inline void Signature::set_signature(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_signature();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000001u;
   signature_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Signature.signature)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Signature.signature)
 }
 inline void Signature::set_signature(const void* value, size_t size) {
-  set_has_signature();
+  _has_bits_[0] |= 0x00000001u;
   signature_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Signature.signature)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Signature.signature)
 }
 inline ::std::string* Signature::mutable_signature() {
-  set_has_signature();
-  // @@protoc_insertion_point(field_mutable:pb.Signature.signature)
+  _has_bits_[0] |= 0x00000001u;
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Signature.signature)
   return signature_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Signature::release_signature() {
-  // @@protoc_insertion_point(field_release:pb.Signature.signature)
+  // @@protoc_insertion_point(field_release:legacy_pb.Signature.signature)
   if (!has_signature()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_signature();
+  _has_bits_[0] &= ~0x00000001u;
   return signature_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Signature::set_allocated_signature(::std::string* signature) {
-  if (signature != NULL) {
-    set_has_signature();
+  if (signature != nullptr) {
+    _has_bits_[0] |= 0x00000001u;
   } else {
-    clear_has_signature();
+    _has_bits_[0] &= ~0x00000001u;
   }
   signature_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), signature);
-  // @@protoc_insertion_point(field_set_allocated:pb.Signature.signature)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Signature.signature)
 }
 
 // required bytes certificateId = 4;
 inline bool Signature::has_certificateid() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Signature::set_has_certificateid() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void Signature::clear_has_certificateid() {
-  _has_bits_[0] &= ~0x00000002u;
-}
 inline void Signature::clear_certificateid() {
   certificateid_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_certificateid();
+  _has_bits_[0] &= ~0x00000002u;
 }
 inline const ::std::string& Signature::certificateid() const {
-  // @@protoc_insertion_point(field_get:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_get:legacy_pb.Signature.certificateId)
   return certificateid_.GetNoArena();
 }
 inline void Signature::set_certificateid(const ::std::string& value) {
-  set_has_certificateid();
+  _has_bits_[0] |= 0x00000002u;
   certificateid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_set:legacy_pb.Signature.certificateId)
 }
 #if LANG_CXX11
 inline void Signature::set_certificateid(::std::string&& value) {
-  set_has_certificateid();
+  _has_bits_[0] |= 0x00000002u;
   certificateid_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Signature.certificateId)
 }
 #endif
 inline void Signature::set_certificateid(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_certificateid();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000002u;
   certificateid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Signature.certificateId)
 }
 inline void Signature::set_certificateid(const void* value, size_t size) {
-  set_has_certificateid();
+  _has_bits_[0] |= 0x00000002u;
   certificateid_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Signature.certificateId)
 }
 inline ::std::string* Signature::mutable_certificateid() {
-  set_has_certificateid();
-  // @@protoc_insertion_point(field_mutable:pb.Signature.certificateId)
+  _has_bits_[0] |= 0x00000002u;
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Signature.certificateId)
   return certificateid_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Signature::release_certificateid() {
-  // @@protoc_insertion_point(field_release:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_release:legacy_pb.Signature.certificateId)
   if (!has_certificateid()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_certificateid();
+  _has_bits_[0] &= ~0x00000002u;
   return certificateid_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Signature::set_allocated_certificateid(::std::string* certificateid) {
-  if (certificateid != NULL) {
-    set_has_certificateid();
+  if (certificateid != nullptr) {
+    _has_bits_[0] |= 0x00000002u;
   } else {
-    clear_has_certificateid();
+    _has_bits_[0] &= ~0x00000002u;
   }
   certificateid_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), certificateid);
-  // @@protoc_insertion_point(field_set_allocated:pb.Signature.certificateId)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Signature.certificateId)
 }
 
 #ifdef __GNUC__
@@ -466,15 +446,15 @@ inline void Signature::set_allocated_certificateid(::std::string* certificateid)
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Signature_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Signature_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Signature_Version>() {
-  return ::pb::Signature_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Signature_Version>() {
+  return ::legacy_pb::Signature_Version_descriptor();
 }
 
 }  // namespace protobuf
@@ -482,4 +462,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::pb::Signature_Version>() {
 
 // @@protoc_insertion_point(global_scope)
 
+#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_signature_2eproto

v1/cpp/source.pb.cc

@@ -6,121 +6,101 @@
 #include <algorithm>
 
 #include <google/protobuf/stubs/common.h>
-#include <google/protobuf/stubs/port.h>
 #include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/extension_set.h>
 #include <google/protobuf/wire_format_lite_inl.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/generated_message_reflection.h>
 #include <google/protobuf/reflection_ops.h>
 #include <google/protobuf/wire_format.h>
-// This is a temporary google only hack
-#ifdef GOOGLE_PROTOBUF_ENFORCE_UNIQUENESS
-#include "third_party/protobuf/version.h"
-#endif
 // @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
 
-namespace pb {
+namespace legacy_pb {
 class SourceDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Source>
-      _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Source> _instance;
 } _Source_default_instance_;
-}  // namespace pb
-namespace protobuf_source_2eproto {
-static void InitDefaultsSource() {
+}  // namespace legacy_pb
+static void InitDefaultsSource_source_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
-    void* ptr = &::pb::_Source_default_instance_;
-    new (ptr) ::pb::Source();
+    void* ptr = &::legacy_pb::_Source_default_instance_;
+    new (ptr) ::legacy_pb::Source();
     ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
   }
-  ::pb::Source::InitAsDefaultInstance();
+  ::legacy_pb::Source::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<0> scc_info_Source =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsSource}, {}};
+::google::protobuf::internal::SCCInfo<0> scc_info_Source_source_2eproto =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 0, InitDefaultsSource_source_2eproto}, {}};
 
-void InitDefaults() {
-  ::google::protobuf::internal::InitSCC(&scc_info_Source.base);
+void InitDefaults_source_2eproto() {
+  ::google::protobuf::internal::InitSCC(&scc_info_Source_source_2eproto.base);
 }
 
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
+::google::protobuf::Metadata file_level_metadata_source_2eproto[1];
+const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_source_2eproto[2];
+constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_source_2eproto = nullptr;
 
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, _internal_metadata_),
+const ::google::protobuf::uint32 TableStruct_source_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Source, _has_bits_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Source, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, sourcetype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, source_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::pb::Source, contenttype_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Source, version_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Source, sourcetype_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Source, source_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Source, contenttype_),
   2,
   3,
   0,
   1,
 };
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  { 0, 9, sizeof(::pb::Source)},
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  { 0, 9, sizeof(::legacy_pb::Source)},
 };
 
 static ::google::protobuf::Message const * const file_default_instances[] = {
-  reinterpret_cast<const ::google::protobuf::Message*>(&::pb::_Source_default_instance_),
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Source_default_instance_),
 };
 
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  AssignDescriptors(
-      "source.proto", schemas, file_default_instances, TableStruct::offsets,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
+::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_source_2eproto = {
+  {}, AddDescriptors_source_2eproto, "source.proto", schemas,
+  file_default_instances, TableStruct_source_2eproto::offsets,
+  file_level_metadata_source_2eproto, 1, file_level_enum_descriptors_source_2eproto, file_level_service_descriptors_source_2eproto,
+};
 
-void protobuf_AssignDescriptorsOnce() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors);
-}
+const char descriptor_table_protodef_source_2eproto[] =
+  "\n\014source.proto\022\tlegacy_pb\"\362\001\n\006Source\022*\n\007"
+  "version\030\001 \002(\0162\031.legacy_pb.Source.Version"
+  "\0221\n\nsourceType\030\002 \002(\0162\035.legacy_pb.Source."
+  "SourceTypes\022\016\n\006source\030\003 \002(\014\022\023\n\013contentTy"
+  "pe\030\004 \002(\t\"*\n\007Version\022\023\n\017UNKNOWN_VERSION\020\000"
+  "\022\n\n\006_0_0_1\020\001\"8\n\013SourceTypes\022\027\n\023UNKNOWN_S"
+  "OURCE_TYPE\020\000\022\020\n\014lbry_sd_hash\020\001"
+  ;
+::google::protobuf::internal::DescriptorTable descriptor_table_source_2eproto = {
+  false, InitDefaults_source_2eproto, 
+  descriptor_table_protodef_source_2eproto,
+  "source.proto", &assign_descriptors_table_source_2eproto, 270,
+};
 
-void protobuf_RegisterTypes(const ::std::string&) GOOGLE_PROTOBUF_ATTRIBUTE_COLD;
-void protobuf_RegisterTypes(const ::std::string&) {
-  protobuf_AssignDescriptorsOnce();
-  ::google::protobuf::internal::RegisterAllTypes(file_level_metadata, 1);
-}
-
-void AddDescriptorsImpl() {
-  InitDefaults();
-  static const char descriptor[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-      "\n\014source.proto\022\002pb\"\344\001\n\006Source\022#\n\007version"
-      "\030\001 \002(\0162\022.pb.Source.Version\022*\n\nsourceType"
-      "\030\002 \002(\0162\026.pb.Source.SourceTypes\022\016\n\006source"
-      "\030\003 \002(\014\022\023\n\013contentType\030\004 \002(\t\"*\n\007Version\022\023"
-      "\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\"8\n\013Sourc"
-      "eTypes\022\027\n\023UNKNOWN_SOURCE_TYPE\020\000\022\020\n\014lbry_"
-      "sd_hash\020\001"
+void AddDescriptors_source_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[1] =
+  {
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 249);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "source.proto", &protobuf_RegisterTypes);
+ ::google::protobuf::internal::AddDescriptors(&descriptor_table_source_2eproto, deps, 0);
 }
 
-void AddDescriptors() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, AddDescriptorsImpl);
-}
-// Force AddDescriptors() to be called at dynamic initialization time.
-struct StaticDescriptorInitializer {
-  StaticDescriptorInitializer() {
-    AddDescriptors();
-  }
-} static_descriptor_initializer;
-}  // namespace protobuf_source_2eproto
-namespace pb {
+// Force running AddDescriptors() at dynamic initialization time.
+static bool dynamic_init_dummy_source_2eproto = []() { AddDescriptors_source_2eproto(); return true; }();
+namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Source_Version_descriptor() {
-  protobuf_source_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_source_2eproto::file_level_enum_descriptors[0];
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_source_2eproto);
+  return file_level_enum_descriptors_source_2eproto[0];
 }
 bool Source_Version_IsValid(int value) {
   switch (value) {
@@ -140,8 +120,8 @@ const Source_Version Source::Version_MAX;
 const int Source::Version_ARRAYSIZE;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 const ::google::protobuf::EnumDescriptor* Source_SourceTypes_descriptor() {
-  protobuf_source_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_source_2eproto::file_level_enum_descriptors[1];
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_source_2eproto);
+  return file_level_enum_descriptors_source_2eproto[1];
 }
 bool Source_SourceTypes_IsValid(int value) {
   switch (value) {
@@ -165,6 +145,22 @@ const int Source::SourceTypes_ARRAYSIZE;
 
 void Source::InitAsDefaultInstance() {
 }
+class Source::HasBitSetters {
+ public:
+  static void set_has_version(Source* msg) {
+    msg->_has_bits_[0] |= 0x00000004u;
+  }
+  static void set_has_sourcetype(Source* msg) {
+    msg->_has_bits_[0] |= 0x00000008u;
+  }
+  static void set_has_source(Source* msg) {
+    msg->_has_bits_[0] |= 0x00000001u;
+  }
+  static void set_has_contenttype(Source* msg) {
+    msg->_has_bits_[0] |= 0x00000002u;
+  }
+};
+
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Source::kVersionFieldNumber;
 const int Source::kSourceTypeFieldNumber;
@@ -173,15 +169,13 @@ const int Source::kContentTypeFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Source::Source()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  ::google::protobuf::internal::InitSCC(
-      &protobuf_source_2eproto::scc_info_Source.base);
+  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
   SharedCtor();
-  // @@protoc_insertion_point(constructor:pb.Source)
+  // @@protoc_insertion_point(constructor:legacy_pb.Source)
 }
 Source::Source(const Source& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
+      _internal_metadata_(nullptr),
       _has_bits_(from._has_bits_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   source_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -195,10 +189,12 @@ Source::Source(const Source& from)
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&sourcetype_) -
     reinterpret_cast<char*>(&version_)) + sizeof(sourcetype_));
-  // @@protoc_insertion_point(copy_constructor:pb.Source)
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Source)
 }
 
 void Source::SharedCtor() {
+  ::google::protobuf::internal::InitSCC(
+      &scc_info_Source_source_2eproto.base);
   source_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   contenttype_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   ::memset(&version_, 0, static_cast<size_t>(
@@ -207,7 +203,7 @@ void Source::SharedCtor() {
 }
 
 Source::~Source() {
-  // @@protoc_insertion_point(destructor:pb.Source)
+  // @@protoc_insertion_point(destructor:legacy_pb.Source)
   SharedDtor();
 }
 
@@ -219,25 +215,20 @@ void Source::SharedDtor() {
 void Source::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
-const ::google::protobuf::Descriptor* Source::descriptor() {
-  ::protobuf_source_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_source_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
 const Source& Source::default_instance() {
-  ::google::protobuf::internal::InitSCC(&protobuf_source_2eproto::scc_info_Source.base);
+  ::google::protobuf::internal::InitSCC(&::scc_info_Source_source_2eproto.base);
   return *internal_default_instance();
 }
 
 
 void Source::Clear() {
-// @@protoc_insertion_point(message_clear_start:pb.Source)
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Source)
   ::google::protobuf::uint32 cached_has_bits = 0;
   // Prevent compiler warnings about cached_has_bits being unused
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  if (cached_has_bits & 3u) {
+  if (cached_has_bits & 0x00000003u) {
     if (cached_has_bits & 0x00000001u) {
       source_.ClearNonDefaultToEmptyNoArena();
     }
@@ -245,7 +236,7 @@ void Source::Clear() {
       contenttype_.ClearNonDefaultToEmptyNoArena();
     }
   }
-  if (cached_has_bits & 12u) {
+  if (cached_has_bits & 0x0000000cu) {
     ::memset(&version_, 0, static_cast<size_t>(
         reinterpret_cast<char*>(&sourcetype_) -
         reinterpret_cast<char*>(&version_)) + sizeof(sourcetype_));
@@ -254,29 +245,120 @@ void Source::Clear() {
   _internal_metadata_.Clear();
 }
 
+#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+const char* Source::_InternalParse(const char* begin, const char* end, void* object,
+                  ::google::protobuf::internal::ParseContext* ctx) {
+  auto msg = static_cast<Source*>(object);
+  ::google::protobuf::int32 size; (void)size;
+  int depth; (void)depth;
+  ::google::protobuf::uint32 tag;
+  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
+  auto ptr = begin;
+  while (ptr < end) {
+    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
+    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+    switch (tag >> 3) {
+      // required .legacy_pb.Source.Version version = 1;
+      case 1: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::Source_Version_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(1, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_version(static_cast<::legacy_pb::Source_Version>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required .legacy_pb.Source.SourceTypes sourceType = 2;
+      case 2: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 16) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::Source_SourceTypes_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(2, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_sourcetype(static_cast<::legacy_pb::Source_SourceTypes>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required bytes source = 3;
+      case 3: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        object = msg->mutable_source();
+        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
+          parser_till_end = ::google::protobuf::internal::GreedyStringParser;
+          goto string_till_end;
+        }
+        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheck(ptr, size, ctx));
+        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
+        ptr += size;
+        break;
+      }
+      // required string contentType = 4;
+      case 4: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 34) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        ctx->extra_parse_data().SetFieldName("legacy_pb.Source.contentType");
+        object = msg->mutable_contenttype();
+        if (size > end - ptr + ::google::protobuf::internal::ParseContext::kSlopBytes) {
+          parser_till_end = ::google::protobuf::internal::GreedyStringParserUTF8Verify;
+          goto string_till_end;
+        }
+        GOOGLE_PROTOBUF_PARSER_ASSERT(::google::protobuf::internal::StringCheckUTF8Verify(ptr, size, ctx));
+        ::google::protobuf::internal::InlineGreedyStringParser(object, ptr, size, ctx);
+        ptr += size;
+        break;
+      }
+      default: {
+      handle_unusual:
+        if ((tag & 7) == 4 || tag == 0) {
+          ctx->EndGroup(tag);
+          return ptr;
+        }
+        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
+          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
+        ptr = res.first;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
+        if (res.second) return ptr;
+      }
+    }  // switch
+  }  // while
+  return ptr;
+string_till_end:
+  static_cast<::std::string*>(object)->clear();
+  static_cast<::std::string*>(object)->reserve(size);
+  goto len_delim_till_end;
+len_delim_till_end:
+  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
+                               {parser_till_end, object}, size);
+}
+#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 bool Source::MergePartialFromCodedStream(
     ::google::protobuf::io::CodedInputStream* input) {
-#define DO_(EXPRESSION) if (!GOOGLE_PREDICT_TRUE(EXPRESSION)) goto failure
+#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
   ::google::protobuf::uint32 tag;
-  // @@protoc_insertion_point(parse_start:pb.Source)
+  // @@protoc_insertion_point(parse_start:legacy_pb.Source)
   for (;;) {
     ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
     tag = p.first;
     if (!p.second) goto handle_unusual;
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
-      // required .pb.Source.Version version = 1;
+      // required .legacy_pb.Source.Version version = 1;
       case 1: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(8u /* 8 & 0xFF */)) {
-          int value;
+        if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
+          int value = 0;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Source_Version_IsValid(value)) {
-            set_version(static_cast< ::pb::Source_Version >(value));
+          if (::legacy_pb::Source_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Source_Version >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
-                1, static_cast< ::google::protobuf::uint64>(value));
+                1, static_cast<::google::protobuf::uint64>(value));
           }
         } else {
           goto handle_unusual;
@@ -284,19 +366,18 @@ bool Source::MergePartialFromCodedStream(
         break;
       }
 
-      // required .pb.Source.SourceTypes sourceType = 2;
+      // required .legacy_pb.Source.SourceTypes sourceType = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(16u /* 16 & 0xFF */)) {
-          int value;
+        if (static_cast< ::google::protobuf::uint8>(tag) == (16 & 0xFF)) {
+          int value = 0;
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
                  input, &value)));
-          if (::pb::Source_SourceTypes_IsValid(value)) {
-            set_sourcetype(static_cast< ::pb::Source_SourceTypes >(value));
+          if (::legacy_pb::Source_SourceTypes_IsValid(value)) {
+            set_sourcetype(static_cast< ::legacy_pb::Source_SourceTypes >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
-                2, static_cast< ::google::protobuf::uint64>(value));
+                2, static_cast<::google::protobuf::uint64>(value));
           }
         } else {
           goto handle_unusual;
@@ -306,8 +387,7 @@ bool Source::MergePartialFromCodedStream(
 
       // required bytes source = 3;
       case 3: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(26u /* 26 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadBytes(
                 input, this->mutable_source()));
         } else {
@@ -318,14 +398,13 @@ bool Source::MergePartialFromCodedStream(
 
       // required string contentType = 4;
       case 4: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(34u /* 34 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (34 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_contenttype()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
             this->contenttype().data(), static_cast<int>(this->contenttype().length()),
             ::google::protobuf::internal::WireFormat::PARSE,
-            "pb.Source.contentType");
+            "legacy_pb.Source.contentType");
         } else {
           goto handle_unusual;
         }
@@ -344,28 +423,29 @@ bool Source::MergePartialFromCodedStream(
     }
   }
 success:
-  // @@protoc_insertion_point(parse_success:pb.Source)
+  // @@protoc_insertion_point(parse_success:legacy_pb.Source)
   return true;
 failure:
-  // @@protoc_insertion_point(parse_failure:pb.Source)
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Source)
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Source::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
-  // @@protoc_insertion_point(serialize_start:pb.Source)
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Source)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Source.Version version = 1;
+  // required .legacy_pb.Source.Version version = 1;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       1, this->version(), output);
   }
 
-  // required .pb.Source.SourceTypes sourceType = 2;
+  // required .legacy_pb.Source.SourceTypes sourceType = 2;
   if (cached_has_bits & 0x00000008u) {
     ::google::protobuf::internal::WireFormatLite::WriteEnum(
       2, this->sourcetype(), output);
@@ -382,7 +462,7 @@ void Source::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->contenttype().data(), static_cast<int>(this->contenttype().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Source.contentType");
+      "legacy_pb.Source.contentType");
     ::google::protobuf::internal::WireFormatLite::WriteStringMaybeAliased(
       4, this->contenttype(), output);
   }
@@ -391,24 +471,23 @@ void Source::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
         _internal_metadata_.unknown_fields(), output);
   }
-  // @@protoc_insertion_point(serialize_end:pb.Source)
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Source)
 }
 
 ::google::protobuf::uint8* Source::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
-  // @@protoc_insertion_point(serialize_to_array_start:pb.Source)
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Source)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  // required .pb.Source.Version version = 1;
+  // required .legacy_pb.Source.Version version = 1;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       1, this->version(), target);
   }
 
-  // required .pb.Source.SourceTypes sourceType = 2;
+  // required .legacy_pb.Source.SourceTypes sourceType = 2;
   if (cached_has_bits & 0x00000008u) {
     target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
       2, this->sourcetype(), target);
@@ -426,7 +505,7 @@ void Source::SerializeWithCachedSizes(
     ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
       this->contenttype().data(), static_cast<int>(this->contenttype().length()),
       ::google::protobuf::internal::WireFormat::SERIALIZE,
-      "pb.Source.contentType");
+      "legacy_pb.Source.contentType");
     target =
       ::google::protobuf::internal::WireFormatLite::WriteStringToArray(
         4, this->contenttype(), target);
@@ -436,12 +515,12 @@ void Source::SerializeWithCachedSizes(
     target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
         _internal_metadata_.unknown_fields(), target);
   }
-  // @@protoc_insertion_point(serialize_to_array_end:pb.Source)
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Source)
   return target;
 }
 
 size_t Source::RequiredFieldsByteSizeFallback() const {
-// @@protoc_insertion_point(required_fields_byte_size_fallback_start:pb.Source)
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Source)
   size_t total_size = 0;
 
   if (has_source()) {
@@ -459,13 +538,13 @@ size_t Source::RequiredFieldsByteSizeFallback() const {
   }
 
   if (has_version()) {
-    // required .pb.Source.Version version = 1;
+    // required .legacy_pb.Source.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
   }
 
   if (has_sourcetype()) {
-    // required .pb.Source.SourceTypes sourceType = 2;
+    // required .legacy_pb.Source.SourceTypes sourceType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->sourcetype());
   }
@@ -473,7 +552,7 @@ size_t Source::RequiredFieldsByteSizeFallback() const {
   return total_size;
 }
 size_t Source::ByteSizeLong() const {
-// @@protoc_insertion_point(message_byte_size_start:pb.Source)
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Source)
   size_t total_size = 0;
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -492,52 +571,56 @@ size_t Source::ByteSizeLong() const {
       ::google::protobuf::internal::WireFormatLite::StringSize(
         this->contenttype());
 
-    // required .pb.Source.Version version = 1;
+    // required .legacy_pb.Source.Version version = 1;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
 
-    // required .pb.Source.SourceTypes sourceType = 2;
+    // required .legacy_pb.Source.SourceTypes sourceType = 2;
     total_size += 1 +
       ::google::protobuf::internal::WireFormatLite::EnumSize(this->sourcetype());
 
   } else {
     total_size += RequiredFieldsByteSizeFallback();
   }
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
   int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
   SetCachedSize(cached_size);
   return total_size;
 }
 
 void Source::MergeFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_merge_from_start:pb.Source)
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Source)
   GOOGLE_DCHECK_NE(&from, this);
   const Source* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Source>(
+      ::google::protobuf::DynamicCastToGenerated<Source>(
           &from);
-  if (source == NULL) {
-  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Source)
+  if (source == nullptr) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Source)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
-  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Source)
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Source)
     MergeFrom(*source);
   }
 }
 
 void Source::MergeFrom(const Source& from) {
-// @@protoc_insertion_point(class_specific_merge_from_start:pb.Source)
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Source)
   GOOGLE_DCHECK_NE(&from, this);
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
 
   cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 15u) {
+  if (cached_has_bits & 0x0000000fu) {
     if (cached_has_bits & 0x00000001u) {
-      set_has_source();
+      _has_bits_[0] |= 0x00000001u;
       source_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.source_);
     }
     if (cached_has_bits & 0x00000002u) {
-      set_has_contenttype();
+      _has_bits_[0] |= 0x00000002u;
       contenttype_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.contenttype_);
     }
     if (cached_has_bits & 0x00000004u) {
@@ -551,14 +634,14 @@ void Source::MergeFrom(const Source& from) {
 }
 
 void Source::CopyFrom(const ::google::protobuf::Message& from) {
-// @@protoc_insertion_point(generalized_copy_from_start:pb.Source)
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Source)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
 }
 
 void Source::CopyFrom(const Source& from) {
-// @@protoc_insertion_point(class_specific_copy_from_start:pb.Source)
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Source)
   if (&from == this) return;
   Clear();
   MergeFrom(from);
@@ -575,30 +658,31 @@ void Source::Swap(Source* other) {
 }
 void Source::InternalSwap(Source* other) {
   using std::swap;
+  _internal_metadata_.Swap(&other->_internal_metadata_);
+  swap(_has_bits_[0], other->_has_bits_[0]);
   source_.Swap(&other->source_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   contenttype_.Swap(&other->contenttype_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   swap(version_, other->version_);
   swap(sourcetype_, other->sourcetype_);
-  swap(_has_bits_[0], other->_has_bits_[0]);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Source::GetMetadata() const {
-  protobuf_source_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_source_2eproto::file_level_metadata[kIndexInFileMessages];
+  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_source_2eproto);
+  return ::file_level_metadata_source_2eproto[kIndexInFileMessages];
 }
 
 
 // @@protoc_insertion_point(namespace_scope)
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::pb::Source* Arena::CreateMaybeMessage< ::pb::Source >(Arena* arena) {
-  return Arena::CreateInternal< ::pb::Source >(arena);
+template<> PROTOBUF_NOINLINE ::legacy_pb::Source* Arena::CreateMaybeMessage< ::legacy_pb::Source >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Source >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
 
 // @@protoc_insertion_point(global_scope)
+#include <google/protobuf/port_undef.inc>

v1/cpp/source.pb.h

@@ -4,21 +4,22 @@
 #ifndef PROTOBUF_INCLUDED_source_2eproto
 #define PROTOBUF_INCLUDED_source_2eproto
 
+#include <limits>
 #include <string>
 
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#include <google/protobuf/port_def.inc>
+#if PROTOBUF_VERSION < 3007000
 #error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
+#error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
+#error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.
 #endif
 
+#include <google/protobuf/port_undef.inc>
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
@@ -32,31 +33,33 @@
 #include <google/protobuf/generated_enum_reflection.h>
 #include <google/protobuf/unknown_field_set.h>
 // @@protoc_insertion_point(includes)
-#define PROTOBUF_INTERNAL_EXPORT_protobuf_source_2eproto 
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_source_2eproto
 
-namespace protobuf_source_2eproto {
 // Internal implementation detail -- do not use these members.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[1];
+struct TableStruct_source_2eproto {
+  static const ::google::protobuf::internal::ParseTableField entries[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::AuxillaryParseTableField aux[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::ParseTable schema[1]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
   static const ::google::protobuf::internal::FieldMetadata field_metadata[];
   static const ::google::protobuf::internal::SerializationTable serialization_table[];
   static const ::google::protobuf::uint32 offsets[];
 };
-void AddDescriptors();
-}  // namespace protobuf_source_2eproto
-namespace pb {
+void AddDescriptors_source_2eproto();
+namespace legacy_pb {
 class Source;
 class SourceDefaultTypeInternal;
 extern SourceDefaultTypeInternal _Source_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Source* Arena::CreateMaybeMessage<::pb::Source>(Arena*);
+template<> ::legacy_pb::Source* Arena::CreateMaybeMessage<::legacy_pb::Source>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Source_Version {
   Source_Version_UNKNOWN_VERSION = 0,
@@ -98,7 +101,8 @@ inline bool Source_SourceTypes_Parse(
 }
 // ===================================================================
 
-class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Source) */ {
+class Source final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Source) */ {
  public:
   Source();
   virtual ~Source();
@@ -131,7 +135,9 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
     return _internal_metadata_.mutable_unknown_fields();
   }
 
-  static const ::google::protobuf::Descriptor* descriptor();
+  static const ::google::protobuf::Descriptor* descriptor() {
+    return default_instance().GetDescriptor();
+  }
   static const Source& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -150,7 +156,7 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   // implements Message ----------------------------------------------
 
   inline Source* New() const final {
-    return CreateMaybeMessage<Source>(NULL);
+    return CreateMaybeMessage<Source>(nullptr);
   }
 
   Source* New(::google::protobuf::Arena* arena) const final {
@@ -160,16 +166,21 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Source& from);
   void MergeFrom(const Source& from);
-  void Clear() final;
+  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
+  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
+  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
+  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
+  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const final;
+      ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -179,10 +190,10 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   void InternalSwap(Source* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return NULL;
+    return nullptr;
   }
   inline void* MaybeArenaPtr() const {
-    return NULL;
+    return nullptr;
   }
   public:
 
@@ -274,30 +285,23 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   ::std::string* release_contenttype();
   void set_allocated_contenttype(::std::string* contenttype);
 
-  // required .pb.Source.Version version = 1;
+  // required .legacy_pb.Source.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Source_Version version() const;
-  void set_version(::pb::Source_Version value);
+  ::legacy_pb::Source_Version version() const;
+  void set_version(::legacy_pb::Source_Version value);
 
-  // required .pb.Source.SourceTypes sourceType = 2;
+  // required .legacy_pb.Source.SourceTypes sourceType = 2;
   bool has_sourcetype() const;
   void clear_sourcetype();
   static const int kSourceTypeFieldNumber = 2;
-  ::pb::Source_SourceTypes sourcetype() const;
-  void set_sourcetype(::pb::Source_SourceTypes value);
+  ::legacy_pb::Source_SourceTypes sourcetype() const;
+  void set_sourcetype(::legacy_pb::Source_SourceTypes value);
 
-  // @@protoc_insertion_point(class_scope:pb.Source)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Source)
  private:
-  void set_has_version();
-  void clear_has_version();
-  void set_has_sourcetype();
-  void clear_has_sourcetype();
-  void set_has_source();
-  void clear_has_source();
-  void set_has_contenttype();
-  void clear_has_contenttype();
+  class HasBitSetters;
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -309,7 +313,7 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   ::google::protobuf::internal::ArenaStringPtr contenttype_;
   int version_;
   int sourcetype_;
-  friend struct ::protobuf_source_2eproto::TableStruct;
+  friend struct ::TableStruct_source_2eproto;
 };
 // ===================================================================
 
@@ -322,186 +326,162 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
 #endif  // __GNUC__
 // Source
 
-// required .pb.Source.Version version = 1;
+// required .legacy_pb.Source.Version version = 1;
 inline bool Source::has_version() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Source::set_has_version() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void Source::clear_has_version() {
-  _has_bits_[0] &= ~0x00000004u;
-}
 inline void Source::clear_version() {
   version_ = 0;
-  clear_has_version();
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline ::pb::Source_Version Source::version() const {
-  // @@protoc_insertion_point(field_get:pb.Source.version)
-  return static_cast< ::pb::Source_Version >(version_);
+inline ::legacy_pb::Source_Version Source::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Source.version)
+  return static_cast< ::legacy_pb::Source_Version >(version_);
 }
-inline void Source::set_version(::pb::Source_Version value) {
-  assert(::pb::Source_Version_IsValid(value));
-  set_has_version();
+inline void Source::set_version(::legacy_pb::Source_Version value) {
+  assert(::legacy_pb::Source_Version_IsValid(value));
+  _has_bits_[0] |= 0x00000004u;
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Source.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Source.version)
 }
 
-// required .pb.Source.SourceTypes sourceType = 2;
+// required .legacy_pb.Source.SourceTypes sourceType = 2;
 inline bool Source::has_sourcetype() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void Source::set_has_sourcetype() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void Source::clear_has_sourcetype() {
-  _has_bits_[0] &= ~0x00000008u;
-}
 inline void Source::clear_sourcetype() {
   sourcetype_ = 0;
-  clear_has_sourcetype();
+  _has_bits_[0] &= ~0x00000008u;
 }
-inline ::pb::Source_SourceTypes Source::sourcetype() const {
-  // @@protoc_insertion_point(field_get:pb.Source.sourceType)
-  return static_cast< ::pb::Source_SourceTypes >(sourcetype_);
+inline ::legacy_pb::Source_SourceTypes Source::sourcetype() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Source.sourceType)
+  return static_cast< ::legacy_pb::Source_SourceTypes >(sourcetype_);
 }
-inline void Source::set_sourcetype(::pb::Source_SourceTypes value) {
-  assert(::pb::Source_SourceTypes_IsValid(value));
-  set_has_sourcetype();
+inline void Source::set_sourcetype(::legacy_pb::Source_SourceTypes value) {
+  assert(::legacy_pb::Source_SourceTypes_IsValid(value));
+  _has_bits_[0] |= 0x00000008u;
   sourcetype_ = value;
-  // @@protoc_insertion_point(field_set:pb.Source.sourceType)
+  // @@protoc_insertion_point(field_set:legacy_pb.Source.sourceType)
 }
 
 // required bytes source = 3;
 inline bool Source::has_source() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Source::set_has_source() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Source::clear_has_source() {
-  _has_bits_[0] &= ~0x00000001u;
-}
 inline void Source::clear_source() {
   source_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_source();
+  _has_bits_[0] &= ~0x00000001u;
 }
 inline const ::std::string& Source::source() const {
-  // @@protoc_insertion_point(field_get:pb.Source.source)
+  // @@protoc_insertion_point(field_get:legacy_pb.Source.source)
   return source_.GetNoArena();
 }
 inline void Source::set_source(const ::std::string& value) {
-  set_has_source();
+  _has_bits_[0] |= 0x00000001u;
   source_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Source.source)
+  // @@protoc_insertion_point(field_set:legacy_pb.Source.source)
 }
 #if LANG_CXX11
 inline void Source::set_source(::std::string&& value) {
-  set_has_source();
+  _has_bits_[0] |= 0x00000001u;
   source_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Source.source)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Source.source)
 }
 #endif
 inline void Source::set_source(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_source();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000001u;
   source_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Source.source)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Source.source)
 }
 inline void Source::set_source(const void* value, size_t size) {
-  set_has_source();
+  _has_bits_[0] |= 0x00000001u;
   source_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Source.source)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Source.source)
 }
 inline ::std::string* Source::mutable_source() {
-  set_has_source();
-  // @@protoc_insertion_point(field_mutable:pb.Source.source)
+  _has_bits_[0] |= 0x00000001u;
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Source.source)
   return source_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Source::release_source() {
-  // @@protoc_insertion_point(field_release:pb.Source.source)
+  // @@protoc_insertion_point(field_release:legacy_pb.Source.source)
   if (!has_source()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_source();
+  _has_bits_[0] &= ~0x00000001u;
   return source_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Source::set_allocated_source(::std::string* source) {
-  if (source != NULL) {
-    set_has_source();
+  if (source != nullptr) {
+    _has_bits_[0] |= 0x00000001u;
   } else {
-    clear_has_source();
+    _has_bits_[0] &= ~0x00000001u;
   }
   source_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), source);
-  // @@protoc_insertion_point(field_set_allocated:pb.Source.source)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Source.source)
 }
 
 // required string contentType = 4;
 inline bool Source::has_contenttype() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Source::set_has_contenttype() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void Source::clear_has_contenttype() {
-  _has_bits_[0] &= ~0x00000002u;
-}
 inline void Source::clear_contenttype() {
   contenttype_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_contenttype();
+  _has_bits_[0] &= ~0x00000002u;
 }
 inline const ::std::string& Source::contenttype() const {
-  // @@protoc_insertion_point(field_get:pb.Source.contentType)
+  // @@protoc_insertion_point(field_get:legacy_pb.Source.contentType)
   return contenttype_.GetNoArena();
 }
 inline void Source::set_contenttype(const ::std::string& value) {
-  set_has_contenttype();
+  _has_bits_[0] |= 0x00000002u;
   contenttype_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
-  // @@protoc_insertion_point(field_set:pb.Source.contentType)
+  // @@protoc_insertion_point(field_set:legacy_pb.Source.contentType)
 }
 #if LANG_CXX11
 inline void Source::set_contenttype(::std::string&& value) {
-  set_has_contenttype();
+  _has_bits_[0] |= 0x00000002u;
   contenttype_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
-  // @@protoc_insertion_point(field_set_rvalue:pb.Source.contentType)
+  // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Source.contentType)
 }
 #endif
 inline void Source::set_contenttype(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_contenttype();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000002u;
   contenttype_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
-  // @@protoc_insertion_point(field_set_char:pb.Source.contentType)
+  // @@protoc_insertion_point(field_set_char:legacy_pb.Source.contentType)
 }
 inline void Source::set_contenttype(const char* value, size_t size) {
-  set_has_contenttype();
+  _has_bits_[0] |= 0x00000002u;
   contenttype_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
-  // @@protoc_insertion_point(field_set_pointer:pb.Source.contentType)
+  // @@protoc_insertion_point(field_set_pointer:legacy_pb.Source.contentType)
 }
 inline ::std::string* Source::mutable_contenttype() {
-  set_has_contenttype();
-  // @@protoc_insertion_point(field_mutable:pb.Source.contentType)
+  _has_bits_[0] |= 0x00000002u;
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Source.contentType)
   return contenttype_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Source::release_contenttype() {
-  // @@protoc_insertion_point(field_release:pb.Source.contentType)
+  // @@protoc_insertion_point(field_release:legacy_pb.Source.contentType)
   if (!has_contenttype()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_contenttype();
+  _has_bits_[0] &= ~0x00000002u;
   return contenttype_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Source::set_allocated_contenttype(::std::string* contenttype) {
-  if (contenttype != NULL) {
-    set_has_contenttype();
+  if (contenttype != nullptr) {
+    _has_bits_[0] |= 0x00000002u;
   } else {
-    clear_has_contenttype();
+    _has_bits_[0] &= ~0x00000002u;
   }
   contenttype_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), contenttype);
-  // @@protoc_insertion_point(field_set_allocated:pb.Source.contentType)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Source.contentType)
 }
 
 #ifdef __GNUC__
@@ -510,20 +490,20 @@ inline void Source::set_allocated_contenttype(::std::string* contenttype) {
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Source_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Source_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Source_Version>() {
-  return ::pb::Source_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Source_Version>() {
+  return ::legacy_pb::Source_Version_descriptor();
 }
-template <> struct is_proto_enum< ::pb::Source_SourceTypes> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Source_SourceTypes> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Source_SourceTypes>() {
-  return ::pb::Source_SourceTypes_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Source_SourceTypes>() {
+  return ::legacy_pb::Source_SourceTypes_descriptor();
 }
 
 }  // namespace protobuf
@@ -531,4 +511,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::pb::Source_SourceTypes>() {
 
 // @@protoc_insertion_point(global_scope)
 
+#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_source_2eproto

v1/cpp/stream.pb.cc

@@ -0,0 +1,608 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: stream.proto
+
+#include "stream.pb.h"
+
+#include <algorithm>
+
+#include <google/protobuf/stubs/common.h>
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/extension_set.h>
+#include <google/protobuf/wire_format_lite_inl.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/generated_message_reflection.h>
+#include <google/protobuf/reflection_ops.h>
+#include <google/protobuf/wire_format.h>
+// @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
+
+extern PROTOBUF_INTERNAL_EXPORT_metadata_2eproto ::google::protobuf::internal::SCCInfo<1> scc_info_Metadata_metadata_2eproto;
+extern PROTOBUF_INTERNAL_EXPORT_source_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Source_source_2eproto;
+namespace legacy_pb {
+class StreamDefaultTypeInternal {
+ public:
+  ::google::protobuf::internal::ExplicitlyConstructed<Stream> _instance;
+} _Stream_default_instance_;
+}  // namespace legacy_pb
+static void InitDefaultsStream_stream_2eproto() {
+  GOOGLE_PROTOBUF_VERIFY_VERSION;
+
+  {
+    void* ptr = &::legacy_pb::_Stream_default_instance_;
+    new (ptr) ::legacy_pb::Stream();
+    ::google::protobuf::internal::OnShutdownDestroyMessage(ptr);
+  }
+  ::legacy_pb::Stream::InitAsDefaultInstance();
+}
+
+::google::protobuf::internal::SCCInfo<2> scc_info_Stream_stream_2eproto =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 2, InitDefaultsStream_stream_2eproto}, {
+      &scc_info_Metadata_metadata_2eproto.base,
+      &scc_info_Source_source_2eproto.base,}};
+
+void InitDefaults_stream_2eproto() {
+  ::google::protobuf::internal::InitSCC(&scc_info_Stream_stream_2eproto.base);
+}
+
+::google::protobuf::Metadata file_level_metadata_stream_2eproto[1];
+const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_stream_2eproto[1];
+constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_stream_2eproto = nullptr;
+
+const ::google::protobuf::uint32 TableStruct_stream_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Stream, _has_bits_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Stream, _internal_metadata_),
+  ~0u,  // no _extensions_
+  ~0u,  // no _oneof_case_
+  ~0u,  // no _weak_field_map_
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Stream, version_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Stream, metadata_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Stream, source_),
+  2,
+  0,
+  1,
+};
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  { 0, 8, sizeof(::legacy_pb::Stream)},
+};
+
+static ::google::protobuf::Message const * const file_default_instances[] = {
+  reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Stream_default_instance_),
+};
+
+::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_stream_2eproto = {
+  {}, AddDescriptors_stream_2eproto, "stream.proto", schemas,
+  file_default_instances, TableStruct_stream_2eproto::offsets,
+  file_level_metadata_stream_2eproto, 1, file_level_enum_descriptors_stream_2eproto, file_level_service_descriptors_stream_2eproto,
+};
+
+const char descriptor_table_protodef_stream_2eproto[] =
+  "\n\014stream.proto\022\tlegacy_pb\032\016metadata.prot"
+  "o\032\014source.proto\"\252\001\n\006Stream\022*\n\007version\030\001 "
+  "\002(\0162\031.legacy_pb.Stream.Version\022%\n\010metada"
+  "ta\030\002 \002(\0132\023.legacy_pb.Metadata\022!\n\006source\030"
+  "\003 \002(\0132\021.legacy_pb.Source\"*\n\007Version\022\023\n\017U"
+  "NKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001"
+  ;
+::google::protobuf::internal::DescriptorTable descriptor_table_stream_2eproto = {
+  false, InitDefaults_stream_2eproto, 
+  descriptor_table_protodef_stream_2eproto,
+  "stream.proto", &assign_descriptors_table_stream_2eproto, 228,
+};
+
+void AddDescriptors_stream_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[2] =
+  {
+    ::AddDescriptors_metadata_2eproto,
+    ::AddDescriptors_source_2eproto,
+  };
+ ::google::protobuf::internal::AddDescriptors(&descriptor_table_stream_2eproto, deps, 2);
+}
+
+// Force running AddDescriptors() at dynamic initialization time.
+static bool dynamic_init_dummy_stream_2eproto = []() { AddDescriptors_stream_2eproto(); return true; }();
+namespace legacy_pb {
+const ::google::protobuf::EnumDescriptor* Stream_Version_descriptor() {
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_stream_2eproto);
+  return file_level_enum_descriptors_stream_2eproto[0];
+}
+bool Stream_Version_IsValid(int value) {
+  switch (value) {
+    case 0:
+    case 1:
+      return true;
+    default:
+      return false;
+  }
+}
+
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+const Stream_Version Stream::UNKNOWN_VERSION;
+const Stream_Version Stream::_0_0_1;
+const Stream_Version Stream::Version_MIN;
+const Stream_Version Stream::Version_MAX;
+const int Stream::Version_ARRAYSIZE;
+#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
+
+// ===================================================================
+
+void Stream::InitAsDefaultInstance() {
+  ::legacy_pb::_Stream_default_instance_._instance.get_mutable()->metadata_ = const_cast< ::legacy_pb::Metadata*>(
+      ::legacy_pb::Metadata::internal_default_instance());
+  ::legacy_pb::_Stream_default_instance_._instance.get_mutable()->source_ = const_cast< ::legacy_pb::Source*>(
+      ::legacy_pb::Source::internal_default_instance());
+}
+class Stream::HasBitSetters {
+ public:
+  static void set_has_version(Stream* msg) {
+    msg->_has_bits_[0] |= 0x00000004u;
+  }
+  static const ::legacy_pb::Metadata& metadata(const Stream* msg);
+  static void set_has_metadata(Stream* msg) {
+    msg->_has_bits_[0] |= 0x00000001u;
+  }
+  static const ::legacy_pb::Source& source(const Stream* msg);
+  static void set_has_source(Stream* msg) {
+    msg->_has_bits_[0] |= 0x00000002u;
+  }
+};
+
+const ::legacy_pb::Metadata&
+Stream::HasBitSetters::metadata(const Stream* msg) {
+  return *msg->metadata_;
+}
+const ::legacy_pb::Source&
+Stream::HasBitSetters::source(const Stream* msg) {
+  return *msg->source_;
+}
+void Stream::clear_metadata() {
+  if (metadata_ != nullptr) metadata_->Clear();
+  _has_bits_[0] &= ~0x00000001u;
+}
+void Stream::clear_source() {
+  if (source_ != nullptr) source_->Clear();
+  _has_bits_[0] &= ~0x00000002u;
+}
+#if !defined(_MSC_VER) || _MSC_VER >= 1900
+const int Stream::kVersionFieldNumber;
+const int Stream::kMetadataFieldNumber;
+const int Stream::kSourceFieldNumber;
+#endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
+
+Stream::Stream()
+  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
+  SharedCtor();
+  // @@protoc_insertion_point(constructor:legacy_pb.Stream)
+}
+Stream::Stream(const Stream& from)
+  : ::google::protobuf::Message(),
+      _internal_metadata_(nullptr),
+      _has_bits_(from._has_bits_) {
+  _internal_metadata_.MergeFrom(from._internal_metadata_);
+  if (from.has_metadata()) {
+    metadata_ = new ::legacy_pb::Metadata(*from.metadata_);
+  } else {
+    metadata_ = nullptr;
+  }
+  if (from.has_source()) {
+    source_ = new ::legacy_pb::Source(*from.source_);
+  } else {
+    source_ = nullptr;
+  }
+  version_ = from.version_;
+  // @@protoc_insertion_point(copy_constructor:legacy_pb.Stream)
+}
+
+void Stream::SharedCtor() {
+  ::google::protobuf::internal::InitSCC(
+      &scc_info_Stream_stream_2eproto.base);
+  ::memset(&metadata_, 0, static_cast<size_t>(
+      reinterpret_cast<char*>(&version_) -
+      reinterpret_cast<char*>(&metadata_)) + sizeof(version_));
+}
+
+Stream::~Stream() {
+  // @@protoc_insertion_point(destructor:legacy_pb.Stream)
+  SharedDtor();
+}
+
+void Stream::SharedDtor() {
+  if (this != internal_default_instance()) delete metadata_;
+  if (this != internal_default_instance()) delete source_;
+}
+
+void Stream::SetCachedSize(int size) const {
+  _cached_size_.Set(size);
+}
+const Stream& Stream::default_instance() {
+  ::google::protobuf::internal::InitSCC(&::scc_info_Stream_stream_2eproto.base);
+  return *internal_default_instance();
+}
+
+
+void Stream::Clear() {
+// @@protoc_insertion_point(message_clear_start:legacy_pb.Stream)
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
+  cached_has_bits = _has_bits_[0];
+  if (cached_has_bits & 0x00000003u) {
+    if (cached_has_bits & 0x00000001u) {
+      GOOGLE_DCHECK(metadata_ != nullptr);
+      metadata_->Clear();
+    }
+    if (cached_has_bits & 0x00000002u) {
+      GOOGLE_DCHECK(source_ != nullptr);
+      source_->Clear();
+    }
+  }
+  version_ = 0;
+  _has_bits_.Clear();
+  _internal_metadata_.Clear();
+}
+
+#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+const char* Stream::_InternalParse(const char* begin, const char* end, void* object,
+                  ::google::protobuf::internal::ParseContext* ctx) {
+  auto msg = static_cast<Stream*>(object);
+  ::google::protobuf::int32 size; (void)size;
+  int depth; (void)depth;
+  ::google::protobuf::uint32 tag;
+  ::google::protobuf::internal::ParseFunc parser_till_end; (void)parser_till_end;
+  auto ptr = begin;
+  while (ptr < end) {
+    ptr = ::google::protobuf::io::Parse32(ptr, &tag);
+    GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+    switch (tag >> 3) {
+      // required .legacy_pb.Stream.Version version = 1;
+      case 1: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 8) goto handle_unusual;
+        ::google::protobuf::uint64 val = ::google::protobuf::internal::ReadVarint(&ptr);
+        if (!::legacy_pb::Stream_Version_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(1, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_version(static_cast<::legacy_pb::Stream_Version>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required .legacy_pb.Metadata metadata = 2;
+      case 2: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 18) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        parser_till_end = ::legacy_pb::Metadata::_InternalParse;
+        object = msg->mutable_metadata();
+        if (size > end - ptr) goto len_delim_till_end;
+        ptr += size;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
+            {parser_till_end, object}, ptr - size, ptr));
+        break;
+      }
+      // required .legacy_pb.Source source = 3;
+      case 3: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 26) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        parser_till_end = ::legacy_pb::Source::_InternalParse;
+        object = msg->mutable_source();
+        if (size > end - ptr) goto len_delim_till_end;
+        ptr += size;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ctx->ParseExactRange(
+            {parser_till_end, object}, ptr - size, ptr));
+        break;
+      }
+      default: {
+      handle_unusual:
+        if ((tag & 7) == 4 || tag == 0) {
+          ctx->EndGroup(tag);
+          return ptr;
+        }
+        auto res = UnknownFieldParse(tag, {_InternalParse, msg},
+          ptr, end, msg->_internal_metadata_.mutable_unknown_fields(), ctx);
+        ptr = res.first;
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr != nullptr);
+        if (res.second) return ptr;
+      }
+    }  // switch
+  }  // while
+  return ptr;
+len_delim_till_end:
+  return ctx->StoreAndTailCall(ptr, end, {_InternalParse, msg},
+                               {parser_till_end, object}, size);
+}
+#else  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+bool Stream::MergePartialFromCodedStream(
+    ::google::protobuf::io::CodedInputStream* input) {
+#define DO_(EXPRESSION) if (!PROTOBUF_PREDICT_TRUE(EXPRESSION)) goto failure
+  ::google::protobuf::uint32 tag;
+  // @@protoc_insertion_point(parse_start:legacy_pb.Stream)
+  for (;;) {
+    ::std::pair<::google::protobuf::uint32, bool> p = input->ReadTagWithCutoffNoLastTag(127u);
+    tag = p.first;
+    if (!p.second) goto handle_unusual;
+    switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
+      // required .legacy_pb.Stream.Version version = 1;
+      case 1: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (8 & 0xFF)) {
+          int value = 0;
+          DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
+                   int, ::google::protobuf::internal::WireFormatLite::TYPE_ENUM>(
+                 input, &value)));
+          if (::legacy_pb::Stream_Version_IsValid(value)) {
+            set_version(static_cast< ::legacy_pb::Stream_Version >(value));
+          } else {
+            mutable_unknown_fields()->AddVarint(
+                1, static_cast<::google::protobuf::uint64>(value));
+          }
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // required .legacy_pb.Metadata metadata = 2;
+      case 2: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
+               input, mutable_metadata()));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      // required .legacy_pb.Source source = 3;
+      case 3: {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (26 & 0xFF)) {
+          DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
+               input, mutable_source()));
+        } else {
+          goto handle_unusual;
+        }
+        break;
+      }
+
+      default: {
+      handle_unusual:
+        if (tag == 0) {
+          goto success;
+        }
+        DO_(::google::protobuf::internal::WireFormat::SkipField(
+              input, tag, _internal_metadata_.mutable_unknown_fields()));
+        break;
+      }
+    }
+  }
+success:
+  // @@protoc_insertion_point(parse_success:legacy_pb.Stream)
+  return true;
+failure:
+  // @@protoc_insertion_point(parse_failure:legacy_pb.Stream)
+  return false;
+#undef DO_
+}
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+
+void Stream::SerializeWithCachedSizes(
+    ::google::protobuf::io::CodedOutputStream* output) const {
+  // @@protoc_insertion_point(serialize_start:legacy_pb.Stream)
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  (void) cached_has_bits;
+
+  cached_has_bits = _has_bits_[0];
+  // required .legacy_pb.Stream.Version version = 1;
+  if (cached_has_bits & 0x00000004u) {
+    ::google::protobuf::internal::WireFormatLite::WriteEnum(
+      1, this->version(), output);
+  }
+
+  // required .legacy_pb.Metadata metadata = 2;
+  if (cached_has_bits & 0x00000001u) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      2, HasBitSetters::metadata(this), output);
+  }
+
+  // required .legacy_pb.Source source = 3;
+  if (cached_has_bits & 0x00000002u) {
+    ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
+      3, HasBitSetters::source(this), output);
+  }
+
+  if (_internal_metadata_.have_unknown_fields()) {
+    ::google::protobuf::internal::WireFormat::SerializeUnknownFields(
+        _internal_metadata_.unknown_fields(), output);
+  }
+  // @@protoc_insertion_point(serialize_end:legacy_pb.Stream)
+}
+
+::google::protobuf::uint8* Stream::InternalSerializeWithCachedSizesToArray(
+    ::google::protobuf::uint8* target) const {
+  // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Stream)
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  (void) cached_has_bits;
+
+  cached_has_bits = _has_bits_[0];
+  // required .legacy_pb.Stream.Version version = 1;
+  if (cached_has_bits & 0x00000004u) {
+    target = ::google::protobuf::internal::WireFormatLite::WriteEnumToArray(
+      1, this->version(), target);
+  }
+
+  // required .legacy_pb.Metadata metadata = 2;
+  if (cached_has_bits & 0x00000001u) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      InternalWriteMessageToArray(
+        2, HasBitSetters::metadata(this), target);
+  }
+
+  // required .legacy_pb.Source source = 3;
+  if (cached_has_bits & 0x00000002u) {
+    target = ::google::protobuf::internal::WireFormatLite::
+      InternalWriteMessageToArray(
+        3, HasBitSetters::source(this), target);
+  }
+
+  if (_internal_metadata_.have_unknown_fields()) {
+    target = ::google::protobuf::internal::WireFormat::SerializeUnknownFieldsToArray(
+        _internal_metadata_.unknown_fields(), target);
+  }
+  // @@protoc_insertion_point(serialize_to_array_end:legacy_pb.Stream)
+  return target;
+}
+
+size_t Stream::RequiredFieldsByteSizeFallback() const {
+// @@protoc_insertion_point(required_fields_byte_size_fallback_start:legacy_pb.Stream)
+  size_t total_size = 0;
+
+  if (has_metadata()) {
+    // required .legacy_pb.Metadata metadata = 2;
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::MessageSize(
+        *metadata_);
+  }
+
+  if (has_source()) {
+    // required .legacy_pb.Source source = 3;
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::MessageSize(
+        *source_);
+  }
+
+  if (has_version()) {
+    // required .legacy_pb.Stream.Version version = 1;
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
+  }
+
+  return total_size;
+}
+size_t Stream::ByteSizeLong() const {
+// @@protoc_insertion_point(message_byte_size_start:legacy_pb.Stream)
+  size_t total_size = 0;
+
+  if (_internal_metadata_.have_unknown_fields()) {
+    total_size +=
+      ::google::protobuf::internal::WireFormat::ComputeUnknownFieldsSize(
+        _internal_metadata_.unknown_fields());
+  }
+  if (((_has_bits_[0] & 0x00000007) ^ 0x00000007) == 0) {  // All required fields are present.
+    // required .legacy_pb.Metadata metadata = 2;
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::MessageSize(
+        *metadata_);
+
+    // required .legacy_pb.Source source = 3;
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::MessageSize(
+        *source_);
+
+    // required .legacy_pb.Stream.Version version = 1;
+    total_size += 1 +
+      ::google::protobuf::internal::WireFormatLite::EnumSize(this->version());
+
+  } else {
+    total_size += RequiredFieldsByteSizeFallback();
+  }
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
+  int cached_size = ::google::protobuf::internal::ToCachedSize(total_size);
+  SetCachedSize(cached_size);
+  return total_size;
+}
+
+void Stream::MergeFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Stream)
+  GOOGLE_DCHECK_NE(&from, this);
+  const Stream* source =
+      ::google::protobuf::DynamicCastToGenerated<Stream>(
+          &from);
+  if (source == nullptr) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Stream)
+    ::google::protobuf::internal::ReflectionOps::Merge(from, this);
+  } else {
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:legacy_pb.Stream)
+    MergeFrom(*source);
+  }
+}
+
+void Stream::MergeFrom(const Stream& from) {
+// @@protoc_insertion_point(class_specific_merge_from_start:legacy_pb.Stream)
+  GOOGLE_DCHECK_NE(&from, this);
+  _internal_metadata_.MergeFrom(from._internal_metadata_);
+  ::google::protobuf::uint32 cached_has_bits = 0;
+  (void) cached_has_bits;
+
+  cached_has_bits = from._has_bits_[0];
+  if (cached_has_bits & 0x00000007u) {
+    if (cached_has_bits & 0x00000001u) {
+      mutable_metadata()->::legacy_pb::Metadata::MergeFrom(from.metadata());
+    }
+    if (cached_has_bits & 0x00000002u) {
+      mutable_source()->::legacy_pb::Source::MergeFrom(from.source());
+    }
+    if (cached_has_bits & 0x00000004u) {
+      version_ = from.version_;
+    }
+    _has_bits_[0] |= cached_has_bits;
+  }
+}
+
+void Stream::CopyFrom(const ::google::protobuf::Message& from) {
+// @@protoc_insertion_point(generalized_copy_from_start:legacy_pb.Stream)
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void Stream::CopyFrom(const Stream& from) {
+// @@protoc_insertion_point(class_specific_copy_from_start:legacy_pb.Stream)
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool Stream::IsInitialized() const {
+  if ((_has_bits_[0] & 0x00000007) != 0x00000007) return false;
+  if (has_metadata()) {
+    if (!this->metadata_->IsInitialized()) return false;
+  }
+  if (has_source()) {
+    if (!this->source_->IsInitialized()) return false;
+  }
+  return true;
+}
+
+void Stream::Swap(Stream* other) {
+  if (other == this) return;
+  InternalSwap(other);
+}
+void Stream::InternalSwap(Stream* other) {
+  using std::swap;
+  _internal_metadata_.Swap(&other->_internal_metadata_);
+  swap(_has_bits_[0], other->_has_bits_[0]);
+  swap(metadata_, other->metadata_);
+  swap(source_, other->source_);
+  swap(version_, other->version_);
+}
+
+::google::protobuf::Metadata Stream::GetMetadata() const {
+  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_stream_2eproto);
+  return ::file_level_metadata_stream_2eproto[kIndexInFileMessages];
+}
+
+
+// @@protoc_insertion_point(namespace_scope)
+}  // namespace legacy_pb
+namespace google {
+namespace protobuf {
+template<> PROTOBUF_NOINLINE ::legacy_pb::Stream* Arena::CreateMaybeMessage< ::legacy_pb::Stream >(Arena* arena) {
+  return Arena::CreateInternal< ::legacy_pb::Stream >(arena);
+}
+}  // namespace protobuf
+}  // namespace google
+
+// @@protoc_insertion_point(global_scope)
+#include <google/protobuf/port_undef.inc>

v1/cpp/stream.pb.h

@@ -4,21 +4,22 @@
 #ifndef PROTOBUF_INCLUDED_stream_2eproto
 #define PROTOBUF_INCLUDED_stream_2eproto
 
+#include <limits>
 #include <string>
 
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3006000
+#include <google/protobuf/port_def.inc>
+#if PROTOBUF_VERSION < 3007000
 #error This file was generated by a newer version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please update
+#error incompatible with your Protocol Buffer headers. Please update
 #error your headers.
 #endif
-#if 3006000 < GOOGLE_PROTOBUF_MIN_PROTOC_VERSION
+#if 3007000 < PROTOBUF_MIN_PROTOC_VERSION
 #error This file was generated by an older version of protoc which is
-#error incompatible with your Protocol Buffer headers.  Please
+#error incompatible with your Protocol Buffer headers. Please
 #error regenerate this file with a newer version of protoc.
 #endif
 
+#include <google/protobuf/port_undef.inc>
 #include <google/protobuf/io/coded_stream.h>
 #include <google/protobuf/arena.h>
 #include <google/protobuf/arenastring.h>
@@ -34,31 +35,33 @@
 #include "metadata.pb.h"
 #include "source.pb.h"
 // @@protoc_insertion_point(includes)
-#define PROTOBUF_INTERNAL_EXPORT_protobuf_stream_2eproto 
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_stream_2eproto
 
-namespace protobuf_stream_2eproto {
 // Internal implementation detail -- do not use these members.
-struct TableStruct {
-  static const ::google::protobuf::internal::ParseTableField entries[];
-  static const ::google::protobuf::internal::AuxillaryParseTableField aux[];
-  static const ::google::protobuf::internal::ParseTable schema[1];
+struct TableStruct_stream_2eproto {
+  static const ::google::protobuf::internal::ParseTableField entries[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::AuxillaryParseTableField aux[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::google::protobuf::internal::ParseTable schema[1]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
   static const ::google::protobuf::internal::FieldMetadata field_metadata[];
   static const ::google::protobuf::internal::SerializationTable serialization_table[];
   static const ::google::protobuf::uint32 offsets[];
 };
-void AddDescriptors();
-}  // namespace protobuf_stream_2eproto
-namespace pb {
+void AddDescriptors_stream_2eproto();
+namespace legacy_pb {
 class Stream;
 class StreamDefaultTypeInternal;
 extern StreamDefaultTypeInternal _Stream_default_instance_;
-}  // namespace pb
+}  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> ::pb::Stream* Arena::CreateMaybeMessage<::pb::Stream>(Arena*);
+template<> ::legacy_pb::Stream* Arena::CreateMaybeMessage<::legacy_pb::Stream>(Arena*);
 }  // namespace protobuf
 }  // namespace google
-namespace pb {
+namespace legacy_pb {
 
 enum Stream_Version {
   Stream_Version_UNKNOWN_VERSION = 0,
@@ -81,7 +84,8 @@ inline bool Stream_Version_Parse(
 }
 // ===================================================================
 
-class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:pb.Stream) */ {
+class Stream final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Stream) */ {
  public:
   Stream();
   virtual ~Stream();
@@ -114,7 +118,9 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
     return _internal_metadata_.mutable_unknown_fields();
   }
 
-  static const ::google::protobuf::Descriptor* descriptor();
+  static const ::google::protobuf::Descriptor* descriptor() {
+    return default_instance().GetDescriptor();
+  }
   static const Stream& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -133,7 +139,7 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   // implements Message ----------------------------------------------
 
   inline Stream* New() const final {
-    return CreateMaybeMessage<Stream>(NULL);
+    return CreateMaybeMessage<Stream>(nullptr);
   }
 
   Stream* New(::google::protobuf::Arena* arena) const final {
@@ -143,16 +149,21 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Stream& from);
   void MergeFrom(const Stream& from);
-  void Clear() final;
+  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
   bool IsInitialized() const final;
 
   size_t ByteSizeLong() const final;
+  #if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+  static const char* _InternalParse(const char* begin, const char* end, void* object, ::google::protobuf::internal::ParseContext* ctx);
+  ::google::protobuf::internal::ParseFunc _ParseFunc() const final { return _InternalParse; }
+  #else
   bool MergePartialFromCodedStream(
       ::google::protobuf::io::CodedInputStream* input) final;
+  #endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
   void SerializeWithCachedSizes(
       ::google::protobuf::io::CodedOutputStream* output) const final;
   ::google::protobuf::uint8* InternalSerializeWithCachedSizesToArray(
-      bool deterministic, ::google::protobuf::uint8* target) const final;
+      ::google::protobuf::uint8* target) const final;
   int GetCachedSize() const final { return _cached_size_.Get(); }
 
   private:
@@ -162,10 +173,10 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   void InternalSwap(Stream* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return NULL;
+    return nullptr;
   }
   inline void* MaybeArenaPtr() const {
-    return NULL;
+    return nullptr;
   }
   public:
 
@@ -201,45 +212,34 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
 
   // accessors -------------------------------------------------------
 
-  // required .pb.Metadata metadata = 2;
+  // required .legacy_pb.Metadata metadata = 2;
   bool has_metadata() const;
   void clear_metadata();
   static const int kMetadataFieldNumber = 2;
-  private:
-  const ::pb::Metadata& _internal_metadata() const;
-  public:
-  const ::pb::Metadata& metadata() const;
-  ::pb::Metadata* release_metadata();
-  ::pb::Metadata* mutable_metadata();
-  void set_allocated_metadata(::pb::Metadata* metadata);
+  const ::legacy_pb::Metadata& metadata() const;
+  ::legacy_pb::Metadata* release_metadata();
+  ::legacy_pb::Metadata* mutable_metadata();
+  void set_allocated_metadata(::legacy_pb::Metadata* metadata);
 
-  // required .pb.Source source = 3;
+  // required .legacy_pb.Source source = 3;
   bool has_source() const;
   void clear_source();
   static const int kSourceFieldNumber = 3;
-  private:
-  const ::pb::Source& _internal_source() const;
-  public:
-  const ::pb::Source& source() const;
-  ::pb::Source* release_source();
-  ::pb::Source* mutable_source();
-  void set_allocated_source(::pb::Source* source);
+  const ::legacy_pb::Source& source() const;
+  ::legacy_pb::Source* release_source();
+  ::legacy_pb::Source* mutable_source();
+  void set_allocated_source(::legacy_pb::Source* source);
 
-  // required .pb.Stream.Version version = 1;
+  // required .legacy_pb.Stream.Version version = 1;
   bool has_version() const;
   void clear_version();
   static const int kVersionFieldNumber = 1;
-  ::pb::Stream_Version version() const;
-  void set_version(::pb::Stream_Version value);
+  ::legacy_pb::Stream_Version version() const;
+  void set_version(::legacy_pb::Stream_Version value);
 
-  // @@protoc_insertion_point(class_scope:pb.Stream)
+  // @@protoc_insertion_point(class_scope:legacy_pb.Stream)
  private:
-  void set_has_version();
-  void clear_has_version();
-  void set_has_metadata();
-  void clear_has_metadata();
-  void set_has_source();
-  void clear_has_source();
+  class HasBitSetters;
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -247,10 +247,10 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   ::google::protobuf::internal::InternalMetadataWithArena _internal_metadata_;
   ::google::protobuf::internal::HasBits<1> _has_bits_;
   mutable ::google::protobuf::internal::CachedSize _cached_size_;
-  ::pb::Metadata* metadata_;
-  ::pb::Source* source_;
+  ::legacy_pb::Metadata* metadata_;
+  ::legacy_pb::Source* source_;
   int version_;
-  friend struct ::protobuf_stream_2eproto::TableStruct;
+  friend struct ::TableStruct_stream_2eproto;
 };
 // ===================================================================
 
@@ -263,137 +263,113 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
 #endif  // __GNUC__
 // Stream
 
-// required .pb.Stream.Version version = 1;
+// required .legacy_pb.Stream.Version version = 1;
 inline bool Stream::has_version() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Stream::set_has_version() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void Stream::clear_has_version() {
-  _has_bits_[0] &= ~0x00000004u;
-}
 inline void Stream::clear_version() {
   version_ = 0;
-  clear_has_version();
+  _has_bits_[0] &= ~0x00000004u;
 }
-inline ::pb::Stream_Version Stream::version() const {
-  // @@protoc_insertion_point(field_get:pb.Stream.version)
-  return static_cast< ::pb::Stream_Version >(version_);
+inline ::legacy_pb::Stream_Version Stream::version() const {
+  // @@protoc_insertion_point(field_get:legacy_pb.Stream.version)
+  return static_cast< ::legacy_pb::Stream_Version >(version_);
 }
-inline void Stream::set_version(::pb::Stream_Version value) {
-  assert(::pb::Stream_Version_IsValid(value));
-  set_has_version();
+inline void Stream::set_version(::legacy_pb::Stream_Version value) {
+  assert(::legacy_pb::Stream_Version_IsValid(value));
+  _has_bits_[0] |= 0x00000004u;
   version_ = value;
-  // @@protoc_insertion_point(field_set:pb.Stream.version)
+  // @@protoc_insertion_point(field_set:legacy_pb.Stream.version)
 }
 
-// required .pb.Metadata metadata = 2;
+// required .legacy_pb.Metadata metadata = 2;
 inline bool Stream::has_metadata() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Stream::set_has_metadata() {
-  _has_bits_[0] |= 0x00000001u;
+inline const ::legacy_pb::Metadata& Stream::metadata() const {
+  const ::legacy_pb::Metadata* p = metadata_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Stream.metadata)
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Metadata*>(
+      &::legacy_pb::_Metadata_default_instance_);
 }
-inline void Stream::clear_has_metadata() {
+inline ::legacy_pb::Metadata* Stream::release_metadata() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Stream.metadata)
   _has_bits_[0] &= ~0x00000001u;
-}
-inline const ::pb::Metadata& Stream::_internal_metadata() const {
-  return *metadata_;
-}
-inline const ::pb::Metadata& Stream::metadata() const {
-  const ::pb::Metadata* p = metadata_;
-  // @@protoc_insertion_point(field_get:pb.Stream.metadata)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Metadata*>(
-      &::pb::_Metadata_default_instance_);
-}
-inline ::pb::Metadata* Stream::release_metadata() {
-  // @@protoc_insertion_point(field_release:pb.Stream.metadata)
-  clear_has_metadata();
-  ::pb::Metadata* temp = metadata_;
-  metadata_ = NULL;
+  ::legacy_pb::Metadata* temp = metadata_;
+  metadata_ = nullptr;
   return temp;
 }
-inline ::pb::Metadata* Stream::mutable_metadata() {
-  set_has_metadata();
-  if (metadata_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Metadata>(GetArenaNoVirtual());
+inline ::legacy_pb::Metadata* Stream::mutable_metadata() {
+  _has_bits_[0] |= 0x00000001u;
+  if (metadata_ == nullptr) {
+    auto* p = CreateMaybeMessage<::legacy_pb::Metadata>(GetArenaNoVirtual());
     metadata_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Stream.metadata)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Stream.metadata)
   return metadata_;
 }
-inline void Stream::set_allocated_metadata(::pb::Metadata* metadata) {
+inline void Stream::set_allocated_metadata(::legacy_pb::Metadata* metadata) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
+  if (message_arena == nullptr) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(metadata_);
   }
   if (metadata) {
-    ::google::protobuf::Arena* submessage_arena = NULL;
+    ::google::protobuf::Arena* submessage_arena = nullptr;
     if (message_arena != submessage_arena) {
       metadata = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, metadata, submessage_arena);
     }
-    set_has_metadata();
+    _has_bits_[0] |= 0x00000001u;
   } else {
-    clear_has_metadata();
+    _has_bits_[0] &= ~0x00000001u;
   }
   metadata_ = metadata;
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.metadata)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Stream.metadata)
 }
 
-// required .pb.Source source = 3;
+// required .legacy_pb.Source source = 3;
 inline bool Stream::has_source() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Stream::set_has_source() {
-  _has_bits_[0] |= 0x00000002u;
+inline const ::legacy_pb::Source& Stream::source() const {
+  const ::legacy_pb::Source* p = source_;
+  // @@protoc_insertion_point(field_get:legacy_pb.Stream.source)
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Source*>(
+      &::legacy_pb::_Source_default_instance_);
 }
-inline void Stream::clear_has_source() {
+inline ::legacy_pb::Source* Stream::release_source() {
+  // @@protoc_insertion_point(field_release:legacy_pb.Stream.source)
   _has_bits_[0] &= ~0x00000002u;
-}
-inline const ::pb::Source& Stream::_internal_source() const {
-  return *source_;
-}
-inline const ::pb::Source& Stream::source() const {
-  const ::pb::Source* p = source_;
-  // @@protoc_insertion_point(field_get:pb.Stream.source)
-  return p != NULL ? *p : *reinterpret_cast<const ::pb::Source*>(
-      &::pb::_Source_default_instance_);
-}
-inline ::pb::Source* Stream::release_source() {
-  // @@protoc_insertion_point(field_release:pb.Stream.source)
-  clear_has_source();
-  ::pb::Source* temp = source_;
-  source_ = NULL;
+  ::legacy_pb::Source* temp = source_;
+  source_ = nullptr;
   return temp;
 }
-inline ::pb::Source* Stream::mutable_source() {
-  set_has_source();
-  if (source_ == NULL) {
-    auto* p = CreateMaybeMessage<::pb::Source>(GetArenaNoVirtual());
+inline ::legacy_pb::Source* Stream::mutable_source() {
+  _has_bits_[0] |= 0x00000002u;
+  if (source_ == nullptr) {
+    auto* p = CreateMaybeMessage<::legacy_pb::Source>(GetArenaNoVirtual());
     source_ = p;
   }
-  // @@protoc_insertion_point(field_mutable:pb.Stream.source)
+  // @@protoc_insertion_point(field_mutable:legacy_pb.Stream.source)
   return source_;
 }
-inline void Stream::set_allocated_source(::pb::Source* source) {
+inline void Stream::set_allocated_source(::legacy_pb::Source* source) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
+  if (message_arena == nullptr) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(source_);
   }
   if (source) {
-    ::google::protobuf::Arena* submessage_arena = NULL;
+    ::google::protobuf::Arena* submessage_arena = nullptr;
     if (message_arena != submessage_arena) {
       source = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, source, submessage_arena);
     }
-    set_has_source();
+    _has_bits_[0] |= 0x00000002u;
   } else {
-    clear_has_source();
+    _has_bits_[0] &= ~0x00000002u;
   }
   source_ = source;
-  // @@protoc_insertion_point(field_set_allocated:pb.Stream.source)
+  // @@protoc_insertion_point(field_set_allocated:legacy_pb.Stream.source)
 }
 
 #ifdef __GNUC__
@@ -402,15 +378,15 @@ inline void Stream::set_allocated_source(::pb::Source* source) {
 
 // @@protoc_insertion_point(namespace_scope)
 
-}  // namespace pb
+}  // namespace legacy_pb
 
 namespace google {
 namespace protobuf {
 
-template <> struct is_proto_enum< ::pb::Stream_Version> : ::std::true_type {};
+template <> struct is_proto_enum< ::legacy_pb::Stream_Version> : ::std::true_type {};
 template <>
-inline const EnumDescriptor* GetEnumDescriptor< ::pb::Stream_Version>() {
-  return ::pb::Stream_Version_descriptor();
+inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Stream_Version>() {
+  return ::legacy_pb::Stream_Version_descriptor();
 }
 
 }  // namespace protobuf
@@ -418,4 +394,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::pb::Stream_Version>() {
 
 // @@protoc_insertion_point(global_scope)
 
+#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_stream_2eproto

v1/go/certificate.pb.go

@@ -0,0 +1,190 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: certificate.proto
+
+package legacy_pb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type KeyType int32
+
+const (
+	KeyType_UNKNOWN_PUBLIC_KEY_TYPE KeyType = 0
+	KeyType_NIST256p                KeyType = 1
+	KeyType_NIST384p                KeyType = 2
+	KeyType_SECP256k1               KeyType = 3
+)
+
+var KeyType_name = map[int32]string{
+	0: "UNKNOWN_PUBLIC_KEY_TYPE",
+	1: "NIST256p",
+	2: "NIST384p",
+	3: "SECP256k1",
+}
+
+var KeyType_value = map[string]int32{
+	"UNKNOWN_PUBLIC_KEY_TYPE": 0,
+	"NIST256p":                1,
+	"NIST384p":                2,
+	"SECP256k1":               3,
+}
+
+func (x KeyType) Enum() *KeyType {
+	p := new(KeyType)
+	*p = x
+	return p
+}
+
+func (x KeyType) String() string {
+	return proto.EnumName(KeyType_name, int32(x))
+}
+
+func (x *KeyType) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(KeyType_value, data, "KeyType")
+	if err != nil {
+		return err
+	}
+	*x = KeyType(value)
+	return nil
+}
+
+func (KeyType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_c0d34c34dd33be4b, []int{0}
+}
+
+type Certificate_Version int32
+
+const (
+	Certificate_UNKNOWN_VERSION Certificate_Version = 0
+	Certificate__0_0_1          Certificate_Version = 1
+)
+
+var Certificate_Version_name = map[int32]string{
+	0: "UNKNOWN_VERSION",
+	1: "_0_0_1",
+}
+
+var Certificate_Version_value = map[string]int32{
+	"UNKNOWN_VERSION": 0,
+	"_0_0_1":          1,
+}
+
+func (x Certificate_Version) Enum() *Certificate_Version {
+	p := new(Certificate_Version)
+	*p = x
+	return p
+}
+
+func (x Certificate_Version) String() string {
+	return proto.EnumName(Certificate_Version_name, int32(x))
+}
+
+func (x *Certificate_Version) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Certificate_Version_value, data, "Certificate_Version")
+	if err != nil {
+		return err
+	}
+	*x = Certificate_Version(value)
+	return nil
+}
+
+func (Certificate_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_c0d34c34dd33be4b, []int{0, 0}
+}
+
+type Certificate struct {
+	Version              *Certificate_Version `protobuf:"varint,1,req,name=version,enum=legacy_pb.Certificate_Version" json:"version,omitempty"`
+	KeyType              *KeyType             `protobuf:"varint,2,req,name=keyType,enum=legacy_pb.KeyType" json:"keyType,omitempty"`
+	PublicKey            []byte               `protobuf:"bytes,4,req,name=publicKey" json:"publicKey,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}             `json:"-"`
+	XXX_unrecognized     []byte               `json:"-"`
+	XXX_sizecache        int32                `json:"-"`
+}
+
+func (m *Certificate) Reset()         { *m = Certificate{} }
+func (m *Certificate) String() string { return proto.CompactTextString(m) }
+func (*Certificate) ProtoMessage()    {}
+func (*Certificate) Descriptor() ([]byte, []int) {
+	return fileDescriptor_c0d34c34dd33be4b, []int{0}
+}
+
+func (m *Certificate) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Certificate.Unmarshal(m, b)
+}
+func (m *Certificate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Certificate.Marshal(b, m, deterministic)
+}
+func (m *Certificate) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Certificate.Merge(m, src)
+}
+func (m *Certificate) XXX_Size() int {
+	return xxx_messageInfo_Certificate.Size(m)
+}
+func (m *Certificate) XXX_DiscardUnknown() {
+	xxx_messageInfo_Certificate.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Certificate proto.InternalMessageInfo
+
+func (m *Certificate) GetVersion() Certificate_Version {
+	if m != nil && m.Version != nil {
+		return *m.Version
+	}
+	return Certificate_UNKNOWN_VERSION
+}
+
+func (m *Certificate) GetKeyType() KeyType {
+	if m != nil && m.KeyType != nil {
+		return *m.KeyType
+	}
+	return KeyType_UNKNOWN_PUBLIC_KEY_TYPE
+}
+
+func (m *Certificate) GetPublicKey() []byte {
+	if m != nil {
+		return m.PublicKey
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterEnum("legacy_pb.KeyType", KeyType_name, KeyType_value)
+	proto.RegisterEnum("legacy_pb.Certificate_Version", Certificate_Version_name, Certificate_Version_value)
+	proto.RegisterType((*Certificate)(nil), "legacy_pb.Certificate")
+}
+
+func init() { proto.RegisterFile("certificate.proto", fileDescriptor_c0d34c34dd33be4b) }
+
+var fileDescriptor_c0d34c34dd33be4b = []byte{
+	// 245 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4c, 0x4e, 0x2d, 0x2a,
+	0xc9, 0x4c, 0xcb, 0x4c, 0x4e, 0x2c, 0x49, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcc,
+	0x49, 0x4d, 0x4f, 0x4c, 0xae, 0x8c, 0x2f, 0x48, 0x52, 0xda, 0xcf, 0xc8, 0xc5, 0xed, 0x8c, 0x50,
+	0x20, 0x64, 0xc1, 0xc5, 0x5e, 0x96, 0x5a, 0x54, 0x9c, 0x99, 0x9f, 0x27, 0xc1, 0xa8, 0xc0, 0xa4,
+	0xc1, 0x67, 0x24, 0xa7, 0x07, 0x57, 0xac, 0x87, 0xa4, 0x50, 0x2f, 0x0c, 0xa2, 0x2a, 0x08, 0xa6,
+	0x5c, 0x48, 0x87, 0x8b, 0x3d, 0x3b, 0xb5, 0x32, 0xa4, 0xb2, 0x20, 0x55, 0x82, 0x09, 0xac, 0x53,
+	0x08, 0x49, 0xa7, 0x37, 0x44, 0x26, 0x08, 0xa6, 0x44, 0x48, 0x86, 0x8b, 0xb3, 0xa0, 0x34, 0x29,
+	0x27, 0x33, 0xd9, 0x3b, 0xb5, 0x52, 0x82, 0x45, 0x81, 0x49, 0x83, 0x27, 0x08, 0x21, 0xa0, 0xa4,
+	0xc5, 0xc5, 0x0e, 0x35, 0x5f, 0x48, 0x98, 0x8b, 0x3f, 0xd4, 0xcf, 0xdb, 0xcf, 0x3f, 0xdc, 0x2f,
+	0x3e, 0xcc, 0x35, 0x28, 0xd8, 0xd3, 0xdf, 0x4f, 0x80, 0x41, 0x88, 0x8b, 0x8b, 0x2d, 0xde, 0x20,
+	0xde, 0x20, 0xde, 0x50, 0x80, 0x51, 0x2b, 0x90, 0x8b, 0x1d, 0x6a, 0xba, 0x90, 0x34, 0x97, 0x38,
+	0x4c, 0x6d, 0x40, 0xa8, 0x93, 0x8f, 0xa7, 0x73, 0xbc, 0xb7, 0x6b, 0x64, 0x7c, 0x48, 0x64, 0x80,
+	0xab, 0x00, 0x83, 0x10, 0x0f, 0x17, 0x87, 0x9f, 0x67, 0x70, 0x88, 0x91, 0xa9, 0x59, 0x81, 0x00,
+	0x23, 0x8c, 0x67, 0x6c, 0x61, 0x52, 0x20, 0xc0, 0x24, 0xc4, 0xcb, 0xc5, 0x19, 0xec, 0xea, 0x1c,
+	0x60, 0x64, 0x6a, 0x96, 0x6d, 0x28, 0xc0, 0x0c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x5a, 0x95, 0x46,
+	0xe4, 0x33, 0x01, 0x00, 0x00,
+}

v1/go/fee.pb.go

@@ -0,0 +1,197 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: fee.proto
+
+package legacy_pb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type Fee_Version int32
+
+const (
+	Fee_UNKNOWN_VERSION Fee_Version = 0
+	Fee__0_0_1          Fee_Version = 1
+)
+
+var Fee_Version_name = map[int32]string{
+	0: "UNKNOWN_VERSION",
+	1: "_0_0_1",
+}
+
+var Fee_Version_value = map[string]int32{
+	"UNKNOWN_VERSION": 0,
+	"_0_0_1":          1,
+}
+
+func (x Fee_Version) Enum() *Fee_Version {
+	p := new(Fee_Version)
+	*p = x
+	return p
+}
+
+func (x Fee_Version) String() string {
+	return proto.EnumName(Fee_Version_name, int32(x))
+}
+
+func (x *Fee_Version) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Fee_Version_value, data, "Fee_Version")
+	if err != nil {
+		return err
+	}
+	*x = Fee_Version(value)
+	return nil
+}
+
+func (Fee_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_fa8e5264b1207167, []int{0, 0}
+}
+
+type Fee_Currency int32
+
+const (
+	Fee_UNKNOWN_CURRENCY Fee_Currency = 0
+	Fee_LBC              Fee_Currency = 1
+	Fee_BTC              Fee_Currency = 2
+	Fee_USD              Fee_Currency = 3
+)
+
+var Fee_Currency_name = map[int32]string{
+	0: "UNKNOWN_CURRENCY",
+	1: "LBC",
+	2: "BTC",
+	3: "USD",
+}
+
+var Fee_Currency_value = map[string]int32{
+	"UNKNOWN_CURRENCY": 0,
+	"LBC":              1,
+	"BTC":              2,
+	"USD":              3,
+}
+
+func (x Fee_Currency) Enum() *Fee_Currency {
+	p := new(Fee_Currency)
+	*p = x
+	return p
+}
+
+func (x Fee_Currency) String() string {
+	return proto.EnumName(Fee_Currency_name, int32(x))
+}
+
+func (x *Fee_Currency) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Fee_Currency_value, data, "Fee_Currency")
+	if err != nil {
+		return err
+	}
+	*x = Fee_Currency(value)
+	return nil
+}
+
+func (Fee_Currency) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_fa8e5264b1207167, []int{0, 1}
+}
+
+type Fee struct {
+	Version              *Fee_Version  `protobuf:"varint,1,req,name=version,enum=legacy_pb.Fee_Version" json:"version,omitempty"`
+	Currency             *Fee_Currency `protobuf:"varint,2,req,name=currency,enum=legacy_pb.Fee_Currency" json:"currency,omitempty"`
+	Address              []byte        `protobuf:"bytes,3,req,name=address" json:"address,omitempty"`
+	Amount               *float32      `protobuf:"fixed32,4,req,name=amount" json:"amount,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *Fee) Reset()         { *m = Fee{} }
+func (m *Fee) String() string { return proto.CompactTextString(m) }
+func (*Fee) ProtoMessage()    {}
+func (*Fee) Descriptor() ([]byte, []int) {
+	return fileDescriptor_fa8e5264b1207167, []int{0}
+}
+
+func (m *Fee) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Fee.Unmarshal(m, b)
+}
+func (m *Fee) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Fee.Marshal(b, m, deterministic)
+}
+func (m *Fee) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Fee.Merge(m, src)
+}
+func (m *Fee) XXX_Size() int {
+	return xxx_messageInfo_Fee.Size(m)
+}
+func (m *Fee) XXX_DiscardUnknown() {
+	xxx_messageInfo_Fee.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Fee proto.InternalMessageInfo
+
+func (m *Fee) GetVersion() Fee_Version {
+	if m != nil && m.Version != nil {
+		return *m.Version
+	}
+	return Fee_UNKNOWN_VERSION
+}
+
+func (m *Fee) GetCurrency() Fee_Currency {
+	if m != nil && m.Currency != nil {
+		return *m.Currency
+	}
+	return Fee_UNKNOWN_CURRENCY
+}
+
+func (m *Fee) GetAddress() []byte {
+	if m != nil {
+		return m.Address
+	}
+	return nil
+}
+
+func (m *Fee) GetAmount() float32 {
+	if m != nil && m.Amount != nil {
+		return *m.Amount
+	}
+	return 0
+}
+
+func init() {
+	proto.RegisterEnum("legacy_pb.Fee_Version", Fee_Version_name, Fee_Version_value)
+	proto.RegisterEnum("legacy_pb.Fee_Currency", Fee_Currency_name, Fee_Currency_value)
+	proto.RegisterType((*Fee)(nil), "legacy_pb.Fee")
+}
+
+func init() { proto.RegisterFile("fee.proto", fileDescriptor_fa8e5264b1207167) }
+
+var fileDescriptor_fa8e5264b1207167 = []byte{
+	// 234 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x8d, 0xc1, 0x4b, 0xc3, 0x30,
+	0x18, 0xc5, 0xd7, 0x54, 0xd6, 0xed, 0x43, 0x34, 0x7c, 0xca, 0xcc, 0xb1, 0xf4, 0x54, 0x3c, 0x84,
+	0xaa, 0x47, 0x6f, 0x8b, 0x1b, 0x88, 0x92, 0x41, 0x66, 0x27, 0x9e, 0x42, 0xed, 0x3e, 0x45, 0xd0,
+	0x66, 0xa4, 0x9b, 0xb0, 0xbf, 0xc0, 0x7f, 0x5b, 0xa6, 0xcd, 0x0e, 0xbb, 0xbd, 0xc7, 0xfb, 0x3d,
+	0x7e, 0x30, 0x7c, 0x23, 0x92, 0x2b, 0xef, 0xd6, 0x0e, 0x87, 0x9f, 0xf4, 0x5e, 0xd5, 0x5b, 0xbb,
+	0x7a, 0xcd, 0x7e, 0x18, 0xc4, 0x53, 0x22, 0x2c, 0x20, 0xf9, 0x26, 0xdf, 0x7e, 0xb8, 0x46, 0x44,
+	0x29, 0xcb, 0x4f, 0xae, 0x47, 0x72, 0x0f, 0xc9, 0x29, 0x91, 0x5c, 0xfc, 0xaf, 0x26, 0x60, 0x78,
+	0x03, 0x83, 0x7a, 0xe3, 0x3d, 0x35, 0xf5, 0x56, 0xb0, 0xbf, 0xcb, 0xc5, 0xc1, 0x45, 0x75, 0xb3,
+	0xd9, 0x83, 0x28, 0x20, 0xa9, 0x96, 0x4b, 0x4f, 0x6d, 0x2b, 0xe2, 0x94, 0xe5, 0xc7, 0x26, 0x54,
+	0x1c, 0x41, 0xbf, 0xfa, 0x72, 0x9b, 0x66, 0x2d, 0x8e, 0x52, 0x96, 0x33, 0xd3, 0xb5, 0xec, 0x12,
+	0x92, 0x4e, 0x8d, 0x67, 0x70, 0x5a, 0xea, 0x07, 0x3d, 0x7b, 0xd6, 0x76, 0x31, 0x31, 0xf3, 0xfb,
+	0x99, 0xe6, 0x3d, 0x04, 0xe8, 0xdb, 0xc2, 0x16, 0xf6, 0x8a, 0x47, 0xd9, 0x2d, 0x0c, 0x82, 0x13,
+	0xcf, 0x81, 0x07, 0x58, 0x95, 0xc6, 0x4c, 0xb4, 0x7a, 0xe1, 0x3d, 0x4c, 0x20, 0x7e, 0x1c, 0x2b,
+	0x1e, 0xed, 0xc2, 0xf8, 0x49, 0x71, 0xb6, 0x0b, 0xe5, 0xfc, 0x8e, 0xc7, 0xbf, 0x01, 0x00, 0x00,
+	0xff, 0xff, 0x4c, 0x11, 0x4f, 0xc8, 0x20, 0x01, 0x00, 0x00,
+}

v1/go/legacy_claim.pb.go

@@ -0,0 +1,206 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: legacy_claim.proto
+
+package legacy_pb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type Claim_Version int32
+
+const (
+	Claim_UNKNOWN_VERSION Claim_Version = 0
+	Claim__0_0_1          Claim_Version = 1
+)
+
+var Claim_Version_name = map[int32]string{
+	0: "UNKNOWN_VERSION",
+	1: "_0_0_1",
+}
+
+var Claim_Version_value = map[string]int32{
+	"UNKNOWN_VERSION": 0,
+	"_0_0_1":          1,
+}
+
+func (x Claim_Version) Enum() *Claim_Version {
+	p := new(Claim_Version)
+	*p = x
+	return p
+}
+
+func (x Claim_Version) String() string {
+	return proto.EnumName(Claim_Version_name, int32(x))
+}
+
+func (x *Claim_Version) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Claim_Version_value, data, "Claim_Version")
+	if err != nil {
+		return err
+	}
+	*x = Claim_Version(value)
+	return nil
+}
+
+func (Claim_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_3b52e2f635402822, []int{0, 0}
+}
+
+type Claim_ClaimType int32
+
+const (
+	Claim_UNKNOWN_CLAIM_TYPE Claim_ClaimType = 0
+	Claim_streamType         Claim_ClaimType = 1
+	Claim_certificateType    Claim_ClaimType = 2
+)
+
+var Claim_ClaimType_name = map[int32]string{
+	0: "UNKNOWN_CLAIM_TYPE",
+	1: "streamType",
+	2: "certificateType",
+}
+
+var Claim_ClaimType_value = map[string]int32{
+	"UNKNOWN_CLAIM_TYPE": 0,
+	"streamType":         1,
+	"certificateType":    2,
+}
+
+func (x Claim_ClaimType) Enum() *Claim_ClaimType {
+	p := new(Claim_ClaimType)
+	*p = x
+	return p
+}
+
+func (x Claim_ClaimType) String() string {
+	return proto.EnumName(Claim_ClaimType_name, int32(x))
+}
+
+func (x *Claim_ClaimType) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Claim_ClaimType_value, data, "Claim_ClaimType")
+	if err != nil {
+		return err
+	}
+	*x = Claim_ClaimType(value)
+	return nil
+}
+
+func (Claim_ClaimType) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_3b52e2f635402822, []int{0, 1}
+}
+
+type Claim struct {
+	Version              *Claim_Version   `protobuf:"varint,1,req,name=version,enum=legacy_pb.Claim_Version" json:"version,omitempty"`
+	ClaimType            *Claim_ClaimType `protobuf:"varint,2,req,name=claimType,enum=legacy_pb.Claim_ClaimType" json:"claimType,omitempty"`
+	Stream               *Stream          `protobuf:"bytes,3,opt,name=stream" json:"stream,omitempty"`
+	Certificate          *Certificate     `protobuf:"bytes,4,opt,name=certificate" json:"certificate,omitempty"`
+	PublisherSignature   *Signature       `protobuf:"bytes,5,opt,name=publisherSignature" json:"publisherSignature,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}         `json:"-"`
+	XXX_unrecognized     []byte           `json:"-"`
+	XXX_sizecache        int32            `json:"-"`
+}
+
+func (m *Claim) Reset()         { *m = Claim{} }
+func (m *Claim) String() string { return proto.CompactTextString(m) }
+func (*Claim) ProtoMessage()    {}
+func (*Claim) Descriptor() ([]byte, []int) {
+	return fileDescriptor_3b52e2f635402822, []int{0}
+}
+
+func (m *Claim) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Claim.Unmarshal(m, b)
+}
+func (m *Claim) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Claim.Marshal(b, m, deterministic)
+}
+func (m *Claim) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Claim.Merge(m, src)
+}
+func (m *Claim) XXX_Size() int {
+	return xxx_messageInfo_Claim.Size(m)
+}
+func (m *Claim) XXX_DiscardUnknown() {
+	xxx_messageInfo_Claim.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Claim proto.InternalMessageInfo
+
+func (m *Claim) GetVersion() Claim_Version {
+	if m != nil && m.Version != nil {
+		return *m.Version
+	}
+	return Claim_UNKNOWN_VERSION
+}
+
+func (m *Claim) GetClaimType() Claim_ClaimType {
+	if m != nil && m.ClaimType != nil {
+		return *m.ClaimType
+	}
+	return Claim_UNKNOWN_CLAIM_TYPE
+}
+
+func (m *Claim) GetStream() *Stream {
+	if m != nil {
+		return m.Stream
+	}
+	return nil
+}
+
+func (m *Claim) GetCertificate() *Certificate {
+	if m != nil {
+		return m.Certificate
+	}
+	return nil
+}
+
+func (m *Claim) GetPublisherSignature() *Signature {
+	if m != nil {
+		return m.PublisherSignature
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterEnum("legacy_pb.Claim_Version", Claim_Version_name, Claim_Version_value)
+	proto.RegisterEnum("legacy_pb.Claim_ClaimType", Claim_ClaimType_name, Claim_ClaimType_value)
+	proto.RegisterType((*Claim)(nil), "legacy_pb.Claim")
+}
+
+func init() { proto.RegisterFile("legacy_claim.proto", fileDescriptor_3b52e2f635402822) }
+
+var fileDescriptor_3b52e2f635402822 = []byte{
+	// 293 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x8f, 0x41, 0x4f, 0xfa, 0x40,
+	0x14, 0xc4, 0x29, 0xfc, 0x81, 0xf0, 0xf8, 0x07, 0xca, 0xd3, 0x90, 0x0d, 0x27, 0xc2, 0x09, 0x3d,
+	0x34, 0xd8, 0x13, 0x57, 0x53, 0x49, 0x24, 0x6a, 0x31, 0x5b, 0xc4, 0x78, 0xda, 0x94, 0x66, 0xc5,
+	0x4d, 0x2a, 0x6d, 0xb6, 0xc5, 0x84, 0x2f, 0xe2, 0xe7, 0x35, 0xdd, 0x6e, 0x61, 0x13, 0xbd, 0xce,
+	0xfc, 0xde, 0xbc, 0x19, 0xc0, 0x98, 0xef, 0xc2, 0xe8, 0xc8, 0xa2, 0x38, 0x14, 0x9f, 0x4e, 0x2a,
+	0x93, 0x3c, 0xc1, 0x8e, 0xd6, 0xd2, 0xed, 0xe8, 0x7f, 0x96, 0x4b, 0x1e, 0x6a, 0x63, 0x34, 0x88,
+	0xb8, 0xcc, 0xc5, 0xbb, 0x88, 0xc2, 0x9c, 0x6b, 0xa9, 0x9f, 0x89, 0xdd, 0x3e, 0xcc, 0x0f, 0x52,
+	0x0b, 0x93, 0xef, 0x06, 0x34, 0xbd, 0x22, 0x0c, 0x5d, 0x68, 0x7f, 0x71, 0x99, 0x89, 0x64, 0x4f,
+	0xac, 0x71, 0x7d, 0xda, 0x73, 0x89, 0x73, 0x0a, 0x76, 0x14, 0xe2, 0x6c, 0x4a, 0x9f, 0x56, 0x20,
+	0xce, 0xa1, 0xa3, 0x9a, 0xac, 0x8f, 0x29, 0x27, 0x75, 0x75, 0x35, 0xfa, 0x75, 0xe5, 0x55, 0x04,
+	0x3d, 0xc3, 0x78, 0x05, 0xad, 0xb2, 0x2b, 0x69, 0x8c, 0xad, 0x69, 0xd7, 0x1d, 0x18, 0x67, 0x81,
+	0x32, 0xa8, 0x06, 0x70, 0x0e, 0x5d, 0x63, 0x08, 0xf9, 0xa7, 0xf8, 0xa1, 0xf9, 0xe6, 0xec, 0x52,
+	0x13, 0xc5, 0x3b, 0xc0, 0xf4, 0xb0, 0x8d, 0x45, 0xf6, 0xc1, 0x65, 0x50, 0x0d, 0x27, 0x4d, 0x15,
+	0x70, 0x69, 0x3e, 0xac, 0x3c, 0xfa, 0x07, 0x3f, 0xb9, 0x86, 0xb6, 0x1e, 0x8e, 0x17, 0xd0, 0x7f,
+	0xf1, 0x1f, 0xfc, 0xd5, 0xab, 0xcf, 0x36, 0x0b, 0x1a, 0x2c, 0x57, 0xbe, 0x5d, 0x43, 0x80, 0x16,
+	0x9b, 0xb1, 0x19, 0xbb, 0xb1, 0xad, 0xc9, 0x3d, 0x74, 0x4e, 0x73, 0x71, 0x08, 0x58, 0xd1, 0xde,
+	0xe3, 0xed, 0xf2, 0x89, 0xad, 0xdf, 0x9e, 0x17, 0x76, 0x0d, 0x7b, 0x00, 0xe5, 0xb4, 0x82, 0xb2,
+	0xad, 0x22, 0xd5, 0x68, 0xad, 0xc4, 0xfa, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6e, 0xb6, 0x8d,
+	0x7b, 0xea, 0x01, 0x00, 0x00,
+}

v1/go/metadata.pb.go

@@ -1,17 +1,25 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: metadata.proto
 
-package pb
+package legacy_pb
 
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
 var _ = fmt.Errorf
 var _ = math.Inf
 
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
 type Metadata_Version int32
 
 const (
@@ -29,6 +37,7 @@ var Metadata_Version_name = map[int32]string{
 	3: "_0_0_3",
 	4: "_0_1_0",
 }
+
 var Metadata_Version_value = map[string]int32{
 	"UNKNOWN_VERSION": 0,
 	"_0_0_1":          1,
@@ -42,9 +51,11 @@ func (x Metadata_Version) Enum() *Metadata_Version {
 	*p = x
 	return p
 }
+
 func (x Metadata_Version) String() string {
 	return proto.EnumName(Metadata_Version_name, int32(x))
 }
+
 func (x *Metadata_Version) UnmarshalJSON(data []byte) error {
 	value, err := proto.UnmarshalJSONEnum(Metadata_Version_value, data, "Metadata_Version")
 	if err != nil {
@@ -53,7 +64,10 @@ func (x *Metadata_Version) UnmarshalJSON(data []byte) error {
 	*x = Metadata_Version(value)
 	return nil
 }
-func (Metadata_Version) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 0} }
+
+func (Metadata_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_56d9f74966f40d04, []int{0, 0}
+}
 
 type Metadata_Language int32
 
@@ -432,6 +446,7 @@ var Metadata_Language_name = map[int32]string{
 	183: "zh",
 	184: "zu",
 }
+
 var Metadata_Language_value = map[string]int32{
 	"UNKNOWN_LANGUAGE": 0,
 	"en":               1,
@@ -625,9 +640,11 @@ func (x Metadata_Language) Enum() *Metadata_Language {
 	*p = x
 	return p
 }
+
 func (x Metadata_Language) String() string {
 	return proto.EnumName(Metadata_Language_name, int32(x))
 }
+
 func (x *Metadata_Language) UnmarshalJSON(data []byte) error {
 	value, err := proto.UnmarshalJSONEnum(Metadata_Language_value, data, "Metadata_Language")
 	if err != nil {
@@ -636,27 +653,52 @@ func (x *Metadata_Language) UnmarshalJSON(data []byte) error {
 	*x = Metadata_Language(value)
 	return nil
 }
-func (Metadata_Language) EnumDescriptor() ([]byte, []int) { return fileDescriptor3, []int{0, 1} }
 
-type Metadata struct {
-	Version          *Metadata_Version  `protobuf:"varint,1,req,name=version,enum=pb.Metadata_Version" json:"version,omitempty"`
-	Language         *Metadata_Language `protobuf:"varint,2,req,name=language,enum=pb.Metadata_Language" json:"language,omitempty"`
-	Title            *string            `protobuf:"bytes,3,req,name=title" json:"title,omitempty"`
-	Description      *string            `protobuf:"bytes,4,req,name=description" json:"description,omitempty"`
-	Author           *string            `protobuf:"bytes,5,req,name=author" json:"author,omitempty"`
-	License          *string            `protobuf:"bytes,6,req,name=license" json:"license,omitempty"`
-	Nsfw             *bool              `protobuf:"varint,7,req,name=nsfw" json:"nsfw,omitempty"`
-	Fee              *Fee               `protobuf:"bytes,8,opt,name=fee" json:"fee,omitempty"`
-	Thumbnail        *string            `protobuf:"bytes,9,opt,name=thumbnail" json:"thumbnail,omitempty"`
-	Preview          *string            `protobuf:"bytes,10,opt,name=preview" json:"preview,omitempty"`
-	LicenseUrl       *string            `protobuf:"bytes,11,opt,name=licenseUrl" json:"licenseUrl,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
+func (Metadata_Language) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_56d9f74966f40d04, []int{0, 1}
 }
 
-func (m *Metadata) Reset()                    { *m = Metadata{} }
-func (m *Metadata) String() string            { return proto.CompactTextString(m) }
-func (*Metadata) ProtoMessage()               {}
-func (*Metadata) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} }
+type Metadata struct {
+	Version              *Metadata_Version  `protobuf:"varint,1,req,name=version,enum=legacy_pb.Metadata_Version" json:"version,omitempty"`
+	Language             *Metadata_Language `protobuf:"varint,2,req,name=language,enum=legacy_pb.Metadata_Language" json:"language,omitempty"`
+	Title                *string            `protobuf:"bytes,3,req,name=title" json:"title,omitempty"`
+	Description          *string            `protobuf:"bytes,4,req,name=description" json:"description,omitempty"`
+	Author               *string            `protobuf:"bytes,5,req,name=author" json:"author,omitempty"`
+	License              *string            `protobuf:"bytes,6,req,name=license" json:"license,omitempty"`
+	Nsfw                 *bool              `protobuf:"varint,7,req,name=nsfw" json:"nsfw,omitempty"`
+	Fee                  *Fee               `protobuf:"bytes,8,opt,name=fee" json:"fee,omitempty"`
+	Thumbnail            *string            `protobuf:"bytes,9,opt,name=thumbnail" json:"thumbnail,omitempty"`
+	Preview              *string            `protobuf:"bytes,10,opt,name=preview" json:"preview,omitempty"`
+	LicenseUrl           *string            `protobuf:"bytes,11,opt,name=licenseUrl" json:"licenseUrl,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Metadata) Reset()         { *m = Metadata{} }
+func (m *Metadata) String() string { return proto.CompactTextString(m) }
+func (*Metadata) ProtoMessage()    {}
+func (*Metadata) Descriptor() ([]byte, []int) {
+	return fileDescriptor_56d9f74966f40d04, []int{0}
+}
+
+func (m *Metadata) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Metadata.Unmarshal(m, b)
+}
+func (m *Metadata) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Metadata.Marshal(b, m, deterministic)
+}
+func (m *Metadata) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Metadata.Merge(m, src)
+}
+func (m *Metadata) XXX_Size() int {
+	return xxx_messageInfo_Metadata.Size(m)
+}
+func (m *Metadata) XXX_DiscardUnknown() {
+	xxx_messageInfo_Metadata.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Metadata proto.InternalMessageInfo
 
 func (m *Metadata) GetVersion() Metadata_Version {
 	if m != nil && m.Version != nil {
@@ -736,74 +778,74 @@ func (m *Metadata) GetLicenseUrl() string {
 }
 
 func init() {
-	proto.RegisterType((*Metadata)(nil), "pb.Metadata")
-	proto.RegisterEnum("pb.Metadata_Version", Metadata_Version_name, Metadata_Version_value)
-	proto.RegisterEnum("pb.Metadata_Language", Metadata_Language_name, Metadata_Language_value)
+	proto.RegisterEnum("legacy_pb.Metadata_Version", Metadata_Version_name, Metadata_Version_value)
+	proto.RegisterEnum("legacy_pb.Metadata_Language", Metadata_Language_name, Metadata_Language_value)
+	proto.RegisterType((*Metadata)(nil), "legacy_pb.Metadata")
 }
 
-func init() { proto.RegisterFile("metadata.proto", fileDescriptor3) }
+func init() { proto.RegisterFile("metadata.proto", fileDescriptor_56d9f74966f40d04) }
 
-var fileDescriptor3 = []byte{
-	// 966 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0xd0, 0xe7, 0x7a, 0x1a, 0x47,
-	0x1b, 0xc6, 0x71, 0x83, 0x64, 0x01, 0x2b, 0xbf, 0xf6, 0xfd, 0xae, 0x4b, 0xd6, 0x8e, 0xe3, 0x10,
-	0xa5, 0x91, 0x46, 0x24, 0x39, 0xbd, 0x3b, 0x89, 0xac, 0x38, 0x96, 0x51, 0x82, 0x23, 0x39, 0x9d,
-	0x0c, 0x30, 0x2c, 0x2b, 0x96, 0x5d, 0xb4, 0x0d, 0x43, 0x7a, 0xef, 0xbd, 0x3a, 0xbd, 0xf7, 0xde,
-	0x8f, 0x21, 0x47, 0x95, 0x6b, 0xef, 0x07, 0xc9, 0xce, 0xa7, 0xdf, 0x7f, 0xe6, 0x99, 0x65, 0xb8,
-	0xc6, 0xd8, 0xdc, 0xd5, 0x91, 0x6a, 0xaa, 0x48, 0x95, 0x7b, 0x81, 0x1f, 0xf9, 0x66, 0xb6, 0x57,
-	0xdf, 0x55, 0x68, 0x69, 0x2d, 0xcb, 0xa9, 0x7f, 0xb6, 0x18, 0xf9, 0x43, 0xa3, 0x13, 0x66, 0xd9,
-	0xc8, 0x25, 0x3a, 0x08, 0x1d, 0xdf, 0xb3, 0x32, 0xc5, 0x6c, 0x69, 0xf3, 0xec, 0xb6, 0x72, 0xaf,
-	0x5e, 0x5e, 0x1b, 0x97, 0x97, 0x65, 0x56, 0x5d, 0x3b, 0x64, 0xce, 0x18, 0x79, 0x57, 0x79, 0x76,
-	0xac, 0x6c, 0x6d, 0x65, 0xf9, 0xc1, 0xf6, 0xff, 0x7c, 0xb0, 0x30, 0x1a, 0x56, 0xd7, 0x8f, 0x99,
-	0xdb, 0x8c, 0x8d, 0x91, 0x13, 0xb9, 0xda, 0x1a, 0x2b, 0x66, 0x4b, 0x85, 0xaa, 0x2c, 0xcc, 0xa2,
-	0x31, 0xd9, 0xd4, 0x61, 0x23, 0x70, 0x7a, 0x51, 0x7a, 0xf9, 0x38, 0x67, 0x27, 0x6e, 0x99, 0x3b,
-	0x8c, 0x09, 0x15, 0x47, 0x6d, 0x3f, 0xb0, 0x36, 0x72, 0x38, 0x5a, 0x99, 0x96, 0x91, 0x73, 0x9d,
-	0x86, 0xf6, 0x42, 0x6d, 0x4d, 0x70, 0xb0, 0xb6, 0x34, 0x4d, 0x63, 0xdc, 0x0b, 0x5b, 0x7d, 0x2b,
-	0x57, 0xcc, 0x96, 0xf2, 0x55, 0xb6, 0xb9, 0xd3, 0x18, 0x6b, 0x69, 0x6d, 0xe5, 0x8b, 0x99, 0xd2,
-	0xe4, 0x6c, 0x2e, 0xfd, 0xaf, 0xfb, 0xb5, 0xae, 0xa6, 0x7b, 0xe6, 0x6e, 0xa3, 0x10, 0xb5, 0xe3,
-	0x6e, 0xdd, 0x53, 0x8e, 0x6b, 0x15, 0x8a, 0x99, 0x52, 0xa1, 0x7a, 0x7c, 0x23, 0xbd, 0xa6, 0x17,
-	0xe8, 0xc4, 0xd1, 0x7d, 0xcb, 0xe0, 0x6c, 0x6d, 0x69, 0xee, 0x31, 0x8c, 0xd1, 0x8d, 0x4b, 0x81,
-	0x6b, 0x4d, 0x72, 0x78, 0xc2, 0xce, 0x54, 0xc5, 0xc8, 0x8d, 0xde, 0xcd, 0xdc, 0x6a, 0x6c, 0x59,
-	0xaa, 0x1c, 0xac, 0x2c, 0x1e, 0xa9, 0xd4, 0x96, 0xe7, 0xaa, 0x87, 0x0f, 0x2c, 0x56, 0xb0, 0xc1,
-	0x34, 0x8c, 0x89, 0xda, 0x74, 0x6d, 0xba, 0x36, 0x83, 0xcc, 0x7a, 0xcf, 0x22, 0xbb, 0xde, 0x7b,
-	0x31, 0x36, 0xea, 0x99, 0xda, 0x34, 0xc6, 0xa7, 0x8e, 0x6d, 0x32, 0xf2, 0x0b, 0xc7, 0x5f, 0x13,
-	0x6b, 0xbf, 0xb8, 0xb0, 0xaf, 0x32, 0xbf, 0xb4, 0x6f, 0x7e, 0x0e, 0x1b, 0xcc, 0x09, 0x23, 0xab,
-	0x3d, 0x64, 0x52, 0x95, 0x42, 0x96, 0xd6, 0x31, 0x46, 0x35, 0xc6, 0x69, 0x0b, 0x1b, 0x69, 0x07,
-	0x13, 0xb4, 0x8b, 0x1c, 0xf5, 0x90, 0xa7, 0x01, 0x0a, 0x34, 0x84, 0x41, 0x13, 0x4c, 0xd2, 0x01,
-	0x36, 0xd1, 0x21, 0xfe, 0x97, 0x5a, 0x57, 0xd8, 0x4c, 0x35, 0xb6, 0x50, 0x1b, 0xa0, 0x6d, 0xfc,
-	0x9f, 0x3a, 0x30, 0x69, 0x17, 0x5b, 0xa9, 0x87, 0x6d, 0xd4, 0xc7, 0x76, 0x1a, 0x60, 0x07, 0x0d,
-	0x71, 0x52, 0x6a, 0x43, 0xc1, 0xa2, 0x1a, 0x3b, 0x69, 0x1b, 0xbb, 0xa8, 0x8f, 0x93, 0x69, 0x80,
-	0xdd, 0x34, 0xc4, 0x29, 0x34, 0xc6, 0x1e, 0x9a, 0xe0, 0x54, 0x3a, 0x40, 0x31, 0xb5, 0xa9, 0x70,
-	0x1a, 0xd5, 0x98, 0xa2, 0x09, 0x4e, 0xa7, 0x43, 0x9c, 0xc1, 0xf7, 0xd1, 0x38, 0x93, 0xba, 0x38,
-	0x8b, 0xfa, 0x38, 0x9b, 0x86, 0x28, 0xd1, 0x08, 0xe7, 0xd0, 0x18, 0xe7, 0xa6, 0xb6, 0x14, 0xce,
-	0xa3, 0x2d, 0x9c, 0x4f, 0x1d, 0x5c, 0x40, 0x57, 0x50, 0xa6, 0x3e, 0x2e, 0xa4, 0x01, 0xa6, 0xe9,
-	0x00, 0x33, 0xa9, 0xb6, 0xc2, 0x2c, 0x6d, 0x62, 0x2f, 0x75, 0x71, 0x11, 0xf5, 0x70, 0x31, 0x8d,
-	0x71, 0x09, 0x4d, 0x70, 0x69, 0x6a, 0x5b, 0xe1, 0x32, 0xaa, 0x71, 0x39, 0x75, 0x70, 0x05, 0xf5,
-	0x71, 0x25, 0x0d, 0x70, 0x15, 0x8d, 0x70, 0x35, 0x8d, 0x71, 0x0d, 0x1d, 0xe0, 0x5a, 0x3a, 0xc4,
-	0x75, 0xa9, 0x8e, 0xc2, 0x3e, 0xda, 0xc4, 0xf5, 0x54, 0xe3, 0x06, 0x6a, 0xe3, 0x46, 0xea, 0x60,
-	0x8e, 0x76, 0xb0, 0x9f, 0xfa, 0x98, 0xa7, 0x21, 0x6e, 0xa2, 0x11, 0x0e, 0xd0, 0x18, 0x37, 0xa7,
-	0xae, 0x28, 0x1c, 0xa4, 0x09, 0x16, 0x52, 0x3b, 0x0a, 0x87, 0xa8, 0x8d, 0x0a, 0x75, 0xb0, 0x48,
-	0x57, 0x70, 0x0b, 0xed, 0xe0, 0x56, 0xea, 0xa2, 0x4a, 0xbb, 0x38, 0x4c, 0x3d, 0xdc, 0x46, 0x7d,
-	0x2c, 0xd1, 0x00, 0xcb, 0x34, 0xc4, 0x11, 0x1a, 0xe3, 0x76, 0x9a, 0xe0, 0x0e, 0xda, 0xc7, 0x9d,
-	0x74, 0x80, 0xbb, 0x52, 0x5d, 0x85, 0xbb, 0x69, 0x1d, 0xf7, 0x50, 0x1b, 0xf7, 0x52, 0x07, 0x35,
-	0xea, 0xe1, 0x3e, 0xea, 0x43, 0xd1, 0x08, 0x75, 0x1a, 0xa3, 0x41, 0x13, 0x34, 0x53, 0xbb, 0x36,
-	0x34, 0x6d, 0xa3, 0x45, 0x1d, 0xd8, 0xb4, 0x83, 0x36, 0x75, 0xe1, 0x50, 0x0f, 0x2b, 0x34, 0x40,
-	0x87, 0x86, 0x70, 0x69, 0x84, 0x2e, 0x1d, 0xc0, 0x4b, 0xf5, 0x14, 0x7c, 0x5a, 0x47, 0x8f, 0x36,
-	0xb1, 0x4a, 0x35, 0x02, 0x6a, 0x23, 0xa4, 0x2e, 0x22, 0xea, 0x21, 0xa6, 0x3e, 0x12, 0x1a, 0xa0,
-	0x4f, 0x13, 0x1c, 0xa5, 0x03, 0x0c, 0x52, 0xfd, 0x06, 0x86, 0x74, 0x05, 0xf7, 0xd3, 0x2e, 0x1e,
-	0xa0, 0x01, 0x1e, 0xa4, 0x21, 0x1e, 0x4a, 0xed, 0x29, 0x3c, 0x6c, 0xe6, 0x8c, 0x6c, 0xcf, 0xc1,
-	0x23, 0x19, 0x86, 0x8b, 0x47, 0x25, 0x42, 0x3c, 0x26, 0x11, 0xe1, 0x71, 0xc6, 0x6a, 0x8c, 0x27,
-	0x18, 0x41, 0x17, 0x4f, 0x4a, 0x78, 0x78, 0x4a, 0xc2, 0xc7, 0xd3, 0x12, 0x31, 0x9e, 0x91, 0xe8,
-	0xe3, 0x59, 0x46, 0xa8, 0xf0, 0x9c, 0x44, 0x03, 0xcf, 0x4b, 0x34, 0xf1, 0x82, 0x84, 0xc6, 0x8b,
-	0x12, 0x36, 0x5e, 0x92, 0x70, 0xf0, 0xb2, 0x44, 0x07, 0xaf, 0x48, 0xb8, 0x78, 0x55, 0xa2, 0x8b,
-	0xd7, 0x24, 0x3c, 0xbc, 0x2e, 0xe1, 0xe3, 0x0d, 0x89, 0x55, 0xbc, 0x29, 0x11, 0xe0, 0x2d, 0x89,
-	0x10, 0x6f, 0x4b, 0x44, 0x78, 0x47, 0x22, 0xc6, 0x31, 0x89, 0x04, 0xef, 0x4a, 0xf4, 0xf1, 0x1e,
-	0x23, 0x52, 0x78, 0x5f, 0x42, 0xe3, 0x03, 0x09, 0x1b, 0x1f, 0x4a, 0xb4, 0xf1, 0x91, 0x84, 0x83,
-	0x8f, 0x25, 0x3a, 0xf8, 0x44, 0xc2, 0xc5, 0xa7, 0x12, 0x1e, 0x3e, 0x93, 0xf0, 0xf1, 0xb9, 0x44,
-	0x80, 0x2f, 0x24, 0x42, 0x7c, 0x29, 0x11, 0xe1, 0x2b, 0x89, 0x3e, 0xbe, 0x96, 0x18, 0xe0, 0x1b,
-	0x46, 0x6c, 0xe3, 0x5b, 0x89, 0x0e, 0xbe, 0x93, 0x08, 0xf0, 0xbd, 0xc4, 0x10, 0x3f, 0x30, 0x12,
-	0x8d, 0x1f, 0x25, 0x1c, 0xfc, 0x24, 0xe1, 0xe3, 0x67, 0x46, 0x5f, 0xe1, 0x17, 0x09, 0x1f, 0xbf,
-	0x32, 0x8e, 0xb6, 0xf1, 0x1b, 0x63, 0xe0, 0xe0, 0x77, 0x09, 0x1f, 0x7f, 0x30, 0x86, 0x0a, 0x7f,
-	0x4a, 0xb4, 0xf1, 0x97, 0x44, 0x8c, 0xbf, 0x33, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x66,
-	0xd9, 0x2b, 0xec, 0x07, 0x00, 0x00,
+var fileDescriptor_56d9f74966f40d04 = []byte{
+	// 975 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0xd0, 0x67, 0x7b, 0xdb, 0x54,
+	0x18, 0xc6, 0xf1, 0xda, 0x49, 0x63, 0x5b, 0x29, 0xe9, 0x8d, 0x5a, 0x8a, 0x68, 0x4b, 0x31, 0x61,
+	0x99, 0x15, 0xd2, 0x94, 0x42, 0xd9, 0x14, 0x48, 0x43, 0x69, 0xea, 0x80, 0x4b, 0x52, 0xb6, 0x39,
+	0xb6, 0x8f, 0x65, 0xc5, 0xb2, 0xe4, 0x68, 0xb9, 0x36, 0x7b, 0xef, 0x3d, 0xcb, 0xde, 0x7b, 0xef,
+	0x6f, 0xc3, 0x57, 0xe1, 0xd2, 0xfd, 0x38, 0x69, 0x5e, 0xf0, 0xea, 0xf7, 0x3f, 0xe7, 0x79, 0x64,
+	0xeb, 0x92, 0x31, 0xd1, 0xd1, 0x91, 0x6a, 0xa8, 0x48, 0x4d, 0x75, 0x03, 0x3f, 0xf2, 0xcd, 0x82,
+	0xab, 0x6d, 0x55, 0xef, 0x57, 0xbb, 0xb5, 0xed, 0x85, 0xa6, 0xd6, 0x72, 0x3b, 0xf9, 0xef, 0x66,
+	0x23, 0x7f, 0x78, 0xb8, 0x68, 0xee, 0x35, 0x72, 0x89, 0x0e, 0x42, 0xc7, 0xf7, 0xac, 0x4c, 0x31,
+	0x5b, 0x9a, 0x98, 0xd9, 0x31, 0xb5, 0xf6, 0xd0, 0xd4, 0xea, 0xd6, 0xd4, 0x92, 0xac, 0x54, 0x56,
+	0x77, 0xcd, 0x7d, 0x46, 0xde, 0x55, 0x9e, 0x1d, 0x2b, 0x5b, 0x5b, 0x59, 0x3e, 0xb7, 0xf3, 0xff,
+	0x9e, 0x9b, 0x1f, 0xee, 0x54, 0xd6, 0xb6, 0xcd, 0xad, 0xc6, 0xc6, 0xc8, 0x89, 0x5c, 0x6d, 0x8d,
+	0x14, 0xb3, 0xa5, 0x42, 0x45, 0x0e, 0x66, 0xd1, 0x18, 0x6f, 0xe8, 0xb0, 0x1e, 0x38, 0xdd, 0x28,
+	0x7d, 0x95, 0x51, 0xce, 0xd6, 0x5f, 0x99, 0xdb, 0x8c, 0x31, 0x15, 0x47, 0x2d, 0x3f, 0xb0, 0x36,
+	0x72, 0x38, 0x3c, 0x99, 0x96, 0x91, 0x73, 0x9d, 0xba, 0xf6, 0x42, 0x6d, 0x8d, 0x71, 0xb0, 0x7a,
+	0x34, 0x4d, 0x63, 0xd4, 0x0b, 0x9b, 0x3d, 0x2b, 0x57, 0xcc, 0x96, 0xf2, 0x15, 0xb6, 0x59, 0x34,
+	0x46, 0x9a, 0x5a, 0x5b, 0xf9, 0x62, 0xa6, 0x34, 0x3e, 0x33, 0xb1, 0xee, 0x95, 0x0f, 0x68, 0x5d,
+	0x49, 0x47, 0xe6, 0x4e, 0xa3, 0x10, 0xb5, 0xe2, 0x4e, 0xcd, 0x53, 0x8e, 0x6b, 0x15, 0x8a, 0x99,
+	0x52, 0xa1, 0x72, 0xe2, 0x22, 0xfd, 0xb7, 0x6e, 0xa0, 0x13, 0x47, 0xf7, 0x2c, 0x83, 0xb3, 0xd5,
+	0xa3, 0xb9, 0xcb, 0x30, 0x86, 0x7f, 0xbc, 0x18, 0xb8, 0xd6, 0x38, 0x87, 0xeb, 0x6e, 0x26, 0xcb,
+	0x46, 0x6e, 0xf8, 0x15, 0xcd, 0x2d, 0xc6, 0xe6, 0xc5, 0xf2, 0xa1, 0xf2, 0xc2, 0xd1, 0x72, 0x75,
+	0x69, 0xb6, 0x72, 0xe4, 0xe0, 0x42, 0x19, 0x1b, 0x4c, 0xc3, 0x18, 0xab, 0x4e, 0x57, 0xa7, 0xab,
+	0xbb, 0x91, 0x59, 0xeb, 0x19, 0x64, 0xd7, 0x7a, 0x0f, 0x46, 0x86, 0xbd, 0xbb, 0x3a, 0x8d, 0xd1,
+	0xc9, 0xe3, 0x9b, 0x8c, 0xfc, 0xfc, 0x89, 0x8f, 0x8a, 0xd5, 0x5f, 0x9c, 0xdf, 0x5f, 0x9e, 0x5b,
+	0xdc, 0x3f, 0x37, 0x8b, 0x0d, 0xe6, 0x98, 0x91, 0xd5, 0x1e, 0x32, 0xa9, 0x4a, 0x21, 0x4b, 0x6b,
+	0x18, 0xa1, 0x1a, 0xa3, 0xb4, 0x89, 0x8d, 0xb4, 0x8d, 0x31, 0xda, 0x41, 0x8e, 0x7a, 0xc8, 0xd3,
+	0x00, 0x05, 0x1a, 0xc2, 0xa0, 0x09, 0xc6, 0x69, 0x1f, 0x9b, 0xe8, 0x00, 0x27, 0xa5, 0xd6, 0x14,
+	0x26, 0xa8, 0xc6, 0x66, 0x6a, 0x03, 0xb4, 0x85, 0x93, 0xa9, 0x03, 0x93, 0x76, 0xb0, 0x85, 0x7a,
+	0xd8, 0x4a, 0x7d, 0x9c, 0x42, 0x03, 0x6c, 0xa3, 0x21, 0x4e, 0x4d, 0xad, 0x2b, 0x58, 0x54, 0xe3,
+	0x34, 0xda, 0xc2, 0x76, 0xea, 0x63, 0x07, 0x0d, 0xb0, 0x93, 0x86, 0x38, 0x9d, 0xc6, 0xd8, 0x45,
+	0x13, 0x9c, 0x41, 0xfb, 0x28, 0xa6, 0x36, 0x14, 0xce, 0xa4, 0x1a, 0x93, 0x34, 0xc1, 0x59, 0x74,
+	0x80, 0xb3, 0xf9, 0x7d, 0x34, 0xce, 0xa1, 0x2e, 0xce, 0xa5, 0x3e, 0xce, 0xa3, 0x21, 0x4a, 0x34,
+	0xc2, 0xf9, 0x34, 0xc6, 0x05, 0xa9, 0x4d, 0x85, 0x0b, 0x69, 0x13, 0x17, 0x51, 0x07, 0x17, 0xd3,
+	0x65, 0x4c, 0x51, 0x1f, 0x97, 0xd0, 0x00, 0xd3, 0xb4, 0x8f, 0xdd, 0xa9, 0xb6, 0xc2, 0x0c, 0x6d,
+	0x60, 0x0f, 0x75, 0x71, 0x29, 0xf5, 0xb0, 0x97, 0xc6, 0xb8, 0x8c, 0x26, 0xb8, 0x3c, 0xb5, 0xa5,
+	0xb0, 0x8f, 0x6a, 0x5c, 0x41, 0x1d, 0x5c, 0x49, 0x7d, 0x5c, 0x45, 0x03, 0x5c, 0x4d, 0x23, 0x5c,
+	0x43, 0x63, 0x5c, 0x4b, 0xfb, 0xb8, 0x8e, 0x0e, 0x70, 0x7d, 0xaa, 0xa3, 0xb0, 0x9f, 0x36, 0x70,
+	0x03, 0xd5, 0xb8, 0x91, 0xda, 0xb8, 0x89, 0x3a, 0x98, 0xa5, 0x6d, 0x1c, 0xa0, 0x3e, 0xe6, 0x68,
+	0x88, 0x9b, 0x69, 0x84, 0x83, 0x34, 0xc6, 0x2d, 0xa9, 0xcb, 0x0a, 0x87, 0x68, 0x82, 0xf9, 0xd4,
+	0xb6, 0xc2, 0x61, 0x6a, 0xa3, 0x4c, 0x1d, 0x2c, 0xd0, 0x65, 0xdc, 0x4a, 0xdb, 0xb8, 0x8d, 0xba,
+	0xa8, 0xd0, 0x0e, 0x8e, 0x50, 0x0f, 0xb7, 0x53, 0x1f, 0x8b, 0x34, 0xc0, 0x12, 0x0d, 0x71, 0x94,
+	0xc6, 0xb8, 0x83, 0x26, 0xb8, 0x93, 0xf6, 0x70, 0x17, 0xed, 0xe3, 0xee, 0x54, 0x57, 0xe1, 0x1e,
+	0x5a, 0xc3, 0xbd, 0xd4, 0xc6, 0x7d, 0xd4, 0x41, 0x95, 0x7a, 0xb8, 0x9f, 0xfa, 0x50, 0x34, 0x42,
+	0x8d, 0xc6, 0xa8, 0xd3, 0x04, 0x8d, 0xd4, 0x8e, 0x0d, 0x4d, 0x5b, 0x68, 0x52, 0x07, 0x36, 0x6d,
+	0xa3, 0x45, 0x5d, 0x38, 0xd4, 0xc3, 0x32, 0x0d, 0xd0, 0xa6, 0x21, 0x5c, 0x1a, 0xa1, 0x43, 0xfb,
+	0xf0, 0x52, 0x3d, 0x05, 0x9f, 0xd6, 0xd0, 0xa5, 0x0d, 0xac, 0x50, 0x8d, 0x80, 0xda, 0x08, 0xa9,
+	0x8b, 0x88, 0x7a, 0x88, 0xa9, 0x8f, 0x84, 0x06, 0xe8, 0xd1, 0x04, 0xc7, 0x68, 0x1f, 0xfd, 0x54,
+	0xbf, 0x8e, 0x01, 0x5d, 0xc6, 0x03, 0xb4, 0x83, 0x07, 0x69, 0x80, 0x87, 0x68, 0x88, 0x87, 0x53,
+	0xbb, 0x0a, 0x8f, 0x98, 0x39, 0x23, 0xdb, 0x75, 0xf0, 0x68, 0x86, 0xe1, 0xe2, 0x31, 0x89, 0x10,
+	0x8f, 0x4b, 0x44, 0x78, 0x82, 0xb1, 0x12, 0xe3, 0x49, 0x46, 0xd0, 0xc1, 0x53, 0x12, 0x1e, 0x9e,
+	0x96, 0xf0, 0xf1, 0x8c, 0x44, 0x8c, 0x67, 0x25, 0x7a, 0x78, 0x8e, 0x11, 0x2a, 0x3c, 0x2f, 0x51,
+	0xc7, 0x0b, 0x12, 0x0d, 0xbc, 0x28, 0xa1, 0xf1, 0x92, 0x84, 0x8d, 0x97, 0x25, 0x1c, 0xbc, 0x22,
+	0xd1, 0xc6, 0xab, 0x12, 0x2e, 0x5e, 0x93, 0xe8, 0xe0, 0x75, 0x09, 0x0f, 0x6f, 0x48, 0xf8, 0x78,
+	0x53, 0x62, 0x05, 0x6f, 0x49, 0x04, 0x78, 0x5b, 0x22, 0xc4, 0x3b, 0x12, 0x11, 0xde, 0x95, 0x88,
+	0x71, 0x5c, 0x22, 0xc1, 0x7b, 0x12, 0x3d, 0xbc, 0xcf, 0x88, 0x14, 0x3e, 0x90, 0xd0, 0xf8, 0x50,
+	0xc2, 0xc6, 0x47, 0x12, 0x2d, 0x7c, 0x2c, 0xe1, 0xe0, 0x13, 0x89, 0x36, 0x3e, 0x95, 0x70, 0xf1,
+	0x99, 0x84, 0x87, 0xcf, 0x25, 0x7c, 0x7c, 0x21, 0x11, 0xe0, 0x4b, 0x89, 0x10, 0x5f, 0x49, 0x44,
+	0xf8, 0x5a, 0xa2, 0x87, 0x6f, 0x24, 0xfa, 0xf8, 0x96, 0x11, 0xdb, 0xf8, 0x4e, 0xa2, 0x8d, 0xef,
+	0x25, 0x02, 0xfc, 0x20, 0x31, 0xc0, 0x8f, 0x8c, 0x44, 0xe3, 0x27, 0x09, 0x07, 0x3f, 0x4b, 0xf8,
+	0xf8, 0x85, 0xd1, 0x53, 0xf8, 0x55, 0xc2, 0xc7, 0x6f, 0x8c, 0x63, 0x2d, 0xfc, 0xce, 0xe8, 0x3b,
+	0xf8, 0x43, 0xc2, 0xc7, 0x9f, 0x8c, 0x81, 0xc2, 0x5f, 0x12, 0x2d, 0xfc, 0x2d, 0x11, 0xe3, 0x9f,
+	0xcc, 0x7f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x15, 0x76, 0x2c, 0x08, 0x08, 0x00, 0x00,
 }

v1/go/signature.pb.go

@@ -0,0 +1,148 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: signature.proto
+
+package legacy_pb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type Signature_Version int32
+
+const (
+	Signature_UNKNOWN_VERSION Signature_Version = 0
+	Signature__0_0_1          Signature_Version = 1
+)
+
+var Signature_Version_name = map[int32]string{
+	0: "UNKNOWN_VERSION",
+	1: "_0_0_1",
+}
+
+var Signature_Version_value = map[string]int32{
+	"UNKNOWN_VERSION": 0,
+	"_0_0_1":          1,
+}
+
+func (x Signature_Version) Enum() *Signature_Version {
+	p := new(Signature_Version)
+	*p = x
+	return p
+}
+
+func (x Signature_Version) String() string {
+	return proto.EnumName(Signature_Version_name, int32(x))
+}
+
+func (x *Signature_Version) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Signature_Version_value, data, "Signature_Version")
+	if err != nil {
+		return err
+	}
+	*x = Signature_Version(value)
+	return nil
+}
+
+func (Signature_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_76962cacebaec211, []int{0, 0}
+}
+
+type Signature struct {
+	Version              *Signature_Version `protobuf:"varint,1,req,name=version,enum=legacy_pb.Signature_Version" json:"version,omitempty"`
+	SignatureType        *KeyType           `protobuf:"varint,2,req,name=signatureType,enum=legacy_pb.KeyType" json:"signatureType,omitempty"`
+	Signature            []byte             `protobuf:"bytes,3,req,name=signature" json:"signature,omitempty"`
+	CertificateId        []byte             `protobuf:"bytes,4,req,name=certificateId" json:"certificateId,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
+	XXX_unrecognized     []byte             `json:"-"`
+	XXX_sizecache        int32              `json:"-"`
+}
+
+func (m *Signature) Reset()         { *m = Signature{} }
+func (m *Signature) String() string { return proto.CompactTextString(m) }
+func (*Signature) ProtoMessage()    {}
+func (*Signature) Descriptor() ([]byte, []int) {
+	return fileDescriptor_76962cacebaec211, []int{0}
+}
+
+func (m *Signature) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Signature.Unmarshal(m, b)
+}
+func (m *Signature) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Signature.Marshal(b, m, deterministic)
+}
+func (m *Signature) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Signature.Merge(m, src)
+}
+func (m *Signature) XXX_Size() int {
+	return xxx_messageInfo_Signature.Size(m)
+}
+func (m *Signature) XXX_DiscardUnknown() {
+	xxx_messageInfo_Signature.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Signature proto.InternalMessageInfo
+
+func (m *Signature) GetVersion() Signature_Version {
+	if m != nil && m.Version != nil {
+		return *m.Version
+	}
+	return Signature_UNKNOWN_VERSION
+}
+
+func (m *Signature) GetSignatureType() KeyType {
+	if m != nil && m.SignatureType != nil {
+		return *m.SignatureType
+	}
+	return KeyType_UNKNOWN_PUBLIC_KEY_TYPE
+}
+
+func (m *Signature) GetSignature() []byte {
+	if m != nil {
+		return m.Signature
+	}
+	return nil
+}
+
+func (m *Signature) GetCertificateId() []byte {
+	if m != nil {
+		return m.CertificateId
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterEnum("legacy_pb.Signature_Version", Signature_Version_name, Signature_Version_value)
+	proto.RegisterType((*Signature)(nil), "legacy_pb.Signature")
+}
+
+func init() { proto.RegisterFile("signature.proto", fileDescriptor_76962cacebaec211) }
+
+var fileDescriptor_76962cacebaec211 = []byte{
+	// 200 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2f, 0xce, 0x4c, 0xcf,
+	0x4b, 0x2c, 0x29, 0x2d, 0x4a, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcc, 0x49, 0x4d,
+	0x4f, 0x4c, 0xae, 0x8c, 0x2f, 0x48, 0x92, 0x12, 0x4c, 0x4e, 0x2d, 0x2a, 0xc9, 0x4c, 0xcb, 0x4c,
+	0x4e, 0x2c, 0x81, 0xca, 0x2a, 0xbd, 0x65, 0xe4, 0xe2, 0x0c, 0x86, 0xe9, 0x10, 0x32, 0xe3, 0x62,
+	0x2f, 0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x33, 0x92, 0xd1,
+	0x83, 0xeb, 0xd6, 0x83, 0x2b, 0xd3, 0x0b, 0x83, 0xa8, 0x09, 0x82, 0x29, 0x16, 0xb2, 0xe0, 0xe2,
+	0x85, 0x5b, 0x1b, 0x52, 0x59, 0x90, 0x2a, 0xc1, 0x04, 0xd6, 0x2d, 0x84, 0xa4, 0xdb, 0x3b, 0xb5,
+	0x12, 0x24, 0x13, 0x84, 0xaa, 0x50, 0x48, 0x86, 0x8b, 0x13, 0x2e, 0x20, 0xc1, 0xac, 0xc0, 0xa4,
+	0xc1, 0x13, 0x84, 0x10, 0x10, 0x52, 0xe1, 0xe2, 0x45, 0x72, 0xb2, 0x67, 0x8a, 0x04, 0x0b, 0x58,
+	0x05, 0xaa, 0xa0, 0x92, 0x16, 0x17, 0x3b, 0xd4, 0x45, 0x42, 0xc2, 0x5c, 0xfc, 0xa1, 0x7e, 0xde,
+	0x7e, 0xfe, 0xe1, 0x7e, 0xf1, 0x61, 0xae, 0x41, 0xc1, 0x9e, 0xfe, 0x7e, 0x02, 0x0c, 0x42, 0x5c,
+	0x5c, 0x6c, 0xf1, 0x06, 0xf1, 0x06, 0xf1, 0x86, 0x02, 0x8c, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0x48, 0xf0, 0x60, 0xdb, 0x1f, 0x01, 0x00, 0x00,
+}

v1/go/source.pb.go

@@ -0,0 +1,191 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: source.proto
+
+package legacy_pb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type Source_Version int32
+
+const (
+	Source_UNKNOWN_VERSION Source_Version = 0
+	Source__0_0_1          Source_Version = 1
+)
+
+var Source_Version_name = map[int32]string{
+	0: "UNKNOWN_VERSION",
+	1: "_0_0_1",
+}
+
+var Source_Version_value = map[string]int32{
+	"UNKNOWN_VERSION": 0,
+	"_0_0_1":          1,
+}
+
+func (x Source_Version) Enum() *Source_Version {
+	p := new(Source_Version)
+	*p = x
+	return p
+}
+
+func (x Source_Version) String() string {
+	return proto.EnumName(Source_Version_name, int32(x))
+}
+
+func (x *Source_Version) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Source_Version_value, data, "Source_Version")
+	if err != nil {
+		return err
+	}
+	*x = Source_Version(value)
+	return nil
+}
+
+func (Source_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_9229c9b6eb8e6b85, []int{0, 0}
+}
+
+type Source_SourceTypes int32
+
+const (
+	Source_UNKNOWN_SOURCE_TYPE Source_SourceTypes = 0
+	Source_lbry_sd_hash        Source_SourceTypes = 1
+)
+
+var Source_SourceTypes_name = map[int32]string{
+	0: "UNKNOWN_SOURCE_TYPE",
+	1: "lbry_sd_hash",
+}
+
+var Source_SourceTypes_value = map[string]int32{
+	"UNKNOWN_SOURCE_TYPE": 0,
+	"lbry_sd_hash":        1,
+}
+
+func (x Source_SourceTypes) Enum() *Source_SourceTypes {
+	p := new(Source_SourceTypes)
+	*p = x
+	return p
+}
+
+func (x Source_SourceTypes) String() string {
+	return proto.EnumName(Source_SourceTypes_name, int32(x))
+}
+
+func (x *Source_SourceTypes) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Source_SourceTypes_value, data, "Source_SourceTypes")
+	if err != nil {
+		return err
+	}
+	*x = Source_SourceTypes(value)
+	return nil
+}
+
+func (Source_SourceTypes) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_9229c9b6eb8e6b85, []int{0, 1}
+}
+
+type Source struct {
+	Version              *Source_Version     `protobuf:"varint,1,req,name=version,enum=legacy_pb.Source_Version" json:"version,omitempty"`
+	SourceType           *Source_SourceTypes `protobuf:"varint,2,req,name=sourceType,enum=legacy_pb.Source_SourceTypes" json:"sourceType,omitempty"`
+	Source               []byte              `protobuf:"bytes,3,req,name=source" json:"source,omitempty"`
+	ContentType          *string             `protobuf:"bytes,4,req,name=contentType" json:"contentType,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
+	XXX_unrecognized     []byte              `json:"-"`
+	XXX_sizecache        int32               `json:"-"`
+}
+
+func (m *Source) Reset()         { *m = Source{} }
+func (m *Source) String() string { return proto.CompactTextString(m) }
+func (*Source) ProtoMessage()    {}
+func (*Source) Descriptor() ([]byte, []int) {
+	return fileDescriptor_9229c9b6eb8e6b85, []int{0}
+}
+
+func (m *Source) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Source.Unmarshal(m, b)
+}
+func (m *Source) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Source.Marshal(b, m, deterministic)
+}
+func (m *Source) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Source.Merge(m, src)
+}
+func (m *Source) XXX_Size() int {
+	return xxx_messageInfo_Source.Size(m)
+}
+func (m *Source) XXX_DiscardUnknown() {
+	xxx_messageInfo_Source.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Source proto.InternalMessageInfo
+
+func (m *Source) GetVersion() Source_Version {
+	if m != nil && m.Version != nil {
+		return *m.Version
+	}
+	return Source_UNKNOWN_VERSION
+}
+
+func (m *Source) GetSourceType() Source_SourceTypes {
+	if m != nil && m.SourceType != nil {
+		return *m.SourceType
+	}
+	return Source_UNKNOWN_SOURCE_TYPE
+}
+
+func (m *Source) GetSource() []byte {
+	if m != nil {
+		return m.Source
+	}
+	return nil
+}
+
+func (m *Source) GetContentType() string {
+	if m != nil && m.ContentType != nil {
+		return *m.ContentType
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterEnum("legacy_pb.Source_Version", Source_Version_name, Source_Version_value)
+	proto.RegisterEnum("legacy_pb.Source_SourceTypes", Source_SourceTypes_name, Source_SourceTypes_value)
+	proto.RegisterType((*Source)(nil), "legacy_pb.Source")
+}
+
+func init() { proto.RegisterFile("source.proto", fileDescriptor_9229c9b6eb8e6b85) }
+
+var fileDescriptor_9229c9b6eb8e6b85 = []byte{
+	// 232 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0xce, 0x2f, 0x2d,
+	0x4a, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcc, 0x49, 0x4d, 0x4f, 0x4c, 0xae,
+	0x8c, 0x2f, 0x48, 0x52, 0x9a, 0xc3, 0xc4, 0xc5, 0x16, 0x0c, 0x96, 0x13, 0x32, 0xe6, 0x62, 0x2f,
+	0x4b, 0x2d, 0x2a, 0xce, 0xcc, 0xcf, 0x93, 0x60, 0x54, 0x60, 0xd2, 0xe0, 0x33, 0x92, 0xd4, 0x83,
+	0xab, 0xd3, 0x83, 0xa8, 0xd1, 0x0b, 0x83, 0x28, 0x08, 0x82, 0xa9, 0x14, 0xb2, 0xe5, 0xe2, 0x82,
+	0x18, 0x1d, 0x52, 0x59, 0x90, 0x2a, 0xc1, 0x04, 0xd6, 0x27, 0x8b, 0xa9, 0x2f, 0x18, 0xae, 0xa6,
+	0x38, 0x08, 0x49, 0x83, 0x90, 0x18, 0x17, 0x1b, 0x84, 0x27, 0xc1, 0xac, 0xc0, 0xa4, 0xc1, 0x13,
+	0x04, 0xe5, 0x09, 0x29, 0x70, 0x71, 0x27, 0xe7, 0xe7, 0x95, 0xa4, 0xe6, 0x95, 0x80, 0xcd, 0x65,
+	0x51, 0x60, 0xd2, 0xe0, 0x0c, 0x42, 0x16, 0x52, 0xd2, 0xe2, 0x62, 0x87, 0x3a, 0x46, 0x48, 0x98,
+	0x8b, 0x3f, 0xd4, 0xcf, 0xdb, 0xcf, 0x3f, 0xdc, 0x2f, 0x3e, 0xcc, 0x35, 0x28, 0xd8, 0xd3, 0xdf,
+	0x4f, 0x80, 0x41, 0x88, 0x8b, 0x8b, 0x2d, 0xde, 0x20, 0xde, 0x20, 0xde, 0x50, 0x80, 0x51, 0xc9,
+	0x82, 0x8b, 0x1b, 0xc9, 0x01, 0x42, 0xe2, 0x5c, 0xc2, 0x30, 0xf5, 0xc1, 0xfe, 0xa1, 0x41, 0xce,
+	0xae, 0xf1, 0x21, 0x91, 0x01, 0xae, 0x02, 0x0c, 0x42, 0x02, 0x5c, 0x3c, 0x39, 0x49, 0x45, 0x95,
+	0xf1, 0xc5, 0x29, 0xf1, 0x19, 0x89, 0xc5, 0x19, 0x02, 0x8c, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff,
+	0xf2, 0x96, 0xa2, 0x14, 0x38, 0x01, 0x00, 0x00,
+}

v1/go/stream.pb.go

@@ -0,0 +1,139 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: stream.proto
+
+package legacy_pb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type Stream_Version int32
+
+const (
+	Stream_UNKNOWN_VERSION Stream_Version = 0
+	Stream__0_0_1          Stream_Version = 1
+)
+
+var Stream_Version_name = map[int32]string{
+	0: "UNKNOWN_VERSION",
+	1: "_0_0_1",
+}
+
+var Stream_Version_value = map[string]int32{
+	"UNKNOWN_VERSION": 0,
+	"_0_0_1":          1,
+}
+
+func (x Stream_Version) Enum() *Stream_Version {
+	p := new(Stream_Version)
+	*p = x
+	return p
+}
+
+func (x Stream_Version) String() string {
+	return proto.EnumName(Stream_Version_name, int32(x))
+}
+
+func (x *Stream_Version) UnmarshalJSON(data []byte) error {
+	value, err := proto.UnmarshalJSONEnum(Stream_Version_value, data, "Stream_Version")
+	if err != nil {
+		return err
+	}
+	*x = Stream_Version(value)
+	return nil
+}
+
+func (Stream_Version) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_bb17ef3f514bfe54, []int{0, 0}
+}
+
+type Stream struct {
+	Version              *Stream_Version `protobuf:"varint,1,req,name=version,enum=legacy_pb.Stream_Version" json:"version,omitempty"`
+	Metadata             *Metadata       `protobuf:"bytes,2,req,name=metadata" json:"metadata,omitempty"`
+	Source               *Source         `protobuf:"bytes,3,req,name=source" json:"source,omitempty"`
+	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
+	XXX_unrecognized     []byte          `json:"-"`
+	XXX_sizecache        int32           `json:"-"`
+}
+
+func (m *Stream) Reset()         { *m = Stream{} }
+func (m *Stream) String() string { return proto.CompactTextString(m) }
+func (*Stream) ProtoMessage()    {}
+func (*Stream) Descriptor() ([]byte, []int) {
+	return fileDescriptor_bb17ef3f514bfe54, []int{0}
+}
+
+func (m *Stream) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Stream.Unmarshal(m, b)
+}
+func (m *Stream) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Stream.Marshal(b, m, deterministic)
+}
+func (m *Stream) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Stream.Merge(m, src)
+}
+func (m *Stream) XXX_Size() int {
+	return xxx_messageInfo_Stream.Size(m)
+}
+func (m *Stream) XXX_DiscardUnknown() {
+	xxx_messageInfo_Stream.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Stream proto.InternalMessageInfo
+
+func (m *Stream) GetVersion() Stream_Version {
+	if m != nil && m.Version != nil {
+		return *m.Version
+	}
+	return Stream_UNKNOWN_VERSION
+}
+
+func (m *Stream) GetMetadata() *Metadata {
+	if m != nil {
+		return m.Metadata
+	}
+	return nil
+}
+
+func (m *Stream) GetSource() *Source {
+	if m != nil {
+		return m.Source
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterEnum("legacy_pb.Stream_Version", Stream_Version_name, Stream_Version_value)
+	proto.RegisterType((*Stream)(nil), "legacy_pb.Stream")
+}
+
+func init() { proto.RegisterFile("stream.proto", fileDescriptor_bb17ef3f514bfe54) }
+
+var fileDescriptor_bb17ef3f514bfe54 = []byte{
+	// 191 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x29, 0x2e, 0x29, 0x4a,
+	0x4d, 0xcc, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcc, 0x49, 0x4d, 0x4f, 0x4c, 0xae,
+	0x8c, 0x2f, 0x48, 0x92, 0xe2, 0xcb, 0x4d, 0x2d, 0x49, 0x4c, 0x49, 0x2c, 0x49, 0x84, 0x48, 0x49,
+	0xf1, 0x14, 0xe7, 0x97, 0x16, 0x25, 0xa7, 0x42, 0x78, 0x4a, 0x47, 0x19, 0xb9, 0xd8, 0x82, 0xc1,
+	0x3a, 0x85, 0x8c, 0xb9, 0xd8, 0xcb, 0x52, 0x8b, 0x8a, 0x33, 0xf3, 0xf3, 0x24, 0x18, 0x15, 0x98,
+	0x34, 0xf8, 0x8c, 0x24, 0xf5, 0xe0, 0xa6, 0xe8, 0x41, 0xd4, 0xe8, 0x85, 0x41, 0x14, 0x04, 0xc1,
+	0x54, 0x0a, 0xe9, 0x73, 0x71, 0xc0, 0xcc, 0x97, 0x60, 0x52, 0x60, 0xd2, 0xe0, 0x36, 0x12, 0x46,
+	0xd2, 0xe5, 0x0b, 0x95, 0x0a, 0x82, 0x2b, 0x12, 0xd2, 0xe4, 0x62, 0x83, 0x38, 0x40, 0x82, 0x19,
+	0xac, 0x5c, 0x10, 0xd9, 0x12, 0xb0, 0x44, 0x10, 0x54, 0x81, 0x92, 0x16, 0x17, 0x3b, 0xd4, 0x3e,
+	0x21, 0x61, 0x2e, 0xfe, 0x50, 0x3f, 0x6f, 0x3f, 0xff, 0x70, 0xbf, 0xf8, 0x30, 0xd7, 0xa0, 0x60,
+	0x4f, 0x7f, 0x3f, 0x01, 0x06, 0x21, 0x2e, 0x2e, 0xb6, 0x78, 0x83, 0x78, 0x83, 0x78, 0x43, 0x01,
+	0x46, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3c, 0xe9, 0x51, 0x8e, 0xff, 0x00, 0x00, 0x00,
+}

v1/js/certificate_pb.js

@@ -11,10 +11,9 @@ var jspb = require('google-protobuf');
 var goog = jspb;
 var global = Function('return this')();
 
-goog.exportSymbol('proto.pb.Certificate', null, global);
-goog.exportSymbol('proto.pb.Certificate.Version', null, global);
-goog.exportSymbol('proto.pb.KeyType', null, global);
-
+goog.exportSymbol('proto.legacy_pb.Certificate', null, global);
+goog.exportSymbol('proto.legacy_pb.Certificate.Version', null, global);
+goog.exportSymbol('proto.legacy_pb.KeyType', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -25,15 +24,20 @@ goog.exportSymbol('proto.pb.KeyType', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Certificate = function(opt_data) {
+proto.legacy_pb.Certificate = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Certificate, jspb.Message);
+goog.inherits(proto.legacy_pb.Certificate, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Certificate.displayName = 'proto.pb.Certificate';
+  /**
+   * @public
+   * @override
+   */
+  proto.legacy_pb.Certificate.displayName = 'proto.legacy_pb.Certificate';
 }
 
 
+
 if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto suitable for use in Soy templates.
@@ -45,8 +49,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Certificate.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Certificate.toObject(opt_includeInstance, this);
+proto.legacy_pb.Certificate.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Certificate.toObject(opt_includeInstance, this);
 };
 
 
@@ -55,12 +59,12 @@ proto.pb.Certificate.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Certificate} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Certificate} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Certificate.toObject = function(includeInstance, msg) {
-  var f, obj = {
+proto.legacy_pb.Certificate.toObject = function(includeInstance, msg) {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     keytype: jspb.Message.getField(msg, 2),
     publickey: msg.getPublickey_asB64()
@@ -77,23 +81,23 @@ proto.pb.Certificate.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Certificate}
+ * @return {!proto.legacy_pb.Certificate}
  */
-proto.pb.Certificate.deserializeBinary = function(bytes) {
+proto.legacy_pb.Certificate.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Certificate;
-  return proto.pb.Certificate.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Certificate;
+  return proto.legacy_pb.Certificate.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Certificate} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Certificate} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Certificate}
+ * @return {!proto.legacy_pb.Certificate}
  */
-proto.pb.Certificate.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Certificate.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -101,11 +105,11 @@ proto.pb.Certificate.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Certificate.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Certificate.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.KeyType} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.KeyType} */ (reader.readEnum());
       msg.setKeytype(value);
       break;
     case 4:
@@ -125,9 +129,9 @@ proto.pb.Certificate.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Certificate.prototype.serializeBinary = function() {
+proto.legacy_pb.Certificate.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Certificate.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Certificate.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -135,20 +139,20 @@ proto.pb.Certificate.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Certificate} message
+ * @param {!proto.legacy_pb.Certificate} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Certificate.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Certificate.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Certificate.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Certificate.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.KeyType} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.KeyType} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -168,65 +172,71 @@ proto.pb.Certificate.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Certificate.Version = {
+proto.legacy_pb.Certificate.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Certificate.Version}
+ * @return {!proto.legacy_pb.Certificate.Version}
  */
-proto.pb.Certificate.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Certificate.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Certificate.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Certificate.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Certificate.Version} value */
-proto.pb.Certificate.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Certificate.Version} value */
+proto.legacy_pb.Certificate.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Certificate.prototype.clearVersion = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Certificate.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Certificate.prototype.hasVersion = function() {
+proto.legacy_pb.Certificate.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required KeyType keyType = 2;
- * @return {!proto.pb.KeyType}
+ * @return {!proto.legacy_pb.KeyType}
  */
-proto.pb.Certificate.prototype.getKeytype = function() {
-  return /** @type {!proto.pb.KeyType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Certificate.prototype.getKeytype = function() {
+  return /** @type {!proto.legacy_pb.KeyType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.KeyType} value */
-proto.pb.Certificate.prototype.setKeytype = function(value) {
+/** @param {!proto.legacy_pb.KeyType} value */
+proto.legacy_pb.Certificate.prototype.setKeytype = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Certificate.prototype.clearKeytype = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Certificate.prototype.clearKeytype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Certificate.prototype.hasKeytype = function() {
+proto.legacy_pb.Certificate.prototype.hasKeytype = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -235,7 +245,7 @@ proto.pb.Certificate.prototype.hasKeytype = function() {
  * required bytes publicKey = 4;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Certificate.prototype.getPublickey = function() {
+proto.legacy_pb.Certificate.prototype.getPublickey = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
@@ -245,7 +255,7 @@ proto.pb.Certificate.prototype.getPublickey = function() {
  * This is a type-conversion wrapper around `getPublickey()`
  * @return {string}
  */
-proto.pb.Certificate.prototype.getPublickey_asB64 = function() {
+proto.legacy_pb.Certificate.prototype.getPublickey_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getPublickey()));
 };
@@ -258,28 +268,31 @@ proto.pb.Certificate.prototype.getPublickey_asB64 = function() {
  * This is a type-conversion wrapper around `getPublickey()`
  * @return {!Uint8Array}
  */
-proto.pb.Certificate.prototype.getPublickey_asU8 = function() {
+proto.legacy_pb.Certificate.prototype.getPublickey_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getPublickey()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Certificate.prototype.setPublickey = function(value) {
+proto.legacy_pb.Certificate.prototype.setPublickey = function(value) {
   jspb.Message.setField(this, 4, value);
 };
 
 
-proto.pb.Certificate.prototype.clearPublickey = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Certificate.prototype.clearPublickey = function() {
   jspb.Message.setField(this, 4, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Certificate.prototype.hasPublickey = function() {
+proto.legacy_pb.Certificate.prototype.hasPublickey = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
@@ -287,11 +300,11 @@ proto.pb.Certificate.prototype.hasPublickey = function() {
 /**
  * @enum {number}
  */
-proto.pb.KeyType = {
+proto.legacy_pb.KeyType = {
   UNKNOWN_PUBLIC_KEY_TYPE: 0,
   NIST256P: 1,
   NIST384P: 2,
   SECP256K1: 3
 };
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);

v1/js/fee_pb.js

@@ -11,10 +11,9 @@ var jspb = require('google-protobuf');
 var goog = jspb;
 var global = Function('return this')();
 
-goog.exportSymbol('proto.pb.Fee', null, global);
-goog.exportSymbol('proto.pb.Fee.Currency', null, global);
-goog.exportSymbol('proto.pb.Fee.Version', null, global);
-
+goog.exportSymbol('proto.legacy_pb.Fee', null, global);
+goog.exportSymbol('proto.legacy_pb.Fee.Currency', null, global);
+goog.exportSymbol('proto.legacy_pb.Fee.Version', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -25,15 +24,20 @@ goog.exportSymbol('proto.pb.Fee.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Fee = function(opt_data) {
+proto.legacy_pb.Fee = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Fee, jspb.Message);
+goog.inherits(proto.legacy_pb.Fee, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Fee.displayName = 'proto.pb.Fee';
+  /**
+   * @public
+   * @override
+   */
+  proto.legacy_pb.Fee.displayName = 'proto.legacy_pb.Fee';
 }
 
 
+
 if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto suitable for use in Soy templates.
@@ -45,8 +49,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Fee.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Fee.toObject(opt_includeInstance, this);
+proto.legacy_pb.Fee.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Fee.toObject(opt_includeInstance, this);
 };
 
 
@@ -55,12 +59,12 @@ proto.pb.Fee.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Fee} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Fee} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Fee.toObject = function(includeInstance, msg) {
-  var f, obj = {
+proto.legacy_pb.Fee.toObject = function(includeInstance, msg) {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     currency: jspb.Message.getField(msg, 2),
     address: msg.getAddress_asB64(),
@@ -78,23 +82,23 @@ proto.pb.Fee.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Fee}
+ * @return {!proto.legacy_pb.Fee}
  */
-proto.pb.Fee.deserializeBinary = function(bytes) {
+proto.legacy_pb.Fee.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Fee;
-  return proto.pb.Fee.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Fee;
+  return proto.legacy_pb.Fee.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Fee} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Fee} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Fee}
+ * @return {!proto.legacy_pb.Fee}
  */
-proto.pb.Fee.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Fee.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -102,11 +106,11 @@ proto.pb.Fee.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Fee.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Fee.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.Fee.Currency} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Fee.Currency} */ (reader.readEnum());
       msg.setCurrency(value);
       break;
     case 3:
@@ -130,9 +134,9 @@ proto.pb.Fee.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Fee.prototype.serializeBinary = function() {
+proto.legacy_pb.Fee.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Fee.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Fee.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -140,20 +144,20 @@ proto.pb.Fee.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Fee} message
+ * @param {!proto.legacy_pb.Fee} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Fee.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Fee.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Fee.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Fee.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.Fee.Currency} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.Fee.Currency} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -180,7 +184,7 @@ proto.pb.Fee.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Fee.Version = {
+proto.legacy_pb.Fee.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
@@ -188,7 +192,7 @@ proto.pb.Fee.Version = {
 /**
  * @enum {number}
  */
-proto.pb.Fee.Currency = {
+proto.legacy_pb.Fee.Currency = {
   UNKNOWN_CURRENCY: 0,
   LBC: 1,
   BTC: 2,
@@ -197,58 +201,64 @@ proto.pb.Fee.Currency = {
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Fee.Version}
+ * @return {!proto.legacy_pb.Fee.Version}
  */
-proto.pb.Fee.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Fee.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Fee.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Fee.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Fee.Version} value */
-proto.pb.Fee.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Fee.Version} value */
+proto.legacy_pb.Fee.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Fee.prototype.clearVersion = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Fee.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Fee.prototype.hasVersion = function() {
+proto.legacy_pb.Fee.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required Currency currency = 2;
- * @return {!proto.pb.Fee.Currency}
+ * @return {!proto.legacy_pb.Fee.Currency}
  */
-proto.pb.Fee.prototype.getCurrency = function() {
-  return /** @type {!proto.pb.Fee.Currency} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Fee.prototype.getCurrency = function() {
+  return /** @type {!proto.legacy_pb.Fee.Currency} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.Fee.Currency} value */
-proto.pb.Fee.prototype.setCurrency = function(value) {
+/** @param {!proto.legacy_pb.Fee.Currency} value */
+proto.legacy_pb.Fee.prototype.setCurrency = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Fee.prototype.clearCurrency = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Fee.prototype.clearCurrency = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Fee.prototype.hasCurrency = function() {
+proto.legacy_pb.Fee.prototype.hasCurrency = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -257,7 +267,7 @@ proto.pb.Fee.prototype.hasCurrency = function() {
  * required bytes address = 3;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Fee.prototype.getAddress = function() {
+proto.legacy_pb.Fee.prototype.getAddress = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
@@ -267,7 +277,7 @@ proto.pb.Fee.prototype.getAddress = function() {
  * This is a type-conversion wrapper around `getAddress()`
  * @return {string}
  */
-proto.pb.Fee.prototype.getAddress_asB64 = function() {
+proto.legacy_pb.Fee.prototype.getAddress_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getAddress()));
 };
@@ -280,28 +290,31 @@ proto.pb.Fee.prototype.getAddress_asB64 = function() {
  * This is a type-conversion wrapper around `getAddress()`
  * @return {!Uint8Array}
  */
-proto.pb.Fee.prototype.getAddress_asU8 = function() {
+proto.legacy_pb.Fee.prototype.getAddress_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getAddress()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Fee.prototype.setAddress = function(value) {
+proto.legacy_pb.Fee.prototype.setAddress = function(value) {
   jspb.Message.setField(this, 3, value);
 };
 
 
-proto.pb.Fee.prototype.clearAddress = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Fee.prototype.clearAddress = function() {
   jspb.Message.setField(this, 3, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Fee.prototype.hasAddress = function() {
+proto.legacy_pb.Fee.prototype.hasAddress = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
@@ -310,29 +323,32 @@ proto.pb.Fee.prototype.hasAddress = function() {
  * required float amount = 4;
  * @return {number}
  */
-proto.pb.Fee.prototype.getAmount = function() {
+proto.legacy_pb.Fee.prototype.getAmount = function() {
   return /** @type {number} */ (+jspb.Message.getFieldWithDefault(this, 4, 0.0));
 };
 
 
 /** @param {number} value */
-proto.pb.Fee.prototype.setAmount = function(value) {
+proto.legacy_pb.Fee.prototype.setAmount = function(value) {
   jspb.Message.setField(this, 4, value);
 };
 
 
-proto.pb.Fee.prototype.clearAmount = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Fee.prototype.clearAmount = function() {
   jspb.Message.setField(this, 4, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Fee.prototype.hasAmount = function() {
+proto.legacy_pb.Fee.prototype.hasAmount = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);

v1/js/legacy_claim_pb.js

@@ -12,12 +12,14 @@ var goog = jspb;
 var global = Function('return this')();
 
 var stream_pb = require('./stream_pb.js');
+goog.object.extend(proto, stream_pb);
 var certificate_pb = require('./certificate_pb.js');
+goog.object.extend(proto, certificate_pb);
 var signature_pb = require('./signature_pb.js');
-goog.exportSymbol('proto.pb.Claim', null, global);
-goog.exportSymbol('proto.pb.Claim.ClaimType', null, global);
-goog.exportSymbol('proto.pb.Claim.Version', null, global);
-
+goog.object.extend(proto, signature_pb);
+goog.exportSymbol('proto.legacy_pb.Claim', null, global);
+goog.exportSymbol('proto.legacy_pb.Claim.ClaimType', null, global);
+goog.exportSymbol('proto.legacy_pb.Claim.Version', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -28,15 +30,20 @@ goog.exportSymbol('proto.pb.Claim.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Claim = function(opt_data) {
+proto.legacy_pb.Claim = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Claim, jspb.Message);
+goog.inherits(proto.legacy_pb.Claim, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Claim.displayName = 'proto.pb.Claim';
+  /**
+   * @public
+   * @override
+   */
+  proto.legacy_pb.Claim.displayName = 'proto.legacy_pb.Claim';
 }
 
 
+
 if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto suitable for use in Soy templates.
@@ -48,8 +55,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Claim.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Claim.toObject(opt_includeInstance, this);
+proto.legacy_pb.Claim.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Claim.toObject(opt_includeInstance, this);
 };
 
 
@@ -58,12 +65,12 @@ proto.pb.Claim.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Claim} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Claim} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Claim.toObject = function(includeInstance, msg) {
-  var f, obj = {
+proto.legacy_pb.Claim.toObject = function(includeInstance, msg) {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     claimtype: jspb.Message.getField(msg, 2),
     stream: (f = msg.getStream()) && stream_pb.Stream.toObject(includeInstance, f),
@@ -82,23 +89,23 @@ proto.pb.Claim.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Claim}
+ * @return {!proto.legacy_pb.Claim}
  */
-proto.pb.Claim.deserializeBinary = function(bytes) {
+proto.legacy_pb.Claim.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Claim;
-  return proto.pb.Claim.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Claim;
+  return proto.legacy_pb.Claim.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Claim} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Claim} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Claim}
+ * @return {!proto.legacy_pb.Claim}
  */
-proto.pb.Claim.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Claim.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -106,11 +113,11 @@ proto.pb.Claim.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Claim.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Claim.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.Claim.ClaimType} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Claim.ClaimType} */ (reader.readEnum());
       msg.setClaimtype(value);
       break;
     case 3:
@@ -141,9 +148,9 @@ proto.pb.Claim.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Claim.prototype.serializeBinary = function() {
+proto.legacy_pb.Claim.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Claim.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Claim.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -151,20 +158,20 @@ proto.pb.Claim.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Claim} message
+ * @param {!proto.legacy_pb.Claim} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Claim.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Claim.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Claim.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Claim.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.Claim.ClaimType} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.Claim.ClaimType} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -201,7 +208,7 @@ proto.pb.Claim.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Claim.Version = {
+proto.legacy_pb.Claim.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
@@ -209,7 +216,7 @@ proto.pb.Claim.Version = {
 /**
  * @enum {number}
  */
-proto.pb.Claim.ClaimType = {
+proto.legacy_pb.Claim.ClaimType = {
   UNKNOWN_CLAIM_TYPE: 0,
   STREAMTYPE: 1,
   CERTIFICATETYPE: 2
@@ -217,150 +224,165 @@ proto.pb.Claim.ClaimType = {
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Claim.Version}
+ * @return {!proto.legacy_pb.Claim.Version}
  */
-proto.pb.Claim.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Claim.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Claim.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Claim.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Claim.Version} value */
-proto.pb.Claim.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Claim.Version} value */
+proto.legacy_pb.Claim.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Claim.prototype.clearVersion = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Claim.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Claim.prototype.hasVersion = function() {
+proto.legacy_pb.Claim.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required ClaimType claimType = 2;
- * @return {!proto.pb.Claim.ClaimType}
+ * @return {!proto.legacy_pb.Claim.ClaimType}
  */
-proto.pb.Claim.prototype.getClaimtype = function() {
-  return /** @type {!proto.pb.Claim.ClaimType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Claim.prototype.getClaimtype = function() {
+  return /** @type {!proto.legacy_pb.Claim.ClaimType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.Claim.ClaimType} value */
-proto.pb.Claim.prototype.setClaimtype = function(value) {
+/** @param {!proto.legacy_pb.Claim.ClaimType} value */
+proto.legacy_pb.Claim.prototype.setClaimtype = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Claim.prototype.clearClaimtype = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Claim.prototype.clearClaimtype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Claim.prototype.hasClaimtype = function() {
+proto.legacy_pb.Claim.prototype.hasClaimtype = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
  * optional Stream stream = 3;
- * @return {?proto.pb.Stream}
+ * @return {?proto.legacy_pb.Stream}
  */
-proto.pb.Claim.prototype.getStream = function() {
-  return /** @type{?proto.pb.Stream} */ (
+proto.legacy_pb.Claim.prototype.getStream = function() {
+  return /** @type{?proto.legacy_pb.Stream} */ (
     jspb.Message.getWrapperField(this, stream_pb.Stream, 3));
 };
 
 
-/** @param {?proto.pb.Stream|undefined} value */
-proto.pb.Claim.prototype.setStream = function(value) {
+/** @param {?proto.legacy_pb.Stream|undefined} value */
+proto.legacy_pb.Claim.prototype.setStream = function(value) {
   jspb.Message.setWrapperField(this, 3, value);
 };
 
 
-proto.pb.Claim.prototype.clearStream = function() {
+/**
+ * Clears the message field making it undefined.
+ */
+proto.legacy_pb.Claim.prototype.clearStream = function() {
   this.setStream(undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Claim.prototype.hasStream = function() {
+proto.legacy_pb.Claim.prototype.hasStream = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
 
 /**
  * optional Certificate certificate = 4;
- * @return {?proto.pb.Certificate}
+ * @return {?proto.legacy_pb.Certificate}
  */
-proto.pb.Claim.prototype.getCertificate = function() {
-  return /** @type{?proto.pb.Certificate} */ (
+proto.legacy_pb.Claim.prototype.getCertificate = function() {
+  return /** @type{?proto.legacy_pb.Certificate} */ (
     jspb.Message.getWrapperField(this, certificate_pb.Certificate, 4));
 };
 
 
-/** @param {?proto.pb.Certificate|undefined} value */
-proto.pb.Claim.prototype.setCertificate = function(value) {
+/** @param {?proto.legacy_pb.Certificate|undefined} value */
+proto.legacy_pb.Claim.prototype.setCertificate = function(value) {
   jspb.Message.setWrapperField(this, 4, value);
 };
 
 
-proto.pb.Claim.prototype.clearCertificate = function() {
+/**
+ * Clears the message field making it undefined.
+ */
+proto.legacy_pb.Claim.prototype.clearCertificate = function() {
   this.setCertificate(undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Claim.prototype.hasCertificate = function() {
+proto.legacy_pb.Claim.prototype.hasCertificate = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
 /**
  * optional Signature publisherSignature = 5;
- * @return {?proto.pb.Signature}
+ * @return {?proto.legacy_pb.Signature}
  */
-proto.pb.Claim.prototype.getPublishersignature = function() {
-  return /** @type{?proto.pb.Signature} */ (
+proto.legacy_pb.Claim.prototype.getPublishersignature = function() {
+  return /** @type{?proto.legacy_pb.Signature} */ (
     jspb.Message.getWrapperField(this, signature_pb.Signature, 5));
 };
 
 
-/** @param {?proto.pb.Signature|undefined} value */
-proto.pb.Claim.prototype.setPublishersignature = function(value) {
+/** @param {?proto.legacy_pb.Signature|undefined} value */
+proto.legacy_pb.Claim.prototype.setPublishersignature = function(value) {
   jspb.Message.setWrapperField(this, 5, value);
 };
 
 
-proto.pb.Claim.prototype.clearPublishersignature = function() {
+/**
+ * Clears the message field making it undefined.
+ */
+proto.legacy_pb.Claim.prototype.clearPublishersignature = function() {
   this.setPublishersignature(undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Claim.prototype.hasPublishersignature = function() {
+proto.legacy_pb.Claim.prototype.hasPublishersignature = function() {
   return jspb.Message.getField(this, 5) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);

v1/js/metadata_pb.js

@@ -12,10 +12,10 @@ var goog = jspb;
 var global = Function('return this')();
 
 var fee_pb = require('./fee_pb.js');
-goog.exportSymbol('proto.pb.Metadata', null, global);
-goog.exportSymbol('proto.pb.Metadata.Language', null, global);
-goog.exportSymbol('proto.pb.Metadata.Version', null, global);
-
+goog.object.extend(proto, fee_pb);
+goog.exportSymbol('proto.legacy_pb.Metadata', null, global);
+goog.exportSymbol('proto.legacy_pb.Metadata.Language', null, global);
+goog.exportSymbol('proto.legacy_pb.Metadata.Version', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -26,15 +26,20 @@ goog.exportSymbol('proto.pb.Metadata.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Metadata = function(opt_data) {
+proto.legacy_pb.Metadata = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Metadata, jspb.Message);
+goog.inherits(proto.legacy_pb.Metadata, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Metadata.displayName = 'proto.pb.Metadata';
+  /**
+   * @public
+   * @override
+   */
+  proto.legacy_pb.Metadata.displayName = 'proto.legacy_pb.Metadata';
 }
 
 
+
 if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto suitable for use in Soy templates.
@@ -46,8 +51,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Metadata.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Metadata.toObject(opt_includeInstance, this);
+proto.legacy_pb.Metadata.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Metadata.toObject(opt_includeInstance, this);
 };
 
 
@@ -56,12 +61,12 @@ proto.pb.Metadata.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Metadata} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Metadata} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Metadata.toObject = function(includeInstance, msg) {
-  var f, obj = {
+proto.legacy_pb.Metadata.toObject = function(includeInstance, msg) {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     language: jspb.Message.getField(msg, 2),
     title: jspb.Message.getField(msg, 3),
@@ -86,23 +91,23 @@ proto.pb.Metadata.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Metadata}
+ * @return {!proto.legacy_pb.Metadata}
  */
-proto.pb.Metadata.deserializeBinary = function(bytes) {
+proto.legacy_pb.Metadata.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Metadata;
-  return proto.pb.Metadata.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Metadata;
+  return proto.legacy_pb.Metadata.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Metadata} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Metadata} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Metadata}
+ * @return {!proto.legacy_pb.Metadata}
  */
-proto.pb.Metadata.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Metadata.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -110,11 +115,11 @@ proto.pb.Metadata.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Metadata.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Metadata.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.Metadata.Language} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Metadata.Language} */ (reader.readEnum());
       msg.setLanguage(value);
       break;
     case 3:
@@ -167,9 +172,9 @@ proto.pb.Metadata.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Metadata.prototype.serializeBinary = function() {
+proto.legacy_pb.Metadata.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Metadata.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Metadata.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -177,20 +182,20 @@ proto.pb.Metadata.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Metadata} message
+ * @param {!proto.legacy_pb.Metadata} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Metadata.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Metadata.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Metadata.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Metadata.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.Metadata.Language} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.Metadata.Language} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -267,7 +272,7 @@ proto.pb.Metadata.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Metadata.Version = {
+proto.legacy_pb.Metadata.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1,
   _0_0_2: 2,
@@ -278,7 +283,7 @@ proto.pb.Metadata.Version = {
 /**
  * @enum {number}
  */
-proto.pb.Metadata.Language = {
+proto.legacy_pb.Metadata.Language = {
   UNKNOWN_LANGUAGE: 0,
   EN: 1,
   AA: 2,
@@ -468,58 +473,64 @@ proto.pb.Metadata.Language = {
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Metadata.Version}
+ * @return {!proto.legacy_pb.Metadata.Version}
  */
-proto.pb.Metadata.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Metadata.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Metadata.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Metadata.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Metadata.Version} value */
-proto.pb.Metadata.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Metadata.Version} value */
+proto.legacy_pb.Metadata.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Metadata.prototype.clearVersion = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasVersion = function() {
+proto.legacy_pb.Metadata.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required Language language = 2;
- * @return {!proto.pb.Metadata.Language}
+ * @return {!proto.legacy_pb.Metadata.Language}
  */
-proto.pb.Metadata.prototype.getLanguage = function() {
-  return /** @type {!proto.pb.Metadata.Language} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Metadata.prototype.getLanguage = function() {
+  return /** @type {!proto.legacy_pb.Metadata.Language} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.Metadata.Language} value */
-proto.pb.Metadata.prototype.setLanguage = function(value) {
+/** @param {!proto.legacy_pb.Metadata.Language} value */
+proto.legacy_pb.Metadata.prototype.setLanguage = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Metadata.prototype.clearLanguage = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearLanguage = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasLanguage = function() {
+proto.legacy_pb.Metadata.prototype.hasLanguage = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -528,27 +539,30 @@ proto.pb.Metadata.prototype.hasLanguage = function() {
  * required string title = 3;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getTitle = function() {
+proto.legacy_pb.Metadata.prototype.getTitle = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setTitle = function(value) {
+proto.legacy_pb.Metadata.prototype.setTitle = function(value) {
   jspb.Message.setField(this, 3, value);
 };
 
 
-proto.pb.Metadata.prototype.clearTitle = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearTitle = function() {
   jspb.Message.setField(this, 3, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasTitle = function() {
+proto.legacy_pb.Metadata.prototype.hasTitle = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
@@ -557,27 +571,30 @@ proto.pb.Metadata.prototype.hasTitle = function() {
  * required string description = 4;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getDescription = function() {
+proto.legacy_pb.Metadata.prototype.getDescription = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setDescription = function(value) {
+proto.legacy_pb.Metadata.prototype.setDescription = function(value) {
   jspb.Message.setField(this, 4, value);
 };
 
 
-proto.pb.Metadata.prototype.clearDescription = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearDescription = function() {
   jspb.Message.setField(this, 4, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasDescription = function() {
+proto.legacy_pb.Metadata.prototype.hasDescription = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
@@ -586,27 +603,30 @@ proto.pb.Metadata.prototype.hasDescription = function() {
  * required string author = 5;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getAuthor = function() {
+proto.legacy_pb.Metadata.prototype.getAuthor = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 5, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setAuthor = function(value) {
+proto.legacy_pb.Metadata.prototype.setAuthor = function(value) {
   jspb.Message.setField(this, 5, value);
 };
 
 
-proto.pb.Metadata.prototype.clearAuthor = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearAuthor = function() {
   jspb.Message.setField(this, 5, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasAuthor = function() {
+proto.legacy_pb.Metadata.prototype.hasAuthor = function() {
   return jspb.Message.getField(this, 5) != null;
 };
 
@@ -615,27 +635,30 @@ proto.pb.Metadata.prototype.hasAuthor = function() {
  * required string license = 6;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getLicense = function() {
+proto.legacy_pb.Metadata.prototype.getLicense = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 6, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setLicense = function(value) {
+proto.legacy_pb.Metadata.prototype.setLicense = function(value) {
   jspb.Message.setField(this, 6, value);
 };
 
 
-proto.pb.Metadata.prototype.clearLicense = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearLicense = function() {
   jspb.Message.setField(this, 6, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasLicense = function() {
+proto.legacy_pb.Metadata.prototype.hasLicense = function() {
   return jspb.Message.getField(this, 6) != null;
 };
 
@@ -646,57 +669,63 @@ proto.pb.Metadata.prototype.hasLicense = function() {
  * You should avoid comparisons like {@code val === true/false} in those cases.
  * @return {boolean}
  */
-proto.pb.Metadata.prototype.getNsfw = function() {
+proto.legacy_pb.Metadata.prototype.getNsfw = function() {
   return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 7, false));
 };
 
 
 /** @param {boolean} value */
-proto.pb.Metadata.prototype.setNsfw = function(value) {
+proto.legacy_pb.Metadata.prototype.setNsfw = function(value) {
   jspb.Message.setField(this, 7, value);
 };
 
 
-proto.pb.Metadata.prototype.clearNsfw = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearNsfw = function() {
   jspb.Message.setField(this, 7, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasNsfw = function() {
+proto.legacy_pb.Metadata.prototype.hasNsfw = function() {
   return jspb.Message.getField(this, 7) != null;
 };
 
 
 /**
  * optional Fee fee = 8;
- * @return {?proto.pb.Fee}
+ * @return {?proto.legacy_pb.Fee}
  */
-proto.pb.Metadata.prototype.getFee = function() {
-  return /** @type{?proto.pb.Fee} */ (
+proto.legacy_pb.Metadata.prototype.getFee = function() {
+  return /** @type{?proto.legacy_pb.Fee} */ (
     jspb.Message.getWrapperField(this, fee_pb.Fee, 8));
 };
 
 
-/** @param {?proto.pb.Fee|undefined} value */
-proto.pb.Metadata.prototype.setFee = function(value) {
+/** @param {?proto.legacy_pb.Fee|undefined} value */
+proto.legacy_pb.Metadata.prototype.setFee = function(value) {
   jspb.Message.setWrapperField(this, 8, value);
 };
 
 
-proto.pb.Metadata.prototype.clearFee = function() {
+/**
+ * Clears the message field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearFee = function() {
   this.setFee(undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasFee = function() {
+proto.legacy_pb.Metadata.prototype.hasFee = function() {
   return jspb.Message.getField(this, 8) != null;
 };
 
@@ -705,27 +734,30 @@ proto.pb.Metadata.prototype.hasFee = function() {
  * optional string thumbnail = 9;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getThumbnail = function() {
+proto.legacy_pb.Metadata.prototype.getThumbnail = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 9, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setThumbnail = function(value) {
+proto.legacy_pb.Metadata.prototype.setThumbnail = function(value) {
   jspb.Message.setField(this, 9, value);
 };
 
 
-proto.pb.Metadata.prototype.clearThumbnail = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearThumbnail = function() {
   jspb.Message.setField(this, 9, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasThumbnail = function() {
+proto.legacy_pb.Metadata.prototype.hasThumbnail = function() {
   return jspb.Message.getField(this, 9) != null;
 };
 
@@ -734,27 +766,30 @@ proto.pb.Metadata.prototype.hasThumbnail = function() {
  * optional string preview = 10;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getPreview = function() {
+proto.legacy_pb.Metadata.prototype.getPreview = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setPreview = function(value) {
+proto.legacy_pb.Metadata.prototype.setPreview = function(value) {
   jspb.Message.setField(this, 10, value);
 };
 
 
-proto.pb.Metadata.prototype.clearPreview = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearPreview = function() {
   jspb.Message.setField(this, 10, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasPreview = function() {
+proto.legacy_pb.Metadata.prototype.hasPreview = function() {
   return jspb.Message.getField(this, 10) != null;
 };
 
@@ -763,29 +798,32 @@ proto.pb.Metadata.prototype.hasPreview = function() {
  * optional string licenseUrl = 11;
  * @return {string}
  */
-proto.pb.Metadata.prototype.getLicenseurl = function() {
+proto.legacy_pb.Metadata.prototype.getLicenseurl = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 11, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Metadata.prototype.setLicenseurl = function(value) {
+proto.legacy_pb.Metadata.prototype.setLicenseurl = function(value) {
   jspb.Message.setField(this, 11, value);
 };
 
 
-proto.pb.Metadata.prototype.clearLicenseurl = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Metadata.prototype.clearLicenseurl = function() {
   jspb.Message.setField(this, 11, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Metadata.prototype.hasLicenseurl = function() {
+proto.legacy_pb.Metadata.prototype.hasLicenseurl = function() {
   return jspb.Message.getField(this, 11) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);

v1/js/signature_pb.js

@@ -12,9 +12,9 @@ var goog = jspb;
 var global = Function('return this')();
 
 var certificate_pb = require('./certificate_pb.js');
-goog.exportSymbol('proto.pb.Signature', null, global);
-goog.exportSymbol('proto.pb.Signature.Version', null, global);
-
+goog.object.extend(proto, certificate_pb);
+goog.exportSymbol('proto.legacy_pb.Signature', null, global);
+goog.exportSymbol('proto.legacy_pb.Signature.Version', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -25,15 +25,20 @@ goog.exportSymbol('proto.pb.Signature.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Signature = function(opt_data) {
+proto.legacy_pb.Signature = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Signature, jspb.Message);
+goog.inherits(proto.legacy_pb.Signature, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Signature.displayName = 'proto.pb.Signature';
+  /**
+   * @public
+   * @override
+   */
+  proto.legacy_pb.Signature.displayName = 'proto.legacy_pb.Signature';
 }
 
 
+
 if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto suitable for use in Soy templates.
@@ -45,8 +50,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Signature.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Signature.toObject(opt_includeInstance, this);
+proto.legacy_pb.Signature.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Signature.toObject(opt_includeInstance, this);
 };
 
 
@@ -55,12 +60,12 @@ proto.pb.Signature.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Signature} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Signature} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Signature.toObject = function(includeInstance, msg) {
-  var f, obj = {
+proto.legacy_pb.Signature.toObject = function(includeInstance, msg) {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     signaturetype: jspb.Message.getField(msg, 2),
     signature: msg.getSignature_asB64(),
@@ -78,23 +83,23 @@ proto.pb.Signature.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Signature}
+ * @return {!proto.legacy_pb.Signature}
  */
-proto.pb.Signature.deserializeBinary = function(bytes) {
+proto.legacy_pb.Signature.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Signature;
-  return proto.pb.Signature.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Signature;
+  return proto.legacy_pb.Signature.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Signature} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Signature} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Signature}
+ * @return {!proto.legacy_pb.Signature}
  */
-proto.pb.Signature.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Signature.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -102,11 +107,11 @@ proto.pb.Signature.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Signature.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Signature.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.KeyType} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.KeyType} */ (reader.readEnum());
       msg.setSignaturetype(value);
       break;
     case 3:
@@ -130,9 +135,9 @@ proto.pb.Signature.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Signature.prototype.serializeBinary = function() {
+proto.legacy_pb.Signature.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Signature.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Signature.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -140,20 +145,20 @@ proto.pb.Signature.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Signature} message
+ * @param {!proto.legacy_pb.Signature} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Signature.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Signature.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Signature.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Signature.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.KeyType} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.KeyType} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -180,65 +185,71 @@ proto.pb.Signature.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Signature.Version = {
+proto.legacy_pb.Signature.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Signature.Version}
+ * @return {!proto.legacy_pb.Signature.Version}
  */
-proto.pb.Signature.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Signature.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Signature.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Signature.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Signature.Version} value */
-proto.pb.Signature.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Signature.Version} value */
+proto.legacy_pb.Signature.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Signature.prototype.clearVersion = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Signature.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Signature.prototype.hasVersion = function() {
+proto.legacy_pb.Signature.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required KeyType signatureType = 2;
- * @return {!proto.pb.KeyType}
+ * @return {!proto.legacy_pb.KeyType}
  */
-proto.pb.Signature.prototype.getSignaturetype = function() {
-  return /** @type {!proto.pb.KeyType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Signature.prototype.getSignaturetype = function() {
+  return /** @type {!proto.legacy_pb.KeyType} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.KeyType} value */
-proto.pb.Signature.prototype.setSignaturetype = function(value) {
+/** @param {!proto.legacy_pb.KeyType} value */
+proto.legacy_pb.Signature.prototype.setSignaturetype = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Signature.prototype.clearSignaturetype = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Signature.prototype.clearSignaturetype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Signature.prototype.hasSignaturetype = function() {
+proto.legacy_pb.Signature.prototype.hasSignaturetype = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -247,7 +258,7 @@ proto.pb.Signature.prototype.hasSignaturetype = function() {
  * required bytes signature = 3;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Signature.prototype.getSignature = function() {
+proto.legacy_pb.Signature.prototype.getSignature = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
@@ -257,7 +268,7 @@ proto.pb.Signature.prototype.getSignature = function() {
  * This is a type-conversion wrapper around `getSignature()`
  * @return {string}
  */
-proto.pb.Signature.prototype.getSignature_asB64 = function() {
+proto.legacy_pb.Signature.prototype.getSignature_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getSignature()));
 };
@@ -270,28 +281,31 @@ proto.pb.Signature.prototype.getSignature_asB64 = function() {
  * This is a type-conversion wrapper around `getSignature()`
  * @return {!Uint8Array}
  */
-proto.pb.Signature.prototype.getSignature_asU8 = function() {
+proto.legacy_pb.Signature.prototype.getSignature_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getSignature()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Signature.prototype.setSignature = function(value) {
+proto.legacy_pb.Signature.prototype.setSignature = function(value) {
   jspb.Message.setField(this, 3, value);
 };
 
 
-proto.pb.Signature.prototype.clearSignature = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Signature.prototype.clearSignature = function() {
   jspb.Message.setField(this, 3, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Signature.prototype.hasSignature = function() {
+proto.legacy_pb.Signature.prototype.hasSignature = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
@@ -300,7 +314,7 @@ proto.pb.Signature.prototype.hasSignature = function() {
  * required bytes certificateId = 4;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Signature.prototype.getCertificateid = function() {
+proto.legacy_pb.Signature.prototype.getCertificateid = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
@@ -310,7 +324,7 @@ proto.pb.Signature.prototype.getCertificateid = function() {
  * This is a type-conversion wrapper around `getCertificateid()`
  * @return {string}
  */
-proto.pb.Signature.prototype.getCertificateid_asB64 = function() {
+proto.legacy_pb.Signature.prototype.getCertificateid_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getCertificateid()));
 };
@@ -323,30 +337,33 @@ proto.pb.Signature.prototype.getCertificateid_asB64 = function() {
  * This is a type-conversion wrapper around `getCertificateid()`
  * @return {!Uint8Array}
  */
-proto.pb.Signature.prototype.getCertificateid_asU8 = function() {
+proto.legacy_pb.Signature.prototype.getCertificateid_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getCertificateid()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Signature.prototype.setCertificateid = function(value) {
+proto.legacy_pb.Signature.prototype.setCertificateid = function(value) {
   jspb.Message.setField(this, 4, value);
 };
 
 
-proto.pb.Signature.prototype.clearCertificateid = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Signature.prototype.clearCertificateid = function() {
   jspb.Message.setField(this, 4, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Signature.prototype.hasCertificateid = function() {
+proto.legacy_pb.Signature.prototype.hasCertificateid = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);

v1/js/source_pb.js

@@ -11,10 +11,9 @@ var jspb = require('google-protobuf');
 var goog = jspb;
 var global = Function('return this')();
 
-goog.exportSymbol('proto.pb.Source', null, global);
-goog.exportSymbol('proto.pb.Source.SourceTypes', null, global);
-goog.exportSymbol('proto.pb.Source.Version', null, global);
-
+goog.exportSymbol('proto.legacy_pb.Source', null, global);
+goog.exportSymbol('proto.legacy_pb.Source.SourceTypes', null, global);
+goog.exportSymbol('proto.legacy_pb.Source.Version', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -25,15 +24,20 @@ goog.exportSymbol('proto.pb.Source.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Source = function(opt_data) {
+proto.legacy_pb.Source = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Source, jspb.Message);
+goog.inherits(proto.legacy_pb.Source, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Source.displayName = 'proto.pb.Source';
+  /**
+   * @public
+   * @override
+   */
+  proto.legacy_pb.Source.displayName = 'proto.legacy_pb.Source';
 }
 
 
+
 if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto suitable for use in Soy templates.
@@ -45,8 +49,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Source.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Source.toObject(opt_includeInstance, this);
+proto.legacy_pb.Source.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Source.toObject(opt_includeInstance, this);
 };
 
 
@@ -55,12 +59,12 @@ proto.pb.Source.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Source} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Source} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Source.toObject = function(includeInstance, msg) {
-  var f, obj = {
+proto.legacy_pb.Source.toObject = function(includeInstance, msg) {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     sourcetype: jspb.Message.getField(msg, 2),
     source: msg.getSource_asB64(),
@@ -78,23 +82,23 @@ proto.pb.Source.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Source}
+ * @return {!proto.legacy_pb.Source}
  */
-proto.pb.Source.deserializeBinary = function(bytes) {
+proto.legacy_pb.Source.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Source;
-  return proto.pb.Source.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Source;
+  return proto.legacy_pb.Source.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Source} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Source} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Source}
+ * @return {!proto.legacy_pb.Source}
  */
-proto.pb.Source.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Source.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -102,11 +106,11 @@ proto.pb.Source.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Source.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Source.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
-      var value = /** @type {!proto.pb.Source.SourceTypes} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Source.SourceTypes} */ (reader.readEnum());
       msg.setSourcetype(value);
       break;
     case 3:
@@ -130,9 +134,9 @@ proto.pb.Source.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Source.prototype.serializeBinary = function() {
+proto.legacy_pb.Source.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Source.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Source.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -140,20 +144,20 @@ proto.pb.Source.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Source} message
+ * @param {!proto.legacy_pb.Source} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Source.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Source.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Source.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Source.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
       f
     );
   }
-  f = /** @type {!proto.pb.Source.SourceTypes} */ (jspb.Message.getField(message, 2));
+  f = /** @type {!proto.legacy_pb.Source.SourceTypes} */ (jspb.Message.getField(message, 2));
   if (f != null) {
     writer.writeEnum(
       2,
@@ -180,7 +184,7 @@ proto.pb.Source.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Source.Version = {
+proto.legacy_pb.Source.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
@@ -188,65 +192,71 @@ proto.pb.Source.Version = {
 /**
  * @enum {number}
  */
-proto.pb.Source.SourceTypes = {
+proto.legacy_pb.Source.SourceTypes = {
   UNKNOWN_SOURCE_TYPE: 0,
   LBRY_SD_HASH: 1
 };
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Source.Version}
+ * @return {!proto.legacy_pb.Source.Version}
  */
-proto.pb.Source.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Source.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Source.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Source.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Source.Version} value */
-proto.pb.Source.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Source.Version} value */
+proto.legacy_pb.Source.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Source.prototype.clearVersion = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Source.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Source.prototype.hasVersion = function() {
+proto.legacy_pb.Source.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required SourceTypes sourceType = 2;
- * @return {!proto.pb.Source.SourceTypes}
+ * @return {!proto.legacy_pb.Source.SourceTypes}
  */
-proto.pb.Source.prototype.getSourcetype = function() {
-  return /** @type {!proto.pb.Source.SourceTypes} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
+proto.legacy_pb.Source.prototype.getSourcetype = function() {
+  return /** @type {!proto.legacy_pb.Source.SourceTypes} */ (jspb.Message.getFieldWithDefault(this, 2, 0));
 };
 
 
-/** @param {!proto.pb.Source.SourceTypes} value */
-proto.pb.Source.prototype.setSourcetype = function(value) {
+/** @param {!proto.legacy_pb.Source.SourceTypes} value */
+proto.legacy_pb.Source.prototype.setSourcetype = function(value) {
   jspb.Message.setField(this, 2, value);
 };
 
 
-proto.pb.Source.prototype.clearSourcetype = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Source.prototype.clearSourcetype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Source.prototype.hasSourcetype = function() {
+proto.legacy_pb.Source.prototype.hasSourcetype = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
@@ -255,7 +265,7 @@ proto.pb.Source.prototype.hasSourcetype = function() {
  * required bytes source = 3;
  * @return {!(string|Uint8Array)}
  */
-proto.pb.Source.prototype.getSource = function() {
+proto.legacy_pb.Source.prototype.getSource = function() {
   return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 3, ""));
 };
 
@@ -265,7 +275,7 @@ proto.pb.Source.prototype.getSource = function() {
  * This is a type-conversion wrapper around `getSource()`
  * @return {string}
  */
-proto.pb.Source.prototype.getSource_asB64 = function() {
+proto.legacy_pb.Source.prototype.getSource_asB64 = function() {
   return /** @type {string} */ (jspb.Message.bytesAsB64(
       this.getSource()));
 };
@@ -278,28 +288,31 @@ proto.pb.Source.prototype.getSource_asB64 = function() {
  * This is a type-conversion wrapper around `getSource()`
  * @return {!Uint8Array}
  */
-proto.pb.Source.prototype.getSource_asU8 = function() {
+proto.legacy_pb.Source.prototype.getSource_asU8 = function() {
   return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
       this.getSource()));
 };
 
 
 /** @param {!(string|Uint8Array)} value */
-proto.pb.Source.prototype.setSource = function(value) {
+proto.legacy_pb.Source.prototype.setSource = function(value) {
   jspb.Message.setField(this, 3, value);
 };
 
 
-proto.pb.Source.prototype.clearSource = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Source.prototype.clearSource = function() {
   jspb.Message.setField(this, 3, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Source.prototype.hasSource = function() {
+proto.legacy_pb.Source.prototype.hasSource = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
@@ -308,29 +321,32 @@ proto.pb.Source.prototype.hasSource = function() {
  * required string contentType = 4;
  * @return {string}
  */
-proto.pb.Source.prototype.getContenttype = function() {
+proto.legacy_pb.Source.prototype.getContenttype = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 4, ""));
 };
 
 
 /** @param {string} value */
-proto.pb.Source.prototype.setContenttype = function(value) {
+proto.legacy_pb.Source.prototype.setContenttype = function(value) {
   jspb.Message.setField(this, 4, value);
 };
 
 
-proto.pb.Source.prototype.clearContenttype = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Source.prototype.clearContenttype = function() {
   jspb.Message.setField(this, 4, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Source.prototype.hasContenttype = function() {
+proto.legacy_pb.Source.prototype.hasContenttype = function() {
   return jspb.Message.getField(this, 4) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);

v1/js/stream_pb.js

@@ -12,10 +12,11 @@ var goog = jspb;
 var global = Function('return this')();
 
 var metadata_pb = require('./metadata_pb.js');
+goog.object.extend(proto, metadata_pb);
 var source_pb = require('./source_pb.js');
-goog.exportSymbol('proto.pb.Stream', null, global);
-goog.exportSymbol('proto.pb.Stream.Version', null, global);
-
+goog.object.extend(proto, source_pb);
+goog.exportSymbol('proto.legacy_pb.Stream', null, global);
+goog.exportSymbol('proto.legacy_pb.Stream.Version', null, global);
 /**
  * Generated by JsPbCodeGenerator.
  * @param {Array=} opt_data Optional initial data array, typically from a
@@ -26,15 +27,20 @@ goog.exportSymbol('proto.pb.Stream.Version', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.pb.Stream = function(opt_data) {
+proto.legacy_pb.Stream = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.pb.Stream, jspb.Message);
+goog.inherits(proto.legacy_pb.Stream, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.pb.Stream.displayName = 'proto.pb.Stream';
+  /**
+   * @public
+   * @override
+   */
+  proto.legacy_pb.Stream.displayName = 'proto.legacy_pb.Stream';
 }
 
 
+
 if (jspb.Message.GENERATE_TO_OBJECT) {
 /**
  * Creates an object representation of this proto suitable for use in Soy templates.
@@ -46,8 +52,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.pb.Stream.prototype.toObject = function(opt_includeInstance) {
-  return proto.pb.Stream.toObject(opt_includeInstance, this);
+proto.legacy_pb.Stream.prototype.toObject = function(opt_includeInstance) {
+  return proto.legacy_pb.Stream.toObject(opt_includeInstance, this);
 };
 
 
@@ -56,12 +62,12 @@ proto.pb.Stream.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.pb.Stream} msg The msg instance to transform.
+ * @param {!proto.legacy_pb.Stream} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Stream.toObject = function(includeInstance, msg) {
-  var f, obj = {
+proto.legacy_pb.Stream.toObject = function(includeInstance, msg) {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     metadata: (f = msg.getMetadata()) && metadata_pb.Metadata.toObject(includeInstance, f),
     source: (f = msg.getSource()) && source_pb.Source.toObject(includeInstance, f)
@@ -78,23 +84,23 @@ proto.pb.Stream.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.pb.Stream}
+ * @return {!proto.legacy_pb.Stream}
  */
-proto.pb.Stream.deserializeBinary = function(bytes) {
+proto.legacy_pb.Stream.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.pb.Stream;
-  return proto.pb.Stream.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.legacy_pb.Stream;
+  return proto.legacy_pb.Stream.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.pb.Stream} msg The message object to deserialize into.
+ * @param {!proto.legacy_pb.Stream} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.pb.Stream}
+ * @return {!proto.legacy_pb.Stream}
  */
-proto.pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
+proto.legacy_pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -102,7 +108,7 @@ proto.pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
     var field = reader.getFieldNumber();
     switch (field) {
     case 1:
-      var value = /** @type {!proto.pb.Stream.Version} */ (reader.readEnum());
+      var value = /** @type {!proto.legacy_pb.Stream.Version} */ (reader.readEnum());
       msg.setVersion(value);
       break;
     case 2:
@@ -128,9 +134,9 @@ proto.pb.Stream.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.pb.Stream.prototype.serializeBinary = function() {
+proto.legacy_pb.Stream.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.pb.Stream.serializeBinaryToWriter(this, writer);
+  proto.legacy_pb.Stream.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
@@ -138,13 +144,13 @@ proto.pb.Stream.prototype.serializeBinary = function() {
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.pb.Stream} message
+ * @param {!proto.legacy_pb.Stream} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.pb.Stream.serializeBinaryToWriter = function(message, writer) {
+proto.legacy_pb.Stream.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
-  f = /** @type {!proto.pb.Stream.Version} */ (jspb.Message.getField(message, 1));
+  f = /** @type {!proto.legacy_pb.Stream.Version} */ (jspb.Message.getField(message, 1));
   if (f != null) {
     writer.writeEnum(
       1,
@@ -173,98 +179,107 @@ proto.pb.Stream.serializeBinaryToWriter = function(message, writer) {
 /**
  * @enum {number}
  */
-proto.pb.Stream.Version = {
+proto.legacy_pb.Stream.Version = {
   UNKNOWN_VERSION: 0,
   _0_0_1: 1
 };
 
 /**
  * required Version version = 1;
- * @return {!proto.pb.Stream.Version}
+ * @return {!proto.legacy_pb.Stream.Version}
  */
-proto.pb.Stream.prototype.getVersion = function() {
-  return /** @type {!proto.pb.Stream.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
+proto.legacy_pb.Stream.prototype.getVersion = function() {
+  return /** @type {!proto.legacy_pb.Stream.Version} */ (jspb.Message.getFieldWithDefault(this, 1, 0));
 };
 
 
-/** @param {!proto.pb.Stream.Version} value */
-proto.pb.Stream.prototype.setVersion = function(value) {
+/** @param {!proto.legacy_pb.Stream.Version} value */
+proto.legacy_pb.Stream.prototype.setVersion = function(value) {
   jspb.Message.setField(this, 1, value);
 };
 
 
-proto.pb.Stream.prototype.clearVersion = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Stream.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Stream.prototype.hasVersion = function() {
+proto.legacy_pb.Stream.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
 };
 
 
 /**
  * required Metadata metadata = 2;
- * @return {!proto.pb.Metadata}
+ * @return {!proto.legacy_pb.Metadata}
  */
-proto.pb.Stream.prototype.getMetadata = function() {
-  return /** @type{!proto.pb.Metadata} */ (
+proto.legacy_pb.Stream.prototype.getMetadata = function() {
+  return /** @type{!proto.legacy_pb.Metadata} */ (
     jspb.Message.getWrapperField(this, metadata_pb.Metadata, 2, 1));
 };
 
 
-/** @param {!proto.pb.Metadata} value */
-proto.pb.Stream.prototype.setMetadata = function(value) {
+/** @param {!proto.legacy_pb.Metadata} value */
+proto.legacy_pb.Stream.prototype.setMetadata = function(value) {
   jspb.Message.setWrapperField(this, 2, value);
 };
 
 
-proto.pb.Stream.prototype.clearMetadata = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Stream.prototype.clearMetadata = function() {
   jspb.Message.setField(this, 2, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Stream.prototype.hasMetadata = function() {
+proto.legacy_pb.Stream.prototype.hasMetadata = function() {
   return jspb.Message.getField(this, 2) != null;
 };
 
 
 /**
  * required Source source = 3;
- * @return {!proto.pb.Source}
+ * @return {!proto.legacy_pb.Source}
  */
-proto.pb.Stream.prototype.getSource = function() {
-  return /** @type{!proto.pb.Source} */ (
+proto.legacy_pb.Stream.prototype.getSource = function() {
+  return /** @type{!proto.legacy_pb.Source} */ (
     jspb.Message.getWrapperField(this, source_pb.Source, 3, 1));
 };
 
 
-/** @param {!proto.pb.Source} value */
-proto.pb.Stream.prototype.setSource = function(value) {
+/** @param {!proto.legacy_pb.Source} value */
+proto.legacy_pb.Stream.prototype.setSource = function(value) {
   jspb.Message.setWrapperField(this, 3, value);
 };
 
 
-proto.pb.Stream.prototype.clearSource = function() {
+/**
+ * Clears the field making it undefined.
+ */
+proto.legacy_pb.Stream.prototype.clearSource = function() {
   jspb.Message.setField(this, 3, undefined);
 };
 
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
-proto.pb.Stream.prototype.hasSource = function() {
+proto.legacy_pb.Stream.prototype.hasSource = function() {
   return jspb.Message.getField(this, 3) != null;
 };
 
 
-goog.object.extend(exports, proto.pb);
+goog.object.extend(exports, proto.legacy_pb);

v1/proto/certificate.proto

@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 enum KeyType {
         UNKNOWN_PUBLIC_KEY_TYPE = 0;

v1/proto/fee.proto

@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 message Fee {
     enum Version {

v1/proto/legacy_claim.proto

@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 import "stream.proto";
 import "certificate.proto";

v1/proto/metadata.proto

@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 import "fee.proto";
 

v1/proto/signature.proto

@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 import "certificate.proto";
 

v1/proto/source.proto

@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 message Source {
     enum Version {

v1/proto/stream.proto

@@ -1,6 +1,6 @@
 syntax = "proto2";
 
-package pb;
+package legacy_pb;
 
 import "metadata.proto";
 import "source.proto";

v1/python/certificate_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: certificate.proto
 
@@ -8,7 +9,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -18,38 +18,39 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='certificate.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x11\x63\x65rtificate.proto\x12\x02pb\"\x94\x01\n\x0b\x43\x65rtificate\x12(\n\x07version\x18\x01 \x02(\x0e\x32\x17.pb.Certificate.Version\x12\x1c\n\x07keyType\x18\x02 \x02(\x0e\x32\x0b.pb.KeyType\x12\x11\n\tpublicKey\x18\x04 \x02(\x0c\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01*Q\n\x07KeyType\x12\x1b\n\x17UNKNOWN_PUBLIC_KEY_TYPE\x10\x00\x12\x0c\n\x08NIST256p\x10\x01\x12\x0c\n\x08NIST384p\x10\x02\x12\r\n\tSECP256k1\x10\x03')
+  serialized_options=None,
+  serialized_pb=_b('\n\x11\x63\x65rtificate.proto\x12\tlegacy_pb\"\xa2\x01\n\x0b\x43\x65rtificate\x12/\n\x07version\x18\x01 \x02(\x0e\x32\x1e.legacy_pb.Certificate.Version\x12#\n\x07keyType\x18\x02 \x02(\x0e\x32\x12.legacy_pb.KeyType\x12\x11\n\tpublicKey\x18\x04 \x02(\x0c\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01*Q\n\x07KeyType\x12\x1b\n\x17UNKNOWN_PUBLIC_KEY_TYPE\x10\x00\x12\x0c\n\x08NIST256p\x10\x01\x12\x0c\n\x08NIST384p\x10\x02\x12\r\n\tSECP256k1\x10\x03')
 )
 
 _KEYTYPE = _descriptor.EnumDescriptor(
   name='KeyType',
-  full_name='pb.KeyType',
+  full_name='legacy_pb.KeyType',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_PUBLIC_KEY_TYPE', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='NIST256p', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='NIST384p', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='SECP256k1', index=3, number=3,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=176,
-  serialized_end=257,
+  serialized_options=None,
+  serialized_start=197,
+  serialized_end=278,
 )
 _sym_db.RegisterEnumDescriptor(_KEYTYPE)
 
@@ -62,55 +63,55 @@ SECP256k1 = 3
 
 _CERTIFICATE_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Certificate.Version',
+  full_name='legacy_pb.Certificate.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=132,
-  serialized_end=174,
+  serialized_options=None,
+  serialized_start=153,
+  serialized_end=195,
 )
 _sym_db.RegisterEnumDescriptor(_CERTIFICATE_VERSION)
 
 
 _CERTIFICATE = _descriptor.Descriptor(
   name='Certificate',
-  full_name='pb.Certificate',
+  full_name='legacy_pb.Certificate',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Certificate.version', index=0,
+      name='version', full_name='legacy_pb.Certificate.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='keyType', full_name='pb.Certificate.keyType', index=1,
+      name='keyType', full_name='legacy_pb.Certificate.keyType', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='publicKey', full_name='pb.Certificate.publicKey', index=2,
+      name='publicKey', full_name='legacy_pb.Certificate.publicKey', index=2,
       number=4, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -118,14 +119,14 @@ _CERTIFICATE = _descriptor.Descriptor(
   enum_types=[
     _CERTIFICATE_VERSION,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=26,
-  serialized_end=174,
+  serialized_start=33,
+  serialized_end=195,
 )
 
 _CERTIFICATE.fields_by_name['version'].enum_type = _CERTIFICATE_VERSION
@@ -138,7 +139,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Certificate = _reflection.GeneratedProtocolMessageType('Certificate', (_message.Message,), dict(
   DESCRIPTOR = _CERTIFICATE,
   __module__ = 'certificate_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Certificate)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Certificate)
   ))
 _sym_db.RegisterMessage(Certificate)
 

v1/python/fee_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: fee.proto
 
@@ -7,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -17,101 +17,102 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='fee.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\tfee.proto\x12\x02pb\"\xd5\x01\n\x03\x46\x65\x65\x12 \n\x07version\x18\x01 \x02(\x0e\x32\x0f.pb.Fee.Version\x12\"\n\x08\x63urrency\x18\x02 \x02(\x0e\x32\x10.pb.Fee.Currency\x12\x0f\n\x07\x61\x64\x64ress\x18\x03 \x02(\x0c\x12\x0e\n\x06\x61mount\x18\x04 \x02(\x02\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\";\n\x08\x43urrency\x12\x14\n\x10UNKNOWN_CURRENCY\x10\x00\x12\x07\n\x03LBC\x10\x01\x12\x07\n\x03\x42TC\x10\x02\x12\x07\n\x03USD\x10\x03')
+  serialized_options=None,
+  serialized_pb=_b('\n\tfee.proto\x12\tlegacy_pb\"\xe3\x01\n\x03\x46\x65\x65\x12\'\n\x07version\x18\x01 \x02(\x0e\x32\x16.legacy_pb.Fee.Version\x12)\n\x08\x63urrency\x18\x02 \x02(\x0e\x32\x17.legacy_pb.Fee.Currency\x12\x0f\n\x07\x61\x64\x64ress\x18\x03 \x02(\x0c\x12\x0e\n\x06\x61mount\x18\x04 \x02(\x02\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\";\n\x08\x43urrency\x12\x14\n\x10UNKNOWN_CURRENCY\x10\x00\x12\x07\n\x03LBC\x10\x01\x12\x07\n\x03\x42TC\x10\x02\x12\x07\n\x03USD\x10\x03')
 )
 
 
 
 _FEE_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Fee.Version',
+  full_name='legacy_pb.Fee.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=128,
-  serialized_end=170,
+  serialized_options=None,
+  serialized_start=149,
+  serialized_end=191,
 )
 _sym_db.RegisterEnumDescriptor(_FEE_VERSION)
 
 _FEE_CURRENCY = _descriptor.EnumDescriptor(
   name='Currency',
-  full_name='pb.Fee.Currency',
+  full_name='legacy_pb.Fee.Currency',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_CURRENCY', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='LBC', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='BTC', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='USD', index=3, number=3,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=172,
-  serialized_end=231,
+  serialized_options=None,
+  serialized_start=193,
+  serialized_end=252,
 )
 _sym_db.RegisterEnumDescriptor(_FEE_CURRENCY)
 
 
 _FEE = _descriptor.Descriptor(
   name='Fee',
-  full_name='pb.Fee',
+  full_name='legacy_pb.Fee',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Fee.version', index=0,
+      name='version', full_name='legacy_pb.Fee.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='currency', full_name='pb.Fee.currency', index=1,
+      name='currency', full_name='legacy_pb.Fee.currency', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='address', full_name='pb.Fee.address', index=2,
+      name='address', full_name='legacy_pb.Fee.address', index=2,
       number=3, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='amount', full_name='pb.Fee.amount', index=3,
+      name='amount', full_name='legacy_pb.Fee.amount', index=3,
       number=4, type=2, cpp_type=6, label=2,
       has_default_value=False, default_value=float(0),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -120,14 +121,14 @@ _FEE = _descriptor.Descriptor(
     _FEE_VERSION,
     _FEE_CURRENCY,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=18,
-  serialized_end=231,
+  serialized_start=25,
+  serialized_end=252,
 )
 
 _FEE.fields_by_name['version'].enum_type = _FEE_VERSION
@@ -140,7 +141,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Fee = _reflection.GeneratedProtocolMessageType('Fee', (_message.Message,), dict(
   DESCRIPTOR = _FEE,
   __module__ = 'fee_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Fee)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Fee)
   ))
 _sym_db.RegisterMessage(Fee)
 

v1/python/legacy_claim_pb2.py

@@ -1,5 +1,6 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
-# source: claim.proto
+# source: legacy_claim.proto
 
 import sys
 _b=sys.version_info[0]<3 and (lambda x:x) or (lambda x:x.encode('latin1'))
@@ -7,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -19,10 +19,11 @@ import signature_pb2 as signature__pb2
 
 
 DESCRIPTOR = _descriptor.FileDescriptor(
-  name='claim.proto',
-  package='pb',
+  name='legacy_claim.proto',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x0b\x63laim.proto\x12\x02pb\x1a\x0cstream.proto\x1a\x11\x63\x65rtificate.proto\x1a\x0fsignature.proto\"\xb6\x02\n\x05\x43laim\x12\"\n\x07version\x18\x01 \x02(\x0e\x32\x11.pb.Claim.Version\x12&\n\tclaimType\x18\x02 \x02(\x0e\x32\x13.pb.Claim.ClaimType\x12\x1a\n\x06stream\x18\x03 \x01(\x0b\x32\n.pb.Stream\x12$\n\x0b\x63\x65rtificate\x18\x04 \x01(\x0b\x32\x0f.pb.Certificate\x12)\n\x12publisherSignature\x18\x05 \x01(\x0b\x32\r.pb.Signature\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\"H\n\tClaimType\x12\x16\n\x12UNKNOWN_CLAIM_TYPE\x10\x00\x12\x0e\n\nstreamType\x10\x01\x12\x13\n\x0f\x63\x65rtificateType\x10\x02')
+  serialized_options=None,
+  serialized_pb=_b('\n\x12legacy_claim.proto\x12\tlegacy_pb\x1a\x0cstream.proto\x1a\x11\x63\x65rtificate.proto\x1a\x0fsignature.proto\"\xd9\x02\n\x05\x43laim\x12)\n\x07version\x18\x01 \x02(\x0e\x32\x18.legacy_pb.Claim.Version\x12-\n\tclaimType\x18\x02 \x02(\x0e\x32\x1a.legacy_pb.Claim.ClaimType\x12!\n\x06stream\x18\x03 \x01(\x0b\x32\x11.legacy_pb.Stream\x12+\n\x0b\x63\x65rtificate\x18\x04 \x01(\x0b\x32\x16.legacy_pb.Certificate\x12\x30\n\x12publisherSignature\x18\x05 \x01(\x0b\x32\x14.legacy_pb.Signature\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\"H\n\tClaimType\x12\x16\n\x12UNKNOWN_CLAIM_TYPE\x10\x00\x12\x0e\n\nstreamType\x10\x01\x12\x13\n\x0f\x63\x65rtificateType\x10\x02')
   ,
   dependencies=[stream__pb2.DESCRIPTOR,certificate__pb2.DESCRIPTOR,signature__pb2.DESCRIPTOR,])
 
@@ -30,95 +31,95 @@ DESCRIPTOR = _descriptor.FileDescriptor(
 
 _CLAIM_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Claim.Version',
+  full_name='legacy_pb.Claim.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=264,
-  serialized_end=306,
+  serialized_options=None,
+  serialized_start=313,
+  serialized_end=355,
 )
 _sym_db.RegisterEnumDescriptor(_CLAIM_VERSION)
 
 _CLAIM_CLAIMTYPE = _descriptor.EnumDescriptor(
   name='ClaimType',
-  full_name='pb.Claim.ClaimType',
+  full_name='legacy_pb.Claim.ClaimType',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_CLAIM_TYPE', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='streamType', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='certificateType', index=2, number=2,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=308,
-  serialized_end=380,
+  serialized_options=None,
+  serialized_start=357,
+  serialized_end=429,
 )
 _sym_db.RegisterEnumDescriptor(_CLAIM_CLAIMTYPE)
 
 
 _CLAIM = _descriptor.Descriptor(
   name='Claim',
-  full_name='pb.Claim',
+  full_name='legacy_pb.Claim',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Claim.version', index=0,
+      name='version', full_name='legacy_pb.Claim.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='claimType', full_name='pb.Claim.claimType', index=1,
+      name='claimType', full_name='legacy_pb.Claim.claimType', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='stream', full_name='pb.Claim.stream', index=2,
+      name='stream', full_name='legacy_pb.Claim.stream', index=2,
       number=3, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='certificate', full_name='pb.Claim.certificate', index=3,
+      name='certificate', full_name='legacy_pb.Claim.certificate', index=3,
       number=4, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='publisherSignature', full_name='pb.Claim.publisherSignature', index=4,
+      name='publisherSignature', full_name='legacy_pb.Claim.publisherSignature', index=4,
       number=5, type=11, cpp_type=10, label=1,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -127,14 +128,14 @@ _CLAIM = _descriptor.Descriptor(
     _CLAIM_VERSION,
     _CLAIM_CLAIMTYPE,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=70,
-  serialized_end=380,
+  serialized_start=84,
+  serialized_end=429,
 )
 
 _CLAIM.fields_by_name['version'].enum_type = _CLAIM_VERSION
@@ -149,8 +150,8 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 
 Claim = _reflection.GeneratedProtocolMessageType('Claim', (_message.Message,), dict(
   DESCRIPTOR = _CLAIM,
-  __module__ = 'claim_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Claim)
+  __module__ = 'legacy_claim_pb2'
+  # @@protoc_insertion_point(class_scope:legacy_pb.Claim)
   ))
 _sym_db.RegisterMessage(Claim)
 

v1/python/signature_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: signature.proto
 
@@ -7,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -18,9 +18,10 @@ import certificate_pb2 as certificate__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='signature.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x0fsignature.proto\x12\x02pb\x1a\x11\x63\x65rtificate.proto\"\xad\x01\n\tSignature\x12&\n\x07version\x18\x01 \x02(\x0e\x32\x15.pb.Signature.Version\x12\"\n\rsignatureType\x18\x02 \x02(\x0e\x32\x0b.pb.KeyType\x12\x11\n\tsignature\x18\x03 \x02(\x0c\x12\x15\n\rcertificateId\x18\x04 \x02(\x0c\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01')
+  serialized_options=None,
+  serialized_pb=_b('\n\x0fsignature.proto\x12\tlegacy_pb\x1a\x11\x63\x65rtificate.proto\"\xbb\x01\n\tSignature\x12-\n\x07version\x18\x01 \x02(\x0e\x32\x1c.legacy_pb.Signature.Version\x12)\n\rsignatureType\x18\x02 \x02(\x0e\x32\x12.legacy_pb.KeyType\x12\x11\n\tsignature\x18\x03 \x02(\x0c\x12\x15\n\rcertificateId\x18\x04 \x02(\x0c\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01')
   ,
   dependencies=[certificate__pb2.DESCRIPTOR,])
 
@@ -28,62 +29,62 @@ DESCRIPTOR = _descriptor.FileDescriptor(
 
 _SIGNATURE_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Signature.Version',
+  full_name='legacy_pb.Signature.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=174,
-  serialized_end=216,
+  serialized_options=None,
+  serialized_start=195,
+  serialized_end=237,
 )
 _sym_db.RegisterEnumDescriptor(_SIGNATURE_VERSION)
 
 
 _SIGNATURE = _descriptor.Descriptor(
   name='Signature',
-  full_name='pb.Signature',
+  full_name='legacy_pb.Signature',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Signature.version', index=0,
+      name='version', full_name='legacy_pb.Signature.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='signatureType', full_name='pb.Signature.signatureType', index=1,
+      name='signatureType', full_name='legacy_pb.Signature.signatureType', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='signature', full_name='pb.Signature.signature', index=2,
+      name='signature', full_name='legacy_pb.Signature.signature', index=2,
       number=3, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='certificateId', full_name='pb.Signature.certificateId', index=3,
+      name='certificateId', full_name='legacy_pb.Signature.certificateId', index=3,
       number=4, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -91,14 +92,14 @@ _SIGNATURE = _descriptor.Descriptor(
   enum_types=[
     _SIGNATURE_VERSION,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=43,
-  serialized_end=216,
+  serialized_start=50,
+  serialized_end=237,
 )
 
 _SIGNATURE.fields_by_name['version'].enum_type = _SIGNATURE_VERSION
@@ -110,7 +111,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Signature = _reflection.GeneratedProtocolMessageType('Signature', (_message.Message,), dict(
   DESCRIPTOR = _SIGNATURE,
   __module__ = 'signature_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Signature)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Signature)
   ))
 _sym_db.RegisterMessage(Signature)
 

v1/python/source_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: source.proto
 
@@ -7,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -17,93 +17,94 @@ _sym_db = _symbol_database.Default()
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='source.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x0csource.proto\x12\x02pb\"\xe4\x01\n\x06Source\x12#\n\x07version\x18\x01 \x02(\x0e\x32\x12.pb.Source.Version\x12*\n\nsourceType\x18\x02 \x02(\x0e\x32\x16.pb.Source.SourceTypes\x12\x0e\n\x06source\x18\x03 \x02(\x0c\x12\x13\n\x0b\x63ontentType\x18\x04 \x02(\t\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\"8\n\x0bSourceTypes\x12\x17\n\x13UNKNOWN_SOURCE_TYPE\x10\x00\x12\x10\n\x0clbry_sd_hash\x10\x01')
+  serialized_options=None,
+  serialized_pb=_b('\n\x0csource.proto\x12\tlegacy_pb\"\xf2\x01\n\x06Source\x12*\n\x07version\x18\x01 \x02(\x0e\x32\x19.legacy_pb.Source.Version\x12\x31\n\nsourceType\x18\x02 \x02(\x0e\x32\x1d.legacy_pb.Source.SourceTypes\x12\x0e\n\x06source\x18\x03 \x02(\x0c\x12\x13\n\x0b\x63ontentType\x18\x04 \x02(\t\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01\"8\n\x0bSourceTypes\x12\x17\n\x13UNKNOWN_SOURCE_TYPE\x10\x00\x12\x10\n\x0clbry_sd_hash\x10\x01')
 )
 
 
 
 _SOURCE_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Source.Version',
+  full_name='legacy_pb.Source.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=149,
-  serialized_end=191,
+  serialized_options=None,
+  serialized_start=170,
+  serialized_end=212,
 )
 _sym_db.RegisterEnumDescriptor(_SOURCE_VERSION)
 
 _SOURCE_SOURCETYPES = _descriptor.EnumDescriptor(
   name='SourceTypes',
-  full_name='pb.Source.SourceTypes',
+  full_name='legacy_pb.Source.SourceTypes',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_SOURCE_TYPE', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='lbry_sd_hash', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=193,
-  serialized_end=249,
+  serialized_options=None,
+  serialized_start=214,
+  serialized_end=270,
 )
 _sym_db.RegisterEnumDescriptor(_SOURCE_SOURCETYPES)
 
 
 _SOURCE = _descriptor.Descriptor(
   name='Source',
-  full_name='pb.Source',
+  full_name='legacy_pb.Source',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Source.version', index=0,
+      name='version', full_name='legacy_pb.Source.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='sourceType', full_name='pb.Source.sourceType', index=1,
+      name='sourceType', full_name='legacy_pb.Source.sourceType', index=1,
       number=2, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='source', full_name='pb.Source.source', index=2,
+      name='source', full_name='legacy_pb.Source.source', index=2,
       number=3, type=12, cpp_type=9, label=2,
       has_default_value=False, default_value=_b(""),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='contentType', full_name='pb.Source.contentType', index=3,
+      name='contentType', full_name='legacy_pb.Source.contentType', index=3,
       number=4, type=9, cpp_type=9, label=2,
       has_default_value=False, default_value=_b("").decode('utf-8'),
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -112,14 +113,14 @@ _SOURCE = _descriptor.Descriptor(
     _SOURCE_VERSION,
     _SOURCE_SOURCETYPES,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=21,
-  serialized_end=249,
+  serialized_start=28,
+  serialized_end=270,
 )
 
 _SOURCE.fields_by_name['version'].enum_type = _SOURCE_VERSION
@@ -132,7 +133,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Source = _reflection.GeneratedProtocolMessageType('Source', (_message.Message,), dict(
   DESCRIPTOR = _SOURCE,
   __module__ = 'source_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Source)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Source)
   ))
 _sym_db.RegisterMessage(Source)
 

v1/python/stream_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: stream.proto
 
@@ -7,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
 from google.protobuf import message as _message
 from google.protobuf import reflection as _reflection
 from google.protobuf import symbol_database as _symbol_database
-from google.protobuf import descriptor_pb2
 # @@protoc_insertion_point(imports)
 
 _sym_db = _symbol_database.Default()
@@ -19,9 +19,10 @@ import source_pb2 as source__pb2
 
 DESCRIPTOR = _descriptor.FileDescriptor(
   name='stream.proto',
-  package='pb',
+  package='legacy_pb',
   syntax='proto2',
-  serialized_pb=_b('\n\x0cstream.proto\x12\x02pb\x1a\x0emetadata.proto\x1a\x0csource.proto\"\x95\x01\n\x06Stream\x12#\n\x07version\x18\x01 \x02(\x0e\x32\x12.pb.Stream.Version\x12\x1e\n\x08metadata\x18\x02 \x02(\x0b\x32\x0c.pb.Metadata\x12\x1a\n\x06source\x18\x03 \x02(\x0b\x32\n.pb.Source\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01')
+  serialized_options=None,
+  serialized_pb=_b('\n\x0cstream.proto\x12\tlegacy_pb\x1a\x0emetadata.proto\x1a\x0csource.proto\"\xaa\x01\n\x06Stream\x12*\n\x07version\x18\x01 \x02(\x0e\x32\x19.legacy_pb.Stream.Version\x12%\n\x08metadata\x18\x02 \x02(\x0b\x32\x13.legacy_pb.Metadata\x12!\n\x06source\x18\x03 \x02(\x0b\x32\x11.legacy_pb.Source\"*\n\x07Version\x12\x13\n\x0fUNKNOWN_VERSION\x10\x00\x12\n\n\x06_0_0_1\x10\x01')
   ,
   dependencies=[metadata__pb2.DESCRIPTOR,source__pb2.DESCRIPTOR,])
 
@@ -29,55 +30,55 @@ DESCRIPTOR = _descriptor.FileDescriptor(
 
 _STREAM_VERSION = _descriptor.EnumDescriptor(
   name='Version',
-  full_name='pb.Stream.Version',
+  full_name='legacy_pb.Stream.Version',
   filename=None,
   file=DESCRIPTOR,
   values=[
     _descriptor.EnumValueDescriptor(
       name='UNKNOWN_VERSION', index=0, number=0,
-      options=None,
+      serialized_options=None,
       type=None),
     _descriptor.EnumValueDescriptor(
       name='_0_0_1', index=1, number=1,
-      options=None,
+      serialized_options=None,
       type=None),
   ],
   containing_type=None,
-  options=None,
-  serialized_start=158,
-  serialized_end=200,
+  serialized_options=None,
+  serialized_start=186,
+  serialized_end=228,
 )
 _sym_db.RegisterEnumDescriptor(_STREAM_VERSION)
 
 
 _STREAM = _descriptor.Descriptor(
   name='Stream',
-  full_name='pb.Stream',
+  full_name='legacy_pb.Stream',
   filename=None,
   file=DESCRIPTOR,
   containing_type=None,
   fields=[
     _descriptor.FieldDescriptor(
-      name='version', full_name='pb.Stream.version', index=0,
+      name='version', full_name='legacy_pb.Stream.version', index=0,
       number=1, type=14, cpp_type=8, label=2,
       has_default_value=False, default_value=0,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='metadata', full_name='pb.Stream.metadata', index=1,
+      name='metadata', full_name='legacy_pb.Stream.metadata', index=1,
       number=2, type=11, cpp_type=10, label=2,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
     _descriptor.FieldDescriptor(
-      name='source', full_name='pb.Stream.source', index=2,
+      name='source', full_name='legacy_pb.Stream.source', index=2,
       number=3, type=11, cpp_type=10, label=2,
       has_default_value=False, default_value=None,
       message_type=None, enum_type=None, containing_type=None,
       is_extension=False, extension_scope=None,
-      options=None, file=DESCRIPTOR),
+      serialized_options=None, file=DESCRIPTOR),
   ],
   extensions=[
   ],
@@ -85,14 +86,14 @@ _STREAM = _descriptor.Descriptor(
   enum_types=[
     _STREAM_VERSION,
   ],
-  options=None,
+  serialized_options=None,
   is_extendable=False,
   syntax='proto2',
   extension_ranges=[],
   oneofs=[
   ],
-  serialized_start=51,
-  serialized_end=200,
+  serialized_start=58,
+  serialized_end=228,
 )
 
 _STREAM.fields_by_name['version'].enum_type = _STREAM_VERSION
@@ -105,7 +106,7 @@ _sym_db.RegisterFileDescriptor(DESCRIPTOR)
 Stream = _reflection.GeneratedProtocolMessageType('Stream', (_message.Message,), dict(
   DESCRIPTOR = _STREAM,
   __module__ = 'stream_pb2'
-  # @@protoc_insertion_point(class_scope:pb.Stream)
+  # @@protoc_insertion_point(class_scope:legacy_pb.Stream)
   ))
 _sym_db.RegisterMessage(Stream)
 

v2/README.md

@@ -0,0 +1,32 @@
+# Using LBRY types in your code
+
+## Go
+
+```go
+package main
+
+import pb "github.com/lbryio/types/go"
+import "fmt"
+
+func main() {
+    title := "Coherence"
+    metadata := pb.Metadata{Title:&title}
+    fmt.Printf("Let's watch %s on LBRY!\n", metadata.GetTitle())
+}
+
+```
+
+## Python
+
+todo
+
+## Javascript
+
+todo
+
+# Compiling types
+
+You only need to do this if you're modifying the types themselves.
+
+- Download [the protoc binary](https://github.com/google/protobuf/releases) and put it in your path. Make sure you get the one starting with `protoc`, not `protobuf`.
+- `./build.sh`

v2/build.sh

@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -euo pipefail
+#set -x
+
+version_gte() {
+  [ "$1" = "$(echo -e "$1\n$2" | sort -V | tail -n1)" ]
+}
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+
+hash protoc 2>/dev/null || { echo >&2 -e 'error: protoc binary not found\nDownload it from https://github.com/google/protobuf/releases and put it in your path.\nMake sure you get the one starting with `protoc`, not `protobuf`.'; exit 1; }
+
+
+PROTOC="$(which protoc)"
+VERSION="$($PROTOC --version | cut -d' ' -f2)"
+MIN_VERSION="3.0"
+
+version_gte "$VERSION" "$MIN_VERSION" || { echo >&2 "error: protoc version must be >= $MIN_VERSION (your $PROTOC is $VERSION)"; exit 1; }
+
+
+hash protoc-gen-go 2>/dev/null || go get -u github.com/golang/protobuf/protoc-gen-go
+hash protoc-gen-go 2>/dev/null || { echo >&2 'error: Make sure $GOPATH/bin is in your $PATH'; exit 1; }
+
+
+mkdir -p $DIR/go $DIR/python $DIR/js $DIR/cpp
+find $DIR/go $DIR/python $DIR/js $DIR/cpp -type f -delete
+
+
+protoc --proto_path="$DIR/proto" --python_out="$DIR/python" --go_out="$DIR/go" --js_out="import_style=commonjs,binary:$DIR/js" --cpp_out="$DIR/cpp" $DIR/proto/*.proto
+
+ls "$DIR"/go/*.pb.go | xargs -n1 -IX bash -c "sed -e 's/,omitempty//' X > X.tmp && mv X{.tmp,}"

v2/cpp/purchase.pb.cc

@@ -0,0 +1,291 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: purchase.proto
+
+#include "purchase.pb.h"
+
+#include <algorithm>
+
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/extension_set.h>
+#include <google/protobuf/wire_format_lite.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/generated_message_reflection.h>
+#include <google/protobuf/reflection_ops.h>
+#include <google/protobuf/wire_format.h>
+// @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
+namespace pb {
+class PurchaseDefaultTypeInternal {
+ public:
+  ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed<Purchase> _instance;
+} _Purchase_default_instance_;
+}  // namespace pb
+static void InitDefaultsscc_info_Purchase_purchase_2eproto() {
+  GOOGLE_PROTOBUF_VERIFY_VERSION;
+
+  {
+    void* ptr = &::pb::_Purchase_default_instance_;
+    new (ptr) ::pb::Purchase();
+    ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr);
+  }
+  ::pb::Purchase::InitAsDefaultInstance();
+}
+
+::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Purchase_purchase_2eproto =
+    {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_Purchase_purchase_2eproto}, {}};
+
+static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_purchase_2eproto[1];
+static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_purchase_2eproto = nullptr;
+static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_purchase_2eproto = nullptr;
+
+const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_purchase_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  ~0u,  // no _has_bits_
+  PROTOBUF_FIELD_OFFSET(::pb::Purchase, _internal_metadata_),
+  ~0u,  // no _extensions_
+  ~0u,  // no _oneof_case_
+  ~0u,  // no _weak_field_map_
+  PROTOBUF_FIELD_OFFSET(::pb::Purchase, claim_hash_),
+};
+static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  { 0, -1, sizeof(::pb::Purchase)},
+};
+
+static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = {
+  reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::Message*>(&::pb::_Purchase_default_instance_),
+};
+
+const char descriptor_table_protodef_purchase_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
+  "\n\016purchase.proto\022\002pb\"\036\n\010Purchase\022\022\n\nclai"
+  "m_hash\030\001 \001(\014b\006proto3"
+  ;
+static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_purchase_2eproto_deps[1] = {
+};
+static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_purchase_2eproto_sccs[1] = {
+  &scc_info_Purchase_purchase_2eproto.base,
+};
+static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_purchase_2eproto_once;
+const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_purchase_2eproto = {
+  false, false, descriptor_table_protodef_purchase_2eproto, "purchase.proto", 60,
+  &descriptor_table_purchase_2eproto_once, descriptor_table_purchase_2eproto_sccs, descriptor_table_purchase_2eproto_deps, 1, 0,
+  schemas, file_default_instances, TableStruct_purchase_2eproto::offsets,
+  file_level_metadata_purchase_2eproto, 1, file_level_enum_descriptors_purchase_2eproto, file_level_service_descriptors_purchase_2eproto,
+};
+
+// Force running AddDescriptors() at dynamic initialization time.
+static bool dynamic_init_dummy_purchase_2eproto = (static_cast<void>(::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_purchase_2eproto)), true);
+namespace pb {
+
+// ===================================================================
+
+void Purchase::InitAsDefaultInstance() {
+}
+class Purchase::_Internal {
+ public:
+};
+
+Purchase::Purchase(::PROTOBUF_NAMESPACE_ID::Arena* arena)
+  : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
+  SharedCtor();
+  RegisterArenaDtor(arena);
+  // @@protoc_insertion_point(arena_constructor:pb.Purchase)
+}
+Purchase::Purchase(const Purchase& from)
+  : ::PROTOBUF_NAMESPACE_ID::Message() {
+  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  claim_hash_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  if (!from._internal_claim_hash().empty()) {
+    claim_hash_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_claim_hash(),
+      GetArena());
+  }
+  // @@protoc_insertion_point(copy_constructor:pb.Purchase)
+}
+
+void Purchase::SharedCtor() {
+  ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_Purchase_purchase_2eproto.base);
+  claim_hash_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+}
+
+Purchase::~Purchase() {
+  // @@protoc_insertion_point(destructor:pb.Purchase)
+  SharedDtor();
+  _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
+}
+
+void Purchase::SharedDtor() {
+  GOOGLE_DCHECK(GetArena() == nullptr);
+  claim_hash_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+}
+
+void Purchase::ArenaDtor(void* object) {
+  Purchase* _this = reinterpret_cast< Purchase* >(object);
+  (void)_this;
+}
+void Purchase::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) {
+}
+void Purchase::SetCachedSize(int size) const {
+  _cached_size_.Set(size);
+}
+const Purchase& Purchase::default_instance() {
+  ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_Purchase_purchase_2eproto.base);
+  return *internal_default_instance();
+}
+
+
+void Purchase::Clear() {
+// @@protoc_insertion_point(message_clear_start:pb.Purchase)
+  ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
+  claim_hash_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
+}
+
+const char* Purchase::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
+#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
+  ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
+  while (!ctx->Done(&ptr)) {
+    ::PROTOBUF_NAMESPACE_ID::uint32 tag;
+    ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
+    CHK_(ptr);
+    switch (tag >> 3) {
+      // bytes claim_hash = 1;
+      case 1:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) {
+          auto str = _internal_mutable_claim_hash();
+          ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx);
+          CHK_(ptr);
+        } else goto handle_unusual;
+        continue;
+      default: {
+      handle_unusual:
+        if ((tag & 7) == 4 || tag == 0) {
+          ctx->SetLastTag(tag);
+          goto success;
+        }
+        ptr = UnknownFieldParse(tag,
+            _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
+            ptr, ctx);
+        CHK_(ptr != nullptr);
+        continue;
+      }
+    }  // switch
+  }  // while
+success:
+  return ptr;
+failure:
+  ptr = nullptr;
+  goto success;
+#undef CHK_
+}
+
+::PROTOBUF_NAMESPACE_ID::uint8* Purchase::_InternalSerialize(
+    ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
+  // @@protoc_insertion_point(serialize_to_array_start:pb.Purchase)
+  ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
+  (void) cached_has_bits;
+
+  // bytes claim_hash = 1;
+  if (this->claim_hash().size() > 0) {
+    target = stream->WriteBytesMaybeAliased(
+        1, this->_internal_claim_hash(), target);
+  }
+
+  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
+    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray(
+        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
+  }
+  // @@protoc_insertion_point(serialize_to_array_end:pb.Purchase)
+  return target;
+}
+
+size_t Purchase::ByteSizeLong() const {
+// @@protoc_insertion_point(message_byte_size_start:pb.Purchase)
+  size_t total_size = 0;
+
+  ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
+  // bytes claim_hash = 1;
+  if (this->claim_hash().size() > 0) {
+    total_size += 1 +
+      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::BytesSize(
+        this->_internal_claim_hash());
+  }
+
+  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
+    return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize(
+        _internal_metadata_, total_size, &_cached_size_);
+  }
+  int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size);
+  SetCachedSize(cached_size);
+  return total_size;
+}
+
+void Purchase::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) {
+// @@protoc_insertion_point(generalized_merge_from_start:pb.Purchase)
+  GOOGLE_DCHECK_NE(&from, this);
+  const Purchase* source =
+      ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated<Purchase>(
+          &from);
+  if (source == nullptr) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Purchase)
+    ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this);
+  } else {
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Purchase)
+    MergeFrom(*source);
+  }
+}
+
+void Purchase::MergeFrom(const Purchase& from) {
+// @@protoc_insertion_point(class_specific_merge_from_start:pb.Purchase)
+  GOOGLE_DCHECK_NE(&from, this);
+  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
+  (void) cached_has_bits;
+
+  if (from.claim_hash().size() > 0) {
+    _internal_set_claim_hash(from._internal_claim_hash());
+  }
+}
+
+void Purchase::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) {
+// @@protoc_insertion_point(generalized_copy_from_start:pb.Purchase)
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void Purchase::CopyFrom(const Purchase& from) {
+// @@protoc_insertion_point(class_specific_copy_from_start:pb.Purchase)
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool Purchase::IsInitialized() const {
+  return true;
+}
+
+void Purchase::InternalSwap(Purchase* other) {
+  using std::swap;
+  _internal_metadata_.Swap<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(&other->_internal_metadata_);
+  claim_hash_.Swap(&other->claim_hash_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+}
+
+::PROTOBUF_NAMESPACE_ID::Metadata Purchase::GetMetadata() const {
+  return GetMetadataStatic();
+}
+
+
+// @@protoc_insertion_point(namespace_scope)
+}  // namespace pb
+PROTOBUF_NAMESPACE_OPEN
+template<> PROTOBUF_NOINLINE ::pb::Purchase* Arena::CreateMaybeMessage< ::pb::Purchase >(Arena* arena) {
+  return Arena::CreateMessageInternal< ::pb::Purchase >(arena);
+}
+PROTOBUF_NAMESPACE_CLOSE
+
+// @@protoc_insertion_point(global_scope)
+#include <google/protobuf/port_undef.inc>

v2/cpp/purchase.pb.h

@@ -0,0 +1,323 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: purchase.proto
+
+#ifndef GOOGLE_PROTOBUF_INCLUDED_purchase_2eproto
+#define GOOGLE_PROTOBUF_INCLUDED_purchase_2eproto
+
+#include <limits>
+#include <string>
+
+#include <google/protobuf/port_def.inc>
+#if PROTOBUF_VERSION < 3012000
+#error This file was generated by a newer version of protoc which is
+#error incompatible with your Protocol Buffer headers. Please update
+#error your headers.
+#endif
+#if 3012004 < PROTOBUF_MIN_PROTOC_VERSION
+#error This file was generated by an older version of protoc which is
+#error incompatible with your Protocol Buffer headers. Please
+#error regenerate this file with a newer version of protoc.
+#endif
+
+#include <google/protobuf/port_undef.inc>
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/arena.h>
+#include <google/protobuf/arenastring.h>
+#include <google/protobuf/generated_message_table_driven.h>
+#include <google/protobuf/generated_message_util.h>
+#include <google/protobuf/inlined_string_field.h>
+#include <google/protobuf/metadata_lite.h>
+#include <google/protobuf/generated_message_reflection.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
+#include <google/protobuf/extension_set.h>  // IWYU pragma: export
+#include <google/protobuf/unknown_field_set.h>
+// @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_purchase_2eproto
+PROTOBUF_NAMESPACE_OPEN
+namespace internal {
+class AnyMetadata;
+}  // namespace internal
+PROTOBUF_NAMESPACE_CLOSE
+
+// Internal implementation detail -- do not use these members.
+struct TableStruct_purchase_2eproto {
+  static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[1]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[];
+  static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[];
+  static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[];
+};
+extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_purchase_2eproto;
+namespace pb {
+class Purchase;
+class PurchaseDefaultTypeInternal;
+extern PurchaseDefaultTypeInternal _Purchase_default_instance_;
+}  // namespace pb
+PROTOBUF_NAMESPACE_OPEN
+template<> ::pb::Purchase* Arena::CreateMaybeMessage<::pb::Purchase>(Arena*);
+PROTOBUF_NAMESPACE_CLOSE
+namespace pb {
+
+// ===================================================================
+
+class Purchase PROTOBUF_FINAL :
+    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:pb.Purchase) */ {
+ public:
+  inline Purchase() : Purchase(nullptr) {};
+  virtual ~Purchase();
+
+  Purchase(const Purchase& from);
+  Purchase(Purchase&& from) noexcept
+    : Purchase() {
+    *this = ::std::move(from);
+  }
+
+  inline Purchase& operator=(const Purchase& from) {
+    CopyFrom(from);
+    return *this;
+  }
+  inline Purchase& operator=(Purchase&& from) noexcept {
+    if (GetArena() == from.GetArena()) {
+      if (this != &from) InternalSwap(&from);
+    } else {
+      CopyFrom(from);
+    }
+    return *this;
+  }
+
+  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
+    return GetDescriptor();
+  }
+  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
+    return GetMetadataStatic().descriptor;
+  }
+  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
+    return GetMetadataStatic().reflection;
+  }
+  static const Purchase& default_instance();
+
+  static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
+  static inline const Purchase* internal_default_instance() {
+    return reinterpret_cast<const Purchase*>(
+               &_Purchase_default_instance_);
+  }
+  static constexpr int kIndexInFileMessages =
+    0;
+
+  friend void swap(Purchase& a, Purchase& b) {
+    a.Swap(&b);
+  }
+  inline void Swap(Purchase* other) {
+    if (other == this) return;
+    if (GetArena() == other->GetArena()) {
+      InternalSwap(other);
+    } else {
+      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
+    }
+  }
+  void UnsafeArenaSwap(Purchase* other) {
+    if (other == this) return;
+    GOOGLE_DCHECK(GetArena() == other->GetArena());
+    InternalSwap(other);
+  }
+
+  // implements Message ----------------------------------------------
+
+  inline Purchase* New() const final {
+    return CreateMaybeMessage<Purchase>(nullptr);
+  }
+
+  Purchase* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+    return CreateMaybeMessage<Purchase>(arena);
+  }
+  void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final;
+  void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final;
+  void CopyFrom(const Purchase& from);
+  void MergeFrom(const Purchase& from);
+  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  bool IsInitialized() const final;
+
+  size_t ByteSizeLong() const final;
+  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
+  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
+      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _cached_size_.Get(); }
+
+  private:
+  inline void SharedCtor();
+  inline void SharedDtor();
+  void SetCachedSize(int size) const final;
+  void InternalSwap(Purchase* other);
+  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
+  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
+    return "pb.Purchase";
+  }
+  protected:
+  explicit Purchase(::PROTOBUF_NAMESPACE_ID::Arena* arena);
+  private:
+  static void ArenaDtor(void* object);
+  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
+  public:
+
+  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
+  private:
+  static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() {
+    ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_purchase_2eproto);
+    return ::descriptor_table_purchase_2eproto.file_level_metadata[kIndexInFileMessages];
+  }
+
+  public:
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  enum : int {
+    kClaimHashFieldNumber = 1,
+  };
+  // bytes claim_hash = 1;
+  void clear_claim_hash();
+  const std::string& claim_hash() const;
+  void set_claim_hash(const std::string& value);
+  void set_claim_hash(std::string&& value);
+  void set_claim_hash(const char* value);
+  void set_claim_hash(const void* value, size_t size);
+  std::string* mutable_claim_hash();
+  std::string* release_claim_hash();
+  void set_allocated_claim_hash(std::string* claim_hash);
+  GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
+  "    string fields are deprecated and will be removed in a"
+  "    future release.")
+  std::string* unsafe_arena_release_claim_hash();
+  GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
+  "    string fields are deprecated and will be removed in a"
+  "    future release.")
+  void unsafe_arena_set_allocated_claim_hash(
+      std::string* claim_hash);
+  private:
+  const std::string& _internal_claim_hash() const;
+  void _internal_set_claim_hash(const std::string& value);
+  std::string* _internal_mutable_claim_hash();
+  public:
+
+  // @@protoc_insertion_point(class_scope:pb.Purchase)
+ private:
+  class _Internal;
+
+  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
+  typedef void InternalArenaConstructable_;
+  typedef void DestructorSkippable_;
+  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr claim_hash_;
+  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+  friend struct ::TableStruct_purchase_2eproto;
+};
+// ===================================================================
+
+
+// ===================================================================
+
+#ifdef __GNUC__
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif  // __GNUC__
+// Purchase
+
+// bytes claim_hash = 1;
+inline void Purchase::clear_claim_hash() {
+  claim_hash_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+}
+inline const std::string& Purchase::claim_hash() const {
+  // @@protoc_insertion_point(field_get:pb.Purchase.claim_hash)
+  return _internal_claim_hash();
+}
+inline void Purchase::set_claim_hash(const std::string& value) {
+  _internal_set_claim_hash(value);
+  // @@protoc_insertion_point(field_set:pb.Purchase.claim_hash)
+}
+inline std::string* Purchase::mutable_claim_hash() {
+  // @@protoc_insertion_point(field_mutable:pb.Purchase.claim_hash)
+  return _internal_mutable_claim_hash();
+}
+inline const std::string& Purchase::_internal_claim_hash() const {
+  return claim_hash_.Get();
+}
+inline void Purchase::_internal_set_claim_hash(const std::string& value) {
+  
+  claim_hash_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+}
+inline void Purchase::set_claim_hash(std::string&& value) {
+  
+  claim_hash_.Set(
+    &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
+  // @@protoc_insertion_point(field_set_rvalue:pb.Purchase.claim_hash)
+}
+inline void Purchase::set_claim_hash(const char* value) {
+  GOOGLE_DCHECK(value != nullptr);
+  
+  claim_hash_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
+              GetArena());
+  // @@protoc_insertion_point(field_set_char:pb.Purchase.claim_hash)
+}
+inline void Purchase::set_claim_hash(const void* value,
+    size_t size) {
+  
+  claim_hash_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+      reinterpret_cast<const char*>(value), size), GetArena());
+  // @@protoc_insertion_point(field_set_pointer:pb.Purchase.claim_hash)
+}
+inline std::string* Purchase::_internal_mutable_claim_hash() {
+  
+  return claim_hash_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+}
+inline std::string* Purchase::release_claim_hash() {
+  // @@protoc_insertion_point(field_release:pb.Purchase.claim_hash)
+  return claim_hash_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+}
+inline void Purchase::set_allocated_claim_hash(std::string* claim_hash) {
+  if (claim_hash != nullptr) {
+    
+  } else {
+    
+  }
+  claim_hash_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), claim_hash,
+      GetArena());
+  // @@protoc_insertion_point(field_set_allocated:pb.Purchase.claim_hash)
+}
+inline std::string* Purchase::unsafe_arena_release_claim_hash() {
+  // @@protoc_insertion_point(field_unsafe_arena_release:pb.Purchase.claim_hash)
+  GOOGLE_DCHECK(GetArena() != nullptr);
+  
+  return claim_hash_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      GetArena());
+}
+inline void Purchase::unsafe_arena_set_allocated_claim_hash(
+    std::string* claim_hash) {
+  GOOGLE_DCHECK(GetArena() != nullptr);
+  if (claim_hash != nullptr) {
+    
+  } else {
+    
+  }
+  claim_hash_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      claim_hash, GetArena());
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:pb.Purchase.claim_hash)
+}
+
+#ifdef __GNUC__
+  #pragma GCC diagnostic pop
+#endif  // __GNUC__
+
+// @@protoc_insertion_point(namespace_scope)
+
+}  // namespace pb
+
+// @@protoc_insertion_point(global_scope)
+
+#include <google/protobuf/port_undef.inc>
+#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_purchase_2eproto

v2/cpp/support.pb.cc

@@ -0,0 +1,296 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: support.proto
+
+#include "support.pb.h"
+
+#include <algorithm>
+
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/extension_set.h>
+#include <google/protobuf/wire_format_lite.h>
+#include <google/protobuf/descriptor.h>
+#include <google/protobuf/generated_message_reflection.h>
+#include <google/protobuf/reflection_ops.h>
+#include <google/protobuf/wire_format.h>
+// @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
+namespace pb {
+class SupportDefaultTypeInternal {
+ public:
+  ::PROTOBUF_NAMESPACE_ID::internal::ExplicitlyConstructed<Support> _instance;
+} _Support_default_instance_;
+}  // namespace pb
+static void InitDefaultsscc_info_Support_support_2eproto() {
+  GOOGLE_PROTOBUF_VERIFY_VERSION;
+
+  {
+    void* ptr = &::pb::_Support_default_instance_;
+    new (ptr) ::pb::Support();
+    ::PROTOBUF_NAMESPACE_ID::internal::OnShutdownDestroyMessage(ptr);
+  }
+  ::pb::Support::InitAsDefaultInstance();
+}
+
+::PROTOBUF_NAMESPACE_ID::internal::SCCInfo<0> scc_info_Support_support_2eproto =
+    {{ATOMIC_VAR_INIT(::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase::kUninitialized), 0, 0, InitDefaultsscc_info_Support_support_2eproto}, {}};
+
+static ::PROTOBUF_NAMESPACE_ID::Metadata file_level_metadata_support_2eproto[1];
+static constexpr ::PROTOBUF_NAMESPACE_ID::EnumDescriptor const** file_level_enum_descriptors_support_2eproto = nullptr;
+static constexpr ::PROTOBUF_NAMESPACE_ID::ServiceDescriptor const** file_level_service_descriptors_support_2eproto = nullptr;
+
+const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_support_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  ~0u,  // no _has_bits_
+  PROTOBUF_FIELD_OFFSET(::pb::Support, _internal_metadata_),
+  ~0u,  // no _extensions_
+  ~0u,  // no _oneof_case_
+  ~0u,  // no _weak_field_map_
+  PROTOBUF_FIELD_OFFSET(::pb::Support, emoji_),
+};
+static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  { 0, -1, sizeof(::pb::Support)},
+};
+
+static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = {
+  reinterpret_cast<const ::PROTOBUF_NAMESPACE_ID::Message*>(&::pb::_Support_default_instance_),
+};
+
+const char descriptor_table_protodef_support_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
+  "\n\rsupport.proto\022\002pb\"\030\n\007Support\022\r\n\005emoji\030"
+  "\001 \001(\tb\006proto3"
+  ;
+static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_support_2eproto_deps[1] = {
+};
+static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_support_2eproto_sccs[1] = {
+  &scc_info_Support_support_2eproto.base,
+};
+static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_support_2eproto_once;
+const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_support_2eproto = {
+  false, false, descriptor_table_protodef_support_2eproto, "support.proto", 53,
+  &descriptor_table_support_2eproto_once, descriptor_table_support_2eproto_sccs, descriptor_table_support_2eproto_deps, 1, 0,
+  schemas, file_default_instances, TableStruct_support_2eproto::offsets,
+  file_level_metadata_support_2eproto, 1, file_level_enum_descriptors_support_2eproto, file_level_service_descriptors_support_2eproto,
+};
+
+// Force running AddDescriptors() at dynamic initialization time.
+static bool dynamic_init_dummy_support_2eproto = (static_cast<void>(::PROTOBUF_NAMESPACE_ID::internal::AddDescriptors(&descriptor_table_support_2eproto)), true);
+namespace pb {
+
+// ===================================================================
+
+void Support::InitAsDefaultInstance() {
+}
+class Support::_Internal {
+ public:
+};
+
+Support::Support(::PROTOBUF_NAMESPACE_ID::Arena* arena)
+  : ::PROTOBUF_NAMESPACE_ID::Message(arena) {
+  SharedCtor();
+  RegisterArenaDtor(arena);
+  // @@protoc_insertion_point(arena_constructor:pb.Support)
+}
+Support::Support(const Support& from)
+  : ::PROTOBUF_NAMESPACE_ID::Message() {
+  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  emoji_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+  if (!from._internal_emoji().empty()) {
+    emoji_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_emoji(),
+      GetArena());
+  }
+  // @@protoc_insertion_point(copy_constructor:pb.Support)
+}
+
+void Support::SharedCtor() {
+  ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_Support_support_2eproto.base);
+  emoji_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+}
+
+Support::~Support() {
+  // @@protoc_insertion_point(destructor:pb.Support)
+  SharedDtor();
+  _internal_metadata_.Delete<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
+}
+
+void Support::SharedDtor() {
+  GOOGLE_DCHECK(GetArena() == nullptr);
+  emoji_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
+}
+
+void Support::ArenaDtor(void* object) {
+  Support* _this = reinterpret_cast< Support* >(object);
+  (void)_this;
+}
+void Support::RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena*) {
+}
+void Support::SetCachedSize(int size) const {
+  _cached_size_.Set(size);
+}
+const Support& Support::default_instance() {
+  ::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&::scc_info_Support_support_2eproto.base);
+  return *internal_default_instance();
+}
+
+
+void Support::Clear() {
+// @@protoc_insertion_point(message_clear_start:pb.Support)
+  ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
+  emoji_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+  _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
+}
+
+const char* Support::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) {
+#define CHK_(x) if (PROTOBUF_PREDICT_FALSE(!(x))) goto failure
+  ::PROTOBUF_NAMESPACE_ID::Arena* arena = GetArena(); (void)arena;
+  while (!ctx->Done(&ptr)) {
+    ::PROTOBUF_NAMESPACE_ID::uint32 tag;
+    ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
+    CHK_(ptr);
+    switch (tag >> 3) {
+      // string emoji = 1;
+      case 1:
+        if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) {
+          auto str = _internal_mutable_emoji();
+          ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx);
+          CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "pb.Support.emoji"));
+          CHK_(ptr);
+        } else goto handle_unusual;
+        continue;
+      default: {
+      handle_unusual:
+        if ((tag & 7) == 4 || tag == 0) {
+          ctx->SetLastTag(tag);
+          goto success;
+        }
+        ptr = UnknownFieldParse(tag,
+            _internal_metadata_.mutable_unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(),
+            ptr, ctx);
+        CHK_(ptr != nullptr);
+        continue;
+      }
+    }  // switch
+  }  // while
+success:
+  return ptr;
+failure:
+  ptr = nullptr;
+  goto success;
+#undef CHK_
+}
+
+::PROTOBUF_NAMESPACE_ID::uint8* Support::_InternalSerialize(
+    ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const {
+  // @@protoc_insertion_point(serialize_to_array_start:pb.Support)
+  ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
+  (void) cached_has_bits;
+
+  // string emoji = 1;
+  if (this->emoji().size() > 0) {
+    ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
+      this->_internal_emoji().data(), static_cast<int>(this->_internal_emoji().length()),
+      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
+      "pb.Support.emoji");
+    target = stream->WriteStringMaybeAliased(
+        1, this->_internal_emoji(), target);
+  }
+
+  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
+    target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormat::InternalSerializeUnknownFieldsToArray(
+        _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
+  }
+  // @@protoc_insertion_point(serialize_to_array_end:pb.Support)
+  return target;
+}
+
+size_t Support::ByteSizeLong() const {
+// @@protoc_insertion_point(message_byte_size_start:pb.Support)
+  size_t total_size = 0;
+
+  ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
+  // Prevent compiler warnings about cached_has_bits being unused
+  (void) cached_has_bits;
+
+  // string emoji = 1;
+  if (this->emoji().size() > 0) {
+    total_size += 1 +
+      ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
+        this->_internal_emoji());
+  }
+
+  if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
+    return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize(
+        _internal_metadata_, total_size, &_cached_size_);
+  }
+  int cached_size = ::PROTOBUF_NAMESPACE_ID::internal::ToCachedSize(total_size);
+  SetCachedSize(cached_size);
+  return total_size;
+}
+
+void Support::MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) {
+// @@protoc_insertion_point(generalized_merge_from_start:pb.Support)
+  GOOGLE_DCHECK_NE(&from, this);
+  const Support* source =
+      ::PROTOBUF_NAMESPACE_ID::DynamicCastToGenerated<Support>(
+          &from);
+  if (source == nullptr) {
+  // @@protoc_insertion_point(generalized_merge_from_cast_fail:pb.Support)
+    ::PROTOBUF_NAMESPACE_ID::internal::ReflectionOps::Merge(from, this);
+  } else {
+  // @@protoc_insertion_point(generalized_merge_from_cast_success:pb.Support)
+    MergeFrom(*source);
+  }
+}
+
+void Support::MergeFrom(const Support& from) {
+// @@protoc_insertion_point(class_specific_merge_from_start:pb.Support)
+  GOOGLE_DCHECK_NE(&from, this);
+  _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
+  ::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
+  (void) cached_has_bits;
+
+  if (from.emoji().size() > 0) {
+    _internal_set_emoji(from._internal_emoji());
+  }
+}
+
+void Support::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) {
+// @@protoc_insertion_point(generalized_copy_from_start:pb.Support)
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+void Support::CopyFrom(const Support& from) {
+// @@protoc_insertion_point(class_specific_copy_from_start:pb.Support)
+  if (&from == this) return;
+  Clear();
+  MergeFrom(from);
+}
+
+bool Support::IsInitialized() const {
+  return true;
+}
+
+void Support::InternalSwap(Support* other) {
+  using std::swap;
+  _internal_metadata_.Swap<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(&other->_internal_metadata_);
+  emoji_.Swap(&other->emoji_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+}
+
+::PROTOBUF_NAMESPACE_ID::Metadata Support::GetMetadata() const {
+  return GetMetadataStatic();
+}
+
+
+// @@protoc_insertion_point(namespace_scope)
+}  // namespace pb
+PROTOBUF_NAMESPACE_OPEN
+template<> PROTOBUF_NOINLINE ::pb::Support* Arena::CreateMaybeMessage< ::pb::Support >(Arena* arena) {
+  return Arena::CreateMessageInternal< ::pb::Support >(arena);
+}
+PROTOBUF_NAMESPACE_CLOSE
+
+// @@protoc_insertion_point(global_scope)
+#include <google/protobuf/port_undef.inc>

v2/cpp/support.pb.h

@@ -0,0 +1,323 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: support.proto
+
+#ifndef GOOGLE_PROTOBUF_INCLUDED_support_2eproto
+#define GOOGLE_PROTOBUF_INCLUDED_support_2eproto
+
+#include <limits>
+#include <string>
+
+#include <google/protobuf/port_def.inc>
+#if PROTOBUF_VERSION < 3012000
+#error This file was generated by a newer version of protoc which is
+#error incompatible with your Protocol Buffer headers. Please update
+#error your headers.
+#endif
+#if 3012004 < PROTOBUF_MIN_PROTOC_VERSION
+#error This file was generated by an older version of protoc which is
+#error incompatible with your Protocol Buffer headers. Please
+#error regenerate this file with a newer version of protoc.
+#endif
+
+#include <google/protobuf/port_undef.inc>
+#include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/arena.h>
+#include <google/protobuf/arenastring.h>
+#include <google/protobuf/generated_message_table_driven.h>
+#include <google/protobuf/generated_message_util.h>
+#include <google/protobuf/inlined_string_field.h>
+#include <google/protobuf/metadata_lite.h>
+#include <google/protobuf/generated_message_reflection.h>
+#include <google/protobuf/message.h>
+#include <google/protobuf/repeated_field.h>  // IWYU pragma: export
+#include <google/protobuf/extension_set.h>  // IWYU pragma: export
+#include <google/protobuf/unknown_field_set.h>
+// @@protoc_insertion_point(includes)
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_support_2eproto
+PROTOBUF_NAMESPACE_OPEN
+namespace internal {
+class AnyMetadata;
+}  // namespace internal
+PROTOBUF_NAMESPACE_CLOSE
+
+// Internal implementation detail -- do not use these members.
+struct TableStruct_support_2eproto {
+  static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTableField entries[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::PROTOBUF_NAMESPACE_ID::internal::AuxillaryParseTableField aux[]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::PROTOBUF_NAMESPACE_ID::internal::ParseTable schema[1]
+    PROTOBUF_SECTION_VARIABLE(protodesc_cold);
+  static const ::PROTOBUF_NAMESPACE_ID::internal::FieldMetadata field_metadata[];
+  static const ::PROTOBUF_NAMESPACE_ID::internal::SerializationTable serialization_table[];
+  static const ::PROTOBUF_NAMESPACE_ID::uint32 offsets[];
+};
+extern const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_support_2eproto;
+namespace pb {
+class Support;
+class SupportDefaultTypeInternal;
+extern SupportDefaultTypeInternal _Support_default_instance_;
+}  // namespace pb
+PROTOBUF_NAMESPACE_OPEN
+template<> ::pb::Support* Arena::CreateMaybeMessage<::pb::Support>(Arena*);
+PROTOBUF_NAMESPACE_CLOSE
+namespace pb {
+
+// ===================================================================
+
+class Support PROTOBUF_FINAL :
+    public ::PROTOBUF_NAMESPACE_ID::Message /* @@protoc_insertion_point(class_definition:pb.Support) */ {
+ public:
+  inline Support() : Support(nullptr) {};
+  virtual ~Support();
+
+  Support(const Support& from);
+  Support(Support&& from) noexcept
+    : Support() {
+    *this = ::std::move(from);
+  }
+
+  inline Support& operator=(const Support& from) {
+    CopyFrom(from);
+    return *this;
+  }
+  inline Support& operator=(Support&& from) noexcept {
+    if (GetArena() == from.GetArena()) {
+      if (this != &from) InternalSwap(&from);
+    } else {
+      CopyFrom(from);
+    }
+    return *this;
+  }
+
+  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* descriptor() {
+    return GetDescriptor();
+  }
+  static const ::PROTOBUF_NAMESPACE_ID::Descriptor* GetDescriptor() {
+    return GetMetadataStatic().descriptor;
+  }
+  static const ::PROTOBUF_NAMESPACE_ID::Reflection* GetReflection() {
+    return GetMetadataStatic().reflection;
+  }
+  static const Support& default_instance();
+
+  static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
+  static inline const Support* internal_default_instance() {
+    return reinterpret_cast<const Support*>(
+               &_Support_default_instance_);
+  }
+  static constexpr int kIndexInFileMessages =
+    0;
+
+  friend void swap(Support& a, Support& b) {
+    a.Swap(&b);
+  }
+  inline void Swap(Support* other) {
+    if (other == this) return;
+    if (GetArena() == other->GetArena()) {
+      InternalSwap(other);
+    } else {
+      ::PROTOBUF_NAMESPACE_ID::internal::GenericSwap(this, other);
+    }
+  }
+  void UnsafeArenaSwap(Support* other) {
+    if (other == this) return;
+    GOOGLE_DCHECK(GetArena() == other->GetArena());
+    InternalSwap(other);
+  }
+
+  // implements Message ----------------------------------------------
+
+  inline Support* New() const final {
+    return CreateMaybeMessage<Support>(nullptr);
+  }
+
+  Support* New(::PROTOBUF_NAMESPACE_ID::Arena* arena) const final {
+    return CreateMaybeMessage<Support>(arena);
+  }
+  void CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final;
+  void MergeFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) final;
+  void CopyFrom(const Support& from);
+  void MergeFrom(const Support& from);
+  PROTOBUF_ATTRIBUTE_REINITIALIZES void Clear() final;
+  bool IsInitialized() const final;
+
+  size_t ByteSizeLong() const final;
+  const char* _InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::internal::ParseContext* ctx) final;
+  ::PROTOBUF_NAMESPACE_ID::uint8* _InternalSerialize(
+      ::PROTOBUF_NAMESPACE_ID::uint8* target, ::PROTOBUF_NAMESPACE_ID::io::EpsCopyOutputStream* stream) const final;
+  int GetCachedSize() const final { return _cached_size_.Get(); }
+
+  private:
+  inline void SharedCtor();
+  inline void SharedDtor();
+  void SetCachedSize(int size) const final;
+  void InternalSwap(Support* other);
+  friend class ::PROTOBUF_NAMESPACE_ID::internal::AnyMetadata;
+  static ::PROTOBUF_NAMESPACE_ID::StringPiece FullMessageName() {
+    return "pb.Support";
+  }
+  protected:
+  explicit Support(::PROTOBUF_NAMESPACE_ID::Arena* arena);
+  private:
+  static void ArenaDtor(void* object);
+  inline void RegisterArenaDtor(::PROTOBUF_NAMESPACE_ID::Arena* arena);
+  public:
+
+  ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadata() const final;
+  private:
+  static ::PROTOBUF_NAMESPACE_ID::Metadata GetMetadataStatic() {
+    ::PROTOBUF_NAMESPACE_ID::internal::AssignDescriptors(&::descriptor_table_support_2eproto);
+    return ::descriptor_table_support_2eproto.file_level_metadata[kIndexInFileMessages];
+  }
+
+  public:
+
+  // nested types ----------------------------------------------------
+
+  // accessors -------------------------------------------------------
+
+  enum : int {
+    kEmojiFieldNumber = 1,
+  };
+  // string emoji = 1;
+  void clear_emoji();
+  const std::string& emoji() const;
+  void set_emoji(const std::string& value);
+  void set_emoji(std::string&& value);
+  void set_emoji(const char* value);
+  void set_emoji(const char* value, size_t size);
+  std::string* mutable_emoji();
+  std::string* release_emoji();
+  void set_allocated_emoji(std::string* emoji);
+  GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
+  "    string fields are deprecated and will be removed in a"
+  "    future release.")
+  std::string* unsafe_arena_release_emoji();
+  GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
+  "    string fields are deprecated and will be removed in a"
+  "    future release.")
+  void unsafe_arena_set_allocated_emoji(
+      std::string* emoji);
+  private:
+  const std::string& _internal_emoji() const;
+  void _internal_set_emoji(const std::string& value);
+  std::string* _internal_mutable_emoji();
+  public:
+
+  // @@protoc_insertion_point(class_scope:pb.Support)
+ private:
+  class _Internal;
+
+  template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
+  typedef void InternalArenaConstructable_;
+  typedef void DestructorSkippable_;
+  ::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr emoji_;
+  mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
+  friend struct ::TableStruct_support_2eproto;
+};
+// ===================================================================
+
+
+// ===================================================================
+
+#ifdef __GNUC__
+  #pragma GCC diagnostic push
+  #pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#endif  // __GNUC__
+// Support
+
+// string emoji = 1;
+inline void Support::clear_emoji() {
+  emoji_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+}
+inline const std::string& Support::emoji() const {
+  // @@protoc_insertion_point(field_get:pb.Support.emoji)
+  return _internal_emoji();
+}
+inline void Support::set_emoji(const std::string& value) {
+  _internal_set_emoji(value);
+  // @@protoc_insertion_point(field_set:pb.Support.emoji)
+}
+inline std::string* Support::mutable_emoji() {
+  // @@protoc_insertion_point(field_mutable:pb.Support.emoji)
+  return _internal_mutable_emoji();
+}
+inline const std::string& Support::_internal_emoji() const {
+  return emoji_.Get();
+}
+inline void Support::_internal_set_emoji(const std::string& value) {
+  
+  emoji_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
+}
+inline void Support::set_emoji(std::string&& value) {
+  
+  emoji_.Set(
+    &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
+  // @@protoc_insertion_point(field_set_rvalue:pb.Support.emoji)
+}
+inline void Support::set_emoji(const char* value) {
+  GOOGLE_DCHECK(value != nullptr);
+  
+  emoji_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
+              GetArena());
+  // @@protoc_insertion_point(field_set_char:pb.Support.emoji)
+}
+inline void Support::set_emoji(const char* value,
+    size_t size) {
+  
+  emoji_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
+      reinterpret_cast<const char*>(value), size), GetArena());
+  // @@protoc_insertion_point(field_set_pointer:pb.Support.emoji)
+}
+inline std::string* Support::_internal_mutable_emoji() {
+  
+  return emoji_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+}
+inline std::string* Support::release_emoji() {
+  // @@protoc_insertion_point(field_release:pb.Support.emoji)
+  return emoji_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
+}
+inline void Support::set_allocated_emoji(std::string* emoji) {
+  if (emoji != nullptr) {
+    
+  } else {
+    
+  }
+  emoji_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), emoji,
+      GetArena());
+  // @@protoc_insertion_point(field_set_allocated:pb.Support.emoji)
+}
+inline std::string* Support::unsafe_arena_release_emoji() {
+  // @@protoc_insertion_point(field_unsafe_arena_release:pb.Support.emoji)
+  GOOGLE_DCHECK(GetArena() != nullptr);
+  
+  return emoji_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      GetArena());
+}
+inline void Support::unsafe_arena_set_allocated_emoji(
+    std::string* emoji) {
+  GOOGLE_DCHECK(GetArena() != nullptr);
+  if (emoji != nullptr) {
+    
+  } else {
+    
+  }
+  emoji_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
+      emoji, GetArena());
+  // @@protoc_insertion_point(field_unsafe_arena_set_allocated:pb.Support.emoji)
+}
+
+#ifdef __GNUC__
+  #pragma GCC diagnostic pop
+#endif  // __GNUC__
+
+// @@protoc_insertion_point(namespace_scope)
+
+}  // namespace pb
+
+// @@protoc_insertion_point(global_scope)
+
+#include <google/protobuf/port_undef.inc>
+#endif  // GOOGLE_PROTOBUF_INCLUDED_GOOGLE_PROTOBUF_INCLUDED_support_2eproto

v2/go/purchase.pb.go

@@ -0,0 +1,76 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: purchase.proto
+
+package pb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type Purchase struct {
+	ClaimHash            []byte   `protobuf:"bytes,1,opt,name=claim_hash,json=claimHash,proto3" json:"claim_hash"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Purchase) Reset()         { *m = Purchase{} }
+func (m *Purchase) String() string { return proto.CompactTextString(m) }
+func (*Purchase) ProtoMessage()    {}
+func (*Purchase) Descriptor() ([]byte, []int) {
+	return fileDescriptor_ea8c7f112c6b4e9e, []int{0}
+}
+
+func (m *Purchase) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Purchase.Unmarshal(m, b)
+}
+func (m *Purchase) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Purchase.Marshal(b, m, deterministic)
+}
+func (m *Purchase) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Purchase.Merge(m, src)
+}
+func (m *Purchase) XXX_Size() int {
+	return xxx_messageInfo_Purchase.Size(m)
+}
+func (m *Purchase) XXX_DiscardUnknown() {
+	xxx_messageInfo_Purchase.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Purchase proto.InternalMessageInfo
+
+func (m *Purchase) GetClaimHash() []byte {
+	if m != nil {
+		return m.ClaimHash
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterType((*Purchase)(nil), "pb.Purchase")
+}
+
+func init() { proto.RegisterFile("purchase.proto", fileDescriptor_ea8c7f112c6b4e9e) }
+
+var fileDescriptor_ea8c7f112c6b4e9e = []byte{
+	// 84 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2b, 0x28, 0x2d, 0x4a,
+	0xce, 0x48, 0x2c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0xd2,
+	0xe4, 0xe2, 0x08, 0x80, 0x8a, 0x0a, 0xc9, 0x72, 0x71, 0x25, 0xe7, 0x24, 0x66, 0xe6, 0xc6, 0x67,
+	0x24, 0x16, 0x67, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0xf0, 0x04, 0x71, 0x82, 0x45, 0x3c, 0x12, 0x8b,
+	0x33, 0x92, 0xd8, 0xc0, 0xba, 0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfd, 0xba, 0x94, 0x00,
+	0x47, 0x00, 0x00, 0x00,
+}

v2/go/result.pb.go

@@ -0,0 +1,563 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: result.proto
+
+package pb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type Error_Code int32
+
+const (
+	Error_UNKNOWN_CODE Error_Code = 0
+	Error_NOT_FOUND    Error_Code = 1
+	Error_INVALID      Error_Code = 2
+	Error_BLOCKED      Error_Code = 3
+)
+
+var Error_Code_name = map[int32]string{
+	0: "UNKNOWN_CODE",
+	1: "NOT_FOUND",
+	2: "INVALID",
+	3: "BLOCKED",
+}
+
+var Error_Code_value = map[string]int32{
+	"UNKNOWN_CODE": 0,
+	"NOT_FOUND":    1,
+	"INVALID":      2,
+	"BLOCKED":      3,
+}
+
+func (x Error_Code) String() string {
+	return proto.EnumName(Error_Code_name, int32(x))
+}
+
+func (Error_Code) EnumDescriptor() ([]byte, []int) {
+	return fileDescriptor_4feee897733d2100, []int{3, 0}
+}
+
+type Outputs struct {
+	Txos                 []*Output  `protobuf:"bytes,1,rep,name=txos,proto3" json:"txos"`
+	ExtraTxos            []*Output  `protobuf:"bytes,2,rep,name=extra_txos,json=extraTxos,proto3" json:"extra_txos"`
+	Total                uint32     `protobuf:"varint,3,opt,name=total,proto3" json:"total"`
+	Offset               uint32     `protobuf:"varint,4,opt,name=offset,proto3" json:"offset"`
+	Blocked              []*Blocked `protobuf:"bytes,5,rep,name=blocked,proto3" json:"blocked"`
+	BlockedTotal         uint32     `protobuf:"varint,6,opt,name=blocked_total,json=blockedTotal,proto3" json:"blocked_total"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *Outputs) Reset()         { *m = Outputs{} }
+func (m *Outputs) String() string { return proto.CompactTextString(m) }
+func (*Outputs) ProtoMessage()    {}
+func (*Outputs) Descriptor() ([]byte, []int) {
+	return fileDescriptor_4feee897733d2100, []int{0}
+}
+
+func (m *Outputs) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Outputs.Unmarshal(m, b)
+}
+func (m *Outputs) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Outputs.Marshal(b, m, deterministic)
+}
+func (m *Outputs) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Outputs.Merge(m, src)
+}
+func (m *Outputs) XXX_Size() int {
+	return xxx_messageInfo_Outputs.Size(m)
+}
+func (m *Outputs) XXX_DiscardUnknown() {
+	xxx_messageInfo_Outputs.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Outputs proto.InternalMessageInfo
+
+func (m *Outputs) GetTxos() []*Output {
+	if m != nil {
+		return m.Txos
+	}
+	return nil
+}
+
+func (m *Outputs) GetExtraTxos() []*Output {
+	if m != nil {
+		return m.ExtraTxos
+	}
+	return nil
+}
+
+func (m *Outputs) GetTotal() uint32 {
+	if m != nil {
+		return m.Total
+	}
+	return 0
+}
+
+func (m *Outputs) GetOffset() uint32 {
+	if m != nil {
+		return m.Offset
+	}
+	return 0
+}
+
+func (m *Outputs) GetBlocked() []*Blocked {
+	if m != nil {
+		return m.Blocked
+	}
+	return nil
+}
+
+func (m *Outputs) GetBlockedTotal() uint32 {
+	if m != nil {
+		return m.BlockedTotal
+	}
+	return 0
+}
+
+type Output struct {
+	TxHash []byte `protobuf:"bytes,1,opt,name=tx_hash,json=txHash,proto3" json:"tx_hash"`
+	Nout   uint32 `protobuf:"varint,2,opt,name=nout,proto3" json:"nout"`
+	Height uint32 `protobuf:"varint,3,opt,name=height,proto3" json:"height"`
+	// Types that are valid to be assigned to Meta:
+	//	*Output_Claim
+	//	*Output_Error
+	Meta                 isOutput_Meta `protobuf_oneof:"meta"`
+	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
+	XXX_unrecognized     []byte        `json:"-"`
+	XXX_sizecache        int32         `json:"-"`
+}
+
+func (m *Output) Reset()         { *m = Output{} }
+func (m *Output) String() string { return proto.CompactTextString(m) }
+func (*Output) ProtoMessage()    {}
+func (*Output) Descriptor() ([]byte, []int) {
+	return fileDescriptor_4feee897733d2100, []int{1}
+}
+
+func (m *Output) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Output.Unmarshal(m, b)
+}
+func (m *Output) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Output.Marshal(b, m, deterministic)
+}
+func (m *Output) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Output.Merge(m, src)
+}
+func (m *Output) XXX_Size() int {
+	return xxx_messageInfo_Output.Size(m)
+}
+func (m *Output) XXX_DiscardUnknown() {
+	xxx_messageInfo_Output.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Output proto.InternalMessageInfo
+
+func (m *Output) GetTxHash() []byte {
+	if m != nil {
+		return m.TxHash
+	}
+	return nil
+}
+
+func (m *Output) GetNout() uint32 {
+	if m != nil {
+		return m.Nout
+	}
+	return 0
+}
+
+func (m *Output) GetHeight() uint32 {
+	if m != nil {
+		return m.Height
+	}
+	return 0
+}
+
+type isOutput_Meta interface {
+	isOutput_Meta()
+}
+
+type Output_Claim struct {
+	Claim *ClaimMeta `protobuf:"bytes,7,opt,name=claim,proto3,oneof"`
+}
+
+type Output_Error struct {
+	Error *Error `protobuf:"bytes,15,opt,name=error,proto3,oneof"`
+}
+
+func (*Output_Claim) isOutput_Meta() {}
+
+func (*Output_Error) isOutput_Meta() {}
+
+func (m *Output) GetMeta() isOutput_Meta {
+	if m != nil {
+		return m.Meta
+	}
+	return nil
+}
+
+func (m *Output) GetClaim() *ClaimMeta {
+	if x, ok := m.GetMeta().(*Output_Claim); ok {
+		return x.Claim
+	}
+	return nil
+}
+
+func (m *Output) GetError() *Error {
+	if x, ok := m.GetMeta().(*Output_Error); ok {
+		return x.Error
+	}
+	return nil
+}
+
+// XXX_OneofWrappers is for the internal use of the proto package.
+func (*Output) XXX_OneofWrappers() []interface{} {
+	return []interface{}{
+		(*Output_Claim)(nil),
+		(*Output_Error)(nil),
+	}
+}
+
+type ClaimMeta struct {
+	Channel              *Output  `protobuf:"bytes,1,opt,name=channel,proto3" json:"channel"`
+	Repost               *Output  `protobuf:"bytes,2,opt,name=repost,proto3" json:"repost"`
+	ShortUrl             string   `protobuf:"bytes,3,opt,name=short_url,json=shortUrl,proto3" json:"short_url"`
+	CanonicalUrl         string   `protobuf:"bytes,4,opt,name=canonical_url,json=canonicalUrl,proto3" json:"canonical_url"`
+	IsControlling        bool     `protobuf:"varint,5,opt,name=is_controlling,json=isControlling,proto3" json:"is_controlling"`
+	TakeOverHeight       uint32   `protobuf:"varint,6,opt,name=take_over_height,json=takeOverHeight,proto3" json:"take_over_height"`
+	CreationHeight       uint32   `protobuf:"varint,7,opt,name=creation_height,json=creationHeight,proto3" json:"creation_height"`
+	ActivationHeight     uint32   `protobuf:"varint,8,opt,name=activation_height,json=activationHeight,proto3" json:"activation_height"`
+	ExpirationHeight     uint32   `protobuf:"varint,9,opt,name=expiration_height,json=expirationHeight,proto3" json:"expiration_height"`
+	ClaimsInChannel      uint32   `protobuf:"varint,10,opt,name=claims_in_channel,json=claimsInChannel,proto3" json:"claims_in_channel"`
+	Reposted             uint32   `protobuf:"varint,11,opt,name=reposted,proto3" json:"reposted"`
+	EffectiveAmount      uint64   `protobuf:"varint,20,opt,name=effective_amount,json=effectiveAmount,proto3" json:"effective_amount"`
+	SupportAmount        uint64   `protobuf:"varint,21,opt,name=support_amount,json=supportAmount,proto3" json:"support_amount"`
+	TrendingGroup        uint32   `protobuf:"varint,22,opt,name=trending_group,json=trendingGroup,proto3" json:"trending_group"`
+	TrendingMixed        float32  `protobuf:"fixed32,23,opt,name=trending_mixed,json=trendingMixed,proto3" json:"trending_mixed"`
+	TrendingLocal        float32  `protobuf:"fixed32,24,opt,name=trending_local,json=trendingLocal,proto3" json:"trending_local"`
+	TrendingGlobal       float32  `protobuf:"fixed32,25,opt,name=trending_global,json=trendingGlobal,proto3" json:"trending_global"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *ClaimMeta) Reset()         { *m = ClaimMeta{} }
+func (m *ClaimMeta) String() string { return proto.CompactTextString(m) }
+func (*ClaimMeta) ProtoMessage()    {}
+func (*ClaimMeta) Descriptor() ([]byte, []int) {
+	return fileDescriptor_4feee897733d2100, []int{2}
+}
+
+func (m *ClaimMeta) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_ClaimMeta.Unmarshal(m, b)
+}
+func (m *ClaimMeta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_ClaimMeta.Marshal(b, m, deterministic)
+}
+func (m *ClaimMeta) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ClaimMeta.Merge(m, src)
+}
+func (m *ClaimMeta) XXX_Size() int {
+	return xxx_messageInfo_ClaimMeta.Size(m)
+}
+func (m *ClaimMeta) XXX_DiscardUnknown() {
+	xxx_messageInfo_ClaimMeta.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ClaimMeta proto.InternalMessageInfo
+
+func (m *ClaimMeta) GetChannel() *Output {
+	if m != nil {
+		return m.Channel
+	}
+	return nil
+}
+
+func (m *ClaimMeta) GetRepost() *Output {
+	if m != nil {
+		return m.Repost
+	}
+	return nil
+}
+
+func (m *ClaimMeta) GetShortUrl() string {
+	if m != nil {
+		return m.ShortUrl
+	}
+	return ""
+}
+
+func (m *ClaimMeta) GetCanonicalUrl() string {
+	if m != nil {
+		return m.CanonicalUrl
+	}
+	return ""
+}
+
+func (m *ClaimMeta) GetIsControlling() bool {
+	if m != nil {
+		return m.IsControlling
+	}
+	return false
+}
+
+func (m *ClaimMeta) GetTakeOverHeight() uint32 {
+	if m != nil {
+		return m.TakeOverHeight
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetCreationHeight() uint32 {
+	if m != nil {
+		return m.CreationHeight
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetActivationHeight() uint32 {
+	if m != nil {
+		return m.ActivationHeight
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetExpirationHeight() uint32 {
+	if m != nil {
+		return m.ExpirationHeight
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetClaimsInChannel() uint32 {
+	if m != nil {
+		return m.ClaimsInChannel
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetReposted() uint32 {
+	if m != nil {
+		return m.Reposted
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetEffectiveAmount() uint64 {
+	if m != nil {
+		return m.EffectiveAmount
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetSupportAmount() uint64 {
+	if m != nil {
+		return m.SupportAmount
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetTrendingGroup() uint32 {
+	if m != nil {
+		return m.TrendingGroup
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetTrendingMixed() float32 {
+	if m != nil {
+		return m.TrendingMixed
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetTrendingLocal() float32 {
+	if m != nil {
+		return m.TrendingLocal
+	}
+	return 0
+}
+
+func (m *ClaimMeta) GetTrendingGlobal() float32 {
+	if m != nil {
+		return m.TrendingGlobal
+	}
+	return 0
+}
+
+type Error struct {
+	Code                 Error_Code `protobuf:"varint,1,opt,name=code,proto3,enum=pb.Error_Code" json:"code"`
+	Text                 string     `protobuf:"bytes,2,opt,name=text,proto3" json:"text"`
+	Blocked              *Blocked   `protobuf:"bytes,3,opt,name=blocked,proto3" json:"blocked"`
+	XXX_NoUnkeyedLiteral struct{}   `json:"-"`
+	XXX_unrecognized     []byte     `json:"-"`
+	XXX_sizecache        int32      `json:"-"`
+}
+
+func (m *Error) Reset()         { *m = Error{} }
+func (m *Error) String() string { return proto.CompactTextString(m) }
+func (*Error) ProtoMessage()    {}
+func (*Error) Descriptor() ([]byte, []int) {
+	return fileDescriptor_4feee897733d2100, []int{3}
+}
+
+func (m *Error) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Error.Unmarshal(m, b)
+}
+func (m *Error) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Error.Marshal(b, m, deterministic)
+}
+func (m *Error) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Error.Merge(m, src)
+}
+func (m *Error) XXX_Size() int {
+	return xxx_messageInfo_Error.Size(m)
+}
+func (m *Error) XXX_DiscardUnknown() {
+	xxx_messageInfo_Error.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Error proto.InternalMessageInfo
+
+func (m *Error) GetCode() Error_Code {
+	if m != nil {
+		return m.Code
+	}
+	return Error_UNKNOWN_CODE
+}
+
+func (m *Error) GetText() string {
+	if m != nil {
+		return m.Text
+	}
+	return ""
+}
+
+func (m *Error) GetBlocked() *Blocked {
+	if m != nil {
+		return m.Blocked
+	}
+	return nil
+}
+
+type Blocked struct {
+	Count                uint32   `protobuf:"varint,1,opt,name=count,proto3" json:"count"`
+	Channel              *Output  `protobuf:"bytes,2,opt,name=channel,proto3" json:"channel"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Blocked) Reset()         { *m = Blocked{} }
+func (m *Blocked) String() string { return proto.CompactTextString(m) }
+func (*Blocked) ProtoMessage()    {}
+func (*Blocked) Descriptor() ([]byte, []int) {
+	return fileDescriptor_4feee897733d2100, []int{4}
+}
+
+func (m *Blocked) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Blocked.Unmarshal(m, b)
+}
+func (m *Blocked) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Blocked.Marshal(b, m, deterministic)
+}
+func (m *Blocked) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Blocked.Merge(m, src)
+}
+func (m *Blocked) XXX_Size() int {
+	return xxx_messageInfo_Blocked.Size(m)
+}
+func (m *Blocked) XXX_DiscardUnknown() {
+	xxx_messageInfo_Blocked.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Blocked proto.InternalMessageInfo
+
+func (m *Blocked) GetCount() uint32 {
+	if m != nil {
+		return m.Count
+	}
+	return 0
+}
+
+func (m *Blocked) GetChannel() *Output {
+	if m != nil {
+		return m.Channel
+	}
+	return nil
+}
+
+func init() {
+	proto.RegisterEnum("pb.Error_Code", Error_Code_name, Error_Code_value)
+	proto.RegisterType((*Outputs)(nil), "pb.Outputs")
+	proto.RegisterType((*Output)(nil), "pb.Output")
+	proto.RegisterType((*ClaimMeta)(nil), "pb.ClaimMeta")
+	proto.RegisterType((*Error)(nil), "pb.Error")
+	proto.RegisterType((*Blocked)(nil), "pb.Blocked")
+}
+
+func init() { proto.RegisterFile("result.proto", fileDescriptor_4feee897733d2100) }
+
+var fileDescriptor_4feee897733d2100 = []byte{
+	// 698 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x94, 0xdd, 0x6e, 0xea, 0x46,
+	0x14, 0x85, 0x63, 0x30, 0x18, 0x6f, 0xfe, 0x9c, 0x51, 0x9a, 0x4c, 0x5b, 0xa9, 0xa2, 0x6e, 0xa3,
+	0x3a, 0xad, 0xc4, 0x45, 0xfa, 0x04, 0x09, 0xd0, 0x24, 0x4a, 0x02, 0x92, 0x95, 0xb4, 0x97, 0xd6,
+	0x60, 0x06, 0xb0, 0x62, 0x3c, 0xd6, 0x78, 0x1c, 0xf1, 0x36, 0xbd, 0xe8, 0x55, 0x5f, 0xe6, 0x3c,
+	0xd3, 0xd1, 0xec, 0x31, 0x10, 0x74, 0xce, 0xb9, 0x9b, 0xbd, 0xd6, 0xe7, 0xed, 0xad, 0x35, 0x3f,
+	0xd0, 0x91, 0xbc, 0x28, 0x53, 0x35, 0xcc, 0xa5, 0x50, 0x82, 0xd4, 0xf2, 0xb9, 0xff, 0xc9, 0x02,
+	0x67, 0x56, 0xaa, 0xbc, 0x54, 0x05, 0xf9, 0x09, 0x6c, 0xb5, 0x15, 0x05, 0xb5, 0x06, 0xf5, 0xa0,
+	0x7d, 0x0d, 0xc3, 0x7c, 0x3e, 0x34, 0x56, 0x88, 0x3a, 0xb9, 0x02, 0xe0, 0x5b, 0x25, 0x59, 0x84,
+	0x54, 0xed, 0x0b, 0xca, 0x45, 0xf7, 0x45, 0xa3, 0x67, 0xd0, 0x50, 0x42, 0xb1, 0x94, 0xd6, 0x07,
+	0x56, 0xd0, 0x0d, 0x4d, 0x41, 0xce, 0xa1, 0x29, 0x96, 0xcb, 0x82, 0x2b, 0x6a, 0xa3, 0x5c, 0x55,
+	0xe4, 0x12, 0x9c, 0x79, 0x2a, 0xe2, 0x37, 0xbe, 0xa0, 0x0d, 0xec, 0xda, 0xd6, 0x5d, 0x6f, 0x8d,
+	0x14, 0xee, 0x3c, 0xf2, 0x0b, 0x74, 0xab, 0x65, 0x64, 0x9a, 0x37, 0xb1, 0x4b, 0xa7, 0x12, 0x5f,
+	0xb4, 0xe6, 0xff, 0x6b, 0x41, 0xd3, 0xcc, 0x43, 0x2e, 0xc0, 0x51, 0xdb, 0x68, 0xcd, 0x8a, 0x35,
+	0xb5, 0x06, 0x56, 0xd0, 0x09, 0x9b, 0x6a, 0x7b, 0xcf, 0x8a, 0x35, 0x21, 0x60, 0x67, 0xa2, 0x54,
+	0xb4, 0x86, 0xdf, 0xe3, 0x5a, 0xcf, 0xb6, 0xe6, 0xc9, 0x6a, 0xad, 0xaa, 0x91, 0xab, 0x8a, 0x5c,
+	0x42, 0x23, 0x4e, 0x59, 0xb2, 0xa1, 0xce, 0xc0, 0x0a, 0xda, 0xd7, 0x5d, 0x3d, 0xd9, 0x48, 0x0b,
+	0xcf, 0x5c, 0xb1, 0xfb, 0x93, 0xd0, 0xb8, 0xe4, 0x67, 0x68, 0x70, 0x29, 0x85, 0xa4, 0x7d, 0xc4,
+	0x5c, 0x8d, 0x4d, 0xb4, 0xa0, 0x11, 0x74, 0x6e, 0x9b, 0x60, 0x6f, 0xb8, 0x62, 0xfe, 0x7f, 0x0d,
+	0x70, 0xf7, 0x1d, 0xc8, 0xaf, 0xe0, 0xc4, 0x6b, 0x96, 0x65, 0x3c, 0xc5, 0x21, 0x8f, 0x13, 0xdd,
+	0x59, 0xc4, 0x87, 0xa6, 0xe4, 0xb9, 0x28, 0xcc, 0xcc, 0xc7, 0x50, 0xe5, 0x90, 0x1f, 0xc1, 0x2d,
+	0xd6, 0x42, 0xaa, 0xa8, 0x94, 0x26, 0x77, 0x37, 0x6c, 0xa1, 0xf0, 0x2a, 0x53, 0x9d, 0x5d, 0xcc,
+	0x32, 0x91, 0x25, 0x31, 0x4b, 0x11, 0xb0, 0x11, 0xe8, 0xec, 0x45, 0x0d, 0x5d, 0x42, 0x2f, 0x29,
+	0xa2, 0x58, 0x64, 0x4a, 0x8a, 0x34, 0x4d, 0xb2, 0x15, 0x6d, 0x0c, 0xac, 0xa0, 0x15, 0x76, 0x93,
+	0x62, 0x74, 0x10, 0x49, 0x00, 0x9e, 0x62, 0x6f, 0x3c, 0x12, 0xef, 0x5c, 0x46, 0x55, 0x68, 0x66,
+	0x2b, 0x7a, 0x5a, 0x9f, 0xbd, 0x73, 0x79, 0x6f, 0xc2, 0xfb, 0x0d, 0xfa, 0xb1, 0xe4, 0x4c, 0x25,
+	0x22, 0xdb, 0x81, 0x8e, 0x01, 0x77, 0x72, 0x05, 0xfe, 0x01, 0xa7, 0x2c, 0x56, 0xc9, 0xfb, 0x11,
+	0xda, 0x42, 0xd4, 0x3b, 0x18, 0x07, 0x98, 0x6f, 0xf3, 0x44, 0x1e, 0xc1, 0xae, 0x81, 0x0f, 0x46,
+	0x05, 0xff, 0x0e, 0xa7, 0xb8, 0x43, 0x45, 0x94, 0x64, 0xd1, 0x2e, 0x69, 0x40, 0xb8, 0x6f, 0x8c,
+	0x87, 0x6c, 0x54, 0xa5, 0xfc, 0x03, 0xb4, 0x4c, 0x96, 0x7c, 0x41, 0xdb, 0x88, 0xec, 0x6b, 0x72,
+	0x05, 0x1e, 0x5f, 0x2e, 0xb9, 0x9e, 0x85, 0x47, 0x6c, 0x23, 0xca, 0x4c, 0xd1, 0xb3, 0x81, 0x15,
+	0xd8, 0x61, 0x7f, 0xaf, 0xdf, 0xa0, 0xac, 0x63, 0x2c, 0xca, 0x3c, 0xd7, 0x5b, 0x51, 0x81, 0xdf,
+	0x21, 0xd8, 0xad, 0xd4, 0x03, 0xa6, 0x24, 0xcf, 0x16, 0x49, 0xb6, 0x8a, 0x56, 0x52, 0x94, 0x39,
+	0x3d, 0xc7, 0x7f, 0x76, 0x77, 0xea, 0x9d, 0x16, 0x8f, 0xb0, 0x4d, 0xb2, 0xe5, 0x0b, 0x7a, 0x31,
+	0xb0, 0x82, 0xda, 0x01, 0x7b, 0xd6, 0xe2, 0x11, 0x96, 0x8a, 0x98, 0xa5, 0x94, 0x1e, 0x63, 0x4f,
+	0x5a, 0xd4, 0x3b, 0x72, 0xf8, 0x69, 0x2a, 0xe6, 0x2c, 0xa5, 0xdf, 0x23, 0xb7, 0xff, 0xfa, 0x0e,
+	0x55, 0xff, 0x7f, 0x0b, 0x1a, 0x78, 0x80, 0x89, 0x0f, 0x76, 0x2c, 0x16, 0x1c, 0x8f, 0x67, 0xef,
+	0xba, 0xb7, 0x3f, 0xd9, 0xc3, 0x91, 0x58, 0xf0, 0x10, 0x3d, 0x7d, 0xa3, 0x14, 0xdf, 0x9a, 0xd3,
+	0xe9, 0x86, 0xb8, 0xfe, 0x78, 0xab, 0xeb, 0x78, 0x68, 0xbf, 0x7a, 0xab, 0xfd, 0x1b, 0xb0, 0x75,
+	0x23, 0xe2, 0x41, 0xe7, 0x75, 0xfa, 0x38, 0x9d, 0xfd, 0x33, 0x8d, 0x46, 0xb3, 0xf1, 0xc4, 0x3b,
+	0x21, 0x5d, 0x70, 0xa7, 0xb3, 0x97, 0xe8, 0xaf, 0xd9, 0xeb, 0x74, 0xec, 0x59, 0xa4, 0x0d, 0xce,
+	0xc3, 0xf4, 0xef, 0x9b, 0xa7, 0x87, 0xb1, 0x57, 0xd3, 0xc5, 0xed, 0xd3, 0x6c, 0xf4, 0x38, 0x19,
+	0x7b, 0x75, 0x7f, 0x02, 0x4e, 0xd5, 0x56, 0x3f, 0x3c, 0x31, 0x46, 0x6e, 0x99, 0x87, 0x07, 0x8b,
+	0x8f, 0x97, 0xac, 0xf6, 0xcd, 0x4b, 0x36, 0x6f, 0xe2, 0xb3, 0xf8, 0xe7, 0xe7, 0x00, 0x00, 0x00,
+	0xff, 0xff, 0x7c, 0x8a, 0x17, 0xf5, 0x26, 0x05, 0x00, 0x00,
+}

v2/go/support.pb.go

@@ -0,0 +1,75 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// source: support.proto
+
+package pb
+
+import (
+	fmt "fmt"
+	proto "github.com/golang/protobuf/proto"
+	math "math"
+)
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+// A compilation error at this line likely means your copy of the
+// proto package needs to be updated.
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+
+type Support struct {
+	Emoji                string   `protobuf:"bytes,1,opt,name=emoji,proto3" json:"emoji"`
+	XXX_NoUnkeyedLiteral struct{} `json:"-"`
+	XXX_unrecognized     []byte   `json:"-"`
+	XXX_sizecache        int32    `json:"-"`
+}
+
+func (m *Support) Reset()         { *m = Support{} }
+func (m *Support) String() string { return proto.CompactTextString(m) }
+func (*Support) ProtoMessage()    {}
+func (*Support) Descriptor() ([]byte, []int) {
+	return fileDescriptor_61fc54fa3a6fab31, []int{0}
+}
+
+func (m *Support) XXX_Unmarshal(b []byte) error {
+	return xxx_messageInfo_Support.Unmarshal(m, b)
+}
+func (m *Support) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	return xxx_messageInfo_Support.Marshal(b, m, deterministic)
+}
+func (m *Support) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_Support.Merge(m, src)
+}
+func (m *Support) XXX_Size() int {
+	return xxx_messageInfo_Support.Size(m)
+}
+func (m *Support) XXX_DiscardUnknown() {
+	xxx_messageInfo_Support.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_Support proto.InternalMessageInfo
+
+func (m *Support) GetEmoji() string {
+	if m != nil {
+		return m.Emoji
+	}
+	return ""
+}
+
+func init() {
+	proto.RegisterType((*Support)(nil), "pb.Support")
+}
+
+func init() { proto.RegisterFile("support.proto", fileDescriptor_61fc54fa3a6fab31) }
+
+var fileDescriptor_61fc54fa3a6fab31 = []byte{
+	// 73 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2d, 0x2e, 0x2d, 0x28,
+	0xc8, 0x2f, 0x2a, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x2a, 0x48, 0x52, 0x92, 0xe7,
+	0x62, 0x0f, 0x86, 0x08, 0x0a, 0x89, 0x70, 0xb1, 0xa6, 0xe6, 0xe6, 0x67, 0x65, 0x4a, 0x30, 0x2a,
+	0x30, 0x6a, 0x70, 0x06, 0x41, 0x38, 0x49, 0x6c, 0x60, 0xb5, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff,
+	0xff, 0xa8, 0xd2, 0x7f, 0x5d, 0x3c, 0x00, 0x00, 0x00,
+}

v2/js/purchase_pb.js

@@ -0,0 +1,191 @@
+// source: purchase.proto
+/**
+ * @fileoverview
+ * @enhanceable
+ * @suppress {messageConventions} JS Compiler reports an error if a variable or
+ *     field starts with 'MSG_' and isn't a translatable message.
+ * @public
+ */
+// GENERATED CODE -- DO NOT EDIT!
+
+var jspb = require('google-protobuf');
+var goog = jspb;
+var global = Function('return this')();
+
+goog.exportSymbol('proto.pb.Purchase', null, global);
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.pb.Purchase = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.pb.Purchase, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.pb.Purchase.displayName = 'proto.pb.Purchase';
+}
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.pb.Purchase.prototype.toObject = function(opt_includeInstance) {
+  return proto.pb.Purchase.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.pb.Purchase} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.pb.Purchase.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    claimHash: msg.getClaimHash_asB64()
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.pb.Purchase}
+ */
+proto.pb.Purchase.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.pb.Purchase;
+  return proto.pb.Purchase.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.pb.Purchase} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.pb.Purchase}
+ */
+proto.pb.Purchase.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {!Uint8Array} */ (reader.readBytes());
+      msg.setClaimHash(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.pb.Purchase.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.pb.Purchase.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.pb.Purchase} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.pb.Purchase.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getClaimHash_asU8();
+  if (f.length > 0) {
+    writer.writeBytes(
+      1,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional bytes claim_hash = 1;
+ * @return {!(string|Uint8Array)}
+ */
+proto.pb.Purchase.prototype.getClaimHash = function() {
+  return /** @type {!(string|Uint8Array)} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * optional bytes claim_hash = 1;
+ * This is a type-conversion wrapper around `getClaimHash()`
+ * @return {string}
+ */
+proto.pb.Purchase.prototype.getClaimHash_asB64 = function() {
+  return /** @type {string} */ (jspb.Message.bytesAsB64(
+      this.getClaimHash()));
+};
+
+
+/**
+ * optional bytes claim_hash = 1;
+ * Note that Uint8Array is not supported on all browsers.
+ * @see http://caniuse.com/Uint8Array
+ * This is a type-conversion wrapper around `getClaimHash()`
+ * @return {!Uint8Array}
+ */
+proto.pb.Purchase.prototype.getClaimHash_asU8 = function() {
+  return /** @type {!Uint8Array} */ (jspb.Message.bytesAsU8(
+      this.getClaimHash()));
+};
+
+
+/**
+ * @param {!(string|Uint8Array)} value
+ * @return {!proto.pb.Purchase} returns this
+ */
+proto.pb.Purchase.prototype.setClaimHash = function(value) {
+  return jspb.Message.setProto3BytesField(this, 1, value);
+};
+
+
+goog.object.extend(exports, proto.pb);

v2/js/support_pb.js

@@ -0,0 +1,167 @@
+// source: support.proto
+/**
+ * @fileoverview
+ * @enhanceable
+ * @suppress {messageConventions} JS Compiler reports an error if a variable or
+ *     field starts with 'MSG_' and isn't a translatable message.
+ * @public
+ */
+// GENERATED CODE -- DO NOT EDIT!
+
+var jspb = require('google-protobuf');
+var goog = jspb;
+var global = Function('return this')();
+
+goog.exportSymbol('proto.pb.Support', null, global);
+/**
+ * Generated by JsPbCodeGenerator.
+ * @param {Array=} opt_data Optional initial data array, typically from a
+ * server response, or constructed directly in Javascript. The array is used
+ * in place and becomes part of the constructed object. It is not cloned.
+ * If no data is provided, the constructed object will be empty, but still
+ * valid.
+ * @extends {jspb.Message}
+ * @constructor
+ */
+proto.pb.Support = function(opt_data) {
+  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
+};
+goog.inherits(proto.pb.Support, jspb.Message);
+if (goog.DEBUG && !COMPILED) {
+  /**
+   * @public
+   * @override
+   */
+  proto.pb.Support.displayName = 'proto.pb.Support';
+}
+
+
+
+if (jspb.Message.GENERATE_TO_OBJECT) {
+/**
+ * Creates an object representation of this proto.
+ * Field names that are reserved in JavaScript and will be renamed to pb_name.
+ * Optional fields that are not set will be set to undefined.
+ * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
+ * For the list of reserved names please see:
+ *     net/proto2/compiler/js/internal/generator.cc#kKeyword.
+ * @param {boolean=} opt_includeInstance Deprecated. whether to include the
+ *     JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @return {!Object}
+ */
+proto.pb.Support.prototype.toObject = function(opt_includeInstance) {
+  return proto.pb.Support.toObject(opt_includeInstance, this);
+};
+
+
+/**
+ * Static version of the {@see toObject} method.
+ * @param {boolean|undefined} includeInstance Deprecated. Whether to include
+ *     the JSPB instance for transitional soy proto support:
+ *     http://goto/soy-param-migration
+ * @param {!proto.pb.Support} msg The msg instance to transform.
+ * @return {!Object}
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.pb.Support.toObject = function(includeInstance, msg) {
+  var f, obj = {
+    emoji: jspb.Message.getFieldWithDefault(msg, 1, "")
+  };
+
+  if (includeInstance) {
+    obj.$jspbMessageInstance = msg;
+  }
+  return obj;
+};
+}
+
+
+/**
+ * Deserializes binary data (in protobuf wire format).
+ * @param {jspb.ByteSource} bytes The bytes to deserialize.
+ * @return {!proto.pb.Support}
+ */
+proto.pb.Support.deserializeBinary = function(bytes) {
+  var reader = new jspb.BinaryReader(bytes);
+  var msg = new proto.pb.Support;
+  return proto.pb.Support.deserializeBinaryFromReader(msg, reader);
+};
+
+
+/**
+ * Deserializes binary data (in protobuf wire format) from the
+ * given reader into the given message object.
+ * @param {!proto.pb.Support} msg The message object to deserialize into.
+ * @param {!jspb.BinaryReader} reader The BinaryReader to use.
+ * @return {!proto.pb.Support}
+ */
+proto.pb.Support.deserializeBinaryFromReader = function(msg, reader) {
+  while (reader.nextField()) {
+    if (reader.isEndGroup()) {
+      break;
+    }
+    var field = reader.getFieldNumber();
+    switch (field) {
+    case 1:
+      var value = /** @type {string} */ (reader.readString());
+      msg.setEmoji(value);
+      break;
+    default:
+      reader.skipField();
+      break;
+    }
+  }
+  return msg;
+};
+
+
+/**
+ * Serializes the message to binary data (in protobuf wire format).
+ * @return {!Uint8Array}
+ */
+proto.pb.Support.prototype.serializeBinary = function() {
+  var writer = new jspb.BinaryWriter();
+  proto.pb.Support.serializeBinaryToWriter(this, writer);
+  return writer.getResultBuffer();
+};
+
+
+/**
+ * Serializes the given message to binary data (in protobuf wire
+ * format), writing to the given BinaryWriter.
+ * @param {!proto.pb.Support} message
+ * @param {!jspb.BinaryWriter} writer
+ * @suppress {unusedLocalVariables} f is only used for nested messages
+ */
+proto.pb.Support.serializeBinaryToWriter = function(message, writer) {
+  var f = undefined;
+  f = message.getEmoji();
+  if (f.length > 0) {
+    writer.writeString(
+      1,
+      f
+    );
+  }
+};
+
+
+/**
+ * optional string emoji = 1;
+ * @return {string}
+ */
+proto.pb.Support.prototype.getEmoji = function() {
+  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
+};
+
+
+/**
+ * @param {string} value
+ * @return {!proto.pb.Support} returns this
+ */
+proto.pb.Support.prototype.setEmoji = function(value) {
+  return jspb.Message.setProto3StringField(this, 1, value);
+};
+
+
+goog.object.extend(exports, proto.pb);

v2/proto/purchase.proto

@@ -0,0 +1,7 @@
+syntax = "proto3";
+
+package pb;
+
+message Purchase {
+    bytes claim_hash = 1;
+}

v2/proto/result.proto

@@ -0,0 +1,60 @@
+syntax = "proto3";
+
+package pb;
+
+message Outputs {
+  repeated Output txos = 1;
+  repeated Output extra_txos = 2;
+  uint32 total = 3;
+  uint32 offset = 4;
+  repeated Blocked blocked = 5;
+  uint32 blocked_total = 6;
+}
+
+message Output {
+  bytes tx_hash = 1;
+  uint32 nout = 2;
+  uint32 height = 3;
+  oneof meta {
+    ClaimMeta claim = 7;
+    Error error = 15;
+  }
+}
+
+message ClaimMeta {
+  Output channel = 1;
+  Output repost = 2;
+  string short_url = 3;
+  string canonical_url = 4;
+  bool is_controlling = 5;
+  uint32 take_over_height = 6;
+  uint32 creation_height = 7;
+  uint32 activation_height = 8;
+  uint32 expiration_height = 9;
+  uint32 claims_in_channel = 10;
+  uint32 reposted = 11;
+
+  uint64 effective_amount = 20;
+  uint64 support_amount = 21;
+  uint32 trending_group = 22;
+  float trending_mixed = 23;
+  float trending_local = 24;
+  float trending_global = 25;
+}
+
+message Error {
+  enum Code {
+    UNKNOWN_CODE = 0;
+    NOT_FOUND = 1;
+    INVALID = 2;
+    BLOCKED = 3;
+  }
+  Code code = 1;
+  string text = 2;
+  Blocked blocked = 3;
+}
+
+message Blocked {
+  uint32 count = 1;
+  Output channel = 2;
+}

v2/proto/support.proto

@@ -0,0 +1,20 @@
+syntax = "proto3";
+
+package pb;
+
+message Support {
+  string emoji = 1;
+  string comment = 2;
+  /*
+  oneof type {
+    Edit edit = 1;
+  }
+  */
+}
+
+/*
+message Edit {
+    string key = 1;
+    string value = 2;
+}
+*/

v2/python/purchase_pb2.py

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: purchase.proto
+
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='purchase.proto',
+  package='pb',
+  syntax='proto3',
+  serialized_options=None,
+  create_key=_descriptor._internal_create_key,
+  serialized_pb=b'\n\x0epurchase.proto\x12\x02pb\"\x1e\n\x08Purchase\x12\x12\n\nclaim_hash\x18\x01 \x01(\x0c\x62\x06proto3'
+)
+
+
+
+
+_PURCHASE = _descriptor.Descriptor(
+  name='Purchase',
+  full_name='pb.Purchase',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='claim_hash', full_name='pb.Purchase.claim_hash', index=0,
+      number=1, type=12, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"",
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=22,
+  serialized_end=52,
+)
+
+DESCRIPTOR.message_types_by_name['Purchase'] = _PURCHASE
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+Purchase = _reflection.GeneratedProtocolMessageType('Purchase', (_message.Message,), {
+  'DESCRIPTOR' : _PURCHASE,
+  '__module__' : 'purchase_pb2'
+  # @@protoc_insertion_point(class_scope:pb.Purchase)
+  })
+_sym_db.RegisterMessage(Purchase)
+
+
+# @@protoc_insertion_point(module_scope)

v2/python/result_pb2.py

@@ -0,0 +1,484 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: result.proto
+
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='result.proto',
+  package='pb',
+  syntax='proto3',
+  serialized_options=None,
+  create_key=_descriptor._internal_create_key,
+  serialized_pb=b'\n\x0cresult.proto\x12\x02pb\"\x97\x01\n\x07Outputs\x12\x18\n\x04txos\x18\x01 \x03(\x0b\x32\n.pb.Output\x12\x1e\n\nextra_txos\x18\x02 \x03(\x0b\x32\n.pb.Output\x12\r\n\x05total\x18\x03 \x01(\r\x12\x0e\n\x06offset\x18\x04 \x01(\r\x12\x1c\n\x07\x62locked\x18\x05 \x03(\x0b\x32\x0b.pb.Blocked\x12\x15\n\rblocked_total\x18\x06 \x01(\r\"{\n\x06Output\x12\x0f\n\x07tx_hash\x18\x01 \x01(\x0c\x12\x0c\n\x04nout\x18\x02 \x01(\r\x12\x0e\n\x06height\x18\x03 \x01(\r\x12\x1e\n\x05\x63laim\x18\x07 \x01(\x0b\x32\r.pb.ClaimMetaH\x00\x12\x1a\n\x05\x65rror\x18\x0f \x01(\x0b\x32\t.pb.ErrorH\x00\x42\x06\n\x04meta\"\xaf\x03\n\tClaimMeta\x12\x1b\n\x07\x63hannel\x18\x01 \x01(\x0b\x32\n.pb.Output\x12\x1a\n\x06repost\x18\x02 \x01(\x0b\x32\n.pb.Output\x12\x11\n\tshort_url\x18\x03 \x01(\t\x12\x15\n\rcanonical_url\x18\x04 \x01(\t\x12\x16\n\x0eis_controlling\x18\x05 \x01(\x08\x12\x18\n\x10take_over_height\x18\x06 \x01(\r\x12\x17\n\x0f\x63reation_height\x18\x07 \x01(\r\x12\x19\n\x11\x61\x63tivation_height\x18\x08 \x01(\r\x12\x19\n\x11\x65xpiration_height\x18\t \x01(\r\x12\x19\n\x11\x63laims_in_channel\x18\n \x01(\r\x12\x10\n\x08reposted\x18\x0b \x01(\r\x12\x18\n\x10\x65\x66\x66\x65\x63tive_amount\x18\x14 \x01(\x04\x12\x16\n\x0esupport_amount\x18\x15 \x01(\x04\x12\x16\n\x0etrending_group\x18\x16 \x01(\r\x12\x16\n\x0etrending_mixed\x18\x17 \x01(\x02\x12\x16\n\x0etrending_local\x18\x18 \x01(\x02\x12\x17\n\x0ftrending_global\x18\x19 \x01(\x02\"\x94\x01\n\x05\x45rror\x12\x1c\n\x04\x63ode\x18\x01 \x01(\x0e\x32\x0e.pb.Error.Code\x12\x0c\n\x04text\x18\x02 \x01(\t\x12\x1c\n\x07\x62locked\x18\x03 \x01(\x0b\x32\x0b.pb.Blocked\"A\n\x04\x43ode\x12\x10\n\x0cUNKNOWN_CODE\x10\x00\x12\r\n\tNOT_FOUND\x10\x01\x12\x0b\n\x07INVALID\x10\x02\x12\x0b\n\x07\x42LOCKED\x10\x03\"5\n\x07\x42locked\x12\r\n\x05\x63ount\x18\x01 \x01(\r\x12\x1b\n\x07\x63hannel\x18\x02 \x01(\x0b\x32\n.pb.Outputb\x06proto3'
+)
+
+
+
+_ERROR_CODE = _descriptor.EnumDescriptor(
+  name='Code',
+  full_name='pb.Error.Code',
+  filename=None,
+  file=DESCRIPTOR,
+  create_key=_descriptor._internal_create_key,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='UNKNOWN_CODE', index=0, number=0,
+      serialized_options=None,
+      type=None,
+      create_key=_descriptor._internal_create_key),
+    _descriptor.EnumValueDescriptor(
+      name='NOT_FOUND', index=1, number=1,
+      serialized_options=None,
+      type=None,
+      create_key=_descriptor._internal_create_key),
+    _descriptor.EnumValueDescriptor(
+      name='INVALID', index=2, number=2,
+      serialized_options=None,
+      type=None,
+      create_key=_descriptor._internal_create_key),
+    _descriptor.EnumValueDescriptor(
+      name='BLOCKED', index=3, number=3,
+      serialized_options=None,
+      type=None,
+      create_key=_descriptor._internal_create_key),
+  ],
+  containing_type=None,
+  serialized_options=None,
+  serialized_start=817,
+  serialized_end=882,
+)
+_sym_db.RegisterEnumDescriptor(_ERROR_CODE)
+
+
+_OUTPUTS = _descriptor.Descriptor(
+  name='Outputs',
+  full_name='pb.Outputs',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='txos', full_name='pb.Outputs.txos', index=0,
+      number=1, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='extra_txos', full_name='pb.Outputs.extra_txos', index=1,
+      number=2, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='total', full_name='pb.Outputs.total', index=2,
+      number=3, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='offset', full_name='pb.Outputs.offset', index=3,
+      number=4, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='blocked', full_name='pb.Outputs.blocked', index=4,
+      number=5, type=11, cpp_type=10, label=3,
+      has_default_value=False, default_value=[],
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='blocked_total', full_name='pb.Outputs.blocked_total', index=5,
+      number=6, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=21,
+  serialized_end=172,
+)
+
+
+_OUTPUT = _descriptor.Descriptor(
+  name='Output',
+  full_name='pb.Output',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='tx_hash', full_name='pb.Output.tx_hash', index=0,
+      number=1, type=12, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"",
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='nout', full_name='pb.Output.nout', index=1,
+      number=2, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='height', full_name='pb.Output.height', index=2,
+      number=3, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='claim', full_name='pb.Output.claim', index=3,
+      number=7, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='error', full_name='pb.Output.error', index=4,
+      number=15, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+    _descriptor.OneofDescriptor(
+      name='meta', full_name='pb.Output.meta',
+      index=0, containing_type=None,
+      create_key=_descriptor._internal_create_key,
+    fields=[]),
+  ],
+  serialized_start=174,
+  serialized_end=297,
+)
+
+
+_CLAIMMETA = _descriptor.Descriptor(
+  name='ClaimMeta',
+  full_name='pb.ClaimMeta',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='channel', full_name='pb.ClaimMeta.channel', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='repost', full_name='pb.ClaimMeta.repost', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='short_url', full_name='pb.ClaimMeta.short_url', index=2,
+      number=3, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='canonical_url', full_name='pb.ClaimMeta.canonical_url', index=3,
+      number=4, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='is_controlling', full_name='pb.ClaimMeta.is_controlling', index=4,
+      number=5, type=8, cpp_type=7, label=1,
+      has_default_value=False, default_value=False,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='take_over_height', full_name='pb.ClaimMeta.take_over_height', index=5,
+      number=6, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='creation_height', full_name='pb.ClaimMeta.creation_height', index=6,
+      number=7, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='activation_height', full_name='pb.ClaimMeta.activation_height', index=7,
+      number=8, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='expiration_height', full_name='pb.ClaimMeta.expiration_height', index=8,
+      number=9, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='claims_in_channel', full_name='pb.ClaimMeta.claims_in_channel', index=9,
+      number=10, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='reposted', full_name='pb.ClaimMeta.reposted', index=10,
+      number=11, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='effective_amount', full_name='pb.ClaimMeta.effective_amount', index=11,
+      number=20, type=4, cpp_type=4, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='support_amount', full_name='pb.ClaimMeta.support_amount', index=12,
+      number=21, type=4, cpp_type=4, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='trending_group', full_name='pb.ClaimMeta.trending_group', index=13,
+      number=22, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='trending_mixed', full_name='pb.ClaimMeta.trending_mixed', index=14,
+      number=23, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='trending_local', full_name='pb.ClaimMeta.trending_local', index=15,
+      number=24, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='trending_global', full_name='pb.ClaimMeta.trending_global', index=16,
+      number=25, type=2, cpp_type=6, label=1,
+      has_default_value=False, default_value=float(0),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=300,
+  serialized_end=731,
+)
+
+
+_ERROR = _descriptor.Descriptor(
+  name='Error',
+  full_name='pb.Error',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='code', full_name='pb.Error.code', index=0,
+      number=1, type=14, cpp_type=8, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='text', full_name='pb.Error.text', index=1,
+      number=2, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='blocked', full_name='pb.Error.blocked', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _ERROR_CODE,
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=734,
+  serialized_end=882,
+)
+
+
+_BLOCKED = _descriptor.Descriptor(
+  name='Blocked',
+  full_name='pb.Blocked',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='count', full_name='pb.Blocked.count', index=0,
+      number=1, type=13, cpp_type=3, label=1,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+    _descriptor.FieldDescriptor(
+      name='channel', full_name='pb.Blocked.channel', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=884,
+  serialized_end=937,
+)
+
+_OUTPUTS.fields_by_name['txos'].message_type = _OUTPUT
+_OUTPUTS.fields_by_name['extra_txos'].message_type = _OUTPUT
+_OUTPUTS.fields_by_name['blocked'].message_type = _BLOCKED
+_OUTPUT.fields_by_name['claim'].message_type = _CLAIMMETA
+_OUTPUT.fields_by_name['error'].message_type = _ERROR
+_OUTPUT.oneofs_by_name['meta'].fields.append(
+  _OUTPUT.fields_by_name['claim'])
+_OUTPUT.fields_by_name['claim'].containing_oneof = _OUTPUT.oneofs_by_name['meta']
+_OUTPUT.oneofs_by_name['meta'].fields.append(
+  _OUTPUT.fields_by_name['error'])
+_OUTPUT.fields_by_name['error'].containing_oneof = _OUTPUT.oneofs_by_name['meta']
+_CLAIMMETA.fields_by_name['channel'].message_type = _OUTPUT
+_CLAIMMETA.fields_by_name['repost'].message_type = _OUTPUT
+_ERROR.fields_by_name['code'].enum_type = _ERROR_CODE
+_ERROR.fields_by_name['blocked'].message_type = _BLOCKED
+_ERROR_CODE.containing_type = _ERROR
+_BLOCKED.fields_by_name['channel'].message_type = _OUTPUT
+DESCRIPTOR.message_types_by_name['Outputs'] = _OUTPUTS
+DESCRIPTOR.message_types_by_name['Output'] = _OUTPUT
+DESCRIPTOR.message_types_by_name['ClaimMeta'] = _CLAIMMETA
+DESCRIPTOR.message_types_by_name['Error'] = _ERROR
+DESCRIPTOR.message_types_by_name['Blocked'] = _BLOCKED
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+Outputs = _reflection.GeneratedProtocolMessageType('Outputs', (_message.Message,), {
+  'DESCRIPTOR' : _OUTPUTS,
+  '__module__' : 'result_pb2'
+  # @@protoc_insertion_point(class_scope:pb.Outputs)
+  })
+_sym_db.RegisterMessage(Outputs)
+
+Output = _reflection.GeneratedProtocolMessageType('Output', (_message.Message,), {
+  'DESCRIPTOR' : _OUTPUT,
+  '__module__' : 'result_pb2'
+  # @@protoc_insertion_point(class_scope:pb.Output)
+  })
+_sym_db.RegisterMessage(Output)
+
+ClaimMeta = _reflection.GeneratedProtocolMessageType('ClaimMeta', (_message.Message,), {
+  'DESCRIPTOR' : _CLAIMMETA,
+  '__module__' : 'result_pb2'
+  # @@protoc_insertion_point(class_scope:pb.ClaimMeta)
+  })
+_sym_db.RegisterMessage(ClaimMeta)
+
+Error = _reflection.GeneratedProtocolMessageType('Error', (_message.Message,), {
+  'DESCRIPTOR' : _ERROR,
+  '__module__' : 'result_pb2'
+  # @@protoc_insertion_point(class_scope:pb.Error)
+  })
+_sym_db.RegisterMessage(Error)
+
+Blocked = _reflection.GeneratedProtocolMessageType('Blocked', (_message.Message,), {
+  'DESCRIPTOR' : _BLOCKED,
+  '__module__' : 'result_pb2'
+  # @@protoc_insertion_point(class_scope:pb.Blocked)
+  })
+_sym_db.RegisterMessage(Blocked)
+
+
+# @@protoc_insertion_point(module_scope)

v2/python/support_pb2.py

@@ -0,0 +1,70 @@
+# -*- coding: utf-8 -*-
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: support.proto
+
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import symbol_database as _symbol_database
+# @@protoc_insertion_point(imports)
+
+_sym_db = _symbol_database.Default()
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='support.proto',
+  package='pb',
+  syntax='proto3',
+  serialized_options=None,
+  create_key=_descriptor._internal_create_key,
+  serialized_pb=b'\n\rsupport.proto\x12\x02pb\"\x18\n\x07Support\x12\r\n\x05\x65moji\x18\x01 \x01(\tb\x06proto3'
+)
+
+
+
+
+_SUPPORT = _descriptor.Descriptor(
+  name='Support',
+  full_name='pb.Support',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  create_key=_descriptor._internal_create_key,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='emoji', full_name='pb.Support.emoji', index=0,
+      number=1, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=b"".decode('utf-8'),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      serialized_options=None, file=DESCRIPTOR,  create_key=_descriptor._internal_create_key),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  serialized_options=None,
+  is_extendable=False,
+  syntax='proto3',
+  extension_ranges=[],
+  oneofs=[
+  ],
+  serialized_start=21,
+  serialized_end=45,
+)
+
+DESCRIPTOR.message_types_by_name['Support'] = _SUPPORT
+_sym_db.RegisterFileDescriptor(DESCRIPTOR)
+
+Support = _reflection.GeneratedProtocolMessageType('Support', (_message.Message,), {
+  'DESCRIPTOR' : _SUPPORT,
+  '__module__' : 'support_pb2'
+  # @@protoc_insertion_point(class_scope:pb.Support)
+  })
+_sym_db.RegisterMessage(Support)
+
+
+# @@protoc_insertion_point(module_scope)