diff --git a/Encrypted Ink.xcodeproj/project.pbxproj b/Encrypted Ink.xcodeproj/project.pbxproj index f151aee5..8e3176cc 100644 --- a/Encrypted Ink.xcodeproj/project.pbxproj +++ b/Encrypted Ink.xcodeproj/project.pbxproj @@ -7,20 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 0DB729122674E2DB0011F7A1 /* EIP712ParameterEncoder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729022674E2DB0011F7A1 /* EIP712ParameterEncoder.swift */; }; - 0DB729142674E2DB0011F7A1 /* EIP712Parameter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729042674E2DB0011F7A1 /* EIP712Parameter.swift */; }; - 0DB729152674E2DB0011F7A1 /* EIP712Error.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729052674E2DB0011F7A1 /* EIP712Error.swift */; }; - 0DB729162674E2DB0011F7A1 /* EIP712SimpleValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729062674E2DB0011F7A1 /* EIP712SimpleValue.swift */; }; - 0DB729172674E2DB0011F7A1 /* EIP712StructType.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729072674E2DB0011F7A1 /* EIP712StructType.swift */; }; - 0DB729182674E2DB0011F7A1 /* EIP712Signer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729082674E2DB0011F7A1 /* EIP712Signer.swift */; }; - 0DB729192674E2DB0011F7A1 /* EIP712TypedData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729092674E2DB0011F7A1 /* EIP712TypedData.swift */; }; - 0DB7291A2674E2DB0011F7A1 /* EIP712Type.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB7290A2674E2DB0011F7A1 /* EIP712Type.swift */; }; - 0DB7291B2674E2DB0011F7A1 /* EIP712Hash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB7290B2674E2DB0011F7A1 /* EIP712Hash.swift */; }; - 0DB7291C2674E2DB0011F7A1 /* EIP712Value.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB7290D2674E2DB0011F7A1 /* EIP712Value.swift */; }; - 0DB7291D2674E2DB0011F7A1 /* EIP712Hashable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB7290E2674E2DB0011F7A1 /* EIP712Hashable.swift */; }; - 0DB7291E2674E2DB0011F7A1 /* EIP712Signable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB7290F2674E2DB0011F7A1 /* EIP712Signable.swift */; }; - 0DB7291F2674E2DB0011F7A1 /* EIP712Representable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729102674E2DB0011F7A1 /* EIP712Representable.swift */; }; - 0DB729202674E2DB0011F7A1 /* EIP712Domain.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DB729112674E2DB0011F7A1 /* EIP712Domain.swift */; }; 0DC850E726B73A5900809E82 /* AuthenticationReason.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DC850E626B73A5900809E82 /* AuthenticationReason.swift */; }; 28BDF30EBC80362870C988B6 /* Pods_Encrypted_Ink.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E2A642C960E4952955E6E82 /* Pods_Encrypted_Ink.framework */; }; 2C03D1D2269B407900EF10EA /* NetworkMonitor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C03D1D1269B407900EF10EA /* NetworkMonitor.swift */; }; @@ -32,10 +18,12 @@ 2C1995562674D0F300A8E370 /* Ethereum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C1995552674D0F300A8E370 /* Ethereum.swift */; }; 2C208A9F26813408005BA500 /* Secrets.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C208A9E26813408005BA500 /* Secrets.swift */; }; 2C528A16267FA8EB00CA3ADD /* Defaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C528A15267FA8EB00CA3ADD /* Defaults.swift */; }; + 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 */; }; + 2C6B964F26B9D98C00D2C819 /* Colors.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 2C6B964E26B9D98C00D2C819 /* Colors.xcassets */; }; 2C78F8282683BDCC00C10670 /* Alert.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C78F8272683BDCC00C10670 /* Alert.swift */; }; 2C797E7E267BB88800F2CE2D /* WelcomeViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C797E7D267BB88800F2CE2D /* WelcomeViewController.swift */; }; - 2C8A09B52675101300993638 /* AccountsService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C8A09B42675101300993638 /* AccountsService.swift */; }; 2C8A09C6267513FC00993638 /* Agent.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C8A09C5267513FC00993638 /* Agent.swift */; }; 2C8A09D42675184700993638 /* Window.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C8A09D32675184700993638 /* Window.swift */; }; 2C8A09D726751A0C00993638 /* WalletConnect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C8A09D626751A0C00993638 /* WalletConnect.swift */; }; @@ -52,28 +40,16 @@ 2CC0CDBE2692027E0072922A /* PriceService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC0CDBD2692027E0072922A /* PriceService.swift */; }; 2CC8946F269A2E8C00879245 /* SessionStorage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC8946E269A2E8C00879245 /* SessionStorage.swift */; }; 2CC89471269A334A00879245 /* UserDefaults.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC89470269A334A00879245 /* UserDefaults.swift */; }; + 2CD0669126B5537B00728C20 /* InkWallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD0668B26B2142000728C20 /* InkWallet.swift */; }; + 2CD0669226B5537B00728C20 /* WalletsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD0668926B213E500728C20 /* WalletsManager.swift */; }; 2CD0B3F526A0DAA900488D92 /* NSPasteboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD0B3F426A0DAA900488D92 /* NSPasteboard.swift */; }; 2CD0B3F726AC619900488D92 /* AddAccountOptionCellView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD0B3F626AC619900488D92 /* AddAccountOptionCellView.swift */; }; 2CDAB3722675B3F0009F8B97 /* PasswordViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CDAB3712675B3F0009F8B97 /* PasswordViewController.swift */; }; 2CE3D012267F73C00032A62E /* Transaction.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE3D011267F73C00032A62E /* Transaction.swift */; }; - 2CE3D015267F73E80032A62E /* AccountWithKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE3D014267F73E80032A62E /* AccountWithKey.swift */; }; + 2CE3D015267F73E80032A62E /* LegacyAccountWithKey.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CE3D014267F73E80032A62E /* LegacyAccountWithKey.swift */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - 0DB729022674E2DB0011F7A1 /* EIP712ParameterEncoder.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712ParameterEncoder.swift; sourceTree = ""; }; - 0DB729042674E2DB0011F7A1 /* EIP712Parameter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Parameter.swift; sourceTree = ""; }; - 0DB729052674E2DB0011F7A1 /* EIP712Error.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Error.swift; sourceTree = ""; }; - 0DB729062674E2DB0011F7A1 /* EIP712SimpleValue.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712SimpleValue.swift; sourceTree = ""; }; - 0DB729072674E2DB0011F7A1 /* EIP712StructType.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712StructType.swift; sourceTree = ""; }; - 0DB729082674E2DB0011F7A1 /* EIP712Signer.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Signer.swift; sourceTree = ""; }; - 0DB729092674E2DB0011F7A1 /* EIP712TypedData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712TypedData.swift; sourceTree = ""; }; - 0DB7290A2674E2DB0011F7A1 /* EIP712Type.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Type.swift; sourceTree = ""; }; - 0DB7290B2674E2DB0011F7A1 /* EIP712Hash.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Hash.swift; sourceTree = ""; }; - 0DB7290D2674E2DB0011F7A1 /* EIP712Value.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Value.swift; sourceTree = ""; }; - 0DB7290E2674E2DB0011F7A1 /* EIP712Hashable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Hashable.swift; sourceTree = ""; }; - 0DB7290F2674E2DB0011F7A1 /* EIP712Signable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Signable.swift; sourceTree = ""; }; - 0DB729102674E2DB0011F7A1 /* EIP712Representable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Representable.swift; sourceTree = ""; }; - 0DB729112674E2DB0011F7A1 /* EIP712Domain.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EIP712Domain.swift; sourceTree = ""; }; 0DC850E626B73A5900809E82 /* AuthenticationReason.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AuthenticationReason.swift; sourceTree = ""; }; 2C03D1D1269B407900EF10EA /* NetworkMonitor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkMonitor.swift; sourceTree = ""; }; 2C03D1D4269B428C00EF10EA /* Notification.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Notification.swift; sourceTree = ""; }; @@ -87,10 +63,12 @@ 2C1995552674D0F300A8E370 /* Ethereum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ethereum.swift; sourceTree = ""; }; 2C208A9E26813408005BA500 /* Secrets.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Secrets.swift; sourceTree = ""; }; 2C528A15267FA8EB00CA3ADD /* Defaults.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Defaults.swift; 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 = ""; }; + 2C6B964E26B9D98C00D2C819 /* Colors.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Colors.xcassets; sourceTree = ""; }; 2C78F8272683BDCC00C10670 /* Alert.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Alert.swift; sourceTree = ""; }; 2C797E7D267BB88800F2CE2D /* WelcomeViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeViewController.swift; sourceTree = ""; }; - 2C8A09B42675101300993638 /* AccountsService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountsService.swift; sourceTree = ""; }; 2C8A09C5267513FC00993638 /* Agent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Agent.swift; sourceTree = ""; }; 2C8A09D32675184700993638 /* Window.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Window.swift; sourceTree = ""; }; 2C8A09D626751A0C00993638 /* WalletConnect.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletConnect.swift; sourceTree = ""; }; @@ -113,7 +91,7 @@ 2CD0B3F626AC619900488D92 /* AddAccountOptionCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAccountOptionCellView.swift; sourceTree = ""; }; 2CDAB3712675B3F0009F8B97 /* PasswordViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordViewController.swift; sourceTree = ""; }; 2CE3D011267F73C00032A62E /* Transaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Transaction.swift; sourceTree = ""; }; - 2CE3D014267F73E80032A62E /* AccountWithKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountWithKey.swift; sourceTree = ""; }; + 2CE3D014267F73E80032A62E /* LegacyAccountWithKey.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LegacyAccountWithKey.swift; sourceTree = ""; }; 35AD6E3AC630C8A9B4EC16D9 /* Pods-Encrypted Ink.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Encrypted Ink.release.xcconfig"; path = "Target Support Files/Pods-Encrypted Ink/Pods-Encrypted Ink.release.xcconfig"; sourceTree = ""; }; 3E2A642C960E4952955E6E82 /* Pods_Encrypted_Ink.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Encrypted_Ink.framework; sourceTree = BUILT_PRODUCTS_DIR; }; A858B0F7D88913EAB1FA50B0 /* Pods-Encrypted Ink.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Encrypted Ink.debug.xcconfig"; path = "Target Support Files/Pods-Encrypted Ink/Pods-Encrypted Ink.debug.xcconfig"; sourceTree = ""; }; @@ -131,35 +109,6 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0DB729012674E2DB0011F7A1 /* EIP712 */ = { - isa = PBXGroup; - children = ( - 0DB729022674E2DB0011F7A1 /* EIP712ParameterEncoder.swift */, - 0DB729042674E2DB0011F7A1 /* EIP712Parameter.swift */, - 0DB729052674E2DB0011F7A1 /* EIP712Error.swift */, - 0DB729062674E2DB0011F7A1 /* EIP712SimpleValue.swift */, - 0DB729072674E2DB0011F7A1 /* EIP712StructType.swift */, - 0DB729082674E2DB0011F7A1 /* EIP712Signer.swift */, - 0DB729092674E2DB0011F7A1 /* EIP712TypedData.swift */, - 0DB7290A2674E2DB0011F7A1 /* EIP712Type.swift */, - 0DB7290B2674E2DB0011F7A1 /* EIP712Hash.swift */, - 0DB729112674E2DB0011F7A1 /* EIP712Domain.swift */, - 0DB7290C2674E2DB0011F7A1 /* Protocols */, - ); - path = EIP712; - sourceTree = ""; - }; - 0DB7290C2674E2DB0011F7A1 /* Protocols */ = { - isa = PBXGroup; - children = ( - 0DB7290D2674E2DB0011F7A1 /* EIP712Value.swift */, - 0DB7290E2674E2DB0011F7A1 /* EIP712Hashable.swift */, - 0DB7290F2674E2DB0011F7A1 /* EIP712Signable.swift */, - 0DB729102674E2DB0011F7A1 /* EIP712Representable.swift */, - ); - path = Protocols; - sourceTree = ""; - }; 0DC850E926B73A8200809E82 /* Models */ = { isa = PBXGroup; children = ( @@ -203,6 +152,7 @@ 2C8A09C2267513A700993638 /* Ethereum */, 2C8A09E5267595C200993638 /* Views */, 2C1995432674C4BA00A8E370 /* Assets.xcassets */, + 2C6B964E26B9D98C00D2C819 /* Colors.xcassets */, 2C1995452674C4BA00A8E370 /* Main.storyboard */, 2C208AA126813497005BA500 /* Supporting Files */, ); @@ -224,6 +174,8 @@ children = ( 2C6706A4267A6BFE006AAEF2 /* Bundle.swift */, 2C03D1D4269B428C00EF10EA /* Notification.swift */, + 2C603D0126B6E13F00956955 /* String.swift */, + 2C6B964B26B9D92500D2C819 /* NSColor.swift */, 2CD0B3F426A0DAA900488D92 /* NSPasteboard.swift */, 2CC89470269A334A00879245 /* UserDefaults.swift */, ); @@ -234,9 +186,8 @@ isa = PBXGroup; children = ( 2C1995552674D0F300A8E370 /* Ethereum.swift */, - 2CE3D014267F73E80032A62E /* AccountWithKey.swift */, + 2CE3D014267F73E80032A62E /* LegacyAccountWithKey.swift */, 2CE3D011267F73C00032A62E /* Transaction.swift */, - 0DB729012674E2DB0011F7A1 /* EIP712 */, ); path = Ethereum; sourceTree = ""; @@ -270,7 +221,6 @@ 2C91742B267D2A7900049075 /* Services */ = { isa = PBXGroup; children = ( - 2C8A09B42675101300993638 /* AccountsService.swift */, 2C03D1D1269B407900EF10EA /* NetworkMonitor.swift */, 2C901C4C268A033100D0926A /* GasService.swift */, 2CC0CDBD2692027E0072922A /* PriceService.swift */, @@ -366,6 +316,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 2C6B964F26B9D98C00D2C819 /* Colors.xcassets in Resources */, 2C1995442674C4BA00A8E370 /* Assets.xcassets in Resources */, 2C1995472674C4BA00A8E370 /* Main.storyboard in Resources */, ); @@ -438,47 +389,36 @@ buildActionMask = 2147483647; files = ( 2C901C4A2689F01700D0926A /* Strings.swift in Sources */, - 0DB729152674E2DB0011F7A1 /* EIP712Error.swift in Sources */, 2C6706A5267A6BFE006AAEF2 /* Bundle.swift in Sources */, 2CC0CDBE2692027E0072922A /* PriceService.swift in Sources */, 2C8A09C6267513FC00993638 /* Agent.swift in Sources */, 2C8A09D42675184700993638 /* Window.swift in Sources */, - 0DB7291A2674E2DB0011F7A1 /* EIP712Type.swift in Sources */, 2C208A9F26813408005BA500 /* Secrets.swift in Sources */, 2CC8946F269A2E8C00879245 /* SessionStorage.swift in Sources */, - 0DB7291D2674E2DB0011F7A1 /* EIP712Hashable.swift in Sources */, - 0DB729162674E2DB0011F7A1 /* EIP712SimpleValue.swift in Sources */, - 0DB729122674E2DB0011F7A1 /* EIP712ParameterEncoder.swift in Sources */, 0DC850E726B73A5900809E82 /* AuthenticationReason.swift in Sources */, + 2CD0669126B5537B00728C20 /* InkWallet.swift in Sources */, 2C8A09D726751A0C00993638 /* WalletConnect.swift in Sources */, 2C03D1D2269B407900EF10EA /* NetworkMonitor.swift in Sources */, 2C8A09E326757FC000993638 /* AccountCellView.swift in Sources */, - 0DB729202674E2DB0011F7A1 /* EIP712Domain.swift in Sources */, - 0DB729182674E2DB0011F7A1 /* EIP712Signer.swift in Sources */, + 2C6B964C26B9D92500D2C819 /* NSColor.swift in Sources */, + 2C603D0226B6E13F00956955 /* String.swift in Sources */, 2CC89471269A334A00879245 /* UserDefaults.swift in Sources */, 2C78F8282683BDCC00C10670 /* Alert.swift in Sources */, 2C8A09EE2675965F00993638 /* WaitingViewController.swift in Sources */, 2C797E7E267BB88800F2CE2D /* WelcomeViewController.swift in Sources */, - 0DB729192674E2DB0011F7A1 /* EIP712TypedData.swift in Sources */, + 2CD0669226B5537B00728C20 /* WalletsManager.swift in Sources */, 2CD0B3F726AC619900488D92 /* AddAccountOptionCellView.swift in Sources */, 2C8A09E82675960D00993638 /* ErrorViewController.swift in Sources */, 2C1995422674C4B900A8E370 /* ImportViewController.swift in Sources */, 2C8E47A326A322E8007B8354 /* RightClickTableView.swift in Sources */, 2C901C472689E6D400D0926A /* ApproveTransactionViewController.swift in Sources */, - 2C8A09B52675101300993638 /* AccountsService.swift in Sources */, 2CDAB3722675B3F0009F8B97 /* PasswordViewController.swift in Sources */, 2C1995402674C4B900A8E370 /* AppDelegate.swift in Sources */, - 0DB729142674E2DB0011F7A1 /* EIP712Parameter.swift in Sources */, 2C901C4D268A033100D0926A /* GasService.swift in Sources */, 2C528A16267FA8EB00CA3ADD /* Defaults.swift in Sources */, 2CD0B3F526A0DAA900488D92 /* NSPasteboard.swift in Sources */, - 2CE3D015267F73E80032A62E /* AccountWithKey.swift in Sources */, + 2CE3D015267F73E80032A62E /* LegacyAccountWithKey.swift in Sources */, 2CE3D012267F73C00032A62E /* Transaction.swift in Sources */, - 0DB7291B2674E2DB0011F7A1 /* EIP712Hash.swift in Sources */, - 0DB729172674E2DB0011F7A1 /* EIP712StructType.swift in Sources */, - 0DB7291F2674E2DB0011F7A1 /* EIP712Representable.swift in Sources */, - 0DB7291E2674E2DB0011F7A1 /* EIP712Signable.swift in Sources */, - 0DB7291C2674E2DB0011F7A1 /* EIP712Value.swift in Sources */, 2C8A09EB2675964700993638 /* ApproveViewController.swift in Sources */, 2C03D1D5269B428C00EF10EA /* Notification.swift in Sources */, 2C1995562674D0F300A8E370 /* Ethereum.swift in Sources */, @@ -626,7 +566,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEVELOPMENT_TEAM = XWNXDSM6BU; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "$(SRCROOT)/Encrypted Ink/Supporting Files/Info.plist"; @@ -653,7 +593,7 @@ CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 22; + CURRENT_PROJECT_VERSION = 23; DEVELOPMENT_TEAM = XWNXDSM6BU; ENABLE_HARDENED_RUNTIME = YES; INFOPLIST_FILE = "$(SRCROOT)/Encrypted Ink/Supporting Files/Info.plist"; diff --git a/Encrypted Ink/Agent.swift b/Encrypted Ink/Agent.swift index 5b67c1db..b206e93c 100644 --- a/Encrypted Ink/Agent.swift +++ b/Encrypted Ink/Agent.swift @@ -11,7 +11,6 @@ class Agent: NSObject { private override init() { super.init() } private var statusBarItem: NSStatusItem! - private let accountsService = AccountsService.shared private var hasPassword = Keychain.shared.password != nil private var didEnterPasswordOnStart = false @@ -72,9 +71,9 @@ class Agent: NSObject { } let windowController = Window.showNew() - let completion = onSelectedAccount(session: session) + let completion = onSelectedWallet(session: session) let accountsList = instantiate(AccountsListViewController.self) - accountsList.onSelectedAccount = completion + accountsList.onSelectedWallet = completion windowController.contentViewController = accountsList } @@ -120,9 +119,9 @@ class Agent: NSObject { showInitialScreen(wcSession: session) } - func getAccountSelectionCompletionIfShouldSelect() -> ((AccountWithKey) -> Void)? { + func getWalletSelectionCompletionIfShouldSelect() -> ((InkWallet) -> Void)? { let session = getSessionFromPasteboard() - return onSelectedAccount(session: session) + return onSelectedWallet(session: session) } lazy private var statusBarMenu: NSMenu = { @@ -223,10 +222,10 @@ class Agent: NSObject { } } - private func onSelectedAccount(session: WCSession?) -> ((AccountWithKey) -> Void)? { + private func onSelectedWallet(session: WCSession?) -> ((InkWallet) -> Void)? { guard let session = session else { return nil } - return { [weak self] account in - self?.connectWallet(session: session, account: account) + return { [weak self] wallet in + self?.connectWallet(session: session, wallet: wallet) } } @@ -285,12 +284,12 @@ class Agent: NSObject { } } - private func connectWallet(session: WCSession, account: AccountWithKey) { + private func connectWallet(session: WCSession, wallet: InkWallet) { let windowController = Window.showNew() let window = windowController.window windowController.contentViewController = WaitingViewController.withReason("Connecting") - WalletConnect.shared.connect(session: session, address: account.address) { [weak window] _ in + WalletConnect.shared.connect(session: session, walletId: wallet.id) { [weak window] _ in if window?.isVisible == true { Window.closeAllAndActivateBrowser() } diff --git a/Encrypted Ink/AppDelegate.swift b/Encrypted Ink/AppDelegate.swift index dec1818f..a2153220 100644 --- a/Encrypted Ink/AppDelegate.swift +++ b/Encrypted Ink/AppDelegate.swift @@ -9,6 +9,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { private let gasService = GasService.shared private let priceService = PriceService.shared private let networkMonitor = NetworkMonitor.shared + private let walletsManager = WalletsManager.shared private var didFinishLaunching = false private var initialInputLink: String? @@ -34,6 +35,7 @@ class AppDelegate: NSObject, NSApplicationDelegate { gasService.start() priceService.start() networkMonitor.start() + walletsManager.start() didFinishLaunching = true if let link = initialInputLink { diff --git a/Encrypted Ink/Base.lproj/Main.storyboard b/Encrypted Ink/Base.lproj/Main.storyboard index 5d3b9fb0..cd8b86f1 100644 --- a/Encrypted Ink/Base.lproj/Main.storyboard +++ b/Encrypted Ink/Base.lproj/Main.storyboard @@ -1,8 +1,8 @@ - + - + @@ -724,7 +724,7 @@ - + @@ -736,18 +736,18 @@ - + - +