blake3 implementation compatible with Android (#232)

fundthmcalculus · web-flow · commit e7a412c36dbe · 2021-11-24T13:31:10.000-05:00
diff --git a/java/build.gradle b/java/build.gradle
@@ -61,11 +61,11 @@ dependencies {
     implementation 'com.google.protobuf:protobuf-java-util:3.19.1'
     implementation group: 'net.java.dev.jna', name: 'jna', version: '5.8.0'
 
-    implementation 'io.grpc:protoc-gen-grpc-java:1.42.1'
     implementation 'io.grpc:grpc-netty-shaded:1.42.1'
     implementation 'io.grpc:grpc-protobuf:1.42.1'
-    implementation 'io.grpc:grpc-stub:1.42.1'
-    implementation 'ky.korins:blake3_3:2.9.0'
+    implementation 'io.grpc:grpc-stub:1.42.1' // This has to match the version of protoc-gen-grpc-java used in `sdk/devops/generate_proto_files.py`
+    // https://mvnrepository.com/artifact/io.github.rctcwyvrn/blake3
+    implementation 'io.github.rctcwyvrn:blake3:1.3'
     implementation 'io.leonard:base58:0.0.2'
     compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
 
diff --git a/java/src/main/java/trinsic/security/OberonSecurityProvider.java b/java/src/main/java/trinsic/security/OberonSecurityProvider.java
@@ -3,7 +3,7 @@
 import com.google.protobuf.ByteString;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
-import ky.korins.blake3.Blake3;
+import io.github.rctcwyvrn.blake3.Blake3;
 import trinsic.okapi.DidException;
 import trinsic.okapi.Oberon;
 import trinsic.okapi.security.v1.Security;
@@ -21,7 +21,9 @@ public String GetAuthHeader(Account.AccountProfile accountProfile, Message messa
 
         // compute the hash of the request and return the result
         var bytes = message.toByteArray();
-        var messageHash = Blake3.newHasher().update(bytes).done(64);
+        var hasher = Blake3.newInstance();
+        hasher.update(bytes);
+        var messageHash = hasher.digest(64);
 
         var nonce = CommonOuterClass.Nonce.newBuilder()
                 .setTimestamp(Instant.now().toEpochMilli())
diff --git a/java/src/main/java/trinsic/services/ServiceBase.java b/java/src/main/java/trinsic/services/ServiceBase.java
@@ -2,6 +2,7 @@
 
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
+import io.grpc.Channel;
 import io.grpc.ManagedChannel;
 import io.grpc.Metadata;
 import trinsic.TrinsicUtilities;
@@ -15,7 +16,7 @@ public abstract class ServiceBase {
     private Account.AccountProfile profile = null;
     private CommonOuterClass.ServerConfig configuration = null;
     private ManagedChannel channel = null;
-    private ISecurityProvider securityProvider = new OberonSecurityProvider();
+    private final ISecurityProvider securityProvider = new OberonSecurityProvider();
 
     protected ServiceBase(Account.AccountProfile accountProfile, CommonOuterClass.ServerConfig serverConfig) {
         this.profile = accountProfile;
@@ -50,7 +51,7 @@ public CommonOuterClass.ServerConfig getConfiguration() {
         return this.configuration;
     }
 
-    public ManagedChannel getChannel() {
+    public Channel getChannel() {
         return this.channel;
     }
 
diff --git a/java/src/main/java/trinsic/services/account/v1/AccountServiceGrpc.java b/java/src/main/java/trinsic/services/account/v1/AccountServiceGrpc.java
@@ -5,14 +5,14 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.41.0)",
+    value = "by gRPC proto compiler (version 1.42.1)",
     comments = "Source: services/account/v1/account.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class AccountServiceGrpc {
 
   private AccountServiceGrpc() {}
 
-  public static final String SERVICE_NAME = "services.account.v1.trinsic.services.AccountService";
+  public static final String SERVICE_NAME = "services.account.v1.AccountService";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<trinsic.services.account.v1.Account.SignInRequest,
@@ -499,7 +499,7 @@ public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
-      return getFileDescriptor().findServiceByName("trinsic.services.AccountService");
+      return getFileDescriptor().findServiceByName("AccountService");
     }
   }
 
diff --git a/java/src/main/java/trinsic/services/common/v1/CommonGrpc.java b/java/src/main/java/trinsic/services/common/v1/CommonGrpc.java
@@ -5,7 +5,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.41.0)",
+    value = "by gRPC proto compiler (version 1.42.1)",
     comments = "Source: services/common/v1/common.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class CommonGrpc {
diff --git a/java/src/main/java/trinsic/services/common/v1/ProviderGrpc.java b/java/src/main/java/trinsic/services/common/v1/ProviderGrpc.java
@@ -5,7 +5,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.41.0)",
+    value = "by gRPC proto compiler (version 1.42.1)",
     comments = "Source: services/provider/v1/provider.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class ProviderGrpc {
diff --git a/java/src/main/java/trinsic/services/trustregistry/v1/TrustRegistryGrpc.java b/java/src/main/java/trinsic/services/trustregistry/v1/TrustRegistryGrpc.java
@@ -5,7 +5,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.41.0)",
+    value = "by gRPC proto compiler (version 1.42.1)",
     comments = "Source: services/trust-registry/v1/trust-registry.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class TrustRegistryGrpc {
