Replace DappError with JsonRpcError #6456

oa-s · oa-s · commit 796d2416df66 · 2023-03-05T10:31:19.000+02:00
diff --git a/AlphaWallet/ActiveWalletCoordinator.swift b/AlphaWallet/ActiveWalletCoordinator.swift
@@ -1168,14 +1168,14 @@ extension ActiveWalletCoordinator: DappBrowserCoordinatorDelegate {
         return firstly {
             showAskSendRawTransaction(title: R.string.localizable.walletConnectSendRawTransactionTitle(), message: transaction)
         }.then { shouldSend -> Promise<ConfirmResult> in
-            guard shouldSend else { return .init(error: DAppError.cancelled) }
+            guard shouldSend else { return .init(error: JsonRpcError.requestRejected) }
             let prompt = R.string.localizable.keystoreAccessKeySign()
             let sender = SendTransaction(session: session, keystore: self.keystore, confirmType: .signThenSend, config: session.config, analytics: self.analytics, prompt: prompt)
             return sender.send(rawTransaction: transaction)
         }.map { data in
             switch data {
             case .signedTransaction, .sentTransaction:
-                throw DAppError.cancelled
+                throw JsonRpcError.requestRejected
             case .sentRawTransaction(let transactionId, _):
                 return transactionId
             }
diff --git a/AlphaWallet/Browser/Coordinators/DappBrowserCoordinator.swift b/AlphaWallet/Browser/Coordinators/DappBrowserCoordinator.swift
@@ -142,7 +142,7 @@ final class DappBrowserCoordinator: NSObject, Coordinator {
         delegate.requestSignTransaction(session: session, source: .browser, requester: nil, transaction: transaction, configuration: .dappTransaction(confirmType: .sign))
             .sink(receiveCompletion: { [browserViewController] result in
                 guard case .failure = result else { return }
-                browserViewController.notifyFinish(callbackID: callbackId, value: .failure(DAppError.cancelled))
+                browserViewController.notifyFinish(callbackID: callbackId, value: .failure(.responseError))
             }, receiveValue: { [browserViewController] data in
                 let callback = DappCallback(id: callbackId, value: .signTransaction(data))
                 browserViewController.notifyFinish(callbackID: callbackId, value: .success(callback))
@@ -157,7 +157,7 @@ final class DappBrowserCoordinator: NSObject, Coordinator {
         delegate.requestSendTransaction(session: session, source: .browser, requester: nil, transaction: transaction, configuration: .dappTransaction(confirmType: .signThenSend))
             .sink(receiveCompletion: { [browserViewController] result in
                 guard case .failure = result else { return }
-                browserViewController.notifyFinish(callbackID: callbackId, value: .failure(DAppError.cancelled))
+                browserViewController.notifyFinish(callbackID: callbackId, value: .failure(.responseError))
             }, receiveValue: { [browserViewController] transaction in
                 let callback = DappCallback(id: callbackId, value: .sentTransaction(Data(_hex: transaction.id)))
                 browserViewController.notifyFinish(callbackID: callbackId, value: .success(callback))
@@ -176,11 +176,11 @@ final class DappBrowserCoordinator: NSObject, Coordinator {
             .sink(receiveCompletion: { [browserViewController] result in
                 guard case .failure(let error) = result else { return }
 
-                if case JSONRPCError.responseError(_, let message, _) = error.embedded {
-                    browserViewController.notifyFinish(callbackID: callbackId, value: .failure(.nodeError(message)))
+                if case JSONRPCError.responseError(let code, let message, _) = error.embedded {
+                    browserViewController.notifyFinish(callbackID: callbackId, value: .failure(.init(code: code, message: message)))
                 } else {
                     //TODO better handle. User didn't cancel
-                    browserViewController.notifyFinish(callbackID: callbackId, value: .failure(.cancelled))
+                    browserViewController.notifyFinish(callbackID: callbackId, value: .failure(.responseError))
                 }
 
             }, receiveValue: { [browserViewController] value in
@@ -241,7 +241,7 @@ final class DappBrowserCoordinator: NSObject, Coordinator {
                     requester: nil)
             }.sink(receiveCompletion: { [browserViewController] result in
                 guard case .failure = result else { return }
-                browserViewController.notifyFinish(callbackID: callbackId, value: .failure(DAppError.cancelled))
+                browserViewController.notifyFinish(callbackID: callbackId, value: .failure(.responseError))
             }, receiveValue: { [browserViewController] data in
                 let callback: DappCallback
                 switch message {
@@ -406,7 +406,7 @@ final class DappBrowserCoordinator: NSObject, Coordinator {
         delegate.requestAddCustomChain(server: server, customChain: customChain)
             .sink(receiveCompletion: { [weak self] result in
                 guard case .failure(let e) = result else { return }
-                let error = e.embedded as? DAppError ?? .nodeError("Unknown Error")
+                let error = e.embedded as? JsonRpcError ?? .internalError
 
                 self?.notifyFinish(callbackID: callbackId, value: .failure(error))
             }, receiveValue: { [weak self] operation in
@@ -432,7 +432,7 @@ final class DappBrowserCoordinator: NSObject, Coordinator {
         delegate.requestSwitchChain(server: server, currentUrl: currentUrl, targetChain: targetChain)
             .sink(receiveCompletion: { [weak self] result in
                 guard case .failure(let e) = result else { return }
-                let error = e.embedded as? DAppError ?? .nodeError("Unknown Error")
+                let error = e.embedded as? JsonRpcError ?? .internalError
 
                 self?.notifyFinish(callbackID: callbackId, value: .failure(error))
             }, receiveValue: { [weak self] operation in
@@ -448,7 +448,7 @@ final class DappBrowserCoordinator: NSObject, Coordinator {
             }).store(in: &cancellable)
     }
 
-    private func notifyFinish(callbackID: Int, value: Swift.Result<DappCallback, DAppError>) {
+    private func notifyFinish(callbackID: Int, value: Swift.Result<DappCallback, JsonRpcError>) {
         browserViewController.notifyFinish(callbackID: callbackID, value: value)
     }
 }
@@ -529,16 +529,16 @@ extension DappBrowserCoordinator: BrowserViewControllerDelegate {
 
     func didCall(action: DappAction, callbackID: Int, inBrowserViewController viewController: BrowserViewController) {
         guard let session = sessionsProvider.session(for: server) else {
-            browserViewController.notifyFinish(callbackID: callbackID, value: .failure(.cancelled))
+            browserViewController.notifyFinish(callbackID: callbackID, value: .failure(.requestRejected))
             return
         }
         guard let delegate = delegate else {
-            browserViewController.notifyFinish(callbackID: callbackID, value: .failure(.cancelled))
+            browserViewController.notifyFinish(callbackID: callbackID, value: .failure(.requestRejected))
             return
         }
 
         func rejectDappAction() {
-            browserViewController.notifyFinish(callbackID: callbackID, value: .failure(DAppError.cancelled))
+            browserViewController.notifyFinish(callbackID: callbackID, value: .failure(JsonRpcError.requestRejected))
             navigationController.topViewController?.displayError(error: ActiveWalletViewModel.Error.onlyWatchAccount)
         }
 
diff --git a/AlphaWallet/Browser/Coordinators/DappRequestSwitchCustomChainCoordinator.swift b/AlphaWallet/Browser/Coordinators/DappRequestSwitchCustomChainCoordinator.swift
@@ -48,11 +48,11 @@ class DappRequestSwitchCustomChainCoordinator: NSObject, Coordinator {
 
     func start() -> AnyPublisher<SwitchCustomChainOperation, PromiseError> {
         guard let customChainId = Int(chainId0xString: customChain.chainId) else {
-            return .fail(PromiseError(error: DAppError.nodeError(R.string.localizable.addCustomChainErrorInvalidChainId(customChain.chainId))))
+            return .fail(PromiseError(error: JsonRpcError.internalError(message: R.string.localizable.addCustomChainErrorInvalidChainId(customChain.chainId))))
         }
         guard customChain.rpcUrls?.first != nil else {
             //Not to spec since RPC URLs are optional according to EIP3085, but it is so much easier to assume it's needed, and quite useless if it isn't provided
-            return .fail(PromiseError(error: DAppError.nodeError(R.string.localizable.addCustomChainErrorInvalidChainId(customChain.chainId))))
+            return .fail(PromiseError(error: JsonRpcError.internalError(message: R.string.localizable.addCustomChainErrorInvalidChainId(customChain.chainId))))
         }
         if let existingServer = ServersCoordinator.serversOrdered.first(where: { $0.chainID == customChainId }) {
             if config.enabledServers.contains(where: { $0.chainID == customChainId }) {
@@ -85,7 +85,7 @@ class DappRequestSwitchCustomChainCoordinator: NSObject, Coordinator {
             case .action:
                 runEnableChain()
             case .canceled:
-                subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))
+                subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))
             }
         }.cauterize()
     }
@@ -118,10 +118,10 @@ class DappRequestSwitchCustomChainCoordinator: NSObject, Coordinator {
                 case 1:
                     runAddCustomChain(isTestnet: true)
                 default:
-                    subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))
+                    subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))
                 }
             case .canceled:
-                subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))
+                subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))
             }
         }.cauterize()
     }
@@ -135,7 +135,7 @@ class DappRequestSwitchCustomChainCoordinator: NSObject, Coordinator {
                 subject.send(.switchBrowserToExistingServer(existingServer, url: self.currentUrl))
                 subject.send(completion: .finished)
             case .canceled:
-                subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))
+                subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))
             }
         }.cauterize()
     }
@@ -172,16 +172,16 @@ extension DappRequestSwitchCustomChainCoordinator: AddCustomChainDelegate {
             subject.send(completion: .finished)
             return
         }
-        let dAppError: DAppError
+        let jsonRpcError: JsonRpcError
         switch error {
         case .cancelled:
-            dAppError = .cancelled
+            jsonRpcError = .requestRejected
         case .missingBlockchainExplorerUrl, .invalidBlockchainExplorerUrl, .noRpcNodeUrl, .invalidChainId, .chainIdNotMatch, .unknown:
-            dAppError = .nodeError(error.localizedDescription)
+            jsonRpcError = JsonRpcError.internalError(message: error.localizedDescription)
             UIAlertController.alert(title: nil, message: error.localizedDescription, alertButtonTitles: [R.string.localizable.oK()], alertButtonStyles: [.cancel], viewController: viewController)
 
         }
 
-        subject.send(completion: .failure(.some(error: dAppError)))
+        subject.send(completion: .failure(.some(error: jsonRpcError)))
     }
 }
