[WIP] Add WSS Links for Infura (trustwallet#762)

* add wss links for Infura * remove trailing whitespace * Make WSS switch exhaustive
fuyxuan · Jun 12, 2018 · 12c5158 · 12c5158
1 parent 4b6fb9a
commit 12c5158
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/Trust/Browser/Factory/WKWebViewConfiguration.swift b/Trust/Browser/Factory/WKWebViewConfiguration.swift
@@ -25,13 +25,16 @@ extension WKWebViewConfiguration {
         """
         const addressHex = "\(address)"
         const rpcURL = "\(sessionConfig.server.rpcURL.absoluteString)"
+        const wssURL = "\(sessionConfig.server.wssURL.absoluteString)"
         const chainID = "\(sessionConfig.chainID)"
 
         function executeCallback (id, error, value) {
           Trust.executeCallback(id, error, value)
         }
 
-        Trust.init(rpcURL, {
+        Trust.init({
+          rpcURL,
+          wssURL,
           getAccounts: function (cb) { cb(null, [addressHex]) },
           processTransaction: function (tx, cb){
             console.log('signing a transaction', tx)

diff --git a/Trust/Settings/Types/Config.swift b/Trust/Settings/Types/Config.swift
@@ -13,7 +13,7 @@ struct Config {
         static let testNetworkWarningOff = "testNetworkWarningOff"
     }
 
-    static let dbMigrationSchemaVersion: UInt64 = 53
+    static let dbMigrationSchemaVersion: UInt64 = 54
 
     static let current: Config = Config()
 

diff --git a/Trust/Settings/Types/CustomRPC.swift b/Trust/Settings/Types/CustomRPC.swift
@@ -8,19 +8,22 @@ class CustomRPC: Object {
     @objc dynamic var name: String = ""
     @objc dynamic var symbol: String = ""
     @objc dynamic var endpoint: String = ""
+    @objc dynamic var wssEndpoint: String = ""
     @objc dynamic var id: String = UUID().uuidString
 
     convenience init(
-            chainID: Int = 0,
-            name: String = "",
-            symbol: String = "",
-            endpoint: String = ""
-        ) {
+        chainID: Int = 0,
+        name: String = "",
+        symbol: String = "",
+        endpoint: String = "",
+        wssEndpoint: String = ""
+    ) {
         self.init()
         self.chainID = chainID
         self.name = name
         self.symbol = symbol
         self.endpoint = endpoint
+        self.wssEndpoint = wssEndpoint
     }
 
     override class func primaryKey() -> String? {

diff --git a/Trust/Settings/Types/RPCServers.swift b/Trust/Settings/Types/RPCServers.swift
@@ -101,6 +101,21 @@ enum RPCServer {
         }()
         return URL(string: urlString)!
     }
+
+    var wssURL: URL {
+        let urlString: String = {
+            switch self {
+            case .main: return "wss://mainnet.infura.io/ws/llyrtzQ3YhkdESt2Fzrk"
+            case .ropsten: return "wss://ropsten.infura.io/ws/llyrtzQ3YhkdESt2Fzrk"
+            case .rinkeby: return "wss://rinkeby.infura.io/ws/llyrtzQ3YhkdESt2Fzrk"
+            case .kovan: return "wss://kovan.infura.io/ws/llyrtzQ3YhkdESt2Fzrk"
+            case .poa, .sokol: return ""
+            case .classic, .callisto: return ""
+            case .custom(let custom): return custom.wssEndpoint
+            }
+        }()
+        return URL(string: urlString)!
+    }
 
     var remoteURL: URL {
         let urlString: String = {