move wallet jsonschema

add comments to supports

README.md

@@ -1,9 +1,12 @@
 # LBRY Types
 
-Cross-language definitions for standard LBRY types. 
+Cross-language definitions for standard LBRY types.
 
 `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.
 
+`jsonschema/` contains the definition of the wallet file.
+
+
 ## License
 
 MIT

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/cpp/certificate.pb.cc

@@ -6,28 +6,23 @@
 #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 legacy_pb {
 class CertificateDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Certificate>
-      _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Certificate> _instance;
 } _Certificate_default_instance_;
 }  // namespace legacy_pb
-namespace protobuf_certificate_2eproto {
-static void InitDefaultsCertificate() {
+static void InitDefaultsCertificate_certificate_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -38,30 +33,31 @@ static void InitDefaultsCertificate() {
   ::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(::legacy_pb::Certificate, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_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(::legacy_pb::Certificate, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Certificate, keytype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_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) = {
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
   { 0, 8, sizeof(::legacy_pb::Certificate)},
 };
 
@@ -69,56 +65,40 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
   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\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"
+void AddDescriptors_certificate_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[1] =
+  {
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 278);
-  ::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
+// 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: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());
@@ -187,6 +178,8 @@ Certificate::Certificate(const Certificate& from)
 }
 
 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_) -
@@ -205,13 +198,8 @@ 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();
 }
 
@@ -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,9 +223,85 @@ 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:legacy_pb.Certificate)
   for (;;) {
@@ -247,9 +311,8 @@ bool Certificate::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // 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)));
@@ -257,7 +320,7 @@ bool Certificate::MergePartialFromCodedStream(
             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;
@@ -267,9 +330,8 @@ bool Certificate::MergePartialFromCodedStream(
 
       // 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)));
@@ -277,7 +339,7 @@ bool Certificate::MergePartialFromCodedStream(
             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 {
@@ -316,6 +377,7 @@ failure:
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Certificate::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -350,8 +412,7 @@ void Certificate::SerializeWithCachedSizes(
 }
 
 ::google::protobuf::uint8* Certificate::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
+    ::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;
@@ -435,6 +496,10 @@ size_t Certificate::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;
@@ -444,9 +509,9 @@ void Certificate::MergeFrom(const ::google::protobuf::Message& from) {
 // @@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) {
+  if (source == nullptr) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Certificate)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -463,9 +528,9 @@ void Certificate::MergeFrom(const Certificate& from) {
   (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) {
@@ -503,17 +568,17 @@ 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];
 }
 
 
@@ -521,10 +586,11 @@ void Certificate::InternalSwap(Certificate* other) {
 }  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Certificate* Arena::CreateMaybeMessage< ::legacy_pb::Certificate >(Arena* 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 < 3006001
+#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 3006001 < 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,20 +33,22 @@
 #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
+void AddDescriptors_certificate_2eproto();
 namespace legacy_pb {
 class Certificate;
 class CertificateDefaultTypeInternal;
@@ -100,7 +103,8 @@ inline bool KeyType_Parse(
 }
 // ===================================================================
 
-class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_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:
 
@@ -251,12 +262,7 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
 
   // @@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;
 };
 // ===================================================================
 
@@ -284,15 +290,9 @@ class Certificate : public ::google::protobuf::Message /* @@protoc_insertion_poi
 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 ::legacy_pb::Certificate_Version Certificate::version() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Certificate.version)
@@ -300,7 +300,7 @@ inline ::legacy_pb::Certificate_Version Certificate::version() const {
 }
 inline void Certificate::set_version(::legacy_pb::Certificate_Version value) {
   assert(::legacy_pb::Certificate_Version_IsValid(value));
-  set_has_version();
+  _has_bits_[0] |= 0x00000002u;
   version_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Certificate.version)
 }
@@ -309,15 +309,9 @@ inline void Certificate::set_version(::legacy_pb::Certificate_Version value) {
 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 ::legacy_pb::KeyType Certificate::keytype() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Certificate.keyType)
@@ -325,7 +319,7 @@ inline ::legacy_pb::KeyType Certificate::keytype() const {
 }
 inline void Certificate::set_keytype(::legacy_pb::KeyType value) {
   assert(::legacy_pb::KeyType_IsValid(value));
-  set_has_keytype();
+  _has_bits_[0] |= 0x00000004u;
   keytype_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Certificate.keyType)
 }
@@ -334,63 +328,57 @@ inline void Certificate::set_keytype(::legacy_pb::KeyType value) {
 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: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: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: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: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:legacy_pb.Certificate.publicKey)
 }
 inline ::std::string* Certificate::mutable_publickey() {
-  set_has_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: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:legacy_pb.Certificate.publicKey)
@@ -423,4 +411,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::KeyType>() {
 
 // @@protoc_insertion_point(global_scope)
 
+#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_certificate_2eproto

v1/cpp/fee.pb.cc

@@ -6,28 +6,23 @@
 #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 legacy_pb {
 class FeeDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Fee>
-      _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Fee> _instance;
 } _Fee_default_instance_;
 }  // namespace legacy_pb
-namespace protobuf_fee_2eproto {
-static void InitDefaultsFee() {
+static void InitDefaultsFee_fee_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -38,32 +33,33 @@ static void InitDefaultsFee() {
   ::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(::legacy_pb::Fee, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_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(::legacy_pb::Fee, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Fee, currency_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Fee, address_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_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) = {
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
   { 0, 9, sizeof(::legacy_pb::Fee)},
 };
 
@@ -71,56 +67,40 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
   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\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"
+void AddDescriptors_fee_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[1] =
+  {
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 252);
-  ::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
+// 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) {
@@ -140,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) {
@@ -169,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;
@@ -177,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: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());
@@ -199,6 +193,8 @@ Fee::Fee(const Fee& from)
 }
 
 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_) -
@@ -217,13 +213,8 @@ 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();
 }
 
@@ -238,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_));
@@ -247,9 +238,92 @@ 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:legacy_pb.Fee)
   for (;;) {
@@ -259,9 +333,8 @@ bool Fee::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // 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)));
@@ -269,7 +342,7 @@ bool Fee::MergePartialFromCodedStream(
             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;
@@ -279,9 +352,8 @@ bool Fee::MergePartialFromCodedStream(
 
       // 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)));
@@ -289,7 +361,7 @@ bool Fee::MergePartialFromCodedStream(
             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;
@@ -299,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 {
@@ -311,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_)));
@@ -342,6 +412,7 @@ failure:
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Fee::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -381,8 +452,7 @@ void Fee::SerializeWithCachedSizes(
 }
 
 ::google::protobuf::uint8* Fee::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
+    ::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;
@@ -479,6 +549,10 @@ 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;
@@ -488,9 +562,9 @@ void Fee::MergeFrom(const ::google::protobuf::Message& from) {
 // @@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) {
+  if (source == nullptr) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Fee)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -507,9 +581,9 @@ void Fee::MergeFrom(const Fee& from) {
   (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) {
@@ -550,18 +624,18 @@ 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];
 }
 
 
@@ -569,10 +643,11 @@ void Fee::InternalSwap(Fee* other) {
 }  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Fee* Arena::CreateMaybeMessage< ::legacy_pb::Fee >(Arena* 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 < 3006001
+#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 3006001 < 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,20 +33,22 @@
 #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
+void AddDescriptors_fee_2eproto();
 namespace legacy_pb {
 class Fee;
 class FeeDefaultTypeInternal;
@@ -100,7 +103,8 @@ inline bool Fee_Currency_Parse(
 }
 // ===================================================================
 
-class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_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:
 
@@ -288,14 +299,7 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
 
   // @@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;
 };
 // ===================================================================
 
@@ -324,15 +328,9 @@ class Fee : public ::google::protobuf::Message /* @@protoc_insertion_point(class
 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 ::legacy_pb::Fee_Version Fee::version() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Fee.version)
@@ -340,7 +338,7 @@ inline ::legacy_pb::Fee_Version Fee::version() const {
 }
 inline void Fee::set_version(::legacy_pb::Fee_Version value) {
   assert(::legacy_pb::Fee_Version_IsValid(value));
-  set_has_version();
+  _has_bits_[0] |= 0x00000002u;
   version_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Fee.version)
 }
@@ -349,15 +347,9 @@ inline void Fee::set_version(::legacy_pb::Fee_Version value) {
 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 ::legacy_pb::Fee_Currency Fee::currency() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Fee.currency)
@@ -365,7 +357,7 @@ inline ::legacy_pb::Fee_Currency Fee::currency() const {
 }
 inline void Fee::set_currency(::legacy_pb::Fee_Currency value) {
   assert(::legacy_pb::Fee_Currency_IsValid(value));
-  set_has_currency();
+  _has_bits_[0] |= 0x00000004u;
   currency_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Fee.currency)
 }
@@ -374,63 +366,57 @@ inline void Fee::set_currency(::legacy_pb::Fee_Currency value) {
 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: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: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: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: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:legacy_pb.Fee.address)
 }
 inline ::std::string* Fee::mutable_address() {
-  set_has_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: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:legacy_pb.Fee.address)
@@ -440,22 +426,16 @@ inline void Fee::set_allocated_address(::std::string* address) {
 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: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:legacy_pb.Fee.amount)
 }
@@ -487,4 +467,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::legacy_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

@@ -6,37 +6,26 @@
 #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 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
+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;
+  ::google::protobuf::internal::ExplicitlyConstructed<Claim> _instance;
 } _Claim_default_instance_;
 }  // namespace legacy_pb
-namespace protobuf_legacy_5fclaim_2eproto {
-static void InitDefaultsClaim() {
+static void InitDefaultsClaim_legacy_5fclaim_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -47,37 +36,38 @@ static void InitDefaultsClaim() {
   ::legacy_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,}};
+::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() {
-  ::google::protobuf::internal::InitSCC(&scc_info_Claim.base);
+void InitDefaults_legacy_5fclaim_2eproto() {
+  ::google::protobuf::internal::InitSCC(&scc_info_Claim_legacy_5fclaim_2eproto.base);
 }
 
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
+::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::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, _internal_metadata_),
+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_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, claimtype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, stream_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, certificate_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Claim, publishersignature_),
+  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[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
   { 0, 10, sizeof(::legacy_pb::Claim)},
 };
 
@@ -85,63 +75,47 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
   reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Claim_default_instance_),
 };
 
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  AssignDescriptors(
-      "legacy_claim.proto", schemas, file_default_instances, TableStruct::offsets,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
+::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,
+};
 
-void protobuf_AssignDescriptorsOnce() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors);
-}
+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 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\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"
+void AddDescriptors_legacy_5fclaim_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[3] =
+  {
+    ::AddDescriptors_stream_2eproto,
+    ::AddDescriptors_certificate_2eproto,
+    ::AddDescriptors_signature_2eproto,
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 429);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "legacy_claim.proto", &protobuf_RegisterTypes);
-  ::protobuf_stream_2eproto::AddDescriptors();
-  ::protobuf_certificate_2eproto::AddDescriptors();
-  ::protobuf_signature_2eproto::AddDescriptors();
+ ::google::protobuf::internal::AddDescriptors(&descriptor_table_legacy_5fclaim_2eproto, deps, 3);
 }
 
-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_legacy_5fclaim_2eproto
+// 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() {
-  protobuf_legacy_5fclaim_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_legacy_5fclaim_2eproto::file_level_enum_descriptors[0];
+  ::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) {
@@ -161,8 +135,8 @@ 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_legacy_5fclaim_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_legacy_5fclaim_2eproto::file_level_enum_descriptors[1];
+  ::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) {
@@ -194,17 +168,51 @@ void Claim::InitAsDefaultInstance() {
   ::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_ != NULL) stream_->Clear();
-  clear_has_stream();
+  if (stream_ != nullptr) stream_->Clear();
+  _has_bits_[0] &= ~0x00000001u;
 }
 void Claim::clear_certificate() {
-  if (certificate_ != NULL) certificate_->Clear();
-  clear_has_certificate();
+  if (certificate_ != nullptr) certificate_->Clear();
+  _has_bits_[0] &= ~0x00000002u;
 }
 void Claim::clear_publishersignature() {
-  if (publishersignature_ != NULL) publishersignature_->Clear();
-  clear_has_publishersignature();
+  if (publishersignature_ != nullptr) publishersignature_->Clear();
+  _has_bits_[0] &= ~0x00000004u;
 }
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Claim::kVersionFieldNumber;
@@ -215,31 +223,29 @@ const int Claim::kPublisherSignatureFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Claim::Claim()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  ::google::protobuf::internal::InitSCC(
-      &protobuf_legacy_5fclaim_2eproto::scc_info_Claim.base);
+  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
   SharedCtor();
   // @@protoc_insertion_point(constructor:legacy_pb.Claim)
 }
 Claim::Claim(const Claim& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
+      _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_ = NULL;
+    stream_ = nullptr;
   }
   if (from.has_certificate()) {
     certificate_ = new ::legacy_pb::Certificate(*from.certificate_);
   } else {
-    certificate_ = NULL;
+    certificate_ = nullptr;
   }
   if (from.has_publishersignature()) {
     publishersignature_ = new ::legacy_pb::Signature(*from.publishersignature_);
   } else {
-    publishersignature_ = NULL;
+    publishersignature_ = nullptr;
   }
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&claimtype_) -
@@ -248,6 +254,8 @@ Claim::Claim(const Claim& from)
 }
 
 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_));
@@ -267,13 +275,8 @@ void Claim::SharedDtor() {
 void Claim::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
-const ::google::protobuf::Descriptor* Claim::descriptor() {
-  ::protobuf_legacy_5fclaim_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_legacy_5fclaim_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
 const Claim& Claim::default_instance() {
-  ::google::protobuf::internal::InitSCC(&protobuf_legacy_5fclaim_2eproto::scc_info_Claim.base);
+  ::google::protobuf::internal::InitSCC(&::scc_info_Claim_legacy_5fclaim_2eproto.base);
   return *internal_default_instance();
 }
 
@@ -285,21 +288,21 @@ void Claim::Clear() {
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  if (cached_has_bits & 7u) {
+  if (cached_has_bits & 0x00000007u) {
     if (cached_has_bits & 0x00000001u) {
-      GOOGLE_DCHECK(stream_ != NULL);
+      GOOGLE_DCHECK(stream_ != nullptr);
       stream_->Clear();
     }
     if (cached_has_bits & 0x00000002u) {
-      GOOGLE_DCHECK(certificate_ != NULL);
+      GOOGLE_DCHECK(certificate_ != nullptr);
       certificate_->Clear();
     }
     if (cached_has_bits & 0x00000004u) {
-      GOOGLE_DCHECK(publishersignature_ != NULL);
+      GOOGLE_DCHECK(publishersignature_ != nullptr);
       publishersignature_->Clear();
     }
   }
-  if (cached_has_bits & 24u) {
+  if (cached_has_bits & 0x00000018u) {
     ::memset(&version_, 0, static_cast<size_t>(
         reinterpret_cast<char*>(&claimtype_) -
         reinterpret_cast<char*>(&version_)) + sizeof(claimtype_));
@@ -308,9 +311,105 @@ void Claim::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 (!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:legacy_pb.Claim)
   for (;;) {
@@ -320,9 +419,8 @@ bool Claim::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // required .legacy_pb.Claim.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)));
@@ -330,7 +428,7 @@ bool Claim::MergePartialFromCodedStream(
             set_version(static_cast< ::legacy_pb::Claim_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;
@@ -340,9 +438,8 @@ bool Claim::MergePartialFromCodedStream(
 
       // required .legacy_pb.Claim.ClaimType claimType = 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)));
@@ -350,7 +447,7 @@ bool Claim::MergePartialFromCodedStream(
             set_claimtype(static_cast< ::legacy_pb::Claim_ClaimType >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
-                2, static_cast< ::google::protobuf::uint64>(value));
+                2, static_cast<::google::protobuf::uint64>(value));
           }
         } else {
           goto handle_unusual;
@@ -360,8 +457,7 @@ bool Claim::MergePartialFromCodedStream(
 
       // optional .legacy_pb.Stream stream = 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::ReadMessage(
                input, mutable_stream()));
         } else {
@@ -372,8 +468,7 @@ bool Claim::MergePartialFromCodedStream(
 
       // optional .legacy_pb.Certificate certificate = 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::ReadMessage(
                input, mutable_certificate()));
         } else {
@@ -384,8 +479,7 @@ bool Claim::MergePartialFromCodedStream(
 
       // optional .legacy_pb.Signature publisherSignature = 5;
       case 5: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
                input, mutable_publishersignature()));
         } else {
@@ -413,6 +507,7 @@ failure:
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Claim::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -436,19 +531,19 @@ void Claim::SerializeWithCachedSizes(
   // optional .legacy_pb.Stream stream = 3;
   if (cached_has_bits & 0x00000001u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->_internal_stream(), output);
+      3, HasBitSetters::stream(this), output);
   }
 
   // optional .legacy_pb.Certificate certificate = 4;
   if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      4, this->_internal_certificate(), output);
+      4, HasBitSetters::certificate(this), output);
   }
 
   // optional .legacy_pb.Signature publisherSignature = 5;
   if (cached_has_bits & 0x00000004u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      5, this->_internal_publishersignature(), output);
+      5, HasBitSetters::publishersignature(this), output);
   }
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -459,8 +554,7 @@ void Claim::SerializeWithCachedSizes(
 }
 
 ::google::protobuf::uint8* Claim::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
+    ::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;
@@ -482,21 +576,21 @@ void Claim::SerializeWithCachedSizes(
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        3, this->_internal_stream(), deterministic, target);
+        3, HasBitSetters::stream(this), target);
   }
 
   // optional .legacy_pb.Certificate certificate = 4;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        4, this->_internal_certificate(), deterministic, target);
+        4, HasBitSetters::certificate(this), target);
   }
 
   // optional .legacy_pb.Signature publisherSignature = 5;
   if (cached_has_bits & 0x00000004u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        5, this->_internal_publishersignature(), deterministic, target);
+        5, HasBitSetters::publishersignature(this), target);
   }
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -546,23 +640,28 @@ size_t Claim::ByteSizeLong() const {
   } else {
     total_size += RequiredFieldsByteSizeFallback();
   }
-  if (_has_bits_[0 / 32] & 7u) {
+  ::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 (has_stream()) {
+    if (cached_has_bits & 0x00000001u) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSize(
           *stream_);
     }
 
     // optional .legacy_pb.Certificate certificate = 4;
-    if (has_certificate()) {
+    if (cached_has_bits & 0x00000002u) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSize(
           *certificate_);
     }
 
     // optional .legacy_pb.Signature publisherSignature = 5;
-    if (has_publishersignature()) {
+    if (cached_has_bits & 0x00000004u) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSize(
           *publishersignature_);
@@ -578,9 +677,9 @@ 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::internal::DynamicCastToGenerated<const Claim>(
+      ::google::protobuf::DynamicCastToGenerated<Claim>(
           &from);
-  if (source == NULL) {
+  if (source == nullptr) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Claim)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -597,7 +696,7 @@ void Claim::MergeFrom(const Claim& from) {
   (void) cached_has_bits;
 
   cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 31u) {
+  if (cached_has_bits & 0x0000001fu) {
     if (cached_has_bits & 0x00000001u) {
       mutable_stream()->::legacy_pb::Stream::MergeFrom(from.stream());
     }
@@ -651,18 +750,18 @@ void Claim::Swap(Claim* 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_);
-  swap(_has_bits_[0], other->_has_bits_[0]);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Claim::GetMetadata() const {
-  protobuf_legacy_5fclaim_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_legacy_5fclaim_2eproto::file_level_metadata[kIndexInFileMessages];
+  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_legacy_5fclaim_2eproto);
+  return ::file_level_metadata_legacy_5fclaim_2eproto[kIndexInFileMessages];
 }
 
 
@@ -670,10 +769,11 @@ void Claim::InternalSwap(Claim* other) {
 }  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Claim* Arena::CreateMaybeMessage< ::legacy_pb::Claim >(Arena* arena) {
+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

@@ -4,21 +4,22 @@
 #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 < 3006001
+#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 3006001 < 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,20 +36,22 @@
 #include "certificate.pb.h"
 #include "signature.pb.h"
 // @@protoc_insertion_point(includes)
-#define PROTOBUF_INTERNAL_EXPORT_protobuf_legacy_5fclaim_2eproto 
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_legacy_5fclaim_2eproto
 
-namespace protobuf_legacy_5fclaim_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_legacy_5fclaim_2eproto
+void AddDescriptors_legacy_5fclaim_2eproto();
 namespace legacy_pb {
 class Claim;
 class ClaimDefaultTypeInternal;
@@ -102,7 +105,8 @@ inline bool Claim_ClaimType_Parse(
 }
 // ===================================================================
 
-class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_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:
 
@@ -254,9 +265,6 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
   bool has_stream() const;
   void clear_stream();
   static const int kStreamFieldNumber = 3;
-  private:
-  const ::legacy_pb::Stream& _internal_stream() const;
-  public:
   const ::legacy_pb::Stream& stream() const;
   ::legacy_pb::Stream* release_stream();
   ::legacy_pb::Stream* mutable_stream();
@@ -266,9 +274,6 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
   bool has_certificate() const;
   void clear_certificate();
   static const int kCertificateFieldNumber = 4;
-  private:
-  const ::legacy_pb::Certificate& _internal_certificate() const;
-  public:
   const ::legacy_pb::Certificate& certificate() const;
   ::legacy_pb::Certificate* release_certificate();
   ::legacy_pb::Certificate* mutable_certificate();
@@ -278,9 +283,6 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
   bool has_publishersignature() const;
   void clear_publishersignature();
   static const int kPublisherSignatureFieldNumber = 5;
-  private:
-  const ::legacy_pb::Signature& _internal_publishersignature() const;
-  public:
   const ::legacy_pb::Signature& publishersignature() const;
   ::legacy_pb::Signature* release_publishersignature();
   ::legacy_pb::Signature* mutable_publishersignature();
@@ -302,16 +304,7 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
 
   // @@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;
@@ -324,7 +317,7 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
   ::legacy_pb::Signature* publishersignature_;
   int version_;
   int claimtype_;
-  friend struct ::protobuf_legacy_5fclaim_2eproto::TableStruct;
+  friend struct ::TableStruct_legacy_5fclaim_2eproto;
 };
 // ===================================================================
 
@@ -341,15 +334,9 @@ class Claim : public ::google::protobuf::Message /* @@protoc_insertion_point(cla
 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 ::legacy_pb::Claim_Version Claim::version() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Claim.version)
@@ -357,7 +344,7 @@ inline ::legacy_pb::Claim_Version Claim::version() const {
 }
 inline void Claim::set_version(::legacy_pb::Claim_Version value) {
   assert(::legacy_pb::Claim_Version_IsValid(value));
-  set_has_version();
+  _has_bits_[0] |= 0x00000008u;
   version_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Claim.version)
 }
@@ -366,15 +353,9 @@ inline void Claim::set_version(::legacy_pb::Claim_Version value) {
 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 ::legacy_pb::Claim_ClaimType Claim::claimtype() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Claim.claimType)
@@ -382,7 +363,7 @@ inline ::legacy_pb::Claim_ClaimType Claim::claimtype() const {
 }
 inline void Claim::set_claimtype(::legacy_pb::Claim_ClaimType value) {
   assert(::legacy_pb::Claim_ClaimType_IsValid(value));
-  set_has_claimtype();
+  _has_bits_[0] |= 0x00000010u;
   claimtype_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Claim.claimType)
 }
@@ -391,31 +372,22 @@ inline void Claim::set_claimtype(::legacy_pb::Claim_ClaimType value) {
 inline bool Claim::has_stream() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Claim::set_has_stream() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Claim::clear_has_stream() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline const ::legacy_pb::Stream& Claim::_internal_stream() const {
-  return *stream_;
-}
 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 != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Stream*>(
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Stream*>(
       &::legacy_pb::_Stream_default_instance_);
 }
 inline ::legacy_pb::Stream* Claim::release_stream() {
   // @@protoc_insertion_point(field_release:legacy_pb.Claim.stream)
-  clear_has_stream();
+  _has_bits_[0] &= ~0x00000001u;
   ::legacy_pb::Stream* temp = stream_;
-  stream_ = NULL;
+  stream_ = nullptr;
   return temp;
 }
 inline ::legacy_pb::Stream* Claim::mutable_stream() {
-  set_has_stream();
-  if (stream_ == NULL) {
+  _has_bits_[0] |= 0x00000001u;
+  if (stream_ == nullptr) {
     auto* p = CreateMaybeMessage<::legacy_pb::Stream>(GetArenaNoVirtual());
     stream_ = p;
   }
@@ -424,18 +396,18 @@ inline ::legacy_pb::Stream* Claim::mutable_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:legacy_pb.Claim.stream)
@@ -445,31 +417,22 @@ inline void Claim::set_allocated_stream(::legacy_pb::Stream* stream) {
 inline bool Claim::has_certificate() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Claim::set_has_certificate() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void Claim::clear_has_certificate() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline const ::legacy_pb::Certificate& Claim::_internal_certificate() const {
-  return *certificate_;
-}
 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 != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Certificate*>(
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Certificate*>(
       &::legacy_pb::_Certificate_default_instance_);
 }
 inline ::legacy_pb::Certificate* Claim::release_certificate() {
   // @@protoc_insertion_point(field_release:legacy_pb.Claim.certificate)
-  clear_has_certificate();
+  _has_bits_[0] &= ~0x00000002u;
   ::legacy_pb::Certificate* temp = certificate_;
-  certificate_ = NULL;
+  certificate_ = nullptr;
   return temp;
 }
 inline ::legacy_pb::Certificate* Claim::mutable_certificate() {
-  set_has_certificate();
-  if (certificate_ == NULL) {
+  _has_bits_[0] |= 0x00000002u;
+  if (certificate_ == nullptr) {
     auto* p = CreateMaybeMessage<::legacy_pb::Certificate>(GetArenaNoVirtual());
     certificate_ = p;
   }
@@ -478,18 +441,18 @@ inline ::legacy_pb::Certificate* Claim::mutable_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:legacy_pb.Claim.certificate)
@@ -499,31 +462,22 @@ inline void Claim::set_allocated_certificate(::legacy_pb::Certificate* certifica
 inline bool Claim::has_publishersignature() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Claim::set_has_publishersignature() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void Claim::clear_has_publishersignature() {
-  _has_bits_[0] &= ~0x00000004u;
-}
-inline const ::legacy_pb::Signature& Claim::_internal_publishersignature() const {
-  return *publishersignature_;
-}
 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 != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Signature*>(
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Signature*>(
       &::legacy_pb::_Signature_default_instance_);
 }
 inline ::legacy_pb::Signature* Claim::release_publishersignature() {
   // @@protoc_insertion_point(field_release:legacy_pb.Claim.publisherSignature)
-  clear_has_publishersignature();
+  _has_bits_[0] &= ~0x00000004u;
   ::legacy_pb::Signature* temp = publishersignature_;
-  publishersignature_ = NULL;
+  publishersignature_ = nullptr;
   return temp;
 }
 inline ::legacy_pb::Signature* Claim::mutable_publishersignature() {
-  set_has_publishersignature();
-  if (publishersignature_ == NULL) {
+  _has_bits_[0] |= 0x00000004u;
+  if (publishersignature_ == nullptr) {
     auto* p = CreateMaybeMessage<::legacy_pb::Signature>(GetArenaNoVirtual());
     publishersignature_ = p;
   }
@@ -532,18 +486,18 @@ inline ::legacy_pb::Signature* Claim::mutable_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:legacy_pb.Claim.publisherSignature)
@@ -576,4 +530,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Claim_ClaimType>()
 
 // @@protoc_insertion_point(global_scope)
 
+#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_legacy_5fclaim_2eproto

v1/cpp/metadata.pb.cc

@@ -6,31 +6,24 @@
 #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 protobuf_fee_2eproto {
-extern PROTOBUF_INTERNAL_EXPORT_protobuf_fee_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Fee;
-}  // namespace protobuf_fee_2eproto
+extern PROTOBUF_INTERNAL_EXPORT_fee_2eproto ::google::protobuf::internal::SCCInfo<0> scc_info_Fee_fee_2eproto;
 namespace legacy_pb {
 class MetadataDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Metadata>
-      _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Metadata> _instance;
 } _Metadata_default_instance_;
 }  // namespace legacy_pb
-namespace protobuf_metadata_2eproto {
-static void InitDefaultsMetadata() {
+static void InitDefaultsMetadata_metadata_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -41,34 +34,35 @@ static void InitDefaultsMetadata() {
   ::legacy_pb::Metadata::InitAsDefaultInstance();
 }
 
-::google::protobuf::internal::SCCInfo<1> scc_info_Metadata =
-    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsMetadata}, {
-      &protobuf_fee_2eproto::scc_info_Fee.base,}};
+::google::protobuf::internal::SCCInfo<1> scc_info_Metadata_metadata_2eproto =
+    {{ATOMIC_VAR_INIT(::google::protobuf::internal::SCCInfoBase::kUninitialized), 1, InitDefaultsMetadata_metadata_2eproto}, {
+      &scc_info_Fee_fee_2eproto.base,}};
 
-void InitDefaults() {
-  ::google::protobuf::internal::InitSCC(&scc_info_Metadata.base);
+void InitDefaults_metadata_2eproto() {
+  ::google::protobuf::internal::InitSCC(&scc_info_Metadata_metadata_2eproto.base);
 }
 
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[2];
+::google::protobuf::Metadata file_level_metadata_metadata_2eproto[1];
+const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors_metadata_2eproto[2];
+constexpr ::google::protobuf::ServiceDescriptor const** file_level_service_descriptors_metadata_2eproto = nullptr;
 
-const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, _internal_metadata_),
+const ::google::protobuf::uint32 TableStruct_metadata_2eproto::offsets[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, _has_bits_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, _internal_metadata_),
   ~0u,  // no _extensions_
   ~0u,  // no _oneof_case_
   ~0u,  // no _weak_field_map_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, language_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, title_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, description_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, author_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, license_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, nsfw_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, fee_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, thumbnail_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, preview_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Metadata, licenseurl_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, version_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, language_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, title_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, description_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, author_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, license_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, nsfw_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, fee_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, thumbnail_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, preview_),
+  PROTOBUF_FIELD_OFFSET(::legacy_pb::Metadata, licenseurl_),
   8,
   9,
   0,
@@ -81,7 +75,7 @@ const ::google::protobuf::uint32 TableStruct::offsets[] GOOGLE_PROTOBUF_ATTRIBUT
   5,
   6,
 };
-static const ::google::protobuf::internal::MigrationSchema schemas[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
   { 0, 16, sizeof(::legacy_pb::Metadata)},
 };
 
@@ -89,99 +83,83 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
   reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_pb::_Metadata_default_instance_),
 };
 
-void protobuf_AssignDescriptors() {
-  AddDescriptors();
-  AssignDescriptors(
-      "metadata.proto", schemas, file_default_instances, TableStruct::offsets,
-      file_level_metadata, file_level_enum_descriptors, NULL);
-}
+::google::protobuf::internal::AssignDescriptorsTable assign_descriptors_table_metadata_2eproto = {
+  {}, AddDescriptors_metadata_2eproto, "metadata.proto", schemas,
+  file_default_instances, TableStruct_metadata_2eproto::offsets,
+  file_level_metadata_metadata_2eproto, 1, file_level_enum_descriptors_metadata_2eproto, file_level_service_descriptors_metadata_2eproto,
+};
 
-void protobuf_AssignDescriptorsOnce() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors);
-}
+const char descriptor_table_protodef_metadata_2eproto[] =
+  "\n\016metadata.proto\022\tlegacy_pb\032\tfee.proto\"\374"
+  "\016\n\010Metadata\022,\n\007version\030\001 \002(\0162\033.legacy_pb"
+  ".Metadata.Version\022.\n\010language\030\002 \002(\0162\034.le"
+  "gacy_pb.Metadata.Language\022\r\n\005title\030\003 \002(\t"
+  "\022\023\n\013description\030\004 \002(\t\022\016\n\006author\030\005 \002(\t\022\017\n"
+  "\007license\030\006 \002(\t\022\014\n\004nsfw\030\007 \002(\010\022\033\n\003fee\030\010 \001("
+  "\0132\016.legacy_pb.Fee\022\021\n\tthumbnail\030\t \001(\t\022\017\n\007"
+  "preview\030\n \001(\t\022\022\n\nlicenseUrl\030\013 \001(\t\"N\n\007Ver"
+  "sion\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\022\n\n"
+  "\006_0_0_2\020\002\022\n\n\006_0_0_3\020\003\022\n\n\006_0_1_0\020\004\"\231\014\n\010La"
+  "nguage\022\024\n\020UNKNOWN_LANGUAGE\020\000\022\006\n\002en\020\001\022\006\n\002"
+  "aa\020\002\022\006\n\002ab\020\003\022\006\n\002ae\020\004\022\006\n\002af\020\005\022\006\n\002ak\020\006\022\006\n\002"
+  "am\020\007\022\006\n\002an\020\010\022\006\n\002ar\020\t\022\006\n\002as\020\n\022\006\n\002av\020\013\022\006\n\002"
+  "ay\020\014\022\006\n\002az\020\r\022\006\n\002ba\020\016\022\006\n\002be\020\017\022\006\n\002bg\020\020\022\006\n\002"
+  "bh\020\021\022\006\n\002bi\020\022\022\006\n\002bm\020\023\022\006\n\002bn\020\024\022\006\n\002bo\020\025\022\006\n\002"
+  "br\020\026\022\006\n\002bs\020\027\022\006\n\002ca\020\030\022\006\n\002ce\020\031\022\006\n\002ch\020\032\022\006\n\002"
+  "co\020\033\022\006\n\002cr\020\034\022\006\n\002cs\020\035\022\006\n\002cu\020\036\022\006\n\002cv\020\037\022\006\n\002"
+  "cy\020 \022\006\n\002da\020!\022\006\n\002de\020\"\022\006\n\002dv\020#\022\006\n\002dz\020$\022\006\n\002"
+  "ee\020%\022\006\n\002el\020&\022\006\n\002eo\020\'\022\006\n\002es\020(\022\006\n\002et\020)\022\006\n\002"
+  "eu\020*\022\006\n\002fa\020+\022\006\n\002ff\020,\022\006\n\002fi\020-\022\006\n\002fj\020.\022\006\n\002"
+  "fo\020/\022\006\n\002fr\0200\022\006\n\002fy\0201\022\006\n\002ga\0202\022\006\n\002gd\0203\022\006\n\002"
+  "gl\0204\022\006\n\002gn\0205\022\006\n\002gu\0206\022\006\n\002gv\0207\022\006\n\002ha\0208\022\006\n\002"
+  "he\0209\022\006\n\002hi\020:\022\006\n\002ho\020;\022\006\n\002hr\020<\022\006\n\002ht\020=\022\006\n\002"
+  "hu\020>\022\006\n\002hy\020\?\022\006\n\002hz\020@\022\006\n\002ia\020A\022\006\n\002id\020B\022\006\n\002"
+  "ie\020C\022\006\n\002ig\020D\022\006\n\002ii\020E\022\006\n\002ik\020F\022\006\n\002io\020G\022\006\n\002"
+  "is\020H\022\006\n\002it\020I\022\006\n\002iu\020J\022\006\n\002ja\020K\022\006\n\002jv\020L\022\006\n\002"
+  "ka\020M\022\006\n\002kg\020N\022\006\n\002ki\020O\022\006\n\002kj\020P\022\006\n\002kk\020Q\022\006\n\002"
+  "kl\020R\022\006\n\002km\020S\022\006\n\002kn\020T\022\006\n\002ko\020U\022\006\n\002kr\020V\022\006\n\002"
+  "ks\020W\022\006\n\002ku\020X\022\006\n\002kv\020Y\022\006\n\002kw\020Z\022\006\n\002ky\020[\022\006\n\002"
+  "la\020\\\022\006\n\002lb\020]\022\006\n\002lg\020^\022\006\n\002li\020_\022\006\n\002ln\020`\022\006\n\002"
+  "lo\020a\022\006\n\002lt\020b\022\006\n\002lu\020c\022\006\n\002lv\020d\022\006\n\002mg\020e\022\006\n\002"
+  "mh\020f\022\006\n\002mi\020g\022\006\n\002mk\020h\022\006\n\002ml\020i\022\006\n\002mn\020j\022\006\n\002"
+  "mr\020k\022\006\n\002ms\020l\022\006\n\002mt\020m\022\006\n\002my\020n\022\006\n\002na\020o\022\006\n\002"
+  "nb\020p\022\006\n\002nd\020q\022\006\n\002ne\020r\022\006\n\002ng\020s\022\006\n\002nl\020t\022\006\n\002"
+  "nn\020u\022\006\n\002no\020v\022\006\n\002nr\020w\022\006\n\002nv\020x\022\006\n\002ny\020y\022\006\n\002"
+  "oc\020z\022\006\n\002oj\020{\022\006\n\002om\020|\022\006\n\002or\020}\022\006\n\002os\020~\022\006\n\002"
+  "pa\020\177\022\007\n\002pi\020\200\001\022\007\n\002pl\020\201\001\022\007\n\002ps\020\202\001\022\007\n\002pt\020\203\001"
+  "\022\007\n\002qu\020\204\001\022\007\n\002rm\020\205\001\022\007\n\002rn\020\206\001\022\007\n\002ro\020\207\001\022\007\n\002"
+  "ru\020\210\001\022\007\n\002rw\020\211\001\022\007\n\002sa\020\212\001\022\007\n\002sc\020\213\001\022\007\n\002sd\020\214"
+  "\001\022\007\n\002se\020\215\001\022\007\n\002sg\020\216\001\022\007\n\002si\020\217\001\022\007\n\002sk\020\220\001\022\007\n"
+  "\002sl\020\221\001\022\007\n\002sm\020\222\001\022\007\n\002sn\020\223\001\022\007\n\002so\020\224\001\022\007\n\002sq\020"
+  "\225\001\022\007\n\002sr\020\226\001\022\007\n\002ss\020\227\001\022\007\n\002st\020\230\001\022\007\n\002su\020\231\001\022\007"
+  "\n\002sv\020\232\001\022\007\n\002sw\020\233\001\022\007\n\002ta\020\234\001\022\007\n\002te\020\235\001\022\007\n\002tg"
+  "\020\236\001\022\007\n\002th\020\237\001\022\007\n\002ti\020\240\001\022\007\n\002tk\020\241\001\022\007\n\002tl\020\242\001\022"
+  "\007\n\002tn\020\243\001\022\007\n\002to\020\244\001\022\007\n\002tr\020\245\001\022\007\n\002ts\020\246\001\022\007\n\002t"
+  "t\020\247\001\022\007\n\002tw\020\250\001\022\007\n\002ty\020\251\001\022\007\n\002ug\020\252\001\022\007\n\002uk\020\253\001"
+  "\022\007\n\002ur\020\254\001\022\007\n\002uz\020\255\001\022\007\n\002ve\020\256\001\022\007\n\002vi\020\257\001\022\007\n\002"
+  "vo\020\260\001\022\007\n\002wa\020\261\001\022\007\n\002wo\020\262\001\022\007\n\002xh\020\263\001\022\007\n\002yi\020\264"
+  "\001\022\007\n\002yo\020\265\001\022\007\n\002za\020\266\001\022\007\n\002zh\020\267\001\022\007\n\002zu\020\270\001"
+  ;
+::google::protobuf::internal::DescriptorTable descriptor_table_metadata_2eproto = {
+  false, InitDefaults_metadata_2eproto, 
+  descriptor_table_protodef_metadata_2eproto,
+  "metadata.proto", &assign_descriptors_table_metadata_2eproto, 1957,
+};
 