diff --git a/AlphaWallet/Browser/Coordinators/DappRequestSwitchExistingChainCoordinator.swift b/AlphaWallet/Browser/Coordinators/DappRequestSwitchExistingChainCoordinator.swift
@@ -36,7 +36,7 @@ class DappRequestSwitchExistingChainCoordinator: NSObject, Coordinator {
 
     func start() -> AnyPublisher<SwitchExistingChainOperation, PromiseError> {
         guard let targetChainId = Int(chainId0xString: targetChain.chainId) else {
-            return .fail(PromiseError(error: DAppError.nodeError(R.string.localizable.switchChainErrorInvalidChainId(targetChain.chainId))))
+            return .fail(PromiseError(error: JsonRpcError.internalError(message: R.string.localizable.switchChainErrorInvalidChainId(targetChain.chainId))))
         }
         if let existingServer = ServersCoordinator.serversOrdered.first(where: { $0.chainID == targetChainId }) {
             if config.enabledServers.contains(where: { $0.chainID == targetChainId }) {
@@ -50,7 +50,7 @@ class DappRequestSwitchExistingChainCoordinator: NSObject, Coordinator {
                 promptAndActivateExistingServer(existingServer: existingServer, inViewController: viewController)
             }
         } else {
-            return .fail(PromiseError(error: DAppError.nodeError(R.string.localizable.switchChainErrorNotSupportedChainId(targetChain.chainId))))
+            return .fail(PromiseError(error: JsonRpcError.unsupportedChain(chainId: targetChain.chainId)))
         }
 
         return subject.eraseToAnyPublisher()
@@ -70,7 +70,7 @@ class DappRequestSwitchExistingChainCoordinator: NSObject, Coordinator {
             case .action:
                 runEnableChain()
             case .canceled:
-                subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))
+                subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))
             }
         }.cauterize()
     }
