diff --git a/dart/lib/proto/google/protobuf/descriptor.pb.dart b/dart/lib/proto/google/protobuf/descriptor.pb.dart
index a408e5be..106f89a5 100644
--- a/dart/lib/proto/google/protobuf/descriptor.pb.dart
+++ b/dart/lib/proto/google/protobuf/descriptor.pb.dart
@@ -1936,7 +1936,7 @@ class FileOptions extends $pb.GeneratedMessage {
     $core.bool? javaGenericServices,
     $core.bool? pyGenericServices,
     @$core.Deprecated('This field is deprecated.')
-        $core.bool? javaGenerateEqualsAndHash,
+    $core.bool? javaGenerateEqualsAndHash,
     $core.bool? deprecated,
     $core.bool? javaStringCheckUtf8,
     $core.bool? ccEnableArenas,
diff --git a/dart/lib/proto/okapi/examples/v1/examples.pb.dart b/dart/lib/proto/okapi/examples/v1/examples.pb.dart
index 335f1d10..3ef3dcc0 100644
--- a/dart/lib/proto/okapi/examples/v1/examples.pb.dart
+++ b/dart/lib/proto/okapi/examples/v1/examples.pb.dart
@@ -1,9 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/examples/v1/examples.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:async' as $async;
 import 'dart:core' as $core;
@@ -13,38 +17,31 @@ import 'package:protobuf/protobuf.dart' as $pb;
 import '../../../pbmse/v1/pbmse.pb.dart' as $2;
 
 class BasicMessage extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'BasicMessage',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.examples.v1'),
-      createEmptyInstance: create)
-    ..aOS(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'text')
-    ..hasRequiredFields = false;
-
-  BasicMessage._() : super();
   factory BasicMessage({
     $core.String? text,
   }) {
-    final _result = create();
+    final $result = create();
     if (text != null) {
-      _result.text = text;
+      $result.text = text;
     }
-    return _result;
+    return $result;
   }
+  BasicMessage._() : super();
   factory BasicMessage.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory BasicMessage.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'BasicMessage',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.examples.v1'),
+      createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'text')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -54,8 +51,10 @@ class BasicMessage extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   BasicMessage copyWith(void Function(BasicMessage) updates) =>
       super.copyWith((message) => updates(message as BasicMessage))
-          as BasicMessage; // ignore: deprecated_member_use
+          as BasicMessage;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static BasicMessage create() => BasicMessage._();
   BasicMessage createEmptyInstance() => create();
@@ -84,16 +83,15 @@ class SecureExampleServiceApi {
   SecureExampleServiceApi(this._client);
 
   $async.Future<$2.EncryptedMessage> unary(
-      $pb.ClientContext? ctx, $2.EncryptedMessage request) {
-    var emptyResponse = $2.EncryptedMessage();
-    return _client.invoke<$2.EncryptedMessage>(
-        ctx, 'SecureExampleService', 'Unary', request, emptyResponse);
-  }
-
+          $pb.ClientContext? ctx, $2.EncryptedMessage request) =>
+      _client.invoke<$2.EncryptedMessage>(
+          ctx, 'SecureExampleService', 'Unary', request, $2.EncryptedMessage());
   $async.Future<$2.EncryptedMessage> serverStreaming(
-      $pb.ClientContext? ctx, $2.EncryptedMessage request) {
-    var emptyResponse = $2.EncryptedMessage();
-    return _client.invoke<$2.EncryptedMessage>(
-        ctx, 'SecureExampleService', 'ServerStreaming', request, emptyResponse);
-  }
+          $pb.ClientContext? ctx, $2.EncryptedMessage request) =>
+      _client.invoke<$2.EncryptedMessage>(ctx, 'SecureExampleService',
+          'ServerStreaming', request, $2.EncryptedMessage());
 }
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/dart/lib/proto/okapi/examples/v1/examples.pbenum.dart b/dart/lib/proto/okapi/examples/v1/examples.pbenum.dart
index 7a589b6a..357a8ac7 100644
--- a/dart/lib/proto/okapi/examples/v1/examples.pbenum.dart
+++ b/dart/lib/proto/okapi/examples/v1/examples.pbenum.dart
@@ -1,6 +1,10 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/examples/v1/examples.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
diff --git a/dart/lib/proto/okapi/examples/v1/examples.pbjson.dart b/dart/lib/proto/okapi/examples/v1/examples.pbjson.dart
index b981af2d..6dff7d7d 100644
--- a/dart/lib/proto/okapi/examples/v1/examples.pbjson.dart
+++ b/dart/lib/proto/okapi/examples/v1/examples.pbjson.dart
@@ -1,36 +1,41 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/examples/v1/examples.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
+
 import '../../../pbmse/v1/pbmse.pbjson.dart' as $2;
 
 @$core.Deprecated('Use basicMessageDescriptor instead')
