Refactor/swift concurency

Sources/OrcaSwapSwift/APIClient/APIClient.swift

@@ -11,9 +11,7 @@ public protocol OrcaSwapAPIClient {
     var configsProvider: OrcaSwapConfigsProvider {get}
     func reload() async throws
     func getTokens() async throws -> [String: TokenValue]
-    func getAquafarms() async throws -> [String: Aquafarm]
     func getPools() async throws -> [String: Pool]
-    func getProgramID() async throws -> ProgramIDS
 }
 
 extension OrcaSwapAPIClient {
@@ -24,26 +22,20 @@ extension OrcaSwapAPIClient {
 
     public func getTokens() async throws -> [String: TokenValue] {
         let data = try await configsProvider.getConfigs()
-        let configs = try JSONDecoder().decode(OrcaConfigs.self, from: data)
-        return configs.tokens
-    }
-
-    public func getAquafarms() async throws -> [String: Aquafarm] {
-        let data = try await configsProvider.getConfigs()
-        let configs = try JSONDecoder().decode(OrcaConfigs.self, from: data)
-        return configs.aquafarms
+        let response = try JSONDecoder().decode(OrcaInfoResponse.self, from: data)
+        return response.value.tokens
     }
 
     public func getPools() async throws -> [String: Pool] {
         let data = try await configsProvider.getConfigs()
-        let configs = try JSONDecoder().decode(OrcaConfigs.self, from: data)
-        return configs.pools
+        let response = try JSONDecoder().decode(OrcaInfoResponse.self, from: data)
+        return response.value.pools
     }
-    
+
     public func getProgramID() async throws -> ProgramIDS {
         let data = try await configsProvider.getConfigs()
-        let configs = try JSONDecoder().decode(OrcaConfigs.self, from: data)
-        return configs.programIDS
+        let response = try JSONDecoder().decode(OrcaInfoResponse.self, from: data)
+        return response.value.programIds
     }
 }
 

Sources/OrcaSwapSwift/APIClient/ConfigsProvider.swift

@@ -20,7 +20,7 @@ extension OrcaSwapConfigsProvider {
 public class NetworkConfigsProvider: OrcaSwapConfigsProvider {
     public let network: String
     public var cache: Data?
-    private let urlString = "https://api.orca.so/configs"
+    private let urlString = "https://orca.wallet.p2p.org/info"
     private let locker = NSLock()
 
     public init(network: String) {

Sources/OrcaSwapSwift/Models/OrcaInfo.swift

@@ -0,0 +1,56 @@
+// This file was generated from JSON Schema using quicktype, do not modify it directly.
+// To parse the JSON, add this file to your project and do:
+//
+//   let orcaConfigs = try? newJSONDecoder().decode(OrcaConfigs.self, from: jsonData)
+
+import Foundation
+import SolanaSwift
+
+// MARK: - OrcaConfigs
+public struct OrcaInfo: Codable {
+    public let pools: [String: Pool]
+    public let programIds: ProgramIDS
+    public let tokens: [String: TokenValue]
+
+    public init(pools: [String: Pool], programIds: ProgramIDS, tokens: [String: TokenValue]) {
+        self.pools = pools
+        self.programIds = programIds
+        self.tokens = tokens
+    }
+}
+
+public enum TokenEnum: String, Codable {
+    case tokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"
+}
+
+// MARK: - ProgramIDS
+public struct ProgramIDS: Codable {
+    public let serumTokenSwap, tokenSwapV2, tokenSwap: String
+    public let token: TokenEnum
+    public let aquafarm: String
+
+    public init(serumTokenSwap: String, tokenSwapV2: String, tokenSwap: String, token: TokenEnum, aquafarm: String) {
+        self.serumTokenSwap = serumTokenSwap
+        self.tokenSwapV2 = tokenSwapV2
+        self.tokenSwap = tokenSwap
+        self.token = token
+        self.aquafarm = aquafarm
+    }
+}
+
+// MARK: - TokenValue
+public struct TokenValue: Codable {
+    public let mint, name: String
+    public let decimals: Int
+    public let fetchPrice, poolToken: Bool?
+    public let wrapper: String?
+
+    public init(mint: String, name: String, decimals: Int, fetchPrice: Bool?, poolToken: Bool?, wrapper: String?) {
+        self.mint = mint
+        self.name = name
+        self.decimals = decimals
+        self.fetchPrice = fetchPrice
+        self.poolToken = poolToken
+        self.wrapper = wrapper
+    }
+}

Sources/OrcaSwapSwift/Models/OrcaInfoResponse.swift

@@ -0,0 +1,3 @@
+struct OrcaInfoResponse: Decodable {
+    let value: OrcaInfo
+}