Merge pull request #486 from Adamant-im/dev/trello.com/c/xq7cJuNp

IanaaDvlp · web-flow · commit d927ac3993cc · 2024-05-15T11:28:09.000+03:00
[trello.com/c/xq7cJuNp] Release 3.6.1
diff --git a/Adamant.xcodeproj/project.pbxproj b/Adamant.xcodeproj/project.pbxproj
@@ -3758,7 +3758,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.0;
+				MARKETING_VERSION = 3.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger-dev";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -3789,7 +3789,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 3.6.0;
+				MARKETING_VERSION = 3.6.1;
 				PRODUCT_BUNDLE_IDENTIFIER = "im.adamant.adamant-messenger";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/Adamant/Modules/Wallets/Adamant/AdmWalletService+DynamicConstants.swift b/Adamant/Modules/Wallets/Adamant/AdmWalletService+DynamicConstants.swift
@@ -78,7 +78,10 @@ Node(url: URL(string: "http://5.161.53.74:36666")!),
 Node(url: URL(string: "http://184.94.215.92:45555")!),
 Node(url: URL(string: "https://node1.adamant.business")!, altUrl: URL(string: "http://194.233.75.29:45555")),
 Node(url: URL(string: "https://node2.blockchain2fa.io")!),
-Node(url: URL(string: "https://sunshine.adamant.im")!),
+Node(url: URL(string: "https://phecda.adm.im")!, altUrl: URL(string: "http://46.250.234.248:36666")),
+Node(url: URL(string: "https://tegmine.adm.im")!, altUrl: URL(string: "http://5.104.87.219:36666")),
+Node(url: URL(string: "https://tauri.adm.im")!, altUrl: URL(string: "http://154.26.159.245:36666")),
+Node(url: URL(string: "https://dschubba.adm.im")!, altUrl: URL(string: "http://85.239.234.17:36666")),
         ]
     }
     
diff --git a/Adamant/Modules/Wallets/Ethereum/EthWalletService+DynamicConstants.swift b/Adamant/Modules/Wallets/Ethereum/EthWalletService+DynamicConstants.swift
@@ -95,8 +95,7 @@ extension EthWalletService {
     
     static var nodes: [Node] {
         [
-            Node(url: URL(string: "https://ethnode1.adamant.im")!, altUrl: URL(string: "http://95.216.41.106:44099")),
-Node(url: URL(string: "https://ethnode2.adamant.im")!, altUrl: URL(string: "http://95.216.114.252:44099")),
+            Node(url: URL(string: "https://ethnode2.adamant.im")!, altUrl: URL(string: "http://95.216.114.252:44099")),
 Node(url: URL(string: "https://ethnode3.adamant.im")!, altUrl: URL(string: "http://46.4.37.157:44099")),
         ]
     }
diff --git a/CommonKit/Sources/CommonKit/AdamantDynamicResources.swift b/CommonKit/Sources/CommonKit/AdamantDynamicResources.swift
@@ -15,7 +15,10 @@ Node(url: URL(string: "http://5.161.53.74:36666")!),
 Node(url: URL(string: "http://184.94.215.92:45555")!),
 Node(url: URL(string: "https://node1.adamant.business")!, altUrl: URL(string: "http://194.233.75.29:45555")),
 Node(url: URL(string: "https://node2.blockchain2fa.io")!),
-Node(url: URL(string: "https://sunshine.adamant.im")!),
+Node(url: URL(string: "https://phecda.adm.im")!, altUrl: URL(string: "http://46.250.234.248:36666")),
+Node(url: URL(string: "https://tegmine.adm.im")!, altUrl: URL(string: "http://5.104.87.219:36666")),
+Node(url: URL(string: "https://tauri.adm.im")!, altUrl: URL(string: "http://154.26.159.245:36666")),
+Node(url: URL(string: "https://dschubba.adm.im")!, altUrl: URL(string: "http://85.239.234.17:36666")),
 
         ]
     }

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,10 @@ Node(url: URL(string: "http://5.161.53.74:36666")!),`
`78`	`78`	`Node(url: URL(string: "http://184.94.215.92:45555")!),`
`79`	`79`	`Node(url: URL(string: "https://node1.adamant.business")!, altUrl: URL(string: "http://194.233.75.29:45555")),`
`80`	`80`	`Node(url: URL(string: "https://node2.blockchain2fa.io")!),`
`81`		`-Node(url: URL(string: "https://sunshine.adamant.im")!),`
	`81`	`+Node(url: URL(string: "https://phecda.adm.im")!, altUrl: URL(string: "http://46.250.234.248:36666")),`
	`82`	`+Node(url: URL(string: "https://tegmine.adm.im")!, altUrl: URL(string: "http://5.104.87.219:36666")),`
	`83`	`+Node(url: URL(string: "https://tauri.adm.im")!, altUrl: URL(string: "http://154.26.159.245:36666")),`
	`84`	`+Node(url: URL(string: "https://dschubba.adm.im")!, altUrl: URL(string: "http://85.239.234.17:36666")),`
`82`	`85`	`]`
`83`	`86`	`}`
`84`	`87`
Original file line number	Diff line number	Diff line change
`@@ -95,8 +95,7 @@ extension EthWalletService {`
`95`	`95`
`96`	`96`	`static var nodes: [Node] {`
`97`	`97`	`[`
`98`		`- Node(url: URL(string: "https://ethnode1.adamant.im")!, altUrl: URL(string: "http://95.216.41.106:44099")),`
`99`		`-Node(url: URL(string: "https://ethnode2.adamant.im")!, altUrl: URL(string: "http://95.216.114.252:44099")),`
	`98`	`+ Node(url: URL(string: "https://ethnode2.adamant.im")!, altUrl: URL(string: "http://95.216.114.252:44099")),`
`100`	`99`	`Node(url: URL(string: "https://ethnode3.adamant.im")!, altUrl: URL(string: "http://46.4.37.157:44099")),`
`101`	`100`	`]`
`102`	`101`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,10 @@ Node(url: URL(string: "http://5.161.53.74:36666")!),`
`15`	`15`	`Node(url: URL(string: "http://184.94.215.92:45555")!),`
`16`	`16`	`Node(url: URL(string: "https://node1.adamant.business")!, altUrl: URL(string: "http://194.233.75.29:45555")),`
`17`	`17`	`Node(url: URL(string: "https://node2.blockchain2fa.io")!),`
`18`		`-Node(url: URL(string: "https://sunshine.adamant.im")!),`
	`18`	`+Node(url: URL(string: "https://phecda.adm.im")!, altUrl: URL(string: "http://46.250.234.248:36666")),`
	`19`	`+Node(url: URL(string: "https://tegmine.adm.im")!, altUrl: URL(string: "http://5.104.87.219:36666")),`
	`20`	`+Node(url: URL(string: "https://tauri.adm.im")!, altUrl: URL(string: "http://154.26.159.245:36666")),`
	`21`	`+Node(url: URL(string: "https://dschubba.adm.im")!, altUrl: URL(string: "http://85.239.234.17:36666")),`
`19`	`22`
`20`	`23`	`]`
`21`	`24`	`}`