From 7baec015aaa23a11dad96dbdacdce814a410b448 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 28 Apr 2020 09:38:26 -0300
Subject: [PATCH] Update to ZKGroup v0.7.0.

---
 Podfile.lock                              | 8 ++++----
 Pods                                      | 2 +-
 SignalMessaging/groups/GroupsV2Impl.swift | 2 +-
 SignalServiceKit/src/TSConstants.swift    | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Podfile.lock b/Podfile.lock
index 4a2f051421..f2b611f660 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -222,8 +222,8 @@ PODS:
   - YYImage/Core (1.0.4)
   - YYImage/WebP (1.0.4):
     - YYImage/Core
-  - ZKGroup (0.6.0)
-  - ZKGroup/Tests (0.6.0)
+  - ZKGroup (0.7.0)
+  - ZKGroup/Tests (0.7.0)
   - ZXingObjC (3.6.5):
     - ZXingObjC/All (= 3.6.5)
   - ZXingObjC/All (3.6.5)
@@ -361,7 +361,7 @@ CHECKOUT OPTIONS:
     :commit: e43ab163b2dcb4c817339c819b07dac545f05fea
     :git: https://github.com/signalapp/YapDatabase.git
   ZKGroup:
-    :commit: d3b36dbf7d08d922b3081818883945fef9cc2e3d
+    :commit: 78e7b2e081e2b44b7451a6b156c02ee518ba310b
     :git: https://github.com/signalapp/signal-zkgroup-swift
   ZXingObjC:
     :commit: fce3786177fd7032c62b230df8beeb206722d38e
@@ -395,7 +395,7 @@ SPEC CHECKSUMS:
   SwiftProtobuf: 4fd9645e69b72cbae6ec8da5be0cdd20ca6565dd
   YapDatabase: b418a4baa6906e8028748938f9159807fd039af4
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
-  ZKGroup: 30fc5406dba3aef20d36d9a38a86c1d775b6d64d
+  ZKGroup: 126835c7fe565afb02d457d2f18cee14e72b1090
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
 PODFILE CHECKSUM: 6ac96ed037cb6453c2c66281ff1ffbbfefe565dd
diff --git a/Pods b/Pods
index b21e0db956..2bfa1ee65c 160000
--- a/Pods
+++ b/Pods
@@ -1 +1 @@
-Subproject commit b21e0db956a811df618a10c64aa1b1540d6086e3
+Subproject commit 2bfa1ee65c1c6d8e9082aaafd70b339dc09fbd87
diff --git a/SignalMessaging/groups/GroupsV2Impl.swift b/SignalMessaging/groups/GroupsV2Impl.swift
index 70276675f0..b95f1f2b51 100644
--- a/SignalMessaging/groups/GroupsV2Impl.swift
+++ b/SignalMessaging/groups/GroupsV2Impl.swift
@@ -92,7 +92,7 @@ public class GroupsV2Impl: NSObject, GroupsV2Swift {
         // zkgroup library.  Instead it's a counter we should bump
         // every time there are breaking changes zkgroup library, e.g.
         // changes to data formats.
-        let zkgroupVersionCounter: Int = 2
+        let zkgroupVersionCounter: Int = 3
 
         let shouldReset = databaseStorage.read { transaction -> Bool in
             guard serverPublicParamsBase64 == self.serviceStore.getString(lastServerPublicParamsKey, transaction: transaction) else {
diff --git a/SignalServiceKit/src/TSConstants.swift b/SignalServiceKit/src/TSConstants.swift
index 74edbb4e86..9d2e2f2d4e 100644
--- a/SignalServiceKit/src/TSConstants.swift
+++ b/SignalServiceKit/src/TSConstants.swift
@@ -214,5 +214,5 @@ private class TSConstantsStaging: TSConstantsProtocol {
 
     // We need to discard all profile key credentials if these values ever change.
     // See: GroupsV2Impl.verifyServerPublicParams(...)
-    public let serverPublicParamsBase64 = "5Eng41NE+ClLn5MDjfb8ahw/SgmYPXw6wafMsH5hJVeSY3+Hlqz+DCbtcv4y9HHQwP0VA131bvqnBp7psSJZLlpANq5RA7NLMvE7ox17oiCvEKnHKoccrxqLDYNfbsgGmNYOaedYZ+/mTzsx+ndnQmOnGerWYCzeKJiRTTBD5TRWb/rqCsmb0RnqkWTIqxYUR4tLgIKkS1MfduVJmAYPGQ=="
+    public let serverPublicParamsBase64 = "ABSY21VckQcbSXVNCGRYJcfWHiAMZmpTtTELcDmxgdFbtp/bWsSxZdMKzfCp8rvIs8ocCU3B37fT3r4Mi5qAemeGeR2X+/YmOGR5ofui7tD5mDQfstAI9i+4WpMtIe8KC3wU5w3Inq3uNWVmoGtpKndsNfwJrCg0Hd9zmObhypUnSkfYn2ooMOOnBpfdanRtrvetZUayDMSC5iSRcXKpdls=="
 }