diff --git a/java/src/main/java/trinsic/services/universalwallet/v1/UniversalWallet.java b/java/src/main/java/trinsic/services/universalwallet/v1/UniversalWallet.java
diff --git a/java/src/main/java/trinsic/services/universalwallet/v1/WalletServiceGrpc.java b/java/src/main/java/trinsic/services/universalwallet/v1/WalletServiceGrpc.java
@@ -5,14 +5,14 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.41.0)",
+    value = "by gRPC proto compiler (version 1.42.1)",
     comments = "Source: services/universal-wallet/v1/universal-wallet.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class WalletServiceGrpc {
 
   private WalletServiceGrpc() {}
 
-  public static final String SERVICE_NAME = "services.universalwallet.v1.trinsic.services.WalletService";
+  public static final String SERVICE_NAME = "services.universalwallet.v1.WalletService";
 
   // Static method descriptors that strictly reflect the proto.
   private static volatile io.grpc.MethodDescriptor<trinsic.services.universalwallet.v1.UniversalWallet.SearchRequest,
@@ -414,7 +414,7 @@ public com.google.protobuf.Descriptors.FileDescriptor getFileDescriptor() {
 
     @java.lang.Override
     public com.google.protobuf.Descriptors.ServiceDescriptor getServiceDescriptor() {
-      return getFileDescriptor().findServiceByName("trinsic.services.WalletService");
+      return getFileDescriptor().findServiceByName("WalletService");
     }
   }
 
diff --git a/java/src/main/java/trinsic/services/verifiablecredentials/templates/v1/CredentialTemplatesGrpc.java b/java/src/main/java/trinsic/services/verifiablecredentials/templates/v1/CredentialTemplatesGrpc.java
@@ -5,7 +5,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.41.0)",
+    value = "by gRPC proto compiler (version 1.42.1)",
     comments = "Source: services/verifiable-credentials/templates/v1/templates.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class CredentialTemplatesGrpc {
diff --git a/java/src/main/java/trinsic/services/verifiablecredentials/v1/CredentialGrpc.java b/java/src/main/java/trinsic/services/verifiablecredentials/v1/CredentialGrpc.java
@@ -5,7 +5,7 @@
 /**
  */
 @javax.annotation.Generated(
-    value = "by gRPC proto compiler (version 1.41.0)",
+    value = "by gRPC proto compiler (version 1.42.1)",
     comments = "Source: services/verifiable-credentials/v1/verifiable-credentials.proto")
 @io.grpc.stub.annotations.GrpcGenerated
 public final class CredentialGrpc {
diff --git a/java/src/test/java/TrinsicServicesTest.java b/java/src/test/java/TrinsicServicesTest.java
@@ -16,7 +16,7 @@
 class TrinsicServicesTest {
 
     @Test
-    public void testServiceBaseSetProfile() throws InterruptedException {
+    public void testServiceBaseSetProfile() {
         var accountService = new AccountService(null, TrinsicUtilities.getTestServerConfig());
 
         Assertions.assertThrows(IllegalArgumentException.class, () -> accountService.buildMetadata(null));
@@ -59,6 +59,6 @@ private void createAndShutdownChannel(String myAddress) throws MalformedURLExcep
 
     @Test
     public void testTrinsicServiceDemo() throws IOException, DidException {
-        new VaccineDemo().run();
+        VaccineDemo.run();
     }
 }
diff --git a/java/src/test/java/VaccineDemo.java b/java/src/test/java/VaccineDemo.java
@@ -25,6 +25,7 @@ public static void main(String[] args) throws IOException, DidException {
     public static void run() throws IOException, DidException {
         // createService() {
         var serverConfig = TrinsicUtilities.getTestServerConfig();
+        System.out.println("Connecting to:\n" + serverConfig);
         var accountService = new AccountService(null, serverConfig);
         // }
 
@@ -82,6 +83,10 @@ public static void run() throws IOException, DidException {
         System.out.println("Verification result: " + isValid);
         Assertions.assertTrue(isValid);
         // }
+
+        accountService.shutdown();
+        credentialsService.shutdown();
+        walletService.shutdown();
     }
 
     // pathData() {
diff --git a/python/trinsic/proto/services/account/v1/__init__.py b/python/trinsic/proto/services/account/v1/__init__.py
