diff --git a/Safari Shared/Models/Web3Provider.swift b/Safari Shared/Models/InpageProvider.swift similarity index 74% rename from Safari Shared/Models/Web3Provider.swift rename to Safari Shared/Models/InpageProvider.swift index 96cee90b..e16704bb 100644 --- a/Safari Shared/Models/Web3Provider.swift +++ b/Safari Shared/Models/InpageProvider.swift @@ -2,6 +2,6 @@ import Foundation -enum Web3Provider: String, Codable { +enum InpageProvider: String, Codable { case ethereum, unknown, multiple } diff --git a/Safari Shared/Models/Requests/SafariRequest.swift b/Safari Shared/Models/Requests/SafariRequest.swift index 37837287..22852466 100644 --- a/Safari Shared/Models/Requests/SafariRequest.swift +++ b/Safari Shared/Models/Requests/SafariRequest.swift @@ -11,7 +11,7 @@ struct SafariRequest { let id: Int let name: String - let provider: Web3Provider + let provider: InpageProvider let body: Body let host: String let favicon: String? @@ -62,7 +62,7 @@ struct SafariRequest { self.favicon = nil } - let provider = Web3Provider(rawValue: json["provider"] as? String ?? "") ?? .unknown + let provider = InpageProvider(rawValue: json["provider"] as? String ?? "") ?? .unknown self.provider = provider var body: Body? diff --git a/Safari Shared/Models/Requests/UnknownSafariRequest.swift b/Safari Shared/Models/Requests/UnknownSafariRequest.swift index 27d093bf..cb6ba6b3 100644 --- a/Safari Shared/Models/Requests/UnknownSafariRequest.swift +++ b/Safari Shared/Models/Requests/UnknownSafariRequest.swift @@ -12,7 +12,7 @@ extension SafariRequest { } struct ProviderConfiguration { - let provider: Web3Provider + let provider: InpageProvider let address: String let network: EthereumNetwork? } @@ -29,7 +29,7 @@ extension SafariRequest { if let latestConfigurations = json["latestConfigurations"] as? [[String: Any]] { for configuration in latestConfigurations { guard let providerString = configuration["provider"] as? String, - let provider = Web3Provider(rawValue: providerString), + let provider = InpageProvider(rawValue: providerString), let data = try? JSONSerialization.data(withJSONObject: configuration) else { continue } diff --git a/Safari Shared/Models/Responses/MultipleResponseToExtension.swift b/Safari Shared/Models/Responses/MultipleResponseToExtension.swift index f3f24e5e..2ef1c66e 100644 --- a/Safari Shared/Models/Responses/MultipleResponseToExtension.swift +++ b/Safari Shared/Models/Responses/MultipleResponseToExtension.swift @@ -7,7 +7,7 @@ extension ResponseToExtension { struct Multiple { let bodies: [Body] - let providersToDisconnect: [Web3Provider] + let providersToDisconnect: [InpageProvider] } diff --git a/Safari Shared/Models/Responses/ResponseToExtension.swift b/Safari Shared/Models/Responses/ResponseToExtension.swift index e6e8b493..39656680 100644 --- a/Safari Shared/Models/Responses/ResponseToExtension.swift +++ b/Safari Shared/Models/Responses/ResponseToExtension.swift @@ -35,7 +35,7 @@ struct ResponseToExtension { } } - var provider: Web3Provider { + var provider: InpageProvider { switch self { case .ethereum: return .ethereum diff --git a/Screensaver/Info.plist b/Screensaver/Info.plist deleted file mode 100644 index fd5fb609..00000000 --- a/Screensaver/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleDevelopmentRegion - $(DEVELOPMENT_LANGUAGE) - CFBundleDisplayName - Tokenary - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - $(PRODUCT_BUNDLE_PACKAGE_TYPE) - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - NSPrincipalClass - Tokenary_ScreensaverView - - diff --git a/Screensaver/Tokenary_ScreensaverView.h b/Screensaver/Tokenary_ScreensaverView.h deleted file mode 100644 index b4f47a52..00000000 --- a/Screensaver/Tokenary_ScreensaverView.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright © 2021 Tokenary. All rights reserved. - -#import - -@interface Tokenary_ScreensaverView : ScreenSaverView - -@end diff --git a/Screensaver/Tokenary_ScreensaverView.m b/Screensaver/Tokenary_ScreensaverView.m deleted file mode 100644 index 7ffa88ee..00000000 --- a/Screensaver/Tokenary_ScreensaverView.m +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright © 2021 Tokenary. All rights reserved. - -#import "Tokenary_ScreensaverView.h" - -@implementation Tokenary_ScreensaverView - -- (instancetype)initWithFrame:(NSRect)frame isPreview:(BOOL)isPreview -{ - self = [super initWithFrame:frame isPreview:isPreview]; - if (self) { - [self setAnimationTimeInterval:1/30.0]; - } - return self; -} - -- (void)startAnimation -{ - [super startAnimation]; -} - -- (void)stopAnimation -{ - [super stopAnimation]; -} - -- (void)drawRect:(NSRect)rect -{ - [super drawRect:rect]; -} - -- (void)animateOneFrame -{ - return; -} - -- (BOOL)hasConfigureSheet -{ - return NO; -} - -- (NSWindow*)configureSheet -{ - return nil; -} - -@end diff --git a/Shared/Extension/CoinType.swift b/Shared/Extension/CoinType.swift index bd182a40..6efeaa9a 100644 --- a/Shared/Extension/CoinType.swift +++ b/Shared/Extension/CoinType.swift @@ -43,8 +43,8 @@ extension CoinType { } } - static func correspondingToWeb3Provider(_ web3Provider: Web3Provider) -> CoinType? { - switch web3Provider { + static func correspondingToInpageProvider(_ inpageProvider: InpageProvider) -> CoinType? { + switch inpageProvider { case .ethereum: return .ethereum case .unknown, .multiple: diff --git a/Shared/Models/DappRequestAction.swift b/Shared/Models/DappRequestAction.swift index e6f33ecb..fd32bd77 100644 --- a/Shared/Models/DappRequestAction.swift +++ b/Shared/Models/DappRequestAction.swift @@ -16,7 +16,7 @@ struct SelectAccountAction { let peer: PeerMeta? let coinType: CoinType? var selectedAccounts: Set - let initiallyConnectedProviders: Set + let initiallyConnectedProviders: Set var network: EthereumNetwork? let source: Source let completion: (EthereumNetwork?, [SpecificWalletAccount]?) -> Void @@ -27,7 +27,7 @@ struct SelectAccountAction { } struct SignMessageAction { - let provider: Web3Provider + let provider: InpageProvider let subject: ApprovalSubject let account: Account let meta: String @@ -36,7 +36,7 @@ struct SignMessageAction { } struct SendTransactionAction { - let provider: Web3Provider + let provider: InpageProvider let transaction: Transaction let chain: EthereumNetwork let account: Account diff --git a/Shared/Services/DappRequestProcessor.swift b/Shared/Services/DappRequestProcessor.swift index aec13b72..8ef3d45b 100644 --- a/Shared/Services/DappRequestProcessor.swift +++ b/Shared/Services/DappRequestProcessor.swift @@ -24,7 +24,7 @@ struct DappRequestProcessor { return .justShowApp case .switchAccount: let preselectedAccounts = body.providerConfigurations.compactMap { (configuration) -> SpecificWalletAccount? in - guard let coin = CoinType.correspondingToWeb3Provider(configuration.provider) else { return nil } + guard let coin = CoinType.correspondingToInpageProvider(configuration.provider) else { return nil } return walletsManager.getSpecificAccount(coin: coin, address: configuration.address) } let network = body.providerConfigurations.compactMap { $0.network }.first @@ -49,7 +49,7 @@ struct DappRequestProcessor { } let providersToDisconnect = initiallyConnectedProviders.filter { provider in - if let coin = CoinType.correspondingToWeb3Provider(provider), + if let coin = CoinType.correspondingToInpageProvider(provider), specificWalletAccounts.contains(where: { $0.account.coin == coin }) { return false } else { diff --git a/Tokenary iOS/Screens/Approve/ApproveViewController.swift b/Tokenary iOS/Screens/Approve/ApproveViewController.swift index 0c58225c..fa89e3a1 100644 --- a/Tokenary iOS/Screens/Approve/ApproveViewController.swift +++ b/Tokenary iOS/Screens/Approve/ApproveViewController.swift @@ -34,7 +34,7 @@ class ApproveViewController: UIViewController { @IBOutlet weak var okButton: UIButton! @IBOutlet weak var cancelButton: UIButton! - static func with(subject: ApprovalSubject, provider: Web3Provider, account: Account, meta: String, peerMeta: PeerMeta?, completion: @escaping (Bool) -> Void) -> ApproveViewController { + static func with(subject: ApprovalSubject, provider: InpageProvider, account: Account, meta: String, peerMeta: PeerMeta?, completion: @escaping (Bool) -> Void) -> ApproveViewController { let new = instantiate(ApproveViewController.self, from: .main) new.completion = completion new.shouldEnableWaiting = false diff --git a/Tokenary.xcodeproj/project.pbxproj b/Tokenary.xcodeproj/project.pbxproj index c7dac4df..df88cbbd 100644 --- a/Tokenary.xcodeproj/project.pbxproj +++ b/Tokenary.xcodeproj/project.pbxproj @@ -39,10 +39,10 @@ 2C264BD127B2F30C00234393 /* UnknownSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BCF27B2F30C00234393 /* UnknownSafariRequest.swift */; }; 2C264BD227B2F30C00234393 /* UnknownSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BCF27B2F30C00234393 /* UnknownSafariRequest.swift */; }; 2C264BD327B2F30C00234393 /* UnknownSafariRequest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BCF27B2F30C00234393 /* UnknownSafariRequest.swift */; }; - 2C264BD527B5806200234393 /* Web3Provider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BD427B5806200234393 /* Web3Provider.swift */; }; - 2C264BD627B5806200234393 /* Web3Provider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BD427B5806200234393 /* Web3Provider.swift */; }; - 2C264BD727B5806200234393 /* Web3Provider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BD427B5806200234393 /* Web3Provider.swift */; }; - 2C264BD827B5806200234393 /* Web3Provider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BD427B5806200234393 /* Web3Provider.swift */; }; + 2C264BD527B5806200234393 /* InpageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BD427B5806200234393 /* InpageProvider.swift */; }; + 2C264BD627B5806200234393 /* InpageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BD427B5806200234393 /* InpageProvider.swift */; }; + 2C264BD727B5806200234393 /* InpageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BD427B5806200234393 /* InpageProvider.swift */; }; + 2C264BD827B5806200234393 /* InpageProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BD427B5806200234393 /* InpageProvider.swift */; }; 2C264BDC27B5AC5400234393 /* EthereumResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BDB27B5AC5400234393 /* EthereumResponseToExtension.swift */; }; 2C264BDD27B5AC5400234393 /* EthereumResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BDB27B5AC5400234393 /* EthereumResponseToExtension.swift */; }; 2C264BDE27B5AC5400234393 /* EthereumResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C264BDB27B5AC5400234393 /* EthereumResponseToExtension.swift */; }; @@ -79,8 +79,6 @@ 2C5FF97926C84F7B00B32ACC /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C5FF97726C84F7B00B32ACC /* Main.storyboard */; }; 2C5FF97B26C84F7C00B32ACC /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2C5FF97A26C84F7C00B32ACC /* Assets.xcassets */; }; 2C5FF97E26C84F7C00B32ACC /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 2C5FF97C26C84F7C00B32ACC /* LaunchScreen.storyboard */; }; - 2C5FF98C26C8567D00B32ACC /* Tokenary_ScreensaverView.h in Headers */ = {isa = PBXBuildFile; fileRef = 2C5FF98B26C8567D00B32ACC /* Tokenary_ScreensaverView.h */; }; - 2C5FF98E26C8567D00B32ACC /* Tokenary_ScreensaverView.m in Sources */ = {isa = PBXBuildFile; fileRef = 2C5FF98D26C8567D00B32ACC /* Tokenary_ScreensaverView.m */; }; 2C603D0226B6E13F00956955 /* String.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C603D0126B6E13F00956955 /* String.swift */; }; 2C6706A5267A6BFE006AAEF2 /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C6706A4267A6BFE006AAEF2 /* Bundle.swift */; }; 2C6B964C26B9D92500D2C819 /* NSColor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C6B964B26B9D92500D2C819 /* NSColor.swift */; }; @@ -275,7 +273,7 @@ 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 = ""; }; 2C264BCF27B2F30C00234393 /* UnknownSafariRequest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UnknownSafariRequest.swift; sourceTree = ""; }; - 2C264BD427B5806200234393 /* Web3Provider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Web3Provider.swift; sourceTree = ""; }; + 2C264BD427B5806200234393 /* InpageProvider.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InpageProvider.swift; sourceTree = ""; }; 2C264BDB27B5AC5400234393 /* EthereumResponseToExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EthereumResponseToExtension.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 = ""; }; @@ -302,10 +300,6 @@ 2C5FF97A26C84F7C00B32ACC /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 2C5FF97D26C84F7C00B32ACC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; 2C5FF97F26C84F7C00B32ACC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 2C5FF98926C8567D00B32ACC /* Screensaver.saver */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Screensaver.saver; sourceTree = BUILT_PRODUCTS_DIR; }; - 2C5FF98B26C8567D00B32ACC /* Tokenary_ScreensaverView.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Tokenary_ScreensaverView.h; sourceTree = ""; }; - 2C5FF98D26C8567D00B32ACC /* Tokenary_ScreensaverView.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = Tokenary_ScreensaverView.m; sourceTree = ""; }; - 2C5FF98F26C8567D00B32ACC /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 2C603D0126B6E13F00956955 /* String.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = String.swift; sourceTree = ""; }; 2C6706A4267A6BFE006AAEF2 /* Bundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bundle.swift; sourceTree = ""; }; 2C6B964B26B9D92500D2C819 /* NSColor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSColor.swift; sourceTree = ""; }; @@ -426,13 +420,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 2C5FF98626C8567D00B32ACC /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 2CCEB82A27594E2A00768473 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -488,7 +475,6 @@ 2CCEB7A227592A3800768473 /* Safari Shared */, 2C09CBA0273979C1009AD39B /* Safari macOS */, 2CCEB82E27594E2A00768473 /* Safari iOS */, - 2C5FF98A26C8567D00B32ACC /* Screensaver */, 2C19953D2674C4B900A8E370 /* Products */, FB5786212D81829B0FADBD25 /* Pods */, 2A7484A18D772B4233D171DA /* Frameworks */, @@ -500,7 +486,6 @@ children = ( 2C19953C2674C4B900A8E370 /* Tokenary.app */, 2C5FF96F26C84F7B00B32ACC /* Tokenary iOS.app */, - 2C5FF98926C8567D00B32ACC /* Screensaver.saver */, 2C09CB9F273979C1009AD39B /* Safari macOS.appex */, 2CCEB82D27594E2A00768473 /* Safari iOS.appex */, ); @@ -552,7 +537,7 @@ children = ( 2C90E62427B2F1B200C8991E /* Requests */, 2C264BD927B5A91B00234393 /* Responses */, - 2C264BD427B5806200234393 /* Web3Provider.swift */, + 2C264BD427B5806200234393 /* InpageProvider.swift */, ); path = Models; sourceTree = ""; @@ -598,16 +583,6 @@ path = "Tokenary iOS"; sourceTree = ""; }; - 2C5FF98A26C8567D00B32ACC /* Screensaver */ = { - isa = PBXGroup; - children = ( - 2C5FF98B26C8567D00B32ACC /* Tokenary_ScreensaverView.h */, - 2C5FF98D26C8567D00B32ACC /* Tokenary_ScreensaverView.m */, - 2C5FF98F26C8567D00B32ACC /* Info.plist */, - ); - path = Screensaver; - sourceTree = ""; - }; 2C6706A7267A6C04006AAEF2 /* Extensions */ = { isa = PBXGroup; children = ( @@ -890,17 +865,6 @@ }; /* End PBXGroup section */ -/* Begin PBXHeadersBuildPhase section */ - 2C5FF98426C8567D00B32ACC /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 2C5FF98C26C8567D00B32ACC /* Tokenary_ScreensaverView.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXHeadersBuildPhase section */ - /* Begin PBXNativeTarget section */ 2C09CB9E273979C1009AD39B /* Safari macOS */ = { isa = PBXNativeTarget; @@ -962,24 +926,6 @@ productReference = 2C5FF96F26C84F7B00B32ACC /* Tokenary iOS.app */; productType = "com.apple.product-type.application"; }; - 2C5FF98826C8567D00B32ACC /* Screensaver */ = { - isa = PBXNativeTarget; - buildConfigurationList = 2C5FF99026C8567D00B32ACC /* Build configuration list for PBXNativeTarget "Screensaver" */; - buildPhases = ( - 2C5FF98426C8567D00B32ACC /* Headers */, - 2C5FF98526C8567D00B32ACC /* Sources */, - 2C5FF98626C8567D00B32ACC /* Frameworks */, - 2C5FF98726C8567D00B32ACC /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = Screensaver; - productName = "Encrypted Ink Screensaver"; - productReference = 2C5FF98926C8567D00B32ACC /* Screensaver.saver */; - productType = "com.apple.product-type.bundle"; - }; 2CCEB82C27594E2A00768473 /* Safari iOS */ = { isa = PBXNativeTarget; buildConfigurationList = 2CCEB84927594E2A00768473 /* Build configuration list for PBXNativeTarget "Safari iOS" */; @@ -1016,9 +962,6 @@ 2C5FF96E26C84F7B00B32ACC = { CreatedOnToolsVersion = 12.5.1; }; - 2C5FF98826C8567D00B32ACC = { - CreatedOnToolsVersion = 12.5.1; - }; 2CCEB82C27594E2A00768473 = { CreatedOnToolsVersion = 13.1; }; @@ -1041,7 +984,6 @@ 2C5FF96E26C84F7B00B32ACC /* Tokenary iOS */, 2C09CB9E273979C1009AD39B /* Safari macOS */, 2CCEB82C27594E2A00768473 /* Safari iOS */, - 2C5FF98826C8567D00B32ACC /* Screensaver */, ); }; /* End PBXProject section */ @@ -1090,13 +1032,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 2C5FF98726C8567D00B32ACC /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 2CCEB82B27594E2A00768473 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1242,7 +1177,7 @@ 2CDD86FA2AE3296600F33F95 /* Secrets.swift in Sources */, 2CF255B2275A4A7200AE54B9 /* UserDefaults.swift in Sources */, 2C264BD227B2F30C00234393 /* UnknownSafariRequest.swift in Sources */, - 2C264BD727B5806200234393 /* Web3Provider.swift in Sources */, + 2C264BD727B5806200234393 /* InpageProvider.swift in Sources */, 2C8ED8D62AEA7DB200818D74 /* String.swift in Sources */, 2C90E61D27B2C5C100C8991E /* InternalSafariRequest.swift in Sources */, 2C2AA1D728AFB1AD00E35DBF /* MultipleResponseToExtension.swift in Sources */, @@ -1269,7 +1204,7 @@ 2CC0CDBE2692027E0072922A /* PriceService.swift in Sources */, 2C8A09C6267513FC00993638 /* Agent.swift in Sources */, 2C8A09D42675184700993638 /* Window.swift in Sources */, - 2C264BD527B5806200234393 /* Web3Provider.swift in Sources */, + 2C264BD527B5806200234393 /* InpageProvider.swift in Sources */, 2C4768B42826ED83005E8D4D /* CoinType.swift in Sources */, 2C773F62274523DC007B04E7 /* ResponseToExtension.swift in Sources */, 0DC850E726B73A5900809E82 /* AuthenticationReason.swift in Sources */, @@ -1376,7 +1311,7 @@ 2CF255AD275A48CF00AE54B9 /* EthereumNetwork.swift in Sources */, 2CF2559C275A477F00AE54B9 /* ApprovalSubject.swift in Sources */, 2C09FC672828331D00DE9C27 /* Image.swift in Sources */, - 2C264BD627B5806200234393 /* Web3Provider.swift in Sources */, + 2C264BD627B5806200234393 /* InpageProvider.swift in Sources */, 2CE0594427640EB40042D844 /* ExtensionBridge.swift in Sources */, 2CF255B1275A4A1800AE54B9 /* ResponseToExtension.swift in Sources */, 2C09FC602828078C00DE9C27 /* AccountsHeaderView.swift in Sources */, @@ -1400,14 +1335,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 2C5FF98526C8567D00B32ACC /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 2C5FF98E26C8567D00B32ACC /* Tokenary_ScreensaverView.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 2CCEB82927594E2A00768473 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -1415,7 +1342,7 @@ 2CDD86FB2AE3296700F33F95 /* Secrets.swift in Sources */, 2CE0594627640F470042D844 /* UserDefaults.swift in Sources */, 2C264BD327B2F30C00234393 /* UnknownSafariRequest.swift in Sources */, - 2C264BD827B5806200234393 /* Web3Provider.swift in Sources */, + 2C264BD827B5806200234393 /* InpageProvider.swift in Sources */, 2C8ED8D72AEA7DB300818D74 /* String.swift in Sources */, 2C90E61E27B2C5C100C8991E /* InternalSafariRequest.swift in Sources */, 2C2AA1D828AFB1AD00E35DBF /* MultipleResponseToExtension.swift in Sources */, @@ -1770,40 +1697,6 @@ }; name = Release; }; - 2C5FF99126C8567D00B32ACC /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 57; - DEVELOPMENT_TEAM = XWNXDSM6BU; - INFOPLIST_FILE = Screensaver/Info.plist; - INSTALL_PATH = "$(HOME)/Library/Screen Savers"; - MACOSX_DEPLOYMENT_TARGET = 11.4; - MARKETING_VERSION = 2.0.14; - PRODUCT_BUNDLE_IDENTIFIER = mac.tokenary.io.Screensaver; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = saver; - }; - name = Debug; - }; - 2C5FF99226C8567D00B32ACC /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 57; - DEVELOPMENT_TEAM = XWNXDSM6BU; - INFOPLIST_FILE = Screensaver/Info.plist; - INSTALL_PATH = "$(HOME)/Library/Screen Savers"; - MACOSX_DEPLOYMENT_TARGET = 11.4; - MARKETING_VERSION = 2.0.14; - PRODUCT_BUNDLE_IDENTIFIER = mac.tokenary.io.Screensaver; - PRODUCT_NAME = "$(TARGET_NAME)"; - WRAPPER_EXTENSION = saver; - }; - name = Release; - }; 2CCEB84727594E2A00768473 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -1912,15 +1805,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2C5FF99026C8567D00B32ACC /* Build configuration list for PBXNativeTarget "Screensaver" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 2C5FF99126C8567D00B32ACC /* Debug */, - 2C5FF99226C8567D00B32ACC /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 2CCEB84927594E2A00768473 /* Build configuration list for PBXNativeTarget "Safari iOS" */ = { isa = XCConfigurationList; buildConfigurations = (