Updated the Infura and partner IPFS access

- Required in the latest UD library

Signed-off-by: kcw-grunt <[email protected]>

Author: kcw-grunt

.gitignore

@@ -30,14 +30,7 @@ Package.resolved
 
 # Add this line if you want to avoid checking in Xcode SPM integration.
 .swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata
-
-# CocoaPods
-#
-# We recommend against adding the Pods directory to your .gitignore. However
-# you should judge for yourself, the pros and cons are mentioned at:
-# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
-
-Pods/ 
+ 
 
 # SwiftFormat
 BuildTools/.build
@@ -47,3 +40,4 @@ BuildTools/.swiftpm
 # Sensitive Partner API 
 Modules/litewallet-partner-api-ios
 litewallet-partner-api-ios
+

loafwallet.xcodeproj/project.pbxproj

@@ -282,6 +282,7 @@
 		C36DBF6128F1988900FBCB24 /* LocalWebViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C36DBF6028F1988900FBCB24 /* LocalWebViewModel.swift */; };
 		C39443F9269DDAD3002703E9 /* LitewalletIconView.swift in Sources */ = {isa = PBXBuildFile; fileRef = C39443F8269DDAD3002703E9 /* LitewalletIconView.swift */; };
 		C39A71472608CB4300E7B640 /* EmptyTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C39A71462608CB4300E7B640 /* EmptyTableViewCell.swift */; };
+		C3A01CBD2B069A5300CC156B /* partner-keys.plist in Resources */ = {isa = PBXBuildFile; fileRef = C3A01CBC2B069A5300CC156B /* partner-keys.plist */; };
 		C3A4647D259A646A00D74D81 /* DataValidation.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3A4647C259A646A00D74D81 /* DataValidation.swift */; };
 		C3B7C3B9255EABBF00E98A64 /* SupportSafariViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B7C3B8255EABBF00E98A64 /* SupportSafariViewModel.swift */; };
 		C3B7C3EE255FF59200E98A64 /* ConstantsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = C3B7C3ED255FF59200E98A64 /* ConstantsTests.swift */; };
@@ -1440,6 +1441,7 @@
 		C36DBF6028F1988900FBCB24 /* LocalWebViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocalWebViewModel.swift; sourceTree = "<group>"; };
 		C39443F8269DDAD3002703E9 /* LitewalletIconView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LitewalletIconView.swift; sourceTree = "<group>"; };
 		C39A71462608CB4300E7B640 /* EmptyTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EmptyTableViewCell.swift; sourceTree = "<group>"; };
+		C3A01CBC2B069A5300CC156B /* partner-keys.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "partner-keys.plist"; path = "../../../../Desktop/partner-keys.plist"; sourceTree = "<group>"; };
 		C3A4647C259A646A00D74D81 /* DataValidation.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DataValidation.swift; sourceTree = "<group>"; };
 		C3ACF2DE25DED601008671D4 /* CHANGELOG.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = CHANGELOG.md; sourceTree = "<group>"; };
 		C3B7C3B8255EABBF00E98A64 /* SupportSafariViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SupportSafariViewModel.swift; sourceTree = "<group>"; };
@@ -2932,6 +2934,7 @@
 		75A2A7921DA5934300A983D8 /* loafwallet */ = {
 			isa = PBXGroup;
 			children = (
+				C3A01CBC2B069A5300CC156B /* partner-keys.plist */,
 				375DDB3D2697C253005E2B27 /* GoogleService-Info.plist */,
 				C3188E2526431E750008ADD1 /* Debug-GoogleService-Info.plist */,
 				C35ABD07257404C6002BB9BB /* SwiftUI+UIKit */,
@@ -3868,6 +3871,7 @@
 				24D5F25F22599C0B00225462 /* BarlowSemiCondensed-Regular.ttf in Resources */,
 				24DFCE6823B89CDE001F17F8 /* Settings.storyboard in Resources */,
 				24393B5C23C259400075218D /* Phrase.storyboard in Resources */,
+				C3A01CBD2B069A5300CC156B /* partner-keys.plist in Resources */,
 				75A2A79B1DA5934300A983D8 /* Assets.xcassets in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

loafwallet/PartnerData.swift

@@ -3,7 +3,7 @@ import UIKit
 
 enum PartnerName {
 	case unstop
-	case changeNow
+	case infura
 }
 
 struct Partner {
@@ -20,4 +20,59 @@ struct Partner {
 
 		return [bitrefill, moonpay, simplex]
 	}
+
+	/// Returns Partner Key
+	/// - Parameter name: Enum for the different partners
+	/// - Returns: Key string
+	static func partnerKeyPath(name: PartnerName) -> String {
+		/// Switch the config file based on the environment
+		var filePath: String
+		#if Release
+
+			// Loads the release Partner Keys config file.
+			guard let releasePath = Bundle.main.path(forResource: "partner-keys",
+			                                         ofType: "plist")
+			else {
+				return "ERROR: FILE-NOT-FOUND"
+			}
+			filePath = releasePath
+		#else
+
+			// Loads the debug Partner Keys config file.
+			guard let debugPath = Bundle.main.path(forResource: "debug-partner-keys",
+			                                       ofType: "plist")
+			else {
+				return "ERROR: FILE-NOT-FOUND"
+			}
+
+			filePath = debugPath
+
+		#endif
+
+		switch name {
+		case .infura:
+
+			if let dictionary = NSDictionary(contentsOfFile: filePath) as? [String: AnyObject],
+			   let key = dictionary["infura-api"] as? String
+			{
+				return "https://mainnet.infura.io/v3/" + key
+			} else {
+				let errorDescription = "ERROR-INFURA_KEY"
+				LWAnalytics.logEventWithParameters(itemName: ._20200112_ERR, properties: ["error": errorDescription])
+				return errorDescription
+			}
+
+		case .unstop:
+
+			if let dictionary = NSDictionary(contentsOfFile: filePath) as? [String: AnyObject],
+			   let key = dictionary["change-now-api"] as? String
+			{
+				return key
+			} else {
+				let errorDescription = "ERROR-CHANGENOW_KEY"
+				LWAnalytics.logEventWithParameters(itemName: ._20200112_ERR, properties: ["error": errorDescription])
+				return errorDescription
+			}
+		}
+	}
 }

loafwallet/UnstoppableDomainViewModel.swift

@@ -74,7 +74,7 @@ class UnstoppableDomainViewModel: ObservableObject {
 		// Otherwise, we may never get in the callback relative to UDR v4.0.0
 		let group = DispatchGroup()
 
-		guard let resolution = try? Resolution()
+		guard let resolution = try? Resolution(apiKey: Partner.partnerKeyPath(name: .infura))
 		else {
 			print("Init of Resolution instance with default parameters failed...")
 			return
@@ -86,7 +86,7 @@ class UnstoppableDomainViewModel: ObservableObject {
 			switch result {
 			case let .success(returnValue):
 
-				let timestamp: String = dateFormatter?.string(from: Date()) ?? ""
+				let timestamp: String = self.dateFormatter?.string(from: Date()) ?? ""
 
 				LWAnalytics.logEventWithParameters(itemName:
 					CustomEvent._20201121_DRIA,
@@ -101,7 +101,7 @@ class UnstoppableDomainViewModel: ObservableObject {
 
 			case let .failure(error):
 				let errorMessage = DomainResolutionFailure().messageWith(error: error)
-				let timestamp: String = dateFormatter?.string(from: Date()) ?? ""
+				let timestamp: String = self.dateFormatter?.string(from: Date()) ?? ""
 
 				LWAnalytics.logEventWithParameters(itemName:
 					CustomEvent._20201121_FRIA,