@@ -84,7 +84,7 @@ class DappRequestSwitchExistingChainCoordinator: NSObject, Coordinator {
                 subject.send(.switchBrowserToExistingServer(existingServer, url: self.currentUrl))
                 subject.send(completion: .finished)
             case .canceled:
-                subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))
+                subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))
             }
         }.cauterize()
     }
diff --git a/AlphaWallet/Browser/ViewControllers/BrowserViewController.swift b/AlphaWallet/Browser/ViewControllers/BrowserViewController.swift
@@ -149,7 +149,7 @@ final class BrowserViewController: UIViewController {
         webView.load(URLRequest(url: url))
     }
 
-    func notifyFinish(callbackID: Int, value: Swift.Result<DappCallback, DAppError>) {
+    func notifyFinish(callbackID: Int, value: Swift.Result<DappCallback, JsonRpcError>) {
         let script: String = {
             switch value {
             case .success(let result):
diff --git a/AlphaWallet/Common/Views/TokenCardRowView.swift b/AlphaWallet/Common/Views/TokenCardRowView.swift
@@ -347,7 +347,7 @@ extension TokenCardRowView: TokenInstanceWebViewDelegate {
                             source: Analytics.SignMessageRequestSource,
                             requester: RequesterViewModel?) -> AnyPublisher<Data, PromiseError> {
         
-        return .fail(PromiseError(error: DAppError.cancelled))
+        return .fail(PromiseError(error: JsonRpcError.requestRejected))
     }
 
     func shouldClose(tokenInstanceWebView: TokenInstanceWebView) {
diff --git a/AlphaWallet/Swap/Swap/SwapTokensCoordinator.swift b/AlphaWallet/Swap/Swap/SwapTokensCoordinator.swift
@@ -269,8 +269,8 @@ extension SwapTokensCoordinator: ApproveSwapProviderDelegate {
                 return transaction.id
             }
         }.recover { error -> Promise<String> in
-            //TODO no good to have `DAppError` here, but this is because of `TransactionConfirmationCoordinatorBridgeToPromise`. Maybe good to have a global "UserCancelled" or something? If enum, not too many cases? To avoid `switch`
-            if case DAppError.cancelled = error {
+            //TODO no good to have `JsonRpcError` here, but this is because of `TransactionConfirmationCoordinatorBridgeToPromise`. Maybe good to have a global "UserCancelled" or something? If enum, not too many cases? To avoid `switch`
+            if let e = error as? JsonRpcError, e == .requestRejected {
                 throw SwapError.userCancelledApproval
             } else {
                 throw error
diff --git a/AlphaWallet/Tokens/Views/TokenInstanceWebView.swift b/AlphaWallet/Tokens/Views/TokenInstanceWebView.swift
@@ -342,7 +342,7 @@ extension TokenInstanceWebView: WKScriptMessageHandler {
             switch action {
             case .signPersonalMessage(let message):
                 guard let delegate = self.delegate else {
-                    self.notifyFinish(callbackID: command.id, value: .failure(DAppError.cancelled))
+                    self.notifyFinish(callbackID: command.id, value: .failure(JsonRpcError.requestRejected))
                     return
                 }
 
@@ -353,10 +353,10 @@ extension TokenInstanceWebView: WKScriptMessageHandler {
                     source: .tokenScript,
                     requester: nil)
                 .handleEvents(receiveCancel: {
-                    self.notifyFinish(callbackID: command.id, value: .failure(DAppError.cancelled))
+                    self.notifyFinish(callbackID: command.id, value: .failure(JsonRpcError.requestRejected))
                 })
                 .sinkAsync(receiveCompletion: { _ in
-                    self.notifyFinish(callbackID: command.id, value: .failure(DAppError.cancelled))
+                    self.notifyFinish(callbackID: command.id, value: .failure(JsonRpcError.requestRejected))
                 }, receiveValue: { value in
                     let callback = DappCallback(id: command.id, value: .signPersonalMessage(value))
                     self.notifyFinish(callbackID: command.id, value: .success(callback))
@@ -399,13 +399,13 @@ extension TokenInstanceWebView: WKUIDelegate {
 
 //TODO this contains functions duplicated and modified from BrowserViewController. Clean this up. Or move it somewhere, to a coordinator?
 extension TokenInstanceWebView {
-    func notifyFinish(callbackID: Int, value: Swift.Result<DappCallback, DAppError>) {
+    func notifyFinish(callbackID: Int, value: Swift.Result<DappCallback, JsonRpcError>) {
         let script: String = {
             switch value {
             case .success(let result):
                 return "executeCallback(\(callbackID), null, \"\(result.value.object)\")"
             case .failure(let error):
-                return "executeCallback(\(callbackID), \"\(error)\", null)"
+                return "executeCallback(\(callbackID), \"\(error.message)\", null)"
             }
         }()
         webView.evaluateJavaScript(script, completionHandler: nil)
diff --git a/AlphaWallet/WalletConnect/Controllers/SignMessageCoordinatorBridgeToPromise.swift b/AlphaWallet/WalletConnect/Controllers/SignMessageCoordinatorBridgeToPromise.swift
@@ -56,7 +56,7 @@ extension SignMessageCoordinatorBridgeToPromise: SignMessageCoordinatorDelegate
     }
 
     func didCancel(in coordinator: SignMessageCoordinator) {
-        seal.reject(DAppError.cancelled)
+        seal.reject(JsonRpcError.requestRejected)
     }
 }
 
diff --git a/AlphaWallet/WalletConnect/Controllers/TransactionConfirmationCoordinatorBridgeToPromise.swift b/AlphaWallet/WalletConnect/Controllers/TransactionConfirmationCoordinatorBridgeToPromise.swift
@@ -108,7 +108,7 @@ extension TransactionConfirmationCoordinatorBridgeToPromise: TransactionConfirma
     }
 
     func didClose(in coordinator: TransactionConfirmationCoordinator) {
-        seal.reject(DAppError.cancelled)
+        seal.reject(JsonRpcError.requestRejected)
     }
 
     func buyCrypto(wallet: Wallet, server: RPCServer, viewController: UIViewController, source: Analytics.BuyCryptoSource) {
diff --git a/AlphaWallet/WalletConnect/WalletConnectServer.swift b/AlphaWallet/WalletConnect/WalletConnectServer.swift
@@ -21,7 +21,7 @@ enum WalletConnectError: Error {
     case `internal`(JsonRpcError)
 
     init(error: PromiseError) {
-        if case DAppError.cancelled = error.embedded {
+        if let e = error.embedded as? JsonRpcError, e == .requestRejected {
             self = .cancelled
         } else if case PMKError.cancelled = error.embedded {
             self = .cancelled
diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/DAppError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Browser/Types/DAppError.swift
diff --git a/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RpcJson/JsonRpcError.swift b/modules/AlphaWalletFoundation/AlphaWalletFoundation/Types/RpcJson/JsonRpcError.swift
@@ -29,4 +29,8 @@ public extension JsonRpcError {
     static func unsupportedChain(chainId: String) -> JsonRpcError {
         JsonRpcError(code: 4902, message: "Unrecognized chain ID \(chainId). Try adding the chain using wallet_addEthereumChain first.")
     }
+
+    static func internalError(message: String) -> JsonRpcError {
+        JsonRpcError(code: -32603, message: message)
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,11 +48,11 @@ class DappRequestSwitchCustomChainCoordinator: NSObject, Coordinator {`
`48`	`48`
`49`	`49`	`func start() -> AnyPublisher<SwitchCustomChainOperation, PromiseError> {`
`50`	`50`	`guard let customChainId = Int(chainId0xString: customChain.chainId) else {`
`51`		`- return .fail(PromiseError(error: DAppError.nodeError(R.string.localizable.addCustomChainErrorInvalidChainId(customChain.chainId))))`
	`51`	`+ return .fail(PromiseError(error: JsonRpcError.internalError(message: R.string.localizable.addCustomChainErrorInvalidChainId(customChain.chainId))))`
`52`	`52`	`}`
`53`	`53`	`guard customChain.rpcUrls?.first != nil else {`
`54`	`54`	`//Not to spec since RPC URLs are optional according to EIP3085, but it is so much easier to assume it's needed, and quite useless if it isn't provided`
`55`		`- return .fail(PromiseError(error: DAppError.nodeError(R.string.localizable.addCustomChainErrorInvalidChainId(customChain.chainId))))`
	`55`	`+ return .fail(PromiseError(error: JsonRpcError.internalError(message: R.string.localizable.addCustomChainErrorInvalidChainId(customChain.chainId))))`
`56`	`56`	`}`
`57`	`57`	`if let existingServer = ServersCoordinator.serversOrdered.first(where: { $0.chainID == customChainId }) {`
`58`	`58`	`if config.enabledServers.contains(where: { $0.chainID == customChainId }) {`
`@@ -85,7 +85,7 @@ class DappRequestSwitchCustomChainCoordinator: NSObject, Coordinator {`
`85`	`85`	`case .action:`
`86`	`86`	`runEnableChain()`
`87`	`87`	`case .canceled:`
`88`		`- subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))`
	`88`	`+ subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))`
`89`	`89`	`}`
`90`	`90`	`}.cauterize()`
`91`	`91`	`}`
`@@ -118,10 +118,10 @@ class DappRequestSwitchCustomChainCoordinator: NSObject, Coordinator {`
`118`	`118`	`case 1:`
`119`	`119`	`runAddCustomChain(isTestnet: true)`
`120`	`120`	`default:`
`121`		`- subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))`
	`121`	`+ subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))`
`122`	`122`	`}`
`123`	`123`	`case .canceled:`
`124`		`- subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))`
	`124`	`+ subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))`
`125`	`125`	`}`
`126`	`126`	`}.cauterize()`
`127`	`127`	`}`
`@@ -135,7 +135,7 @@ class DappRequestSwitchCustomChainCoordinator: NSObject, Coordinator {`
`135`	`135`	`subject.send(.switchBrowserToExistingServer(existingServer, url: self.currentUrl))`
`136`	`136`	`subject.send(completion: .finished)`
`137`	`137`	`case .canceled:`
`138`		`- subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))`
	`138`	`+ subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))`
`139`	`139`	`}`
`140`	`140`	`}.cauterize()`
`141`	`141`	`}`
`@@ -172,16 +172,16 @@ extension DappRequestSwitchCustomChainCoordinator: AddCustomChainDelegate {`
`172`	`172`	`subject.send(completion: .finished)`
`173`	`173`	`return`
`174`	`174`	`}`
`175`		`- let dAppError: DAppError`
	`175`	`+ let jsonRpcError: JsonRpcError`
`176`	`176`	`switch error {`
`177`	`177`	`case .cancelled:`
`178`		`- dAppError = .cancelled`
	`178`	`+ jsonRpcError = .requestRejected`
`179`	`179`	`case .missingBlockchainExplorerUrl, .invalidBlockchainExplorerUrl, .noRpcNodeUrl, .invalidChainId, .chainIdNotMatch, .unknown:`
`180`		`- dAppError = .nodeError(error.localizedDescription)`
	`180`	`+ jsonRpcError = JsonRpcError.internalError(message: error.localizedDescription)`
`181`	`181`	`UIAlertController.alert(title: nil, message: error.localizedDescription, alertButtonTitles: [R.string.localizable.oK()], alertButtonStyles: [.cancel], viewController: viewController)`
`182`	`182`
`183`	`183`	`}`
`184`	`184`
`185`		`- subject.send(completion: .failure(.some(error: dAppError)))`
	`185`	`+ subject.send(completion: .failure(.some(error: jsonRpcError)))`
`186`	`186`	`}`
`187`	`187`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ class DappRequestSwitchExistingChainCoordinator: NSObject, Coordinator {`
`36`	`36`
`37`	`37`	`func start() -> AnyPublisher<SwitchExistingChainOperation, PromiseError> {`
`38`	`38`	`guard let targetChainId = Int(chainId0xString: targetChain.chainId) else {`
`39`		`- return .fail(PromiseError(error: DAppError.nodeError(R.string.localizable.switchChainErrorInvalidChainId(targetChain.chainId))))`
	`39`	`+ return .fail(PromiseError(error: JsonRpcError.internalError(message: R.string.localizable.switchChainErrorInvalidChainId(targetChain.chainId))))`
`40`	`40`	`}`
`41`	`41`	`if let existingServer = ServersCoordinator.serversOrdered.first(where: { $0.chainID == targetChainId }) {`
`42`	`42`	`if config.enabledServers.contains(where: { $0.chainID == targetChainId }) {`
`@@ -50,7 +50,7 @@ class DappRequestSwitchExistingChainCoordinator: NSObject, Coordinator {`
`50`	`50`	`promptAndActivateExistingServer(existingServer: existingServer, inViewController: viewController)`
`51`	`51`	`}`
`52`	`52`	`} else {`
`53`		`- return .fail(PromiseError(error: DAppError.nodeError(R.string.localizable.switchChainErrorNotSupportedChainId(targetChain.chainId))))`
	`53`	`+ return .fail(PromiseError(error: JsonRpcError.unsupportedChain(chainId: targetChain.chainId)))`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`return subject.eraseToAnyPublisher()`
`@@ -70,7 +70,7 @@ class DappRequestSwitchExistingChainCoordinator: NSObject, Coordinator {`
`70`	`70`	`case .action:`
`71`	`71`	`runEnableChain()`
`72`	`72`	`case .canceled:`
`73`		`- subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))`
	`73`	`+ subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))`
`74`	`74`	`}`
`75`	`75`	`}.cauterize()`
`76`	`76`	`}`
`@@ -84,7 +84,7 @@ class DappRequestSwitchExistingChainCoordinator: NSObject, Coordinator {`
`84`	`84`	`subject.send(.switchBrowserToExistingServer(existingServer, url: self.currentUrl))`
`85`	`85`	`subject.send(completion: .finished)`
`86`	`86`	`case .canceled:`
`87`		`- subject.send(completion: .failure(PromiseError(error: DAppError.cancelled)))`
	`87`	`+ subject.send(completion: .failure(PromiseError(error: JsonRpcError.requestRejected)))`
`88`	`88`	`}`
`89`	`89`	`}.cauterize()`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ final class BrowserViewController: UIViewController {`
`149`	`149`	`webView.load(URLRequest(url: url))`
`150`	`150`	`}`
`151`	`151`
`152`		`- func notifyFinish(callbackID: Int, value: Swift.Result<DappCallback, DAppError>) {`
	`152`	`+ func notifyFinish(callbackID: Int, value: Swift.Result<DappCallback, JsonRpcError>) {`
`153`	`153`	`let script: String = {`
`154`	`154`	`switch value {`
`155`	`155`	`case .success(let result):`
Original file line number	Diff line number	Diff line change
`@@ -347,7 +347,7 @@ extension TokenCardRowView: TokenInstanceWebViewDelegate {`
`347`	`347`	`source: Analytics.SignMessageRequestSource,`
`348`	`348`	`requester: RequesterViewModel?) -> AnyPublisher<Data, PromiseError> {`
`349`	`349`
`350`		`- return .fail(PromiseError(error: DAppError.cancelled))`
	`350`	`+ return .fail(PromiseError(error: JsonRpcError.requestRejected))`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`func shouldClose(tokenInstanceWebView: TokenInstanceWebView) {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ extension SignMessageCoordinatorBridgeToPromise: SignMessageCoordinatorDelegate`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`func didCancel(in coordinator: SignMessageCoordinator) {`
`59`		`- seal.reject(DAppError.cancelled)`
	`59`	`+ seal.reject(JsonRpcError.requestRejected)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ extension TransactionConfirmationCoordinatorBridgeToPromise: TransactionConfirma`
`108`	`108`	`}`
`109`	`109`
`110`	`110`	`func didClose(in coordinator: TransactionConfirmationCoordinator) {`
`111`		`- seal.reject(DAppError.cancelled)`
	`111`	`+ seal.reject(JsonRpcError.requestRejected)`
`112`	`112`	`}`
`113`	`113`
`114`	`114`	`func buyCrypto(wallet: Wallet, server: RPCServer, viewController: UIViewController, source: Analytics.BuyCryptoSource) {`
Original file line number	Diff line number	Diff line change
`@@ -29,4 +29,8 @@ public extension JsonRpcError {`
`29`	`29`	`static func unsupportedChain(chainId: String) -> JsonRpcError {`
`30`	`30`	`JsonRpcError(code: 4902, message: "Unrecognized chain ID \(chainId). Try adding the chain using wallet_addEthereumChain first.")`
`31`	`31`	`}`
	`32`	`+`
	`33`	`+ static func internalError(message: String) -> JsonRpcError {`
	`34`	`+ JsonRpcError(code: -32603, message: message)`
	`35`	`+ }`
`32`	`36`	`}`