Merge pull request #560 from Adamant-im/dev/trello.com/c/Jf4GpUjS

[trello.com/c/Jf4GpUjS] adamant-wallets update

Author: just-software-dev

Adamant.xcodeproj/project.pbxproj

@@ -2814,7 +2814,6 @@
 				629616F00016639A2AFC5FC7 /* [CP] Embed Pods Frameworks */,
 				E96D64E62295CD4700CA5587 /* Embed App Extensions */,
 				A5AC8E01262E0B030053A7E2 /* Embed Frameworks */,
-				418BBB14293752F800CAB719 /* Run Script - Load wallets */,
 				41079EBC28AE974300C32DAF /* Run Script - SwiftLint */,
 			);
 			buildRules = (
@@ -3182,26 +3181,6 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/SwiftLint/swiftlint\"\n";
 		};
-		418BBB14293752F800CAB719 /* Run Script - Load wallets */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 8;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"$(SRCROOT)/CommonKit/Scripts/UpdateWalletsScript.sh",
-				"$(SRCROOT)/CommonKit/Scripts/CoinsScript.rb",
-			);
-			name = "Run Script - Load wallets";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 1;
-			shellPath = /bin/sh;
-			shellScript = "$SCRIPT_INPUT_FILE_0 xcode\n$SCRIPT_INPUT_FILE_1 xcode\n\nrm -r $PWD/scripts\n";
-		};
 		47866E9AB7D201F2CED0064C /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Adamant/Helpers/NodeGroup+Constants.swift

@@ -26,7 +26,7 @@ extension NodeGroup {
         case .dash:
             return DashWalletService.healthCheckParameters.onScreenUpdateInterval
         case .ipfs:
-            return IPFSApiService.healthCheckParameters.onScreenUpdateInterval
+            return 10 // TODO: Fix the adamant-wallets script and the repo itself
         case .infoService:
             return AdmWalletService.healthCheckParameters.onScreenServiceUpdateInterval
         }
@@ -72,7 +72,7 @@ extension NodeGroup {
         case .dash:
             return DashWalletService.healthCheckParameters.threshold
         case .ipfs:
-            return IPFSApiService.healthCheckParameters.threshold
+            return IPFSApiService.healthCheckParameters.nodeHeightEpsilon
         case .infoService:
             return InfoService.threshold
         }

Adamant/Modules/Wallets/Adamant/AdmWalletService+DynamicConstants.swift

@@ -87,8 +87,14 @@ Node.makeDefaultNode(url: URL(string: "https://dschubba.adm.im")!),
 
     static var serviceNodes: [Node] {
         [
-            Node.makeDefaultNode(url: URL(string: "https://info.adamant.im")!),
-Node.makeDefaultNode(url: URL(string: "https://info2.adm.im")!),
+            Node.makeDefaultNode(
+                url: URL(string: "https://info.adamant.im")!,
+                altUrl: URL(string: "http://88.198.156.44:44099")!
+            ),
+            Node.makeDefaultNode(
+                url: URL(string: "https://info2.adm.im")!,
+                altUrl: URL(string: "http://207.180.210.95:33088")!
+            )
         ]
     }
 }

Adamant/Modules/Wallets/Klayr/KLYWalletService+DynamicConstants.swift

@@ -75,15 +75,21 @@ extension KlyWalletService {
 
     static var nodes: [Node] {
         [
-            Node.makeDefaultNode(url: URL(string: "https://klynode1.adamant.im")!, altUrl: URL(string: "http://195.26.255.137:44099")),
-Node.makeDefaultNode(url: URL(string: "https://klynode2.adamant.im")!, altUrl: URL(string: "http://109.176.199.130:44099")),
+            Node.makeDefaultNode(url: URL(string: "https://klynode2.adamant.im")!, altUrl: URL(string: "http://109.176.199.130:44099")),
+Node.makeDefaultNode(url: URL(string: "https://klynode3.adm.im")!, altUrl: URL(string: "http://37.27.205.78:44099")),
         ]
     }
 
     static var serviceNodes: [Node] {
         [
-            Node.makeDefaultNode(url: URL(string: "https://klyservice1.adamant.im")!),
-Node.makeDefaultNode(url: URL(string: "https://klyservice2.adamant.im")!),
+            Node.makeDefaultNode(
+                url: URL(string: "https://klyservice2.adamant.im")!,
+                altUrl: URL(string: "http://109.176.199.130:44098")!
+            ),
+            Node.makeDefaultNode(
+                url: URL(string: "https://klyservice3.adm.im")!,
+                altUrl: URL(string: "http://37.27.205.78:44098")!
+            ),
         ]
     }
 }

Adamant/Services/FilesNetworkManager/IPFS+Constants.swift

@@ -43,13 +43,12 @@ extension IPFSApiService {
         ]
     }
 
-    static let healthCheckParameters = CoinHealthCheckParameters(
-        normalUpdateInterval: 210,
+    static let healthCheckParameters = BlockchainHealthCheckParams(
+        group: .ipfs,
+        name: symbol,
+        normalUpdateInterval: 300,
         crucialUpdateInterval: 30,
-        onScreenUpdateInterval: 10,
-        threshold: 3,
-        normalServiceUpdateInterval: 210,
-        crucialServiceUpdateInterval: 30,
-        onScreenServiceUpdateInterval: 10
+        minNodeVersion: nil,
+        nodeHeightEpsilon: .zero
     )
 }