From 9190676f623e3627c410a2df61606365210cf8b6 Mon Sep 17 00:00:00 2001
From: metalurgical <97008724+metalurgical@users.noreply.github.com>
Date: Sun, 6 Oct 2024 01:17:20 +0200
Subject: [PATCH] refactor: update to latest torusutils

---
 CustomAuth.podspec                                     |  4 ++--
 Package.resolved                                       | 10 +++++-----
 Package.swift                                          |  2 +-
 Sources/CustomAuth/CustomAuthArgs.swift                |  4 ++--
 .../Handlers/Protocol/CreateHandlerParams.swift        |  4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CustomAuth.podspec b/CustomAuth.podspec
index 821ce54..f951509 100644
--- a/CustomAuth.podspec
+++ b/CustomAuth.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |spec|
   spec.name         = "CustomAuth"
-  spec.version      = "11.0.0"
+  spec.version      = "12.0.0"
   spec.platform = :ios, "13.0"
   spec.summary      = "Swift SDK that allows applications to directly interact with the Torus Network, similar to how Torus Wallet does."
   spec.homepage     = "https://github.com/torusresearch/customauth-swift-sdk"
@@ -10,6 +10,6 @@ Pod::Spec.new do |spec|
   spec.module_name = "CustomAuth"
   spec.source       = { :git => "https://github.com/torusresearch/customauth-swift-sdk.git", :tag => spec.version }
   spec.source_files = "Sources/CustomAuth/*.{swift}","Sources/CustomAuth/**/*.{swift}"
-  spec.dependency 'Torus-utils', '~> 9.0.1'
+  spec.dependency 'Torus-utils', '~> 10.0.0'
   spec.dependency 'JWTDecode', '~> 3.1.0'
 end
diff --git a/Package.resolved b/Package.resolved
index 8997069..f326077 100644
--- a/Package.resolved
+++ b/Package.resolved
@@ -21,10 +21,10 @@
     {
       "identity" : "fetch-node-details-swift",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/torusresearch/fetch-node-details-swift.git",
+      "location" : "https://github.com/torusresearch/fetch-node-details-swift",
       "state" : {
-        "revision" : "4bd96c33ba8d02d9e27190c5c7cedf09cfdfd656",
-        "version" : "6.0.3"
+        "branch" : "encapsulate_torusnetwork",
+        "revision" : "2fcd108ea89a48f092a955017977a299129d20c7"
       }
     },
     {
@@ -59,8 +59,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/torusresearch/torus-utils-swift.git",
       "state" : {
-        "revision" : "eda55b8537a600e657d19d4c452c0a36f217883c",
-        "version" : "9.0.1"
+        "branch" : "encapsulate_torusnetwork",
+        "revision" : "ef50d543ee773ebcde6ac386ac831e9ccaceef8f"
       }
     }
   ],
diff --git a/Package.swift b/Package.swift
index 1269605..44c1036 100644
--- a/Package.swift
+++ b/Package.swift
@@ -14,7 +14,7 @@ let package = Package(
             targets: ["CustomAuth"])
     ],
     dependencies: [
-        .package(url: "https://github.com/torusresearch/torus-utils-swift.git", from: "9.0.1"),
+        .package(url: "https://github.com/torusresearch/torus-utils-swift.git", branch: "encapsulate_torusnetwork"),
         .package(url: "https://github.com/auth0/JWTDecode.swift.git", from: "3.1.0"),
         // NB: jwt-kit may only be a test dependency or it will break cocoapods support
         .package(url: "https://github.com/vapor/jwt-kit.git", from: "4.13.0"),
diff --git a/Sources/CustomAuth/CustomAuthArgs.swift b/Sources/CustomAuth/CustomAuthArgs.swift
index 310b054..2128b94 100644
--- a/Sources/CustomAuth/CustomAuthArgs.swift
+++ b/Sources/CustomAuth/CustomAuthArgs.swift
@@ -4,7 +4,7 @@ import Foundation
 public class CustomAuthArgs {
     public let urlScheme: String
     public let metadataUrl: String
-    public let network: TorusNetwork
+    public let network: Web3AuthNetwork
     public let enableLogging: Bool
     public let enableOneKey: Bool
     public let apiKey: String
@@ -15,7 +15,7 @@ public class CustomAuthArgs {
     public let useDkg: Bool // TODO: Implement usage of this
 
     public init(urlScheme: String,
-                network: TorusNetwork,
+                network: Web3AuthNetwork,
                 metadataUrl: String = "https://metadata.tor.us",
                 enableLogging: Bool = false,
                 apiKey: String = "torus-default",
diff --git a/Sources/CustomAuth/Handlers/Protocol/CreateHandlerParams.swift b/Sources/CustomAuth/Handlers/Protocol/CreateHandlerParams.swift
index b685675..2238657 100644
--- a/Sources/CustomAuth/Handlers/Protocol/CreateHandlerParams.swift
+++ b/Sources/CustomAuth/Handlers/Protocol/CreateHandlerParams.swift
@@ -9,10 +9,10 @@ internal class CreateHandlerParams {
     public let redirectURL: String
     public let jwtParams: Auth0ClientOptions?
     public let customState: TorusGenericContainer?
-    public let web3AuthNetwork: TorusNetwork
+    public let web3AuthNetwork: Web3AuthNetwork
     public let web3AuthClientId: String
 
-    public init(typeOfLogin: LoginType, verifier: String, clientId: String, urlScheme: String, redirectURL: String, jwtParams: Auth0ClientOptions? = nil, customState: TorusGenericContainer? = nil, web3AuthNetwork: TorusNetwork, web3AuthClientId: String) {
+    public init(typeOfLogin: LoginType, verifier: String, clientId: String, urlScheme: String, redirectURL: String, jwtParams: Auth0ClientOptions? = nil, customState: TorusGenericContainer? = nil, web3AuthNetwork: Web3AuthNetwork, web3AuthClientId: String) {
         self.typeOfLogin = typeOfLogin
         self.verifier = verifier
         self.clientId = clientId