fix: check for nil pubnonce for v2 user

torusresearch · Jul 16, 2024 · 6516d25 · 6516d25
1 parent 1fcc104
commit 6516d25
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Sources/TorusUtils/Helpers/NodeUtils.swift b/Sources/TorusUtils/Helpers/NodeUtils.swift
@@ -533,10 +533,14 @@ internal class NodeUtils {
             }
         } else {
             typeOfUser = .v2
-            let publicNonce = KeyUtils.getPublicKeyFromCoords(pubKeyX: thresholdNonceData!.pubNonce!.x, pubKeyY: thresholdNonceData!.pubNonce!.y)
             let oAuthPubKey = KeyUtils.getPublicKeyFromCoords(pubKeyX: oAuthPublicKeyX, pubKeyY: oAuthPublicKeyY)
-            finalPubKey = try KeyUtils.combinePublicKeys(keys: [oAuthPubKey, publicNonce])
-            pubNonce = PubNonce(x: thresholdNonceData!.pubNonce!.x, y: thresholdNonceData!.pubNonce!.y)
+            if thresholdNonceData!.pubNonce != nil {
+                let publicNonce = KeyUtils.getPublicKeyFromCoords(pubKeyX: thresholdNonceData!.pubNonce!.x, pubKeyY: thresholdNonceData!.pubNonce!.y)
+                finalPubKey = try KeyUtils.combinePublicKeys(keys: [oAuthPubKey, publicNonce])
+                pubNonce = PubNonce(x: thresholdNonceData!.pubNonce!.x, y: thresholdNonceData!.pubNonce!.y)
+            } else {
+                finalPubKey = oAuthPubKey
+            }
         }
 
         if finalPubKey == nil {
@@ -554,7 +558,7 @@ internal class NodeUtils {
             finalPrivKey = privateKeyWithNonce.magnitude.serialize().hexString.addLeading0sForLength64()
         }
 
-        var isUpgraded: Bool? = nil
+        var isUpgraded: Bool?
         if typeOfUser == .v2 {
             isUpgraded = metadataNonce == BigInt(0)
         }