Merge branch 'release/1.2'

Author: RealBonus

Adamant.xcodeproj/project.pbxproj

@@ -37,6 +37,39 @@
 				</dict>
 			</dict>
 		</dict>
+		<key>NativeCoreTests</key>
+		<dict>
+			<key>testPerformanceHashForPassphrase()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>1.179</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+			<key>testPerformanceKeypairForPassphrase()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>1.1729</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+			<key>testPerformanceSignTransaction()</key>
+			<dict>
+				<key>com.apple.XCTPerformanceMetric_WallClockTime</key>
+				<dict>
+					<key>baselineAverage</key>
+					<real>0.0018654</real>
+					<key>baselineIntegrationDisplayName</key>
+					<string>Local Baseline</string>
+				</dict>
+			</dict>
+		</dict>
 	</dict>
 </dict>
 </plist>

Adamant.xcodeproj/xcshareddata/xcbaselines/E9EC344320066D4A00C0E546.xcbaseline/2F5A2BDA-A1C8-4C51-B0EB-6802181570B4.plist

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1010"
    version = "2.0">
    <BuildAction
       parallelizeBuildables = "YES"

Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Dev.BackgroundFetch.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Dev.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Release.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0940"
+   LastUpgradeVersion = "1010"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Test.xcscheme

@@ -36,15 +36,20 @@ extension StoreKey {
 
 // MARK: - Resources
 struct AdamantResources {
-	static let jsCore = Bundle.main.url(forResource: "adamant-core", withExtension: "js")!
-	static let coreDataModel = Bundle.main.url(forResource: "ChatModels", withExtension: "momd")!
+	static let coreDataModel = Bundle.main.url(forResource: "Adamant", withExtension: "momd")!
 
 	static let nodes: [Node] = [
-		Node(scheme: .https, host: "endless.adamant.im", port: nil),
-		Node(scheme: .https, host: "clown.adamant.im", port: nil),
-		Node(scheme: .https, host: "lake.adamant.im", port: nil),
-		Node(scheme: .http, host: "80.211.177.181", port: nil)
+        Node(scheme: .https, host: "endless.adamant.im", port: nil),
+        Node(scheme: .https, host: "clown.adamant.im", port: nil),
+        Node(scheme: .https, host: "lake.adamant.im", port: nil),
+//		Node(scheme: .http, host: "80.211.177.181", port: nil), // Bugged one
+//      Node(scheme: .http, host: "163.172.132.38", port: 36667) // Testnet
 	]
+    
+    static let ethServers = [
+        "https://ethnode1.adamant.im/"
+//        "https://ropsten.infura.io/"  // test network
+    ]
 
 	// Addresses
 	static let supportEmail = "ios@adamant.im"
@@ -61,6 +66,11 @@ struct AdamantResources {
 
 		private init() {}
 	}
+    
+    // Explorers
+    static let adamantExplorerAddress = "https://explorer.adamant.im/tx/"
+    static let ethereumExplorerAddress = "https://etherscan.io/tx/"
+//    static let ethereumExplorerAddress = "https://ropsten.etherscan.io/tx/" // Testnet
 
 	private init() {}
 }
@@ -81,7 +91,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 	// MARK: - Lifecycle
 
-	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
+	func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
 		// MARK: 1. Initiating Swinject
 		container = Container()
 		container.registerAdamantServices()
@@ -200,7 +210,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 		}
 
 		// MARK: 7. Welcome messages
-		NotificationCenter.default.addObserver(forName: Notification.Name.AdamantChatsProvider.initialSyncFinished, object: nil, queue: OperationQueue.main, using: handleWelcomeMessages)
+		NotificationCenter.default.addObserver(forName: Notification.Name.AdamantChatsProvider.initiallySyncedChanged, object: nil, queue: OperationQueue.main, using: handleWelcomeMessages)
 
 		return true
 	}
@@ -322,7 +332,7 @@ extension AppDelegate {
 		container.registerAdamantBackgroundFetchServices()
 
 		guard let notificationsService = container.resolve(NotificationsService.self) else {
-				UIApplication.shared.setMinimumBackgroundFetchInterval(UIApplicationBackgroundFetchIntervalNever)
+				UIApplication.shared.setMinimumBackgroundFetchInterval(UIApplication.backgroundFetchIntervalNever)
 				completionHandler(.failed)
 				return
 		}
@@ -378,6 +388,10 @@ extension AppDelegate {
 // MARK: - Welcome messages
 extension AppDelegate {
 	private func handleWelcomeMessages(notification: Notification) {
+        guard let synced = notification.userInfo?[AdamantUserInfoKey.ChatProvider.initiallySynced] as? Bool, synced else {
+            return
+        }
+        
 		guard let stack = container.resolve(CoreDataStack.self), let chatProvider = container.resolve(ChatsProvider.self) else {
 			fatalError("Whoa...")
 		}
@@ -397,7 +411,14 @@ extension AppDelegate {
 									  date: Date.adamantNullDate,
 									  unread: unread,
 									  silent: welcome.silentNotification,
-									  completion: { _ in })
+                                      showsChatroom: true,
+                                      completion: { result in
+                                        guard case let .failure(error) = result else {
+                                            return
+                                        }
+                                        
+                                        print("ERROR showing welcome message: \(error.message)")
+            })
 		}
 
 		if let ico = AdamantContacts.adamantIco.messages["chats.ico_message"] {
@@ -406,7 +427,14 @@ extension AppDelegate {
 									  date: Date.adamantNullDate,
 									  unread: unread,
 									  silent: ico.silentNotification,
-									  completion: { _ in })
+                                      showsChatroom: true,
+									  completion: { result in
+                                        guard case let .failure(error) = result else {
+                                            return
+                                        }
+                                        
+                                        print("ERROR showing welcome message: \(error.message)")
+            })
 		}
 	}
 }

Adamant/AppDelegate.swift

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Attachment.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Attachment@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "Attachment@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Buttons/Attachment.imageset/Attachment.png

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "SendMoney.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "SendMoney@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "SendMoney@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Buttons/Attachment.imageset/Attachment@2x.png

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "adamant_token.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "adamant_token@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "adamant_token@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Adamant/Assets/Assets.xcassets/Buttons/Attachment.imageset/Attachment@3x.png

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "eth_token.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "eth_token@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "eth_token@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Adamant/Assets/Assets.xcassets/Buttons/Attachment.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "wallet_lsk.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "wallet_lsk@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "wallet_lsk@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Adamant/Assets/Assets.xcassets/Buttons/SendMoney.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "row_Notifications.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "row_Notifications@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "row_Notifications@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Buttons/SendMoney.imageset/SendMoney.png

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "row_QR.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "row_QR@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "row_QR@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Buttons/SendMoney.imageset/SendMoney@2x.png

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "row_faceid.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "row_faceid@2x.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "row_faceid@3x.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}