-const BasicMessage$json = const {
+const BasicMessage$json = {
   '1': 'BasicMessage',
-  '2': const [
-    const {'1': 'text', '3': 1, '4': 1, '5': 9, '10': 'text'},
+  '2': [
+    {'1': 'text', '3': 1, '4': 1, '5': 9, '10': 'text'},
   ],
 };
 
 /// Descriptor for `BasicMessage`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List basicMessageDescriptor =
     $convert.base64Decode('CgxCYXNpY01lc3NhZ2USEgoEdGV4dBgBIAEoCVIEdGV4dA==');
-const $core.Map<$core.String, $core.dynamic> SecureExampleServiceBase$json =
-    const {
+
+const $core.Map<$core.String, $core.dynamic> SecureExampleServiceBase$json = {
   '1': 'SecureExampleService',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'Unary',
       '2': '.pbmse.v1.EncryptedMessage',
       '3': '.pbmse.v1.EncryptedMessage'
     },
-    const {
+    {
       '1': 'ServerStreaming',
       '2': '.pbmse.v1.EncryptedMessage',
       '3': '.pbmse.v1.EncryptedMessage',
@@ -41,7 +46,7 @@ const $core.Map<$core.String, $core.dynamic> SecureExampleServiceBase$json =
 
 @$core.Deprecated('Use secureExampleServiceDescriptor instead')
 const $core.Map<$core.String, $core.Map<$core.String, $core.dynamic>>
-    SecureExampleServiceBase$messageJson = const {
+    SecureExampleServiceBase$messageJson = {
   '.pbmse.v1.EncryptedMessage': $2.EncryptedMessage$json,
   '.pbmse.v1.EncryptionRecipient': $2.EncryptionRecipient$json,
   '.pbmse.v1.EncryptionHeader': $2.EncryptionHeader$json,
@@ -49,4 +54,6 @@ const $core.Map<$core.String, $core.Map<$core.String, $core.dynamic>>
 
 /// Descriptor for `SecureExampleService`. Decode as a `google.protobuf.ServiceDescriptorProto`.
 final $typed_data.Uint8List secureExampleServiceDescriptor = $convert.base64Decode(
-    'ChRTZWN1cmVFeGFtcGxlU2VydmljZRI/CgVVbmFyeRIaLnBibXNlLnYxLkVuY3J5cHRlZE1lc3NhZ2UaGi5wYm1zZS52MS5FbmNyeXB0ZWRNZXNzYWdlEksKD1NlcnZlclN0cmVhbWluZxIaLnBibXNlLnYxLkVuY3J5cHRlZE1lc3NhZ2UaGi5wYm1zZS52MS5FbmNyeXB0ZWRNZXNzYWdlMAE=');
+    'ChRTZWN1cmVFeGFtcGxlU2VydmljZRI/CgVVbmFyeRIaLnBibXNlLnYxLkVuY3J5cHRlZE1lc3'
+    'NhZ2UaGi5wYm1zZS52MS5FbmNyeXB0ZWRNZXNzYWdlEksKD1NlcnZlclN0cmVhbWluZxIaLnBi'
+    'bXNlLnYxLkVuY3J5cHRlZE1lc3NhZ2UaGi5wYm1zZS52MS5FbmNyeXB0ZWRNZXNzYWdlMAE=');
diff --git a/dart/lib/proto/okapi/examples/v1/examples.pbserver.dart b/dart/lib/proto/okapi/examples/v1/examples.pbserver.dart
index d9a9a5fd..c3fec43b 100644
--- a/dart/lib/proto/okapi/examples/v1/examples.pbserver.dart
+++ b/dart/lib/proto/okapi/examples/v1/examples.pbserver.dart
@@ -1,15 +1,20 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/examples/v1/examples.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:async' as $async;
+import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import 'dart:core' as $core;
 import '../../../pbmse/v1/pbmse.pb.dart' as $2;
 import 'examples.pbjson.dart';
 
@@ -21,26 +26,26 @@ abstract class SecureExampleServiceBase extends $pb.GeneratedService {
   $async.Future<$2.EncryptedMessage> serverStreaming(
       $pb.ServerContext ctx, $2.EncryptedMessage request);
 
-  $pb.GeneratedMessage createRequest($core.String method) {
-    switch (method) {
+  $pb.GeneratedMessage createRequest($core.String methodName) {
+    switch (methodName) {
       case 'Unary':
         return $2.EncryptedMessage();
       case 'ServerStreaming':
         return $2.EncryptedMessage();
       default:
-        throw $core.ArgumentError('Unknown method: $method');
+        throw $core.ArgumentError('Unknown method: $methodName');
     }
   }
 
   $async.Future<$pb.GeneratedMessage> handleCall($pb.ServerContext ctx,
-      $core.String method, $pb.GeneratedMessage request) {
-    switch (method) {
+      $core.String methodName, $pb.GeneratedMessage request) {
+    switch (methodName) {
       case 'Unary':
         return this.unary(ctx, request as $2.EncryptedMessage);
       case 'ServerStreaming':
         return this.serverStreaming(ctx, request as $2.EncryptedMessage);
       default:
-        throw $core.ArgumentError('Unknown method: $method');
+        throw $core.ArgumentError('Unknown method: $methodName');
     }
   }
 
diff --git a/dart/lib/proto/okapi/hashing/v1/hashing.pb.dart b/dart/lib/proto/okapi/hashing/v1/hashing.pb.dart
index e6e8f368..808b62b5 100644
--- a/dart/lib/proto/okapi/hashing/v1/hashing.pb.dart
+++ b/dart/lib/proto/okapi/hashing/v1/hashing.pb.dart
@@ -1,48 +1,45 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/hashing/v1/hashing.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class Blake3HashRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'Blake3HashRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.hashing.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'data',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  Blake3HashRequest._() : super();
   factory Blake3HashRequest({
     $core.List<$core.int>? data,
   }) {
-    final _result = create();
+    final $result = create();
     if (data != null) {
-      _result.data = data;
+      $result.data = data;
     }
-    return _result;
+    return $result;
   }
+  Blake3HashRequest._() : super();
   factory Blake3HashRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Blake3HashRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Blake3HashRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.hashing.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -52,8 +49,10 @@ class Blake3HashRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   Blake3HashRequest copyWith(void Function(Blake3HashRequest) updates) =>
       super.copyWith((message) => updates(message as Blake3HashRequest))
-          as Blake3HashRequest; // ignore: deprecated_member_use
+          as Blake3HashRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static Blake3HashRequest create() => Blake3HashRequest._();
   Blake3HashRequest createEmptyInstance() => create();
@@ -78,39 +77,32 @@ class Blake3HashRequest extends $pb.GeneratedMessage {
 }
 
 class Blake3HashResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'Blake3HashResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.hashing.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'digest',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  Blake3HashResponse._() : super();
   factory Blake3HashResponse({
     $core.List<$core.int>? digest,
   }) {
-    final _result = create();
+    final $result = create();
     if (digest != null) {
-      _result.digest = digest;
+      $result.digest = digest;
     }
-    return _result;
+    return $result;
   }
+  Blake3HashResponse._() : super();
   factory Blake3HashResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Blake3HashResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Blake3HashResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.hashing.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'digest', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -120,8 +112,10 @@ class Blake3HashResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   Blake3HashResponse copyWith(void Function(Blake3HashResponse) updates) =>
       super.copyWith((message) => updates(message as Blake3HashResponse))
-          as Blake3HashResponse; // ignore: deprecated_member_use
+          as Blake3HashResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static Blake3HashResponse create() => Blake3HashResponse._();
   Blake3HashResponse createEmptyInstance() => create();
@@ -146,49 +140,38 @@ class Blake3HashResponse extends $pb.GeneratedMessage {
 }
 
 class Blake3KeyedHashRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'Blake3KeyedHashRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.hashing.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'data',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'key',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  Blake3KeyedHashRequest._() : super();
   factory Blake3KeyedHashRequest({
     $core.List<$core.int>? data,
     $core.List<$core.int>? key,
   }) {
-    final _result = create();
+    final $result = create();
     if (data != null) {
-      _result.data = data;
+      $result.data = data;
     }
     if (key != null) {
-      _result.key = key;
+      $result.key = key;
     }
-    return _result;
+    return $result;
   }
+  Blake3KeyedHashRequest._() : super();
   factory Blake3KeyedHashRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Blake3KeyedHashRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Blake3KeyedHashRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.hashing.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'key', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -200,8 +183,10 @@ class Blake3KeyedHashRequest extends $pb.GeneratedMessage {
   Blake3KeyedHashRequest copyWith(
           void Function(Blake3KeyedHashRequest) updates) =>
       super.copyWith((message) => updates(message as Blake3KeyedHashRequest))
-          as Blake3KeyedHashRequest; // ignore: deprecated_member_use
+          as Blake3KeyedHashRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static Blake3KeyedHashRequest create() => Blake3KeyedHashRequest._();
   Blake3KeyedHashRequest createEmptyInstance() => create();
@@ -238,39 +223,32 @@ class Blake3KeyedHashRequest extends $pb.GeneratedMessage {
 }
 
 class Blake3KeyedHashResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'Blake3KeyedHashResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.hashing.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'digest',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  Blake3KeyedHashResponse._() : super();
   factory Blake3KeyedHashResponse({
     $core.List<$core.int>? digest,
   }) {
-    final _result = create();
+    final $result = create();
     if (digest != null) {
-      _result.digest = digest;
+      $result.digest = digest;
     }
-    return _result;
+    return $result;
   }
+  Blake3KeyedHashResponse._() : super();
   factory Blake3KeyedHashResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Blake3KeyedHashResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Blake3KeyedHashResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.hashing.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'digest', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -282,8 +260,10 @@ class Blake3KeyedHashResponse extends $pb.GeneratedMessage {
   Blake3KeyedHashResponse copyWith(
           void Function(Blake3KeyedHashResponse) updates) =>
       super.copyWith((message) => updates(message as Blake3KeyedHashResponse))
-          as Blake3KeyedHashResponse; // ignore: deprecated_member_use
+          as Blake3KeyedHashResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static Blake3KeyedHashResponse create() => Blake3KeyedHashResponse._();
   Blake3KeyedHashResponse createEmptyInstance() => create();
@@ -308,49 +288,38 @@ class Blake3KeyedHashResponse extends $pb.GeneratedMessage {
 }
 
 class Blake3DeriveKeyRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'Blake3DeriveKeyRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.hashing.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'context',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'keyMaterial',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  Blake3DeriveKeyRequest._() : super();
   factory Blake3DeriveKeyRequest({
     $core.List<$core.int>? context,
     $core.List<$core.int>? keyMaterial,
   }) {
-    final _result = create();
+    final $result = create();
     if (context != null) {
-      _result.context = context;
+      $result.context = context;
     }
     if (keyMaterial != null) {
-      _result.keyMaterial = keyMaterial;
+      $result.keyMaterial = keyMaterial;
     }
-    return _result;
+    return $result;
   }
+  Blake3DeriveKeyRequest._() : super();
   factory Blake3DeriveKeyRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Blake3DeriveKeyRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Blake3DeriveKeyRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.hashing.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'context', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'keyMaterial', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -362,8 +331,10 @@ class Blake3DeriveKeyRequest extends $pb.GeneratedMessage {
   Blake3DeriveKeyRequest copyWith(
           void Function(Blake3DeriveKeyRequest) updates) =>
       super.copyWith((message) => updates(message as Blake3DeriveKeyRequest))
-          as Blake3DeriveKeyRequest; // ignore: deprecated_member_use
+          as Blake3DeriveKeyRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static Blake3DeriveKeyRequest create() => Blake3DeriveKeyRequest._();
   Blake3DeriveKeyRequest createEmptyInstance() => create();
@@ -400,39 +371,32 @@ class Blake3DeriveKeyRequest extends $pb.GeneratedMessage {
 }
 
 class Blake3DeriveKeyResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'Blake3DeriveKeyResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.hashing.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'digest',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  Blake3DeriveKeyResponse._() : super();
   factory Blake3DeriveKeyResponse({
     $core.List<$core.int>? digest,
   }) {
-    final _result = create();
+    final $result = create();
     if (digest != null) {
-      _result.digest = digest;
+      $result.digest = digest;
     }
-    return _result;
+    return $result;
   }
+  Blake3DeriveKeyResponse._() : super();
   factory Blake3DeriveKeyResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Blake3DeriveKeyResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Blake3DeriveKeyResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.hashing.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'digest', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -444,8 +408,10 @@ class Blake3DeriveKeyResponse extends $pb.GeneratedMessage {
   Blake3DeriveKeyResponse copyWith(
           void Function(Blake3DeriveKeyResponse) updates) =>
       super.copyWith((message) => updates(message as Blake3DeriveKeyResponse))
-          as Blake3DeriveKeyResponse; // ignore: deprecated_member_use
+          as Blake3DeriveKeyResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static Blake3DeriveKeyResponse create() => Blake3DeriveKeyResponse._();
   Blake3DeriveKeyResponse createEmptyInstance() => create();
@@ -470,39 +436,32 @@ class Blake3DeriveKeyResponse extends $pb.GeneratedMessage {
 }
 
 class SHA256HashRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'SHA256HashRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.hashing.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'data',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  SHA256HashRequest._() : super();
   factory SHA256HashRequest({
     $core.List<$core.int>? data,
   }) {
-    final _result = create();
+    final $result = create();
     if (data != null) {
-      _result.data = data;
+      $result.data = data;
     }
-    return _result;
+    return $result;
   }
+  SHA256HashRequest._() : super();
   factory SHA256HashRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory SHA256HashRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'SHA256HashRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.hashing.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -512,8 +471,10 @@ class SHA256HashRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   SHA256HashRequest copyWith(void Function(SHA256HashRequest) updates) =>
       super.copyWith((message) => updates(message as SHA256HashRequest))
-          as SHA256HashRequest; // ignore: deprecated_member_use
+          as SHA256HashRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static SHA256HashRequest create() => SHA256HashRequest._();
   SHA256HashRequest createEmptyInstance() => create();
@@ -538,39 +499,32 @@ class SHA256HashRequest extends $pb.GeneratedMessage {
 }
 
 class SHA256HashResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'SHA256HashResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.hashing.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'digest',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  SHA256HashResponse._() : super();
   factory SHA256HashResponse({
     $core.List<$core.int>? digest,
   }) {
-    final _result = create();
+    final $result = create();
     if (digest != null) {
-      _result.digest = digest;
+      $result.digest = digest;
     }
-    return _result;
+    return $result;
   }
+  SHA256HashResponse._() : super();
   factory SHA256HashResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory SHA256HashResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'SHA256HashResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.hashing.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'digest', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -580,8 +534,10 @@ class SHA256HashResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   SHA256HashResponse copyWith(void Function(SHA256HashResponse) updates) =>
       super.copyWith((message) => updates(message as SHA256HashResponse))
-          as SHA256HashResponse; // ignore: deprecated_member_use
+          as SHA256HashResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static SHA256HashResponse create() => SHA256HashResponse._();
   SHA256HashResponse createEmptyInstance() => create();
@@ -604,3 +560,7 @@ class SHA256HashResponse extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   void clearDigest() => clearField(1);
 }
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/dart/lib/proto/okapi/hashing/v1/hashing.pbenum.dart b/dart/lib/proto/okapi/hashing/v1/hashing.pbenum.dart
index d055183e..e37c291b 100644
--- a/dart/lib/proto/okapi/hashing/v1/hashing.pbenum.dart
+++ b/dart/lib/proto/okapi/hashing/v1/hashing.pbenum.dart
@@ -1,6 +1,10 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/hashing/v1/hashing.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
diff --git a/dart/lib/proto/okapi/hashing/v1/hashing.pbjson.dart b/dart/lib/proto/okapi/hashing/v1/hashing.pbjson.dart
index 250a91bc..02c4d37f 100644
--- a/dart/lib/proto/okapi/hashing/v1/hashing.pbjson.dart
+++ b/dart/lib/proto/okapi/hashing/v1/hashing.pbjson.dart
@@ -1,30 +1,35 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/hashing/v1/hashing.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
 @$core.Deprecated('Use blake3HashRequestDescriptor instead')
-const Blake3HashRequest$json = const {
+const Blake3HashRequest$json = {
   '1': 'Blake3HashRequest',
-  '2': const [
-    const {'1': 'data', '3': 1, '4': 1, '5': 12, '10': 'data'},
+  '2': [
+    {'1': 'data', '3': 1, '4': 1, '5': 12, '10': 'data'},
   ],
 };
 
 /// Descriptor for `Blake3HashRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List blake3HashRequestDescriptor = $convert
     .base64Decode('ChFCbGFrZTNIYXNoUmVxdWVzdBISCgRkYXRhGAEgASgMUgRkYXRh');
+
 @$core.Deprecated('Use blake3HashResponseDescriptor instead')
-const Blake3HashResponse$json = const {
+const Blake3HashResponse$json = {
   '1': 'Blake3HashResponse',
-  '2': const [
-    const {'1': 'digest', '3': 1, '4': 1, '5': 12, '10': 'digest'},
+  '2': [
+    {'1': 'digest', '3': 1, '4': 1, '5': 12, '10': 'digest'},
   ],
 };
 
@@ -32,24 +37,27 @@ const Blake3HashResponse$json = const {
 final $typed_data.Uint8List blake3HashResponseDescriptor =
     $convert.base64Decode(
         'ChJCbGFrZTNIYXNoUmVzcG9uc2USFgoGZGlnZXN0GAEgASgMUgZkaWdlc3Q=');
+
 @$core.Deprecated('Use blake3KeyedHashRequestDescriptor instead')
-const Blake3KeyedHashRequest$json = const {
+const Blake3KeyedHashRequest$json = {
   '1': 'Blake3KeyedHashRequest',
-  '2': const [
-    const {'1': 'data', '3': 1, '4': 1, '5': 12, '10': 'data'},
-    const {'1': 'key', '3': 2, '4': 1, '5': 12, '10': 'key'},
+  '2': [
+    {'1': 'data', '3': 1, '4': 1, '5': 12, '10': 'data'},
+    {'1': 'key', '3': 2, '4': 1, '5': 12, '10': 'key'},
   ],
 };
 
 /// Descriptor for `Blake3KeyedHashRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List blake3KeyedHashRequestDescriptor =
     $convert.base64Decode(
-        'ChZCbGFrZTNLZXllZEhhc2hSZXF1ZXN0EhIKBGRhdGEYASABKAxSBGRhdGESEAoDa2V5GAIgASgMUgNrZXk=');
+        'ChZCbGFrZTNLZXllZEhhc2hSZXF1ZXN0EhIKBGRhdGEYASABKAxSBGRhdGESEAoDa2V5GAIgAS'
+        'gMUgNrZXk=');
+
 @$core.Deprecated('Use blake3KeyedHashResponseDescriptor instead')
-const Blake3KeyedHashResponse$json = const {
+const Blake3KeyedHashResponse$json = {
   '1': 'Blake3KeyedHashResponse',
-  '2': const [
-    const {'1': 'digest', '3': 1, '4': 1, '5': 12, '10': 'digest'},
+  '2': [
+    {'1': 'digest', '3': 1, '4': 1, '5': 12, '10': 'digest'},
   ],
 };
 
@@ -57,24 +65,27 @@ const Blake3KeyedHashResponse$json = const {
 final $typed_data.Uint8List blake3KeyedHashResponseDescriptor =
     $convert.base64Decode(
         'ChdCbGFrZTNLZXllZEhhc2hSZXNwb25zZRIWCgZkaWdlc3QYASABKAxSBmRpZ2VzdA==');
+
 @$core.Deprecated('Use blake3DeriveKeyRequestDescriptor instead')
-const Blake3DeriveKeyRequest$json = const {
+const Blake3DeriveKeyRequest$json = {
   '1': 'Blake3DeriveKeyRequest',
-  '2': const [
-    const {'1': 'context', '3': 1, '4': 1, '5': 12, '10': 'context'},
-    const {'1': 'key_material', '3': 2, '4': 1, '5': 12, '10': 'keyMaterial'},
+  '2': [
+    {'1': 'context', '3': 1, '4': 1, '5': 12, '10': 'context'},
+    {'1': 'key_material', '3': 2, '4': 1, '5': 12, '10': 'keyMaterial'},
   ],
 };
 
 /// Descriptor for `Blake3DeriveKeyRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List blake3DeriveKeyRequestDescriptor =
     $convert.base64Decode(
-        'ChZCbGFrZTNEZXJpdmVLZXlSZXF1ZXN0EhgKB2NvbnRleHQYASABKAxSB2NvbnRleHQSIQoMa2V5X21hdGVyaWFsGAIgASgMUgtrZXlNYXRlcmlhbA==');
+        'ChZCbGFrZTNEZXJpdmVLZXlSZXF1ZXN0EhgKB2NvbnRleHQYASABKAxSB2NvbnRleHQSIQoMa2'
+        'V5X21hdGVyaWFsGAIgASgMUgtrZXlNYXRlcmlhbA==');
+
 @$core.Deprecated('Use blake3DeriveKeyResponseDescriptor instead')
-const Blake3DeriveKeyResponse$json = const {
+const Blake3DeriveKeyResponse$json = {
   '1': 'Blake3DeriveKeyResponse',
-  '2': const [
-    const {'1': 'digest', '3': 1, '4': 1, '5': 12, '10': 'digest'},
+  '2': [
+    {'1': 'digest', '3': 1, '4': 1, '5': 12, '10': 'digest'},
   ],
 };
 
@@ -82,22 +93,24 @@ const Blake3DeriveKeyResponse$json = const {
 final $typed_data.Uint8List blake3DeriveKeyResponseDescriptor =
     $convert.base64Decode(
         'ChdCbGFrZTNEZXJpdmVLZXlSZXNwb25zZRIWCgZkaWdlc3QYASABKAxSBmRpZ2VzdA==');
+
 @$core.Deprecated('Use sHA256HashRequestDescriptor instead')
-const SHA256HashRequest$json = const {
+const SHA256HashRequest$json = {
   '1': 'SHA256HashRequest',
-  '2': const [
-    const {'1': 'data', '3': 1, '4': 1, '5': 12, '10': 'data'},
+  '2': [
+    {'1': 'data', '3': 1, '4': 1, '5': 12, '10': 'data'},
   ],
 };
 
 /// Descriptor for `SHA256HashRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List sHA256HashRequestDescriptor = $convert
     .base64Decode('ChFTSEEyNTZIYXNoUmVxdWVzdBISCgRkYXRhGAEgASgMUgRkYXRh');
+
 @$core.Deprecated('Use sHA256HashResponseDescriptor instead')
-const SHA256HashResponse$json = const {
+const SHA256HashResponse$json = {
   '1': 'SHA256HashResponse',
-  '2': const [
-    const {'1': 'digest', '3': 1, '4': 1, '5': 12, '10': 'digest'},
+  '2': [
+    {'1': 'digest', '3': 1, '4': 1, '5': 12, '10': 'digest'},
   ],
 };
 
diff --git a/dart/lib/proto/okapi/hashing/v1/hashing.pbserver.dart b/dart/lib/proto/okapi/hashing/v1/hashing.pbserver.dart
index 1e8593b3..ef784d54 100644
--- a/dart/lib/proto/okapi/hashing/v1/hashing.pbserver.dart
+++ b/dart/lib/proto/okapi/hashing/v1/hashing.pbserver.dart
@@ -1,8 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/hashing/v1/hashing.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'hashing.pb.dart';
diff --git a/dart/lib/proto/okapi/keys/v1/keys.pb.dart b/dart/lib/proto/okapi/keys/v1/keys.pb.dart
index 793c3aa1..083137b1 100644
--- a/dart/lib/proto/okapi/keys/v1/keys.pb.dart
+++ b/dart/lib/proto/okapi/keys/v1/keys.pb.dart
@@ -1,80 +1,66 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/keys/v1/keys.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
 import '../../../google/protobuf/struct.pb.dart' as $0;
-
 import 'keys.pbenum.dart';
 
 export 'keys.pbenum.dart';
 
 class GenerateKeyRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'GenerateKeyRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.keys.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'seed',
-        $pb.PbFieldType.OY)
-    ..e<KeyType>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'keyType',
-        $pb.PbFieldType.OE,
-        defaultOrMaker: KeyType.KEY_TYPE_UNSPECIFIED,
-        valueOf: KeyType.valueOf,
-        enumValues: KeyType.values)
-    ..e<DocumentKeyFormat>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'keyFormat',
-        $pb.PbFieldType.OE,
-        defaultOrMaker: DocumentKeyFormat.DOCUMENT_KEY_FORMAT_UNSPECIFIED,
-        valueOf: DocumentKeyFormat.valueOf,
-        enumValues: DocumentKeyFormat.values)
-    ..hasRequiredFields = false;
-
-  GenerateKeyRequest._() : super();
   factory GenerateKeyRequest({
     $core.List<$core.int>? seed,
     KeyType? keyType,
     DocumentKeyFormat? keyFormat,
   }) {
-    final _result = create();
+    final $result = create();
     if (seed != null) {
-      _result.seed = seed;
+      $result.seed = seed;
     }
     if (keyType != null) {
-      _result.keyType = keyType;
+      $result.keyType = keyType;
     }
     if (keyFormat != null) {
-      _result.keyFormat = keyFormat;
+      $result.keyFormat = keyFormat;
     }
-    return _result;
+    return $result;
   }
+  GenerateKeyRequest._() : super();
   factory GenerateKeyRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory GenerateKeyRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GenerateKeyRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'okapi.keys.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'seed', $pb.PbFieldType.OY)
+    ..e<KeyType>(2, _omitFieldNames ? '' : 'keyType', $pb.PbFieldType.OE,
+        defaultOrMaker: KeyType.KEY_TYPE_UNSPECIFIED,
+        valueOf: KeyType.valueOf,
+        enumValues: KeyType.values)
+    ..e<DocumentKeyFormat>(
+        3, _omitFieldNames ? '' : 'keyFormat', $pb.PbFieldType.OE,
+        defaultOrMaker: DocumentKeyFormat.DOCUMENT_KEY_FORMAT_UNSPECIFIED,
+        valueOf: DocumentKeyFormat.valueOf,
+        enumValues: DocumentKeyFormat.values)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -84,8 +70,10 @@ class GenerateKeyRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   GenerateKeyRequest copyWith(void Function(GenerateKeyRequest) updates) =>
       super.copyWith((message) => updates(message as GenerateKeyRequest))
-          as GenerateKeyRequest; // ignore: deprecated_member_use
+          as GenerateKeyRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static GenerateKeyRequest create() => GenerateKeyRequest._();
   GenerateKeyRequest createEmptyInstance() => create();
@@ -134,50 +122,37 @@ class GenerateKeyRequest extends $pb.GeneratedMessage {
 }
 
 class GenerateKeyResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'GenerateKeyResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.keys.v1'),
-      createEmptyInstance: create)
-    ..pc<JsonWebKey>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'key',
-        $pb.PbFieldType.PM,
-        subBuilder: JsonWebKey.create)
-    ..aOM<$0.Struct>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'didDocument',
-        subBuilder: $0.Struct.create)
-    ..hasRequiredFields = false;
-
-  GenerateKeyResponse._() : super();
   factory GenerateKeyResponse({
     $core.Iterable<JsonWebKey>? key,
     $0.Struct? didDocument,
   }) {
-    final _result = create();
+    final $result = create();
     if (key != null) {
-      _result.key.addAll(key);
+      $result.key.addAll(key);
     }
     if (didDocument != null) {
-      _result.didDocument = didDocument;
+      $result.didDocument = didDocument;
     }
-    return _result;
+    return $result;
   }
+  GenerateKeyResponse._() : super();
   factory GenerateKeyResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory GenerateKeyResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'GenerateKeyResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'okapi.keys.v1'),
+      createEmptyInstance: create)
+    ..pc<JsonWebKey>(1, _omitFieldNames ? '' : 'key', $pb.PbFieldType.PM,
+        subBuilder: JsonWebKey.create)
+    ..aOM<$0.Struct>(2, _omitFieldNames ? '' : 'didDocument',
+        subBuilder: $0.Struct.create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -187,8 +162,10 @@ class GenerateKeyResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   GenerateKeyResponse copyWith(void Function(GenerateKeyResponse) updates) =>
       super.copyWith((message) => updates(message as GenerateKeyResponse))
-          as GenerateKeyResponse; // ignore: deprecated_member_use
+          as GenerateKeyResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static GenerateKeyResponse create() => GenerateKeyResponse._();
   GenerateKeyResponse createEmptyInstance() => create();
@@ -218,38 +195,30 @@ class GenerateKeyResponse extends $pb.GeneratedMessage {
 }
 
 class ResolveRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'ResolveRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.keys.v1'),
-      createEmptyInstance: create)
-    ..aOS(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'did')
-    ..hasRequiredFields = false;
-
-  ResolveRequest._() : super();
   factory ResolveRequest({
     $core.String? did,
   }) {
-    final _result = create();
+    final $result = create();
     if (did != null) {
-      _result.did = did;
+      $result.did = did;
     }
-    return _result;
+    return $result;
   }
+  ResolveRequest._() : super();
   factory ResolveRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory ResolveRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'ResolveRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'okapi.keys.v1'),
+      createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'did')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -259,8 +228,10 @@ class ResolveRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   ResolveRequest copyWith(void Function(ResolveRequest) updates) =>
       super.copyWith((message) => updates(message as ResolveRequest))
-          as ResolveRequest; // ignore: deprecated_member_use
+          as ResolveRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static ResolveRequest create() => ResolveRequest._();
   ResolveRequest createEmptyInstance() => create();
@@ -285,50 +256,37 @@ class ResolveRequest extends $pb.GeneratedMessage {
 }
 
 class ResolveResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'ResolveResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.keys.v1'),
-      createEmptyInstance: create)
-    ..aOM<$0.Struct>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'didDocument',
-        subBuilder: $0.Struct.create)
-    ..pc<JsonWebKey>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'keys',
-        $pb.PbFieldType.PM,
-        subBuilder: JsonWebKey.create)
-    ..hasRequiredFields = false;
-
-  ResolveResponse._() : super();
   factory ResolveResponse({
     $0.Struct? didDocument,
     $core.Iterable<JsonWebKey>? keys,
   }) {
-    final _result = create();
+    final $result = create();
     if (didDocument != null) {
-      _result.didDocument = didDocument;
+      $result.didDocument = didDocument;
     }
     if (keys != null) {
-      _result.keys.addAll(keys);
+      $result.keys.addAll(keys);
     }
-    return _result;
+    return $result;
   }
+  ResolveResponse._() : super();
   factory ResolveResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory ResolveResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'ResolveResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'okapi.keys.v1'),
+      createEmptyInstance: create)
+    ..aOM<$0.Struct>(1, _omitFieldNames ? '' : 'didDocument',
+        subBuilder: $0.Struct.create)
+    ..pc<JsonWebKey>(2, _omitFieldNames ? '' : 'keys', $pb.PbFieldType.PM,
+        subBuilder: JsonWebKey.create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -338,8 +296,10 @@ class ResolveResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   ResolveResponse copyWith(void Function(ResolveResponse) updates) =>
       super.copyWith((message) => updates(message as ResolveResponse))
-          as ResolveResponse; // ignore: deprecated_member_use
+          as ResolveResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static ResolveResponse create() => ResolveResponse._();
   ResolveResponse createEmptyInstance() => create();
@@ -369,48 +329,6 @@ class ResolveResponse extends $pb.GeneratedMessage {
 }
 
 class JsonWebKey extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'JsonWebKey',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.keys.v1'),
-      createEmptyInstance: create)
-    ..aOS(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'kid')
-    ..aOS(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'x')
-    ..aOS(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'y')
-    ..aOS(
-        4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'd')
-    ..aOS(
-        5,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'crv')
-    ..aOS(
-        6,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'kty')
-    ..hasRequiredFields = false;
-
-  JsonWebKey._() : super();
   factory JsonWebKey({
     $core.String? kid,
     $core.String? x,
@@ -419,33 +337,47 @@ class JsonWebKey extends $pb.GeneratedMessage {
     $core.String? crv,
     $core.String? kty,
   }) {
-    final _result = create();
+    final $result = create();
     if (kid != null) {
-      _result.kid = kid;
+      $result.kid = kid;
     }
     if (x != null) {
-      _result.x = x;
+      $result.x = x;
     }
     if (y != null) {
-      _result.y = y;
+      $result.y = y;
     }
     if (d != null) {
-      _result.d = d;
+      $result.d = d;
     }
     if (crv != null) {
-      _result.crv = crv;
+      $result.crv = crv;
     }
     if (kty != null) {
-      _result.kty = kty;
+      $result.kty = kty;
     }
-    return _result;
+    return $result;
   }
+  JsonWebKey._() : super();
   factory JsonWebKey.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory JsonWebKey.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'JsonWebKey',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'okapi.keys.v1'),
+      createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'kid')
+    ..aOS(2, _omitFieldNames ? '' : 'x')
+    ..aOS(3, _omitFieldNames ? '' : 'y')
+    ..aOS(4, _omitFieldNames ? '' : 'd')
+    ..aOS(5, _omitFieldNames ? '' : 'crv')
+    ..aOS(6, _omitFieldNames ? '' : 'kty')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -454,9 +386,10 @@ class JsonWebKey extends $pb.GeneratedMessage {
       'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
       'Will be removed in next major version')
   JsonWebKey copyWith(void Function(JsonWebKey) updates) =>
-      super.copyWith((message) => updates(message as JsonWebKey))
-          as JsonWebKey; // ignore: deprecated_member_use
+      super.copyWith((message) => updates(message as JsonWebKey)) as JsonWebKey;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static JsonWebKey create() => JsonWebKey._();
   JsonWebKey createEmptyInstance() => create();
@@ -538,3 +471,7 @@ class JsonWebKey extends $pb.GeneratedMessage {
   @$pb.TagNumber(6)
   void clearKty() => clearField(6);
 }
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/dart/lib/proto/okapi/keys/v1/keys.pbenum.dart b/dart/lib/proto/okapi/keys/v1/keys.pbenum.dart
index c1246870..bc22ba21 100644
--- a/dart/lib/proto/okapi/keys/v1/keys.pbenum.dart
+++ b/dart/lib/proto/okapi/keys/v1/keys.pbenum.dart
@@ -1,45 +1,31 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/keys/v1/keys.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-// ignore_for_file: UNDEFINED_SHOWN_NAME
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:core' as $core;
+
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class KeyType extends $pb.ProtobufEnum {
-  static const KeyType KEY_TYPE_UNSPECIFIED = KeyType._(
-      0,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'KEY_TYPE_UNSPECIFIED');
-  static const KeyType KEY_TYPE_ED25519 = KeyType._(
-      1,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'KEY_TYPE_ED25519');
-  static const KeyType KEY_TYPE_X25519 = KeyType._(
-      2,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'KEY_TYPE_X25519');
-  static const KeyType KEY_TYPE_P256 = KeyType._(
-      3,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'KEY_TYPE_P256');
-  static const KeyType KEY_TYPE_BLS12381G1G2 = KeyType._(
-      4,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'KEY_TYPE_BLS12381G1G2');
-  static const KeyType KEY_TYPE_SECP256K1 = KeyType._(
-      5,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'KEY_TYPE_SECP256K1');
+  static const KeyType KEY_TYPE_UNSPECIFIED =
+      KeyType._(0, _omitEnumNames ? '' : 'KEY_TYPE_UNSPECIFIED');
+  static const KeyType KEY_TYPE_ED25519 =
+      KeyType._(1, _omitEnumNames ? '' : 'KEY_TYPE_ED25519');
+  static const KeyType KEY_TYPE_X25519 =
+      KeyType._(2, _omitEnumNames ? '' : 'KEY_TYPE_X25519');
+  static const KeyType KEY_TYPE_P256 =
+      KeyType._(3, _omitEnumNames ? '' : 'KEY_TYPE_P256');
+  static const KeyType KEY_TYPE_BLS12381G1G2 =
+      KeyType._(4, _omitEnumNames ? '' : 'KEY_TYPE_BLS12381G1G2');
+  static const KeyType KEY_TYPE_SECP256K1 =
+      KeyType._(5, _omitEnumNames ? '' : 'KEY_TYPE_SECP256K1');
 
   static const $core.List<KeyType> values = <KeyType>[
     KEY_TYPE_UNSPECIFIED,
@@ -60,20 +46,11 @@ class KeyType extends $pb.ProtobufEnum {
 class DocumentKeyFormat extends $pb.ProtobufEnum {
   static const DocumentKeyFormat DOCUMENT_KEY_FORMAT_UNSPECIFIED =
       DocumentKeyFormat._(
-          0,
-          const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-              ? ''
-              : 'DOCUMENT_KEY_FORMAT_UNSPECIFIED');
-  static const DocumentKeyFormat DOCUMENT_KEY_FORMAT_LD = DocumentKeyFormat._(
-      1,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'DOCUMENT_KEY_FORMAT_LD');
-  static const DocumentKeyFormat DOCUMENT_KEY_FORMAT_JOSE = DocumentKeyFormat._(
-      2,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'DOCUMENT_KEY_FORMAT_JOSE');
+          0, _omitEnumNames ? '' : 'DOCUMENT_KEY_FORMAT_UNSPECIFIED');
+  static const DocumentKeyFormat DOCUMENT_KEY_FORMAT_LD =
+      DocumentKeyFormat._(1, _omitEnumNames ? '' : 'DOCUMENT_KEY_FORMAT_LD');
+  static const DocumentKeyFormat DOCUMENT_KEY_FORMAT_JOSE =
+      DocumentKeyFormat._(2, _omitEnumNames ? '' : 'DOCUMENT_KEY_FORMAT_JOSE');
 
   static const $core.List<DocumentKeyFormat> values = <DocumentKeyFormat>[
     DOCUMENT_KEY_FORMAT_UNSPECIFIED,
@@ -87,3 +64,5 @@ class DocumentKeyFormat extends $pb.ProtobufEnum {
 
   const DocumentKeyFormat._($core.int v, $core.String n) : super(v, n);
 }
+
+const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/dart/lib/proto/okapi/keys/v1/keys.pbjson.dart b/dart/lib/proto/okapi/keys/v1/keys.pbjson.dart
index 46f86046..318d1d5c 100644
--- a/dart/lib/proto/okapi/keys/v1/keys.pbjson.dart
+++ b/dart/lib/proto/okapi/keys/v1/keys.pbjson.dart
@@ -1,49 +1,59 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/keys/v1/keys.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
 @$core.Deprecated('Use keyTypeDescriptor instead')
-const KeyType$json = const {
+const KeyType$json = {
   '1': 'KeyType',
-  '2': const [
-    const {'1': 'KEY_TYPE_UNSPECIFIED', '2': 0},
-    const {'1': 'KEY_TYPE_ED25519', '2': 1},
-    const {'1': 'KEY_TYPE_X25519', '2': 2},
-    const {'1': 'KEY_TYPE_P256', '2': 3},
-    const {'1': 'KEY_TYPE_BLS12381G1G2', '2': 4},
-    const {'1': 'KEY_TYPE_SECP256K1', '2': 5},
+  '2': [
+    {'1': 'KEY_TYPE_UNSPECIFIED', '2': 0},
+    {'1': 'KEY_TYPE_ED25519', '2': 1},
+    {'1': 'KEY_TYPE_X25519', '2': 2},
+    {'1': 'KEY_TYPE_P256', '2': 3},
+    {'1': 'KEY_TYPE_BLS12381G1G2', '2': 4},
+    {'1': 'KEY_TYPE_SECP256K1', '2': 5},
   ],
 };
 
 /// Descriptor for `KeyType`. Decode as a `google.protobuf.EnumDescriptorProto`.
 final $typed_data.Uint8List keyTypeDescriptor = $convert.base64Decode(
-    'CgdLZXlUeXBlEhgKFEtFWV9UWVBFX1VOU1BFQ0lGSUVEEAASFAoQS0VZX1RZUEVfRUQyNTUxORABEhMKD0tFWV9UWVBFX1gyNTUxORACEhEKDUtFWV9UWVBFX1AyNTYQAxIZChVLRVlfVFlQRV9CTFMxMjM4MUcxRzIQBBIWChJLRVlfVFlQRV9TRUNQMjU2SzEQBQ==');
+    'CgdLZXlUeXBlEhgKFEtFWV9UWVBFX1VOU1BFQ0lGSUVEEAASFAoQS0VZX1RZUEVfRUQyNTUxOR'
+    'ABEhMKD0tFWV9UWVBFX1gyNTUxORACEhEKDUtFWV9UWVBFX1AyNTYQAxIZChVLRVlfVFlQRV9C'
+    'TFMxMjM4MUcxRzIQBBIWChJLRVlfVFlQRV9TRUNQMjU2SzEQBQ==');
+
 @$core.Deprecated('Use documentKeyFormatDescriptor instead')
-const DocumentKeyFormat$json = const {
+const DocumentKeyFormat$json = {
   '1': 'DocumentKeyFormat',
-  '2': const [
-    const {'1': 'DOCUMENT_KEY_FORMAT_UNSPECIFIED', '2': 0},
-    const {'1': 'DOCUMENT_KEY_FORMAT_LD', '2': 1},
-    const {'1': 'DOCUMENT_KEY_FORMAT_JOSE', '2': 2},
+  '2': [
+    {'1': 'DOCUMENT_KEY_FORMAT_UNSPECIFIED', '2': 0},
+    {'1': 'DOCUMENT_KEY_FORMAT_LD', '2': 1},
+    {'1': 'DOCUMENT_KEY_FORMAT_JOSE', '2': 2},
   ],
 };
 
 /// Descriptor for `DocumentKeyFormat`. Decode as a `google.protobuf.EnumDescriptorProto`.
 final $typed_data.Uint8List documentKeyFormatDescriptor = $convert.base64Decode(
-    'ChFEb2N1bWVudEtleUZvcm1hdBIjCh9ET0NVTUVOVF9LRVlfRk9STUFUX1VOU1BFQ0lGSUVEEAASGgoWRE9DVU1FTlRfS0VZX0ZPUk1BVF9MRBABEhwKGERPQ1VNRU5UX0tFWV9GT1JNQVRfSk9TRRAC');
+    'ChFEb2N1bWVudEtleUZvcm1hdBIjCh9ET0NVTUVOVF9LRVlfRk9STUFUX1VOU1BFQ0lGSUVEEA'
+    'ASGgoWRE9DVU1FTlRfS0VZX0ZPUk1BVF9MRBABEhwKGERPQ1VNRU5UX0tFWV9GT1JNQVRfSk9T'
+    'RRAC');
+
 @$core.Deprecated('Use generateKeyRequestDescriptor instead')
-const GenerateKeyRequest$json = const {
+const GenerateKeyRequest$json = {
   '1': 'GenerateKeyRequest',
-  '2': const [
-    const {'1': 'seed', '3': 1, '4': 1, '5': 12, '10': 'seed'},
-    const {
+  '2': [
+    {'1': 'seed', '3': 1, '4': 1, '5': 12, '10': 'seed'},
+    {
       '1': 'key_type',
       '3': 2,
       '4': 1,
@@ -51,7 +61,7 @@ const GenerateKeyRequest$json = const {
       '6': '.okapi.keys.v1.KeyType',
       '10': 'keyType'
     },
-    const {
+    {
       '1': 'key_format',
       '3': 3,
       '4': 1,
@@ -64,12 +74,15 @@ const GenerateKeyRequest$json = const {
 
 /// Descriptor for `GenerateKeyRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List generateKeyRequestDescriptor = $convert.base64Decode(
-    'ChJHZW5lcmF0ZUtleVJlcXVlc3QSEgoEc2VlZBgBIAEoDFIEc2VlZBIxCghrZXlfdHlwZRgCIAEoDjIWLm9rYXBpLmtleXMudjEuS2V5VHlwZVIHa2V5VHlwZRI/CgprZXlfZm9ybWF0GAMgASgOMiAub2thcGkua2V5cy52MS5Eb2N1bWVudEtleUZvcm1hdFIJa2V5Rm9ybWF0');
+    'ChJHZW5lcmF0ZUtleVJlcXVlc3QSEgoEc2VlZBgBIAEoDFIEc2VlZBIxCghrZXlfdHlwZRgCIA'
+    'EoDjIWLm9rYXBpLmtleXMudjEuS2V5VHlwZVIHa2V5VHlwZRI/CgprZXlfZm9ybWF0GAMgASgO'
+    'MiAub2thcGkua2V5cy52MS5Eb2N1bWVudEtleUZvcm1hdFIJa2V5Rm9ybWF0');
+
 @$core.Deprecated('Use generateKeyResponseDescriptor instead')
-const GenerateKeyResponse$json = const {
+const GenerateKeyResponse$json = {
   '1': 'GenerateKeyResponse',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'key',
       '3': 1,
       '4': 3,
@@ -77,7 +90,7 @@ const GenerateKeyResponse$json = const {
       '6': '.okapi.keys.v1.JsonWebKey',
       '10': 'key'
     },
-    const {
+    {
       '1': 'did_document',
       '3': 2,
       '4': 1,
@@ -90,23 +103,27 @@ const GenerateKeyResponse$json = const {
 
 /// Descriptor for `GenerateKeyResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List generateKeyResponseDescriptor = $convert.base64Decode(
-    'ChNHZW5lcmF0ZUtleVJlc3BvbnNlEisKA2tleRgBIAMoCzIZLm9rYXBpLmtleXMudjEuSnNvbldlYktleVIDa2V5EjoKDGRpZF9kb2N1bWVudBgCIAEoCzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RSC2RpZERvY3VtZW50');
+    'ChNHZW5lcmF0ZUtleVJlc3BvbnNlEisKA2tleRgBIAMoCzIZLm9rYXBpLmtleXMudjEuSnNvbl'
+    'dlYktleVIDa2V5EjoKDGRpZF9kb2N1bWVudBgCIAEoCzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1'
+    'Y3RSC2RpZERvY3VtZW50');
+
 @$core.Deprecated('Use resolveRequestDescriptor instead')
-const ResolveRequest$json = const {
+const ResolveRequest$json = {
   '1': 'ResolveRequest',
-  '2': const [
-    const {'1': 'did', '3': 1, '4': 1, '5': 9, '10': 'did'},
+  '2': [
+    {'1': 'did', '3': 1, '4': 1, '5': 9, '10': 'did'},
   ],
 };
 
 /// Descriptor for `ResolveRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List resolveRequestDescriptor =
     $convert.base64Decode('Cg5SZXNvbHZlUmVxdWVzdBIQCgNkaWQYASABKAlSA2RpZA==');
+
 @$core.Deprecated('Use resolveResponseDescriptor instead')
-const ResolveResponse$json = const {
+const ResolveResponse$json = {
   '1': 'ResolveResponse',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'did_document',
       '3': 1,
       '4': 1,
@@ -114,7 +131,7 @@ const ResolveResponse$json = const {
       '6': '.google.protobuf.Struct',
       '10': 'didDocument'
     },
-    const {
+    {
       '1': 'keys',
       '3': 2,
       '4': 3,
@@ -127,20 +144,24 @@ const ResolveResponse$json = const {
 
 /// Descriptor for `ResolveResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List resolveResponseDescriptor = $convert.base64Decode(
-    'Cg9SZXNvbHZlUmVzcG9uc2USOgoMZGlkX2RvY3VtZW50GAEgASgLMhcuZ29vZ2xlLnByb3RvYnVmLlN0cnVjdFILZGlkRG9jdW1lbnQSLQoEa2V5cxgCIAMoCzIZLm9rYXBpLmtleXMudjEuSnNvbldlYktleVIEa2V5cw==');
+    'Cg9SZXNvbHZlUmVzcG9uc2USOgoMZGlkX2RvY3VtZW50GAEgASgLMhcuZ29vZ2xlLnByb3RvYn'
+    'VmLlN0cnVjdFILZGlkRG9jdW1lbnQSLQoEa2V5cxgCIAMoCzIZLm9rYXBpLmtleXMudjEuSnNv'
+    'bldlYktleVIEa2V5cw==');
+
 @$core.Deprecated('Use jsonWebKeyDescriptor instead')
-const JsonWebKey$json = const {
+const JsonWebKey$json = {
   '1': 'JsonWebKey',
-  '2': const [
-    const {'1': 'kid', '3': 1, '4': 1, '5': 9, '10': 'kid'},
-    const {'1': 'x', '3': 2, '4': 1, '5': 9, '10': 'x'},
-    const {'1': 'y', '3': 3, '4': 1, '5': 9, '10': 'y'},
-    const {'1': 'd', '3': 4, '4': 1, '5': 9, '10': 'd'},
-    const {'1': 'crv', '3': 5, '4': 1, '5': 9, '10': 'crv'},
-    const {'1': 'kty', '3': 6, '4': 1, '5': 9, '10': 'kty'},
+  '2': [
+    {'1': 'kid', '3': 1, '4': 1, '5': 9, '10': 'kid'},
+    {'1': 'x', '3': 2, '4': 1, '5': 9, '10': 'x'},
+    {'1': 'y', '3': 3, '4': 1, '5': 9, '10': 'y'},
+    {'1': 'd', '3': 4, '4': 1, '5': 9, '10': 'd'},
+    {'1': 'crv', '3': 5, '4': 1, '5': 9, '10': 'crv'},
+    {'1': 'kty', '3': 6, '4': 1, '5': 9, '10': 'kty'},
   ],
 };
 
 /// Descriptor for `JsonWebKey`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List jsonWebKeyDescriptor = $convert.base64Decode(
-    'CgpKc29uV2ViS2V5EhAKA2tpZBgBIAEoCVIDa2lkEgwKAXgYAiABKAlSAXgSDAoBeRgDIAEoCVIBeRIMCgFkGAQgASgJUgFkEhAKA2NydhgFIAEoCVIDY3J2EhAKA2t0eRgGIAEoCVIDa3R5');
+    'CgpKc29uV2ViS2V5EhAKA2tpZBgBIAEoCVIDa2lkEgwKAXgYAiABKAlSAXgSDAoBeRgDIAEoCV'
+    'IBeRIMCgFkGAQgASgJUgFkEhAKA2NydhgFIAEoCVIDY3J2EhAKA2t0eRgGIAEoCVIDa3R5');
diff --git a/dart/lib/proto/okapi/keys/v1/keys.pbserver.dart b/dart/lib/proto/okapi/keys/v1/keys.pbserver.dart
index 1994c9fb..3b88be4c 100644
--- a/dart/lib/proto/okapi/keys/v1/keys.pbserver.dart
+++ b/dart/lib/proto/okapi/keys/v1/keys.pbserver.dart
@@ -1,8 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/keys/v1/keys.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'keys.pb.dart';
diff --git a/dart/lib/proto/okapi/metadata/metadata.pb.dart b/dart/lib/proto/okapi/metadata/metadata.pb.dart
index 48f244d5..1e044e9b 100644
--- a/dart/lib/proto/okapi/metadata/metadata.pb.dart
+++ b/dart/lib/proto/okapi/metadata/metadata.pb.dart
@@ -1,34 +1,35 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/metadata/metadata.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+/// Request custom metadata about the native okapi binaries - cannot get cargo env vars at runtime
 class MetadataRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'MetadataRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.metadata'),
-      createEmptyInstance: create)
-    ..hasRequiredFields = false;
-
-  MetadataRequest._() : super();
   factory MetadataRequest() => create();
+  MetadataRequest._() : super();
   factory MetadataRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory MetadataRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'MetadataRequest',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'okapi.metadata'),
+      createEmptyInstance: create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -38,8 +39,10 @@ class MetadataRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   MetadataRequest copyWith(void Function(MetadataRequest) updates) =>
       super.copyWith((message) => updates(message as MetadataRequest))
-          as MetadataRequest; // ignore: deprecated_member_use
+          as MetadataRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static MetadataRequest create() => MetadataRequest._();
   MetadataRequest createEmptyInstance() => create();
@@ -51,67 +54,8 @@ class MetadataRequest extends $pb.GeneratedMessage {
   static MetadataRequest? _defaultInstance;
 }
 
+/// Metadata information about the native okapi binaries. Always returns the version information
 class MetadataResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'MetadataResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.metadata'),
-      createEmptyInstance: create)
-    ..aOS(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'version')
-    ..a<$core.int>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'versionMajor',
-        $pb.PbFieldType.O3)
-    ..a<$core.int>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'versionMinor',
-        $pb.PbFieldType.O3)
-    ..a<$core.int>(
-        4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'versionPatch',
-        $pb.PbFieldType.O3)
-    ..aOS(
-        10,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'targetFamily')
-    ..aOS(
-        11,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'targetOs')
-    ..aOS(
-        12,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'targetArch')
-    ..aOS(
-        13,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'targetVendor')
-    ..aOS(
-        14,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'targetEnv')
-    ..hasRequiredFields = false;
-
-  MetadataResponse._() : super();
   factory MetadataResponse({
     $core.String? version,
     $core.int? versionMajor,
@@ -123,42 +67,59 @@ class MetadataResponse extends $pb.GeneratedMessage {
     $core.String? targetVendor,
     $core.String? targetEnv,
   }) {
-    final _result = create();
+    final $result = create();
     if (version != null) {
-      _result.version = version;
+      $result.version = version;
     }
     if (versionMajor != null) {
-      _result.versionMajor = versionMajor;
+      $result.versionMajor = versionMajor;
     }
     if (versionMinor != null) {
-      _result.versionMinor = versionMinor;
+      $result.versionMinor = versionMinor;
     }
     if (versionPatch != null) {
-      _result.versionPatch = versionPatch;
+      $result.versionPatch = versionPatch;
     }
     if (targetFamily != null) {
-      _result.targetFamily = targetFamily;
+      $result.targetFamily = targetFamily;
     }
     if (targetOs != null) {
-      _result.targetOs = targetOs;
+      $result.targetOs = targetOs;
     }
     if (targetArch != null) {
-      _result.targetArch = targetArch;
+      $result.targetArch = targetArch;
     }
     if (targetVendor != null) {
-      _result.targetVendor = targetVendor;
+      $result.targetVendor = targetVendor;
     }
     if (targetEnv != null) {
-      _result.targetEnv = targetEnv;
+      $result.targetEnv = targetEnv;
     }
-    return _result;
+    return $result;
   }
+  MetadataResponse._() : super();
   factory MetadataResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory MetadataResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'MetadataResponse',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'okapi.metadata'),
+      createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'version')
+    ..a<$core.int>(2, _omitFieldNames ? '' : 'versionMajor', $pb.PbFieldType.O3)
+    ..a<$core.int>(3, _omitFieldNames ? '' : 'versionMinor', $pb.PbFieldType.O3)
+    ..a<$core.int>(4, _omitFieldNames ? '' : 'versionPatch', $pb.PbFieldType.O3)
+    ..aOS(10, _omitFieldNames ? '' : 'targetFamily')
+    ..aOS(11, _omitFieldNames ? '' : 'targetOs')
+    ..aOS(12, _omitFieldNames ? '' : 'targetArch')
+    ..aOS(13, _omitFieldNames ? '' : 'targetVendor')
+    ..aOS(14, _omitFieldNames ? '' : 'targetEnv')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -168,8 +129,10 @@ class MetadataResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   MetadataResponse copyWith(void Function(MetadataResponse) updates) =>
       super.copyWith((message) => updates(message as MetadataResponse))
-          as MetadataResponse; // ignore: deprecated_member_use
+          as MetadataResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static MetadataResponse create() => MetadataResponse._();
   MetadataResponse createEmptyInstance() => create();
@@ -228,6 +191,7 @@ class MetadataResponse extends $pb.GeneratedMessage {
   @$pb.TagNumber(4)
   void clearVersionPatch() => clearField(4);
 
+  /// https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-crates
   @$pb.TagNumber(10)
   $core.String get targetFamily => $_getSZ(4);
   @$pb.TagNumber(10)
@@ -288,3 +252,7 @@ class MetadataResponse extends $pb.GeneratedMessage {
   @$pb.TagNumber(14)
   void clearTargetEnv() => clearField(14);
 }
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/dart/lib/proto/okapi/metadata/metadata.pbenum.dart b/dart/lib/proto/okapi/metadata/metadata.pbenum.dart
index c02f8387..8f97473d 100644
--- a/dart/lib/proto/okapi/metadata/metadata.pbenum.dart
+++ b/dart/lib/proto/okapi/metadata/metadata.pbenum.dart
@@ -1,6 +1,10 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/metadata/metadata.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
diff --git a/dart/lib/proto/okapi/metadata/metadata.pbjson.dart b/dart/lib/proto/okapi/metadata/metadata.pbjson.dart
index f3e89a4a..6e52308d 100644
--- a/dart/lib/proto/okapi/metadata/metadata.pbjson.dart
+++ b/dart/lib/proto/okapi/metadata/metadata.pbjson.dart
@@ -1,38 +1,48 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/metadata/metadata.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
 @$core.Deprecated('Use metadataRequestDescriptor instead')
-const MetadataRequest$json = const {
+const MetadataRequest$json = {
   '1': 'MetadataRequest',
 };
 
 /// Descriptor for `MetadataRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List metadataRequestDescriptor =
     $convert.base64Decode('Cg9NZXRhZGF0YVJlcXVlc3Q=');
+
 @$core.Deprecated('Use metadataResponseDescriptor instead')
-const MetadataResponse$json = const {
+const MetadataResponse$json = {
   '1': 'MetadataResponse',
-  '2': const [
-    const {'1': 'version', '3': 1, '4': 1, '5': 9, '10': 'version'},
-    const {'1': 'version_major', '3': 2, '4': 1, '5': 5, '10': 'versionMajor'},
-    const {'1': 'version_minor', '3': 3, '4': 1, '5': 5, '10': 'versionMinor'},
-    const {'1': 'version_patch', '3': 4, '4': 1, '5': 5, '10': 'versionPatch'},
-    const {'1': 'target_family', '3': 10, '4': 1, '5': 9, '10': 'targetFamily'},
-    const {'1': 'target_os', '3': 11, '4': 1, '5': 9, '10': 'targetOs'},
-    const {'1': 'target_arch', '3': 12, '4': 1, '5': 9, '10': 'targetArch'},
-    const {'1': 'target_vendor', '3': 13, '4': 1, '5': 9, '10': 'targetVendor'},
-    const {'1': 'target_env', '3': 14, '4': 1, '5': 9, '10': 'targetEnv'},
+  '2': [
+    {'1': 'version', '3': 1, '4': 1, '5': 9, '10': 'version'},
+    {'1': 'version_major', '3': 2, '4': 1, '5': 5, '10': 'versionMajor'},
+    {'1': 'version_minor', '3': 3, '4': 1, '5': 5, '10': 'versionMinor'},
+    {'1': 'version_patch', '3': 4, '4': 1, '5': 5, '10': 'versionPatch'},
+    {'1': 'target_family', '3': 10, '4': 1, '5': 9, '10': 'targetFamily'},
+    {'1': 'target_os', '3': 11, '4': 1, '5': 9, '10': 'targetOs'},
+    {'1': 'target_arch', '3': 12, '4': 1, '5': 9, '10': 'targetArch'},
+    {'1': 'target_vendor', '3': 13, '4': 1, '5': 9, '10': 'targetVendor'},
+    {'1': 'target_env', '3': 14, '4': 1, '5': 9, '10': 'targetEnv'},
   ],
 };
 
 /// Descriptor for `MetadataResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List metadataResponseDescriptor = $convert.base64Decode(
-    'ChBNZXRhZGF0YVJlc3BvbnNlEhgKB3ZlcnNpb24YASABKAlSB3ZlcnNpb24SIwoNdmVyc2lvbl9tYWpvchgCIAEoBVIMdmVyc2lvbk1ham9yEiMKDXZlcnNpb25fbWlub3IYAyABKAVSDHZlcnNpb25NaW5vchIjCg12ZXJzaW9uX3BhdGNoGAQgASgFUgx2ZXJzaW9uUGF0Y2gSIwoNdGFyZ2V0X2ZhbWlseRgKIAEoCVIMdGFyZ2V0RmFtaWx5EhsKCXRhcmdldF9vcxgLIAEoCVIIdGFyZ2V0T3MSHwoLdGFyZ2V0X2FyY2gYDCABKAlSCnRhcmdldEFyY2gSIwoNdGFyZ2V0X3ZlbmRvchgNIAEoCVIMdGFyZ2V0VmVuZG9yEh0KCnRhcmdldF9lbnYYDiABKAlSCXRhcmdldEVudg==');
+    'ChBNZXRhZGF0YVJlc3BvbnNlEhgKB3ZlcnNpb24YASABKAlSB3ZlcnNpb24SIwoNdmVyc2lvbl'
+    '9tYWpvchgCIAEoBVIMdmVyc2lvbk1ham9yEiMKDXZlcnNpb25fbWlub3IYAyABKAVSDHZlcnNp'
+    'b25NaW5vchIjCg12ZXJzaW9uX3BhdGNoGAQgASgFUgx2ZXJzaW9uUGF0Y2gSIwoNdGFyZ2V0X2'
+    'ZhbWlseRgKIAEoCVIMdGFyZ2V0RmFtaWx5EhsKCXRhcmdldF9vcxgLIAEoCVIIdGFyZ2V0T3MS'
+    'HwoLdGFyZ2V0X2FyY2gYDCABKAlSCnRhcmdldEFyY2gSIwoNdGFyZ2V0X3ZlbmRvchgNIAEoCV'
+    'IMdGFyZ2V0VmVuZG9yEh0KCnRhcmdldF9lbnYYDiABKAlSCXRhcmdldEVudg==');
diff --git a/dart/lib/proto/okapi/metadata/metadata.pbserver.dart b/dart/lib/proto/okapi/metadata/metadata.pbserver.dart
index ba0befb8..4cc63597 100644
--- a/dart/lib/proto/okapi/metadata/metadata.pbserver.dart
+++ b/dart/lib/proto/okapi/metadata/metadata.pbserver.dart
@@ -1,8 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/metadata/metadata.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'metadata.pb.dart';
diff --git a/dart/lib/proto/okapi/proofs/v1/proofs.pb.dart b/dart/lib/proto/okapi/proofs/v1/proofs.pb.dart
index 400c78d0..02cea5f6 100644
--- a/dart/lib/proto/okapi/proofs/v1/proofs.pb.dart
+++ b/dart/lib/proto/okapi/proofs/v1/proofs.pb.dart
@@ -1,9 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/proofs/v1/proofs.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:core' as $core;
 
@@ -11,68 +15,51 @@ import 'package:protobuf/protobuf.dart' as $pb;
 
 import '../../../google/protobuf/struct.pb.dart' as $0;
 import '../../keys/v1/keys.pb.dart' as $1;
-
 import 'proofs.pbenum.dart';
 
 export 'proofs.pbenum.dart';
 
 class CreateProofRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'CreateProofRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.proofs.v1'),
-      createEmptyInstance: create)
-    ..aOM<$0.Struct>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'document',
-        subBuilder: $0.Struct.create)
-    ..aOM<$1.JsonWebKey>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'key',
-        subBuilder: $1.JsonWebKey.create)
-    ..e<LdSuite>(
-        4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'suite',
-        $pb.PbFieldType.OE,
-        defaultOrMaker: LdSuite.LD_SUITE_UNSPECIFIED,
-        valueOf: LdSuite.valueOf,
-        enumValues: LdSuite.values)
-    ..hasRequiredFields = false;
-
-  CreateProofRequest._() : super();
   factory CreateProofRequest({
     $0.Struct? document,
     $1.JsonWebKey? key,
     LdSuite? suite,
   }) {
-    final _result = create();
+    final $result = create();
     if (document != null) {
-      _result.document = document;
+      $result.document = document;
     }
     if (key != null) {
-      _result.key = key;
+      $result.key = key;
     }
     if (suite != null) {
-      _result.suite = suite;
+      $result.suite = suite;
     }
-    return _result;
+    return $result;
   }
+  CreateProofRequest._() : super();
   factory CreateProofRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory CreateProofRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CreateProofRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.proofs.v1'),
+      createEmptyInstance: create)
+    ..aOM<$0.Struct>(1, _omitFieldNames ? '' : 'document',
+        subBuilder: $0.Struct.create)
+    ..aOM<$1.JsonWebKey>(3, _omitFieldNames ? '' : 'key',
+        subBuilder: $1.JsonWebKey.create)
+    ..e<LdSuite>(4, _omitFieldNames ? '' : 'suite', $pb.PbFieldType.OE,
+        defaultOrMaker: LdSuite.LD_SUITE_UNSPECIFIED,
+        valueOf: LdSuite.valueOf,
+        enumValues: LdSuite.values)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -82,8 +69,10 @@ class CreateProofRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   CreateProofRequest copyWith(void Function(CreateProofRequest) updates) =>
       super.copyWith((message) => updates(message as CreateProofRequest))
-          as CreateProofRequest; // ignore: deprecated_member_use
+          as CreateProofRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static CreateProofRequest create() => CreateProofRequest._();
   CreateProofRequest createEmptyInstance() => create();
@@ -94,6 +83,10 @@ class CreateProofRequest extends $pb.GeneratedMessage {
       $pb.GeneratedMessage.$_defaultFor<CreateProofRequest>(create);
   static CreateProofRequest? _defaultInstance;
 
+  /// The input JSON document that will be used
+  /// to create the LD Proof. This document must
+  /// also contain a "proof" object, with the desired
+  /// values filled in.
   @$pb.TagNumber(1)
   $0.Struct get document => $_getN(0);
   @$pb.TagNumber(1)
@@ -108,6 +101,10 @@ class CreateProofRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   $0.Struct ensureDocument() => $_ensure(0);
 
+  /// The signer of the proof. This field must include
+  /// the 'kid' in full URI format.
+  /// Example:
+  ///  did:example:alice#key-1
   @$pb.TagNumber(3)
   $1.JsonWebKey get key => $_getN(1);
   @$pb.TagNumber(3)
@@ -122,6 +119,7 @@ class CreateProofRequest extends $pb.GeneratedMessage {
   @$pb.TagNumber(3)
   $1.JsonWebKey ensureKey() => $_ensure(1);
 
+  /// The LD Suite to use to produce this proof
   @$pb.TagNumber(4)
   LdSuite get suite => $_getN(2);
   @$pb.TagNumber(4)
@@ -136,39 +134,32 @@ class CreateProofRequest extends $pb.GeneratedMessage {
 }
 
 class CreateProofResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'CreateProofResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.proofs.v1'),
-      createEmptyInstance: create)
-    ..aOM<$0.Struct>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'signedDocument',
-        subBuilder: $0.Struct.create)
-    ..hasRequiredFields = false;
-
-  CreateProofResponse._() : super();
   factory CreateProofResponse({
     $0.Struct? signedDocument,
   }) {
-    final _result = create();
+    final $result = create();
     if (signedDocument != null) {
-      _result.signedDocument = signedDocument;
+      $result.signedDocument = signedDocument;
     }
-    return _result;
+    return $result;
   }
+  CreateProofResponse._() : super();
   factory CreateProofResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory CreateProofResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CreateProofResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.proofs.v1'),
+      createEmptyInstance: create)
+    ..aOM<$0.Struct>(1, _omitFieldNames ? '' : 'signedDocument',
+        subBuilder: $0.Struct.create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -178,8 +169,10 @@ class CreateProofResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   CreateProofResponse copyWith(void Function(CreateProofResponse) updates) =>
       super.copyWith((message) => updates(message as CreateProofResponse))
-          as CreateProofResponse; // ignore: deprecated_member_use
+          as CreateProofResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static CreateProofResponse create() => CreateProofResponse._();
   CreateProofResponse createEmptyInstance() => create();
@@ -206,25 +199,22 @@ class CreateProofResponse extends $pb.GeneratedMessage {
 }
 
 class VerifyProofRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'VerifyProofRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.proofs.v1'),
-      createEmptyInstance: create)
-    ..hasRequiredFields = false;
-
-  VerifyProofRequest._() : super();
   factory VerifyProofRequest() => create();
+  VerifyProofRequest._() : super();
   factory VerifyProofRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory VerifyProofRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'VerifyProofRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.proofs.v1'),
+      createEmptyInstance: create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -234,8 +224,10 @@ class VerifyProofRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   VerifyProofRequest copyWith(void Function(VerifyProofRequest) updates) =>
       super.copyWith((message) => updates(message as VerifyProofRequest))
-          as VerifyProofRequest; // ignore: deprecated_member_use
+          as VerifyProofRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static VerifyProofRequest create() => VerifyProofRequest._();
   VerifyProofRequest createEmptyInstance() => create();
@@ -248,25 +240,22 @@ class VerifyProofRequest extends $pb.GeneratedMessage {
 }
 
 class VerifyProofResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'VerifyProofResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.proofs.v1'),
-      createEmptyInstance: create)
-    ..hasRequiredFields = false;
-
-  VerifyProofResponse._() : super();
   factory VerifyProofResponse() => create();
+  VerifyProofResponse._() : super();
   factory VerifyProofResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory VerifyProofResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'VerifyProofResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.proofs.v1'),
+      createEmptyInstance: create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -276,8 +265,10 @@ class VerifyProofResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   VerifyProofResponse copyWith(void Function(VerifyProofResponse) updates) =>
       super.copyWith((message) => updates(message as VerifyProofResponse))
-          as VerifyProofResponse; // ignore: deprecated_member_use
+          as VerifyProofResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static VerifyProofResponse create() => VerifyProofResponse._();
   VerifyProofResponse createEmptyInstance() => create();
@@ -288,3 +279,7 @@ class VerifyProofResponse extends $pb.GeneratedMessage {
       $pb.GeneratedMessage.$_defaultFor<VerifyProofResponse>(create);
   static VerifyProofResponse? _defaultInstance;
 }
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/dart/lib/proto/okapi/proofs/v1/proofs.pbenum.dart b/dart/lib/proto/okapi/proofs/v1/proofs.pbenum.dart
index 398d695b..7b5a9a1e 100644
--- a/dart/lib/proto/okapi/proofs/v1/proofs.pbenum.dart
+++ b/dart/lib/proto/okapi/proofs/v1/proofs.pbenum.dart
@@ -1,25 +1,23 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/proofs/v1/proofs.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-// ignore_for_file: UNDEFINED_SHOWN_NAME
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:core' as $core;
+
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class LdSuite extends $pb.ProtobufEnum {
-  static const LdSuite LD_SUITE_UNSPECIFIED = LdSuite._(
-      0,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'LD_SUITE_UNSPECIFIED');
-  static const LdSuite LD_SUITE_JCSED25519SIGNATURE2020 = LdSuite._(
-      1,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'LD_SUITE_JCSED25519SIGNATURE2020');
+  static const LdSuite LD_SUITE_UNSPECIFIED =
+      LdSuite._(0, _omitEnumNames ? '' : 'LD_SUITE_UNSPECIFIED');
+  static const LdSuite LD_SUITE_JCSED25519SIGNATURE2020 =
+      LdSuite._(1, _omitEnumNames ? '' : 'LD_SUITE_JCSED25519SIGNATURE2020');
 
   static const $core.List<LdSuite> values = <LdSuite>[
     LD_SUITE_UNSPECIFIED,
@@ -32,3 +30,5 @@ class LdSuite extends $pb.ProtobufEnum {
 
   const LdSuite._($core.int v, $core.String n) : super(v, n);
 }
+
+const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/dart/lib/proto/okapi/proofs/v1/proofs.pbjson.dart b/dart/lib/proto/okapi/proofs/v1/proofs.pbjson.dart
index ee53a9fd..7046f17d 100644
--- a/dart/lib/proto/okapi/proofs/v1/proofs.pbjson.dart
+++ b/dart/lib/proto/okapi/proofs/v1/proofs.pbjson.dart
@@ -1,31 +1,37 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/proofs/v1/proofs.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
 @$core.Deprecated('Use ldSuiteDescriptor instead')
-const LdSuite$json = const {
+const LdSuite$json = {
   '1': 'LdSuite',
-  '2': const [
-    const {'1': 'LD_SUITE_UNSPECIFIED', '2': 0},
-    const {'1': 'LD_SUITE_JCSED25519SIGNATURE2020', '2': 1},
+  '2': [
+    {'1': 'LD_SUITE_UNSPECIFIED', '2': 0},
+    {'1': 'LD_SUITE_JCSED25519SIGNATURE2020', '2': 1},
   ],
 };
 
 /// Descriptor for `LdSuite`. Decode as a `google.protobuf.EnumDescriptorProto`.
 final $typed_data.Uint8List ldSuiteDescriptor = $convert.base64Decode(
-    'CgdMZFN1aXRlEhgKFExEX1NVSVRFX1VOU1BFQ0lGSUVEEAASJAogTERfU1VJVEVfSkNTRUQyNTUxOVNJR05BVFVSRTIwMjAQAQ==');
+    'CgdMZFN1aXRlEhgKFExEX1NVSVRFX1VOU1BFQ0lGSUVEEAASJAogTERfU1VJVEVfSkNTRUQyNT'
+    'UxOVNJR05BVFVSRTIwMjAQAQ==');
+
 @$core.Deprecated('Use createProofRequestDescriptor instead')
-const CreateProofRequest$json = const {
+const CreateProofRequest$json = {
   '1': 'CreateProofRequest',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'document',
       '3': 1,
       '4': 1,
@@ -33,7 +39,7 @@ const CreateProofRequest$json = const {
       '6': '.google.protobuf.Struct',
       '10': 'document'
     },
-    const {
+    {
       '1': 'key',
       '3': 3,
       '4': 1,
@@ -41,7 +47,7 @@ const CreateProofRequest$json = const {
       '6': '.okapi.keys.v1.JsonWebKey',
       '10': 'key'
     },
-    const {
+    {
       '1': 'suite',
       '3': 4,
       '4': 1,
@@ -54,12 +60,16 @@ const CreateProofRequest$json = const {
 
 /// Descriptor for `CreateProofRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List createProofRequestDescriptor = $convert.base64Decode(
-    'ChJDcmVhdGVQcm9vZlJlcXVlc3QSMwoIZG9jdW1lbnQYASABKAsyFy5nb29nbGUucHJvdG9idWYuU3RydWN0Ughkb2N1bWVudBIrCgNrZXkYAyABKAsyGS5va2FwaS5rZXlzLnYxLkpzb25XZWJLZXlSA2tleRIuCgVzdWl0ZRgEIAEoDjIYLm9rYXBpLnByb29mcy52MS5MZFN1aXRlUgVzdWl0ZQ==');
+    'ChJDcmVhdGVQcm9vZlJlcXVlc3QSMwoIZG9jdW1lbnQYASABKAsyFy5nb29nbGUucHJvdG9idW'
+    'YuU3RydWN0Ughkb2N1bWVudBIrCgNrZXkYAyABKAsyGS5va2FwaS5rZXlzLnYxLkpzb25XZWJL'
+    'ZXlSA2tleRIuCgVzdWl0ZRgEIAEoDjIYLm9rYXBpLnByb29mcy52MS5MZFN1aXRlUgVzdWl0ZQ'
+    '==');
+
 @$core.Deprecated('Use createProofResponseDescriptor instead')
-const CreateProofResponse$json = const {
+const CreateProofResponse$json = {
   '1': 'CreateProofResponse',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'signed_document',
       '3': 1,
       '4': 1,
@@ -72,17 +82,20 @@ const CreateProofResponse$json = const {
 
 /// Descriptor for `CreateProofResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List createProofResponseDescriptor = $convert.base64Decode(
-    'ChNDcmVhdGVQcm9vZlJlc3BvbnNlEkAKD3NpZ25lZF9kb2N1bWVudBgBIAEoCzIXLmdvb2dsZS5wcm90b2J1Zi5TdHJ1Y3RSDnNpZ25lZERvY3VtZW50');
+    'ChNDcmVhdGVQcm9vZlJlc3BvbnNlEkAKD3NpZ25lZF9kb2N1bWVudBgBIAEoCzIXLmdvb2dsZS'
+    '5wcm90b2J1Zi5TdHJ1Y3RSDnNpZ25lZERvY3VtZW50');
+
 @$core.Deprecated('Use verifyProofRequestDescriptor instead')
-const VerifyProofRequest$json = const {
+const VerifyProofRequest$json = {
   '1': 'VerifyProofRequest',
 };
 
 /// Descriptor for `VerifyProofRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List verifyProofRequestDescriptor =
     $convert.base64Decode('ChJWZXJpZnlQcm9vZlJlcXVlc3Q=');
+
 @$core.Deprecated('Use verifyProofResponseDescriptor instead')
-const VerifyProofResponse$json = const {
+const VerifyProofResponse$json = {
   '1': 'VerifyProofResponse',
 };
 
diff --git a/dart/lib/proto/okapi/proofs/v1/proofs.pbserver.dart b/dart/lib/proto/okapi/proofs/v1/proofs.pbserver.dart
index fff6c770..130c12cb 100644
--- a/dart/lib/proto/okapi/proofs/v1/proofs.pbserver.dart
+++ b/dart/lib/proto/okapi/proofs/v1/proofs.pbserver.dart
@@ -1,8 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/proofs/v1/proofs.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'proofs.pb.dart';
diff --git a/dart/lib/proto/okapi/security/v1/security.pb.dart b/dart/lib/proto/okapi/security/v1/security.pb.dart
index df7eb32a..c853636b 100644
--- a/dart/lib/proto/okapi/security/v1/security.pb.dart
+++ b/dart/lib/proto/okapi/security/v1/security.pb.dart
@@ -1,48 +1,46 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/security/v1/security.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:core' as $core;
 
 import 'package:protobuf/protobuf.dart' as $pb;
 
+/// Create an Oberon Compatible Secret Key
 class CreateOberonKeyRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'CreateOberonKeyRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'seed',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  CreateOberonKeyRequest._() : super();
   factory CreateOberonKeyRequest({
     $core.List<$core.int>? seed,
   }) {
-    final _result = create();
+    final $result = create();
     if (seed != null) {
-      _result.seed = seed;
+      $result.seed = seed;
     }
-    return _result;
+    return $result;
   }
+  CreateOberonKeyRequest._() : super();
   factory CreateOberonKeyRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory CreateOberonKeyRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CreateOberonKeyRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'seed', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -54,8 +52,10 @@ class CreateOberonKeyRequest extends $pb.GeneratedMessage {
   CreateOberonKeyRequest copyWith(
           void Function(CreateOberonKeyRequest) updates) =>
       super.copyWith((message) => updates(message as CreateOberonKeyRequest))
-          as CreateOberonKeyRequest; // ignore: deprecated_member_use
+          as CreateOberonKeyRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static CreateOberonKeyRequest create() => CreateOberonKeyRequest._();
   CreateOberonKeyRequest createEmptyInstance() => create();
@@ -79,50 +79,40 @@ class CreateOberonKeyRequest extends $pb.GeneratedMessage {
   void clearSeed() => clearField(1);
 }
 
+/// Contains the oberon secret key bytes
 class CreateOberonKeyResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'CreateOberonKeyResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'sk',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'pk',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  CreateOberonKeyResponse._() : super();
   factory CreateOberonKeyResponse({
     $core.List<$core.int>? sk,
     $core.List<$core.int>? pk,
   }) {
-    final _result = create();
+    final $result = create();
     if (sk != null) {
-      _result.sk = sk;
+      $result.sk = sk;
     }
     if (pk != null) {
-      _result.pk = pk;
+      $result.pk = pk;
     }
-    return _result;
+    return $result;
   }
+  CreateOberonKeyResponse._() : super();
   factory CreateOberonKeyResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory CreateOberonKeyResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CreateOberonKeyResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'sk', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'pk', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -134,8 +124,10 @@ class CreateOberonKeyResponse extends $pb.GeneratedMessage {
   CreateOberonKeyResponse copyWith(
           void Function(CreateOberonKeyResponse) updates) =>
       super.copyWith((message) => updates(message as CreateOberonKeyResponse))
-          as CreateOberonKeyResponse; // ignore: deprecated_member_use
+          as CreateOberonKeyResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static CreateOberonKeyResponse create() => CreateOberonKeyResponse._();
   CreateOberonKeyResponse createEmptyInstance() => create();
@@ -171,60 +163,46 @@ class CreateOberonKeyResponse extends $pb.GeneratedMessage {
   void clearPk() => clearField(3);
 }
 
+/// Create a new oberon token
 class CreateOberonTokenRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'CreateOberonTokenRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'sk',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'data',
-        $pb.PbFieldType.OY)
-    ..p<$core.List<$core.int>>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'blinding',
-        $pb.PbFieldType.PY)
-    ..hasRequiredFields = false;
-
-  CreateOberonTokenRequest._() : super();
   factory CreateOberonTokenRequest({
     $core.List<$core.int>? sk,
     $core.List<$core.int>? data,
     $core.Iterable<$core.List<$core.int>>? blinding,
   }) {
-    final _result = create();
+    final $result = create();
     if (sk != null) {
-      _result.sk = sk;
+      $result.sk = sk;
     }
     if (data != null) {
-      _result.data = data;
+      $result.data = data;
     }
     if (blinding != null) {
-      _result.blinding.addAll(blinding);
+      $result.blinding.addAll(blinding);
     }
-    return _result;
+    return $result;
   }
+  CreateOberonTokenRequest._() : super();
   factory CreateOberonTokenRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory CreateOberonTokenRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CreateOberonTokenRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'sk', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
+    ..p<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'blinding', $pb.PbFieldType.PY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -236,8 +214,10 @@ class CreateOberonTokenRequest extends $pb.GeneratedMessage {
   CreateOberonTokenRequest copyWith(
           void Function(CreateOberonTokenRequest) updates) =>
       super.copyWith((message) => updates(message as CreateOberonTokenRequest))
-          as CreateOberonTokenRequest; // ignore: deprecated_member_use
+          as CreateOberonTokenRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static CreateOberonTokenRequest create() => CreateOberonTokenRequest._();
   CreateOberonTokenRequest createEmptyInstance() => create();
@@ -276,40 +256,34 @@ class CreateOberonTokenRequest extends $pb.GeneratedMessage {
   $core.List<$core.List<$core.int>> get blinding => $_getList(2);
 }
 
+/// Contains the token with optional blinding
 class CreateOberonTokenResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'CreateOberonTokenResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'token',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  CreateOberonTokenResponse._() : super();
   factory CreateOberonTokenResponse({
     $core.List<$core.int>? token,
   }) {
-    final _result = create();
+    final $result = create();
     if (token != null) {
-      _result.token = token;
+      $result.token = token;
     }
-    return _result;
+    return $result;
   }
+  CreateOberonTokenResponse._() : super();
   factory CreateOberonTokenResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory CreateOberonTokenResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CreateOberonTokenResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'token', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -321,8 +295,10 @@ class CreateOberonTokenResponse extends $pb.GeneratedMessage {
   CreateOberonTokenResponse copyWith(
           void Function(CreateOberonTokenResponse) updates) =>
       super.copyWith((message) => updates(message as CreateOberonTokenResponse))
-          as CreateOberonTokenResponse; // ignore: deprecated_member_use
+          as CreateOberonTokenResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static CreateOberonTokenResponse create() => CreateOberonTokenResponse._();
   CreateOberonTokenResponse createEmptyInstance() => create();
@@ -346,70 +322,52 @@ class CreateOberonTokenResponse extends $pb.GeneratedMessage {
   void clearToken() => clearField(1);
 }
 
+/// Create a proof that holder knows the token
 class CreateOberonProofRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'CreateOberonProofRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'data',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'token',
-        $pb.PbFieldType.OY)
-    ..p<$core.List<$core.int>>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'blinding',
-        $pb.PbFieldType.PY)
-    ..a<$core.List<$core.int>>(
-        4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'nonce',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  CreateOberonProofRequest._() : super();
   factory CreateOberonProofRequest({
     $core.List<$core.int>? data,
     $core.List<$core.int>? token,
     $core.Iterable<$core.List<$core.int>>? blinding,
     $core.List<$core.int>? nonce,
   }) {
-    final _result = create();
+    final $result = create();
     if (data != null) {
-      _result.data = data;
+      $result.data = data;
     }
     if (token != null) {
-      _result.token = token;
+      $result.token = token;
     }
     if (blinding != null) {
-      _result.blinding.addAll(blinding);
+      $result.blinding.addAll(blinding);
     }
     if (nonce != null) {
-      _result.nonce = nonce;
+      $result.nonce = nonce;
     }
-    return _result;
+    return $result;
   }
+  CreateOberonProofRequest._() : super();
   factory CreateOberonProofRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory CreateOberonProofRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CreateOberonProofRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'token', $pb.PbFieldType.OY)
+    ..p<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'blinding', $pb.PbFieldType.PY)
+    ..a<$core.List<$core.int>>(
+        4, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -421,8 +379,10 @@ class CreateOberonProofRequest extends $pb.GeneratedMessage {
   CreateOberonProofRequest copyWith(
           void Function(CreateOberonProofRequest) updates) =>
       super.copyWith((message) => updates(message as CreateOberonProofRequest))
-          as CreateOberonProofRequest; // ignore: deprecated_member_use
+          as CreateOberonProofRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static CreateOberonProofRequest create() => CreateOberonProofRequest._();
   CreateOberonProofRequest createEmptyInstance() => create();
@@ -473,40 +433,34 @@ class CreateOberonProofRequest extends $pb.GeneratedMessage {
   void clearNonce() => clearField(4);
 }
 
+/// Contains the token proof
 class CreateOberonProofResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'CreateOberonProofResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'proof',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  CreateOberonProofResponse._() : super();
   factory CreateOberonProofResponse({
     $core.List<$core.int>? proof,
   }) {
-    final _result = create();
+    final $result = create();
     if (proof != null) {
-      _result.proof = proof;
+      $result.proof = proof;
     }
-    return _result;
+    return $result;
   }
+  CreateOberonProofResponse._() : super();
   factory CreateOberonProofResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory CreateOberonProofResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CreateOberonProofResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'proof', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -518,8 +472,10 @@ class CreateOberonProofResponse extends $pb.GeneratedMessage {
   CreateOberonProofResponse copyWith(
           void Function(CreateOberonProofResponse) updates) =>
       super.copyWith((message) => updates(message as CreateOberonProofResponse))
-          as CreateOberonProofResponse; // ignore: deprecated_member_use
+          as CreateOberonProofResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static CreateOberonProofResponse create() => CreateOberonProofResponse._();
   CreateOberonProofResponse createEmptyInstance() => create();
@@ -543,70 +499,52 @@ class CreateOberonProofResponse extends $pb.GeneratedMessage {
   void clearProof() => clearField(2);
 }
 
+/// Verify the presented proof is valid
 class VerifyOberonProofRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'VerifyOberonProofRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'proof',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'data',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'nonce',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'pk',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  VerifyOberonProofRequest._() : super();
   factory VerifyOberonProofRequest({
     $core.List<$core.int>? proof,
     $core.List<$core.int>? data,
     $core.List<$core.int>? nonce,
     $core.List<$core.int>? pk,
   }) {
-    final _result = create();
+    final $result = create();
     if (proof != null) {
-      _result.proof = proof;
+      $result.proof = proof;
     }
     if (data != null) {
-      _result.data = data;
+      $result.data = data;
     }
     if (nonce != null) {
-      _result.nonce = nonce;
+      $result.nonce = nonce;
     }
     if (pk != null) {
-      _result.pk = pk;
+      $result.pk = pk;
     }
-    return _result;
+    return $result;
   }
+  VerifyOberonProofRequest._() : super();
   factory VerifyOberonProofRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory VerifyOberonProofRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'VerifyOberonProofRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'proof', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'nonce', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        4, _omitFieldNames ? '' : 'pk', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -618,8 +556,10 @@ class VerifyOberonProofRequest extends $pb.GeneratedMessage {
   VerifyOberonProofRequest copyWith(
           void Function(VerifyOberonProofRequest) updates) =>
       super.copyWith((message) => updates(message as VerifyOberonProofRequest))
-          as VerifyOberonProofRequest; // ignore: deprecated_member_use
+          as VerifyOberonProofRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static VerifyOberonProofRequest create() => VerifyOberonProofRequest._();
   VerifyOberonProofRequest createEmptyInstance() => create();
@@ -679,39 +619,33 @@ class VerifyOberonProofRequest extends $pb.GeneratedMessage {
   void clearPk() => clearField(4);
 }
 
+/// Contains the status of the proof validation
 class VerifyOberonProofResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'VerifyOberonProofResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..aOB(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'valid')
-    ..hasRequiredFields = false;
-
-  VerifyOberonProofResponse._() : super();
   factory VerifyOberonProofResponse({
     $core.bool? valid,
   }) {
-    final _result = create();
+    final $result = create();
     if (valid != null) {
-      _result.valid = valid;
+      $result.valid = valid;
     }
-    return _result;
+    return $result;
   }
+  VerifyOberonProofResponse._() : super();
   factory VerifyOberonProofResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory VerifyOberonProofResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'VerifyOberonProofResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..aOB(1, _omitFieldNames ? '' : 'valid')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -723,8 +657,10 @@ class VerifyOberonProofResponse extends $pb.GeneratedMessage {
   VerifyOberonProofResponse copyWith(
           void Function(VerifyOberonProofResponse) updates) =>
       super.copyWith((message) => updates(message as VerifyOberonProofResponse))
-          as VerifyOberonProofResponse; // ignore: deprecated_member_use
+          as VerifyOberonProofResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static VerifyOberonProofResponse create() => VerifyOberonProofResponse._();
   VerifyOberonProofResponse createEmptyInstance() => create();
@@ -748,50 +684,40 @@ class VerifyOberonProofResponse extends $pb.GeneratedMessage {
   void clearValid() => clearField(1);
 }
 
+/// Blind an oberon token
 class BlindOberonTokenRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'BlindOberonTokenRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'token',
-        $pb.PbFieldType.OY)
-    ..p<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'blinding',
-        $pb.PbFieldType.PY)
-    ..hasRequiredFields = false;
-
-  BlindOberonTokenRequest._() : super();
   factory BlindOberonTokenRequest({
     $core.List<$core.int>? token,
     $core.Iterable<$core.List<$core.int>>? blinding,
   }) {
-    final _result = create();
+    final $result = create();
     if (token != null) {
-      _result.token = token;
+      $result.token = token;
     }
     if (blinding != null) {
-      _result.blinding.addAll(blinding);
+      $result.blinding.addAll(blinding);
     }
-    return _result;
+    return $result;
   }
+  BlindOberonTokenRequest._() : super();
   factory BlindOberonTokenRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory BlindOberonTokenRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'BlindOberonTokenRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'token', $pb.PbFieldType.OY)
+    ..p<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'blinding', $pb.PbFieldType.PY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -803,8 +729,10 @@ class BlindOberonTokenRequest extends $pb.GeneratedMessage {
   BlindOberonTokenRequest copyWith(
           void Function(BlindOberonTokenRequest) updates) =>
       super.copyWith((message) => updates(message as BlindOberonTokenRequest))
-          as BlindOberonTokenRequest; // ignore: deprecated_member_use
+          as BlindOberonTokenRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static BlindOberonTokenRequest create() => BlindOberonTokenRequest._();
   BlindOberonTokenRequest createEmptyInstance() => create();
@@ -831,40 +759,34 @@ class BlindOberonTokenRequest extends $pb.GeneratedMessage {
   $core.List<$core.List<$core.int>> get blinding => $_getList(1);
 }
 
+/// Contains the blinded token reply
 class BlindOberonTokenResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'BlindOberonTokenResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'token',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  BlindOberonTokenResponse._() : super();
   factory BlindOberonTokenResponse({
     $core.List<$core.int>? token,
   }) {
-    final _result = create();
+    final $result = create();
     if (token != null) {
-      _result.token = token;
+      $result.token = token;
     }
-    return _result;
+    return $result;
   }
+  BlindOberonTokenResponse._() : super();
   factory BlindOberonTokenResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory BlindOberonTokenResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'BlindOberonTokenResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'token', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -876,8 +798,10 @@ class BlindOberonTokenResponse extends $pb.GeneratedMessage {
   BlindOberonTokenResponse copyWith(
           void Function(BlindOberonTokenResponse) updates) =>
       super.copyWith((message) => updates(message as BlindOberonTokenResponse))
-          as BlindOberonTokenResponse; // ignore: deprecated_member_use
+          as BlindOberonTokenResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static BlindOberonTokenResponse create() => BlindOberonTokenResponse._();
   BlindOberonTokenResponse createEmptyInstance() => create();
@@ -901,50 +825,40 @@ class BlindOberonTokenResponse extends $pb.GeneratedMessage {
   void clearToken() => clearField(1);
 }
 
+/// UnBlind an oberon token
 class UnBlindOberonTokenRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'UnBlindOberonTokenRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'token',
-        $pb.PbFieldType.OY)
-    ..p<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'blinding',
-        $pb.PbFieldType.PY)
-    ..hasRequiredFields = false;
-
-  UnBlindOberonTokenRequest._() : super();
   factory UnBlindOberonTokenRequest({
     $core.List<$core.int>? token,
     $core.Iterable<$core.List<$core.int>>? blinding,
   }) {
-    final _result = create();
+    final $result = create();
     if (token != null) {
-      _result.token = token;
+      $result.token = token;
     }
     if (blinding != null) {
-      _result.blinding.addAll(blinding);
+      $result.blinding.addAll(blinding);
     }
-    return _result;
+    return $result;
   }
+  UnBlindOberonTokenRequest._() : super();
   factory UnBlindOberonTokenRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory UnBlindOberonTokenRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'UnBlindOberonTokenRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'token', $pb.PbFieldType.OY)
+    ..p<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'blinding', $pb.PbFieldType.PY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -956,8 +870,10 @@ class UnBlindOberonTokenRequest extends $pb.GeneratedMessage {
   UnBlindOberonTokenRequest copyWith(
           void Function(UnBlindOberonTokenRequest) updates) =>
       super.copyWith((message) => updates(message as UnBlindOberonTokenRequest))
-          as UnBlindOberonTokenRequest; // ignore: deprecated_member_use
+          as UnBlindOberonTokenRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static UnBlindOberonTokenRequest create() => UnBlindOberonTokenRequest._();
   UnBlindOberonTokenRequest createEmptyInstance() => create();
@@ -984,40 +900,34 @@ class UnBlindOberonTokenRequest extends $pb.GeneratedMessage {
   $core.List<$core.List<$core.int>> get blinding => $_getList(1);
 }
 
+/// Contains the unblinded token reply
 class UnBlindOberonTokenResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'UnBlindOberonTokenResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'token',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  UnBlindOberonTokenResponse._() : super();
   factory UnBlindOberonTokenResponse({
     $core.List<$core.int>? token,
   }) {
-    final _result = create();
+    final $result = create();
     if (token != null) {
-      _result.token = token;
+      $result.token = token;
     }
-    return _result;
+    return $result;
   }
+  UnBlindOberonTokenResponse._() : super();
   factory UnBlindOberonTokenResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory UnBlindOberonTokenResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'UnBlindOberonTokenResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'token', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -1030,8 +940,10 @@ class UnBlindOberonTokenResponse extends $pb.GeneratedMessage {
           void Function(UnBlindOberonTokenResponse) updates) =>
       super.copyWith(
               (message) => updates(message as UnBlindOberonTokenResponse))
-          as UnBlindOberonTokenResponse; // ignore: deprecated_member_use
+          as UnBlindOberonTokenResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static UnBlindOberonTokenResponse create() => UnBlindOberonTokenResponse._();
   UnBlindOberonTokenResponse createEmptyInstance() => create();
@@ -1055,60 +967,46 @@ class UnBlindOberonTokenResponse extends $pb.GeneratedMessage {
   void clearToken() => clearField(1);
 }
 
+/// Verify that an oberon token comes from the desired issuer
 class VerifyOberonTokenRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'VerifyOberonTokenRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'token',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'pk',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'data',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  VerifyOberonTokenRequest._() : super();
   factory VerifyOberonTokenRequest({
     $core.List<$core.int>? token,
     $core.List<$core.int>? pk,
     $core.List<$core.int>? data,
   }) {
-    final _result = create();
+    final $result = create();
     if (token != null) {
-      _result.token = token;
+      $result.token = token;
     }
     if (pk != null) {
-      _result.pk = pk;
+      $result.pk = pk;
     }
     if (data != null) {
-      _result.data = data;
+      $result.data = data;
     }
-    return _result;
+    return $result;
   }
+  VerifyOberonTokenRequest._() : super();
   factory VerifyOberonTokenRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory VerifyOberonTokenRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'VerifyOberonTokenRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'token', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'pk', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'data', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -1120,8 +1018,10 @@ class VerifyOberonTokenRequest extends $pb.GeneratedMessage {
   VerifyOberonTokenRequest copyWith(
           void Function(VerifyOberonTokenRequest) updates) =>
       super.copyWith((message) => updates(message as VerifyOberonTokenRequest))
-          as VerifyOberonTokenRequest; // ignore: deprecated_member_use
+          as VerifyOberonTokenRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static VerifyOberonTokenRequest create() => VerifyOberonTokenRequest._();
   VerifyOberonTokenRequest createEmptyInstance() => create();
@@ -1169,39 +1069,33 @@ class VerifyOberonTokenRequest extends $pb.GeneratedMessage {
   void clearData() => clearField(3);
 }
 
+/// Contains the verification result for the oberon token
 class VerifyOberonTokenResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'VerifyOberonTokenResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.security.v1'),
-      createEmptyInstance: create)
-    ..aOB(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'valid')
-    ..hasRequiredFields = false;
-
-  VerifyOberonTokenResponse._() : super();
   factory VerifyOberonTokenResponse({
     $core.bool? valid,
   }) {
-    final _result = create();
+    final $result = create();
     if (valid != null) {
-      _result.valid = valid;
+      $result.valid = valid;
     }
-    return _result;
+    return $result;
   }
+  VerifyOberonTokenResponse._() : super();
   factory VerifyOberonTokenResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory VerifyOberonTokenResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'VerifyOberonTokenResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.security.v1'),
+      createEmptyInstance: create)
+    ..aOB(1, _omitFieldNames ? '' : 'valid')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -1213,8 +1107,10 @@ class VerifyOberonTokenResponse extends $pb.GeneratedMessage {
   VerifyOberonTokenResponse copyWith(
           void Function(VerifyOberonTokenResponse) updates) =>
       super.copyWith((message) => updates(message as VerifyOberonTokenResponse))
-          as VerifyOberonTokenResponse; // ignore: deprecated_member_use
+          as VerifyOberonTokenResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static VerifyOberonTokenResponse create() => VerifyOberonTokenResponse._();
   VerifyOberonTokenResponse createEmptyInstance() => create();
@@ -1237,3 +1133,7 @@ class VerifyOberonTokenResponse extends $pb.GeneratedMessage {
   @$pb.TagNumber(1)
   void clearValid() => clearField(1);
 }
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/dart/lib/proto/okapi/security/v1/security.pbenum.dart b/dart/lib/proto/okapi/security/v1/security.pbenum.dart
index dde86b96..d945a3b1 100644
--- a/dart/lib/proto/okapi/security/v1/security.pbenum.dart
+++ b/dart/lib/proto/okapi/security/v1/security.pbenum.dart
@@ -1,6 +1,10 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/security/v1/security.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
diff --git a/dart/lib/proto/okapi/security/v1/security.pbjson.dart b/dart/lib/proto/okapi/security/v1/security.pbjson.dart
index 33b5954a..e118cf2f 100644
--- a/dart/lib/proto/okapi/security/v1/security.pbjson.dart
+++ b/dart/lib/proto/okapi/security/v1/security.pbjson.dart
@@ -1,19 +1,23 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/security/v1/security.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
 @$core.Deprecated('Use createOberonKeyRequestDescriptor instead')
-const CreateOberonKeyRequest$json = const {
+const CreateOberonKeyRequest$json = {
   '1': 'CreateOberonKeyRequest',
-  '2': const [
-    const {'1': 'seed', '3': 1, '4': 1, '5': 12, '10': 'seed'},
+  '2': [
+    {'1': 'seed', '3': 1, '4': 1, '5': 12, '10': 'seed'},
   ],
 };
 
@@ -21,38 +25,43 @@ const CreateOberonKeyRequest$json = const {
 final $typed_data.Uint8List createOberonKeyRequestDescriptor =
     $convert.base64Decode(
         'ChZDcmVhdGVPYmVyb25LZXlSZXF1ZXN0EhIKBHNlZWQYASABKAxSBHNlZWQ=');
+
 @$core.Deprecated('Use createOberonKeyResponseDescriptor instead')
-const CreateOberonKeyResponse$json = const {
+const CreateOberonKeyResponse$json = {
   '1': 'CreateOberonKeyResponse',
-  '2': const [
-    const {'1': 'sk', '3': 2, '4': 1, '5': 12, '10': 'sk'},
-    const {'1': 'pk', '3': 3, '4': 1, '5': 12, '10': 'pk'},
+  '2': [
+    {'1': 'sk', '3': 2, '4': 1, '5': 12, '10': 'sk'},
+    {'1': 'pk', '3': 3, '4': 1, '5': 12, '10': 'pk'},
   ],
 };
 
 /// Descriptor for `CreateOberonKeyResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List createOberonKeyResponseDescriptor =
     $convert.base64Decode(
-        'ChdDcmVhdGVPYmVyb25LZXlSZXNwb25zZRIOCgJzaxgCIAEoDFICc2sSDgoCcGsYAyABKAxSAnBr');
+        'ChdDcmVhdGVPYmVyb25LZXlSZXNwb25zZRIOCgJzaxgCIAEoDFICc2sSDgoCcGsYAyABKAxSAn'
+        'Br');
+
 @$core.Deprecated('Use createOberonTokenRequestDescriptor instead')
-const CreateOberonTokenRequest$json = const {
+const CreateOberonTokenRequest$json = {
   '1': 'CreateOberonTokenRequest',
-  '2': const [
-    const {'1': 'sk', '3': 1, '4': 1, '5': 12, '10': 'sk'},
-    const {'1': 'data', '3': 2, '4': 1, '5': 12, '10': 'data'},
-    const {'1': 'blinding', '3': 3, '4': 3, '5': 12, '10': 'blinding'},
+  '2': [
+    {'1': 'sk', '3': 1, '4': 1, '5': 12, '10': 'sk'},
+    {'1': 'data', '3': 2, '4': 1, '5': 12, '10': 'data'},
+    {'1': 'blinding', '3': 3, '4': 3, '5': 12, '10': 'blinding'},
   ],
 };
 
 /// Descriptor for `CreateOberonTokenRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List createOberonTokenRequestDescriptor =
     $convert.base64Decode(
-        'ChhDcmVhdGVPYmVyb25Ub2tlblJlcXVlc3QSDgoCc2sYASABKAxSAnNrEhIKBGRhdGEYAiABKAxSBGRhdGESGgoIYmxpbmRpbmcYAyADKAxSCGJsaW5kaW5n');
+        'ChhDcmVhdGVPYmVyb25Ub2tlblJlcXVlc3QSDgoCc2sYASABKAxSAnNrEhIKBGRhdGEYAiABKA'
+        'xSBGRhdGESGgoIYmxpbmRpbmcYAyADKAxSCGJsaW5kaW5n');
+
 @$core.Deprecated('Use createOberonTokenResponseDescriptor instead')
-const CreateOberonTokenResponse$json = const {
+const CreateOberonTokenResponse$json = {
   '1': 'CreateOberonTokenResponse',
-  '2': const [
-    const {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
+  '2': [
+    {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
   ],
 };
 
@@ -60,26 +69,29 @@ const CreateOberonTokenResponse$json = const {
 final $typed_data.Uint8List createOberonTokenResponseDescriptor =
     $convert.base64Decode(
         'ChlDcmVhdGVPYmVyb25Ub2tlblJlc3BvbnNlEhQKBXRva2VuGAEgASgMUgV0b2tlbg==');
+
 @$core.Deprecated('Use createOberonProofRequestDescriptor instead')
-const CreateOberonProofRequest$json = const {
+const CreateOberonProofRequest$json = {
   '1': 'CreateOberonProofRequest',
-  '2': const [
-    const {'1': 'data', '3': 1, '4': 1, '5': 12, '10': 'data'},
-    const {'1': 'token', '3': 2, '4': 1, '5': 12, '10': 'token'},
-    const {'1': 'blinding', '3': 3, '4': 3, '5': 12, '10': 'blinding'},
-    const {'1': 'nonce', '3': 4, '4': 1, '5': 12, '10': 'nonce'},
+  '2': [
+    {'1': 'data', '3': 1, '4': 1, '5': 12, '10': 'data'},
+    {'1': 'token', '3': 2, '4': 1, '5': 12, '10': 'token'},
+    {'1': 'blinding', '3': 3, '4': 3, '5': 12, '10': 'blinding'},
+    {'1': 'nonce', '3': 4, '4': 1, '5': 12, '10': 'nonce'},
   ],
 };
 
 /// Descriptor for `CreateOberonProofRequest`. Decode as a `google.protobuf.DescriptorProto`.
-final $typed_data.Uint8List createOberonProofRequestDescriptor =
-    $convert.base64Decode(
-        'ChhDcmVhdGVPYmVyb25Qcm9vZlJlcXVlc3QSEgoEZGF0YRgBIAEoDFIEZGF0YRIUCgV0b2tlbhgCIAEoDFIFdG9rZW4SGgoIYmxpbmRpbmcYAyADKAxSCGJsaW5kaW5nEhQKBW5vbmNlGAQgASgMUgVub25jZQ==');
+final $typed_data.Uint8List createOberonProofRequestDescriptor = $convert.base64Decode(
+    'ChhDcmVhdGVPYmVyb25Qcm9vZlJlcXVlc3QSEgoEZGF0YRgBIAEoDFIEZGF0YRIUCgV0b2tlbh'
+    'gCIAEoDFIFdG9rZW4SGgoIYmxpbmRpbmcYAyADKAxSCGJsaW5kaW5nEhQKBW5vbmNlGAQgASgM'
+    'UgVub25jZQ==');
+
 @$core.Deprecated('Use createOberonProofResponseDescriptor instead')
-const CreateOberonProofResponse$json = const {
+const CreateOberonProofResponse$json = {
   '1': 'CreateOberonProofResponse',
-  '2': const [
-    const {'1': 'proof', '3': 2, '4': 1, '5': 12, '10': 'proof'},
+  '2': [
+    {'1': 'proof', '3': 2, '4': 1, '5': 12, '10': 'proof'},
   ],
 };
 
@@ -87,26 +99,29 @@ const CreateOberonProofResponse$json = const {
 final $typed_data.Uint8List createOberonProofResponseDescriptor =
     $convert.base64Decode(
         'ChlDcmVhdGVPYmVyb25Qcm9vZlJlc3BvbnNlEhQKBXByb29mGAIgASgMUgVwcm9vZg==');
+
 @$core.Deprecated('Use verifyOberonProofRequestDescriptor instead')
-const VerifyOberonProofRequest$json = const {
+const VerifyOberonProofRequest$json = {
   '1': 'VerifyOberonProofRequest',
-  '2': const [
-    const {'1': 'proof', '3': 1, '4': 1, '5': 12, '10': 'proof'},
-    const {'1': 'data', '3': 2, '4': 1, '5': 12, '10': 'data'},
-    const {'1': 'nonce', '3': 3, '4': 1, '5': 12, '10': 'nonce'},
-    const {'1': 'pk', '3': 4, '4': 1, '5': 12, '10': 'pk'},
+  '2': [
+    {'1': 'proof', '3': 1, '4': 1, '5': 12, '10': 'proof'},
+    {'1': 'data', '3': 2, '4': 1, '5': 12, '10': 'data'},
+    {'1': 'nonce', '3': 3, '4': 1, '5': 12, '10': 'nonce'},
+    {'1': 'pk', '3': 4, '4': 1, '5': 12, '10': 'pk'},
   ],
 };
 
 /// Descriptor for `VerifyOberonProofRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List verifyOberonProofRequestDescriptor =
     $convert.base64Decode(
-        'ChhWZXJpZnlPYmVyb25Qcm9vZlJlcXVlc3QSFAoFcHJvb2YYASABKAxSBXByb29mEhIKBGRhdGEYAiABKAxSBGRhdGESFAoFbm9uY2UYAyABKAxSBW5vbmNlEg4KAnBrGAQgASgMUgJwaw==');
+        'ChhWZXJpZnlPYmVyb25Qcm9vZlJlcXVlc3QSFAoFcHJvb2YYASABKAxSBXByb29mEhIKBGRhdG'
+        'EYAiABKAxSBGRhdGESFAoFbm9uY2UYAyABKAxSBW5vbmNlEg4KAnBrGAQgASgMUgJwaw==');
+
 @$core.Deprecated('Use verifyOberonProofResponseDescriptor instead')
-const VerifyOberonProofResponse$json = const {
+const VerifyOberonProofResponse$json = {
   '1': 'VerifyOberonProofResponse',
-  '2': const [
-    const {'1': 'valid', '3': 1, '4': 1, '5': 8, '10': 'valid'},
+  '2': [
+    {'1': 'valid', '3': 1, '4': 1, '5': 8, '10': 'valid'},
   ],
 };
 
@@ -114,24 +129,27 @@ const VerifyOberonProofResponse$json = const {
 final $typed_data.Uint8List verifyOberonProofResponseDescriptor =
     $convert.base64Decode(
         'ChlWZXJpZnlPYmVyb25Qcm9vZlJlc3BvbnNlEhQKBXZhbGlkGAEgASgIUgV2YWxpZA==');
+
 @$core.Deprecated('Use blindOberonTokenRequestDescriptor instead')
-const BlindOberonTokenRequest$json = const {
+const BlindOberonTokenRequest$json = {
   '1': 'BlindOberonTokenRequest',
-  '2': const [
-    const {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
-    const {'1': 'blinding', '3': 2, '4': 3, '5': 12, '10': 'blinding'},
+  '2': [
+    {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
+    {'1': 'blinding', '3': 2, '4': 3, '5': 12, '10': 'blinding'},
   ],
 };
 
 /// Descriptor for `BlindOberonTokenRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List blindOberonTokenRequestDescriptor =
     $convert.base64Decode(
-        'ChdCbGluZE9iZXJvblRva2VuUmVxdWVzdBIUCgV0b2tlbhgBIAEoDFIFdG9rZW4SGgoIYmxpbmRpbmcYAiADKAxSCGJsaW5kaW5n');
+        'ChdCbGluZE9iZXJvblRva2VuUmVxdWVzdBIUCgV0b2tlbhgBIAEoDFIFdG9rZW4SGgoIYmxpbm'
+        'RpbmcYAiADKAxSCGJsaW5kaW5n');
+
 @$core.Deprecated('Use blindOberonTokenResponseDescriptor instead')
-const BlindOberonTokenResponse$json = const {
+const BlindOberonTokenResponse$json = {
   '1': 'BlindOberonTokenResponse',
-  '2': const [
-    const {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
+  '2': [
+    {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
   ],
 };
 
@@ -139,24 +157,27 @@ const BlindOberonTokenResponse$json = const {
 final $typed_data.Uint8List blindOberonTokenResponseDescriptor =
     $convert.base64Decode(
         'ChhCbGluZE9iZXJvblRva2VuUmVzcG9uc2USFAoFdG9rZW4YASABKAxSBXRva2Vu');
+
 @$core.Deprecated('Use unBlindOberonTokenRequestDescriptor instead')
-const UnBlindOberonTokenRequest$json = const {
+const UnBlindOberonTokenRequest$json = {
   '1': 'UnBlindOberonTokenRequest',
-  '2': const [
-    const {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
-    const {'1': 'blinding', '3': 2, '4': 3, '5': 12, '10': 'blinding'},
+  '2': [
+    {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
+    {'1': 'blinding', '3': 2, '4': 3, '5': 12, '10': 'blinding'},
   ],
 };
 
 /// Descriptor for `UnBlindOberonTokenRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List unBlindOberonTokenRequestDescriptor =
     $convert.base64Decode(
-        'ChlVbkJsaW5kT2Jlcm9uVG9rZW5SZXF1ZXN0EhQKBXRva2VuGAEgASgMUgV0b2tlbhIaCghibGluZGluZxgCIAMoDFIIYmxpbmRpbmc=');
+        'ChlVbkJsaW5kT2Jlcm9uVG9rZW5SZXF1ZXN0EhQKBXRva2VuGAEgASgMUgV0b2tlbhIaCghibG'
+        'luZGluZxgCIAMoDFIIYmxpbmRpbmc=');
+
 @$core.Deprecated('Use unBlindOberonTokenResponseDescriptor instead')
-const UnBlindOberonTokenResponse$json = const {
+const UnBlindOberonTokenResponse$json = {
   '1': 'UnBlindOberonTokenResponse',
-  '2': const [
-    const {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
+  '2': [
+    {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
   ],
 };
 
@@ -164,25 +185,28 @@ const UnBlindOberonTokenResponse$json = const {
 final $typed_data.Uint8List unBlindOberonTokenResponseDescriptor =
     $convert.base64Decode(
         'ChpVbkJsaW5kT2Jlcm9uVG9rZW5SZXNwb25zZRIUCgV0b2tlbhgBIAEoDFIFdG9rZW4=');
+
 @$core.Deprecated('Use verifyOberonTokenRequestDescriptor instead')
-const VerifyOberonTokenRequest$json = const {
+const VerifyOberonTokenRequest$json = {
   '1': 'VerifyOberonTokenRequest',
-  '2': const [
-    const {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
-    const {'1': 'pk', '3': 2, '4': 1, '5': 12, '10': 'pk'},
-    const {'1': 'data', '3': 3, '4': 1, '5': 12, '10': 'data'},
+  '2': [
+    {'1': 'token', '3': 1, '4': 1, '5': 12, '10': 'token'},
+    {'1': 'pk', '3': 2, '4': 1, '5': 12, '10': 'pk'},
+    {'1': 'data', '3': 3, '4': 1, '5': 12, '10': 'data'},
   ],
 };
 
 /// Descriptor for `VerifyOberonTokenRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List verifyOberonTokenRequestDescriptor =
     $convert.base64Decode(
-        'ChhWZXJpZnlPYmVyb25Ub2tlblJlcXVlc3QSFAoFdG9rZW4YASABKAxSBXRva2VuEg4KAnBrGAIgASgMUgJwaxISCgRkYXRhGAMgASgMUgRkYXRh');
+        'ChhWZXJpZnlPYmVyb25Ub2tlblJlcXVlc3QSFAoFdG9rZW4YASABKAxSBXRva2VuEg4KAnBrGA'
+        'IgASgMUgJwaxISCgRkYXRhGAMgASgMUgRkYXRh');
+
 @$core.Deprecated('Use verifyOberonTokenResponseDescriptor instead')
-const VerifyOberonTokenResponse$json = const {
+const VerifyOberonTokenResponse$json = {
   '1': 'VerifyOberonTokenResponse',
-  '2': const [
-    const {'1': 'valid', '3': 1, '4': 1, '5': 8, '10': 'valid'},
+  '2': [
+    {'1': 'valid', '3': 1, '4': 1, '5': 8, '10': 'valid'},
   ],
 };
 
diff --git a/dart/lib/proto/okapi/security/v1/security.pbserver.dart b/dart/lib/proto/okapi/security/v1/security.pbserver.dart
index 3536496f..81ff6b5e 100644
--- a/dart/lib/proto/okapi/security/v1/security.pbserver.dart
+++ b/dart/lib/proto/okapi/security/v1/security.pbserver.dart
@@ -1,8 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/security/v1/security.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'security.pb.dart';
diff --git a/dart/lib/proto/okapi/transport/v1/transport.pb.dart b/dart/lib/proto/okapi/transport/v1/transport.pb.dart
index d18b97ae..009e98b3 100644
--- a/dart/lib/proto/okapi/transport/v1/transport.pb.dart
+++ b/dart/lib/proto/okapi/transport/v1/transport.pb.dart
@@ -1,74 +1,62 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/transport/v1/transport.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:core' as $core;
 
 import 'package:fixnum/fixnum.dart' as $fixnum;
 import 'package:protobuf/protobuf.dart' as $pb;
 
-import '../../keys/v1/keys.pb.dart' as $1;
 import '../../../pbmse/v1/pbmse.pb.dart' as $2;
-
 import '../../../pbmse/v1/pbmse.pbenum.dart' as $2;
+import '../../keys/v1/keys.pb.dart' as $1;
 
 class SignRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'SignRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.transport.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'payload',
-        $pb.PbFieldType.OY)
-    ..aOM<$1.JsonWebKey>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'key',
-        subBuilder: $1.JsonWebKey.create)
-    ..aOM<$2.SignedMessage>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'appendTo',
-        subBuilder: $2.SignedMessage.create)
-    ..hasRequiredFields = false;
-
-  SignRequest._() : super();
   factory SignRequest({
     $core.List<$core.int>? payload,
     $1.JsonWebKey? key,
     $2.SignedMessage? appendTo,
   }) {
-    final _result = create();
+    final $result = create();
     if (payload != null) {
-      _result.payload = payload;
+      $result.payload = payload;
     }
     if (key != null) {
-      _result.key = key;
+      $result.key = key;
     }
     if (appendTo != null) {
-      _result.appendTo = appendTo;
+      $result.appendTo = appendTo;
     }
-    return _result;
+    return $result;
   }
+  SignRequest._() : super();
   factory SignRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory SignRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'SignRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.transport.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'payload', $pb.PbFieldType.OY)
+    ..aOM<$1.JsonWebKey>(2, _omitFieldNames ? '' : 'key',
+        subBuilder: $1.JsonWebKey.create)
+    ..aOM<$2.SignedMessage>(3, _omitFieldNames ? '' : 'appendTo',
+        subBuilder: $2.SignedMessage.create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -78,8 +66,10 @@ class SignRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   SignRequest copyWith(void Function(SignRequest) updates) =>
       super.copyWith((message) => updates(message as SignRequest))
-          as SignRequest; // ignore: deprecated_member_use
+          as SignRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static SignRequest create() => SignRequest._();
   SignRequest createEmptyInstance() => create();
@@ -131,39 +121,32 @@ class SignRequest extends $pb.GeneratedMessage {
 }
 
 class SignResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'SignResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.transport.v1'),
-      createEmptyInstance: create)
-    ..aOM<$2.SignedMessage>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'message',
-        subBuilder: $2.SignedMessage.create)
-    ..hasRequiredFields = false;
-
-  SignResponse._() : super();
   factory SignResponse({
     $2.SignedMessage? message,
   }) {
-    final _result = create();
+    final $result = create();
     if (message != null) {
-      _result.message = message;
+      $result.message = message;
     }
-    return _result;
+    return $result;
   }
+  SignResponse._() : super();
   factory SignResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory SignResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'SignResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.transport.v1'),
+      createEmptyInstance: create)
+    ..aOM<$2.SignedMessage>(1, _omitFieldNames ? '' : 'message',
+        subBuilder: $2.SignedMessage.create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -173,8 +156,10 @@ class SignResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   SignResponse copyWith(void Function(SignResponse) updates) =>
       super.copyWith((message) => updates(message as SignResponse))
-          as SignResponse; // ignore: deprecated_member_use
+          as SignResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static SignResponse create() => SignResponse._();
   SignResponse createEmptyInstance() => create();
@@ -201,49 +186,38 @@ class SignResponse extends $pb.GeneratedMessage {
 }
 
 class VerifyRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'VerifyRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.transport.v1'),
-      createEmptyInstance: create)
-    ..aOM<$2.SignedMessage>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'message',
-        subBuilder: $2.SignedMessage.create)
-    ..aOM<$1.JsonWebKey>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'key',
-        subBuilder: $1.JsonWebKey.create)
-    ..hasRequiredFields = false;
-
-  VerifyRequest._() : super();
   factory VerifyRequest({
     $2.SignedMessage? message,
     $1.JsonWebKey? key,
   }) {
-    final _result = create();
+    final $result = create();
     if (message != null) {
-      _result.message = message;
+      $result.message = message;
     }
     if (key != null) {
-      _result.key = key;
+      $result.key = key;
     }
-    return _result;
+    return $result;
   }
+  VerifyRequest._() : super();
   factory VerifyRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory VerifyRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'VerifyRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.transport.v1'),
+      createEmptyInstance: create)
+    ..aOM<$2.SignedMessage>(1, _omitFieldNames ? '' : 'message',
+        subBuilder: $2.SignedMessage.create)
+    ..aOM<$1.JsonWebKey>(2, _omitFieldNames ? '' : 'key',
+        subBuilder: $1.JsonWebKey.create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -253,8 +227,10 @@ class VerifyRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   VerifyRequest copyWith(void Function(VerifyRequest) updates) =>
       super.copyWith((message) => updates(message as VerifyRequest))
-          as VerifyRequest; // ignore: deprecated_member_use
+          as VerifyRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static VerifyRequest create() => VerifyRequest._();
   VerifyRequest createEmptyInstance() => create();
@@ -295,38 +271,31 @@ class VerifyRequest extends $pb.GeneratedMessage {
 }
 
 class VerifyResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'VerifyResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.transport.v1'),
-      createEmptyInstance: create)
-    ..aOB(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'isValid')
-    ..hasRequiredFields = false;
-
-  VerifyResponse._() : super();
   factory VerifyResponse({
     $core.bool? isValid,
   }) {
-    final _result = create();
+    final $result = create();
     if (isValid != null) {
-      _result.isValid = isValid;
+      $result.isValid = isValid;
     }
-    return _result;
+    return $result;
   }
+  VerifyResponse._() : super();
   factory VerifyResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory VerifyResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'VerifyResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.transport.v1'),
+      createEmptyInstance: create)
+    ..aOB(1, _omitFieldNames ? '' : 'isValid')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -336,8 +305,10 @@ class VerifyResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   VerifyResponse copyWith(void Function(VerifyResponse) updates) =>
       super.copyWith((message) => updates(message as VerifyResponse))
-          as VerifyResponse; // ignore: deprecated_member_use
+          as VerifyResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static VerifyResponse create() => VerifyResponse._();
   VerifyResponse createEmptyInstance() => create();
@@ -362,60 +333,6 @@ class VerifyResponse extends $pb.GeneratedMessage {
 }
 
 class PackRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'PackRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.transport.v1'),
-      createEmptyInstance: create)
-    ..aOM<$1.JsonWebKey>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'senderKey',
-        subBuilder: $1.JsonWebKey.create)
-    ..aOM<$1.JsonWebKey>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'receiverKey',
-        subBuilder: $1.JsonWebKey.create)
-    ..a<$core.List<$core.int>>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'associatedData',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'plaintext',
-        $pb.PbFieldType.OY)
-    ..e<$2.EncryptionMode>(
-        5,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'mode',
-        $pb.PbFieldType.OE,
-        defaultOrMaker: $2.EncryptionMode.ENCRYPTION_MODE_UNSPECIFIED,
-        valueOf: $2.EncryptionMode.valueOf,
-        enumValues: $2.EncryptionMode.values)
-    ..e<$2.EncryptionAlgorithm>(
-        6,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'algorithm',
-        $pb.PbFieldType.OE,
-        defaultOrMaker: $2.EncryptionAlgorithm.ENCRYPTION_ALGORITHM_UNSPECIFIED,
-        valueOf: $2.EncryptionAlgorithm.valueOf,
-        enumValues: $2.EncryptionAlgorithm.values)
-    ..hasRequiredFields = false;
-
-  PackRequest._() : super();
   factory PackRequest({
     $1.JsonWebKey? senderKey,
     $1.JsonWebKey? receiverKey,
@@ -424,33 +341,59 @@ class PackRequest extends $pb.GeneratedMessage {
     $2.EncryptionMode? mode,
     $2.EncryptionAlgorithm? algorithm,
   }) {
-    final _result = create();
+    final $result = create();
     if (senderKey != null) {
-      _result.senderKey = senderKey;
+      $result.senderKey = senderKey;
     }
     if (receiverKey != null) {
-      _result.receiverKey = receiverKey;
+      $result.receiverKey = receiverKey;
     }
     if (associatedData != null) {
-      _result.associatedData = associatedData;
+      $result.associatedData = associatedData;
     }
     if (plaintext != null) {
-      _result.plaintext = plaintext;
+      $result.plaintext = plaintext;
     }
     if (mode != null) {
-      _result.mode = mode;
+      $result.mode = mode;
     }
     if (algorithm != null) {
-      _result.algorithm = algorithm;
+      $result.algorithm = algorithm;
     }
-    return _result;
+    return $result;
   }
+  PackRequest._() : super();
   factory PackRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory PackRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PackRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.transport.v1'),
+      createEmptyInstance: create)
+    ..aOM<$1.JsonWebKey>(1, _omitFieldNames ? '' : 'senderKey',
+        subBuilder: $1.JsonWebKey.create)
+    ..aOM<$1.JsonWebKey>(2, _omitFieldNames ? '' : 'receiverKey',
+        subBuilder: $1.JsonWebKey.create)
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'associatedData', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        4, _omitFieldNames ? '' : 'plaintext', $pb.PbFieldType.OY)
+    ..e<$2.EncryptionMode>(5, _omitFieldNames ? '' : 'mode', $pb.PbFieldType.OE,
+        defaultOrMaker: $2.EncryptionMode.ENCRYPTION_MODE_UNSPECIFIED,
+        valueOf: $2.EncryptionMode.valueOf,
+        enumValues: $2.EncryptionMode.values)
+    ..e<$2.EncryptionAlgorithm>(
+        6, _omitFieldNames ? '' : 'algorithm', $pb.PbFieldType.OE,
+        defaultOrMaker: $2.EncryptionAlgorithm.ENCRYPTION_ALGORITHM_UNSPECIFIED,
+        valueOf: $2.EncryptionAlgorithm.valueOf,
+        enumValues: $2.EncryptionAlgorithm.values)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -460,8 +403,10 @@ class PackRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   PackRequest copyWith(void Function(PackRequest) updates) =>
       super.copyWith((message) => updates(message as PackRequest))
-          as PackRequest; // ignore: deprecated_member_use
+          as PackRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static PackRequest create() => PackRequest._();
   PackRequest createEmptyInstance() => create();
@@ -549,39 +494,32 @@ class PackRequest extends $pb.GeneratedMessage {
 }
 
 class PackResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'PackResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.transport.v1'),
-      createEmptyInstance: create)
-    ..aOM<$2.EncryptedMessage>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'message',
-        subBuilder: $2.EncryptedMessage.create)
-    ..hasRequiredFields = false;
-
-  PackResponse._() : super();
   factory PackResponse({
     $2.EncryptedMessage? message,
   }) {
-    final _result = create();
+    final $result = create();
     if (message != null) {
-      _result.message = message;
+      $result.message = message;
     }
-    return _result;
+    return $result;
   }
+  PackResponse._() : super();
   factory PackResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory PackResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'PackResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.transport.v1'),
+      createEmptyInstance: create)
+    ..aOM<$2.EncryptedMessage>(1, _omitFieldNames ? '' : 'message',
+        subBuilder: $2.EncryptedMessage.create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -591,8 +529,10 @@ class PackResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   PackResponse copyWith(void Function(PackResponse) updates) =>
       super.copyWith((message) => updates(message as PackResponse))
-          as PackResponse; // ignore: deprecated_member_use
+          as PackResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static PackResponse create() => PackResponse._();
   PackResponse createEmptyInstance() => create();
@@ -619,59 +559,44 @@ class PackResponse extends $pb.GeneratedMessage {
 }
 
 class UnpackRequest extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'UnpackRequest',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.transport.v1'),
-      createEmptyInstance: create)
-    ..aOM<$1.JsonWebKey>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'senderKey',
-        subBuilder: $1.JsonWebKey.create)
-    ..aOM<$1.JsonWebKey>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'receiverKey',
-        subBuilder: $1.JsonWebKey.create)
-    ..aOM<$2.EncryptedMessage>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'message',
-        subBuilder: $2.EncryptedMessage.create)
-    ..hasRequiredFields = false;
-
-  UnpackRequest._() : super();
   factory UnpackRequest({
     $1.JsonWebKey? senderKey,
     $1.JsonWebKey? receiverKey,
     $2.EncryptedMessage? message,
   }) {
-    final _result = create();
+    final $result = create();
     if (senderKey != null) {
-      _result.senderKey = senderKey;
+      $result.senderKey = senderKey;
     }
     if (receiverKey != null) {
-      _result.receiverKey = receiverKey;
+      $result.receiverKey = receiverKey;
     }
     if (message != null) {
-      _result.message = message;
+      $result.message = message;
     }
-    return _result;
+    return $result;
   }
+  UnpackRequest._() : super();
   factory UnpackRequest.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory UnpackRequest.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'UnpackRequest',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.transport.v1'),
+      createEmptyInstance: create)
+    ..aOM<$1.JsonWebKey>(1, _omitFieldNames ? '' : 'senderKey',
+        subBuilder: $1.JsonWebKey.create)
+    ..aOM<$1.JsonWebKey>(2, _omitFieldNames ? '' : 'receiverKey',
+        subBuilder: $1.JsonWebKey.create)
+    ..aOM<$2.EncryptedMessage>(3, _omitFieldNames ? '' : 'message',
+        subBuilder: $2.EncryptedMessage.create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -681,8 +606,10 @@ class UnpackRequest extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   UnpackRequest copyWith(void Function(UnpackRequest) updates) =>
       super.copyWith((message) => updates(message as UnpackRequest))
-          as UnpackRequest; // ignore: deprecated_member_use
+          as UnpackRequest;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static UnpackRequest create() => UnpackRequest._();
   UnpackRequest createEmptyInstance() => create();
@@ -737,39 +664,32 @@ class UnpackRequest extends $pb.GeneratedMessage {
 }
 
 class UnpackResponse extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'UnpackResponse',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.transport.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'plaintext',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  UnpackResponse._() : super();
   factory UnpackResponse({
     $core.List<$core.int>? plaintext,
   }) {
-    final _result = create();
+    final $result = create();
     if (plaintext != null) {
-      _result.plaintext = plaintext;
+      $result.plaintext = plaintext;
     }
-    return _result;
+    return $result;
   }
+  UnpackResponse._() : super();
   factory UnpackResponse.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory UnpackResponse.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'UnpackResponse',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.transport.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'plaintext', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -779,8 +699,10 @@ class UnpackResponse extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   UnpackResponse copyWith(void Function(UnpackResponse) updates) =>
       super.copyWith((message) => updates(message as UnpackResponse))
-          as UnpackResponse; // ignore: deprecated_member_use
+          as UnpackResponse;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static UnpackResponse create() => UnpackResponse._();
   UnpackResponse createEmptyInstance() => create();
@@ -805,56 +727,6 @@ class UnpackResponse extends $pb.GeneratedMessage {
 }
 
 class CoreMessage extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'CoreMessage',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'okapi.transport.v1'),
-      createEmptyInstance: create)
-    ..aOS(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'id')
-    ..aOS(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'type')
-    ..a<$core.List<$core.int>>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'body',
-        $pb.PbFieldType.OY)
-    ..pPS(
-        4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'to')
-    ..aOS(
-        5,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'from')
-    ..aInt64(
-        6,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'created_time',
-        protoName: 'created')
-    ..aInt64(
-        7,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'expires_time',
-        protoName: 'expires')
-    ..hasRequiredFields = false;
-
-  CoreMessage._() : super();
   factory CoreMessage({
     $core.String? id,
     $core.String? type,
@@ -864,36 +736,53 @@ class CoreMessage extends $pb.GeneratedMessage {
     $fixnum.Int64? created,
     $fixnum.Int64? expires,
   }) {
-    final _result = create();
+    final $result = create();
     if (id != null) {
-      _result.id = id;
+      $result.id = id;
     }
     if (type != null) {
-      _result.type = type;
+      $result.type = type;
     }
     if (body != null) {
-      _result.body = body;
+      $result.body = body;
     }
     if (to != null) {
-      _result.to.addAll(to);
+      $result.to.addAll(to);
     }
     if (from != null) {
-      _result.from = from;
+      $result.from = from;
     }
     if (created != null) {
-      _result.created = created;
+      $result.created = created;
     }
     if (expires != null) {
-      _result.expires = expires;
+      $result.expires = expires;
     }
-    return _result;
+    return $result;
   }
+  CoreMessage._() : super();
   factory CoreMessage.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory CoreMessage.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'CoreMessage',
+      package:
+          const $pb.PackageName(_omitMessageNames ? '' : 'okapi.transport.v1'),
+      createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'id')
+    ..aOS(2, _omitFieldNames ? '' : 'type')
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'body', $pb.PbFieldType.OY)
+    ..pPS(4, _omitFieldNames ? '' : 'to')
+    ..aOS(5, _omitFieldNames ? '' : 'from')
+    ..aInt64(6, _omitFieldNames ? '' : 'created_time', protoName: 'created')
+    ..aInt64(7, _omitFieldNames ? '' : 'expires_time', protoName: 'expires')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -903,8 +792,10 @@ class CoreMessage extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   CoreMessage copyWith(void Function(CoreMessage) updates) =>
       super.copyWith((message) => updates(message as CoreMessage))
-          as CoreMessage; // ignore: deprecated_member_use
+          as CoreMessage;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static CoreMessage create() => CoreMessage._();
   CoreMessage createEmptyInstance() => create();
@@ -989,3 +880,7 @@ class CoreMessage extends $pb.GeneratedMessage {
   @$pb.TagNumber(7)
   void clearExpires() => clearField(7);
 }
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/dart/lib/proto/okapi/transport/v1/transport.pbenum.dart b/dart/lib/proto/okapi/transport/v1/transport.pbenum.dart
index fff1c85c..858248b8 100644
--- a/dart/lib/proto/okapi/transport/v1/transport.pbenum.dart
+++ b/dart/lib/proto/okapi/transport/v1/transport.pbenum.dart
@@ -1,6 +1,10 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/transport/v1/transport.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
diff --git a/dart/lib/proto/okapi/transport/v1/transport.pbjson.dart b/dart/lib/proto/okapi/transport/v1/transport.pbjson.dart
index 5fd2bf81..64124b0d 100644
--- a/dart/lib/proto/okapi/transport/v1/transport.pbjson.dart
+++ b/dart/lib/proto/okapi/transport/v1/transport.pbjson.dart
@@ -1,20 +1,24 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/transport/v1/transport.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
 @$core.Deprecated('Use signRequestDescriptor instead')
-const SignRequest$json = const {
+const SignRequest$json = {
   '1': 'SignRequest',
-  '2': const [
-    const {'1': 'payload', '3': 1, '4': 1, '5': 12, '10': 'payload'},
-    const {
+  '2': [
+    {'1': 'payload', '3': 1, '4': 1, '5': 12, '10': 'payload'},
+    {
       '1': 'key',
       '3': 2,
       '4': 1,
@@ -22,7 +26,7 @@ const SignRequest$json = const {
       '6': '.okapi.keys.v1.JsonWebKey',
       '10': 'key'
     },
-    const {
+    {
       '1': 'append_to',
       '3': 3,
       '4': 1,
@@ -35,12 +39,15 @@ const SignRequest$json = const {
 
 /// Descriptor for `SignRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List signRequestDescriptor = $convert.base64Decode(
-    'CgtTaWduUmVxdWVzdBIYCgdwYXlsb2FkGAEgASgMUgdwYXlsb2FkEisKA2tleRgCIAEoCzIZLm9rYXBpLmtleXMudjEuSnNvbldlYktleVIDa2V5EjQKCWFwcGVuZF90bxgDIAEoCzIXLnBibXNlLnYxLlNpZ25lZE1lc3NhZ2VSCGFwcGVuZFRv');
+    'CgtTaWduUmVxdWVzdBIYCgdwYXlsb2FkGAEgASgMUgdwYXlsb2FkEisKA2tleRgCIAEoCzIZLm'
+    '9rYXBpLmtleXMudjEuSnNvbldlYktleVIDa2V5EjQKCWFwcGVuZF90bxgDIAEoCzIXLnBibXNl'
+    'LnYxLlNpZ25lZE1lc3NhZ2VSCGFwcGVuZFRv');
+
 @$core.Deprecated('Use signResponseDescriptor instead')
-const SignResponse$json = const {
+const SignResponse$json = {
   '1': 'SignResponse',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'message',
       '3': 1,
       '4': 1,
@@ -53,12 +60,14 @@ const SignResponse$json = const {
 
 /// Descriptor for `SignResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List signResponseDescriptor = $convert.base64Decode(
-    'CgxTaWduUmVzcG9uc2USMQoHbWVzc2FnZRgBIAEoCzIXLnBibXNlLnYxLlNpZ25lZE1lc3NhZ2VSB21lc3NhZ2U=');
+    'CgxTaWduUmVzcG9uc2USMQoHbWVzc2FnZRgBIAEoCzIXLnBibXNlLnYxLlNpZ25lZE1lc3NhZ2'
+    'VSB21lc3NhZ2U=');
+
 @$core.Deprecated('Use verifyRequestDescriptor instead')
-const VerifyRequest$json = const {
+const VerifyRequest$json = {
   '1': 'VerifyRequest',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'message',
       '3': 1,
       '4': 1,
@@ -66,7 +75,7 @@ const VerifyRequest$json = const {
       '6': '.pbmse.v1.SignedMessage',
       '10': 'message'
     },
-    const {
+    {
       '1': 'key',
       '3': 2,
       '4': 1,
@@ -79,23 +88,26 @@ const VerifyRequest$json = const {
 
 /// Descriptor for `VerifyRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List verifyRequestDescriptor = $convert.base64Decode(
-    'Cg1WZXJpZnlSZXF1ZXN0EjEKB21lc3NhZ2UYASABKAsyFy5wYm1zZS52MS5TaWduZWRNZXNzYWdlUgdtZXNzYWdlEisKA2tleRgCIAEoCzIZLm9rYXBpLmtleXMudjEuSnNvbldlYktleVIDa2V5');
+    'Cg1WZXJpZnlSZXF1ZXN0EjEKB21lc3NhZ2UYASABKAsyFy5wYm1zZS52MS5TaWduZWRNZXNzYW'
+    'dlUgdtZXNzYWdlEisKA2tleRgCIAEoCzIZLm9rYXBpLmtleXMudjEuSnNvbldlYktleVIDa2V5');
+
 @$core.Deprecated('Use verifyResponseDescriptor instead')
-const VerifyResponse$json = const {
+const VerifyResponse$json = {
   '1': 'VerifyResponse',
-  '2': const [
-    const {'1': 'is_valid', '3': 1, '4': 1, '5': 8, '10': 'isValid'},
+  '2': [
+    {'1': 'is_valid', '3': 1, '4': 1, '5': 8, '10': 'isValid'},
   ],
 };
 
 /// Descriptor for `VerifyResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List verifyResponseDescriptor = $convert.base64Decode(
     'Cg5WZXJpZnlSZXNwb25zZRIZCghpc192YWxpZBgBIAEoCFIHaXNWYWxpZA==');
+
 @$core.Deprecated('Use packRequestDescriptor instead')
-const PackRequest$json = const {
+const PackRequest$json = {
   '1': 'PackRequest',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'sender_key',
       '3': 1,
       '4': 1,
@@ -103,7 +115,7 @@ const PackRequest$json = const {
       '6': '.okapi.keys.v1.JsonWebKey',
       '10': 'senderKey'
     },
-    const {
+    {
       '1': 'receiver_key',
       '3': 2,
       '4': 1,
@@ -111,15 +123,9 @@ const PackRequest$json = const {
       '6': '.okapi.keys.v1.JsonWebKey',
       '10': 'receiverKey'
     },
-    const {
-      '1': 'associated_data',
-      '3': 3,
-      '4': 1,
-      '5': 12,
-      '10': 'associatedData'
-    },
-    const {'1': 'plaintext', '3': 4, '4': 1, '5': 12, '10': 'plaintext'},
-    const {
+    {'1': 'associated_data', '3': 3, '4': 1, '5': 12, '10': 'associatedData'},
+    {'1': 'plaintext', '3': 4, '4': 1, '5': 12, '10': 'plaintext'},
+    {
       '1': 'mode',
       '3': 5,
       '4': 1,
@@ -127,7 +133,7 @@ const PackRequest$json = const {
       '6': '.pbmse.v1.EncryptionMode',
       '10': 'mode'
     },
-    const {
+    {
       '1': 'algorithm',
       '3': 6,
       '4': 1,
@@ -140,12 +146,18 @@ const PackRequest$json = const {
 
 /// Descriptor for `PackRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List packRequestDescriptor = $convert.base64Decode(
-    'CgtQYWNrUmVxdWVzdBI4CgpzZW5kZXJfa2V5GAEgASgLMhkub2thcGkua2V5cy52MS5Kc29uV2ViS2V5UglzZW5kZXJLZXkSPAoMcmVjZWl2ZXJfa2V5GAIgASgLMhkub2thcGkua2V5cy52MS5Kc29uV2ViS2V5UgtyZWNlaXZlcktleRInCg9hc3NvY2lhdGVkX2RhdGEYAyABKAxSDmFzc29jaWF0ZWREYXRhEhwKCXBsYWludGV4dBgEIAEoDFIJcGxhaW50ZXh0EiwKBG1vZGUYBSABKA4yGC5wYm1zZS52MS5FbmNyeXB0aW9uTW9kZVIEbW9kZRI7CglhbGdvcml0aG0YBiABKA4yHS5wYm1zZS52MS5FbmNyeXB0aW9uQWxnb3JpdGhtUglhbGdvcml0aG0=');
+    'CgtQYWNrUmVxdWVzdBI4CgpzZW5kZXJfa2V5GAEgASgLMhkub2thcGkua2V5cy52MS5Kc29uV2'
+    'ViS2V5UglzZW5kZXJLZXkSPAoMcmVjZWl2ZXJfa2V5GAIgASgLMhkub2thcGkua2V5cy52MS5K'
+    'c29uV2ViS2V5UgtyZWNlaXZlcktleRInCg9hc3NvY2lhdGVkX2RhdGEYAyABKAxSDmFzc29jaW'
+    'F0ZWREYXRhEhwKCXBsYWludGV4dBgEIAEoDFIJcGxhaW50ZXh0EiwKBG1vZGUYBSABKA4yGC5w'
+    'Ym1zZS52MS5FbmNyeXB0aW9uTW9kZVIEbW9kZRI7CglhbGdvcml0aG0YBiABKA4yHS5wYm1zZS'
+    '52MS5FbmNyeXB0aW9uQWxnb3JpdGhtUglhbGdvcml0aG0=');
+
 @$core.Deprecated('Use packResponseDescriptor instead')
-const PackResponse$json = const {
+const PackResponse$json = {
   '1': 'PackResponse',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'message',
       '3': 1,
       '4': 1,
@@ -158,12 +170,14 @@ const PackResponse$json = const {
 
 /// Descriptor for `PackResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List packResponseDescriptor = $convert.base64Decode(
-    'CgxQYWNrUmVzcG9uc2USNAoHbWVzc2FnZRgBIAEoCzIaLnBibXNlLnYxLkVuY3J5cHRlZE1lc3NhZ2VSB21lc3NhZ2U=');
+    'CgxQYWNrUmVzcG9uc2USNAoHbWVzc2FnZRgBIAEoCzIaLnBibXNlLnYxLkVuY3J5cHRlZE1lc3'
+    'NhZ2VSB21lc3NhZ2U=');
+
 @$core.Deprecated('Use unpackRequestDescriptor instead')
-const UnpackRequest$json = const {
+const UnpackRequest$json = {
   '1': 'UnpackRequest',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'sender_key',
       '3': 1,
       '4': 1,
@@ -171,7 +185,7 @@ const UnpackRequest$json = const {
       '6': '.okapi.keys.v1.JsonWebKey',
       '10': 'senderKey'
     },
-    const {
+    {
       '1': 'receiver_key',
       '3': 2,
       '4': 1,
@@ -179,7 +193,7 @@ const UnpackRequest$json = const {
       '6': '.okapi.keys.v1.JsonWebKey',
       '10': 'receiverKey'
     },
-    const {
+    {
       '1': 'message',
       '3': 3,
       '4': 1,
@@ -192,32 +206,40 @@ const UnpackRequest$json = const {
 
 /// Descriptor for `UnpackRequest`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List unpackRequestDescriptor = $convert.base64Decode(
-    'Cg1VbnBhY2tSZXF1ZXN0EjgKCnNlbmRlcl9rZXkYASABKAsyGS5va2FwaS5rZXlzLnYxLkpzb25XZWJLZXlSCXNlbmRlcktleRI8CgxyZWNlaXZlcl9rZXkYAiABKAsyGS5va2FwaS5rZXlzLnYxLkpzb25XZWJLZXlSC3JlY2VpdmVyS2V5EjQKB21lc3NhZ2UYAyABKAsyGi5wYm1zZS52MS5FbmNyeXB0ZWRNZXNzYWdlUgdtZXNzYWdl');
+    'Cg1VbnBhY2tSZXF1ZXN0EjgKCnNlbmRlcl9rZXkYASABKAsyGS5va2FwaS5rZXlzLnYxLkpzb2'
+    '5XZWJLZXlSCXNlbmRlcktleRI8CgxyZWNlaXZlcl9rZXkYAiABKAsyGS5va2FwaS5rZXlzLnYx'
+    'Lkpzb25XZWJLZXlSC3JlY2VpdmVyS2V5EjQKB21lc3NhZ2UYAyABKAsyGi5wYm1zZS52MS5Fbm'
+    'NyeXB0ZWRNZXNzYWdlUgdtZXNzYWdl');
+
 @$core.Deprecated('Use unpackResponseDescriptor instead')
-const UnpackResponse$json = const {
+const UnpackResponse$json = {
   '1': 'UnpackResponse',
-  '2': const [
-    const {'1': 'plaintext', '3': 1, '4': 1, '5': 12, '10': 'plaintext'},
+  '2': [
+    {'1': 'plaintext', '3': 1, '4': 1, '5': 12, '10': 'plaintext'},
   ],
 };
 
 /// Descriptor for `UnpackResponse`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List unpackResponseDescriptor = $convert.base64Decode(
     'Cg5VbnBhY2tSZXNwb25zZRIcCglwbGFpbnRleHQYASABKAxSCXBsYWludGV4dA==');
+
 @$core.Deprecated('Use coreMessageDescriptor instead')
-const CoreMessage$json = const {
+const CoreMessage$json = {
   '1': 'CoreMessage',
-  '2': const [
-    const {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
-    const {'1': 'type', '3': 2, '4': 1, '5': 9, '10': 'type'},
-    const {'1': 'body', '3': 3, '4': 1, '5': 12, '10': 'body'},
-    const {'1': 'to', '3': 4, '4': 3, '5': 9, '10': 'to'},
-    const {'1': 'from', '3': 5, '4': 1, '5': 9, '10': 'from'},
-    const {'1': 'created', '3': 6, '4': 1, '5': 3, '10': 'created_time'},
-    const {'1': 'expires', '3': 7, '4': 1, '5': 3, '10': 'expires_time'},
+  '2': [
+    {'1': 'id', '3': 1, '4': 1, '5': 9, '10': 'id'},
+    {'1': 'type', '3': 2, '4': 1, '5': 9, '10': 'type'},
+    {'1': 'body', '3': 3, '4': 1, '5': 12, '10': 'body'},
+    {'1': 'to', '3': 4, '4': 3, '5': 9, '10': 'to'},
+    {'1': 'from', '3': 5, '4': 1, '5': 9, '10': 'from'},
+    {'1': 'created', '3': 6, '4': 1, '5': 3, '10': 'created_time'},
+    {'1': 'expires', '3': 7, '4': 1, '5': 3, '10': 'expires_time'},
   ],
 };
 
 /// Descriptor for `CoreMessage`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List coreMessageDescriptor = $convert.base64Decode(
-    'CgtDb3JlTWVzc2FnZRIOCgJpZBgBIAEoCVICaWQSEgoEdHlwZRgCIAEoCVIEdHlwZRISCgRib2R5GAMgASgMUgRib2R5Eg4KAnRvGAQgAygJUgJ0bxISCgRmcm9tGAUgASgJUgRmcm9tEh0KB2NyZWF0ZWQYBiABKANSDGNyZWF0ZWRfdGltZRIdCgdleHBpcmVzGAcgASgDUgxleHBpcmVzX3RpbWU=');
+    'CgtDb3JlTWVzc2FnZRIOCgJpZBgBIAEoCVICaWQSEgoEdHlwZRgCIAEoCVIEdHlwZRISCgRib2'
+    'R5GAMgASgMUgRib2R5Eg4KAnRvGAQgAygJUgJ0bxISCgRmcm9tGAUgASgJUgRmcm9tEh0KB2Ny'
+    'ZWF0ZWQYBiABKANSDGNyZWF0ZWRfdGltZRIdCgdleHBpcmVzGAcgASgDUgxleHBpcmVzX3RpbW'
+    'U=');
diff --git a/dart/lib/proto/okapi/transport/v1/transport.pbserver.dart b/dart/lib/proto/okapi/transport/v1/transport.pbserver.dart
index 00f89ea9..45145ed0 100644
--- a/dart/lib/proto/okapi/transport/v1/transport.pbserver.dart
+++ b/dart/lib/proto/okapi/transport/v1/transport.pbserver.dart
@@ -1,8 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: okapi/transport/v1/transport.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'transport.pb.dart';
diff --git a/dart/lib/proto/pbmse/v1/pbmse.pb.dart b/dart/lib/proto/pbmse/v1/pbmse.pb.dart
index cdded13f..4712bf81 100644
--- a/dart/lib/proto/pbmse/v1/pbmse.pb.dart
+++ b/dart/lib/proto/pbmse/v1/pbmse.pb.dart
@@ -1,9 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: pbmse/v1/pbmse.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 import 'dart:core' as $core;
 
@@ -13,51 +17,40 @@ import 'pbmse.pbenum.dart';
 
 export 'pbmse.pbenum.dart';
 
+/// JWS
+/// Protocol buffer message signing and encryption
 class SignedMessage extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'SignedMessage',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'pbmse.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'payload',
-        $pb.PbFieldType.OY)
-    ..pc<Signature>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'signatures',
-        $pb.PbFieldType.PM,
-        subBuilder: Signature.create)
-    ..hasRequiredFields = false;
-
-  SignedMessage._() : super();
   factory SignedMessage({
     $core.List<$core.int>? payload,
     $core.Iterable<Signature>? signatures,
   }) {
-    final _result = create();
+    final $result = create();
     if (payload != null) {
-      _result.payload = payload;
+      $result.payload = payload;
     }
     if (signatures != null) {
-      _result.signatures.addAll(signatures);
+      $result.signatures.addAll(signatures);
     }
-    return _result;
+    return $result;
   }
+  SignedMessage._() : super();
   factory SignedMessage.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory SignedMessage.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'SignedMessage',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'pbmse.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'payload', $pb.PbFieldType.OY)
+    ..pc<Signature>(2, _omitFieldNames ? '' : 'signatures', $pb.PbFieldType.PM,
+        subBuilder: Signature.create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -67,8 +60,10 @@ class SignedMessage extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   SignedMessage copyWith(void Function(SignedMessage) updates) =>
       super.copyWith((message) => updates(message as SignedMessage))
-          as SignedMessage; // ignore: deprecated_member_use
+          as SignedMessage;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static SignedMessage create() => SignedMessage._();
   SignedMessage createEmptyInstance() => create();
@@ -96,49 +91,37 @@ class SignedMessage extends $pb.GeneratedMessage {
 }
 
 class Signature extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'Signature',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'pbmse.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'header',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'signature',
-        $pb.PbFieldType.OY)
-    ..hasRequiredFields = false;
-
-  Signature._() : super();
   factory Signature({
     $core.List<$core.int>? header,
     $core.List<$core.int>? signature,
   }) {
-    final _result = create();
+    final $result = create();
     if (header != null) {
-      _result.header = header;
+      $result.header = header;
     }
     if (signature != null) {
-      _result.signature = signature;
+      $result.signature = signature;
     }
-    return _result;
+    return $result;
   }
+  Signature._() : super();
   factory Signature.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory Signature.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'Signature',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'pbmse.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'header', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'signature', $pb.PbFieldType.OY)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -147,9 +130,10 @@ class Signature extends $pb.GeneratedMessage {
       'Use [GeneratedMessageGenericExtensions.rebuild] instead. '
       'Will be removed in next major version')
   Signature copyWith(void Function(Signature) updates) =>
-      super.copyWith((message) => updates(message as Signature))
-          as Signature; // ignore: deprecated_member_use
+      super.copyWith((message) => updates(message as Signature)) as Signature;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static Signature create() => Signature._();
   Signature createEmptyInstance() => create();
@@ -185,47 +169,35 @@ class Signature extends $pb.GeneratedMessage {
 }
 
 class SignatureHeader extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'SignatureHeader',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'pbmse.v1'),
-      createEmptyInstance: create)
-    ..aOS(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'algorithm')
-    ..aOS(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'keyId')
-    ..hasRequiredFields = false;
-
-  SignatureHeader._() : super();
   factory SignatureHeader({
     $core.String? algorithm,
     $core.String? keyId,
   }) {
-    final _result = create();
+    final $result = create();
     if (algorithm != null) {
-      _result.algorithm = algorithm;
+      $result.algorithm = algorithm;
     }
     if (keyId != null) {
-      _result.keyId = keyId;
+      $result.keyId = keyId;
     }
-    return _result;
+    return $result;
   }
+  SignatureHeader._() : super();
   factory SignatureHeader.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory SignatureHeader.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'SignatureHeader',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'pbmse.v1'),
+      createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'algorithm')
+    ..aOS(2, _omitFieldNames ? '' : 'keyId')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -235,8 +207,10 @@ class SignatureHeader extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   SignatureHeader copyWith(void Function(SignatureHeader) updates) =>
       super.copyWith((message) => updates(message as SignatureHeader))
-          as SignatureHeader; // ignore: deprecated_member_use
+          as SignatureHeader;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static SignatureHeader create() => SignatureHeader._();
   SignatureHeader createEmptyInstance() => create();
@@ -273,49 +247,6 @@ class SignatureHeader extends $pb.GeneratedMessage {
 }
 
 class EncryptedMessage extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'EncryptedMessage',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'pbmse.v1'),
-      createEmptyInstance: create)
-    ..a<$core.List<$core.int>>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'iv',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'aad',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'ciphertext',
-        $pb.PbFieldType.OY)
-    ..a<$core.List<$core.int>>(
-        4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'tag',
-        $pb.PbFieldType.OY)
-    ..pc<EncryptionRecipient>(
-        5,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'recipients',
-        $pb.PbFieldType.PM,
-        subBuilder: EncryptionRecipient.create)
-    ..hasRequiredFields = false;
-
-  EncryptedMessage._() : super();
   factory EncryptedMessage({
     $core.List<$core.int>? iv,
     $core.List<$core.int>? aad,
@@ -323,30 +254,49 @@ class EncryptedMessage extends $pb.GeneratedMessage {
     $core.List<$core.int>? tag,
     $core.Iterable<EncryptionRecipient>? recipients,
   }) {
-    final _result = create();
+    final $result = create();
     if (iv != null) {
-      _result.iv = iv;
+      $result.iv = iv;
     }
     if (aad != null) {
-      _result.aad = aad;
+      $result.aad = aad;
     }
     if (ciphertext != null) {
-      _result.ciphertext = ciphertext;
+      $result.ciphertext = ciphertext;
     }
     if (tag != null) {
-      _result.tag = tag;
+      $result.tag = tag;
     }
     if (recipients != null) {
-      _result.recipients.addAll(recipients);
+      $result.recipients.addAll(recipients);
     }
-    return _result;
+    return $result;
   }
+  EncryptedMessage._() : super();
   factory EncryptedMessage.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory EncryptedMessage.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptedMessage',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'pbmse.v1'),
+      createEmptyInstance: create)
+    ..a<$core.List<$core.int>>(
+        1, _omitFieldNames ? '' : 'iv', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'aad', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        3, _omitFieldNames ? '' : 'ciphertext', $pb.PbFieldType.OY)
+    ..a<$core.List<$core.int>>(
+        4, _omitFieldNames ? '' : 'tag', $pb.PbFieldType.OY)
+    ..pc<EncryptionRecipient>(
+        5, _omitFieldNames ? '' : 'recipients', $pb.PbFieldType.PM,
+        subBuilder: EncryptionRecipient.create)
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -356,8 +306,10 @@ class EncryptedMessage extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   EncryptedMessage copyWith(void Function(EncryptedMessage) updates) =>
       super.copyWith((message) => updates(message as EncryptedMessage))
-          as EncryptedMessage; // ignore: deprecated_member_use
+          as EncryptedMessage;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static EncryptedMessage create() => EncryptedMessage._();
   EncryptedMessage createEmptyInstance() => create();
@@ -421,77 +373,54 @@ class EncryptedMessage extends $pb.GeneratedMessage {
 }
 
 class EncryptionHeader extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'EncryptionHeader',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'pbmse.v1'),
-      createEmptyInstance: create)
-    ..e<EncryptionMode>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'enc',
-        $pb.PbFieldType.OE,
-        protoName: 'mode',
-        defaultOrMaker: EncryptionMode.ENCRYPTION_MODE_UNSPECIFIED,
-        valueOf: EncryptionMode.valueOf,
-        enumValues: EncryptionMode.values)
-    ..e<EncryptionAlgorithm>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'alg',
-        $pb.PbFieldType.OE,
-        protoName: 'algorithm',
-        defaultOrMaker: EncryptionAlgorithm.ENCRYPTION_ALGORITHM_UNSPECIFIED,
-        valueOf: EncryptionAlgorithm.valueOf,
-        enumValues: EncryptionAlgorithm.values)
-    ..aOS(
-        3,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'kid',
-        protoName: 'key_id')
-    ..aOS(
-        4,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'skid',
-        protoName: 'sender_key_id')
-    ..hasRequiredFields = false;
-
-  EncryptionHeader._() : super();
   factory EncryptionHeader({
     EncryptionMode? mode,
     EncryptionAlgorithm? algorithm,
     $core.String? keyId,
     $core.String? senderKeyId,
   }) {
-    final _result = create();
+    final $result = create();
     if (mode != null) {
-      _result.mode = mode;
+      $result.mode = mode;
     }
     if (algorithm != null) {
-      _result.algorithm = algorithm;
+      $result.algorithm = algorithm;
     }
     if (keyId != null) {
-      _result.keyId = keyId;
+      $result.keyId = keyId;
     }
     if (senderKeyId != null) {
-      _result.senderKeyId = senderKeyId;
+      $result.senderKeyId = senderKeyId;
     }
-    return _result;
+    return $result;
   }
+  EncryptionHeader._() : super();
   factory EncryptionHeader.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory EncryptionHeader.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptionHeader',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'pbmse.v1'),
+      createEmptyInstance: create)
+    ..e<EncryptionMode>(1, _omitFieldNames ? '' : 'enc', $pb.PbFieldType.OE,
+        protoName: 'mode',
+        defaultOrMaker: EncryptionMode.ENCRYPTION_MODE_UNSPECIFIED,
+        valueOf: EncryptionMode.valueOf,
+        enumValues: EncryptionMode.values)
+    ..e<EncryptionAlgorithm>(
+        2, _omitFieldNames ? '' : 'alg', $pb.PbFieldType.OE,
+        protoName: 'algorithm',
+        defaultOrMaker: EncryptionAlgorithm.ENCRYPTION_ALGORITHM_UNSPECIFIED,
+        valueOf: EncryptionAlgorithm.valueOf,
+        enumValues: EncryptionAlgorithm.values)
+    ..aOS(3, _omitFieldNames ? '' : 'kid', protoName: 'key_id')
+    ..aOS(4, _omitFieldNames ? '' : 'skid', protoName: 'sender_key_id')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -501,8 +430,10 @@ class EncryptionHeader extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   EncryptionHeader copyWith(void Function(EncryptionHeader) updates) =>
       super.copyWith((message) => updates(message as EncryptionHeader))
-          as EncryptionHeader; // ignore: deprecated_member_use
+          as EncryptionHeader;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static EncryptionHeader create() => EncryptionHeader._();
   EncryptionHeader createEmptyInstance() => create();
@@ -563,51 +494,38 @@ class EncryptionHeader extends $pb.GeneratedMessage {
 }
 
 class EncryptionRecipient extends $pb.GeneratedMessage {
-  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
-      const $core.bool.fromEnvironment('protobuf.omit_message_names')
-          ? ''
-          : 'EncryptionRecipient',
-      package: const $pb.PackageName(
-          const $core.bool.fromEnvironment('protobuf.omit_message_names')
-              ? ''
-              : 'pbmse.v1'),
-      createEmptyInstance: create)
-    ..aOM<EncryptionHeader>(
-        1,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'unprotected',
-        protoName: 'header',
-        subBuilder: EncryptionHeader.create)
-    ..a<$core.List<$core.int>>(
-        2,
-        const $core.bool.fromEnvironment('protobuf.omit_field_names')
-            ? ''
-            : 'cek',
-        $pb.PbFieldType.OY,
-        protoName: 'content_encryption_key')
-    ..hasRequiredFields = false;
-
-  EncryptionRecipient._() : super();
   factory EncryptionRecipient({
     EncryptionHeader? header,
     $core.List<$core.int>? contentEncryptionKey,
   }) {
-    final _result = create();
+    final $result = create();
     if (header != null) {
-      _result.header = header;
+      $result.header = header;
     }
     if (contentEncryptionKey != null) {
-      _result.contentEncryptionKey = contentEncryptionKey;
+      $result.contentEncryptionKey = contentEncryptionKey;
     }
-    return _result;
+    return $result;
   }
+  EncryptionRecipient._() : super();
   factory EncryptionRecipient.fromBuffer($core.List<$core.int> i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromBuffer(i, r);
   factory EncryptionRecipient.fromJson($core.String i,
           [$pb.ExtensionRegistry r = $pb.ExtensionRegistry.EMPTY]) =>
       create()..mergeFromJson(i, r);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(
+      _omitMessageNames ? '' : 'EncryptionRecipient',
+      package: const $pb.PackageName(_omitMessageNames ? '' : 'pbmse.v1'),
+      createEmptyInstance: create)
+    ..aOM<EncryptionHeader>(1, _omitFieldNames ? '' : 'unprotected',
+        protoName: 'header', subBuilder: EncryptionHeader.create)
+    ..a<$core.List<$core.int>>(
+        2, _omitFieldNames ? '' : 'cek', $pb.PbFieldType.OY,
+        protoName: 'content_encryption_key')
+    ..hasRequiredFields = false;
+
   @$core.Deprecated('Using this can add significant overhead to your binary. '
       'Use [GeneratedMessageGenericExtensions.deepCopy] instead. '
       'Will be removed in next major version')
@@ -617,8 +535,10 @@ class EncryptionRecipient extends $pb.GeneratedMessage {
       'Will be removed in next major version')
   EncryptionRecipient copyWith(void Function(EncryptionRecipient) updates) =>
       super.copyWith((message) => updates(message as EncryptionRecipient))
-          as EncryptionRecipient; // ignore: deprecated_member_use
+          as EncryptionRecipient;
+
   $pb.BuilderInfo get info_ => _i;
+
   @$core.pragma('dart2js:noInline')
   static EncryptionRecipient create() => EncryptionRecipient._();
   EncryptionRecipient createEmptyInstance() => create();
@@ -655,3 +575,7 @@ class EncryptionRecipient extends $pb.GeneratedMessage {
   @$pb.TagNumber(2)
   void clearContentEncryptionKey() => clearField(2);
 }
+
+const _omitFieldNames = $core.bool.fromEnvironment('protobuf.omit_field_names');
+const _omitMessageNames =
+    $core.bool.fromEnvironment('protobuf.omit_message_names');
diff --git a/dart/lib/proto/pbmse/v1/pbmse.pbenum.dart b/dart/lib/proto/pbmse/v1/pbmse.pbenum.dart
index 48476ee7..cb7d28b8 100644
--- a/dart/lib/proto/pbmse/v1/pbmse.pbenum.dart
+++ b/dart/lib/proto/pbmse/v1/pbmse.pbenum.dart
@@ -1,31 +1,26 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: pbmse/v1/pbmse.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-// ignore_for_file: UNDEFINED_SHOWN_NAME
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:core' as $core;
+
 import 'package:protobuf/protobuf.dart' as $pb;
 
 class EncryptionMode extends $pb.ProtobufEnum {
-  static const EncryptionMode ENCRYPTION_MODE_UNSPECIFIED = EncryptionMode._(
-      0,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'ENCRYPTION_MODE_UNSPECIFIED');
-  static const EncryptionMode ENCRYPTION_MODE_DIRECT = EncryptionMode._(
-      1,
-      const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-          ? ''
-          : 'ENCRYPTION_MODE_DIRECT');
+  static const EncryptionMode ENCRYPTION_MODE_UNSPECIFIED =
+      EncryptionMode._(0, _omitEnumNames ? '' : 'ENCRYPTION_MODE_UNSPECIFIED');
+  static const EncryptionMode ENCRYPTION_MODE_DIRECT =
+      EncryptionMode._(1, _omitEnumNames ? '' : 'ENCRYPTION_MODE_DIRECT');
   static const EncryptionMode ENCRYPTION_MODE_CONTENT_ENCRYPTION_KEY =
       EncryptionMode._(
-          2,
-          const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-              ? ''
-              : 'ENCRYPTION_MODE_CONTENT_ENCRYPTION_KEY');
+          2, _omitEnumNames ? '' : 'ENCRYPTION_MODE_CONTENT_ENCRYPTION_KEY');
 
   static const $core.List<EncryptionMode> values = <EncryptionMode>[
     ENCRYPTION_MODE_UNSPECIFIED,
@@ -43,22 +38,13 @@ class EncryptionMode extends $pb.ProtobufEnum {
 class EncryptionAlgorithm extends $pb.ProtobufEnum {
   static const EncryptionAlgorithm ENCRYPTION_ALGORITHM_UNSPECIFIED =
       EncryptionAlgorithm._(
-          0,
-          const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-              ? ''
-              : 'ENCRYPTION_ALGORITHM_UNSPECIFIED');
+          0, _omitEnumNames ? '' : 'ENCRYPTION_ALGORITHM_UNSPECIFIED');
   static const EncryptionAlgorithm ENCRYPTION_ALGORITHM_XCHACHA20POLY1305 =
       EncryptionAlgorithm._(
-          1,
-          const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-              ? ''
-              : 'ENCRYPTION_ALGORITHM_XCHACHA20POLY1305');
+          1, _omitEnumNames ? '' : 'ENCRYPTION_ALGORITHM_XCHACHA20POLY1305');
   static const EncryptionAlgorithm ENCRYPTION_ALGORITHM_AES_GCM =
       EncryptionAlgorithm._(
-          2,
-          const $core.bool.fromEnvironment('protobuf.omit_enum_names')
-              ? ''
-              : 'ENCRYPTION_ALGORITHM_AES_GCM');
+          2, _omitEnumNames ? '' : 'ENCRYPTION_ALGORITHM_AES_GCM');
 
   static const $core.List<EncryptionAlgorithm> values = <EncryptionAlgorithm>[
     ENCRYPTION_ALGORITHM_UNSPECIFIED,
@@ -72,3 +58,5 @@ class EncryptionAlgorithm extends $pb.ProtobufEnum {
 
   const EncryptionAlgorithm._($core.int v, $core.String n) : super(v, n);
 }
+
+const _omitEnumNames = $core.bool.fromEnvironment('protobuf.omit_enum_names');
diff --git a/dart/lib/proto/pbmse/v1/pbmse.pbjson.dart b/dart/lib/proto/pbmse/v1/pbmse.pbjson.dart
index 9ee78603..8bbe4a59 100644
--- a/dart/lib/proto/pbmse/v1/pbmse.pbjson.dart
+++ b/dart/lib/proto/pbmse/v1/pbmse.pbjson.dart
@@ -1,46 +1,56 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: pbmse/v1/pbmse.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
 
-import 'dart:core' as $core;
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
+
 import 'dart:convert' as $convert;
+import 'dart:core' as $core;
 import 'dart:typed_data' as $typed_data;
 
 @$core.Deprecated('Use encryptionModeDescriptor instead')
-const EncryptionMode$json = const {
+const EncryptionMode$json = {
   '1': 'EncryptionMode',
-  '2': const [
-    const {'1': 'ENCRYPTION_MODE_UNSPECIFIED', '2': 0},
-    const {'1': 'ENCRYPTION_MODE_DIRECT', '2': 1},
-    const {'1': 'ENCRYPTION_MODE_CONTENT_ENCRYPTION_KEY', '2': 2},
+  '2': [
+    {'1': 'ENCRYPTION_MODE_UNSPECIFIED', '2': 0},
+    {'1': 'ENCRYPTION_MODE_DIRECT', '2': 1},
+    {'1': 'ENCRYPTION_MODE_CONTENT_ENCRYPTION_KEY', '2': 2},
   ],
 };
 
 /// Descriptor for `EncryptionMode`. Decode as a `google.protobuf.EnumDescriptorProto`.
 final $typed_data.Uint8List encryptionModeDescriptor = $convert.base64Decode(
-    'Cg5FbmNyeXB0aW9uTW9kZRIfChtFTkNSWVBUSU9OX01PREVfVU5TUEVDSUZJRUQQABIaChZFTkNSWVBUSU9OX01PREVfRElSRUNUEAESKgomRU5DUllQVElPTl9NT0RFX0NPTlRFTlRfRU5DUllQVElPTl9LRVkQAg==');
+    'Cg5FbmNyeXB0aW9uTW9kZRIfChtFTkNSWVBUSU9OX01PREVfVU5TUEVDSUZJRUQQABIaChZFTk'
+    'NSWVBUSU9OX01PREVfRElSRUNUEAESKgomRU5DUllQVElPTl9NT0RFX0NPTlRFTlRfRU5DUllQ'
+    'VElPTl9LRVkQAg==');
+
 @$core.Deprecated('Use encryptionAlgorithmDescriptor instead')
-const EncryptionAlgorithm$json = const {
+const EncryptionAlgorithm$json = {
   '1': 'EncryptionAlgorithm',
-  '2': const [
-    const {'1': 'ENCRYPTION_ALGORITHM_UNSPECIFIED', '2': 0},
-    const {'1': 'ENCRYPTION_ALGORITHM_XCHACHA20POLY1305', '2': 1},
-    const {'1': 'ENCRYPTION_ALGORITHM_AES_GCM', '2': 2},
+  '2': [
+    {'1': 'ENCRYPTION_ALGORITHM_UNSPECIFIED', '2': 0},
+    {'1': 'ENCRYPTION_ALGORITHM_XCHACHA20POLY1305', '2': 1},
+    {'1': 'ENCRYPTION_ALGORITHM_AES_GCM', '2': 2},
   ],
 };
 
 /// Descriptor for `EncryptionAlgorithm`. Decode as a `google.protobuf.EnumDescriptorProto`.
 final $typed_data.Uint8List encryptionAlgorithmDescriptor = $convert.base64Decode(
-    'ChNFbmNyeXB0aW9uQWxnb3JpdGhtEiQKIEVOQ1JZUFRJT05fQUxHT1JJVEhNX1VOU1BFQ0lGSUVEEAASKgomRU5DUllQVElPTl9BTEdPUklUSE1fWENIQUNIQTIwUE9MWTEzMDUQARIgChxFTkNSWVBUSU9OX0FMR09SSVRITV9BRVNfR0NNEAI=');
+    'ChNFbmNyeXB0aW9uQWxnb3JpdGhtEiQKIEVOQ1JZUFRJT05fQUxHT1JJVEhNX1VOU1BFQ0lGSU'
+    'VEEAASKgomRU5DUllQVElPTl9BTEdPUklUSE1fWENIQUNIQTIwUE9MWTEzMDUQARIgChxFTkNS'
+    'WVBUSU9OX0FMR09SSVRITV9BRVNfR0NNEAI=');
+
 @$core.Deprecated('Use signedMessageDescriptor instead')
-const SignedMessage$json = const {
+const SignedMessage$json = {
   '1': 'SignedMessage',
-  '2': const [
-    const {'1': 'payload', '3': 1, '4': 1, '5': 12, '10': 'payload'},
-    const {
+  '2': [
+    {'1': 'payload', '3': 1, '4': 1, '5': 12, '10': 'payload'},
+    {
       '1': 'signatures',
       '3': 2,
       '4': 3,
@@ -53,40 +63,46 @@ const SignedMessage$json = const {
 
 /// Descriptor for `SignedMessage`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List signedMessageDescriptor = $convert.base64Decode(
-    'Cg1TaWduZWRNZXNzYWdlEhgKB3BheWxvYWQYASABKAxSB3BheWxvYWQSMwoKc2lnbmF0dXJlcxgCIAMoCzITLnBibXNlLnYxLlNpZ25hdHVyZVIKc2lnbmF0dXJlcw==');
+    'Cg1TaWduZWRNZXNzYWdlEhgKB3BheWxvYWQYASABKAxSB3BheWxvYWQSMwoKc2lnbmF0dXJlcx'
+    'gCIAMoCzITLnBibXNlLnYxLlNpZ25hdHVyZVIKc2lnbmF0dXJlcw==');
+
 @$core.Deprecated('Use signatureDescriptor instead')
-const Signature$json = const {
+const Signature$json = {
   '1': 'Signature',
-  '2': const [
-    const {'1': 'header', '3': 1, '4': 1, '5': 12, '10': 'header'},
-    const {'1': 'signature', '3': 3, '4': 1, '5': 12, '10': 'signature'},
+  '2': [
+    {'1': 'header', '3': 1, '4': 1, '5': 12, '10': 'header'},
+    {'1': 'signature', '3': 3, '4': 1, '5': 12, '10': 'signature'},
   ],
 };
 
 /// Descriptor for `Signature`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List signatureDescriptor = $convert.base64Decode(
-    'CglTaWduYXR1cmUSFgoGaGVhZGVyGAEgASgMUgZoZWFkZXISHAoJc2lnbmF0dXJlGAMgASgMUglzaWduYXR1cmU=');
+    'CglTaWduYXR1cmUSFgoGaGVhZGVyGAEgASgMUgZoZWFkZXISHAoJc2lnbmF0dXJlGAMgASgMUg'
+    'lzaWduYXR1cmU=');
+
 @$core.Deprecated('Use signatureHeaderDescriptor instead')
-const SignatureHeader$json = const {
+const SignatureHeader$json = {
   '1': 'SignatureHeader',
-  '2': const [
-    const {'1': 'algorithm', '3': 1, '4': 1, '5': 9, '10': 'algorithm'},
-    const {'1': 'key_id', '3': 2, '4': 1, '5': 9, '10': 'keyId'},
+  '2': [
+    {'1': 'algorithm', '3': 1, '4': 1, '5': 9, '10': 'algorithm'},
+    {'1': 'key_id', '3': 2, '4': 1, '5': 9, '10': 'keyId'},
   ],
 };
 
 /// Descriptor for `SignatureHeader`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List signatureHeaderDescriptor = $convert.base64Decode(
-    'Cg9TaWduYXR1cmVIZWFkZXISHAoJYWxnb3JpdGhtGAEgASgJUglhbGdvcml0aG0SFQoGa2V5X2lkGAIgASgJUgVrZXlJZA==');
+    'Cg9TaWduYXR1cmVIZWFkZXISHAoJYWxnb3JpdGhtGAEgASgJUglhbGdvcml0aG0SFQoGa2V5X2'
+    'lkGAIgASgJUgVrZXlJZA==');
+
 @$core.Deprecated('Use encryptedMessageDescriptor instead')
-const EncryptedMessage$json = const {
+const EncryptedMessage$json = {
   '1': 'EncryptedMessage',
-  '2': const [
-    const {'1': 'iv', '3': 1, '4': 1, '5': 12, '10': 'iv'},
-    const {'1': 'aad', '3': 2, '4': 1, '5': 12, '10': 'aad'},
-    const {'1': 'ciphertext', '3': 3, '4': 1, '5': 12, '10': 'ciphertext'},
-    const {'1': 'tag', '3': 4, '4': 1, '5': 12, '10': 'tag'},
-    const {
+  '2': [
+    {'1': 'iv', '3': 1, '4': 1, '5': 12, '10': 'iv'},
+    {'1': 'aad', '3': 2, '4': 1, '5': 12, '10': 'aad'},
+    {'1': 'ciphertext', '3': 3, '4': 1, '5': 12, '10': 'ciphertext'},
+    {'1': 'tag', '3': 4, '4': 1, '5': 12, '10': 'tag'},
+    {
       '1': 'recipients',
       '3': 5,
       '4': 3,
@@ -99,12 +115,15 @@ const EncryptedMessage$json = const {
 
 /// Descriptor for `EncryptedMessage`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptedMessageDescriptor = $convert.base64Decode(
-    'ChBFbmNyeXB0ZWRNZXNzYWdlEg4KAml2GAEgASgMUgJpdhIQCgNhYWQYAiABKAxSA2FhZBIeCgpjaXBoZXJ0ZXh0GAMgASgMUgpjaXBoZXJ0ZXh0EhAKA3RhZxgEIAEoDFIDdGFnEj0KCnJlY2lwaWVudHMYBSADKAsyHS5wYm1zZS52MS5FbmNyeXB0aW9uUmVjaXBpZW50UgpyZWNpcGllbnRz');
+    'ChBFbmNyeXB0ZWRNZXNzYWdlEg4KAml2GAEgASgMUgJpdhIQCgNhYWQYAiABKAxSA2FhZBIeCg'
+    'pjaXBoZXJ0ZXh0GAMgASgMUgpjaXBoZXJ0ZXh0EhAKA3RhZxgEIAEoDFIDdGFnEj0KCnJlY2lw'
+    'aWVudHMYBSADKAsyHS5wYm1zZS52MS5FbmNyeXB0aW9uUmVjaXBpZW50UgpyZWNpcGllbnRz');
+
 @$core.Deprecated('Use encryptionHeaderDescriptor instead')
-const EncryptionHeader$json = const {
+const EncryptionHeader$json = {
   '1': 'EncryptionHeader',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'mode',
       '3': 1,
       '4': 1,
@@ -112,7 +131,7 @@ const EncryptionHeader$json = const {
       '6': '.pbmse.v1.EncryptionMode',
       '10': 'enc'
     },
-    const {
+    {
       '1': 'algorithm',
       '3': 2,
       '4': 1,
@@ -120,19 +139,23 @@ const EncryptionHeader$json = const {
       '6': '.pbmse.v1.EncryptionAlgorithm',
       '10': 'alg'
     },
-    const {'1': 'key_id', '3': 3, '4': 1, '5': 9, '10': 'kid'},
-    const {'1': 'sender_key_id', '3': 4, '4': 1, '5': 9, '10': 'skid'},
+    {'1': 'key_id', '3': 3, '4': 1, '5': 9, '10': 'kid'},
+    {'1': 'sender_key_id', '3': 4, '4': 1, '5': 9, '10': 'skid'},
   ],
 };
 
 /// Descriptor for `EncryptionHeader`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptionHeaderDescriptor = $convert.base64Decode(
-    'ChBFbmNyeXB0aW9uSGVhZGVyEisKBG1vZGUYASABKA4yGC5wYm1zZS52MS5FbmNyeXB0aW9uTW9kZVIDZW5jEjUKCWFsZ29yaXRobRgCIAEoDjIdLnBibXNlLnYxLkVuY3J5cHRpb25BbGdvcml0aG1SA2FsZxITCgZrZXlfaWQYAyABKAlSA2tpZBIbCg1zZW5kZXJfa2V5X2lkGAQgASgJUgRza2lk');
+    'ChBFbmNyeXB0aW9uSGVhZGVyEisKBG1vZGUYASABKA4yGC5wYm1zZS52MS5FbmNyeXB0aW9uTW'
+    '9kZVIDZW5jEjUKCWFsZ29yaXRobRgCIAEoDjIdLnBibXNlLnYxLkVuY3J5cHRpb25BbGdvcml0'
+    'aG1SA2FsZxITCgZrZXlfaWQYAyABKAlSA2tpZBIbCg1zZW5kZXJfa2V5X2lkGAQgASgJUgRza2'
+    'lk');
+
 @$core.Deprecated('Use encryptionRecipientDescriptor instead')
-const EncryptionRecipient$json = const {
+const EncryptionRecipient$json = {
   '1': 'EncryptionRecipient',
-  '2': const [
-    const {
+  '2': [
+    {
       '1': 'header',
       '3': 1,
       '4': 1,
@@ -140,10 +163,12 @@ const EncryptionRecipient$json = const {
       '6': '.pbmse.v1.EncryptionHeader',
       '10': 'unprotected'
     },
-    const {'1': 'content_encryption_key', '3': 2, '4': 1, '5': 12, '10': 'cek'},
+    {'1': 'content_encryption_key', '3': 2, '4': 1, '5': 12, '10': 'cek'},
   ],
 };
 
 /// Descriptor for `EncryptionRecipient`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List encryptionRecipientDescriptor = $convert.base64Decode(
-    'ChNFbmNyeXB0aW9uUmVjaXBpZW50EjcKBmhlYWRlchgBIAEoCzIaLnBibXNlLnYxLkVuY3J5cHRpb25IZWFkZXJSC3VucHJvdGVjdGVkEiMKFmNvbnRlbnRfZW5jcnlwdGlvbl9rZXkYAiABKAxSA2Nlaw==');
+    'ChNFbmNyeXB0aW9uUmVjaXBpZW50EjcKBmhlYWRlchgBIAEoCzIaLnBibXNlLnYxLkVuY3J5cH'
+    'Rpb25IZWFkZXJSC3VucHJvdGVjdGVkEiMKFmNvbnRlbnRfZW5jcnlwdGlvbl9rZXkYAiABKAxS'
+    'A2Nlaw==');
diff --git a/dart/lib/proto/pbmse/v1/pbmse.pbserver.dart b/dart/lib/proto/pbmse/v1/pbmse.pbserver.dart
index 83191a85..cd9f1615 100644
--- a/dart/lib/proto/pbmse/v1/pbmse.pbserver.dart
+++ b/dart/lib/proto/pbmse/v1/pbmse.pbserver.dart
@@ -1,8 +1,13 @@
-///
+//
 //  Generated code. Do not modify.
 //  source: pbmse/v1/pbmse.proto
 //
 // @dart = 2.12
-// ignore_for_file: annotate_overrides,camel_case_types,constant_identifier_names,deprecated_member_use_from_same_package,directives_ordering,library_prefixes,non_constant_identifier_names,prefer_final_fields,return_of_invalid_type,unnecessary_const,unnecessary_import,unnecessary_this,unused_import,unused_shown_name
+
+// ignore_for_file: annotate_overrides, camel_case_types, comment_references
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: deprecated_member_use_from_same_package, library_prefixes
+// ignore_for_file: non_constant_identifier_names, prefer_final_fields
+// ignore_for_file: unnecessary_import, unnecessary_this, unused_import
 
 export 'pbmse.pb.dart';
diff --git a/devops/requirements.txt b/devops/requirements.txt
index 71a70384..e71137c3 100644
--- a/devops/requirements.txt
+++ b/devops/requirements.txt
@@ -1,6 +1,6 @@
 git+https://github.com/danielgtaylor/python-betterproto.git@master#egg=betterproto[compiler]
 grpcio-tools
 requests==2.31.0
-PyYAML==6.0
-gql[all]==3.4.0
+PyYAML==6.0.1
+gql[all]==3.4.1
 python-dateutil==2.8.2
diff --git a/docs/reference/proto/index.md b/docs/reference/proto/index.md
index c42c3d95..1c798e53 100644
--- a/docs/reference/proto/index.md
+++ b/docs/reference/proto/index.md
@@ -8,150 +8,6 @@ This page documents the Protobuf Services and Messages which compose the Trinsic
 
 
 
-<a name="pbmse_v1_pbmse-proto"></a>
-<p align="right"><a href="#top">Top</a></p>
-
-## pbmse/v1/pbmse.proto
-
-
- <!-- end services -->
-
-
-<a name="pbmse-v1-EncryptedMessage"></a>
-
-### EncryptedMessage
-
-
-
-| Field | Type | Description |
-| ----- | ---- | ----------- |
-| iv | [bytes](/reference/proto#bytes) |  |
-| aad | [bytes](/reference/proto#bytes) |  |
-| ciphertext | [bytes](/reference/proto#bytes) |  |
-| tag | [bytes](/reference/proto#bytes) |  |
-| recipients | [EncryptionRecipient](/reference/proto#pbmse-v1-EncryptionRecipient)[] |  |
-
-
-
-
-
-
-<a name="pbmse-v1-EncryptionHeader"></a>
-
-### EncryptionHeader
-
-
-
-| Field | Type | Description |
-| ----- | ---- | ----------- |
-| mode | [EncryptionMode](/reference/proto#pbmse-v1-EncryptionMode) |  |
-| algorithm | [EncryptionAlgorithm](/reference/proto#pbmse-v1-EncryptionAlgorithm) |  |
-| key_id | [string](/reference/proto#string) |  |
-| sender_key_id | [string](/reference/proto#string) |  |
-
-
-
-
-
-
-<a name="pbmse-v1-EncryptionRecipient"></a>
-
-### EncryptionRecipient
-
-
-
-| Field | Type | Description |
-| ----- | ---- | ----------- |
-| header | [EncryptionHeader](/reference/proto#pbmse-v1-EncryptionHeader) |  |
-| content_encryption_key | [bytes](/reference/proto#bytes) |  |
-
-
-
-
-
-
-<a name="pbmse-v1-Signature"></a>
-
-### Signature
-
-
-
-| Field | Type | Description |
-| ----- | ---- | ----------- |
-| header | [bytes](/reference/proto#bytes) |  |
-| signature | [bytes](/reference/proto#bytes) |  |
-
-
-
-
-
-
-<a name="pbmse-v1-SignatureHeader"></a>
-
-### SignatureHeader
-
-
-
-| Field | Type | Description |
-| ----- | ---- | ----------- |
-| algorithm | [string](/reference/proto#string) |  |
-| key_id | [string](/reference/proto#string) |  |
-
-
-
-
-
-
-<a name="pbmse-v1-SignedMessage"></a>
-
-### SignedMessage
-JWS
-Protocol buffer message signing and encryption
-
-
-| Field | Type | Description |
-| ----- | ---- | ----------- |
-| payload | [bytes](/reference/proto#bytes) |  |
-| signatures | [Signature](/reference/proto#pbmse-v1-Signature)[] |  |
-
-
-
-
-
- <!-- end messages -->
-
-
-<a name="pbmse-v1-EncryptionAlgorithm"></a>
-
-### EncryptionAlgorithm
-
-
-| Name | Number | Description |
-| ---- | ------ | ----------- |
-| ENCRYPTION_ALGORITHM_UNSPECIFIED | 0 |  |
-| ENCRYPTION_ALGORITHM_XCHACHA20POLY1305 | 1 |  |
-| ENCRYPTION_ALGORITHM_AES_GCM | 2 |  |
-
-
-
-<a name="pbmse-v1-EncryptionMode"></a>
-
-### EncryptionMode
-
-
-| Name | Number | Description |
-| ---- | ------ | ----------- |
-| ENCRYPTION_MODE_UNSPECIFIED | 0 |  |
-| ENCRYPTION_MODE_DIRECT | 1 |  |
-| ENCRYPTION_MODE_CONTENT_ENCRYPTION_KEY | 2 |  |
-
-
- <!-- end enums -->
-
- <!-- end HasExtensions -->
-
-
-
 <a name="okapi_transport_v1_transport-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
@@ -319,233 +175,273 @@ Protocol buffer message signing and encryption
 
 
 
-<a name="okapi_security_v1_security-proto"></a>
+<a name="okapi_hashing_v1_hashing-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## okapi/security/v1/security.proto
-messages related to the oberon protocol
-See: https://github.com/mikelodder7/oberon
+## okapi/hashing/v1/hashing.proto
+
 
  <!-- end services -->
 
 
-<a name="okapi-security-v1-BlindOberonTokenRequest"></a>
+<a name="okapi-hashing-v1-Blake3DeriveKeyRequest"></a>
+
+### Blake3DeriveKeyRequest
 
-### BlindOberonTokenRequest
-Blind an oberon token
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| token | [bytes](/reference/proto#bytes) | raw token bytes |
-| blinding | [bytes](/reference/proto#bytes)[] | blinding to apply to the token |
+| context | [bytes](/reference/proto#bytes) |  |
+| key_material | [bytes](/reference/proto#bytes) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-BlindOberonTokenResponse"></a>
+<a name="okapi-hashing-v1-Blake3DeriveKeyResponse"></a>
+
+### Blake3DeriveKeyResponse
 
-### BlindOberonTokenResponse
-Contains the blinded token reply
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| token | [bytes](/reference/proto#bytes) | raw blinded token bytes |
+| digest | [bytes](/reference/proto#bytes) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-CreateOberonKeyRequest"></a>
+<a name="okapi-hashing-v1-Blake3HashRequest"></a>
+
+### Blake3HashRequest
 
-### CreateOberonKeyRequest
-Create an Oberon Compatible Secret Key
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| seed | [bytes](/reference/proto#bytes) | optional seed to generate deterministic keys |
+| data | [bytes](/reference/proto#bytes) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-CreateOberonKeyResponse"></a>
+<a name="okapi-hashing-v1-Blake3HashResponse"></a>
+
+### Blake3HashResponse
 
-### CreateOberonKeyResponse
-Contains the oberon secret key bytes
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| sk | [bytes](/reference/proto#bytes) | raw secret key bytes |
-| pk | [bytes](/reference/proto#bytes) | raw public key bytes |
+| digest | [bytes](/reference/proto#bytes) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-CreateOberonProofRequest"></a>
+<a name="okapi-hashing-v1-Blake3KeyedHashRequest"></a>
+
+### Blake3KeyedHashRequest
 
-### CreateOberonProofRequest
-Create a proof that holder knows the token
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| data | [bytes](/reference/proto#bytes) | data used to create the token |
-| token | [bytes](/reference/proto#bytes) | token data |
-| blinding | [bytes](/reference/proto#bytes)[] | any blindings used to create the token |
-| nonce | [bytes](/reference/proto#bytes) | nonce for generating the proof |
+| data | [bytes](/reference/proto#bytes) |  |
+| key | [bytes](/reference/proto#bytes) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-CreateOberonProofResponse"></a>
+<a name="okapi-hashing-v1-Blake3KeyedHashResponse"></a>
+
+### Blake3KeyedHashResponse
 
-### CreateOberonProofResponse
-Contains the token proof
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| proof | [bytes](/reference/proto#bytes) | raw proof bytes |
+| digest | [bytes](/reference/proto#bytes) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-CreateOberonTokenRequest"></a>
+<a name="okapi-hashing-v1-SHA256HashRequest"></a>
+
+### SHA256HashRequest
 
-### CreateOberonTokenRequest
-Create a new oberon token
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| sk | [bytes](/reference/proto#bytes) | raw BLS key bytes |
-| data | [bytes](/reference/proto#bytes) | data is the public part of the oberon protocol and can be any data |
-| blinding | [bytes](/reference/proto#bytes)[] | optional blinding for the token |
+| data | [bytes](/reference/proto#bytes) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-CreateOberonTokenResponse"></a>
+<a name="okapi-hashing-v1-SHA256HashResponse"></a>
+
+### SHA256HashResponse
 
-### CreateOberonTokenResponse
-Contains the token with optional blinding
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| token | [bytes](/reference/proto#bytes) | raw token bytes |
+| digest | [bytes](/reference/proto#bytes) |  |
 
 
 
 
 
+ <!-- end messages -->
 
-<a name="okapi-security-v1-UnBlindOberonTokenRequest"></a>
+ <!-- end enums -->
+
+ <!-- end HasExtensions -->
+
+
+
+<a name="okapi_examples_v1_examples-proto"></a>
+<p align="right"><a href="#top">Top</a></p>
+
+## okapi/examples/v1/examples.proto
+
+
+
+<a name="okapi-examples-v1-SecureExampleService"></a>
+
+### Service - SecureExampleService
+
+
+| Method Name | Request Type | Response Type | Description |
+| ----------- | ------------ | ------------- | ------------|
+| Unary | [.pbmse.v1.EncryptedMessage](/reference/proto#pbmse-v1-EncryptedMessage) | [.pbmse.v1.EncryptedMessage](/reference/proto#pbmse-v1-EncryptedMessage) |  |
+| ServerStreaming | [.pbmse.v1.EncryptedMessage](/reference/proto#pbmse-v1-EncryptedMessage) | [.pbmse.v1.EncryptedMessage](/reference/proto#pbmse-v1-EncryptedMessage) stream |  |
+
+ <!-- end services -->
+
+
+<a name="okapi-examples-v1-BasicMessage"></a>
+
+### BasicMessage
 
-### UnBlindOberonTokenRequest
-UnBlind an oberon token
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| token | [bytes](/reference/proto#bytes) | raw token bytes |
-| blinding | [bytes](/reference/proto#bytes)[] | blinding to remove from the token |
+| text | [string](/reference/proto#string) |  |
 
 
 
 
 
+ <!-- end messages -->
 
-<a name="okapi-security-v1-UnBlindOberonTokenResponse"></a>
+ <!-- end enums -->
+
+ <!-- end HasExtensions -->
+
+
+
+<a name="okapi_keys_v1_keys-proto"></a>
+<p align="right"><a href="#top">Top</a></p>
+
+## okapi/keys/v1/keys.proto
+
+
+ <!-- end services -->
+
+
+<a name="okapi-keys-v1-GenerateKeyRequest"></a>
+
+### GenerateKeyRequest
 
-### UnBlindOberonTokenResponse
-Contains the unblinded token reply
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| token | [bytes](/reference/proto#bytes) | raw unblinded token bytes |
+| seed | [bytes](/reference/proto#bytes) |  |
+| key_type | [KeyType](/reference/proto#okapi-keys-v1-KeyType) |  |
+| key_format | [DocumentKeyFormat](/reference/proto#okapi-keys-v1-DocumentKeyFormat) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-VerifyOberonProofRequest"></a>
+<a name="okapi-keys-v1-GenerateKeyResponse"></a>
+
+### GenerateKeyResponse
 
-### VerifyOberonProofRequest
-Verify the presented proof is valid
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| proof | [bytes](/reference/proto#bytes) | raw proof bytes returned from CreateProof |
-| data | [bytes](/reference/proto#bytes) | data used to create the token |
-| nonce | [bytes](/reference/proto#bytes) | nonce used to generate the proof |
-| pk | [bytes](/reference/proto#bytes) | public key that was used to generate the token |
+| key | [JsonWebKey](/reference/proto#okapi-keys-v1-JsonWebKey)[] |  |
+| did_document | [google.protobuf.Struct](/reference/proto#google-protobuf-Struct) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-VerifyOberonProofResponse"></a>
+<a name="okapi-keys-v1-JsonWebKey"></a>
+
+### JsonWebKey
 
-### VerifyOberonProofResponse
-Contains the status of the proof validation
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| valid | [bool](/reference/proto#bool) | whether the given proof was valid |
+| kid | [string](/reference/proto#string) |  |
+| x | [string](/reference/proto#string) | public_key |
+| y | [string](/reference/proto#string) | public_key |
+| d | [string](/reference/proto#string) | secret_key |
+| crv | [string](/reference/proto#string) |  |
+| kty | [string](/reference/proto#string) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-VerifyOberonTokenRequest"></a>
+<a name="okapi-keys-v1-ResolveRequest"></a>
+
+### ResolveRequest
 
-### VerifyOberonTokenRequest
-Verify that an oberon token comes from the desired issuer
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| token | [bytes](/reference/proto#bytes) | raw token bytes |
-| pk | [bytes](/reference/proto#bytes) | token is valid to this public key? |
-| data | [bytes](/reference/proto#bytes) | public part of oberon protocol - can be any data |
+| did | [string](/reference/proto#string) |  |
 
 
 
 
 
 
-<a name="okapi-security-v1-VerifyOberonTokenResponse"></a>
+<a name="okapi-keys-v1-ResolveResponse"></a>
+
+### ResolveResponse
 
-### VerifyOberonTokenResponse
-Contains the verification result for the oberon token
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| valid | [bool](/reference/proto#bool) | token is valid to the public key |
+| did_document | [google.protobuf.Struct](/reference/proto#google-protobuf-Struct) |  |
+| keys | [JsonWebKey](/reference/proto#okapi-keys-v1-JsonWebKey)[] |  |
 
 
 
@@ -553,230 +449,268 @@ Contains the verification result for the oberon token
 
  <!-- end messages -->
 
+
+<a name="okapi-keys-v1-DocumentKeyFormat"></a>
+
+### DocumentKeyFormat
+
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| DOCUMENT_KEY_FORMAT_UNSPECIFIED | 0 |  |
+| DOCUMENT_KEY_FORMAT_LD | 1 |  |
+| DOCUMENT_KEY_FORMAT_JOSE | 2 |  |
+
+
+
+<a name="okapi-keys-v1-KeyType"></a>
+
+### KeyType
+
+
+| Name | Number | Description |
+| ---- | ------ | ----------- |
+| KEY_TYPE_UNSPECIFIED | 0 |  |
+| KEY_TYPE_ED25519 | 1 |  |
+| KEY_TYPE_X25519 | 2 |  |
+| KEY_TYPE_P256 | 3 |  |
+| KEY_TYPE_BLS12381G1G2 | 4 |  |
+| KEY_TYPE_SECP256K1 | 5 |  |
+
+
  <!-- end enums -->
 
  <!-- end HasExtensions -->
 
 
 
-<a name="okapi_examples_v1_examples-proto"></a>
+<a name="okapi_security_v1_security-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## okapi/examples/v1/examples.proto
+## okapi/security/v1/security.proto
+messages related to the oberon protocol
+See: https://github.com/mikelodder7/oberon
 
+ <!-- end services -->
 
 
-<a name="okapi-examples-v1-SecureExampleService"></a>
+<a name="okapi-security-v1-BlindOberonTokenRequest"></a>
 
-### Service - SecureExampleService
+### BlindOberonTokenRequest
+Blind an oberon token
 
 
-| Method Name | Request Type | Response Type | Description |
-| ----------- | ------------ | ------------- | ------------|
-| Unary | [.pbmse.v1.EncryptedMessage](/reference/proto#pbmse-v1-EncryptedMessage) | [.pbmse.v1.EncryptedMessage](/reference/proto#pbmse-v1-EncryptedMessage) |  |
-| ServerStreaming | [.pbmse.v1.EncryptedMessage](/reference/proto#pbmse-v1-EncryptedMessage) | [.pbmse.v1.EncryptedMessage](/reference/proto#pbmse-v1-EncryptedMessage) stream |  |
+| Field | Type | Description |
+| ----- | ---- | ----------- |
+| token | [bytes](/reference/proto#bytes) | raw token bytes |
+| blinding | [bytes](/reference/proto#bytes)[] | blinding to apply to the token |
 
- <!-- end services -->
 
 
-<a name="okapi-examples-v1-BasicMessage"></a>
 
-### BasicMessage
 
 
+<a name="okapi-security-v1-BlindOberonTokenResponse"></a>
+
+### BlindOberonTokenResponse
+Contains the blinded token reply
+
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| text | [string](/reference/proto#string) |  |
+| token | [bytes](/reference/proto#bytes) | raw blinded token bytes |
 
 
 
 
 
- <!-- end messages -->
 
- <!-- end enums -->
+<a name="okapi-security-v1-CreateOberonKeyRequest"></a>
 
- <!-- end HasExtensions -->
+### CreateOberonKeyRequest
+Create an Oberon Compatible Secret Key
 
 
+| Field | Type | Description |
+| ----- | ---- | ----------- |
+| seed | [bytes](/reference/proto#bytes) | optional seed to generate deterministic keys |
 
-<a name="okapi_metadata_metadata-proto"></a>
-<p align="right"><a href="#top">Top</a></p>
 
-## okapi/metadata/metadata.proto
 
 
- <!-- end services -->
 
 
-<a name="okapi-metadata-MetadataRequest"></a>
+<a name="okapi-security-v1-CreateOberonKeyResponse"></a>
 
-### MetadataRequest
-Request custom metadata about the native okapi binaries - cannot get cargo env vars at runtime
+### CreateOberonKeyResponse
+Contains the oberon secret key bytes
 
-repeated string variables = 1; // optional field, can contain any of the cargo env vars
 
+| Field | Type | Description |
+| ----- | ---- | ----------- |
+| sk | [bytes](/reference/proto#bytes) | raw secret key bytes |
+| pk | [bytes](/reference/proto#bytes) | raw public key bytes |
 
 
 
 
 
-<a name="okapi-metadata-MetadataResponse"></a>
 
-### MetadataResponse
-Metadata information about the native okapi binaries. Always returns the version information
+<a name="okapi-security-v1-CreateOberonProofRequest"></a>
+
+### CreateOberonProofRequest
+Create a proof that holder knows the token
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| version | [string](/reference/proto#string) | The full version string from okapi |
-| version_major | [int32](/reference/proto#int32) | Major version |
-| version_minor | [int32](/reference/proto#int32) | Minor version |
-| version_patch | [int32](/reference/proto#int32) | Patch release version |
-| target_family | [string](/reference/proto#string) | https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-crates |
-| target_os | [string](/reference/proto#string) |  |
-| target_arch | [string](/reference/proto#string) |  |
-| target_vendor | [string](/reference/proto#string) |  |
-| target_env | [string](/reference/proto#string) |  |
-
+| data | [bytes](/reference/proto#bytes) | data used to create the token |
+| token | [bytes](/reference/proto#bytes) | token data |
+| blinding | [bytes](/reference/proto#bytes)[] | any blindings used to create the token |
+| nonce | [bytes](/reference/proto#bytes) | nonce for generating the proof |
 
 
 
 
- <!-- end messages -->
 
- <!-- end enums -->
 
- <!-- end HasExtensions -->
+<a name="okapi-security-v1-CreateOberonProofResponse"></a>
 
+### CreateOberonProofResponse
+Contains the token proof
 
 
-<a name="okapi_hashing_v1_hashing-proto"></a>
-<p align="right"><a href="#top">Top</a></p>
+| Field | Type | Description |
+| ----- | ---- | ----------- |
+| proof | [bytes](/reference/proto#bytes) | raw proof bytes |
 
-## okapi/hashing/v1/hashing.proto
 
 
- <!-- end services -->
 
 
-<a name="okapi-hashing-v1-Blake3DeriveKeyRequest"></a>
 
-### Blake3DeriveKeyRequest
+<a name="okapi-security-v1-CreateOberonTokenRequest"></a>
 
+### CreateOberonTokenRequest
+Create a new oberon token
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| context | [bytes](/reference/proto#bytes) |  |
-| key_material | [bytes](/reference/proto#bytes) |  |
-
+| sk | [bytes](/reference/proto#bytes) | raw BLS key bytes |
+| data | [bytes](/reference/proto#bytes) | data is the public part of the oberon protocol and can be any data |
+| blinding | [bytes](/reference/proto#bytes)[] | optional blinding for the token |
 
 
 
 
 
-<a name="okapi-hashing-v1-Blake3DeriveKeyResponse"></a>
 
-### Blake3DeriveKeyResponse
+<a name="okapi-security-v1-CreateOberonTokenResponse"></a>
 
+### CreateOberonTokenResponse
+Contains the token with optional blinding
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| digest | [bytes](/reference/proto#bytes) |  |
-
+| token | [bytes](/reference/proto#bytes) | raw token bytes |
 
 
 
 
 
-<a name="okapi-hashing-v1-Blake3HashRequest"></a>
 
-### Blake3HashRequest
+<a name="okapi-security-v1-UnBlindOberonTokenRequest"></a>
 
+### UnBlindOberonTokenRequest
+UnBlind an oberon token
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| data | [bytes](/reference/proto#bytes) |  |
-
+| token | [bytes](/reference/proto#bytes) | raw token bytes |
+| blinding | [bytes](/reference/proto#bytes)[] | blinding to remove from the token |
 
 
 
 
 
-<a name="okapi-hashing-v1-Blake3HashResponse"></a>
 
-### Blake3HashResponse
+<a name="okapi-security-v1-UnBlindOberonTokenResponse"></a>
 
+### UnBlindOberonTokenResponse
+Contains the unblinded token reply
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| digest | [bytes](/reference/proto#bytes) |  |
-
+| token | [bytes](/reference/proto#bytes) | raw unblinded token bytes |
 
 
 
 
 
-<a name="okapi-hashing-v1-Blake3KeyedHashRequest"></a>
 
-### Blake3KeyedHashRequest
+<a name="okapi-security-v1-VerifyOberonProofRequest"></a>
 
+### VerifyOberonProofRequest
+Verify the presented proof is valid
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| data | [bytes](/reference/proto#bytes) |  |
-| key | [bytes](/reference/proto#bytes) |  |
-
+| proof | [bytes](/reference/proto#bytes) | raw proof bytes returned from CreateProof |
+| data | [bytes](/reference/proto#bytes) | data used to create the token |
+| nonce | [bytes](/reference/proto#bytes) | nonce used to generate the proof |
+| pk | [bytes](/reference/proto#bytes) | public key that was used to generate the token |
 
 
 
 
 
-<a name="okapi-hashing-v1-Blake3KeyedHashResponse"></a>
 
-### Blake3KeyedHashResponse
+<a name="okapi-security-v1-VerifyOberonProofResponse"></a>
 
+### VerifyOberonProofResponse
+Contains the status of the proof validation
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| digest | [bytes](/reference/proto#bytes) |  |
-
+| valid | [bool](/reference/proto#bool) | whether the given proof was valid |
 
 
 
 
 
-<a name="okapi-hashing-v1-SHA256HashRequest"></a>
 
-### SHA256HashRequest
+<a name="okapi-security-v1-VerifyOberonTokenRequest"></a>
 
+### VerifyOberonTokenRequest
+Verify that an oberon token comes from the desired issuer
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| data | [bytes](/reference/proto#bytes) |  |
-
+| token | [bytes](/reference/proto#bytes) | raw token bytes |
+| pk | [bytes](/reference/proto#bytes) | token is valid to this public key? |
+| data | [bytes](/reference/proto#bytes) | public part of oberon protocol - can be any data |
 
 
 
 
 
-<a name="okapi-hashing-v1-SHA256HashResponse"></a>
 
-### SHA256HashResponse
+<a name="okapi-security-v1-VerifyOberonTokenResponse"></a>
 
+### VerifyOberonTokenResponse
+Contains the verification result for the oberon token
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| digest | [bytes](/reference/proto#bytes) |  |
+| valid | [bool](/reference/proto#bool) | token is valid to the public key |
 
 
 
@@ -870,93 +804,162 @@ Metadata information about the native okapi binaries. Always returns the version
 
 
 
-<a name="okapi_keys_v1_keys-proto"></a>
+<a name="okapi_metadata_metadata-proto"></a>
 <p align="right"><a href="#top">Top</a></p>
 
-## okapi/keys/v1/keys.proto
+## okapi/metadata/metadata.proto
 
 
  <!-- end services -->
 
 
-<a name="okapi-keys-v1-GenerateKeyRequest"></a>
+<a name="okapi-metadata-MetadataRequest"></a>
+
+### MetadataRequest
+Request custom metadata about the native okapi binaries - cannot get cargo env vars at runtime
+
+repeated string variables = 1; // optional field, can contain any of the cargo env vars
+
+
+
+
 
-### GenerateKeyRequest
 
+<a name="okapi-metadata-MetadataResponse"></a>
+
+### MetadataResponse
+Metadata information about the native okapi binaries. Always returns the version information
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| seed | [bytes](/reference/proto#bytes) |  |
-| key_type | [KeyType](/reference/proto#okapi-keys-v1-KeyType) |  |
-| key_format | [DocumentKeyFormat](/reference/proto#okapi-keys-v1-DocumentKeyFormat) |  |
+| version | [string](/reference/proto#string) | The full version string from okapi |
+| version_major | [int32](/reference/proto#int32) | Major version |
+| version_minor | [int32](/reference/proto#int32) | Minor version |
+| version_patch | [int32](/reference/proto#int32) | Patch release version |
+| target_family | [string](/reference/proto#string) | https://doc.rust-lang.org/cargo/reference/environment-variables.html#environment-variables-cargo-sets-for-crates |
+| target_os | [string](/reference/proto#string) |  |
+| target_arch | [string](/reference/proto#string) |  |
+| target_vendor | [string](/reference/proto#string) |  |
+| target_env | [string](/reference/proto#string) |  |
 
 
 
 
 
+ <!-- end messages -->
 
-<a name="okapi-keys-v1-GenerateKeyResponse"></a>
+ <!-- end enums -->
+
+ <!-- end HasExtensions -->
+
+
+
+<a name="pbmse_v1_pbmse-proto"></a>
+<p align="right"><a href="#top">Top</a></p>
+
+## pbmse/v1/pbmse.proto
+
+
+ <!-- end services -->
 
-### GenerateKeyResponse
+
+<a name="pbmse-v1-EncryptedMessage"></a>
+
+### EncryptedMessage
 
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| key | [JsonWebKey](/reference/proto#okapi-keys-v1-JsonWebKey)[] |  |
-| did_document | [google.protobuf.Struct](/reference/proto#google-protobuf-Struct) |  |
+| iv | [bytes](/reference/proto#bytes) |  |
+| aad | [bytes](/reference/proto#bytes) |  |
+| ciphertext | [bytes](/reference/proto#bytes) |  |
+| tag | [bytes](/reference/proto#bytes) |  |
+| recipients | [EncryptionRecipient](/reference/proto#pbmse-v1-EncryptionRecipient)[] |  |
 
 
 
 
 
 
-<a name="okapi-keys-v1-JsonWebKey"></a>
+<a name="pbmse-v1-EncryptionHeader"></a>
 
-### JsonWebKey
+### EncryptionHeader
 
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| kid | [string](/reference/proto#string) |  |
-| x | [string](/reference/proto#string) | public_key |
-| y | [string](/reference/proto#string) | public_key |
-| d | [string](/reference/proto#string) | secret_key |
-| crv | [string](/reference/proto#string) |  |
-| kty | [string](/reference/proto#string) |  |
+| mode | [EncryptionMode](/reference/proto#pbmse-v1-EncryptionMode) |  |
+| algorithm | [EncryptionAlgorithm](/reference/proto#pbmse-v1-EncryptionAlgorithm) |  |
+| key_id | [string](/reference/proto#string) |  |
+| sender_key_id | [string](/reference/proto#string) |  |
 
 
 
 
 
 
-<a name="okapi-keys-v1-ResolveRequest"></a>
+<a name="pbmse-v1-EncryptionRecipient"></a>
 
-### ResolveRequest
+### EncryptionRecipient
 
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| did | [string](/reference/proto#string) |  |
+| header | [EncryptionHeader](/reference/proto#pbmse-v1-EncryptionHeader) |  |
+| content_encryption_key | [bytes](/reference/proto#bytes) |  |
 
 
 
 
 
 
-<a name="okapi-keys-v1-ResolveResponse"></a>
+<a name="pbmse-v1-Signature"></a>
 
-### ResolveResponse
+### Signature
 
 
 
 | Field | Type | Description |
 | ----- | ---- | ----------- |
-| did_document | [google.protobuf.Struct](/reference/proto#google-protobuf-Struct) |  |
-| keys | [JsonWebKey](/reference/proto#okapi-keys-v1-JsonWebKey)[] |  |
+| header | [bytes](/reference/proto#bytes) |  |
+| signature | [bytes](/reference/proto#bytes) |  |
+
+
+
+
+
+
+<a name="pbmse-v1-SignatureHeader"></a>
+
+### SignatureHeader
+
+
+
+| Field | Type | Description |
+| ----- | ---- | ----------- |
+| algorithm | [string](/reference/proto#string) |  |
+| key_id | [string](/reference/proto#string) |  |
+
+
+
+
+
+
+<a name="pbmse-v1-SignedMessage"></a>
+
+### SignedMessage
+JWS
+Protocol buffer message signing and encryption
+
+
+| Field | Type | Description |
+| ----- | ---- | ----------- |
+| payload | [bytes](/reference/proto#bytes) |  |
+| signatures | [Signature](/reference/proto#pbmse-v1-Signature)[] |  |
 
 
 
@@ -965,32 +968,29 @@ Metadata information about the native okapi binaries. Always returns the version
  <!-- end messages -->
 
 
-<a name="okapi-keys-v1-DocumentKeyFormat"></a>
+<a name="pbmse-v1-EncryptionAlgorithm"></a>
 
-### DocumentKeyFormat
+### EncryptionAlgorithm
 
 
 | Name | Number | Description |
 | ---- | ------ | ----------- |
-| DOCUMENT_KEY_FORMAT_UNSPECIFIED | 0 |  |
-| DOCUMENT_KEY_FORMAT_LD | 1 |  |
-| DOCUMENT_KEY_FORMAT_JOSE | 2 |  |
+| ENCRYPTION_ALGORITHM_UNSPECIFIED | 0 |  |
+| ENCRYPTION_ALGORITHM_XCHACHA20POLY1305 | 1 |  |
+| ENCRYPTION_ALGORITHM_AES_GCM | 2 |  |
 
 
 
-<a name="okapi-keys-v1-KeyType"></a>
+<a name="pbmse-v1-EncryptionMode"></a>
 
-### KeyType
+### EncryptionMode
 
 
 | Name | Number | Description |
 | ---- | ------ | ----------- |
-| KEY_TYPE_UNSPECIFIED | 0 |  |
-| KEY_TYPE_ED25519 | 1 |  |
-| KEY_TYPE_X25519 | 2 |  |
-| KEY_TYPE_P256 | 3 |  |
-| KEY_TYPE_BLS12381G1G2 | 4 |  |
-| KEY_TYPE_SECP256K1 | 5 |  |
+| ENCRYPTION_MODE_UNSPECIFIED | 0 |  |
+| ENCRYPTION_MODE_DIRECT | 1 |  |
+| ENCRYPTION_MODE_CONTENT_ENCRYPTION_KEY | 2 |  |
 
 
  <!-- end enums -->
diff --git a/go/okapi/examples/v1/examples/examples.pb.go b/go/okapi/examples/v1/examples/examples.pb.go
index f8859c90..f8dfce9b 100644
--- a/go/okapi/examples/v1/examples/examples.pb.go
+++ b/go/okapi/examples/v1/examples/examples.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.31.0
 // 	protoc        v3.20.3
 // source: okapi/examples/v1/examples.proto
 
diff --git a/go/okapi/hashing/v1/hashing/hashing.pb.go b/go/okapi/hashing/v1/hashing/hashing.pb.go
index 4a2541fe..3a68c35e 100644
--- a/go/okapi/hashing/v1/hashing/hashing.pb.go
+++ b/go/okapi/hashing/v1/hashing/hashing.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.31.0
 // 	protoc        v3.20.3
 // source: okapi/hashing/v1/hashing.proto
 
diff --git a/go/okapi/keys/v1/keys/keys.pb.go b/go/okapi/keys/v1/keys/keys.pb.go
index 460bf624..6f947766 100644
--- a/go/okapi/keys/v1/keys/keys.pb.go
+++ b/go/okapi/keys/v1/keys/keys.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.31.0
 // 	protoc        v3.20.3
 // source: okapi/keys/v1/keys.proto
 
diff --git a/go/okapi/metadata/metadata.pb.go b/go/okapi/metadata/metadata.pb.go
index a7fb3384..5ee24d00 100644
--- a/go/okapi/metadata/metadata.pb.go
+++ b/go/okapi/metadata/metadata.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.31.0
 // 	protoc        v3.20.3
 // source: okapi/metadata/metadata.proto
 
diff --git a/go/okapi/proofs/v1/proofs/proofs.pb.go b/go/okapi/proofs/v1/proofs/proofs.pb.go
index a6f1ed8f..0371a92a 100644
--- a/go/okapi/proofs/v1/proofs/proofs.pb.go
+++ b/go/okapi/proofs/v1/proofs/proofs.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.31.0
 // 	protoc        v3.20.3
 // source: okapi/proofs/v1/proofs.proto
 
diff --git a/go/okapi/security/v1/security/security.pb.go b/go/okapi/security/v1/security/security.pb.go
index b570beda..f7e656d7 100644
--- a/go/okapi/security/v1/security/security.pb.go
+++ b/go/okapi/security/v1/security/security.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.31.0
 // 	protoc        v3.20.3
 // source: okapi/security/v1/security.proto
 
diff --git a/go/okapi/transport/v1/transport/transport.pb.go b/go/okapi/transport/v1/transport/transport.pb.go
index a7979f60..47cdc6d5 100644
--- a/go/okapi/transport/v1/transport/transport.pb.go
+++ b/go/okapi/transport/v1/transport/transport.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.31.0
 // 	protoc        v3.20.3
 // source: okapi/transport/v1/transport.proto
 
diff --git a/go/pbmse/v1/pbmse/pbmse.pb.go b/go/pbmse/v1/pbmse/pbmse.pb.go
index 6b9790ca..f50d1e44 100644
--- a/go/pbmse/v1/pbmse/pbmse.pb.go
+++ b/go/pbmse/v1/pbmse/pbmse.pb.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.1
+// 	protoc-gen-go v1.31.0
 // 	protoc        v3.20.3
 // source: pbmse/v1/pbmse.proto