Merge branch 'develop' into feature/migrate_to_native_core

# Conflicts:
#	Adamant.xcodeproj/project.pbxproj
#	Adamant/Helpers/Decimal+adamant.swift
#	Podfile
#	Podfile.lock

.gitattributes

@@ -0,0 +1 @@
+Adamant/Assets/adamant-core.js linguist-vendored

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 = "2.0">
    <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

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

Adamant/AppDelegate.swift

@@ -42,8 +42,14 @@ struct AdamantResources {
 		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: .http, host: "80.211.177.181", port: nil), // Bugged one
+//		Node(scheme: .http, host: "163.172.183.198", port: nil) // Testnet
 	]
+
+    static let ethServers = [
+//        "https://ethnode1.adamant.im/"
+        "https://ropsten.infura.io/"  // test network
+    ]
 
 	// Addresses
 	static let supportEmail = "[email protected]"
@@ -60,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() {}
 }
@@ -71,7 +82,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 	var window: UIWindow?
 	var repeater: RepeaterService!
 	var container: Container!
-	var backgroundTaskID: UIBackgroundTaskIdentifier = UIBackgroundTaskInvalid
 
 	// MARK: Dependencies
 	var accountService: AccountService!
@@ -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()
@@ -213,16 +223,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
 	func applicationDidEnterBackground(_ application: UIApplication) {
 		repeater.pauseAll()
-
-		// MARK: Save KVS data
-		backgroundTaskID = UIApplication.shared.beginBackgroundTask { [unowned self] in
-			UIApplication.shared.endBackgroundTask(self.backgroundTaskID)
-			self.backgroundTaskID = UIBackgroundTaskInvalid
-		}
-
 		addressBookService.saveIfNeeded()
-		UIApplication.shared.endBackgroundTask(backgroundTaskID)
-		self.backgroundTaskID = UIBackgroundTaskInvalid
 	}
 
 	// MARK: Notifications
@@ -331,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
 		}

Adamant/Assets/Assets.xcassets/Icons/adamant_token.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/Icons/attachment.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/Icons/eth_token.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/Icons/wallet_lsk.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/Swipe actions/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Adamant/Assets/Assets.xcassets/Swipe actions/swipe_mark-as-read.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/Swipe actions/swipe_more.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/TransactionStatus/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Adamant/Assets/Assets.xcassets/TransactionStatus/status_failed.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/TransactionStatus/status_pending.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/TransactionStatus/status_success.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/TransactionStatus/status_updating.imageset/Contents.json

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