-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\016metadata.proto\022\tlegacy_pb\032\tfee.proto\"\374"
-      "\016\n\010Metadata\022,\n\007version\030\001 \002(\0162\033.legacy_pb"
-      ".Metadata.Version\022.\n\010language\030\002 \002(\0162\034.le"
-      "gacy_pb.Metadata.Language\022\r\n\005title\030\003 \002(\t"
-      "\022\023\n\013description\030\004 \002(\t\022\016\n\006author\030\005 \002(\t\022\017\n"
-      "\007license\030\006 \002(\t\022\014\n\004nsfw\030\007 \002(\010\022\033\n\003fee\030\010 \001("
-      "\0132\016.legacy_pb.Fee\022\021\n\tthumbnail\030\t \001(\t\022\017\n\007"
-      "preview\030\n \001(\t\022\022\n\nlicenseUrl\030\013 \001(\t\"N\n\007Ver"
-      "sion\022\023\n\017UNKNOWN_VERSION\020\000\022\n\n\006_0_0_1\020\001\022\n\n"
-      "\006_0_0_2\020\002\022\n\n\006_0_0_3\020\003\022\n\n\006_0_1_0\020\004\"\231\014\n\010La"
-      "nguage\022\024\n\020UNKNOWN_LANGUAGE\020\000\022\006\n\002en\020\001\022\006\n\002"
-      "aa\020\002\022\006\n\002ab\020\003\022\006\n\002ae\020\004\022\006\n\002af\020\005\022\006\n\002ak\020\006\022\006\n\002"
-      "am\020\007\022\006\n\002an\020\010\022\006\n\002ar\020\t\022\006\n\002as\020\n\022\006\n\002av\020\013\022\006\n\002"
-      "ay\020\014\022\006\n\002az\020\r\022\006\n\002ba\020\016\022\006\n\002be\020\017\022\006\n\002bg\020\020\022\006\n\002"
-      "bh\020\021\022\006\n\002bi\020\022\022\006\n\002bm\020\023\022\006\n\002bn\020\024\022\006\n\002bo\020\025\022\006\n\002"
-      "br\020\026\022\006\n\002bs\020\027\022\006\n\002ca\020\030\022\006\n\002ce\020\031\022\006\n\002ch\020\032\022\006\n\002"
-      "co\020\033\022\006\n\002cr\020\034\022\006\n\002cs\020\035\022\006\n\002cu\020\036\022\006\n\002cv\020\037\022\006\n\002"
-      "cy\020 \022\006\n\002da\020!\022\006\n\002de\020\"\022\006\n\002dv\020#\022\006\n\002dz\020$\022\006\n\002"
-      "ee\020%\022\006\n\002el\020&\022\006\n\002eo\020\'\022\006\n\002es\020(\022\006\n\002et\020)\022\006\n\002"
-      "eu\020*\022\006\n\002fa\020+\022\006\n\002ff\020,\022\006\n\002fi\020-\022\006\n\002fj\020.\022\006\n\002"
-      "fo\020/\022\006\n\002fr\0200\022\006\n\002fy\0201\022\006\n\002ga\0202\022\006\n\002gd\0203\022\006\n\002"
-      "gl\0204\022\006\n\002gn\0205\022\006\n\002gu\0206\022\006\n\002gv\0207\022\006\n\002ha\0208\022\006\n\002"
-      "he\0209\022\006\n\002hi\020:\022\006\n\002ho\020;\022\006\n\002hr\020<\022\006\n\002ht\020=\022\006\n\002"
-      "hu\020>\022\006\n\002hy\020\?\022\006\n\002hz\020@\022\006\n\002ia\020A\022\006\n\002id\020B\022\006\n\002"
-      "ie\020C\022\006\n\002ig\020D\022\006\n\002ii\020E\022\006\n\002ik\020F\022\006\n\002io\020G\022\006\n\002"
-      "is\020H\022\006\n\002it\020I\022\006\n\002iu\020J\022\006\n\002ja\020K\022\006\n\002jv\020L\022\006\n\002"
-      "ka\020M\022\006\n\002kg\020N\022\006\n\002ki\020O\022\006\n\002kj\020P\022\006\n\002kk\020Q\022\006\n\002"
-      "kl\020R\022\006\n\002km\020S\022\006\n\002kn\020T\022\006\n\002ko\020U\022\006\n\002kr\020V\022\006\n\002"
-      "ks\020W\022\006\n\002ku\020X\022\006\n\002kv\020Y\022\006\n\002kw\020Z\022\006\n\002ky\020[\022\006\n\002"
-      "la\020\\\022\006\n\002lb\020]\022\006\n\002lg\020^\022\006\n\002li\020_\022\006\n\002ln\020`\022\006\n\002"
-      "lo\020a\022\006\n\002lt\020b\022\006\n\002lu\020c\022\006\n\002lv\020d\022\006\n\002mg\020e\022\006\n\002"
-      "mh\020f\022\006\n\002mi\020g\022\006\n\002mk\020h\022\006\n\002ml\020i\022\006\n\002mn\020j\022\006\n\002"
-      "mr\020k\022\006\n\002ms\020l\022\006\n\002mt\020m\022\006\n\002my\020n\022\006\n\002na\020o\022\006\n\002"
-      "nb\020p\022\006\n\002nd\020q\022\006\n\002ne\020r\022\006\n\002ng\020s\022\006\n\002nl\020t\022\006\n\002"
-      "nn\020u\022\006\n\002no\020v\022\006\n\002nr\020w\022\006\n\002nv\020x\022\006\n\002ny\020y\022\006\n\002"
-      "oc\020z\022\006\n\002oj\020{\022\006\n\002om\020|\022\006\n\002or\020}\022\006\n\002os\020~\022\006\n\002"
-      "pa\020\177\022\007\n\002pi\020\200\001\022\007\n\002pl\020\201\001\022\007\n\002ps\020\202\001\022\007\n\002pt\020\203\001"
-      "\022\007\n\002qu\020\204\001\022\007\n\002rm\020\205\001\022\007\n\002rn\020\206\001\022\007\n\002ro\020\207\001\022\007\n\002"
-      "ru\020\210\001\022\007\n\002rw\020\211\001\022\007\n\002sa\020\212\001\022\007\n\002sc\020\213\001\022\007\n\002sd\020\214"
-      "\001\022\007\n\002se\020\215\001\022\007\n\002sg\020\216\001\022\007\n\002si\020\217\001\022\007\n\002sk\020\220\001\022\007\n"
-      "\002sl\020\221\001\022\007\n\002sm\020\222\001\022\007\n\002sn\020\223\001\022\007\n\002so\020\224\001\022\007\n\002sq\020"
-      "\225\001\022\007\n\002sr\020\226\001\022\007\n\002ss\020\227\001\022\007\n\002st\020\230\001\022\007\n\002su\020\231\001\022\007"
-      "\n\002sv\020\232\001\022\007\n\002sw\020\233\001\022\007\n\002ta\020\234\001\022\007\n\002te\020\235\001\022\007\n\002tg"
-      "\020\236\001\022\007\n\002th\020\237\001\022\007\n\002ti\020\240\001\022\007\n\002tk\020\241\001\022\007\n\002tl\020\242\001\022"
-      "\007\n\002tn\020\243\001\022\007\n\002to\020\244\001\022\007\n\002tr\020\245\001\022\007\n\002ts\020\246\001\022\007\n\002t"
-      "t\020\247\001\022\007\n\002tw\020\250\001\022\007\n\002ty\020\251\001\022\007\n\002ug\020\252\001\022\007\n\002uk\020\253\001"
-      "\022\007\n\002ur\020\254\001\022\007\n\002uz\020\255\001\022\007\n\002ve\020\256\001\022\007\n\002vi\020\257\001\022\007\n\002"
-      "vo\020\260\001\022\007\n\002wa\020\261\001\022\007\n\002wo\020\262\001\022\007\n\002xh\020\263\001\022\007\n\002yi\020\264"
-      "\001\022\007\n\002yo\020\265\001\022\007\n\002za\020\266\001\022\007\n\002zh\020\267\001\022\007\n\002zu\020\270\001"
+void AddDescriptors_metadata_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[1] =
+  {
+    ::AddDescriptors_fee_2eproto,
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 1957);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "metadata.proto", &protobuf_RegisterTypes);
-  ::protobuf_fee_2eproto::AddDescriptors();
+ ::google::protobuf::internal::AddDescriptors(&descriptor_table_metadata_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_metadata_2eproto
+// Force running AddDescriptors() at dynamic initialization time.
+static bool dynamic_init_dummy_metadata_2eproto = []() { AddDescriptors_metadata_2eproto(); return true; }();
 namespace legacy_pb {
 const ::google::protobuf::EnumDescriptor* Metadata_Version_descriptor() {
-  protobuf_metadata_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_metadata_2eproto::file_level_enum_descriptors[0];
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_metadata_2eproto);
+  return file_level_enum_descriptors_metadata_2eproto[0];
 }
 bool Metadata_Version_IsValid(int value) {
   switch (value) {
@@ -207,8 +185,8 @@ const Metadata_Version Metadata::Version_MAX;
 const int Metadata::Version_ARRAYSIZE;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 const ::google::protobuf::EnumDescriptor* Metadata_Language_descriptor() {
-  protobuf_metadata_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_metadata_2eproto::file_level_enum_descriptors[1];
+  ::google::protobuf::internal::AssignDescriptors(&assign_descriptors_table_metadata_2eproto);
+  return file_level_enum_descriptors_metadata_2eproto[1];
 }
 bool Metadata_Language_IsValid(int value) {
   switch (value) {
@@ -600,9 +578,51 @@ void Metadata::InitAsDefaultInstance() {
   ::legacy_pb::_Metadata_default_instance_._instance.get_mutable()->fee_ = const_cast< ::legacy_pb::Fee*>(
       ::legacy_pb::Fee::internal_default_instance());
 }
+class Metadata::HasBitSetters {
+ public:
+  static void set_has_version(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000100u;
+  }
+  static void set_has_language(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000200u;
+  }
+  static void set_has_title(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000001u;
+  }
+  static void set_has_description(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000002u;
+  }
+  static void set_has_author(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000004u;
+  }
+  static void set_has_license(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000008u;
+  }
+  static void set_has_nsfw(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000400u;
+  }
+  static const ::legacy_pb::Fee& fee(const Metadata* msg);
+  static void set_has_fee(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000080u;
+  }
+  static void set_has_thumbnail(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000010u;
+  }
+  static void set_has_preview(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000020u;
+  }
+  static void set_has_licenseurl(Metadata* msg) {
+    msg->_has_bits_[0] |= 0x00000040u;
+  }
+};
+
+const ::legacy_pb::Fee&
+Metadata::HasBitSetters::fee(const Metadata* msg) {
+  return *msg->fee_;
+}
 void Metadata::clear_fee() {
-  if (fee_ != NULL) fee_->Clear();
-  clear_has_fee();
+  if (fee_ != nullptr) fee_->Clear();
+  _has_bits_[0] &= ~0x00000080u;
 }
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Metadata::kVersionFieldNumber;
@@ -619,15 +639,13 @@ const int Metadata::kLicenseUrlFieldNumber;
 #endif  // !defined(_MSC_VER) || _MSC_VER >= 1900
 
 Metadata::Metadata()
-  : ::google::protobuf::Message(), _internal_metadata_(NULL) {
-  ::google::protobuf::internal::InitSCC(
-      &protobuf_metadata_2eproto::scc_info_Metadata.base);
+  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
   SharedCtor();
   // @@protoc_insertion_point(constructor:legacy_pb.Metadata)
 }
 Metadata::Metadata(const Metadata& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
+      _internal_metadata_(nullptr),
       _has_bits_(from._has_bits_) {
   _internal_metadata_.MergeFrom(from._internal_metadata_);
   title_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -661,7 +679,7 @@ Metadata::Metadata(const Metadata& from)
   if (from.has_fee()) {
     fee_ = new ::legacy_pb::Fee(*from.fee_);
   } else {
-    fee_ = NULL;
+    fee_ = nullptr;
   }
   ::memcpy(&version_, &from.version_,
     static_cast<size_t>(reinterpret_cast<char*>(&nsfw_) -
@@ -670,6 +688,8 @@ Metadata::Metadata(const Metadata& from)
 }
 
 void Metadata::SharedCtor() {
+  ::google::protobuf::internal::InitSCC(
+      &scc_info_Metadata_metadata_2eproto.base);
   title_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   description_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
   author_.UnsafeSetDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
@@ -701,13 +721,8 @@ void Metadata::SharedDtor() {
 void Metadata::SetCachedSize(int size) const {
   _cached_size_.Set(size);
 }
-const ::google::protobuf::Descriptor* Metadata::descriptor() {
-  ::protobuf_metadata_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_metadata_2eproto::file_level_metadata[kIndexInFileMessages].descriptor;
-}
-
 const Metadata& Metadata::default_instance() {
-  ::google::protobuf::internal::InitSCC(&protobuf_metadata_2eproto::scc_info_Metadata.base);
+  ::google::protobuf::internal::InitSCC(&::scc_info_Metadata_metadata_2eproto.base);
   return *internal_default_instance();
 }
 
@@ -719,7 +734,7 @@ void Metadata::Clear() {
   (void) cached_has_bits;
 
   cached_has_bits = _has_bits_[0];
-  if (cached_has_bits & 255u) {
+  if (cached_has_bits & 0x000000ffu) {
     if (cached_has_bits & 0x00000001u) {
       title_.ClearNonDefaultToEmptyNoArena();
     }
@@ -742,11 +757,11 @@ void Metadata::Clear() {
       licenseurl_.ClearNonDefaultToEmptyNoArena();
     }
     if (cached_has_bits & 0x00000080u) {
-      GOOGLE_DCHECK(fee_ != NULL);
+      GOOGLE_DCHECK(fee_ != nullptr);
       fee_->Clear();
     }
   }
-  if (cached_has_bits & 1792u) {
+  if (cached_has_bits & 0x00000700u) {
     ::memset(&version_, 0, static_cast<size_t>(
         reinterpret_cast<char*>(&nsfw_) -
         reinterpret_cast<char*>(&version_)) + sizeof(nsfw_));
@@ -755,9 +770,202 @@ void Metadata::Clear() {
   _internal_metadata_.Clear();
 }
 
+#if GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
+const char* Metadata::_InternalParse(const char* begin, const char* end, void* object,
+                  ::google::protobuf::internal::ParseContext* ctx) {
+  auto msg = static_cast<Metadata*>(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.Metadata.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::Metadata_Version_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(1, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_version(static_cast<::legacy_pb::Metadata_Version>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required .legacy_pb.Metadata.Language language = 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::Metadata_Language_IsValid(val)) {
+          ::google::protobuf::internal::WriteVarint(2, val, msg->mutable_unknown_fields());
+          break;
+        }
+        msg->set_language(static_cast<::legacy_pb::Metadata_Language>(val));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // required string title = 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);
+        ctx->extra_parse_data().SetFieldName("legacy_pb.Metadata.title");
+        object = msg->mutable_title();
+        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;
+      }
+      // required string description = 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.Metadata.description");
+        object = msg->mutable_description();
+        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;
+      }
+      // required string author = 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);
+        ctx->extra_parse_data().SetFieldName("legacy_pb.Metadata.author");
+        object = msg->mutable_author();
+        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;
+      }
+      // required string license = 6;
+      case 6: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 50) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        ctx->extra_parse_data().SetFieldName("legacy_pb.Metadata.license");
+        object = msg->mutable_license();
+        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;
+      }
+      // required bool nsfw = 7;
+      case 7: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 56) goto handle_unusual;
+        msg->set_nsfw(::google::protobuf::internal::ReadVarint(&ptr));
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        break;
+      }
+      // optional .legacy_pb.Fee fee = 8;
+      case 8: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 66) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        parser_till_end = ::legacy_pb::Fee::_InternalParse;
+        object = msg->mutable_fee();
+        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 string thumbnail = 9;
+      case 9: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 74) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        ctx->extra_parse_data().SetFieldName("legacy_pb.Metadata.thumbnail");
+        object = msg->mutable_thumbnail();
+        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;
+      }
+      // optional string preview = 10;
+      case 10: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 82) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        ctx->extra_parse_data().SetFieldName("legacy_pb.Metadata.preview");
+        object = msg->mutable_preview();
+        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;
+      }
+      // optional string licenseUrl = 11;
+      case 11: {
+        if (static_cast<::google::protobuf::uint8>(tag) != 90) goto handle_unusual;
+        ptr = ::google::protobuf::io::ReadSize(ptr, &size);
+        GOOGLE_PROTOBUF_PARSER_ASSERT(ptr);
+        ctx->extra_parse_data().SetFieldName("legacy_pb.Metadata.licenseUrl");
+        object = msg->mutable_licenseurl();
+        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 Metadata::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:legacy_pb.Metadata)
   for (;;) {
@@ -767,9 +975,8 @@ bool Metadata::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // required .legacy_pb.Metadata.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)));
@@ -777,7 +984,7 @@ bool Metadata::MergePartialFromCodedStream(
             set_version(static_cast< ::legacy_pb::Metadata_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;
@@ -787,9 +994,8 @@ bool Metadata::MergePartialFromCodedStream(
 
       // required .legacy_pb.Metadata.Language language = 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)));
@@ -797,7 +1003,7 @@ bool Metadata::MergePartialFromCodedStream(
             set_language(static_cast< ::legacy_pb::Metadata_Language >(value));
           } else {
             mutable_unknown_fields()->AddVarint(
-                2, static_cast< ::google::protobuf::uint64>(value));
+                2, static_cast<::google::protobuf::uint64>(value));
           }
         } else {
           goto handle_unusual;
@@ -807,8 +1013,7 @@ bool Metadata::MergePartialFromCodedStream(
 
       // required string title = 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::ReadString(
                 input, this->mutable_title()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
@@ -823,8 +1028,7 @@ bool Metadata::MergePartialFromCodedStream(
 
       // required string description = 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_description()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
@@ -839,8 +1043,7 @@ bool Metadata::MergePartialFromCodedStream(
 
       // required string author = 5;
       case 5: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(42u /* 42 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (42 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_author()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
@@ -855,8 +1058,7 @@ bool Metadata::MergePartialFromCodedStream(
 
       // required string license = 6;
       case 6: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(50u /* 50 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (50 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_license()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
@@ -871,9 +1073,8 @@ bool Metadata::MergePartialFromCodedStream(
 
       // required bool nsfw = 7;
       case 7: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(56u /* 56 & 0xFF */)) {
-          set_has_nsfw();
+        if (static_cast< ::google::protobuf::uint8>(tag) == (56 & 0xFF)) {
+          HasBitSetters::set_has_nsfw(this);
           DO_((::google::protobuf::internal::WireFormatLite::ReadPrimitive<
                    bool, ::google::protobuf::internal::WireFormatLite::TYPE_BOOL>(
                  input, &nsfw_)));
@@ -885,8 +1086,7 @@ bool Metadata::MergePartialFromCodedStream(
 
       // optional .legacy_pb.Fee fee = 8;
       case 8: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(66u /* 66 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (66 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
                input, mutable_fee()));
         } else {
@@ -897,8 +1097,7 @@ bool Metadata::MergePartialFromCodedStream(
 
       // optional string thumbnail = 9;
       case 9: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(74u /* 74 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (74 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_thumbnail()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
@@ -913,8 +1112,7 @@ bool Metadata::MergePartialFromCodedStream(
 
       // optional string preview = 10;
       case 10: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(82u /* 82 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (82 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_preview()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
@@ -929,8 +1127,7 @@ bool Metadata::MergePartialFromCodedStream(
 
       // optional string licenseUrl = 11;
       case 11: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(90u /* 90 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (90 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadString(
                 input, this->mutable_licenseurl()));
           ::google::protobuf::internal::WireFormat::VerifyUTF8StringNamedField(
@@ -962,6 +1159,7 @@ failure:
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Metadata::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -1030,7 +1228,7 @@ void Metadata::SerializeWithCachedSizes(
   // optional .legacy_pb.Fee fee = 8;
   if (cached_has_bits & 0x00000080u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      8, this->_internal_fee(), output);
+      8, HasBitSetters::fee(this), output);
   }
 
   // optional string thumbnail = 9;
@@ -1071,8 +1269,7 @@ void Metadata::SerializeWithCachedSizes(
 }
 
 ::google::protobuf::uint8* Metadata::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
+    ::google::protobuf::uint8* target) const {
   // @@protoc_insertion_point(serialize_to_array_start:legacy_pb.Metadata)
   ::google::protobuf::uint32 cached_has_bits = 0;
   (void) cached_has_bits;
@@ -1143,7 +1340,7 @@ void Metadata::SerializeWithCachedSizes(
   if (cached_has_bits & 0x00000080u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        8, this->_internal_fee(), deterministic, target);
+        8, HasBitSetters::fee(this), target);
   }
 
   // optional string thumbnail = 9;
@@ -1282,30 +1479,35 @@ size_t Metadata::ByteSizeLong() const {
   } else {
     total_size += RequiredFieldsByteSizeFallback();
   }
-  if (_has_bits_[0 / 32] & 240u) {
+  ::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 & 0x000000f0u) {
     // optional string thumbnail = 9;
-    if (has_thumbnail()) {
+    if (cached_has_bits & 0x00000010u) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->thumbnail());
     }
 
     // optional string preview = 10;
-    if (has_preview()) {
+    if (cached_has_bits & 0x00000020u) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->preview());
     }
 
     // optional string licenseUrl = 11;
-    if (has_licenseurl()) {
+    if (cached_has_bits & 0x00000040u) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::StringSize(
           this->licenseurl());
     }
 
     // optional .legacy_pb.Fee fee = 8;
-    if (has_fee()) {
+    if (cached_has_bits & 0x00000080u) {
       total_size += 1 +
         ::google::protobuf::internal::WireFormatLite::MessageSize(
           *fee_);
@@ -1321,9 +1523,9 @@ void Metadata::MergeFrom(const ::google::protobuf::Message& from) {
 // @@protoc_insertion_point(generalized_merge_from_start:legacy_pb.Metadata)
   GOOGLE_DCHECK_NE(&from, this);
   const Metadata* source =
-      ::google::protobuf::internal::DynamicCastToGenerated<const Metadata>(
+      ::google::protobuf::DynamicCastToGenerated<Metadata>(
           &from);
-  if (source == NULL) {
+  if (source == nullptr) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Metadata)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -1340,40 +1542,40 @@ void Metadata::MergeFrom(const Metadata& from) {
   (void) cached_has_bits;
 
   cached_has_bits = from._has_bits_[0];
-  if (cached_has_bits & 255u) {
+  if (cached_has_bits & 0x000000ffu) {
     if (cached_has_bits & 0x00000001u) {
-      set_has_title();
+      _has_bits_[0] |= 0x00000001u;
       title_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.title_);
     }
     if (cached_has_bits & 0x00000002u) {
-      set_has_description();
+      _has_bits_[0] |= 0x00000002u;
       description_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.description_);
     }
     if (cached_has_bits & 0x00000004u) {
-      set_has_author();
+      _has_bits_[0] |= 0x00000004u;
       author_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.author_);
     }
     if (cached_has_bits & 0x00000008u) {
-      set_has_license();
+      _has_bits_[0] |= 0x00000008u;
       license_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.license_);
     }
     if (cached_has_bits & 0x00000010u) {
-      set_has_thumbnail();
+      _has_bits_[0] |= 0x00000010u;
       thumbnail_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.thumbnail_);
     }
     if (cached_has_bits & 0x00000020u) {
-      set_has_preview();
+      _has_bits_[0] |= 0x00000020u;
       preview_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.preview_);
     }
     if (cached_has_bits & 0x00000040u) {
-      set_has_licenseurl();
+      _has_bits_[0] |= 0x00000040u;
       licenseurl_.AssignWithDefault(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), from.licenseurl_);
     }
     if (cached_has_bits & 0x00000080u) {
       mutable_fee()->::legacy_pb::Fee::MergeFrom(from.fee());
     }
   }
-  if (cached_has_bits & 1792u) {
+  if (cached_has_bits & 0x00000700u) {
     if (cached_has_bits & 0x00000100u) {
       version_ = from.version_;
     }
@@ -1415,6 +1617,8 @@ void Metadata::Swap(Metadata* other) {
 }
 void Metadata::InternalSwap(Metadata* other) {
   using std::swap;
+  _internal_metadata_.Swap(&other->_internal_metadata_);
+  swap(_has_bits_[0], other->_has_bits_[0]);
   title_.Swap(&other->title_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
     GetArenaNoVirtual());
   description_.Swap(&other->description_, &::google::protobuf::internal::GetEmptyStringAlreadyInited(),
@@ -1433,13 +1637,11 @@ void Metadata::InternalSwap(Metadata* other) {
   swap(version_, other->version_);
   swap(language_, other->language_);
   swap(nsfw_, other->nsfw_);
-  swap(_has_bits_[0], other->_has_bits_[0]);
-  _internal_metadata_.Swap(&other->_internal_metadata_);
 }
 
 ::google::protobuf::Metadata Metadata::GetMetadata() const {
-  protobuf_metadata_2eproto::protobuf_AssignDescriptorsOnce();
-  return ::protobuf_metadata_2eproto::file_level_metadata[kIndexInFileMessages];
+  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_metadata_2eproto);
+  return ::file_level_metadata_metadata_2eproto[kIndexInFileMessages];
 }
 
 
@@ -1447,10 +1649,11 @@ void Metadata::InternalSwap(Metadata* other) {
 }  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Metadata* Arena::CreateMaybeMessage< ::legacy_pb::Metadata >(Arena* arena) {
+template<> PROTOBUF_NOINLINE ::legacy_pb::Metadata* Arena::CreateMaybeMessage< ::legacy_pb::Metadata >(Arena* arena) {
   return Arena::CreateInternal< ::legacy_pb::Metadata >(arena);
 }
 }  // namespace protobuf
 }  // namespace google
 
 // @@protoc_insertion_point(global_scope)
+#include <google/protobuf/port_undef.inc>

v1/cpp/metadata.pb.h

@@ -4,21 +4,22 @@
 #ifndef PROTOBUF_INCLUDED_metadata_2eproto
 #define PROTOBUF_INCLUDED_metadata_2eproto
 
+#include <limits>
 #include <string>
 
-#include <google/protobuf/stubs/common.h>
-
-#if GOOGLE_PROTOBUF_VERSION < 3006001
+#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 3006001 < 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,20 +34,22 @@
 #include <google/protobuf/unknown_field_set.h>
 #include "fee.pb.h"
 // @@protoc_insertion_point(includes)
-#define PROTOBUF_INTERNAL_EXPORT_protobuf_metadata_2eproto 
+#include <google/protobuf/port_def.inc>
+#define PROTOBUF_INTERNAL_EXPORT_metadata_2eproto
 
-namespace protobuf_metadata_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_metadata_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_metadata_2eproto
+void AddDescriptors_metadata_2eproto();
 namespace legacy_pb {
 class Metadata;
 class MetadataDefaultTypeInternal;
@@ -285,7 +288,8 @@ inline bool Metadata_Language_Parse(
 }
 // ===================================================================
 
-class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Metadata) */ {
+class Metadata final :
+    public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_pb.Metadata) */ {
  public:
   Metadata();
   virtual ~Metadata();
@@ -318,7 +322,9 @@ class Metadata : 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 Metadata& default_instance();
 
   static void InitAsDefaultInstance();  // FOR INTERNAL USE ONLY
@@ -337,7 +343,7 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
   // implements Message ----------------------------------------------
 
   inline Metadata* New() const final {
-    return CreateMaybeMessage<Metadata>(NULL);
+    return CreateMaybeMessage<Metadata>(nullptr);
   }
 
   Metadata* New(::google::protobuf::Arena* arena) const final {
@@ -347,16 +353,21 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
   void MergeFrom(const ::google::protobuf::Message& from) final;
   void CopyFrom(const Metadata& from);
   void MergeFrom(const Metadata& 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:
@@ -366,10 +377,10 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
   void InternalSwap(Metadata* other);
   private:
   inline ::google::protobuf::Arena* GetArenaNoVirtual() const {
-    return NULL;
+    return nullptr;
   }
   inline void* MaybeArenaPtr() const {
-    return NULL;
+    return nullptr;
   }
   public:
 
@@ -912,9 +923,6 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
   bool has_fee() const;
   void clear_fee();
   static const int kFeeFieldNumber = 8;
-  private:
-  const ::legacy_pb::Fee& _internal_fee() const;
-  public:
   const ::legacy_pb::Fee& fee() const;
   ::legacy_pb::Fee* release_fee();
   ::legacy_pb::Fee* mutable_fee();
@@ -943,28 +951,7 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
 
   // @@protoc_insertion_point(class_scope:legacy_pb.Metadata)
  private:
-  void set_has_version();
-  void clear_has_version();
-  void set_has_language();
-  void clear_has_language();
-  void set_has_title();
-  void clear_has_title();
-  void set_has_description();
-  void clear_has_description();
-  void set_has_author();
-  void clear_has_author();
-  void set_has_license();
-  void clear_has_license();
-  void set_has_nsfw();
-  void clear_has_nsfw();
-  void set_has_fee();
-  void clear_has_fee();
-  void set_has_thumbnail();
-  void clear_has_thumbnail();
-  void set_has_preview();
-  void clear_has_preview();
-  void set_has_licenseurl();
-  void clear_has_licenseurl();
+  class HasBitSetters;
 
   // helper for ByteSizeLong()
   size_t RequiredFieldsByteSizeFallback() const;
@@ -983,7 +970,7 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
   int version_;
   int language_;
   bool nsfw_;
-  friend struct ::protobuf_metadata_2eproto::TableStruct;
+  friend struct ::TableStruct_metadata_2eproto;
 };
 // ===================================================================
 
@@ -1000,15 +987,9 @@ class Metadata : public ::google::protobuf::Message /* @@protoc_insertion_point(
 inline bool Metadata::has_version() const {
   return (_has_bits_[0] & 0x00000100u) != 0;
 }
-inline void Metadata::set_has_version() {
-  _has_bits_[0] |= 0x00000100u;
-}
-inline void Metadata::clear_has_version() {
-  _has_bits_[0] &= ~0x00000100u;
-}
 inline void Metadata::clear_version() {
   version_ = 0;
-  clear_has_version();
+  _has_bits_[0] &= ~0x00000100u;
 }
 inline ::legacy_pb::Metadata_Version Metadata::version() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.version)
@@ -1016,7 +997,7 @@ inline ::legacy_pb::Metadata_Version Metadata::version() const {
 }
 inline void Metadata::set_version(::legacy_pb::Metadata_Version value) {
   assert(::legacy_pb::Metadata_Version_IsValid(value));
-  set_has_version();
+  _has_bits_[0] |= 0x00000100u;
   version_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Metadata.version)
 }
@@ -1025,15 +1006,9 @@ inline void Metadata::set_version(::legacy_pb::Metadata_Version value) {
 inline bool Metadata::has_language() const {
   return (_has_bits_[0] & 0x00000200u) != 0;
 }
-inline void Metadata::set_has_language() {
-  _has_bits_[0] |= 0x00000200u;
-}
-inline void Metadata::clear_has_language() {
-  _has_bits_[0] &= ~0x00000200u;
-}
 inline void Metadata::clear_language() {
   language_ = 0;
-  clear_has_language();
+  _has_bits_[0] &= ~0x00000200u;
 }
 inline ::legacy_pb::Metadata_Language Metadata::language() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.language)
@@ -1041,7 +1016,7 @@ inline ::legacy_pb::Metadata_Language Metadata::language() const {
 }
 inline void Metadata::set_language(::legacy_pb::Metadata_Language value) {
   assert(::legacy_pb::Metadata_Language_IsValid(value));
-  set_has_language();
+  _has_bits_[0] |= 0x00000200u;
   language_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Metadata.language)
 }
@@ -1050,63 +1025,57 @@ inline void Metadata::set_language(::legacy_pb::Metadata_Language value) {
 inline bool Metadata::has_title() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Metadata::set_has_title() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Metadata::clear_has_title() {
-  _has_bits_[0] &= ~0x00000001u;
-}
 inline void Metadata::clear_title() {
   title_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_title();
+  _has_bits_[0] &= ~0x00000001u;
 }
 inline const ::std::string& Metadata::title() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.title)
   return title_.GetNoArena();
 }
 inline void Metadata::set_title(const ::std::string& value) {
-  set_has_title();
+  _has_bits_[0] |= 0x00000001u;
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:legacy_pb.Metadata.title)
 }
 #if LANG_CXX11
 inline void Metadata::set_title(::std::string&& value) {
-  set_has_title();
+  _has_bits_[0] |= 0x00000001u;
   title_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.title)
 }
 #endif
 inline void Metadata::set_title(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_title();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000001u;
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.title)
 }
 inline void Metadata::set_title(const char* value, size_t size) {
-  set_has_title();
+  _has_bits_[0] |= 0x00000001u;
   title_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.title)
 }
 inline ::std::string* Metadata::mutable_title() {
-  set_has_title();
+  _has_bits_[0] |= 0x00000001u;
   // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.title)
   return title_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_title() {
   // @@protoc_insertion_point(field_release:legacy_pb.Metadata.title)
   if (!has_title()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_title();
+  _has_bits_[0] &= ~0x00000001u;
   return title_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Metadata::set_allocated_title(::std::string* title) {
-  if (title != NULL) {
-    set_has_title();
+  if (title != nullptr) {
+    _has_bits_[0] |= 0x00000001u;
   } else {
-    clear_has_title();
+    _has_bits_[0] &= ~0x00000001u;
   }
   title_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), title);
   // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.title)
@@ -1116,63 +1085,57 @@ inline void Metadata::set_allocated_title(::std::string* title) {
 inline bool Metadata::has_description() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Metadata::set_has_description() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void Metadata::clear_has_description() {
-  _has_bits_[0] &= ~0x00000002u;
-}
 inline void Metadata::clear_description() {
   description_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_description();
+  _has_bits_[0] &= ~0x00000002u;
 }
 inline const ::std::string& Metadata::description() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.description)
   return description_.GetNoArena();
 }
 inline void Metadata::set_description(const ::std::string& value) {
-  set_has_description();
+  _has_bits_[0] |= 0x00000002u;
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:legacy_pb.Metadata.description)
 }
 #if LANG_CXX11
 inline void Metadata::set_description(::std::string&& value) {
-  set_has_description();
+  _has_bits_[0] |= 0x00000002u;
   description_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.description)
 }
 #endif
 inline void Metadata::set_description(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_description();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000002u;
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.description)
 }
 inline void Metadata::set_description(const char* value, size_t size) {
-  set_has_description();
+  _has_bits_[0] |= 0x00000002u;
   description_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.description)
 }
 inline ::std::string* Metadata::mutable_description() {
-  set_has_description();
+  _has_bits_[0] |= 0x00000002u;
   // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.description)
   return description_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_description() {
   // @@protoc_insertion_point(field_release:legacy_pb.Metadata.description)
   if (!has_description()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_description();
+  _has_bits_[0] &= ~0x00000002u;
   return description_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Metadata::set_allocated_description(::std::string* description) {
-  if (description != NULL) {
-    set_has_description();
+  if (description != nullptr) {
+    _has_bits_[0] |= 0x00000002u;
   } else {
-    clear_has_description();
+    _has_bits_[0] &= ~0x00000002u;
   }
   description_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), description);
   // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.description)
@@ -1182,63 +1145,57 @@ inline void Metadata::set_allocated_description(::std::string* description) {
 inline bool Metadata::has_author() const {
   return (_has_bits_[0] & 0x00000004u) != 0;
 }
-inline void Metadata::set_has_author() {
-  _has_bits_[0] |= 0x00000004u;
-}
-inline void Metadata::clear_has_author() {
-  _has_bits_[0] &= ~0x00000004u;
-}
 inline void Metadata::clear_author() {
   author_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_author();
+  _has_bits_[0] &= ~0x00000004u;
 }
 inline const ::std::string& Metadata::author() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.author)
   return author_.GetNoArena();
 }
 inline void Metadata::set_author(const ::std::string& value) {
-  set_has_author();
+  _has_bits_[0] |= 0x00000004u;
   author_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:legacy_pb.Metadata.author)
 }
 #if LANG_CXX11
 inline void Metadata::set_author(::std::string&& value) {
-  set_has_author();
+  _has_bits_[0] |= 0x00000004u;
   author_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.author)
 }
 #endif
 inline void Metadata::set_author(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_author();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000004u;
   author_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.author)
 }
 inline void Metadata::set_author(const char* value, size_t size) {
-  set_has_author();
+  _has_bits_[0] |= 0x00000004u;
   author_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.author)
 }
 inline ::std::string* Metadata::mutable_author() {
-  set_has_author();
+  _has_bits_[0] |= 0x00000004u;
   // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.author)
   return author_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_author() {
   // @@protoc_insertion_point(field_release:legacy_pb.Metadata.author)
   if (!has_author()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_author();
+  _has_bits_[0] &= ~0x00000004u;
   return author_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Metadata::set_allocated_author(::std::string* author) {
-  if (author != NULL) {
-    set_has_author();
+  if (author != nullptr) {
+    _has_bits_[0] |= 0x00000004u;
   } else {
-    clear_has_author();
+    _has_bits_[0] &= ~0x00000004u;
   }
   author_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), author);
   // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.author)
@@ -1248,63 +1205,57 @@ inline void Metadata::set_allocated_author(::std::string* author) {
 inline bool Metadata::has_license() const {
   return (_has_bits_[0] & 0x00000008u) != 0;
 }
-inline void Metadata::set_has_license() {
-  _has_bits_[0] |= 0x00000008u;
-}
-inline void Metadata::clear_has_license() {
-  _has_bits_[0] &= ~0x00000008u;
-}
 inline void Metadata::clear_license() {
   license_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_license();
+  _has_bits_[0] &= ~0x00000008u;
 }
 inline const ::std::string& Metadata::license() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.license)
   return license_.GetNoArena();
 }
 inline void Metadata::set_license(const ::std::string& value) {
-  set_has_license();
+  _has_bits_[0] |= 0x00000008u;
   license_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:legacy_pb.Metadata.license)
 }
 #if LANG_CXX11
 inline void Metadata::set_license(::std::string&& value) {
-  set_has_license();
+  _has_bits_[0] |= 0x00000008u;
   license_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.license)
 }
 #endif
 inline void Metadata::set_license(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_license();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000008u;
   license_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.license)
 }
 inline void Metadata::set_license(const char* value, size_t size) {
-  set_has_license();
+  _has_bits_[0] |= 0x00000008u;
   license_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.license)
 }
 inline ::std::string* Metadata::mutable_license() {
-  set_has_license();
+  _has_bits_[0] |= 0x00000008u;
   // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.license)
   return license_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_license() {
   // @@protoc_insertion_point(field_release:legacy_pb.Metadata.license)
   if (!has_license()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_license();
+  _has_bits_[0] &= ~0x00000008u;
   return license_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Metadata::set_allocated_license(::std::string* license) {
-  if (license != NULL) {
-    set_has_license();
+  if (license != nullptr) {
+    _has_bits_[0] |= 0x00000008u;
   } else {
-    clear_has_license();
+    _has_bits_[0] &= ~0x00000008u;
   }
   license_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), license);
   // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.license)
@@ -1314,22 +1265,16 @@ inline void Metadata::set_allocated_license(::std::string* license) {
 inline bool Metadata::has_nsfw() const {
   return (_has_bits_[0] & 0x00000400u) != 0;
 }
-inline void Metadata::set_has_nsfw() {
-  _has_bits_[0] |= 0x00000400u;
-}
-inline void Metadata::clear_has_nsfw() {
-  _has_bits_[0] &= ~0x00000400u;
-}
 inline void Metadata::clear_nsfw() {
   nsfw_ = false;
-  clear_has_nsfw();
+  _has_bits_[0] &= ~0x00000400u;
 }
 inline bool Metadata::nsfw() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.nsfw)
   return nsfw_;
 }
 inline void Metadata::set_nsfw(bool value) {
-  set_has_nsfw();
+  _has_bits_[0] |= 0x00000400u;
   nsfw_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Metadata.nsfw)
 }
@@ -1338,31 +1283,22 @@ inline void Metadata::set_nsfw(bool value) {
 inline bool Metadata::has_fee() const {
   return (_has_bits_[0] & 0x00000080u) != 0;
 }
-inline void Metadata::set_has_fee() {
-  _has_bits_[0] |= 0x00000080u;
-}
-inline void Metadata::clear_has_fee() {
-  _has_bits_[0] &= ~0x00000080u;
-}
-inline const ::legacy_pb::Fee& Metadata::_internal_fee() const {
-  return *fee_;
-}
 inline const ::legacy_pb::Fee& Metadata::fee() const {
   const ::legacy_pb::Fee* p = fee_;
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.fee)
-  return p != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Fee*>(
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Fee*>(
       &::legacy_pb::_Fee_default_instance_);
 }
 inline ::legacy_pb::Fee* Metadata::release_fee() {
   // @@protoc_insertion_point(field_release:legacy_pb.Metadata.fee)
-  clear_has_fee();
+  _has_bits_[0] &= ~0x00000080u;
   ::legacy_pb::Fee* temp = fee_;
-  fee_ = NULL;
+  fee_ = nullptr;
   return temp;
 }
 inline ::legacy_pb::Fee* Metadata::mutable_fee() {
-  set_has_fee();
-  if (fee_ == NULL) {
+  _has_bits_[0] |= 0x00000080u;
+  if (fee_ == nullptr) {
     auto* p = CreateMaybeMessage<::legacy_pb::Fee>(GetArenaNoVirtual());
     fee_ = p;
   }
@@ -1371,18 +1307,18 @@ inline ::legacy_pb::Fee* Metadata::mutable_fee() {
 }
 inline void Metadata::set_allocated_fee(::legacy_pb::Fee* fee) {
   ::google::protobuf::Arena* message_arena = GetArenaNoVirtual();
-  if (message_arena == NULL) {
+  if (message_arena == nullptr) {
     delete reinterpret_cast< ::google::protobuf::MessageLite*>(fee_);
   }
   if (fee) {
-    ::google::protobuf::Arena* submessage_arena = NULL;
+    ::google::protobuf::Arena* submessage_arena = nullptr;
     if (message_arena != submessage_arena) {
       fee = ::google::protobuf::internal::GetOwnedMessage(
           message_arena, fee, submessage_arena);
     }
-    set_has_fee();
+    _has_bits_[0] |= 0x00000080u;
   } else {
-    clear_has_fee();
+    _has_bits_[0] &= ~0x00000080u;
   }
   fee_ = fee;
   // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.fee)
@@ -1392,63 +1328,57 @@ inline void Metadata::set_allocated_fee(::legacy_pb::Fee* fee) {
 inline bool Metadata::has_thumbnail() const {
   return (_has_bits_[0] & 0x00000010u) != 0;
 }
-inline void Metadata::set_has_thumbnail() {
-  _has_bits_[0] |= 0x00000010u;
-}
-inline void Metadata::clear_has_thumbnail() {
-  _has_bits_[0] &= ~0x00000010u;
-}
 inline void Metadata::clear_thumbnail() {
   thumbnail_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_thumbnail();
+  _has_bits_[0] &= ~0x00000010u;
 }
 inline const ::std::string& Metadata::thumbnail() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.thumbnail)
   return thumbnail_.GetNoArena();
 }
 inline void Metadata::set_thumbnail(const ::std::string& value) {
-  set_has_thumbnail();
+  _has_bits_[0] |= 0x00000010u;
   thumbnail_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:legacy_pb.Metadata.thumbnail)
 }
 #if LANG_CXX11
 inline void Metadata::set_thumbnail(::std::string&& value) {
-  set_has_thumbnail();
+  _has_bits_[0] |= 0x00000010u;
   thumbnail_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.thumbnail)
 }
 #endif
 inline void Metadata::set_thumbnail(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_thumbnail();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000010u;
   thumbnail_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.thumbnail)
 }
 inline void Metadata::set_thumbnail(const char* value, size_t size) {
-  set_has_thumbnail();
+  _has_bits_[0] |= 0x00000010u;
   thumbnail_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.thumbnail)
 }
 inline ::std::string* Metadata::mutable_thumbnail() {
-  set_has_thumbnail();
+  _has_bits_[0] |= 0x00000010u;
   // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.thumbnail)
   return thumbnail_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_thumbnail() {
   // @@protoc_insertion_point(field_release:legacy_pb.Metadata.thumbnail)
   if (!has_thumbnail()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_thumbnail();
+  _has_bits_[0] &= ~0x00000010u;
   return thumbnail_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Metadata::set_allocated_thumbnail(::std::string* thumbnail) {
-  if (thumbnail != NULL) {
-    set_has_thumbnail();
+  if (thumbnail != nullptr) {
+    _has_bits_[0] |= 0x00000010u;
   } else {
-    clear_has_thumbnail();
+    _has_bits_[0] &= ~0x00000010u;
   }
   thumbnail_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), thumbnail);
   // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.thumbnail)
@@ -1458,63 +1388,57 @@ inline void Metadata::set_allocated_thumbnail(::std::string* thumbnail) {
 inline bool Metadata::has_preview() const {
   return (_has_bits_[0] & 0x00000020u) != 0;
 }
-inline void Metadata::set_has_preview() {
-  _has_bits_[0] |= 0x00000020u;
-}
-inline void Metadata::clear_has_preview() {
-  _has_bits_[0] &= ~0x00000020u;
-}
 inline void Metadata::clear_preview() {
   preview_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_preview();
+  _has_bits_[0] &= ~0x00000020u;
 }
 inline const ::std::string& Metadata::preview() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.preview)
   return preview_.GetNoArena();
 }
 inline void Metadata::set_preview(const ::std::string& value) {
-  set_has_preview();
+  _has_bits_[0] |= 0x00000020u;
   preview_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:legacy_pb.Metadata.preview)
 }
 #if LANG_CXX11
 inline void Metadata::set_preview(::std::string&& value) {
-  set_has_preview();
+  _has_bits_[0] |= 0x00000020u;
   preview_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.preview)
 }
 #endif
 inline void Metadata::set_preview(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_preview();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000020u;
   preview_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.preview)
 }
 inline void Metadata::set_preview(const char* value, size_t size) {
-  set_has_preview();
+  _has_bits_[0] |= 0x00000020u;
   preview_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.preview)
 }
 inline ::std::string* Metadata::mutable_preview() {
-  set_has_preview();
+  _has_bits_[0] |= 0x00000020u;
   // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.preview)
   return preview_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_preview() {
   // @@protoc_insertion_point(field_release:legacy_pb.Metadata.preview)
   if (!has_preview()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_preview();
+  _has_bits_[0] &= ~0x00000020u;
   return preview_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Metadata::set_allocated_preview(::std::string* preview) {
-  if (preview != NULL) {
-    set_has_preview();
+  if (preview != nullptr) {
+    _has_bits_[0] |= 0x00000020u;
   } else {
-    clear_has_preview();
+    _has_bits_[0] &= ~0x00000020u;
   }
   preview_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), preview);
   // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.preview)
@@ -1524,63 +1448,57 @@ inline void Metadata::set_allocated_preview(::std::string* preview) {
 inline bool Metadata::has_licenseurl() const {
   return (_has_bits_[0] & 0x00000040u) != 0;
 }
-inline void Metadata::set_has_licenseurl() {
-  _has_bits_[0] |= 0x00000040u;
-}
-inline void Metadata::clear_has_licenseurl() {
-  _has_bits_[0] &= ~0x00000040u;
-}
 inline void Metadata::clear_licenseurl() {
   licenseurl_.ClearToEmptyNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
-  clear_has_licenseurl();
+  _has_bits_[0] &= ~0x00000040u;
 }
 inline const ::std::string& Metadata::licenseurl() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Metadata.licenseUrl)
   return licenseurl_.GetNoArena();
 }
 inline void Metadata::set_licenseurl(const ::std::string& value) {
-  set_has_licenseurl();
+  _has_bits_[0] |= 0x00000040u;
   licenseurl_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), value);
   // @@protoc_insertion_point(field_set:legacy_pb.Metadata.licenseUrl)
 }
 #if LANG_CXX11
 inline void Metadata::set_licenseurl(::std::string&& value) {
-  set_has_licenseurl();
+  _has_bits_[0] |= 0x00000040u;
   licenseurl_.SetNoArena(
     &::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::move(value));
   // @@protoc_insertion_point(field_set_rvalue:legacy_pb.Metadata.licenseUrl)
 }
 #endif
 inline void Metadata::set_licenseurl(const char* value) {
-  GOOGLE_DCHECK(value != NULL);
-  set_has_licenseurl();
+  GOOGLE_DCHECK(value != nullptr);
+  _has_bits_[0] |= 0x00000040u;
   licenseurl_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), ::std::string(value));
   // @@protoc_insertion_point(field_set_char:legacy_pb.Metadata.licenseUrl)
 }
 inline void Metadata::set_licenseurl(const char* value, size_t size) {
-  set_has_licenseurl();
+  _has_bits_[0] |= 0x00000040u;
   licenseurl_.SetNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(),
       ::std::string(reinterpret_cast<const char*>(value), size));
   // @@protoc_insertion_point(field_set_pointer:legacy_pb.Metadata.licenseUrl)
 }
 inline ::std::string* Metadata::mutable_licenseurl() {
-  set_has_licenseurl();
+  _has_bits_[0] |= 0x00000040u;
   // @@protoc_insertion_point(field_mutable:legacy_pb.Metadata.licenseUrl)
   return licenseurl_.MutableNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline ::std::string* Metadata::release_licenseurl() {
   // @@protoc_insertion_point(field_release:legacy_pb.Metadata.licenseUrl)
   if (!has_licenseurl()) {
-    return NULL;
+    return nullptr;
   }
-  clear_has_licenseurl();
+  _has_bits_[0] &= ~0x00000040u;
   return licenseurl_.ReleaseNonDefaultNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited());
 }
 inline void Metadata::set_allocated_licenseurl(::std::string* licenseurl) {
-  if (licenseurl != NULL) {
-    set_has_licenseurl();
+  if (licenseurl != nullptr) {
+    _has_bits_[0] |= 0x00000040u;
   } else {
-    clear_has_licenseurl();
+    _has_bits_[0] &= ~0x00000040u;
   }
   licenseurl_.SetAllocatedNoArena(&::google::protobuf::internal::GetEmptyStringAlreadyInited(), licenseurl);
   // @@protoc_insertion_point(field_set_allocated:legacy_pb.Metadata.licenseUrl)
@@ -1613,4 +1531,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Metadata_Language>(
 
 // @@protoc_insertion_point(global_scope)
 
+#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_metadata_2eproto

v1/cpp/signature.pb.cc

@@ -6,28 +6,23 @@
 #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 legacy_pb {
 class SignatureDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Signature>
-      _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Signature> _instance;
 } _Signature_default_instance_;
 }  // namespace legacy_pb
-namespace protobuf_signature_2eproto {
-static void InitDefaultsSignature() {
+static void InitDefaultsSignature_signature_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -38,32 +33,33 @@ static void InitDefaultsSignature() {
   ::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(::legacy_pb::Signature, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_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(::legacy_pb::Signature, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Signature, signaturetype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Signature, signature_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_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) = {
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
   { 0, 9, sizeof(::legacy_pb::Signature)},
 };
 
@@ -71,56 +67,40 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
   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\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"
+void AddDescriptors_signature_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[1] =
+  {
+    ::AddDescriptors_certificate_2eproto,
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 237);
-  ::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
+// 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: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());
@@ -178,6 +172,8 @@ Signature::Signature(const Signature& from)
 }
 
 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>(
@@ -198,13 +194,8 @@ 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();
 }
 
@@ -216,7 +207,7 @@ void Signature::Clear() {
   (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,9 +224,100 @@ 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:legacy_pb.Signature)
   for (;;) {
@@ -245,9 +327,8 @@ bool Signature::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // 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)));
@@ -255,7 +336,7 @@ bool Signature::MergePartialFromCodedStream(
             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;
@@ -265,9 +346,8 @@ bool Signature::MergePartialFromCodedStream(
 
       // 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)));
@@ -275,7 +355,7 @@ bool Signature::MergePartialFromCodedStream(
             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 {
@@ -326,6 +404,7 @@ failure:
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Signature::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -366,8 +445,7 @@ void Signature::SerializeWithCachedSizes(
 }
 
 ::google::protobuf::uint8* Signature::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
+    ::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;
@@ -470,6 +548,10 @@ size_t Signature::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;
@@ -479,9 +561,9 @@ void Signature::MergeFrom(const ::google::protobuf::Message& from) {
 // @@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) {
+  if (source == nullptr) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Signature)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -498,13 +580,13 @@ void Signature::MergeFrom(const Signature& from) {
   (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) {
@@ -542,19 +624,19 @@ 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];
 }
 
 
@@ -562,10 +644,11 @@ void Signature::InternalSwap(Signature* other) {
 }  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Signature* Arena::CreateMaybeMessage< ::legacy_pb::Signature >(Arena* 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 < 3006001
+#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 3006001 < 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,20 +34,22 @@
 #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
+void AddDescriptors_signature_2eproto();
 namespace legacy_pb {
 class Signature;
 class SignatureDefaultTypeInternal;
@@ -80,7 +83,8 @@ inline bool Signature_Version_Parse(
 }
 // ===================================================================
 
-class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_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:
 
@@ -246,14 +257,7 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
 
   // @@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;
 };
 // ===================================================================
 
@@ -282,15 +286,9 @@ class Signature : public ::google::protobuf::Message /* @@protoc_insertion_point
 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 ::legacy_pb::Signature_Version Signature::version() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Signature.version)
@@ -298,7 +296,7 @@ inline ::legacy_pb::Signature_Version Signature::version() const {
 }
 inline void Signature::set_version(::legacy_pb::Signature_Version value) {
   assert(::legacy_pb::Signature_Version_IsValid(value));
-  set_has_version();
+  _has_bits_[0] |= 0x00000004u;
   version_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Signature.version)
 }
@@ -307,15 +305,9 @@ inline void Signature::set_version(::legacy_pb::Signature_Version value) {
 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 ::legacy_pb::KeyType Signature::signaturetype() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Signature.signatureType)
@@ -323,7 +315,7 @@ inline ::legacy_pb::KeyType Signature::signaturetype() const {
 }
 inline void Signature::set_signaturetype(::legacy_pb::KeyType value) {
   assert(::legacy_pb::KeyType_IsValid(value));
-  set_has_signaturetype();
+  _has_bits_[0] |= 0x00000008u;
   signaturetype_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Signature.signatureType)
 }
@@ -332,63 +324,57 @@ inline void Signature::set_signaturetype(::legacy_pb::KeyType value) {
 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: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: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: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: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:legacy_pb.Signature.signature)
 }
 inline ::std::string* Signature::mutable_signature() {
-  set_has_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: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:legacy_pb.Signature.signature)
@@ -398,63 +384,57 @@ inline void Signature::set_allocated_signature(::std::string* signature) {
 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: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: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: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: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:legacy_pb.Signature.certificateId)
 }
 inline ::std::string* Signature::mutable_certificateid() {
-  set_has_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: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:legacy_pb.Signature.certificateId)
@@ -482,4 +462,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::legacy_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,28 +6,23 @@
 #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 legacy_pb {
 class SourceDefaultTypeInternal {
  public:
-  ::google::protobuf::internal::ExplicitlyConstructed<Source>
-      _instance;
+  ::google::protobuf::internal::ExplicitlyConstructed<Source> _instance;
 } _Source_default_instance_;
 }  // namespace legacy_pb
-namespace protobuf_source_2eproto {
-static void InitDefaultsSource() {
+static void InitDefaultsSource_source_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -38,32 +33,33 @@ static void InitDefaultsSource() {
   ::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(::legacy_pb::Source, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_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(::legacy_pb::Source, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Source, sourcetype_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Source, source_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_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) = {
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
   { 0, 9, sizeof(::legacy_pb::Source)},
 };
 
@@ -71,56 +67,40 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
   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\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"
+void AddDescriptors_source_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[1] =
+  {
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 270);
-  ::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
+// 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: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());
@@ -199,6 +193,8 @@ Source::Source(const Source& from)
 }
 
 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>(
@@ -219,13 +215,8 @@ 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();
 }
 
@@ -237,7 +228,7 @@ void Source::Clear() {
   (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,9 +245,101 @@ 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:legacy_pb.Source)
   for (;;) {
@@ -266,9 +349,8 @@ bool Source::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // 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)));
@@ -276,7 +358,7 @@ bool Source::MergePartialFromCodedStream(
             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;
@@ -286,9 +368,8 @@ bool Source::MergePartialFromCodedStream(
 
       // 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)));
@@ -296,7 +377,7 @@ bool Source::MergePartialFromCodedStream(
             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,8 +398,7 @@ 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(
@@ -351,6 +430,7 @@ failure:
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Source::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -395,8 +475,7 @@ void Source::SerializeWithCachedSizes(
 }
 
 ::google::protobuf::uint8* Source::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
+    ::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;
@@ -503,6 +582,10 @@ size_t Source::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;
@@ -512,9 +595,9 @@ void Source::MergeFrom(const ::google::protobuf::Message& from) {
 // @@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) {
+  if (source == nullptr) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Source)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -531,13 +614,13 @@ void Source::MergeFrom(const Source& from) {
   (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) {
@@ -575,19 +658,19 @@ 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];
 }
 
 
@@ -595,10 +678,11 @@ void Source::InternalSwap(Source* other) {
 }  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Source* Arena::CreateMaybeMessage< ::legacy_pb::Source >(Arena* 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 < 3006001
+#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 3006001 < 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,20 +33,22 @@
 #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
+void AddDescriptors_source_2eproto();
 namespace legacy_pb {
 class Source;
 class SourceDefaultTypeInternal;
@@ -98,7 +101,8 @@ inline bool Source_SourceTypes_Parse(
 }
 // ===================================================================
 
-class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_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:
 
@@ -290,14 +301,7 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
 
   // @@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;
 };
 // ===================================================================
 
@@ -326,15 +330,9 @@ class Source : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
 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 ::legacy_pb::Source_Version Source::version() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Source.version)
@@ -342,7 +340,7 @@ inline ::legacy_pb::Source_Version Source::version() const {
 }
 inline void Source::set_version(::legacy_pb::Source_Version value) {
   assert(::legacy_pb::Source_Version_IsValid(value));
-  set_has_version();
+  _has_bits_[0] |= 0x00000004u;
   version_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Source.version)
 }
@@ -351,15 +349,9 @@ inline void Source::set_version(::legacy_pb::Source_Version value) {
 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 ::legacy_pb::Source_SourceTypes Source::sourcetype() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Source.sourceType)
@@ -367,7 +359,7 @@ inline ::legacy_pb::Source_SourceTypes Source::sourcetype() const {
 }
 inline void Source::set_sourcetype(::legacy_pb::Source_SourceTypes value) {
   assert(::legacy_pb::Source_SourceTypes_IsValid(value));
-  set_has_sourcetype();
+  _has_bits_[0] |= 0x00000008u;
   sourcetype_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Source.sourceType)
 }
@@ -376,63 +368,57 @@ inline void Source::set_sourcetype(::legacy_pb::Source_SourceTypes value) {
 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: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: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: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: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:legacy_pb.Source.source)
 }
 inline ::std::string* Source::mutable_source() {
-  set_has_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: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:legacy_pb.Source.source)
@@ -442,63 +428,57 @@ inline void Source::set_allocated_source(::std::string* source) {
 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: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: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: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: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:legacy_pb.Source.contentType)
 }
 inline ::std::string* Source::mutable_contenttype() {
-  set_has_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: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:legacy_pb.Source.contentType)
@@ -531,4 +511,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Source_SourceTypes>
 
 // @@protoc_insertion_point(global_scope)
 
+#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_source_2eproto

v1/cpp/stream.pb.cc

@@ -6,34 +6,25 @@
 #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 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
+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;
+  ::google::protobuf::internal::ExplicitlyConstructed<Stream> _instance;
 } _Stream_default_instance_;
 }  // namespace legacy_pb
-namespace protobuf_stream_2eproto {
-static void InitDefaultsStream() {
+static void InitDefaultsStream_stream_2eproto() {
   GOOGLE_PROTOBUF_VERIFY_VERSION;
 
   {
@@ -44,32 +35,33 @@ static void InitDefaultsStream() {
   ::legacy_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,}};
+::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() {
-  ::google::protobuf::internal::InitSCC(&scc_info_Stream.base);
+void InitDefaults_stream_2eproto() {
+  ::google::protobuf::internal::InitSCC(&scc_info_Stream_stream_2eproto.base);
 }
 
-::google::protobuf::Metadata file_level_metadata[1];
-const ::google::protobuf::EnumDescriptor* file_level_enum_descriptors[1];
+::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::offsets[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Stream, _has_bits_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Stream, _internal_metadata_),
+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_
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Stream, version_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Stream, metadata_),
-  GOOGLE_PROTOBUF_GENERATED_MESSAGE_FIELD_OFFSET(::legacy_pb::Stream, source_),
+  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[] GOOGLE_PROTOBUF_ATTRIBUTE_SECTION_VARIABLE(protodesc_cold) = {
+static const ::google::protobuf::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
   { 0, 8, sizeof(::legacy_pb::Stream)},
 };
 
@@ -77,57 +69,41 @@ static ::google::protobuf::Message const * const file_default_instances[] = {
   reinterpret_cast<const ::google::protobuf::Message*>(&::legacy_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);
-}
+::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,
+};
 
-void protobuf_AssignDescriptorsOnce() {
-  static ::google::protobuf::internal::once_flag once;
-  ::google::protobuf::internal::call_once(once, protobuf_AssignDescriptors);
-}
+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 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\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"
+void AddDescriptors_stream_2eproto() {
+  static constexpr ::google::protobuf::internal::InitFunc deps[2] =
+  {
+    ::AddDescriptors_metadata_2eproto,
+    ::AddDescriptors_source_2eproto,
   };
-  ::google::protobuf::DescriptorPool::InternalAddGeneratedFile(
-      descriptor, 228);
-  ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile(
-    "stream.proto", &protobuf_RegisterTypes);
-  ::protobuf_metadata_2eproto::AddDescriptors();
-  ::protobuf_source_2eproto::AddDescriptors();
+ ::google::protobuf::internal::AddDescriptors(&descriptor_table_stream_2eproto, deps, 2);
 }
 
-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
+// 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() {
-  protobuf_stream_2eproto::protobuf_AssignDescriptorsOnce();
-  return protobuf_stream_2eproto::file_level_enum_descriptors[0];
+  ::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) {
@@ -155,13 +131,36 @@ void Stream::InitAsDefaultInstance() {
   ::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_ != NULL) metadata_->Clear();
-  clear_has_metadata();
+  if (metadata_ != nullptr) metadata_->Clear();
+  _has_bits_[0] &= ~0x00000001u;
 }
 void Stream::clear_source() {
-  if (source_ != NULL) source_->Clear();
-  clear_has_source();
+  if (source_ != nullptr) source_->Clear();
+  _has_bits_[0] &= ~0x00000002u;
 }
 #if !defined(_MSC_VER) || _MSC_VER >= 1900
 const int Stream::kVersionFieldNumber;
@@ -170,32 +169,32 @@ 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);
+  : ::google::protobuf::Message(), _internal_metadata_(nullptr) {
   SharedCtor();
   // @@protoc_insertion_point(constructor:legacy_pb.Stream)
 }
 Stream::Stream(const Stream& from)
   : ::google::protobuf::Message(),
-      _internal_metadata_(NULL),
+      _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_ = NULL;
+    metadata_ = nullptr;
   }
   if (from.has_source()) {
     source_ = new ::legacy_pb::Source(*from.source_);
   } else {
-    source_ = NULL;
+    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_));
@@ -214,13 +213,8 @@ void Stream::SharedDtor() {
 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);
+  ::google::protobuf::internal::InitSCC(&::scc_info_Stream_stream_2eproto.base);
   return *internal_default_instance();
 }
 
@@ -232,13 +226,13 @@ void Stream::Clear() {
   (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) {
-      GOOGLE_DCHECK(metadata_ != NULL);
+      GOOGLE_DCHECK(metadata_ != nullptr);
       metadata_->Clear();
     }
     if (cached_has_bits & 0x00000002u) {
-      GOOGLE_DCHECK(source_ != NULL);
+      GOOGLE_DCHECK(source_ != nullptr);
       source_->Clear();
     }
   }
@@ -247,9 +241,80 @@ void Stream::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 (!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:legacy_pb.Stream)
   for (;;) {
@@ -259,9 +324,8 @@ bool Stream::MergePartialFromCodedStream(
     switch (::google::protobuf::internal::WireFormatLite::GetTagFieldNumber(tag)) {
       // required .legacy_pb.Stream.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)));
@@ -269,7 +333,7 @@ bool Stream::MergePartialFromCodedStream(
             set_version(static_cast< ::legacy_pb::Stream_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;
@@ -279,8 +343,7 @@ bool Stream::MergePartialFromCodedStream(
 
       // required .legacy_pb.Metadata metadata = 2;
       case 2: {
-        if (static_cast< ::google::protobuf::uint8>(tag) ==
-            static_cast< ::google::protobuf::uint8>(18u /* 18 & 0xFF */)) {
+        if (static_cast< ::google::protobuf::uint8>(tag) == (18 & 0xFF)) {
           DO_(::google::protobuf::internal::WireFormatLite::ReadMessage(
                input, mutable_metadata()));
         } else {
@@ -291,8 +354,7 @@ bool Stream::MergePartialFromCodedStream(
 
       // required .legacy_pb.Source 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::ReadMessage(
                input, mutable_source()));
         } else {
@@ -320,6 +382,7 @@ failure:
   return false;
 #undef DO_
 }
+#endif  // GOOGLE_PROTOBUF_ENABLE_EXPERIMENTAL_PARSER
 
 void Stream::SerializeWithCachedSizes(
     ::google::protobuf::io::CodedOutputStream* output) const {
@@ -337,13 +400,13 @@ void Stream::SerializeWithCachedSizes(
   // required .legacy_pb.Metadata metadata = 2;
   if (cached_has_bits & 0x00000001u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      2, this->_internal_metadata(), output);
+      2, HasBitSetters::metadata(this), output);
   }
 
   // required .legacy_pb.Source source = 3;
   if (cached_has_bits & 0x00000002u) {
     ::google::protobuf::internal::WireFormatLite::WriteMessageMaybeToArray(
-      3, this->_internal_source(), output);
+      3, HasBitSetters::source(this), output);
   }
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -354,8 +417,7 @@ void Stream::SerializeWithCachedSizes(
 }
 
 ::google::protobuf::uint8* Stream::InternalSerializeWithCachedSizesToArray(
-    bool deterministic, ::google::protobuf::uint8* target) const {
-  (void)deterministic; // Unused
+    ::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;
@@ -371,14 +433,14 @@ void Stream::SerializeWithCachedSizes(
   if (cached_has_bits & 0x00000001u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        2, this->_internal_metadata(), deterministic, target);
+        2, HasBitSetters::metadata(this), target);
   }
 
   // required .legacy_pb.Source source = 3;
   if (cached_has_bits & 0x00000002u) {
     target = ::google::protobuf::internal::WireFormatLite::
       InternalWriteMessageToArray(
-        3, this->_internal_source(), deterministic, target);
+        3, HasBitSetters::source(this), target);
   }
 
   if (_internal_metadata_.have_unknown_fields()) {
@@ -442,6 +504,10 @@ size_t Stream::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;
@@ -451,9 +517,9 @@ 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::internal::DynamicCastToGenerated<const Stream>(
+      ::google::protobuf::DynamicCastToGenerated<Stream>(
           &from);
-  if (source == NULL) {
+  if (source == nullptr) {
   // @@protoc_insertion_point(generalized_merge_from_cast_fail:legacy_pb.Stream)
     ::google::protobuf::internal::ReflectionOps::Merge(from, this);
   } else {
@@ -470,7 +536,7 @@ void Stream::MergeFrom(const Stream& from) {
   (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) {
       mutable_metadata()->::legacy_pb::Metadata::MergeFrom(from.metadata());
     }
@@ -515,16 +581,16 @@ void Stream::Swap(Stream* 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_);
-  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];
+  ::google::protobuf::internal::AssignDescriptors(&::assign_descriptors_table_stream_2eproto);
+  return ::file_level_metadata_stream_2eproto[kIndexInFileMessages];
 }
 
 
@@ -532,10 +598,11 @@ void Stream::InternalSwap(Stream* other) {
 }  // namespace legacy_pb
 namespace google {
 namespace protobuf {
-template<> GOOGLE_PROTOBUF_ATTRIBUTE_NOINLINE ::legacy_pb::Stream* Arena::CreateMaybeMessage< ::legacy_pb::Stream >(Arena* arena) {
+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 < 3006001
+#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 3006001 < 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,20 +35,22 @@
 #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
+void AddDescriptors_stream_2eproto();
 namespace legacy_pb {
 class Stream;
 class StreamDefaultTypeInternal;
@@ -81,7 +84,8 @@ inline bool Stream_Version_Parse(
 }
 // ===================================================================
 
-class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(class_definition:legacy_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:
 
@@ -205,9 +216,6 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   bool has_metadata() const;
   void clear_metadata();
   static const int kMetadataFieldNumber = 2;
-  private:
-  const ::legacy_pb::Metadata& _internal_metadata() const;
-  public:
   const ::legacy_pb::Metadata& metadata() const;
   ::legacy_pb::Metadata* release_metadata();
   ::legacy_pb::Metadata* mutable_metadata();
@@ -217,9 +225,6 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   bool has_source() const;
   void clear_source();
   static const int kSourceFieldNumber = 3;
-  private:
-  const ::legacy_pb::Source& _internal_source() const;
-  public:
   const ::legacy_pb::Source& source() const;
   ::legacy_pb::Source* release_source();
   ::legacy_pb::Source* mutable_source();
@@ -234,12 +239,7 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
 
   // @@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;
@@ -250,7 +250,7 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
   ::legacy_pb::Metadata* metadata_;
   ::legacy_pb::Source* source_;
   int version_;
-  friend struct ::protobuf_stream_2eproto::TableStruct;
+  friend struct ::TableStruct_stream_2eproto;
 };
 // ===================================================================
 
@@ -267,15 +267,9 @@ class Stream : public ::google::protobuf::Message /* @@protoc_insertion_point(cl
 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 ::legacy_pb::Stream_Version Stream::version() const {
   // @@protoc_insertion_point(field_get:legacy_pb.Stream.version)
@@ -283,7 +277,7 @@ inline ::legacy_pb::Stream_Version Stream::version() const {
 }
 inline void Stream::set_version(::legacy_pb::Stream_Version value) {
   assert(::legacy_pb::Stream_Version_IsValid(value));
-  set_has_version();
+  _has_bits_[0] |= 0x00000004u;
   version_ = value;
   // @@protoc_insertion_point(field_set:legacy_pb.Stream.version)
 }
@@ -292,31 +286,22 @@ inline void Stream::set_version(::legacy_pb::Stream_Version value) {
 inline bool Stream::has_metadata() const {
   return (_has_bits_[0] & 0x00000001u) != 0;
 }
-inline void Stream::set_has_metadata() {
-  _has_bits_[0] |= 0x00000001u;
-}
-inline void Stream::clear_has_metadata() {
-  _has_bits_[0] &= ~0x00000001u;
-}
-inline const ::legacy_pb::Metadata& Stream::_internal_metadata() const {
-  return *metadata_;
-}
 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 != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Metadata*>(
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Metadata*>(
       &::legacy_pb::_Metadata_default_instance_);
 }
 inline ::legacy_pb::Metadata* Stream::release_metadata() {
   // @@protoc_insertion_point(field_release:legacy_pb.Stream.metadata)
-  clear_has_metadata();
+  _has_bits_[0] &= ~0x00000001u;
   ::legacy_pb::Metadata* temp = metadata_;
-  metadata_ = NULL;
+  metadata_ = nullptr;
   return temp;
 }
 inline ::legacy_pb::Metadata* Stream::mutable_metadata() {
-  set_has_metadata();
-  if (metadata_ == NULL) {
+  _has_bits_[0] |= 0x00000001u;
+  if (metadata_ == nullptr) {
     auto* p = CreateMaybeMessage<::legacy_pb::Metadata>(GetArenaNoVirtual());
     metadata_ = p;
   }
@@ -325,18 +310,18 @@ inline ::legacy_pb::Metadata* Stream::mutable_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:legacy_pb.Stream.metadata)
@@ -346,31 +331,22 @@ inline void Stream::set_allocated_metadata(::legacy_pb::Metadata* metadata) {
 inline bool Stream::has_source() const {
   return (_has_bits_[0] & 0x00000002u) != 0;
 }
-inline void Stream::set_has_source() {
-  _has_bits_[0] |= 0x00000002u;
-}
-inline void Stream::clear_has_source() {
-  _has_bits_[0] &= ~0x00000002u;
-}
-inline const ::legacy_pb::Source& Stream::_internal_source() const {
-  return *source_;
-}
 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 != NULL ? *p : *reinterpret_cast<const ::legacy_pb::Source*>(
+  return p != nullptr ? *p : *reinterpret_cast<const ::legacy_pb::Source*>(
       &::legacy_pb::_Source_default_instance_);
 }
 inline ::legacy_pb::Source* Stream::release_source() {
   // @@protoc_insertion_point(field_release:legacy_pb.Stream.source)
-  clear_has_source();
+  _has_bits_[0] &= ~0x00000002u;
   ::legacy_pb::Source* temp = source_;
-  source_ = NULL;
+  source_ = nullptr;
   return temp;
 }
 inline ::legacy_pb::Source* Stream::mutable_source() {
-  set_has_source();
-  if (source_ == NULL) {
+  _has_bits_[0] |= 0x00000002u;
+  if (source_ == nullptr) {
     auto* p = CreateMaybeMessage<::legacy_pb::Source>(GetArenaNoVirtual());
     source_ = p;
   }
@@ -379,18 +355,18 @@ inline ::legacy_pb::Source* Stream::mutable_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:legacy_pb.Stream.source)
@@ -418,4 +394,5 @@ inline const EnumDescriptor* GetEnumDescriptor< ::legacy_pb::Stream_Version>() {
 
 // @@protoc_insertion_point(global_scope)
 
+#include <google/protobuf/port_undef.inc>
 #endif  // PROTOBUF_INCLUDED_stream_2eproto

v1/go/certificate.pb.go

@@ -3,9 +3,11 @@
 
 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
@@ -16,7 +18,7 @@ var _ = math.Inf
 // 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
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type KeyType int32
 
@@ -33,6 +35,7 @@ var KeyType_name = map[int32]string{
 	2: "NIST384p",
 	3: "SECP256k1",
 }
+
 var KeyType_value = map[string]int32{
 	"UNKNOWN_PUBLIC_KEY_TYPE": 0,
 	"NIST256p":                1,
@@ -45,9 +48,11 @@ func (x KeyType) Enum() *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 {
@@ -56,8 +61,9 @@ func (x *KeyType) UnmarshalJSON(data []byte) error {
 	*x = KeyType(value)
 	return nil
 }
+
 func (KeyType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_certificate_47a4b47e210891c4, []int{0}
+	return fileDescriptor_c0d34c34dd33be4b, []int{0}
 }
 
 type Certificate_Version int32
@@ -71,6 +77,7 @@ 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,
@@ -81,9 +88,11 @@ func (x Certificate_Version) Enum() *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 {
@@ -92,8 +101,9 @@ func (x *Certificate_Version) UnmarshalJSON(data []byte) error {
 	*x = Certificate_Version(value)
 	return nil
 }
+
 func (Certificate_Version) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_certificate_47a4b47e210891c4, []int{0, 0}
+	return fileDescriptor_c0d34c34dd33be4b, []int{0, 0}
 }
 
 type Certificate struct {
@@ -109,16 +119,17 @@ 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_certificate_47a4b47e210891c4, []int{0}
+	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 (dst *Certificate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Certificate.Merge(dst, src)
+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)
@@ -151,14 +162,14 @@ func (m *Certificate) GetPublicKey() []byte {
 }
 
 func init() {
-	proto.RegisterType((*Certificate)(nil), "legacy_pb.Certificate")
 	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_certificate_47a4b47e210891c4) }
+func init() { proto.RegisterFile("certificate.proto", fileDescriptor_c0d34c34dd33be4b) }
 
-var fileDescriptor_certificate_47a4b47e210891c4 = []byte{
+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,

v1/go/fee.pb.go

@@ -3,9 +3,11 @@
 
 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
@@ -16,7 +18,7 @@ var _ = math.Inf
 // 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
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Fee_Version int32
 
@@ -29,6 +31,7 @@ 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,
@@ -39,9 +42,11 @@ func (x Fee_Version) Enum() *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 {
@@ -50,8 +55,9 @@ func (x *Fee_Version) UnmarshalJSON(data []byte) error {
 	*x = Fee_Version(value)
 	return nil
 }
+
 func (Fee_Version) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_fee_a80c5fb0f0bc8783, []int{0, 0}
+	return fileDescriptor_fa8e5264b1207167, []int{0, 0}
 }
 
 type Fee_Currency int32
@@ -69,6 +75,7 @@ var Fee_Currency_name = map[int32]string{
 	2: "BTC",
 	3: "USD",
 }
+
 var Fee_Currency_value = map[string]int32{
 	"UNKNOWN_CURRENCY": 0,
 	"LBC":              1,
@@ -81,9 +88,11 @@ func (x Fee_Currency) Enum() *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 {
@@ -92,8 +101,9 @@ func (x *Fee_Currency) UnmarshalJSON(data []byte) error {
 	*x = Fee_Currency(value)
 	return nil
 }
+
 func (Fee_Currency) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_fee_a80c5fb0f0bc8783, []int{0, 1}
+	return fileDescriptor_fa8e5264b1207167, []int{0, 1}
 }
 
 type Fee struct {
@@ -110,16 +120,17 @@ 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_fee_a80c5fb0f0bc8783, []int{0}
+	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 (dst *Fee) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Fee.Merge(dst, src)
+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)
@@ -159,14 +170,14 @@ func (m *Fee) GetAmount() float32 {
 }
 
 func init() {
-	proto.RegisterType((*Fee)(nil), "legacy_pb.Fee")
 	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_fee_a80c5fb0f0bc8783) }
+func init() { proto.RegisterFile("fee.proto", fileDescriptor_fa8e5264b1207167) }
 
-var fileDescriptor_fee_a80c5fb0f0bc8783 = []byte{
+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,

v1/go/legacy_claim.pb.go

@@ -3,9 +3,11 @@
 
 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
@@ -16,7 +18,7 @@ var _ = math.Inf
 // 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
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Claim_Version int32
 
@@ -29,6 +31,7 @@ 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,
@@ -39,9 +42,11 @@ func (x Claim_Version) Enum() *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 {
@@ -50,8 +55,9 @@ func (x *Claim_Version) UnmarshalJSON(data []byte) error {
 	*x = Claim_Version(value)
 	return nil
 }
+
 func (Claim_Version) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_legacy_claim_ba06518775556f44, []int{0, 0}
+	return fileDescriptor_3b52e2f635402822, []int{0, 0}
 }
 
 type Claim_ClaimType int32
@@ -67,6 +73,7 @@ var Claim_ClaimType_name = map[int32]string{
 	1: "streamType",
 	2: "certificateType",
 }
+
 var Claim_ClaimType_value = map[string]int32{
 	"UNKNOWN_CLAIM_TYPE": 0,
 	"streamType":         1,
@@ -78,9 +85,11 @@ func (x Claim_ClaimType) Enum() *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 {
@@ -89,8 +98,9 @@ func (x *Claim_ClaimType) UnmarshalJSON(data []byte) error {
 	*x = Claim_ClaimType(value)
 	return nil
 }
+
 func (Claim_ClaimType) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_legacy_claim_ba06518775556f44, []int{0, 1}
+	return fileDescriptor_3b52e2f635402822, []int{0, 1}
 }
 
 type Claim struct {
@@ -108,16 +118,17 @@ 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_legacy_claim_ba06518775556f44, []int{0}
+	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 (dst *Claim) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Claim.Merge(dst, src)
+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)
@@ -164,14 +175,14 @@ func (m *Claim) GetPublisherSignature() *Signature {
 }
 
 func init() {
-	proto.RegisterType((*Claim)(nil), "legacy_pb.Claim")
 	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_legacy_claim_ba06518775556f44) }
+func init() { proto.RegisterFile("legacy_claim.proto", fileDescriptor_3b52e2f635402822) }
 
-var fileDescriptor_legacy_claim_ba06518775556f44 = []byte{
+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,

v1/go/metadata.pb.go

@@ -3,9 +3,11 @@
 
 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
@@ -16,7 +18,7 @@ var _ = math.Inf
 // 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
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Metadata_Version int32
 
@@ -35,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,
@@ -48,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 {
@@ -59,8 +64,9 @@ func (x *Metadata_Version) UnmarshalJSON(data []byte) error {
 	*x = Metadata_Version(value)
 	return nil
 }
+
 func (Metadata_Version) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_metadata_e82f9da818ea7d21, []int{0, 0}
+	return fileDescriptor_56d9f74966f40d04, []int{0, 0}
 }
 
 type Metadata_Language int32
@@ -440,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,
@@ -633,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 {
@@ -644,8 +653,9 @@ func (x *Metadata_Language) UnmarshalJSON(data []byte) error {
 	*x = Metadata_Language(value)
 	return nil
 }
+
 func (Metadata_Language) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_metadata_e82f9da818ea7d21, []int{0, 1}
+	return fileDescriptor_56d9f74966f40d04, []int{0, 1}
 }
 
 type Metadata struct {
@@ -669,16 +679,17 @@ 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_metadata_e82f9da818ea7d21, []int{0}
+	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 (dst *Metadata) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Metadata.Merge(dst, src)
+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)
@@ -767,14 +778,14 @@ func (m *Metadata) GetLicenseUrl() string {
 }
 
 func init() {
-	proto.RegisterType((*Metadata)(nil), "legacy_pb.Metadata")
 	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", fileDescriptor_metadata_e82f9da818ea7d21) }
+func init() { proto.RegisterFile("metadata.proto", fileDescriptor_56d9f74966f40d04) }
 
-var fileDescriptor_metadata_e82f9da818ea7d21 = []byte{
+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,

v1/go/signature.pb.go

@@ -3,9 +3,11 @@
 
 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
@@ -16,7 +18,7 @@ var _ = math.Inf
 // 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
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Signature_Version int32
 
@@ -29,6 +31,7 @@ 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,
@@ -39,9 +42,11 @@ func (x Signature_Version) Enum() *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 {
@@ -50,8 +55,9 @@ func (x *Signature_Version) UnmarshalJSON(data []byte) error {
 	*x = Signature_Version(value)
 	return nil
 }
+
 func (Signature_Version) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_signature_db49c854424da426, []int{0, 0}
+	return fileDescriptor_76962cacebaec211, []int{0, 0}
 }
 
 type Signature struct {
@@ -68,16 +74,17 @@ 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_signature_db49c854424da426, []int{0}
+	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 (dst *Signature) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Signature.Merge(dst, src)
+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)
@@ -117,13 +124,13 @@ func (m *Signature) GetCertificateId() []byte {
 }
 
 func init() {
-	proto.RegisterType((*Signature)(nil), "legacy_pb.Signature")
 	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_signature_db49c854424da426) }
+func init() { proto.RegisterFile("signature.proto", fileDescriptor_76962cacebaec211) }
 
-var fileDescriptor_signature_db49c854424da426 = []byte{
+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,

v1/go/source.pb.go

@@ -3,9 +3,11 @@
 
 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
@@ -16,7 +18,7 @@ var _ = math.Inf
 // 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
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Source_Version int32
 
@@ -29,6 +31,7 @@ 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,
@@ -39,9 +42,11 @@ func (x Source_Version) Enum() *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 {
@@ -50,8 +55,9 @@ func (x *Source_Version) UnmarshalJSON(data []byte) error {
 	*x = Source_Version(value)
 	return nil
 }
+
 func (Source_Version) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_source_ce8ba9f1af24d4de, []int{0, 0}
+	return fileDescriptor_9229c9b6eb8e6b85, []int{0, 0}
 }
 
 type Source_SourceTypes int32
@@ -65,6 +71,7 @@ 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,
@@ -75,9 +82,11 @@ func (x Source_SourceTypes) Enum() *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 {
@@ -86,8 +95,9 @@ func (x *Source_SourceTypes) UnmarshalJSON(data []byte) error {
 	*x = Source_SourceTypes(value)
 	return nil
 }
+
 func (Source_SourceTypes) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_source_ce8ba9f1af24d4de, []int{0, 1}
+	return fileDescriptor_9229c9b6eb8e6b85, []int{0, 1}
 }
 
 type Source struct {
@@ -104,16 +114,17 @@ 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_source_ce8ba9f1af24d4de, []int{0}
+	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 (dst *Source) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Source.Merge(dst, src)
+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)
@@ -153,14 +164,14 @@ func (m *Source) GetContentType() string {
 }
 
 func init() {
-	proto.RegisterType((*Source)(nil), "legacy_pb.Source")
 	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_source_ce8ba9f1af24d4de) }
+func init() { proto.RegisterFile("source.proto", fileDescriptor_9229c9b6eb8e6b85) }
 
-var fileDescriptor_source_ce8ba9f1af24d4de = []byte{
+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,

v1/go/stream.pb.go

@@ -3,9 +3,11 @@
 
 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
@@ -16,7 +18,7 @@ var _ = math.Inf
 // 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
+const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 
 type Stream_Version int32
 
@@ -29,6 +31,7 @@ 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,
@@ -39,9 +42,11 @@ func (x Stream_Version) Enum() *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 {
@@ -50,8 +55,9 @@ func (x *Stream_Version) UnmarshalJSON(data []byte) error {
 	*x = Stream_Version(value)
 	return nil
 }
+
 func (Stream_Version) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_stream_f91d9f76e019d7b0, []int{0, 0}
+	return fileDescriptor_bb17ef3f514bfe54, []int{0, 0}
 }
 
 type Stream struct {
@@ -67,16 +73,17 @@ 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_stream_f91d9f76e019d7b0, []int{0}
+	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 (dst *Stream) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Stream.Merge(dst, src)
+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)
@@ -109,13 +116,13 @@ func (m *Stream) GetSource() *Source {
 }
 
 func init() {
-	proto.RegisterType((*Stream)(nil), "legacy_pb.Stream")
 	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_stream_f91d9f76e019d7b0) }
+func init() { proto.RegisterFile("stream.proto", fileDescriptor_bb17ef3f514bfe54) }
 
-var fileDescriptor_stream_f91d9f76e019d7b0 = []byte{
+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,

v1/js/certificate_pb.js

@@ -14,7 +14,6 @@ var global = Function('return this')();
 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
@@ -30,10 +29,15 @@ proto.legacy_pb.Certificate = function(opt_data) {
 };
 goog.inherits(proto.legacy_pb.Certificate, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
+  /**
+   * @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.
@@ -60,7 +64,7 @@ proto.legacy_pb.Certificate.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.legacy_pb.Certificate.toObject = function(includeInstance, msg) {
-  var f, obj = {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     keytype: jspb.Message.getField(msg, 2),
     publickey: msg.getPublickey_asB64()
@@ -188,6 +192,9 @@ proto.legacy_pb.Certificate.prototype.setVersion = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Certificate.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
@@ -195,7 +202,7 @@ proto.legacy_pb.Certificate.prototype.clearVersion = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Certificate.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
@@ -217,6 +224,9 @@ proto.legacy_pb.Certificate.prototype.setKeytype = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Certificate.prototype.clearKeytype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
@@ -224,7 +234,7 @@ proto.legacy_pb.Certificate.prototype.clearKeytype = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Certificate.prototype.hasKeytype = function() {
   return jspb.Message.getField(this, 2) != null;
@@ -270,6 +280,9 @@ proto.legacy_pb.Certificate.prototype.setPublickey = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Certificate.prototype.clearPublickey = function() {
   jspb.Message.setField(this, 4, undefined);
 };
@@ -277,7 +290,7 @@ proto.legacy_pb.Certificate.prototype.clearPublickey = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Certificate.prototype.hasPublickey = function() {
   return jspb.Message.getField(this, 4) != null;

v1/js/fee_pb.js

@@ -14,7 +14,6 @@ var global = Function('return this')();
 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
@@ -30,10 +29,15 @@ proto.legacy_pb.Fee = function(opt_data) {
 };
 goog.inherits(proto.legacy_pb.Fee, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
+  /**
+   * @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.
@@ -60,7 +64,7 @@ proto.legacy_pb.Fee.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.legacy_pb.Fee.toObject = function(includeInstance, msg) {
-  var f, obj = {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     currency: jspb.Message.getField(msg, 2),
     address: msg.getAddress_asB64(),
@@ -210,6 +214,9 @@ proto.legacy_pb.Fee.prototype.setVersion = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Fee.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
@@ -217,7 +224,7 @@ proto.legacy_pb.Fee.prototype.clearVersion = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Fee.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
@@ -239,6 +246,9 @@ proto.legacy_pb.Fee.prototype.setCurrency = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Fee.prototype.clearCurrency = function() {
   jspb.Message.setField(this, 2, undefined);
 };
@@ -246,7 +256,7 @@ proto.legacy_pb.Fee.prototype.clearCurrency = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Fee.prototype.hasCurrency = function() {
   return jspb.Message.getField(this, 2) != null;
@@ -292,6 +302,9 @@ proto.legacy_pb.Fee.prototype.setAddress = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Fee.prototype.clearAddress = function() {
   jspb.Message.setField(this, 3, undefined);
 };
@@ -299,7 +312,7 @@ proto.legacy_pb.Fee.prototype.clearAddress = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Fee.prototype.hasAddress = function() {
   return jspb.Message.getField(this, 3) != null;
@@ -321,6 +334,9 @@ proto.legacy_pb.Fee.prototype.setAmount = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Fee.prototype.clearAmount = function() {
   jspb.Message.setField(this, 4, undefined);
 };
@@ -328,7 +344,7 @@ proto.legacy_pb.Fee.prototype.clearAmount = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Fee.prototype.hasAmount = function() {
   return jspb.Message.getField(this, 4) != null;

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.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
@@ -33,10 +35,15 @@ proto.legacy_pb.Claim = function(opt_data) {
 };
 goog.inherits(proto.legacy_pb.Claim, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
+  /**
+   * @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.
@@ -63,7 +70,7 @@ proto.legacy_pb.Claim.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.legacy_pb.Claim.toObject = function(includeInstance, msg) {
-  var f, obj = {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     claimtype: jspb.Message.getField(msg, 2),
     stream: (f = msg.getStream()) && stream_pb.Stream.toObject(includeInstance, f),
@@ -230,6 +237,9 @@ proto.legacy_pb.Claim.prototype.setVersion = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Claim.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
@@ -237,7 +247,7 @@ proto.legacy_pb.Claim.prototype.clearVersion = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Claim.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
@@ -259,6 +269,9 @@ proto.legacy_pb.Claim.prototype.setClaimtype = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Claim.prototype.clearClaimtype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
@@ -266,7 +279,7 @@ proto.legacy_pb.Claim.prototype.clearClaimtype = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Claim.prototype.hasClaimtype = function() {
   return jspb.Message.getField(this, 2) != null;
@@ -289,6 +302,9 @@ proto.legacy_pb.Claim.prototype.setStream = function(value) {
 };
 
 
+/**
+ * Clears the message field making it undefined.
+ */
 proto.legacy_pb.Claim.prototype.clearStream = function() {
   this.setStream(undefined);
 };
@@ -296,7 +312,7 @@ proto.legacy_pb.Claim.prototype.clearStream = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Claim.prototype.hasStream = function() {
   return jspb.Message.getField(this, 3) != null;
@@ -319,6 +335,9 @@ proto.legacy_pb.Claim.prototype.setCertificate = function(value) {
 };
 
 
+/**
+ * Clears the message field making it undefined.
+ */
 proto.legacy_pb.Claim.prototype.clearCertificate = function() {
   this.setCertificate(undefined);
 };
@@ -326,7 +345,7 @@ proto.legacy_pb.Claim.prototype.clearCertificate = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Claim.prototype.hasCertificate = function() {
   return jspb.Message.getField(this, 4) != null;
@@ -349,6 +368,9 @@ proto.legacy_pb.Claim.prototype.setPublishersignature = function(value) {
 };
 
 
+/**
+ * Clears the message field making it undefined.
+ */
 proto.legacy_pb.Claim.prototype.clearPublishersignature = function() {
   this.setPublishersignature(undefined);
 };
@@ -356,7 +378,7 @@ proto.legacy_pb.Claim.prototype.clearPublishersignature = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Claim.prototype.hasPublishersignature = function() {
   return jspb.Message.getField(this, 5) != null;

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.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
@@ -31,10 +31,15 @@ proto.legacy_pb.Metadata = function(opt_data) {
 };
 goog.inherits(proto.legacy_pb.Metadata, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
+  /**
+   * @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.
@@ -61,7 +66,7 @@ proto.legacy_pb.Metadata.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.legacy_pb.Metadata.toObject = function(includeInstance, msg) {
-  var f, obj = {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     language: jspb.Message.getField(msg, 2),
     title: jspb.Message.getField(msg, 3),
@@ -481,6 +486,9 @@ proto.legacy_pb.Metadata.prototype.setVersion = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
@@ -488,7 +496,7 @@ proto.legacy_pb.Metadata.prototype.clearVersion = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
@@ -510,6 +518,9 @@ proto.legacy_pb.Metadata.prototype.setLanguage = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearLanguage = function() {
   jspb.Message.setField(this, 2, undefined);
 };
@@ -517,7 +528,7 @@ proto.legacy_pb.Metadata.prototype.clearLanguage = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasLanguage = function() {
   return jspb.Message.getField(this, 2) != null;
@@ -539,6 +550,9 @@ proto.legacy_pb.Metadata.prototype.setTitle = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearTitle = function() {
   jspb.Message.setField(this, 3, undefined);
 };
@@ -546,7 +560,7 @@ proto.legacy_pb.Metadata.prototype.clearTitle = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasTitle = function() {
   return jspb.Message.getField(this, 3) != null;
@@ -568,6 +582,9 @@ proto.legacy_pb.Metadata.prototype.setDescription = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearDescription = function() {
   jspb.Message.setField(this, 4, undefined);
 };
@@ -575,7 +592,7 @@ proto.legacy_pb.Metadata.prototype.clearDescription = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasDescription = function() {
   return jspb.Message.getField(this, 4) != null;
@@ -597,6 +614,9 @@ proto.legacy_pb.Metadata.prototype.setAuthor = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearAuthor = function() {
   jspb.Message.setField(this, 5, undefined);
 };
@@ -604,7 +624,7 @@ proto.legacy_pb.Metadata.prototype.clearAuthor = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasAuthor = function() {
   return jspb.Message.getField(this, 5) != null;
@@ -626,6 +646,9 @@ proto.legacy_pb.Metadata.prototype.setLicense = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearLicense = function() {
   jspb.Message.setField(this, 6, undefined);
 };
@@ -633,7 +656,7 @@ proto.legacy_pb.Metadata.prototype.clearLicense = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasLicense = function() {
   return jspb.Message.getField(this, 6) != null;
@@ -657,6 +680,9 @@ proto.legacy_pb.Metadata.prototype.setNsfw = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearNsfw = function() {
   jspb.Message.setField(this, 7, undefined);
 };
@@ -664,7 +690,7 @@ proto.legacy_pb.Metadata.prototype.clearNsfw = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasNsfw = function() {
   return jspb.Message.getField(this, 7) != null;
@@ -687,6 +713,9 @@ proto.legacy_pb.Metadata.prototype.setFee = function(value) {
 };
 
 
+/**
+ * Clears the message field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearFee = function() {
   this.setFee(undefined);
 };
@@ -694,7 +723,7 @@ proto.legacy_pb.Metadata.prototype.clearFee = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasFee = function() {
   return jspb.Message.getField(this, 8) != null;
@@ -716,6 +745,9 @@ proto.legacy_pb.Metadata.prototype.setThumbnail = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearThumbnail = function() {
   jspb.Message.setField(this, 9, undefined);
 };
@@ -723,7 +755,7 @@ proto.legacy_pb.Metadata.prototype.clearThumbnail = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasThumbnail = function() {
   return jspb.Message.getField(this, 9) != null;
@@ -745,6 +777,9 @@ proto.legacy_pb.Metadata.prototype.setPreview = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearPreview = function() {
   jspb.Message.setField(this, 10, undefined);
 };
@@ -752,7 +787,7 @@ proto.legacy_pb.Metadata.prototype.clearPreview = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasPreview = function() {
   return jspb.Message.getField(this, 10) != null;
@@ -774,6 +809,9 @@ proto.legacy_pb.Metadata.prototype.setLicenseurl = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Metadata.prototype.clearLicenseurl = function() {
   jspb.Message.setField(this, 11, undefined);
 };
@@ -781,7 +819,7 @@ proto.legacy_pb.Metadata.prototype.clearLicenseurl = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Metadata.prototype.hasLicenseurl = function() {
   return jspb.Message.getField(this, 11) != null;

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.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
@@ -30,10 +30,15 @@ proto.legacy_pb.Signature = function(opt_data) {
 };
 goog.inherits(proto.legacy_pb.Signature, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
+  /**
+   * @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.
@@ -60,7 +65,7 @@ proto.legacy_pb.Signature.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.legacy_pb.Signature.toObject = function(includeInstance, msg) {
-  var f, obj = {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     signaturetype: jspb.Message.getField(msg, 2),
     signature: msg.getSignature_asB64(),
@@ -200,6 +205,9 @@ proto.legacy_pb.Signature.prototype.setVersion = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Signature.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
@@ -207,7 +215,7 @@ proto.legacy_pb.Signature.prototype.clearVersion = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Signature.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
@@ -229,6 +237,9 @@ proto.legacy_pb.Signature.prototype.setSignaturetype = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Signature.prototype.clearSignaturetype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
@@ -236,7 +247,7 @@ proto.legacy_pb.Signature.prototype.clearSignaturetype = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Signature.prototype.hasSignaturetype = function() {
   return jspb.Message.getField(this, 2) != null;
@@ -282,6 +293,9 @@ proto.legacy_pb.Signature.prototype.setSignature = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Signature.prototype.clearSignature = function() {
   jspb.Message.setField(this, 3, undefined);
 };
@@ -289,7 +303,7 @@ proto.legacy_pb.Signature.prototype.clearSignature = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Signature.prototype.hasSignature = function() {
   return jspb.Message.getField(this, 3) != null;
@@ -335,6 +349,9 @@ proto.legacy_pb.Signature.prototype.setCertificateid = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Signature.prototype.clearCertificateid = function() {
   jspb.Message.setField(this, 4, undefined);
 };
@@ -342,7 +359,7 @@ proto.legacy_pb.Signature.prototype.clearCertificateid = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Signature.prototype.hasCertificateid = function() {
   return jspb.Message.getField(this, 4) != null;

v1/js/source_pb.js

@@ -14,7 +14,6 @@ var global = Function('return this')();
 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
@@ -30,10 +29,15 @@ proto.legacy_pb.Source = function(opt_data) {
 };
 goog.inherits(proto.legacy_pb.Source, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
+  /**
+   * @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.
@@ -60,7 +64,7 @@ proto.legacy_pb.Source.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.legacy_pb.Source.toObject = function(includeInstance, msg) {
-  var f, obj = {
+  var obj = {
     version: jspb.Message.getField(msg, 1),
     sourcetype: jspb.Message.getField(msg, 2),
     source: msg.getSource_asB64(),
@@ -208,6 +212,9 @@ proto.legacy_pb.Source.prototype.setVersion = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Source.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
@@ -215,7 +222,7 @@ proto.legacy_pb.Source.prototype.clearVersion = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Source.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
@@ -237,6 +244,9 @@ proto.legacy_pb.Source.prototype.setSourcetype = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Source.prototype.clearSourcetype = function() {
   jspb.Message.setField(this, 2, undefined);
 };
@@ -244,7 +254,7 @@ proto.legacy_pb.Source.prototype.clearSourcetype = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Source.prototype.hasSourcetype = function() {
   return jspb.Message.getField(this, 2) != null;
@@ -290,6 +300,9 @@ proto.legacy_pb.Source.prototype.setSource = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Source.prototype.clearSource = function() {
   jspb.Message.setField(this, 3, undefined);
 };
@@ -297,7 +310,7 @@ proto.legacy_pb.Source.prototype.clearSource = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Source.prototype.hasSource = function() {
   return jspb.Message.getField(this, 3) != null;
@@ -319,6 +332,9 @@ proto.legacy_pb.Source.prototype.setContenttype = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Source.prototype.clearContenttype = function() {
   jspb.Message.setField(this, 4, undefined);
 };
@@ -326,7 +342,7 @@ proto.legacy_pb.Source.prototype.clearContenttype = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Source.prototype.hasContenttype = function() {
   return jspb.Message.getField(this, 4) != null;

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.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
@@ -31,10 +32,15 @@ proto.legacy_pb.Stream = function(opt_data) {
 };
 goog.inherits(proto.legacy_pb.Stream, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
+  /**
+   * @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.
@@ -61,7 +67,7 @@ proto.legacy_pb.Stream.prototype.toObject = function(opt_includeInstance) {
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
 proto.legacy_pb.Stream.toObject = function(includeInstance, msg) {
-  var f, obj = {
+  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)
@@ -193,6 +199,9 @@ proto.legacy_pb.Stream.prototype.setVersion = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Stream.prototype.clearVersion = function() {
   jspb.Message.setField(this, 1, undefined);
 };
@@ -200,7 +209,7 @@ proto.legacy_pb.Stream.prototype.clearVersion = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Stream.prototype.hasVersion = function() {
   return jspb.Message.getField(this, 1) != null;
@@ -223,6 +232,9 @@ proto.legacy_pb.Stream.prototype.setMetadata = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Stream.prototype.clearMetadata = function() {
   jspb.Message.setField(this, 2, undefined);
 };
@@ -230,7 +242,7 @@ proto.legacy_pb.Stream.prototype.clearMetadata = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Stream.prototype.hasMetadata = function() {
   return jspb.Message.getField(this, 2) != null;
@@ -253,6 +265,9 @@ proto.legacy_pb.Stream.prototype.setSource = function(value) {
 };
 
 
+/**
+ * Clears the field making it undefined.
+ */
 proto.legacy_pb.Stream.prototype.clearSource = function() {
   jspb.Message.setField(this, 3, undefined);
 };
@@ -260,7 +275,7 @@ proto.legacy_pb.Stream.prototype.clearSource = function() {
 
 /**
  * Returns whether this field is set.
- * @return {!boolean}
+ * @return {boolean}
  */
 proto.legacy_pb.Stream.prototype.hasSource = function() {
   return jspb.Message.getField(this, 3) != null;

v1/python/certificate_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: certificate.proto
 

v1/python/fee_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: fee.proto
 

v1/python/legacy_claim_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: legacy_claim.proto
 

v1/python/metadata_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: metadata.proto
 

v1/python/signature_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: signature.proto
 

v1/python/source_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: source.proto
 

v1/python/stream_pb2.py

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Generated by the protocol buffer compiler.  DO NOT EDIT!
 # source: stream.proto
 

v2/build.sh

@@ -29,3 +29,5 @@ 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)