Update libsignal-service

[signal-cli] / lib / src / main / java / org / asamk / signal / manager / util / PaymentUtils.java

diff --git a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
index ca55008c93ee575583284c6ceff6802736a26375..fd8e46efa53192795446727d0edd9e6875f18c2c 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
+++ b/lib/src/main/java/org/asamk/signal/manager/util/PaymentUtils.java
@@ -12,7 +12,7 @@ import okio.ByteString;
 
 public class PaymentUtils {
 
-    private final static Logger logger = LoggerFactory.getLogger(PaymentUtils.class);
+    private static final Logger logger = LoggerFactory.getLogger(PaymentUtils.class);
 
     private PaymentUtils() {
     }
@@ -20,13 +20,11 @@ public class PaymentUtils {
     /**
      * Signs the supplied address bytes with the {@link IdentityKeyPair}'s private key and returns a proto that includes it, and it's signature.
      */
-    public static PaymentAddress signPaymentsAddress(
-            byte[] publicAddressBytes, ECPrivateKey privateKey
-    ) {
+    public static PaymentAddress signPaymentsAddress(byte[] publicAddressBytes, ECPrivateKey privateKey) {
         byte[] signature = privateKey.calculateSignature(publicAddressBytes);
 
-        return new PaymentAddress.Builder().mobileCoinAddress(new PaymentAddress.MobileCoinAddress.Builder().address(
-                ByteString.of(publicAddressBytes)).signature(ByteString.of(signature)).build()).build();
+        return new PaymentAddress.Builder().mobileCoin(new PaymentAddress.MobileCoin.Builder().publicAddress(ByteString.of(
+                publicAddressBytes)).signature(ByteString.of(signature)).build()).build();
     }
 
     /**
@@ -34,16 +32,16 @@ public class PaymentUtils {
      * <p>
      * Returns the validated bytes if so, otherwise returns null.
      */
-    public static byte[] verifyPaymentsAddress(
-            PaymentAddress paymentAddress, ECPublicKey publicKey
-    ) {
-        final var mobileCoinAddress = paymentAddress.mobileCoinAddress;
-        if (mobileCoinAddress == null || mobileCoinAddress.address == null || mobileCoinAddress.signature == null) {
+    public static byte[] verifyPaymentsAddress(PaymentAddress paymentAddress, ECPublicKey publicKey) {
+        final var mobileCoinAddress = paymentAddress.mobileCoin;
+        if (mobileCoinAddress == null
+                || mobileCoinAddress.publicAddress == null
+                || mobileCoinAddress.signature == null) {
             logger.debug("Got payment address without mobile coin address, ignoring.");
             return null;
         }
 
-        byte[] bytes = mobileCoinAddress.address.toByteArray();
+        byte[] bytes = mobileCoinAddress.publicAddress.toByteArray();
         byte[] signature = mobileCoinAddress.signature.toByteArray();
 
         if (signature.length != 64 || !publicKey.verifySignature(bytes, signature)) {