diff --git a/Safari Shared/Models/Requests/NearSafariRequest.swift b/Safari Shared/Models/Requests/NearSafariRequest.swift deleted file mode 100644 index 6ee16110..00000000 --- a/Safari Shared/Models/Requests/NearSafariRequest.swift +++ /dev/null @@ -1,50 +0,0 @@ -// Copyright © 2022 Tokenary. All rights reserved. - -import Foundation - -extension SafariRequest { - - struct Near: SafariRequestBody { - - enum Method: String, Decodable, CaseIterable { - case signIn, signAndSendTransactions - } - - struct SignInRequest { - let contractId: String - let methodNames: [String]? - } - - let method: Method - let account: String - let signInRequest: SignInRequest? - let transactions: [[String: Any]]? - - init?(name: String, json: [String: Any]) { - guard let method = Method(rawValue: name), - let account = json["account"] as? String else { return nil } - self.method = method - self.account = account - - let parameters = (json["object"] as? [String: Any])?["params"] as? [String: Any] - self.transactions = parameters?["transactions"] as? [[String: Any]] - - if let contractId = parameters?["contractId"] as? String { - self.signInRequest = SignInRequest(contractId: contractId, methodNames: parameters?["methodNames"] as? [String]) - } else { - self.signInRequest = nil - } - } - - var responseUpdatesStoredConfiguration: Bool { - switch method { - case .signIn: - return true - case .signAndSendTransactions: - return false - } - } - - } - -} diff --git a/Safari Shared/Models/Requests/SafariRequest.swift b/Safari Shared/Models/Requests/SafariRequest.swift index 9d9c6f3a..37837287 100644 --- a/Safari Shared/Models/Requests/SafariRequest.swift +++ b/Safari Shared/Models/Requests/SafariRequest.swift @@ -19,20 +19,11 @@ struct SafariRequest { enum Body { case unknown(Unknown) case ethereum(Ethereum) - case solana(Solana) - case tezos(Tezos) - case near(Near) var value: SafariRequestBody { switch self { case .ethereum(let body): return body - case .solana(let body): - return body - case .tezos(let body): - return body - case .near(let body): - return body case .unknown(let body): return body } @@ -80,18 +71,6 @@ struct SafariRequest { if let request = Ethereum(name: name, json: jsonBody) { body = .ethereum(request) } - case .solana: - if let request = Solana(name: name, json: jsonBody) { - body = .solana(request) - } - case .tezos: - if let request = Tezos(name: name, json: jsonBody) { - body = .tezos(request) - } - case .near: - if let request = Near(name: name, json: jsonBody) { - body = .near(request) - } case .unknown, .multiple: if let request = Unknown(name: name, json: jsonBody) { body = .unknown(request) diff --git a/Safari Shared/Models/Requests/SolanaSafariRequest.swift b/Safari Shared/Models/Requests/SolanaSafariRequest.swift deleted file mode 100644 index d5d9015a..00000000 --- a/Safari Shared/Models/Requests/SolanaSafariRequest.swift +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright © 2022 Tokenary. All rights reserved. - -import Foundation - -extension SafariRequest { - - struct Solana: SafariRequestBody { - - enum Method: String, Decodable, CaseIterable { - case connect, signMessage, signTransaction, signAllTransactions, signAndSendTransaction - } - - let method: Method - let publicKey: String - let message: String? - let messages: [String]? - let displayHex: Bool - let sendOptions: [String: Any]? - - init?(name: String, json: [String: Any]) { - guard let method = Method(rawValue: name), - let publicKey = json["publicKey"] as? String else { return nil } - self.method = method - self.publicKey = publicKey - let parameters = (json["object"] as? [String: Any])?["params"] as? [String: Any] - self.message = parameters?["message"] as? String - self.messages = parameters?["messages"] as? [String] - self.displayHex = (parameters?["display"] as? String) == "hex" - self.sendOptions = parameters?["options"] as? [String: Any] - } - - var responseUpdatesStoredConfiguration: Bool { - switch method { - case .connect: - return true - case .signMessage, .signTransaction, .signAllTransactions, .signAndSendTransaction: - return false - } - } - - } - -} diff --git a/Safari Shared/Models/Requests/TezosSafariRequest.swift b/Safari Shared/Models/Requests/TezosSafariRequest.swift deleted file mode 100644 index fff7c155..00000000 --- a/Safari Shared/Models/Requests/TezosSafariRequest.swift +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright © 2022 Tokenary. All rights reserved. - -import Foundation - -extension SafariRequest { - - struct Tezos: SafariRequestBody { - - init?(name: String, json: [String: Any]) { - - } - - var responseUpdatesStoredConfiguration: Bool { - return false - } - - } - -} diff --git a/Safari Shared/Models/Requests/UnknownSafariRequest.swift b/Safari Shared/Models/Requests/UnknownSafariRequest.swift index e241c471..e7ce0363 100644 --- a/Safari Shared/Models/Requests/UnknownSafariRequest.swift +++ b/Safari Shared/Models/Requests/UnknownSafariRequest.swift @@ -38,15 +38,7 @@ extension SafariRequest { guard let response = try? jsonDecoder.decode(ResponseToExtension.Ethereum.self, from: data), let address = response.results?.first else { continue } configurations.append(ProviderConfiguration(provider: provider, address: address, network: EthereumChain.withChainId(response.chainId))) - case .solana: - guard let response = try? jsonDecoder.decode(ResponseToExtension.Solana.self, from: data), - let address = response.publicKey else { continue } - configurations.append(ProviderConfiguration(provider: provider, address: address, network: nil)) - case .near: - guard let response = try? jsonDecoder.decode(ResponseToExtension.Near.self, from: data), - let address = response.account else { continue } - configurations.append(ProviderConfiguration(provider: provider, address: address, network: nil)) - case .tezos, .unknown, .multiple: + case .unknown, .multiple: continue } } diff --git a/Safari Shared/Models/Responses/NearResponseToExtension.swift b/Safari Shared/Models/Responses/NearResponseToExtension.swift deleted file mode 100644 index e39f942c..00000000 --- a/Safari Shared/Models/Responses/NearResponseToExtension.swift +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright © 2022 Tokenary. All rights reserved. - -import Foundation - -extension ResponseToExtension { - - struct Near: Codable { - - let account: String? - let response: String? - - init(account: String? = nil, response: [[String: Any]]? = nil) { - self.account = account - if let response = response, - let responseData = try? JSONSerialization.data(withJSONObject: response, options: .fragmentsAllowed), - let jsonString = String(data: responseData, encoding: .utf8) { - self.response = jsonString - } else { - self.response = nil - } - } - - } - -} diff --git a/Safari Shared/Models/Responses/ResponseToExtension.swift b/Safari Shared/Models/Responses/ResponseToExtension.swift index 4d3fbe26..e6e8b493 100644 --- a/Safari Shared/Models/Responses/ResponseToExtension.swift +++ b/Safari Shared/Models/Responses/ResponseToExtension.swift @@ -9,9 +9,6 @@ struct ResponseToExtension { enum Body { case ethereum(Ethereum) - case solana(Solana) - case tezos(Tezos) - case near(Near) case multiple(Multiple) var json: [String: Any] { @@ -21,12 +18,6 @@ struct ResponseToExtension { switch self { case .ethereum(let body): data = try? jsonEncoder.encode(body) - case .solana(let body): - data = try? jsonEncoder.encode(body) - case .near(let body): - data = try? jsonEncoder.encode(body) - case .tezos(let body): - data = try? jsonEncoder.encode(body) case .multiple(let body): let dict: [String: Any] = [ "bodies": body.bodies.map { $0.json }, @@ -48,12 +39,6 @@ struct ResponseToExtension { switch self { case .ethereum: return .ethereum - case .solana: - return .solana - case .near: - return .near - case .tezos: - return .tezos case .multiple: return .multiple } diff --git a/Safari Shared/Models/Responses/SolanaResponseToExtension.swift b/Safari Shared/Models/Responses/SolanaResponseToExtension.swift deleted file mode 100644 index 377d84d6..00000000 --- a/Safari Shared/Models/Responses/SolanaResponseToExtension.swift +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright © 2022 Tokenary. All rights reserved. - -import Foundation - -extension ResponseToExtension { - - struct Solana: Codable { - - let publicKey: String? - let result: String? - let results: [String]? - - init(publicKey: String? = nil, result: String? = nil, results: [String]? = nil) { - self.publicKey = publicKey - self.result = result - self.results = results - } - - } - -} diff --git a/Safari Shared/Models/Responses/TezosResponseToExtension.swift b/Safari Shared/Models/Responses/TezosResponseToExtension.swift deleted file mode 100644 index 75ede784..00000000 --- a/Safari Shared/Models/Responses/TezosResponseToExtension.swift +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright © 2022 Tokenary. All rights reserved. - -import Foundation - -extension ResponseToExtension { - - struct Tezos: Codable { - - } - -} diff --git a/Safari Shared/Models/Web3Provider.swift b/Safari Shared/Models/Web3Provider.swift index d0487c20..96cee90b 100644 --- a/Safari Shared/Models/Web3Provider.swift +++ b/Safari Shared/Models/Web3Provider.swift @@ -3,5 +3,5 @@ import Foundation enum Web3Provider: String, Codable { - case ethereum, solana, tezos, near, unknown, multiple + case ethereum, unknown, multiple } diff --git a/Shared/Extension/CoinType.swift b/Shared/Extension/CoinType.swift index c16c1dc5..bd182a40 100644 --- a/Shared/Extension/CoinType.swift +++ b/Shared/Extension/CoinType.swift @@ -47,12 +47,6 @@ extension CoinType { switch web3Provider { case .ethereum: return .ethereum - case .solana: - return .solana - case .tezos: - return .tezos - case .near: - return .near case .unknown, .multiple: return nil } diff --git a/Shared/Services/DappRequestProcessor.swift b/Shared/Services/DappRequestProcessor.swift index 0e7ea82b..2d80ce33 100644 --- a/Shared/Services/DappRequestProcessor.swift +++ b/Shared/Services/DappRequestProcessor.swift @@ -17,9 +17,6 @@ struct DappRequestProcessor { switch request.body { case let .ethereum(body): return process(request: request, ethereumRequest: body, completion: completion) - case .solana, .near, .tezos: - respond(to: request, error: "not supported yet", completion: completion) - return .none case let .unknown(body): switch body.method { case .justShowApp: @@ -46,12 +43,6 @@ struct DappRequestProcessor { case .ethereum: let responseBody = ResponseToExtension.Ethereum(results: [account.address], chainId: chain.hexStringId, rpcURL: chain.nodeURLString) specificProviderBodies.append(.ethereum(responseBody)) - case .solana: - let responseBody = ResponseToExtension.Solana(publicKey: account.address) - specificProviderBodies.append(.solana(responseBody)) - case .near: - let responseBody = ResponseToExtension.Near(account: account.address) - specificProviderBodies.append(.near(responseBody)) default: fatalError("Can't select that coin") } diff --git a/Tokenary iOS/Screens/Approve/ApproveViewController.swift b/Tokenary iOS/Screens/Approve/ApproveViewController.swift index a3d2b453..0c58225c 100644 --- a/Tokenary iOS/Screens/Approve/ApproveViewController.swift +++ b/Tokenary iOS/Screens/Approve/ApproveViewController.swift @@ -37,7 +37,7 @@ class ApproveViewController: UIViewController { static func with(subject: ApprovalSubject, provider: Web3Provider, account: Account, meta: String, peerMeta: PeerMeta?, completion: @escaping (Bool) -> Void) -> ApproveViewController { let new = instantiate(ApproveViewController.self, from: .main) new.completion = completion - new.shouldEnableWaiting = provider == .near && subject == .approveTransaction + new.shouldEnableWaiting = false new.account = account new.meta = meta new.approveTitle = subject.title diff --git a/Tokenary.xcodeproj/project.pbxproj b/Tokenary.xcodeproj/project.pbxproj index d59358fc..eed54ad3 100644 --- a/Tokenary.xcodeproj/project.pbxproj +++ b/Tokenary.xcodeproj/project.pbxproj @@ -35,14 +35,6 @@ 2C264BC227B2F2C100234393 /* EthereumSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BC027B2F2C100234393 /* EthereumSafariRequest.swift */; }; 2C264BC327B2F2C100234393 /* EthereumSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BC027B2F2C100234393 /* EthereumSafariRequest.swift */; }; 2C264BC427B2F2C100234393 /* EthereumSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BC027B2F2C100234393 /* EthereumSafariRequest.swift */; }; - 2C264BC627B2F2F400234393 /* SolanaSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BC527B2F2F400234393 /* SolanaSafariRequest.swift */; }; - 2C264BC727B2F2F400234393 /* SolanaSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BC527B2F2F400234393 /* SolanaSafariRequest.swift */; }; - 2C264BC827B2F2F400234393 /* SolanaSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BC527B2F2F400234393 /* SolanaSafariRequest.swift */; }; - 2C264BC927B2F2F400234393 /* SolanaSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BC527B2F2F400234393 /* SolanaSafariRequest.swift */; }; - 2C264BCB27B2F2FF00234393 /* TezosSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BCA27B2F2FF00234393 /* TezosSafariRequest.swift */; }; - 2C264BCC27B2F2FF00234393 /* TezosSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BCA27B2F2FF00234393 /* TezosSafariRequest.swift */; }; - 2C264BCD27B2F2FF00234393 /* TezosSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BCA27B2F2FF00234393 /* TezosSafariRequest.swift */; }; - 2C264BCE27B2F2FF00234393 /* TezosSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BCA27B2F2FF00234393 /* TezosSafariRequest.swift */; }; 2C264BD027B2F30C00234393 /* UnknownSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BCF27B2F30C00234393 /* UnknownSafariRequest.swift */; }; 2C264BD127B2F30C00234393 /* UnknownSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BCF27B2F30C00234393 /* UnknownSafariRequest.swift */; }; 2C264BD227B2F30C00234393 /* UnknownSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BCF27B2F30C00234393 /* UnknownSafariRequest.swift */; }; @@ -55,14 +47,6 @@ 2C264BDD27B5AC5400234393 /* EthereumResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BDB27B5AC5400234393 /* EthereumResponseToExtension.swift */; }; 2C264BDE27B5AC5400234393 /* EthereumResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BDB27B5AC5400234393 /* EthereumResponseToExtension.swift */; }; 2C264BDF27B5AC5400234393 /* EthereumResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BDB27B5AC5400234393 /* EthereumResponseToExtension.swift */; }; - 2C264BE127B5AC6000234393 /* SolanaResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BE027B5AC6000234393 /* SolanaResponseToExtension.swift */; }; - 2C264BE227B5AC6000234393 /* SolanaResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BE027B5AC6000234393 /* SolanaResponseToExtension.swift */; }; - 2C264BE327B5AC6000234393 /* SolanaResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BE027B5AC6000234393 /* SolanaResponseToExtension.swift */; }; - 2C264BE427B5AC6000234393 /* SolanaResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BE027B5AC6000234393 /* SolanaResponseToExtension.swift */; }; - 2C264BE627B5AC6800234393 /* TezosResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BE527B5AC6800234393 /* TezosResponseToExtension.swift */; }; - 2C264BE727B5AC6800234393 /* TezosResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BE527B5AC6800234393 /* TezosResponseToExtension.swift */; }; - 2C264BE827B5AC6800234393 /* TezosResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BE527B5AC6800234393 /* TezosResponseToExtension.swift */; }; - 2C264BE927B5AC6800234393 /* TezosResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BE527B5AC6800234393 /* TezosResponseToExtension.swift */; }; 2C264BEB27B6B50700234393 /* DappRequestProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BEA27B6B50700234393 /* DappRequestProcessor.swift */; }; 2C264BEC27B6B50700234393 /* DappRequestProcessor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BEA27B6B50700234393 /* DappRequestProcessor.swift */; }; 2C2AA1D228AD1DC100E35DBF /* SpecificWalletAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2AA1D128AD1DC100E35DBF /* SpecificWalletAccount.swift */; }; @@ -113,14 +97,6 @@ 2C8155682ADFC7A700F4559B /* popup.css in Resources */ = {isa = PBXBuildFile; fileRef = 2C8155662ADFC7A700F4559B /* popup.css */; }; 2C81556B2ADFC7B900F4559B /* popup.js in Resources */ = {isa = PBXBuildFile; fileRef = 2C8155692ADFC7B900F4559B /* popup.js */; }; 2C81556E2ADFC7C400F4559B /* popup.html in Resources */ = {isa = PBXBuildFile; fileRef = 2C81556C2ADFC7C400F4559B /* popup.html */; }; - 2C86A262282D1F090028EA11 /* NearSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C86A261282D1F090028EA11 /* NearSafariRequest.swift */; }; - 2C86A263282D1F090028EA11 /* NearSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C86A261282D1F090028EA11 /* NearSafariRequest.swift */; }; - 2C86A264282D1F090028EA11 /* NearSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C86A261282D1F090028EA11 /* NearSafariRequest.swift */; }; - 2C86A265282D1F090028EA11 /* NearSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C86A261282D1F090028EA11 /* NearSafariRequest.swift */; }; - 2C86A267282D1F220028EA11 /* NearResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C86A266282D1F220028EA11 /* NearResponseToExtension.swift */; }; - 2C86A268282D1F220028EA11 /* NearResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C86A266282D1F220028EA11 /* NearResponseToExtension.swift */; }; - 2C86A269282D1F220028EA11 /* NearResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C86A266282D1F220028EA11 /* NearResponseToExtension.swift */; }; - 2C86A26A282D1F220028EA11 /* NearResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C86A266282D1F220028EA11 /* NearResponseToExtension.swift */; }; 2C89D26827BADCA9006C0C8D /* DappRequestAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C89D26727BADCA9006C0C8D /* DappRequestAction.swift */; }; 2C89D26927BADCA9006C0C8D /* DappRequestAction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C89D26727BADCA9006C0C8D /* DappRequestAction.swift */; }; 2C8A09C6267513FC00993638 /* Agent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C8A09C5267513FC00993638 /* Agent.swift */; }; @@ -292,13 +268,9 @@ 2C1995552674D0F300A8E370 /* Ethereum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ethereum.swift; sourceTree = ""; }; 2C264BBB27B2F25E00234393 /* SafariRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafariRequest.swift; sourceTree = ""; }; 2C264BC027B2F2C100234393 /* EthereumSafariRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthereumSafariRequest.swift; sourceTree = ""; }; - 2C264BC527B2F2F400234393 /* SolanaSafariRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SolanaSafariRequest.swift; sourceTree = ""; }; - 2C264BCA27B2F2FF00234393 /* TezosSafariRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TezosSafariRequest.swift; sourceTree = ""; }; 2C264BCF27B2F30C00234393 /* UnknownSafariRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnknownSafariRequest.swift; sourceTree = ""; }; 2C264BD427B5806200234393 /* Web3Provider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Web3Provider.swift; sourceTree = ""; }; 2C264BDB27B5AC5400234393 /* EthereumResponseToExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthereumResponseToExtension.swift; sourceTree = ""; }; - 2C264BE027B5AC6000234393 /* SolanaResponseToExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SolanaResponseToExtension.swift; sourceTree = ""; }; - 2C264BE527B5AC6800234393 /* TezosResponseToExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TezosResponseToExtension.swift; sourceTree = ""; }; 2C264BEA27B6B50700234393 /* DappRequestProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DappRequestProcessor.swift; sourceTree = ""; }; 2C2AA1D128AD1DC100E35DBF /* SpecificWalletAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpecificWalletAccount.swift; sourceTree = ""; }; 2C2AA1D428AFB1AD00E35DBF /* MultipleResponseToExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultipleResponseToExtension.swift; sourceTree = ""; }; @@ -342,8 +314,6 @@ 2C8155662ADFC7A700F4559B /* popup.css */ = {isa = PBXFileReference; lastKnownFileType = text.css; path = popup.css; sourceTree = ""; }; 2C8155692ADFC7B900F4559B /* popup.js */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.javascript; path = popup.js; sourceTree = ""; }; 2C81556C2ADFC7C400F4559B /* popup.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = popup.html; sourceTree = ""; }; - 2C86A261282D1F090028EA11 /* NearSafariRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearSafariRequest.swift; sourceTree = ""; }; - 2C86A266282D1F220028EA11 /* NearResponseToExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NearResponseToExtension.swift; sourceTree = ""; }; 2C89D26727BADCA9006C0C8D /* DappRequestAction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DappRequestAction.swift; sourceTree = ""; }; 2C89D26A27BAF2A3006C0C8D /* yarn.lock */ = {isa = PBXFileReference; lastKnownFileType = text; name = yarn.lock; path = "web3-provider/yarn.lock"; sourceTree = ""; }; 2C89D26B27BAF2A3006C0C8D /* package-lock.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; name = "package-lock.json"; path = "web3-provider/package-lock.json"; sourceTree = ""; }; @@ -565,9 +535,6 @@ 2C773F61274523DC007B04E7 /* ResponseToExtension.swift */, 2C2AA1D428AFB1AD00E35DBF /* MultipleResponseToExtension.swift */, 2C264BDB27B5AC5400234393 /* EthereumResponseToExtension.swift */, - 2C264BE027B5AC6000234393 /* SolanaResponseToExtension.swift */, - 2C86A266282D1F220028EA11 /* NearResponseToExtension.swift */, - 2C264BE527B5AC6800234393 /* TezosResponseToExtension.swift */, ); path = Responses; sourceTree = ""; @@ -711,9 +678,6 @@ 2C90E61C27B2C5C100C8991E /* InternalSafariRequest.swift */, 2C264BBB27B2F25E00234393 /* SafariRequest.swift */, 2C264BC027B2F2C100234393 /* EthereumSafariRequest.swift */, - 2C86A261282D1F090028EA11 /* NearSafariRequest.swift */, - 2C264BC527B2F2F400234393 /* SolanaSafariRequest.swift */, - 2C264BCA27B2F2FF00234393 /* TezosSafariRequest.swift */, 2C264BCF27B2F30C00234393 /* UnknownSafariRequest.swift */, ); path = Requests; @@ -1266,23 +1230,17 @@ buildActionMask = 2147483647; files = ( 2CDD86FA2AE3296600F33F95 /* Secrets.swift in Sources */, - 2C264BCD27B2F2FF00234393 /* TezosSafariRequest.swift in Sources */, 2CF255B2275A4A7200AE54B9 /* UserDefaults.swift in Sources */, - 2C264BC827B2F2F400234393 /* SolanaSafariRequest.swift in Sources */, 2C264BD227B2F30C00234393 /* UnknownSafariRequest.swift in Sources */, 2C264BD727B5806200234393 /* Web3Provider.swift in Sources */, 2C90E61D27B2C5C100C8991E /* InternalSafariRequest.swift in Sources */, - 2C86A269282D1F220028EA11 /* NearResponseToExtension.swift in Sources */, 2C2AA1D728AFB1AD00E35DBF /* MultipleResponseToExtension.swift in Sources */, - 2C264BE327B5AC6000234393 /* SolanaResponseToExtension.swift in Sources */, 2C773F5E27450B97007B04E7 /* ExtensionBridge.swift in Sources */, 2C264BDE27B5AC5400234393 /* EthereumResponseToExtension.swift in Sources */, 2CC8C5AC276A7EF70083FB1B /* EthereumChain.swift in Sources */, 2C264BC327B2F2C100234393 /* EthereumSafariRequest.swift in Sources */, 2C264BBE27B2F25E00234393 /* SafariRequest.swift in Sources */, - 2C264BE827B5AC6800234393 /* TezosResponseToExtension.swift in Sources */, 2C09CBA2273979C1009AD39B /* SafariWebExtensionHandler.swift in Sources */, - 2C86A264282D1F090028EA11 /* NearSafariRequest.swift in Sources */, 2C773F63274523DC007B04E7 /* ResponseToExtension.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1301,14 +1259,11 @@ 2C8A09C6267513FC00993638 /* Agent.swift in Sources */, 2C8A09D42675184700993638 /* Window.swift in Sources */, 2C264BD527B5806200234393 /* Web3Provider.swift in Sources */, - 2C86A267282D1F220028EA11 /* NearResponseToExtension.swift in Sources */, - 2C264BC627B2F2F400234393 /* SolanaSafariRequest.swift in Sources */, 2C4768B42826ED83005E8D4D /* CoinType.swift in Sources */, 2C9F0B6526BDC9AF008FA3D6 /* EthereumNetwork.swift in Sources */, 2C773F62274523DC007B04E7 /* ResponseToExtension.swift in Sources */, 0DC850E726B73A5900809E82 /* AuthenticationReason.swift in Sources */, 2C4768AB2826CA63005E8D4D /* CoinDerivation.swift in Sources */, - 2C86A262282D1F090028EA11 /* NearSafariRequest.swift in Sources */, 2CAA412526C7CD93009F3535 /* ReviewRequester.swift in Sources */, 2CD0669126B5537B00728C20 /* TokenaryWallet.swift in Sources */, 2C89D26827BADCA9006C0C8D /* DappRequestAction.swift in Sources */, @@ -1330,7 +1285,6 @@ 2CB4031D281D745D00BAEBEE /* NSTableView.swift in Sources */, 2CD0B3F726AC619900488D92 /* AddAccountOptionCellView.swift in Sources */, 0D059AD226C2796200EE3023 /* ApprovalSubject.swift in Sources */, - 2C264BCB27B2F2FF00234393 /* TezosSafariRequest.swift in Sources */, 2C1995422674C4B900A8E370 /* ImportViewController.swift in Sources */, 2C8E47A326A322E8007B8354 /* RightClickTableView.swift in Sources */, 2C773F5F27450FBD007B04E7 /* ExtensionBridge.swift in Sources */, @@ -1343,13 +1297,11 @@ 2C5C829F2822B9DF007D9488 /* Images.swift in Sources */, 2C4297282ADEDCBD0044357A /* PeerMeta.swift in Sources */, 2C528A16267FA8EB00CA3ADD /* Defaults.swift in Sources */, - 2C264BE127B5AC6000234393 /* SolanaResponseToExtension.swift in Sources */, 2C264BBC27B2F25E00234393 /* SafariRequest.swift in Sources */, 2CFAE56A28BE6292001D0799 /* NSImage.swift in Sources */, 2CD0B3F526A0DAA900488D92 /* NSPasteboard.swift in Sources */, 2C2AA1D528AFB1AD00E35DBF /* MultipleResponseToExtension.swift in Sources */, 2C264BEB27B6B50700234393 /* DappRequestProcessor.swift in Sources */, - 2C264BE627B5AC6800234393 /* TezosResponseToExtension.swift in Sources */, 2CE3D012267F73C00032A62E /* Transaction.swift in Sources */, 2C90E62227B2ED2D00C8991E /* SafariRequest+Helpers.swift in Sources */, 2C09FC662828331D00DE9C27 /* Image.swift in Sources */, @@ -1380,7 +1332,6 @@ 2C96D392276232A300687301 /* UITableView.swift in Sources */, 2CF255A5275A48BB00AE54B9 /* ReviewRequester.swift in Sources */, 2CF255B6275A746000AE54B9 /* AccountsListViewController.swift in Sources */, - 2C264BCC27B2F2FF00234393 /* TezosSafariRequest.swift in Sources */, 2C96D3A42763C6A800687301 /* UIView.swift in Sources */, 2CF25597275A46D300AE54B9 /* Defaults.swift in Sources */, 2CF255A2275A47DD00AE54B9 /* String.swift in Sources */, @@ -1389,7 +1340,6 @@ 2CF255AB275A48CF00AE54B9 /* Ethereum.swift in Sources */, 2CC8C5A22767D3B30083FB1B /* GasPriceSliderTableViewCell.swift in Sources */, 2CC6EF0D275E64810040CC62 /* UIViewController.swift in Sources */, - 2C264BE227B5AC6000234393 /* SolanaResponseToExtension.swift in Sources */, 2C264BDD27B5AC5400234393 /* EthereumResponseToExtension.swift in Sources */, 2CF255A9275A48BB00AE54B9 /* Keychain.swift in Sources */, 2CF255A7275A48BB00AE54B9 /* PriceService.swift in Sources */, @@ -1399,7 +1349,6 @@ 2C96D38F2762317300687301 /* AccountTableViewCell.swift in Sources */, 2C264BEC27B6B50700234393 /* DappRequestProcessor.swift in Sources */, 2CF255A1275A47DD00AE54B9 /* Notification.swift in Sources */, - 2C86A263282D1F090028EA11 /* NearSafariRequest.swift in Sources */, 2C4297292ADEDCBD0044357A /* PeerMeta.swift in Sources */, 2CE059392763F3FF0042D844 /* CGFloat.swift in Sources */, 2C264BBD27B2F25E00234393 /* SafariRequest.swift in Sources */, @@ -1412,7 +1361,6 @@ 2CF255AD275A48CF00AE54B9 /* EthereumChain.swift in Sources */, 2CF2559C275A477F00AE54B9 /* ApprovalSubject.swift in Sources */, 2C09FC672828331D00DE9C27 /* Image.swift in Sources */, - 2C264BE727B5AC6800234393 /* TezosResponseToExtension.swift in Sources */, 2C264BD627B5806200234393 /* Web3Provider.swift in Sources */, 2CE0594427640EB40042D844 /* ExtensionBridge.swift in Sources */, 2CF255B1275A4A1800AE54B9 /* ResponseToExtension.swift in Sources */, @@ -1425,10 +1373,8 @@ 2CF255B8275A748300AE54B9 /* ApproveTransactionViewController.swift in Sources */, 2C8E88A4275FB7B9003EB8DB /* UIApplication.swift in Sources */, 2C40709427667A8600AB3D55 /* ImageWithLabelTableViewCell.swift in Sources */, - 2C264BC727B2F2F400234393 /* SolanaSafariRequest.swift in Sources */, 2C5FF97226C84F7B00B32ACC /* AppDelegate.swift in Sources */, 2C4768AC2826CA63005E8D4D /* CoinDerivation.swift in Sources */, - 2C86A268282D1F220028EA11 /* NearResponseToExtension.swift in Sources */, 2C89D26927BADCA9006C0C8D /* DappRequestAction.swift in Sources */, 2CF255A8275A48BB00AE54B9 /* NetworkMonitor.swift in Sources */, 2C8E88A2275FA596003EB8DB /* ImportViewController.swift in Sources */, @@ -1452,23 +1398,17 @@ buildActionMask = 2147483647; files = ( 2CDD86FB2AE3296700F33F95 /* Secrets.swift in Sources */, - 2C264BCE27B2F2FF00234393 /* TezosSafariRequest.swift in Sources */, 2CE0594627640F470042D844 /* UserDefaults.swift in Sources */, - 2C264BC927B2F2F400234393 /* SolanaSafariRequest.swift in Sources */, 2C264BD327B2F30C00234393 /* UnknownSafariRequest.swift in Sources */, 2C264BD827B5806200234393 /* Web3Provider.swift in Sources */, 2C90E61E27B2C5C100C8991E /* InternalSafariRequest.swift in Sources */, - 2C86A26A282D1F220028EA11 /* NearResponseToExtension.swift in Sources */, 2C2AA1D828AFB1AD00E35DBF /* MultipleResponseToExtension.swift in Sources */, - 2C264BE427B5AC6000234393 /* SolanaResponseToExtension.swift in Sources */, 2CE0594327640EAB0042D844 /* ExtensionBridge.swift in Sources */, 2C264BDF27B5AC5400234393 /* EthereumResponseToExtension.swift in Sources */, 2CC8C5AD276A7EF80083FB1B /* EthereumChain.swift in Sources */, 2C264BC427B2F2C100234393 /* EthereumSafariRequest.swift in Sources */, 2C264BBF27B2F25E00234393 /* SafariRequest.swift in Sources */, - 2C264BE927B5AC6800234393 /* TezosResponseToExtension.swift in Sources */, 2CE0593F27640E300042D844 /* SafariWebExtensionHandler.swift in Sources */, - 2C86A265282D1F090028EA11 /* NearSafariRequest.swift in Sources */, 2CE0594527640EF10042D844 /* ResponseToExtension.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0;