@signalapp/libsignal-client 0.29.0 → 0.30.0

package/Native.d.ts

@@ -76,13 +76,13 @@ export function CallLinkAuthCredentialPresentation_CheckValidContents(presentati
 export function CallLinkAuthCredentialPresentation_GetUserId(presentationBytes: Buffer): Serialized<UuidCiphertext>;
 export function CallLinkAuthCredentialPresentation_Verify(presentationBytes: Buffer, now: Timestamp, serverParamsBytes: Buffer, callLinkParamsBytes: Buffer): void;
 export function CallLinkAuthCredentialResponse_CheckValidContents(responseBytes: Buffer): void;
-export function CallLinkAuthCredentialResponse_IssueDeterministic(userId: Uuid, redemptionTime: Timestamp, paramsBytes: Buffer, randomness: Buffer): Buffer;
-export function CallLinkAuthCredentialResponse_Receive(responseBytes: Buffer, userId: Uuid, redemptionTime: Timestamp, paramsBytes: Buffer): Buffer;
+export function CallLinkAuthCredentialResponse_IssueDeterministic(userId: Buffer, redemptionTime: Timestamp, paramsBytes: Buffer, randomness: Buffer): Buffer;
+export function CallLinkAuthCredentialResponse_Receive(responseBytes: Buffer, userId: Buffer, redemptionTime: Timestamp, paramsBytes: Buffer): Buffer;
 export function CallLinkAuthCredential_CheckValidContents(credentialBytes: Buffer): void;
-export function CallLinkAuthCredential_PresentDeterministic(credentialBytes: Buffer, userId: Uuid, redemptionTime: Timestamp, serverParamsBytes: Buffer, callLinkParamsBytes: Buffer, randomness: Buffer): Buffer;
+export function CallLinkAuthCredential_PresentDeterministic(credentialBytes: Buffer, userId: Buffer, redemptionTime: Timestamp, serverParamsBytes: Buffer, callLinkParamsBytes: Buffer, randomness: Buffer): Buffer;
 export function CallLinkPublicParams_CheckValidContents(paramsBytes: Buffer): void;
 export function CallLinkSecretParams_CheckValidContents(paramsBytes: Buffer): void;
-export function CallLinkSecretParams_DecryptUserId(paramsBytes: Buffer, userId: Serialized<UuidCiphertext>): Uuid;
+export function CallLinkSecretParams_DecryptUserId(paramsBytes: Buffer, userId: Serialized<UuidCiphertext>): Buffer;
 export function CallLinkSecretParams_DeriveFromRootKey(rootKey: Buffer): Buffer;
 export function CallLinkSecretParams_GetPublicParams(paramsBytes: Buffer): Buffer;
 export function Cds2ClientState_New(mrenclave: Buffer, attestationMsg: Buffer, currentTimestamp: Timestamp): SgxClientState;
@@ -94,12 +94,12 @@ export function CreateCallLinkCredentialPresentation_Verify(presentationBytes: B
 export function CreateCallLinkCredentialRequestContext_CheckValidContents(contextBytes: Buffer): void;
 export function CreateCallLinkCredentialRequestContext_GetRequest(contextBytes: Buffer): Buffer;
 export function CreateCallLinkCredentialRequestContext_NewDeterministic(roomId: Buffer, randomness: Buffer): Buffer;
-export function CreateCallLinkCredentialRequestContext_ReceiveResponse(contextBytes: Buffer, responseBytes: Buffer, userId: Uuid, paramsBytes: Buffer): Buffer;
+export function CreateCallLinkCredentialRequestContext_ReceiveResponse(contextBytes: Buffer, responseBytes: Buffer, userId: Buffer, paramsBytes: Buffer): Buffer;
 export function CreateCallLinkCredentialRequest_CheckValidContents(requestBytes: Buffer): void;
-export function CreateCallLinkCredentialRequest_IssueDeterministic(requestBytes: Buffer, userId: Uuid, timestamp: Timestamp, paramsBytes: Buffer, randomness: Buffer): Buffer;
+export function CreateCallLinkCredentialRequest_IssueDeterministic(requestBytes: Buffer, userId: Buffer, timestamp: Timestamp, paramsBytes: Buffer, randomness: Buffer): Buffer;
 export function CreateCallLinkCredentialResponse_CheckValidContents(responseBytes: Buffer): void;
 export function CreateCallLinkCredential_CheckValidContents(paramsBytes: Buffer): void;
-export function CreateCallLinkCredential_PresentDeterministic(credentialBytes: Buffer, roomId: Buffer, userId: Uuid, serverParamsBytes: Buffer, callLinkParamsBytes: Buffer, randomness: Buffer): Buffer;
+export function CreateCallLinkCredential_PresentDeterministic(credentialBytes: Buffer, roomId: Buffer, userId: Buffer, serverParamsBytes: Buffer, callLinkParamsBytes: Buffer, randomness: Buffer): Buffer;
 export function DecryptionErrorMessage_Deserialize(data: Buffer): DecryptionErrorMessage;
 export function DecryptionErrorMessage_ExtractFromSerializedContent(bytes: Buffer): DecryptionErrorMessage;
 export function DecryptionErrorMessage_ForOriginalMessage(originalBytes: Buffer, originalType: number, originalTimestamp: Timestamp, originalSenderDeviceId: number): DecryptionErrorMessage;
@@ -124,12 +124,12 @@ export function GroupPublicParams_CheckValidContents(buffer: Buffer): void;
 export function GroupPublicParams_GetGroupIdentifier(groupPublicParams: Serialized<GroupPublicParams>): Buffer;
 export function GroupSecretParams_CheckValidContents(buffer: Buffer): void;
 export function GroupSecretParams_DecryptBlobWithPadding(params: Serialized<GroupSecretParams>, ciphertext: Buffer): Buffer;
-export function GroupSecretParams_DecryptProfileKey(params: Serialized<GroupSecretParams>, profileKey: Serialized<ProfileKeyCiphertext>, uuid: Uuid): Serialized<ProfileKey>;
-export function GroupSecretParams_DecryptUuid(params: Serialized<GroupSecretParams>, uuid: Serialized<UuidCiphertext>): Uuid;
+export function GroupSecretParams_DecryptProfileKey(params: Serialized<GroupSecretParams>, profileKey: Serialized<ProfileKeyCiphertext>, userId: Buffer): Serialized<ProfileKey>;
+export function GroupSecretParams_DecryptServiceId(params: Serialized<GroupSecretParams>, ciphertext: Serialized<UuidCiphertext>): Buffer;
 export function GroupSecretParams_DeriveFromMasterKey(masterKey: Serialized<GroupMasterKey>): Serialized<GroupSecretParams>;
 export function GroupSecretParams_EncryptBlobWithPaddingDeterministic(params: Serialized<GroupSecretParams>, randomness: Buffer, plaintext: Buffer, paddingLen: number): Buffer;
-export function GroupSecretParams_EncryptProfileKey(params: Serialized<GroupSecretParams>, profileKey: Serialized<ProfileKey>, uuid: Uuid): Serialized<ProfileKeyCiphertext>;
-export function GroupSecretParams_EncryptUuid(params: Serialized<GroupSecretParams>, uuid: Uuid): Serialized<UuidCiphertext>;
+export function GroupSecretParams_EncryptProfileKey(params: Serialized<GroupSecretParams>, profileKey: Serialized<ProfileKey>, userId: Buffer): Serialized<ProfileKeyCiphertext>;
+export function GroupSecretParams_EncryptServiceId(params: Serialized<GroupSecretParams>, serviceId: Buffer): Serialized<UuidCiphertext>;
 export function GroupSecretParams_GenerateDeterministic(randomness: Buffer): Serialized<GroupSecretParams>;
 export function GroupSecretParams_GetMasterKey(params: Serialized<GroupSecretParams>): Serialized<GroupMasterKey>;
 export function GroupSecretParams_GetPublicParams(params: Serialized<GroupSecretParams>): Serialized<GroupPublicParams>;
@@ -210,8 +210,8 @@ export function ProfileKeyCredentialRequestContext_GetRequest(context: Serialize
 export function ProfileKeyCredentialRequest_CheckValidContents(buffer: Buffer): void;
 export function ProfileKey_CheckValidContents(buffer: Buffer): void;
 export function ProfileKey_DeriveAccessKey(profileKey: Serialized<ProfileKey>): Buffer;
-export function ProfileKey_GetCommitment(profileKey: Serialized<ProfileKey>, uuid: Uuid): Serialized<ProfileKeyCommitment>;
-export function ProfileKey_GetProfileKeyVersion(profileKey: Serialized<ProfileKey>, uuid: Uuid): Buffer;
+export function ProfileKey_GetCommitment(profileKey: Serialized<ProfileKey>, userId: Buffer): Serialized<ProfileKeyCommitment>;
+export function ProfileKey_GetProfileKeyVersion(profileKey: Serialized<ProfileKey>, userId: Buffer): Buffer;
 export function ProtocolAddress_DeviceId(obj: Wrapper<ProtocolAddress>): number;
 export function ProtocolAddress_Name(obj: Wrapper<ProtocolAddress>): string;
 export function ProtocolAddress_New(name: string, deviceId: number): ProtocolAddress;
@@ -287,20 +287,22 @@ export function ServerPublicParams_CheckValidContents(buffer: Buffer): void;
 export function ServerPublicParams_CreateAuthCredentialPresentationDeterministic(serverPublicParams: Serialized<ServerPublicParams>, randomness: Buffer, groupSecretParams: Serialized<GroupSecretParams>, authCredential: Serialized<AuthCredential>): Buffer;
 export function ServerPublicParams_CreateAuthCredentialWithPniPresentationDeterministic(serverPublicParams: Serialized<ServerPublicParams>, randomness: Buffer, groupSecretParams: Serialized<GroupSecretParams>, authCredential: Serialized<AuthCredentialWithPni>): Buffer;
 export function ServerPublicParams_CreateExpiringProfileKeyCredentialPresentationDeterministic(serverPublicParams: Serialized<ServerPublicParams>, randomness: Buffer, groupSecretParams: Serialized<GroupSecretParams>, profileKeyCredential: Serialized<ExpiringProfileKeyCredential>): Buffer;
-export function ServerPublicParams_CreateProfileKeyCredentialRequestContextDeterministic(serverPublicParams: Serialized<ServerPublicParams>, randomness: Buffer, uuid: Uuid, profileKey: Serialized<ProfileKey>): Serialized<ProfileKeyCredentialRequestContext>;
+export function ServerPublicParams_CreateProfileKeyCredentialRequestContextDeterministic(serverPublicParams: Serialized<ServerPublicParams>, randomness: Buffer, userId: Buffer, profileKey: Serialized<ProfileKey>): Serialized<ProfileKeyCredentialRequestContext>;
 export function ServerPublicParams_CreateReceiptCredentialPresentationDeterministic(serverPublicParams: Serialized<ServerPublicParams>, randomness: Buffer, receiptCredential: Serialized<ReceiptCredential>): Serialized<ReceiptCredentialPresentation>;
 export function ServerPublicParams_CreateReceiptCredentialRequestContextDeterministic(serverPublicParams: Serialized<ServerPublicParams>, randomness: Buffer, receiptSerial: Buffer): Serialized<ReceiptCredentialRequestContext>;
-export function ServerPublicParams_ReceiveAuthCredential(params: Serialized<ServerPublicParams>, uuid: Uuid, redemptionTime: number, response: Serialized<AuthCredentialResponse>): Serialized<AuthCredential>;
-export function ServerPublicParams_ReceiveAuthCredentialWithPni(params: Serialized<ServerPublicParams>, aci: Uuid, pni: Uuid, redemptionTime: Timestamp, response: Serialized<AuthCredentialWithPniResponse>): Serialized<AuthCredentialWithPni>;
+export function ServerPublicParams_ReceiveAuthCredential(params: Serialized<ServerPublicParams>, aci: Buffer, redemptionTime: number, response: Serialized<AuthCredentialResponse>): Serialized<AuthCredential>;
+export function ServerPublicParams_ReceiveAuthCredentialWithPniAsAci(params: Serialized<ServerPublicParams>, aci: Buffer, pni: Buffer, redemptionTime: Timestamp, response: Serialized<AuthCredentialWithPniResponse>): Serialized<AuthCredentialWithPni>;
+export function ServerPublicParams_ReceiveAuthCredentialWithPniAsServiceId(params: Serialized<ServerPublicParams>, aci: Buffer, pni: Buffer, redemptionTime: Timestamp, response: Serialized<AuthCredentialWithPniResponse>): Serialized<AuthCredentialWithPni>;
 export function ServerPublicParams_ReceiveExpiringProfileKeyCredential(serverPublicParams: Serialized<ServerPublicParams>, requestContext: Serialized<ProfileKeyCredentialRequestContext>, response: Serialized<ExpiringProfileKeyCredentialResponse>, currentTimeInSeconds: Timestamp): Serialized<ExpiringProfileKeyCredential>;
 export function ServerPublicParams_ReceiveReceiptCredential(serverPublicParams: Serialized<ServerPublicParams>, requestContext: Serialized<ReceiptCredentialRequestContext>, response: Serialized<ReceiptCredentialResponse>): Serialized<ReceiptCredential>;
 export function ServerPublicParams_VerifySignature(serverPublicParams: Serialized<ServerPublicParams>, message: Buffer, notarySignature: Buffer): void;
 export function ServerSecretParams_CheckValidContents(buffer: Buffer): void;
 export function ServerSecretParams_GenerateDeterministic(randomness: Buffer): Serialized<ServerSecretParams>;
 export function ServerSecretParams_GetPublicParams(params: Serialized<ServerSecretParams>): Serialized<ServerPublicParams>;
-export function ServerSecretParams_IssueAuthCredentialDeterministic(serverSecretParams: Serialized<ServerSecretParams>, randomness: Buffer, uuid: Uuid, redemptionTime: number): Serialized<AuthCredentialResponse>;
-export function ServerSecretParams_IssueAuthCredentialWithPniDeterministic(serverSecretParams: Serialized<ServerSecretParams>, randomness: Buffer, aci: Uuid, pni: Uuid, redemptionTime: Timestamp): Serialized<AuthCredentialWithPniResponse>;
-export function ServerSecretParams_IssueExpiringProfileKeyCredentialDeterministic(serverSecretParams: Serialized<ServerSecretParams>, randomness: Buffer, request: Serialized<ProfileKeyCredentialRequest>, uuid: Uuid, commitment: Serialized<ProfileKeyCommitment>, expirationInSeconds: Timestamp): Serialized<ExpiringProfileKeyCredentialResponse>;
+export function ServerSecretParams_IssueAuthCredentialDeterministic(serverSecretParams: Serialized<ServerSecretParams>, randomness: Buffer, aci: Buffer, redemptionTime: number): Serialized<AuthCredentialResponse>;
+export function ServerSecretParams_IssueAuthCredentialWithPniAsAciDeterministic(serverSecretParams: Serialized<ServerSecretParams>, randomness: Buffer, aci: Buffer, pni: Buffer, redemptionTime: Timestamp): Serialized<AuthCredentialWithPniResponse>;
+export function ServerSecretParams_IssueAuthCredentialWithPniAsServiceIdDeterministic(serverSecretParams: Serialized<ServerSecretParams>, randomness: Buffer, aci: Buffer, pni: Buffer, redemptionTime: Timestamp): Serialized<AuthCredentialWithPniResponse>;
+export function ServerSecretParams_IssueExpiringProfileKeyCredentialDeterministic(serverSecretParams: Serialized<ServerSecretParams>, randomness: Buffer, request: Serialized<ProfileKeyCredentialRequest>, userId: Buffer, commitment: Serialized<ProfileKeyCommitment>, expirationInSeconds: Timestamp): Serialized<ExpiringProfileKeyCredentialResponse>;
 export function ServerSecretParams_IssueReceiptCredentialDeterministic(serverSecretParams: Serialized<ServerSecretParams>, randomness: Buffer, request: Serialized<ReceiptCredentialRequest>, receiptExpirationTime: Timestamp, receiptLevel: Buffer): Serialized<ReceiptCredentialResponse>;
 export function ServerSecretParams_SignDeterministic(params: Serialized<ServerSecretParams>, randomness: Buffer, message: Buffer): Buffer;
 export function ServerSecretParams_VerifyAuthCredentialPresentation(serverSecretParams: Serialized<ServerSecretParams>, groupPublicParams: Serialized<GroupPublicParams>, presentationBytes: Buffer, currentTimeInSeconds: Timestamp): void;

package/dist/Address.d.ts

@@ -12,9 +12,10 @@ export declare class ServiceId extends Object {
     protected constructor(serviceIdFixedWidthBinary: Buffer);
     protected static fromUuidBytesAndKind<T extends typeof ServiceId>(this: T, uuidBytes: ArrayLike<number>, kind: ServiceIdKind): ThisType<T>;
     getServiceIdBinary(): Buffer;
+    getServiceIdFixedWidthBinary(): Buffer;
     getServiceIdString(): string;
     toString(): string;
-    private static parseFromServiceIdFixedWidthBinary;
+    static parseFromServiceIdFixedWidthBinary<T extends typeof ServiceId>(this: T, serviceIdFixedWidthBinary: Buffer): ThisType<T>;
     static parseFromServiceIdBinary(serviceIdBinary: Buffer): ServiceId;
     static parseFromServiceIdString(serviceIdString: string): ServiceId;
     getRawUuid(): string;

package/dist/Address.js

@@ -30,6 +30,9 @@ class ServiceId extends Object {
     getServiceIdBinary() {
         return Native.ServiceId_ServiceIdBinary(this.serviceIdFixedWidthBinary);
     }
+    getServiceIdFixedWidthBinary() {
+        return Buffer.from(this.serviceIdFixedWidthBinary);
+    }
     getServiceIdString() {
         return Native.ServiceId_ServiceIdString(this.serviceIdFixedWidthBinary);
     }
@@ -37,14 +40,21 @@ class ServiceId extends Object {
         return Native.ServiceId_ServiceIdLog(this.serviceIdFixedWidthBinary);
     }
     static parseFromServiceIdFixedWidthBinary(serviceIdFixedWidthBinary) {
+        let result;
         switch (serviceIdFixedWidthBinary[0]) {
             case ServiceIdKind.Aci:
-                return new Aci(serviceIdFixedWidthBinary);
+                result = new Aci(serviceIdFixedWidthBinary);
+                break;
             case ServiceIdKind.Pni:
-                return new Pni(serviceIdFixedWidthBinary);
+                result = new Pni(serviceIdFixedWidthBinary);
+                break;
             default:
                 throw new TypeError('unknown type in Service-Id-FixedWidthBinary');
         }
+        if (result instanceof this) {
+            return result;
+        }
+        throw new TypeError(`expected ${this.name}, got ${result.constructor.name}`);
     }
     static parseFromServiceIdBinary(serviceIdBinary) {
         return ServiceId.parseFromServiceIdFixedWidthBinary(Native.ServiceId_ParseFromServiceIdBinary(serviceIdBinary));

package/dist/zkgroup/auth/ClientZkAuthOperations.d.ts

@@ -6,17 +6,26 @@ import AuthCredentialResponse from './AuthCredentialResponse';
 import AuthCredentialWithPni from './AuthCredentialWithPni';
 import AuthCredentialWithPniResponse from './AuthCredentialWithPniResponse';
 import GroupSecretParams from '../groups/GroupSecretParams';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci, Pni } from '../../Address';
 export default class ClientZkAuthOperations {
     serverPublicParams: ServerPublicParams;
     constructor(serverPublicParams: ServerPublicParams);
-    receiveAuthCredential(uuid: UUIDType, redemptionTime: number, authCredentialResponse: AuthCredentialResponse): AuthCredential;
+    receiveAuthCredential(aci: Aci, redemptionTime: number, authCredentialResponse: AuthCredentialResponse): AuthCredential;
     /**
      * Produces the AuthCredentialWithPni from a server-generated AuthCredentialWithPniResponse.
      *
      * @param redemptionTime - This is provided by the server as an integer, and should be passed through directly.
      */
-    receiveAuthCredentialWithPni(aci: UUIDType, pni: UUIDType, redemptionTime: number, authCredentialResponse: AuthCredentialWithPniResponse): AuthCredentialWithPni;
+    receiveAuthCredentialWithPniAsServiceId(aci: Aci, pni: Pni, redemptionTime: number, authCredentialResponse: AuthCredentialWithPniResponse): AuthCredentialWithPni;
+    /**
+     * Produces the AuthCredentialWithPni from a server-generated AuthCredentialWithPniResponse.
+     *
+     * This older style of AuthCredentialWithPni will not actually have a usable PNI field,
+     * but can still be used for authenticating with an ACI.
+     *
+     * @param redemptionTime - This is provided by the server as an integer, and should be passed through directly.
+     */
+    receiveAuthCredentialWithPniAsAci(aci: Aci, pni: Pni, redemptionTime: number, authCredentialResponse: AuthCredentialWithPniResponse): AuthCredentialWithPni;
     createAuthCredentialPresentation(groupSecretParams: GroupSecretParams, authCredential: AuthCredential): AuthCredentialPresentation;
     createAuthCredentialPresentationWithRandom(random: Buffer, groupSecretParams: GroupSecretParams, authCredential: AuthCredential): AuthCredentialPresentation;
     createAuthCredentialWithPniPresentation(groupSecretParams: GroupSecretParams, authCredential: AuthCredentialWithPni): AuthCredentialPresentation;

package/dist/zkgroup/auth/ClientZkAuthOperations.js

@@ -10,21 +10,31 @@ const Constants_1 = require("../internal/Constants");
 const AuthCredential_1 = require("./AuthCredential");
 const AuthCredentialPresentation_1 = require("./AuthCredentialPresentation");
 const AuthCredentialWithPni_1 = require("./AuthCredentialWithPni");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
 class ClientZkAuthOperations {
     constructor(serverPublicParams) {
         this.serverPublicParams = serverPublicParams;
     }
-    receiveAuthCredential(uuid, redemptionTime, authCredentialResponse) {
-        return new AuthCredential_1.default(Native.ServerPublicParams_ReceiveAuthCredential(this.serverPublicParams.getContents(), (0, UUIDUtil_1.fromUUID)(uuid), redemptionTime, authCredentialResponse.getContents()));
+    receiveAuthCredential(aci, redemptionTime, authCredentialResponse) {
+        return new AuthCredential_1.default(Native.ServerPublicParams_ReceiveAuthCredential(this.serverPublicParams.getContents(), aci.getServiceIdFixedWidthBinary(), redemptionTime, authCredentialResponse.getContents()));
     }
     /**
      * Produces the AuthCredentialWithPni from a server-generated AuthCredentialWithPniResponse.
      *
      * @param redemptionTime - This is provided by the server as an integer, and should be passed through directly.
      */
-    receiveAuthCredentialWithPni(aci, pni, redemptionTime, authCredentialResponse) {
-        return new AuthCredentialWithPni_1.default(Native.ServerPublicParams_ReceiveAuthCredentialWithPni(this.serverPublicParams.getContents(), (0, UUIDUtil_1.fromUUID)(aci), (0, UUIDUtil_1.fromUUID)(pni), redemptionTime, authCredentialResponse.getContents()));
+    receiveAuthCredentialWithPniAsServiceId(aci, pni, redemptionTime, authCredentialResponse) {
+        return new AuthCredentialWithPni_1.default(Native.ServerPublicParams_ReceiveAuthCredentialWithPniAsServiceId(this.serverPublicParams.getContents(), aci.getServiceIdFixedWidthBinary(), pni.getServiceIdFixedWidthBinary(), redemptionTime, authCredentialResponse.getContents()));
+    }
+    /**
+     * Produces the AuthCredentialWithPni from a server-generated AuthCredentialWithPniResponse.
+     *
+     * This older style of AuthCredentialWithPni will not actually have a usable PNI field,
+     * but can still be used for authenticating with an ACI.
+     *
+     * @param redemptionTime - This is provided by the server as an integer, and should be passed through directly.
+     */
+    receiveAuthCredentialWithPniAsAci(aci, pni, redemptionTime, authCredentialResponse) {
+        return new AuthCredentialWithPni_1.default(Native.ServerPublicParams_ReceiveAuthCredentialWithPniAsAci(this.serverPublicParams.getContents(), aci.getServiceIdFixedWidthBinary(), pni.getServiceIdFixedWidthBinary(), redemptionTime, authCredentialResponse.getContents()));
     }
     createAuthCredentialPresentation(groupSecretParams, authCredential) {
         const random = (0, crypto_1.randomBytes)(Constants_1.RANDOM_LENGTH);

package/dist/zkgroup/auth/ServerZkAuthOperations.d.ts

@@ -4,13 +4,15 @@ import AuthCredentialResponse from './AuthCredentialResponse';
 import AuthCredentialPresentation from './AuthCredentialPresentation';
 import AuthCredentialWithPniResponse from './AuthCredentialWithPniResponse';
 import GroupPublicParams from '../groups/GroupPublicParams';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci, Pni } from '../../Address';
 export default class ServerZkAuthOperations {
     serverSecretParams: ServerSecretParams;
     constructor(serverSecretParams: ServerSecretParams);
-    issueAuthCredential(uuid: UUIDType, redemptionTime: number): AuthCredentialResponse;
-    issueAuthCredentialWithRandom(random: Buffer, uuid: UUIDType, redemptionTime: number): AuthCredentialResponse;
-    issueAuthCredentialWithPni(aci: UUIDType, pni: UUIDType, redemptionTime: number): AuthCredentialWithPniResponse;
-    issueAuthCredentialWithPniWithRandom(random: Buffer, aci: UUIDType, pni: UUIDType, redemptionTime: number): AuthCredentialWithPniResponse;
+    issueAuthCredential(aci: Aci, redemptionTime: number): AuthCredentialResponse;
+    issueAuthCredentialWithRandom(random: Buffer, aci: Aci, redemptionTime: number): AuthCredentialResponse;
+    issueAuthCredentialWithPniAsServiceId(aci: Aci, pni: Pni, redemptionTime: number): AuthCredentialWithPniResponse;
+    issueAuthCredentialWithPniAsServiceIdWithRandom(random: Buffer, aci: Aci, pni: Pni, redemptionTime: number): AuthCredentialWithPniResponse;
+    issueAuthCredentialWithPniAsAci(aci: Aci, pni: Pni, redemptionTime: number): AuthCredentialWithPniResponse;
+    issueAuthCredentialWithPniAsAciWithRandom(random: Buffer, aci: Aci, pni: Pni, redemptionTime: number): AuthCredentialWithPniResponse;
     verifyAuthCredentialPresentation(groupPublicParams: GroupPublicParams, authCredentialPresentation: AuthCredentialPresentation, now?: Date): void;
 }

package/dist/zkgroup/auth/ServerZkAuthOperations.js

@@ -9,24 +9,30 @@ const Constants_1 = require("../internal/Constants");
 const Native = require("../../../Native");
 const AuthCredentialResponse_1 = require("./AuthCredentialResponse");
 const AuthCredentialWithPniResponse_1 = require("./AuthCredentialWithPniResponse");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
 class ServerZkAuthOperations {
     constructor(serverSecretParams) {
         this.serverSecretParams = serverSecretParams;
     }
-    issueAuthCredential(uuid, redemptionTime) {
+    issueAuthCredential(aci, redemptionTime) {
         const random = (0, crypto_1.randomBytes)(Constants_1.RANDOM_LENGTH);
-        return this.issueAuthCredentialWithRandom(random, uuid, redemptionTime);
+        return this.issueAuthCredentialWithRandom(random, aci, redemptionTime);
     }
-    issueAuthCredentialWithRandom(random, uuid, redemptionTime) {
-        return new AuthCredentialResponse_1.default(Native.ServerSecretParams_IssueAuthCredentialDeterministic(this.serverSecretParams.getContents(), random, (0, UUIDUtil_1.fromUUID)(uuid), redemptionTime));
+    issueAuthCredentialWithRandom(random, aci, redemptionTime) {
+        return new AuthCredentialResponse_1.default(Native.ServerSecretParams_IssueAuthCredentialDeterministic(this.serverSecretParams.getContents(), random, aci.getServiceIdFixedWidthBinary(), redemptionTime));
     }
-    issueAuthCredentialWithPni(aci, pni, redemptionTime) {
+    issueAuthCredentialWithPniAsServiceId(aci, pni, redemptionTime) {
         const random = (0, crypto_1.randomBytes)(Constants_1.RANDOM_LENGTH);
-        return this.issueAuthCredentialWithPniWithRandom(random, aci, pni, redemptionTime);
+        return this.issueAuthCredentialWithPniAsServiceIdWithRandom(random, aci, pni, redemptionTime);
     }
-    issueAuthCredentialWithPniWithRandom(random, aci, pni, redemptionTime) {
-        return new AuthCredentialWithPniResponse_1.default(Native.ServerSecretParams_IssueAuthCredentialWithPniDeterministic(this.serverSecretParams.getContents(), random, (0, UUIDUtil_1.fromUUID)(aci), (0, UUIDUtil_1.fromUUID)(pni), redemptionTime));
+    issueAuthCredentialWithPniAsServiceIdWithRandom(random, aci, pni, redemptionTime) {
+        return new AuthCredentialWithPniResponse_1.default(Native.ServerSecretParams_IssueAuthCredentialWithPniAsServiceIdDeterministic(this.serverSecretParams.getContents(), random, aci.getServiceIdFixedWidthBinary(), pni.getServiceIdFixedWidthBinary(), redemptionTime));
+    }
+    issueAuthCredentialWithPniAsAci(aci, pni, redemptionTime) {
+        const random = (0, crypto_1.randomBytes)(Constants_1.RANDOM_LENGTH);
+        return this.issueAuthCredentialWithPniAsAciWithRandom(random, aci, pni, redemptionTime);
+    }
+    issueAuthCredentialWithPniAsAciWithRandom(random, aci, pni, redemptionTime) {
+        return new AuthCredentialWithPniResponse_1.default(Native.ServerSecretParams_IssueAuthCredentialWithPniAsAciDeterministic(this.serverSecretParams.getContents(), random, aci.getServiceIdFixedWidthBinary(), pni.getServiceIdFixedWidthBinary(), redemptionTime));
     }
     verifyAuthCredentialPresentation(groupPublicParams, authCredentialPresentation, now = new Date()) {
         Native.ServerSecretParams_VerifyAuthCredentialPresentation(this.serverSecretParams.getContents(), groupPublicParams.getContents(), authCredentialPresentation.getContents(), Math.floor(now.getTime() / 1000));

package/dist/zkgroup/calllinks/CallLinkAuthCredential.d.ts

@@ -3,10 +3,10 @@ import ByteArray from '../internal/ByteArray';
 import CallLinkSecretParams from './CallLinkSecretParams';
 import CallLinkAuthCredentialPresentation from './CallLinkAuthCredentialPresentation';
 import GenericServerPublicParams from '../GenericServerPublicParams';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci } from '../../Address';
 export default class CallLinkAuthCredential extends ByteArray {
     private readonly __type?;
     constructor(contents: Buffer);
-    present(userId: UUIDType, redemptionTime: number, serverParams: GenericServerPublicParams, callLinkParams: CallLinkSecretParams): CallLinkAuthCredentialPresentation;
-    presentWithRandom(userId: UUIDType, redemptionTime: number, serverParams: GenericServerPublicParams, callLinkParams: CallLinkSecretParams, random: Buffer): CallLinkAuthCredentialPresentation;
+    present(userId: Aci, redemptionTime: number, serverParams: GenericServerPublicParams, callLinkParams: CallLinkSecretParams): CallLinkAuthCredentialPresentation;
+    presentWithRandom(userId: Aci, redemptionTime: number, serverParams: GenericServerPublicParams, callLinkParams: CallLinkSecretParams, random: Buffer): CallLinkAuthCredentialPresentation;
 }

package/dist/zkgroup/calllinks/CallLinkAuthCredential.js

@@ -9,7 +9,6 @@ const ByteArray_1 = require("../internal/ByteArray");
 const Constants_1 = require("../internal/Constants");
 const Native = require("../../../Native");
 const CallLinkAuthCredentialPresentation_1 = require("./CallLinkAuthCredentialPresentation");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
 class CallLinkAuthCredential extends ByteArray_1.default {
     constructor(contents) {
         super(contents, Native.CallLinkAuthCredential_CheckValidContents);
@@ -19,7 +18,7 @@ class CallLinkAuthCredential extends ByteArray_1.default {
         return this.presentWithRandom(userId, redemptionTime, serverParams, callLinkParams, random);
     }
     presentWithRandom(userId, redemptionTime, serverParams, callLinkParams, random) {
-        return new CallLinkAuthCredentialPresentation_1.default(Native.CallLinkAuthCredential_PresentDeterministic(this.contents, (0, UUIDUtil_1.fromUUID)(userId), redemptionTime, serverParams.contents, callLinkParams.contents, random));
+        return new CallLinkAuthCredentialPresentation_1.default(Native.CallLinkAuthCredential_PresentDeterministic(this.contents, userId.getServiceIdFixedWidthBinary(), redemptionTime, serverParams.contents, callLinkParams.contents, random));
     }
 }
 exports.default = CallLinkAuthCredential;

package/dist/zkgroup/calllinks/CallLinkAuthCredentialResponse.d.ts

@@ -1,13 +1,13 @@
 /// <reference types="node" />
 import ByteArray from '../internal/ByteArray';
-import { UUIDType } from '../internal/UUIDUtil';
 import GenericServerSecretParams from '../GenericServerSecretParams';
 import GenericServerPublicParams from '../GenericServerPublicParams';
 import CallLinkAuthCredential from './CallLinkAuthCredential';
+import { Aci } from '../../Address';
 export default class CallLinkAuthCredentialResponse extends ByteArray {
     private readonly __type?;
     constructor(contents: Buffer);
-    static issueCredential(userId: UUIDType, redemptionTime: number, params: GenericServerSecretParams): CallLinkAuthCredentialResponse;
-    static issueCredentialWithRandom(userId: UUIDType, redemptionTime: number, params: GenericServerSecretParams, random: Buffer): CallLinkAuthCredentialResponse;
-    receive(userId: UUIDType, redemptionTime: number, params: GenericServerPublicParams): CallLinkAuthCredential;
+    static issueCredential(userId: Aci, redemptionTime: number, params: GenericServerSecretParams): CallLinkAuthCredentialResponse;
+    static issueCredentialWithRandom(userId: Aci, redemptionTime: number, params: GenericServerSecretParams, random: Buffer): CallLinkAuthCredentialResponse;
+    receive(userId: Aci, redemptionTime: number, params: GenericServerPublicParams): CallLinkAuthCredential;
 }

package/dist/zkgroup/calllinks/CallLinkAuthCredentialResponse.js

@@ -8,7 +8,6 @@ const crypto_1 = require("crypto");
 const ByteArray_1 = require("../internal/ByteArray");
 const Native = require("../../../Native");
 const Constants_1 = require("../internal/Constants");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
 const CallLinkAuthCredential_1 = require("./CallLinkAuthCredential");
 class CallLinkAuthCredentialResponse extends ByteArray_1.default {
     constructor(contents) {
@@ -19,10 +18,10 @@ class CallLinkAuthCredentialResponse extends ByteArray_1.default {
         return this.issueCredentialWithRandom(userId, redemptionTime, params, random);
     }
     static issueCredentialWithRandom(userId, redemptionTime, params, random) {
-        return new CallLinkAuthCredentialResponse(Native.CallLinkAuthCredentialResponse_IssueDeterministic((0, UUIDUtil_1.fromUUID)(userId), redemptionTime, params.contents, random));
+        return new CallLinkAuthCredentialResponse(Native.CallLinkAuthCredentialResponse_IssueDeterministic(userId.getServiceIdFixedWidthBinary(), redemptionTime, params.contents, random));
     }
     receive(userId, redemptionTime, params) {
-        return new CallLinkAuthCredential_1.default(Native.CallLinkAuthCredentialResponse_Receive(this.contents, (0, UUIDUtil_1.fromUUID)(userId), redemptionTime, params.contents));
+        return new CallLinkAuthCredential_1.default(Native.CallLinkAuthCredentialResponse_Receive(this.contents, userId.getServiceIdFixedWidthBinary(), redemptionTime, params.contents));
     }
 }
 exports.default = CallLinkAuthCredentialResponse;

package/dist/zkgroup/calllinks/CallLinkSecretParams.d.ts

@@ -2,11 +2,11 @@
 import ByteArray from '../internal/ByteArray';
 import CallLinkPublicParams from './CallLinkPublicParams';
 import UuidCiphertext from '../groups/UuidCiphertext';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci } from '../../Address';
 export default class CallLinkSecretParams extends ByteArray {
     private readonly __type?;
     static deriveFromRootKey(callLinkRootKey: Buffer): CallLinkSecretParams;
     constructor(contents: Buffer);
     getPublicParams(): CallLinkPublicParams;
-    decryptUserId(userId: UuidCiphertext): UUIDType;
+    decryptUserId(userId: UuidCiphertext): Aci;
 }

package/dist/zkgroup/calllinks/CallLinkSecretParams.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ByteArray_1 = require("../internal/ByteArray");
 const Native = require("../../../Native");
 const CallLinkPublicParams_1 = require("./CallLinkPublicParams");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
+const Address_1 = require("../../Address");
 class CallLinkSecretParams extends ByteArray_1.default {
     static deriveFromRootKey(callLinkRootKey) {
         return new CallLinkSecretParams(Native.CallLinkSecretParams_DeriveFromRootKey(callLinkRootKey));
@@ -19,7 +19,7 @@ class CallLinkSecretParams extends ByteArray_1.default {
         return new CallLinkPublicParams_1.default(Native.CallLinkSecretParams_GetPublicParams(this.contents));
     }
     decryptUserId(userId) {
-        return (0, UUIDUtil_1.toUUID)(Native.CallLinkSecretParams_DecryptUserId(this.contents, userId.contents));
+        return Address_1.Aci.parseFromServiceIdFixedWidthBinary(Native.CallLinkSecretParams_DecryptUserId(this.contents, userId.contents));
     }
 }
 exports.default = CallLinkSecretParams;

package/dist/zkgroup/calllinks/CreateCallLinkCredential.d.ts

@@ -3,10 +3,10 @@ import ByteArray from '../internal/ByteArray';
 import CallLinkSecretParams from './CallLinkSecretParams';
 import CreateCallLinkCredentialPresentation from './CreateCallLinkCredentialPresentation';
 import GenericServerPublicParams from '../GenericServerPublicParams';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci } from '../../Address';
 export default class CreateCallLinkCredential extends ByteArray {
     private readonly __type?;
     constructor(contents: Buffer);
-    present(roomId: Buffer, userId: UUIDType, serverParams: GenericServerPublicParams, callLinkParams: CallLinkSecretParams): CreateCallLinkCredentialPresentation;
-    presentWithRandom(roomId: Buffer, userId: UUIDType, serverParams: GenericServerPublicParams, callLinkParams: CallLinkSecretParams, random: Buffer): CreateCallLinkCredentialPresentation;
+    present(roomId: Buffer, userId: Aci, serverParams: GenericServerPublicParams, callLinkParams: CallLinkSecretParams): CreateCallLinkCredentialPresentation;
+    presentWithRandom(roomId: Buffer, userId: Aci, serverParams: GenericServerPublicParams, callLinkParams: CallLinkSecretParams, random: Buffer): CreateCallLinkCredentialPresentation;
 }

package/dist/zkgroup/calllinks/CreateCallLinkCredential.js

@@ -9,7 +9,6 @@ const ByteArray_1 = require("../internal/ByteArray");
 const Constants_1 = require("../internal/Constants");
 const Native = require("../../../Native");
 const CreateCallLinkCredentialPresentation_1 = require("./CreateCallLinkCredentialPresentation");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
 class CreateCallLinkCredential extends ByteArray_1.default {
     constructor(contents) {
         super(contents, Native.CreateCallLinkCredential_CheckValidContents);
@@ -19,7 +18,7 @@ class CreateCallLinkCredential extends ByteArray_1.default {
         return this.presentWithRandom(roomId, userId, serverParams, callLinkParams, random);
     }
     presentWithRandom(roomId, userId, serverParams, callLinkParams, random) {
-        return new CreateCallLinkCredentialPresentation_1.default(Native.CreateCallLinkCredential_PresentDeterministic(this.contents, roomId, (0, UUIDUtil_1.fromUUID)(userId), serverParams.contents, callLinkParams.contents, random));
+        return new CreateCallLinkCredentialPresentation_1.default(Native.CreateCallLinkCredential_PresentDeterministic(this.contents, roomId, userId.getServiceIdFixedWidthBinary(), serverParams.contents, callLinkParams.contents, random));
     }
 }
 exports.default = CreateCallLinkCredential;

package/dist/zkgroup/calllinks/CreateCallLinkCredentialRequest.d.ts

@@ -2,10 +2,10 @@
 import ByteArray from '../internal/ByteArray';
 import CreateCallLinkCredentialResponse from './CreateCallLinkCredentialResponse';
 import GenericServerSecretParams from '../GenericServerSecretParams';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci } from '../../Address';
 export default class CreateCallLinkCredentialRequest extends ByteArray {
     private readonly __type?;
     constructor(contents: Buffer);
-    issueCredential(userId: UUIDType, timestamp: number, params: GenericServerSecretParams): CreateCallLinkCredentialResponse;
-    issueCredentialWithRandom(userId: UUIDType, timestamp: number, params: GenericServerSecretParams, random: Buffer): CreateCallLinkCredentialResponse;
+    issueCredential(userId: Aci, timestamp: number, params: GenericServerSecretParams): CreateCallLinkCredentialResponse;
+    issueCredentialWithRandom(userId: Aci, timestamp: number, params: GenericServerSecretParams, random: Buffer): CreateCallLinkCredentialResponse;
 }

package/dist/zkgroup/calllinks/CreateCallLinkCredentialRequest.js

@@ -9,7 +9,6 @@ const ByteArray_1 = require("../internal/ByteArray");
 const Constants_1 = require("../internal/Constants");
 const Native = require("../../../Native");
 const CreateCallLinkCredentialResponse_1 = require("./CreateCallLinkCredentialResponse");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
 class CreateCallLinkCredentialRequest extends ByteArray_1.default {
     constructor(contents) {
         super(contents, Native.CreateCallLinkCredentialRequest_CheckValidContents);
@@ -19,7 +18,7 @@ class CreateCallLinkCredentialRequest extends ByteArray_1.default {
         return this.issueCredentialWithRandom(userId, timestamp, params, random);
     }
     issueCredentialWithRandom(userId, timestamp, params, random) {
-        return new CreateCallLinkCredentialResponse_1.default(Native.CreateCallLinkCredentialRequest_IssueDeterministic(this.contents, (0, UUIDUtil_1.fromUUID)(userId), timestamp, params.contents, random));
+        return new CreateCallLinkCredentialResponse_1.default(Native.CreateCallLinkCredentialRequest_IssueDeterministic(this.contents, userId.getServiceIdFixedWidthBinary(), timestamp, params.contents, random));
     }
 }
 exports.default = CreateCallLinkCredentialRequest;

package/dist/zkgroup/calllinks/CreateCallLinkCredentialRequestContext.d.ts

@@ -4,12 +4,12 @@ import CreateCallLinkCredentialRequest from './CreateCallLinkCredentialRequest';
 import CreateCallLinkCredentialResponse from './CreateCallLinkCredentialResponse';
 import CreateCallLinkCredential from './CreateCallLinkCredential';
 import GenericServerPublicParams from '../GenericServerPublicParams';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci } from '../../Address';
 export default class CreateCallLinkCredentialRequestContext extends ByteArray {
     private readonly __type?;
     constructor(contents: Buffer);
     static forRoomId(roomId: Buffer): CreateCallLinkCredentialRequestContext;
     static forRoomIdWithRandom(roomId: Buffer, random: Buffer): CreateCallLinkCredentialRequestContext;
     getRequest(): CreateCallLinkCredentialRequest;
-    receive(response: CreateCallLinkCredentialResponse, userId: UUIDType, params: GenericServerPublicParams): CreateCallLinkCredential;
+    receive(response: CreateCallLinkCredentialResponse, userId: Aci, params: GenericServerPublicParams): CreateCallLinkCredential;
 }

package/dist/zkgroup/calllinks/CreateCallLinkCredentialRequestContext.js

@@ -10,7 +10,6 @@ const Constants_1 = require("../internal/Constants");
 const Native = require("../../../Native");
 const CreateCallLinkCredentialRequest_1 = require("./CreateCallLinkCredentialRequest");
 const CreateCallLinkCredential_1 = require("./CreateCallLinkCredential");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
 class CreateCallLinkCredentialRequestContext extends ByteArray_1.default {
     constructor(contents) {
         super(contents, Native.CreateCallLinkCredentialRequestContext_CheckValidContents);
@@ -26,7 +25,7 @@ class CreateCallLinkCredentialRequestContext extends ByteArray_1.default {
         return new CreateCallLinkCredentialRequest_1.default(Native.CreateCallLinkCredentialRequestContext_GetRequest(this.contents));
     }
     receive(response, userId, params) {
-        return new CreateCallLinkCredential_1.default(Native.CreateCallLinkCredentialRequestContext_ReceiveResponse(this.contents, response.contents, (0, UUIDUtil_1.fromUUID)(userId), params.contents));
+        return new CreateCallLinkCredential_1.default(Native.CreateCallLinkCredentialRequestContext_ReceiveResponse(this.contents, response.contents, userId.getServiceIdFixedWidthBinary(), params.contents));
     }
 }
 exports.default = CreateCallLinkCredentialRequestContext;

package/dist/zkgroup/groups/ClientZkGroupCipher.d.ts

@@ -3,14 +3,14 @@ import UuidCiphertext from './UuidCiphertext';
 import ProfileKeyCiphertext from './ProfileKeyCiphertext';
 import ProfileKey from '../profiles/ProfileKey';
 import GroupSecretParams from './GroupSecretParams';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci, ServiceId } from '../../Address';
 export default class ClientZkGroupCipher {
     groupSecretParams: GroupSecretParams;
     constructor(groupSecretParams: GroupSecretParams);
-    encryptUuid(uuid: UUIDType): UuidCiphertext;
-    decryptUuid(uuidCiphertext: UuidCiphertext): UUIDType;
-    encryptProfileKey(profileKey: ProfileKey, uuid: UUIDType): ProfileKeyCiphertext;
-    decryptProfileKey(profileKeyCiphertext: ProfileKeyCiphertext, uuid: UUIDType): ProfileKey;
+    encryptServiceId(serviceId: ServiceId): UuidCiphertext;
+    decryptServiceId(ciphertext: UuidCiphertext): ServiceId;
+    encryptProfileKey(profileKey: ProfileKey, userId: Aci): ProfileKeyCiphertext;
+    decryptProfileKey(profileKeyCiphertext: ProfileKeyCiphertext, userId: Aci): ProfileKey;
     encryptBlob(plaintext: Buffer): Buffer;
     encryptBlobWithRandom(random: Buffer, plaintext: Buffer): Buffer;
     decryptBlob(blobCiphertext: Buffer): Buffer;

package/dist/zkgroup/groups/ClientZkGroupCipher.js

@@ -10,22 +10,22 @@ const Native = require("../../../Native");
 const UuidCiphertext_1 = require("./UuidCiphertext");
 const ProfileKeyCiphertext_1 = require("./ProfileKeyCiphertext");
 const ProfileKey_1 = require("../profiles/ProfileKey");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
+const Address_1 = require("../../Address");
 class ClientZkGroupCipher {
     constructor(groupSecretParams) {
         this.groupSecretParams = groupSecretParams;
     }
-    encryptUuid(uuid) {
-        return new UuidCiphertext_1.default(Native.GroupSecretParams_EncryptUuid(this.groupSecretParams.getContents(), (0, UUIDUtil_1.fromUUID)(uuid)));
+    encryptServiceId(serviceId) {
+        return new UuidCiphertext_1.default(Native.GroupSecretParams_EncryptServiceId(this.groupSecretParams.getContents(), serviceId.getServiceIdFixedWidthBinary()));
     }
-    decryptUuid(uuidCiphertext) {
-        return (0, UUIDUtil_1.toUUID)(Native.GroupSecretParams_DecryptUuid(this.groupSecretParams.getContents(), uuidCiphertext.getContents()));
+    decryptServiceId(ciphertext) {
+        return Address_1.ServiceId.parseFromServiceIdFixedWidthBinary(Native.GroupSecretParams_DecryptServiceId(this.groupSecretParams.getContents(), ciphertext.getContents()));
     }
-    encryptProfileKey(profileKey, uuid) {
-        return new ProfileKeyCiphertext_1.default(Native.GroupSecretParams_EncryptProfileKey(this.groupSecretParams.getContents(), profileKey.getContents(), (0, UUIDUtil_1.fromUUID)(uuid)));
+    encryptProfileKey(profileKey, userId) {
+        return new ProfileKeyCiphertext_1.default(Native.GroupSecretParams_EncryptProfileKey(this.groupSecretParams.getContents(), profileKey.getContents(), userId.getServiceIdFixedWidthBinary()));
     }
-    decryptProfileKey(profileKeyCiphertext, uuid) {
-        return new ProfileKey_1.default(Native.GroupSecretParams_DecryptProfileKey(this.groupSecretParams.getContents(), profileKeyCiphertext.getContents(), (0, UUIDUtil_1.fromUUID)(uuid)));
+    decryptProfileKey(profileKeyCiphertext, userId) {
+        return new ProfileKey_1.default(Native.GroupSecretParams_DecryptProfileKey(this.groupSecretParams.getContents(), profileKeyCiphertext.getContents(), userId.getServiceIdFixedWidthBinary()));
     }
     encryptBlob(plaintext) {
         const random = (0, crypto_1.randomBytes)(Constants_1.RANDOM_LENGTH);

package/dist/zkgroup/profiles/ClientZkProfileOperations.d.ts

@@ -6,12 +6,12 @@ import ExpiringProfileKeyCredentialResponse from './ExpiringProfileKeyCredential
 import ProfileKey from './ProfileKey';
 import ProfileKeyCredentialPresentation from './ProfileKeyCredentialPresentation';
 import ProfileKeyCredentialRequestContext from './ProfileKeyCredentialRequestContext';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci } from '../../Address';
 export default class ClientZkProfileOperations {
     serverPublicParams: ServerPublicParams;
     constructor(serverPublicParams: ServerPublicParams);
-    createProfileKeyCredentialRequestContext(uuid: UUIDType, profileKey: ProfileKey): ProfileKeyCredentialRequestContext;
-    createProfileKeyCredentialRequestContextWithRandom(random: Buffer, uuid: UUIDType, profileKey: ProfileKey): ProfileKeyCredentialRequestContext;
+    createProfileKeyCredentialRequestContext(userId: Aci, profileKey: ProfileKey): ProfileKeyCredentialRequestContext;
+    createProfileKeyCredentialRequestContextWithRandom(random: Buffer, userId: Aci, profileKey: ProfileKey): ProfileKeyCredentialRequestContext;
     receiveExpiringProfileKeyCredential(profileKeyCredentialRequestContext: ProfileKeyCredentialRequestContext, profileKeyCredentialResponse: ExpiringProfileKeyCredentialResponse, now?: Date): ExpiringProfileKeyCredential;
     createExpiringProfileKeyCredentialPresentation(groupSecretParams: GroupSecretParams, profileKeyCredential: ExpiringProfileKeyCredential): ProfileKeyCredentialPresentation;
     createExpiringProfileKeyCredentialPresentationWithRandom(random: Buffer, groupSecretParams: GroupSecretParams, profileKeyCredential: ExpiringProfileKeyCredential): ProfileKeyCredentialPresentation;

package/dist/zkgroup/profiles/ClientZkProfileOperations.js

@@ -10,17 +10,16 @@ const Native = require("../../../Native");
 const ExpiringProfileKeyCredential_1 = require("./ExpiringProfileKeyCredential");
 const ProfileKeyCredentialPresentation_1 = require("./ProfileKeyCredentialPresentation");
 const ProfileKeyCredentialRequestContext_1 = require("./ProfileKeyCredentialRequestContext");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
 class ClientZkProfileOperations {
     constructor(serverPublicParams) {
         this.serverPublicParams = serverPublicParams;
     }
-    createProfileKeyCredentialRequestContext(uuid, profileKey) {
+    createProfileKeyCredentialRequestContext(userId, profileKey) {
         const random = (0, crypto_1.randomBytes)(Constants_1.RANDOM_LENGTH);
-        return this.createProfileKeyCredentialRequestContextWithRandom(random, uuid, profileKey);
+        return this.createProfileKeyCredentialRequestContextWithRandom(random, userId, profileKey);
     }
-    createProfileKeyCredentialRequestContextWithRandom(random, uuid, profileKey) {
-        return new ProfileKeyCredentialRequestContext_1.default(Native.ServerPublicParams_CreateProfileKeyCredentialRequestContextDeterministic(this.serverPublicParams.getContents(), random, (0, UUIDUtil_1.fromUUID)(uuid), profileKey.getContents()));
+    createProfileKeyCredentialRequestContextWithRandom(random, userId, profileKey) {
+        return new ProfileKeyCredentialRequestContext_1.default(Native.ServerPublicParams_CreateProfileKeyCredentialRequestContextDeterministic(this.serverPublicParams.getContents(), random, userId.getServiceIdFixedWidthBinary(), profileKey.getContents()));
     }
     receiveExpiringProfileKeyCredential(profileKeyCredentialRequestContext, profileKeyCredentialResponse, now = new Date()) {
         return new ExpiringProfileKeyCredential_1.default(Native.ServerPublicParams_ReceiveExpiringProfileKeyCredential(this.serverPublicParams.getContents(), profileKeyCredentialRequestContext.getContents(), profileKeyCredentialResponse.getContents(), Math.floor(now.getTime() / 1000)));

package/dist/zkgroup/profiles/ProfileKey.d.ts

@@ -2,12 +2,12 @@
 import ByteArray from '../internal/ByteArray';
 import ProfileKeyCommitment from './ProfileKeyCommitment';
 import ProfileKeyVersion from './ProfileKeyVersion';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci } from '../../Address';
 export default class ProfileKey extends ByteArray {
     private readonly __type?;
     static SIZE: number;
     constructor(contents: Buffer);
-    getCommitment(uuid: UUIDType): ProfileKeyCommitment;
-    getProfileKeyVersion(uuid: UUIDType): ProfileKeyVersion;
+    getCommitment(userId: Aci): ProfileKeyCommitment;
+    getProfileKeyVersion(userId: Aci): ProfileKeyVersion;
     deriveAccessKey(): Buffer;
 }

package/dist/zkgroup/profiles/ProfileKey.js

@@ -8,16 +8,15 @@ const ByteArray_1 = require("../internal/ByteArray");
 const Native = require("../../../Native");
 const ProfileKeyCommitment_1 = require("./ProfileKeyCommitment");
 const ProfileKeyVersion_1 = require("./ProfileKeyVersion");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
 class ProfileKey extends ByteArray_1.default {
     constructor(contents) {
         super(contents, ProfileKey.checkLength(ProfileKey.SIZE));
     }
-    getCommitment(uuid) {
-        return new ProfileKeyCommitment_1.default(Native.ProfileKey_GetCommitment(this.contents, (0, UUIDUtil_1.fromUUID)(uuid)));
+    getCommitment(userId) {
+        return new ProfileKeyCommitment_1.default(Native.ProfileKey_GetCommitment(this.contents, userId.getServiceIdFixedWidthBinary()));
     }
-    getProfileKeyVersion(uuid) {
-        return new ProfileKeyVersion_1.default(Native.ProfileKey_GetProfileKeyVersion(this.contents, (0, UUIDUtil_1.fromUUID)(uuid)));
+    getProfileKeyVersion(userId) {
+        return new ProfileKeyVersion_1.default(Native.ProfileKey_GetProfileKeyVersion(this.contents, userId.getServiceIdFixedWidthBinary()));
     }
     deriveAccessKey() {
         return Native.ProfileKey_DeriveAccessKey(this.contents);

package/dist/zkgroup/profiles/ServerZkProfileOperations.d.ts

@@ -5,11 +5,11 @@ import ExpiringProfileKeyCredentialResponse from './ExpiringProfileKeyCredential
 import ProfileKeyCommitment from './ProfileKeyCommitment';
 import ProfileKeyCredentialPresentation from './ProfileKeyCredentialPresentation';
 import ProfileKeyCredentialRequest from './ProfileKeyCredentialRequest';
-import { UUIDType } from '../internal/UUIDUtil';
+import { Aci } from '../../Address';
 export default class ServerZkProfileOperations {
     serverSecretParams: ServerSecretParams;
     constructor(serverSecretParams: ServerSecretParams);
-    issueExpiringProfileKeyCredential(profileKeyCredentialRequest: ProfileKeyCredentialRequest, uuid: UUIDType, profileKeyCommitment: ProfileKeyCommitment, expirationInSeconds: number): ExpiringProfileKeyCredentialResponse;
-    issueExpiringProfileKeyCredentialWithRandom(random: Buffer, profileKeyCredentialRequest: ProfileKeyCredentialRequest, uuid: UUIDType, profileKeyCommitment: ProfileKeyCommitment, expirationInSeconds: number): ExpiringProfileKeyCredentialResponse;
+    issueExpiringProfileKeyCredential(profileKeyCredentialRequest: ProfileKeyCredentialRequest, userId: Aci, profileKeyCommitment: ProfileKeyCommitment, expirationInSeconds: number): ExpiringProfileKeyCredentialResponse;
+    issueExpiringProfileKeyCredentialWithRandom(random: Buffer, profileKeyCredentialRequest: ProfileKeyCredentialRequest, userId: Aci, profileKeyCommitment: ProfileKeyCommitment, expirationInSeconds: number): ExpiringProfileKeyCredentialResponse;
     verifyProfileKeyCredentialPresentation(groupPublicParams: GroupPublicParams, profileKeyCredentialPresentation: ProfileKeyCredentialPresentation, now?: Date): void;
 }

package/dist/zkgroup/profiles/ServerZkProfileOperations.js

@@ -8,17 +8,16 @@ const crypto_1 = require("crypto");
 const Native = require("../../../Native");
 const Constants_1 = require("../internal/Constants");
 const ExpiringProfileKeyCredentialResponse_1 = require("./ExpiringProfileKeyCredentialResponse");
-const UUIDUtil_1 = require("../internal/UUIDUtil");
 class ServerZkProfileOperations {
     constructor(serverSecretParams) {
         this.serverSecretParams = serverSecretParams;
     }
-    issueExpiringProfileKeyCredential(profileKeyCredentialRequest, uuid, profileKeyCommitment, expirationInSeconds) {
+    issueExpiringProfileKeyCredential(profileKeyCredentialRequest, userId, profileKeyCommitment, expirationInSeconds) {
         const random = (0, crypto_1.randomBytes)(Constants_1.RANDOM_LENGTH);
-        return this.issueExpiringProfileKeyCredentialWithRandom(random, profileKeyCredentialRequest, uuid, profileKeyCommitment, expirationInSeconds);
+        return this.issueExpiringProfileKeyCredentialWithRandom(random, profileKeyCredentialRequest, userId, profileKeyCommitment, expirationInSeconds);
     }
-    issueExpiringProfileKeyCredentialWithRandom(random, profileKeyCredentialRequest, uuid, profileKeyCommitment, expirationInSeconds) {
-        return new ExpiringProfileKeyCredentialResponse_1.default(Native.ServerSecretParams_IssueExpiringProfileKeyCredentialDeterministic(this.serverSecretParams.getContents(), random, profileKeyCredentialRequest.getContents(), (0, UUIDUtil_1.fromUUID)(uuid), profileKeyCommitment.getContents(), expirationInSeconds));
+    issueExpiringProfileKeyCredentialWithRandom(random, profileKeyCredentialRequest, userId, profileKeyCommitment, expirationInSeconds) {
+        return new ExpiringProfileKeyCredentialResponse_1.default(Native.ServerSecretParams_IssueExpiringProfileKeyCredentialDeterministic(this.serverSecretParams.getContents(), random, profileKeyCredentialRequest.getContents(), userId.getServiceIdFixedWidthBinary(), profileKeyCommitment.getContents(), expirationInSeconds));
     }
     verifyProfileKeyCredentialPresentation(groupPublicParams, profileKeyCredentialPresentation, now = new Date()) {
         Native.ServerSecretParams_VerifyProfileKeyCredentialPresentation(this.serverSecretParams.getContents(), groupPublicParams.getContents(), profileKeyCredentialPresentation.getContents(), Math.floor(now.getTime() / 1000));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalapp/libsignal-client",
-  "version": "0.29.0",
+  "version": "0.30.0",
   "license": "AGPL-3.0-only",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/dist/zkgroup/internal/UUIDUtil.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="node" />
-export type UUIDType = string;
-export declare function toUUID(array: Buffer): UUIDType;
-export declare function fromUUID(uuid: UUIDType): Buffer;

package/dist/zkgroup/internal/UUIDUtil.js

@@ -1,23 +0,0 @@
-"use strict";
-//
-// Copyright 2020-2021 Signal Messenger, LLC.
-// SPDX-License-Identifier: AGPL-3.0-only
-//
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.fromUUID = exports.toUUID = void 0;
-function toUUID(array) {
-    const hex = array.toString('hex');
-    return `${hex.substring(0, 8)}-${hex.substring(8, 12)}-${hex.substring(12, 16)}-${hex.substring(16, 20)}-${hex.substring(20)}`;
-}
-exports.toUUID = toUUID;
-function fromUUID(uuid) {
-    let i = 0;
-    const array = Buffer.alloc(16);
-    uuid.replace(/[0-9A-F]{2}/gi, (oct) => {
-        array[i++] = parseInt(oct, 16);
-        return '';
-    });
-    return array;
-}
-exports.fromUUID = fromUUID;
-//# sourceMappingURL=UUIDUtil.js.map