lil-org/tiny-wallet
1
1
Fork 0
mirror of https://github.com/lil-org/tiny-wallet.git synced 2024-10-04 07:27:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

clean up tokenary

Browse Source
This commit is contained in:
ivan grachev 2024-02-28 14:53:27 +03:00
parent 9eab576bdf
commit 71dc4d8c50
28 changed files with 180 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
App iOS/Info.plist
View File

@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Tokenary</string>
<string>Wallet</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIcons</key>
@ -32,10 +32,10 @@
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleURLName</key>
<string>tokenary</string>
<string>tinywallet</string>
<key>CFBundleURLSchemes</key>
<array>
<string>tokenary</string>
<string>tinywallet</string>
</array>
</dict>
</array>

29
App iOS/Screens/Accounts/AccountsListViewController.swift
View File

@ -31,7 +31,7 @@ class AccountsListViewController: UIViewController, DataStateContainer {
private var network = Networks.ethereum
var selectAccountAction: SelectAccountAction?
private var wallets: [TokenaryWallet] {
private var wallets: [WalletContainer] {
return walletsManager.wallets
}
@ -88,7 +88,7 @@ class AccountsListViewController: UIViewController, DataStateContainer {
if forWalletSelection {
navigationItem.leftBarButtonItem = cancelItem
}
configureDataState(.noData, description: Strings.tokenaryIsEmpty, buttonTitle: Strings.addWallet) { [weak self] in
configureDataState(.noData, description: Strings.tinyWalletIsEmpty, buttonTitle: Strings.addWallet) { [weak self] in
self?.addWallet()
}
dataStateShouldMoveWithKeyboard(false)
@ -167,7 +167,7 @@ class AccountsListViewController: UIViewController, DataStateContainer {
}
}
private func walletForIndexPath(_ indexPath: IndexPath) -> TokenaryWallet {
private func walletForIndexPath(_ indexPath: IndexPath) -> WalletContainer {
let section = sections[indexPath.section]
let items = section.items
@ -242,9 +242,8 @@ class AccountsListViewController: UIViewController, DataStateContainer {
self?.redirectBack(requestId: id, tryFarcaster: true)
}
}
} else if let prefix = ["https://tokenary.io/extension?query=",
"tokenary://safari?request=",
"https://www.tokenary.io/extension?query="].first(where: { inputLinkString.hasPrefix($0) == true }),
} else if let prefix = ["https://lil.org/extension?query=",
"tinywallet://safari?request="].first(where: { inputLinkString.hasPrefix($0) == true }),
let request = SafariRequest(query: String(inputLinkString.dropFirst(prefix.count))) {
id = request.id
action = DappRequestProcessor.processSafariRequest(request) { [weak self] hash in
@ -393,7 +392,7 @@ class AccountsListViewController: UIViewController, DataStateContainer {
}
@objc private func preferencesButtonTapped() {
let actionSheet = UIAlertController(title: "❤️ " + Strings.tokenary.uppercased() + " ⭐️", message: nil, preferredStyle: .actionSheet)
let actionSheet = UIAlertController(title: "❤️ " + Strings.tinyWallet.uppercased() + " ⭐️", message: nil, preferredStyle: .actionSheet)
actionSheet.popoverPresentationController?.barButtonItem = preferencesItem
let xAction = UIAlertAction(title: Strings.viewOnX.withEllipsis, style: .default) { _ in
UIApplication.shared.open(URL.x)
@ -453,7 +452,7 @@ class AccountsListViewController: UIViewController, DataStateContainer {
showKey(wallet: wallet, mnemonic: true)
}
private func showKey(wallet: TokenaryWallet, mnemonic: Bool) {
private func showKey(wallet: WalletContainer, mnemonic: Bool) {
let secret: String
if mnemonic, let mnemonicString = try? walletsManager.exportMnemonic(wallet: wallet) {
secret = mnemonicString
@ -478,7 +477,7 @@ class AccountsListViewController: UIViewController, DataStateContainer {
present(importViewController.inNavigationController, animated: true)
}
private func showActionsForWallet(wallet: TokenaryWallet, headerView: AccountsHeaderView) {
private func showActionsForWallet(wallet: WalletContainer, headerView: AccountsHeaderView) {
let actionSheet = UIAlertController(title: Strings.multicoinWallet, message: nil, preferredStyle: .actionSheet)
actionSheet.popoverPresentationController?.sourceView = headerView
@ -505,7 +504,7 @@ class AccountsListViewController: UIViewController, DataStateContainer {
present(actionSheet, animated: true)
}
private func showActionsForAccount(_ account: Account, wallet: TokenaryWallet, cell: UITableViewCell?) {
private func showActionsForAccount(_ account: Account, wallet: WalletContainer, cell: UITableViewCell?) {
let actionSheet = UIAlertController(title: account.coin.name, message: account.address, preferredStyle: .actionSheet)
actionSheet.popoverPresentationController?.sourceView = cell
@ -542,7 +541,7 @@ class AccountsListViewController: UIViewController, DataStateContainer {
present(actionSheet, animated: true)
}
private func attemptToRemoveAccount(_ account: Account, fromWallet wallet: TokenaryWallet) {
private func attemptToRemoveAccount(_ account: Account, fromWallet wallet: WalletContainer) {
guard wallet.accounts.count > 1 else {
warnOnLastAccountRemovalAttempt(wallet: wallet)
return
@ -555,7 +554,7 @@ class AccountsListViewController: UIViewController, DataStateContainer {
}
}
private func warnOnLastAccountRemovalAttempt(wallet: TokenaryWallet) {
private func warnOnLastAccountRemovalAttempt(wallet: WalletContainer) {
let alert = UIAlertController(title: Strings.removingTheLastAccount, message: nil, preferredStyle: .alert)
let cancelAction = UIAlertAction(title: Strings.cancel, style: .cancel)
@ -569,7 +568,7 @@ class AccountsListViewController: UIViewController, DataStateContainer {
present(alert, animated: true)
}
private func askBeforeRemoving(wallet: TokenaryWallet) {
private func askBeforeRemoving(wallet: WalletContainer) {
let alert = UIAlertController(title: Strings.removedWalletsCantBeRecovered, message: nil, preferredStyle: .alert)
let removeAction = UIAlertAction(title: Strings.removeAnyway, style: .destructive) { [weak self] _ in
LocalAuthentication.attempt(reason: Strings.removeWallet, presentPasswordAlertFrom: self, passwordReason: Strings.toRemoveWallet) { success in
@ -584,12 +583,12 @@ class AccountsListViewController: UIViewController, DataStateContainer {
present(alert, animated: true)
}
private func removeWallet(_ wallet: TokenaryWallet) {
private func removeWallet(_ wallet: WalletContainer) {
try? walletsManager.delete(wallet: wallet)
reloadData()
}
private func didTapExportWallet(_ wallet: TokenaryWallet) {
private func didTapExportWallet(_ wallet: WalletContainer) {
let isMnemonic = wallet.isMnemonic
let title = isMnemonic ? Strings.secretWordsGiveFullAccess : Strings.privateKeyGivesFullAccess
let alert = UIAlertController(title: title, message: nil, preferredStyle: .alert)

4
App iOS/Screens/Accounts/EditAccountsViewController.swift
View File

@ -10,10 +10,10 @@ class EditAccountsViewController: UIViewController {
var isEnabled: Bool
}
var wallet: TokenaryWallet!
var wallet: WalletContainer!
private let walletsManager = WalletsManager.shared
private var cellModels = [PreviewAccountCellModel]()
private let previewAccountsQueue = DispatchQueue(label: "mac.tokenary.io.accounts", qos: .userInitiated)
private let previewAccountsQueue = DispatchQueue(label: "org.lil.wallet.accounts", qos: .userInitiated)
private var page = 1
private var requestedPreviewFor: Int?
private var lastPreviewDate = Date()

2
App iOS/Screens/PasswordViewController.swift
View File

@ -77,7 +77,7 @@ class PasswordViewController: UIViewController {
}
private func askForLocalAuthentication() {
LocalAuthentication.attempt(reason: Strings.enterTokenary, presentPasswordAlertFrom: nil, passwordReason: nil) { [weak self] success in
LocalAuthentication.attempt(reason: Strings.enterWallet, presentPasswordAlertFrom: nil, passwordReason: nil) { [weak self] success in
if success {
self?.showAccountsList()
} else {

9
App iOS/Tokenary iOS.entitlements → App iOS/Wallet iOS.entitlements
View File

@ -2,15 +2,16 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:tokenary.io</string>
<string>applinks:www.tokenary.io</string>
<string>applinks:lil.org</string>
<string>applinks:yo.finance</string>
</array>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>
<string>iCloud.tokenary</string>
<string>iCloud.tinywallet</string>
</array>
<key>com.apple.developer.icloud-services</key>
<array>
@ -18,7 +19,7 @@
</array>
<key>com.apple.security.application-groups</key>
<array>
<string>group.io.tokenary</string>
<string>group.org.lil.wallet</string>
</array>
</dict>
</plist>

8
App macOS/Agent.swift
View File

@ -105,16 +105,16 @@ class Agent: NSObject {
}
lazy private var statusBarMenu: NSMenu = {
let menu = NSMenu(title: Strings.tokenary)
let menu = NSMenu(title: Strings.tinyWallet)
let showItem = NSMenuItem(title: Strings.showTokenary, action: #selector(didSelectShowMenuItem), keyEquivalent: "")
let showItem = NSMenuItem(title: Strings.showWallet, action: #selector(didSelectShowMenuItem), keyEquivalent: "")
let safariItem = NSMenuItem(title: Strings.enableSafariExtension.withEllipsis, action: #selector(enableSafariExtension), keyEquivalent: "")
let mailItem = NSMenuItem(title: Strings.dropUsALine.withEllipsis, action: #selector(didSelectMailMenuItem), keyEquivalent: "")
let githubItem = NSMenuItem(title: Strings.viewOnGithub.withEllipsis, action: #selector(didSelectGitHubMenuItem), keyEquivalent: "")
let warpcastItem = NSMenuItem(title: Strings.viewOnWarpcast.withEllipsis, action: #selector(didSelectWarpcastMenuItem), keyEquivalent: "")
let xItem = NSMenuItem(title: Strings.viewOnX.withEllipsis, action: #selector(didSelectXMenuItem), keyEquivalent: "")
let quitItem = NSMenuItem(title: Strings.quit, action: #selector(didSelectQuitMenuItem), keyEquivalent: "q")
showItem.attributedTitle = NSAttributedString(string: "👀 " + Strings.showTokenary, attributes: [.font: NSFont.systemFont(ofSize: 15, weight: .semibold)])
showItem.attributedTitle = NSAttributedString(string: "👀 " + Strings.showWallet, attributes: [.font: NSFont.systemFont(ofSize: 15, weight: .semibold)])
showItem.target = self
safariItem.target = self
@ -141,7 +141,7 @@ class Agent: NSObject {
func warnBeforeQuitting(updateStatusBarAfterwards: Bool = false) {
Window.activateWindow(nil)
let alert = Alert()
alert.messageText = Strings.quitTokenary
alert.messageText = Strings.quitTinyWallet
alert.alertStyle = .warning
alert.addButton(withTitle: Strings.ok)
alert.addButton(withTitle: Strings.cancel)

2
App macOS/AppDelegate.swift
View File

@ -64,7 +64,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
if let txRequest = DirectTransactionRequest(from: url) {
processExternalRequest(.direct(txRequest))
} else {
let safariPrefix = "tokenary://safari?request="
let safariPrefix = "tinywallet://safari?request="
if url.hasPrefix(safariPrefix), let request = SafariRequest(query: String(url.dropFirst(safariPrefix.count))) {
processExternalRequest(.safari(request))
}

50
App macOS/Base.lproj/Main.storyboard
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22155" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="22505" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22155"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22505"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@ -12,11 +12,11 @@
<application id="hnw-xV-0zn" sceneMemberID="viewController">
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
<menuItem title="Tokenary" id="1Xt-HY-uBw">
<menuItem title="tiny wallet" id="1Xt-HY-uBw">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Tokenary" systemMenu="apple" id="uQy-DD-JDr">
<menu key="submenu" title="tiny wallet" systemMenu="apple" id="uQy-DD-JDr">
<items>
<menuItem title="About Tokenary" id="5kV-Vb-QxS">
<menuItem title="About tiny wallet" id="5kV-Vb-QxS">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
@ -30,7 +30,7 @@
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
</menuItem>
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
<menuItem title="Hide Tokenary" keyEquivalent="h" id="Olw-nP-bQN">
<menuItem title="Hide tiny wallet" keyEquivalent="h" id="Olw-nP-bQN">
<connections>
<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
</connections>
@ -48,7 +48,7 @@
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
<menuItem title="Quit Tokenary" keyEquivalent="q" id="4sb-4s-VLi">
<menuItem title="Quit tiny wallet" keyEquivalent="q" id="4sb-4s-VLi">
<connections>
<action selector="performClose:" target="Ady-hI-5gd" id="W3D-CJ-kQe"/>
</connections>
@ -661,7 +661,7 @@
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
<items>
<menuItem title="Tokenary Help" keyEquivalent="?" id="FKE-Sm-Kum">
<menuItem title="tiny wallet Help" keyEquivalent="?" id="FKE-Sm-Kum">
<connections>
<action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
</connections>
@ -675,7 +675,7 @@
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
</connections>
</application>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Tokenary" customModuleProvider="target"/>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Wallet_macOS" customModuleProvider="target"/>
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
@ -685,7 +685,7 @@
<scene sceneID="R2V-B0-nI4">
<objects>
<windowController storyboardIdentifier="initial" showSeguePresentationStyle="single" id="B8D-0N-5wS" sceneMemberID="viewController">
<window key="window" title="Tokenary" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" tabbingMode="disallowed" id="IQv-IB-iLA">
<window key="window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" tabbingMode="disallowed" titleVisibility="hidden" id="IQv-IB-iLA">
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
<rect key="contentRect" x="561" y="342" width="250" height="350"/>
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1050"/>
@ -717,7 +717,7 @@
<!--Import View Controller-->
<scene sceneID="hIz-AP-VOD">
<objects>
<viewController storyboardIdentifier="ImportViewController" id="XfG-lQ-9wD" customClass="ImportViewController" customModule="Tokenary" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="ImportViewController" id="XfG-lQ-9wD" customClass="ImportViewController" customModule="Wallet_macOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="m2S-Jp-Qdl">
<rect key="frame" x="0.0" y="0.0" width="250" height="350"/>
<autoresizingMask key="autoresizingMask"/>
@ -806,7 +806,7 @@ DQ
<!--Accounts List View Controller-->
<scene sceneID="o7E-xn-hDh">
<objects>
<viewController storyboardIdentifier="AccountsListViewController" id="29s-Rd-OUf" customClass="AccountsListViewController" customModule="Tokenary" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="AccountsListViewController" id="29s-Rd-OUf" customClass="AccountsListViewController" customModule="Wallet_macOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="Yjc-Zm-uZY">
<rect key="frame" x="0.0" y="0.0" width="250" height="412"/>
<autoresizingMask key="autoresizingMask"/>
@ -825,7 +825,7 @@ DQ
<rect key="frame" x="1" y="1" width="248" height="278"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" tableStyle="plain" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="40" rowSizeStyle="automatic" viewBased="YES" id="glA-FK-Kdd" customClass="RightClickTableView" customModule="Tokenary" customModuleProvider="target">
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="none" tableStyle="plain" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="40" rowSizeStyle="automatic" viewBased="YES" id="glA-FK-Kdd" customClass="RightClickTableView" customModule="Wallet_macOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="248" height="278"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@ -842,7 +842,7 @@ DQ
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<prototypeCellViews>
<tableCellView identifier="AccountCellView" id="Lp1-Zy-70c" customClass="AccountCellView" customModule="Tokenary" customModuleProvider="target">
<tableCellView identifier="AccountCellView" id="Lp1-Zy-70c" customClass="AccountCellView" customModule="Wallet_macOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="248" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@ -891,7 +891,7 @@ DQ
<outlet property="addressTextField" destination="sef-hl-iPV" id="aGb-wC-t98"/>
</connections>
</tableCellView>
<tableCellView identifier="AccountsHeaderRowView" id="HeR-ji-8cK" customClass="AccountsHeaderRowView" customModule="Tokenary" customModuleProvider="target">
<tableCellView identifier="AccountsHeaderRowView" id="HeR-ji-8cK" customClass="AccountsHeaderRowView" customModule="Wallet_macOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="40" width="248" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@ -915,7 +915,7 @@ DQ
<outlet property="titleButton" destination="VIM-Pg-2r3" id="KF2-28-nzL"/>
</connections>
</tableCellView>
<tableCellView identifier="AddAccountOptionCellView" id="1KM-PS-nEo" customClass="AddAccountOptionCellView" customModule="Tokenary" customModuleProvider="target">
<tableCellView identifier="AddAccountOptionCellView" id="1KM-PS-nEo" customClass="AddAccountOptionCellView" customModule="Wallet_macOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="80" width="248" height="40"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
@ -1104,7 +1104,7 @@ DQ
<!--Waiting View Controller-->
<scene sceneID="xkb-7p-mUK">
<objects>
<viewController storyboardIdentifier="WaitingViewController" id="Wjt-h2-yE1" customClass="WaitingViewController" customModule="Tokenary" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="WaitingViewController" id="Wjt-h2-yE1" customClass="WaitingViewController" customModule="Wallet_macOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="DVX-Gd-m4U">
<rect key="frame" x="0.0" y="0.0" width="250" height="350"/>
<autoresizingMask key="autoresizingMask"/>
@ -1164,7 +1164,7 @@ DQ
<!--Approve View Controller-->
<scene sceneID="aMM-KY-BR7">
<objects>
<viewController storyboardIdentifier="ApproveViewController" id="A70-cr-SWr" customClass="ApproveViewController" customModule="Tokenary" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="ApproveViewController" id="A70-cr-SWr" customClass="ApproveViewController" customModule="Wallet_macOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="xvx-vV-OZe">
<rect key="frame" x="0.0" y="0.0" width="250" height="372"/>
<autoresizingMask key="autoresizingMask"/>
@ -1320,7 +1320,7 @@ DQ
<!--Password View Controller-->
<scene sceneID="Riu-mP-tQs">
<objects>
<viewController storyboardIdentifier="PasswordViewController" id="KMi-XY-mOg" customClass="PasswordViewController" customModule="Tokenary" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="PasswordViewController" id="KMi-XY-mOg" customClass="PasswordViewController" customModule="Wallet_macOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="Efz-OH-wm2">
<rect key="frame" x="0.0" y="0.0" width="250" height="350"/>
<autoresizingMask key="autoresizingMask"/>
@ -1424,14 +1424,14 @@ DQ
<!--Welcome View Controller-->
<scene sceneID="xdv-om-uKF">
<objects>
<viewController storyboardIdentifier="WelcomeViewController" id="42G-F4-o1P" customClass="WelcomeViewController" customModule="Tokenary" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="WelcomeViewController" id="42G-F4-o1P" customClass="WelcomeViewController" customModule="Wallet_macOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="n8I-Pv-qZV">
<rect key="frame" x="0.0" y="0.0" width="250" height="350"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField focusRingType="none" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="vxh-AZ-Ll4">
<rect key="frame" x="14" y="292" width="222" height="34"/>
<textFieldCell key="cell" controlSize="large" alignment="center" title="Tokenary" id="dja-pE-CfV">
<textFieldCell key="cell" controlSize="large" alignment="center" title="tiny wallet" id="dja-pE-CfV">
<font key="font" metaFont="systemHeavy" size="29"/>
<color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@ -1493,7 +1493,7 @@ DQ
<!--Approve Transaction View Controller-->
<scene sceneID="WAJ-YX-5QJ">
<objects>
<viewController storyboardIdentifier="ApproveTransactionViewController" id="eky-J7-eog" customClass="ApproveTransactionViewController" customModule="Tokenary" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="ApproveTransactionViewController" id="eky-J7-eog" customClass="ApproveTransactionViewController" customModule="Wallet_macOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="SAE-QE-uez">
<rect key="frame" x="0.0" y="0.0" width="250" height="407"/>
<autoresizingMask key="autoresizingMask"/>
@ -1721,7 +1721,7 @@ DQ
<!--Edit Accounts View Controller-->
<scene sceneID="PtW-Bw-c7x">
<objects>
<viewController storyboardIdentifier="EditAccountsViewController" id="tNa-Gh-bIQ" customClass="EditAccountsViewController" customModule="Tokenary" customModuleProvider="target" sceneMemberID="viewController">
<viewController storyboardIdentifier="EditAccountsViewController" id="tNa-Gh-bIQ" customClass="EditAccountsViewController" customModule="Wallet_macOS" customModuleProvider="target" sceneMemberID="viewController">
<view key="view" id="IWe-oX-N42">
<rect key="frame" x="0.0" y="0.0" width="250" height="350"/>
<autoresizingMask key="autoresizingMask"/>
@ -1781,7 +1781,7 @@ DQ
<rect key="frame" x="1" y="1" width="208" height="148"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" tableStyle="plain" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="32" rowSizeStyle="automatic" viewBased="YES" id="JM4-ya-UH4" customClass="RightClickTableView" customModule="Tokenary" customModuleProvider="target">
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" tableStyle="plain" columnReordering="NO" columnResizing="NO" multipleSelection="NO" autosaveColumns="NO" typeSelect="NO" rowHeight="32" rowSizeStyle="automatic" viewBased="YES" id="JM4-ya-UH4" customClass="RightClickTableView" customModule="Wallet_macOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="208" height="148"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
@ -1799,7 +1799,7 @@ DQ
</textFieldCell>
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
<prototypeCellViews>
<tableCellView identifier="PreviewAccountCellView" id="qLR-M4-6xB" customClass="PreviewAccountCellView" customModule="Tokenary" customModuleProvider="target">
<tableCellView identifier="PreviewAccountCellView" id="qLR-M4-6xB" customClass="PreviewAccountCellView" customModule="Wallet_macOS" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="208" height="32"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>

2
App macOS/Identifiers.swift
View File

@ -4,6 +4,6 @@ import Foundation
struct Identifiers {
static let safariExtensionBundle = "mac.tokenary.io.Safari"
static let safariExtensionBundle = "org.lil.wallet.Safari"
}

18
App macOS/Screens/AccountsListViewController.swift
View File

@ -75,7 +75,7 @@ class AccountsListViewController: NSViewController {
}
}
private var wallets: [TokenaryWallet] {
private var wallets: [WalletContainer] {
return walletsManager.wallets
}
@ -319,7 +319,7 @@ class AccountsListViewController: NSViewController {
}
}
private func walletForRow(_ row: Int) -> TokenaryWallet? {
private func walletForRow(_ row: Int) -> WalletContainer? {
guard row >= 0 else { return nil }
let item = cellModels[row]
switch item {
@ -382,7 +382,7 @@ class AccountsListViewController: NSViewController {
}
}
private func warnOnLastAccountRemovalAttempt(wallet: TokenaryWallet) {
private func warnOnLastAccountRemovalAttempt(wallet: WalletContainer) {
let alert = Alert()
alert.messageText = Strings.removingTheLastAccount
alert.alertStyle = .critical
@ -394,7 +394,7 @@ class AccountsListViewController: NSViewController {
}
}
private func warnBeforeRemoving(wallet: TokenaryWallet) {
private func warnBeforeRemoving(wallet: WalletContainer) {
let alert = Alert()
alert.messageText = Strings.removedWalletsCantBeRecovered
alert.alertStyle = .critical
@ -410,7 +410,7 @@ class AccountsListViewController: NSViewController {
}
}
private func removeWallet(_ wallet: TokenaryWallet) {
private func removeWallet(_ wallet: WalletContainer) {
try? walletsManager.delete(wallet: wallet)
}
@ -428,7 +428,7 @@ class AccountsListViewController: NSViewController {
warnBeforeShowingKey(wallet: wallet)
}
private func warnBeforeShowingKey(wallet: TokenaryWallet) {
private func warnBeforeShowingKey(wallet: WalletContainer) {
let alert = Alert()
alert.messageText = wallet.isMnemonic ? Strings.secretWordsGiveFullAccess : Strings.privateKeyGivesFullAccess
alert.alertStyle = .critical
@ -445,7 +445,7 @@ class AccountsListViewController: NSViewController {
}
}
private func showKey(wallet: TokenaryWallet) {
private func showKey(wallet: WalletContainer) {
let secret: String
if wallet.isMnemonic, let mnemonicString = try? walletsManager.exportMnemonic(wallet: wallet) {
secret = mnemonicString
@ -543,7 +543,7 @@ extension AccountsListViewController: TableViewMenuSource {
let item = cellModels[row]
let account: Account
let wallet: TokenaryWallet
let wallet: WalletContainer
switch item {
case .mnemonicWalletHeader, .privateKeyWalletsHeader, .addAccountOption:
@ -617,7 +617,7 @@ extension AccountsListViewController: NSTableViewDelegate {
guard tableView.selectedRow < 0 else { return false }
let model = cellModels[row]
let wallet: TokenaryWallet
let wallet: WalletContainer
let account: Account
switch model {

4
App macOS/Screens/EditAccountsViewController.swift
View File

@ -5,7 +5,7 @@ import WalletCore
class EditAccountsViewController: NSViewController {
var wallet: TokenaryWallet!
var wallet: WalletContainer!
var getBackToRect: CGRect?
var selectAccountAction: SelectAccountAction?
@ -16,7 +16,7 @@ class EditAccountsViewController: NSViewController {
private let walletsManager = WalletsManager.shared
private var cellModels = [PreviewAccountCellModel]()
private let previewAccountsQueue = DispatchQueue(label: "mac.tokenary.io.accounts", qos: .userInitiated)
private let previewAccountsQueue = DispatchQueue(label: "org.lil.wallet.accounts", qos: .userInitiated)
private var page = 1
private var requestedPreviewFor: Int?
private var lastPreviewDate = Date()

6
App macOS/Supporting Files/Info.plist
View File

@ -5,7 +5,7 @@
<key>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleDisplayName</key>
<string>Tokenary</string>
<string>Wallet</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIconFile</key>
@ -36,10 +36,10 @@
<key>CFBundleTypeRole</key>
<string>Viewer</string>
<key>CFBundleURLName</key>
<string>tokenary</string>
<string>tinywallet</string>
<key>CFBundleURLSchemes</key>
<array>
<string>tokenary</string>
<string>tinywallet</string>
</array>
</dict>
</array>

8
App macOS/Supporting Files/Tokenary.entitlements → App macOS/Supporting Files/Wallet macOS.entitlements
View File

@ -2,14 +2,16 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.developer.aps-environment</key>
<string>development</string>
<key>com.apple.developer.associated-domains</key>
<array>
<string>applinks:tokenary.io</string>
<string>applinks:lil.org</string>
<string>applinks:yo.finance</string>
</array>
<key>com.apple.developer.icloud-container-identifiers</key>
<array>
<string>iCloud.tokenary</string>
<string>iCloud.tinywallet</string>
</array>
<key>com.apple.developer.icloud-services</key>
<array>
@ -19,7 +21,7 @@
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>group.io.tokenary</string>
<string>group.org.lil.wallet</string>
</array>
<key>com.apple.security.network.client</key>
<true/>

2
Safari Shared/ExtensionBridge.swift
View File

@ -4,7 +4,7 @@ import Foundation
struct ExtensionBridge {
private static let defaults = UserDefaults(suiteName: "group.io.tokenary")
private static let defaults = UserDefaults(suiteName: "group.org.lil.wallet")
private static func key(id: Int) -> String {
return String(id)

6
Safari Shared/Inpage Provider/package.json
View File

@ -9,11 +9,11 @@
},
"repository": {
"type": "git",
"url": "git+ssh://git@github.com/lilorg/tokenary.git"
"url": "git+ssh://git@github.com/lil-org/tiny-wallet.git"
},
"keywords": [],
"author": "tokenary <yo@lil.org>",
"license": "MIT",
"author": "lil org <yo@lil.org>",
"license": "CC0-1.0",
"dependencies": {
"buffer": "^5.6.0",
"events": "^3.2.0",

4
Safari Shared/Resources/_locales/en/messages.json
View File

@ -1,10 +1,10 @@
{
"extension_name": {
"message": "Tokenary",
"message": "tiny wallet",
"description": "The display name for the extension."
},
"extension_description": {
"message": "Crypto Wallet",
"message": "crypto wallet",
"description": "Description of what the extension does."
}
}

2
Safari Shared/Resources/content.js
View File

@ -74,7 +74,7 @@ function injectScript() {
container.insertBefore(scriptTag, container.children[0]);
container.removeChild(scriptTag);
} catch (error) {
console.error('tokenary: failed to inject', error);
console.error('tiny wallet: failed to inject', error);
}
}

2
Safari Shared/SafariWebExtensionHandler.swift
View File

@ -40,7 +40,7 @@ class SafariWebExtensionHandler: NSObject, NSExtensionRequestHandling {
}
} else if let query = String(data: data, encoding: .utf8)?.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed),
let request = SafariRequest(query: query),
let url = URL(string: "tokenary://safari?request=\(query)") {
let url = URL(string: "tinywallet://safari?request=\(query)") {
if case let .ethereum(ethereumRequest) = request.body,
ethereumRequest.method == .switchEthereumChain || ethereumRequest.method == .addEthereumChain {
// TODO: different processing for addEthereumChain

2
Safari iOS/Safari iOS.entitlements
View File

@ -4,7 +4,7 @@
<dict>
<key>com.apple.security.application-groups</key>
<array>
<string>group.io.tokenary</string>
<string>group.org.lil.wallet</string>
</array>
</dict>
</plist>

2
Safari macOS/Safari.entitlements
View File

@ -6,7 +6,7 @@
<true/>
<key>com.apple.security.application-groups</key>
<array>
<string>group.io.tokenary</string>
<string>group.org.lil.wallet</string>
</array>
<key>com.apple.security.network.client</key>
<true/>

11
Shared/Extensions/URL.swift
View File

@ -5,12 +5,11 @@ import UniformTypeIdentifiers
extension URL {
static let x = URL(string: "https://tokenary.io/x")!
static let warpcast = URL(string: "https://warpcast.com/org")!
static let github = URL(string: "https://tokenary.io/github")!
static let email = URL(string: "mailto:support@tokenary.io")!
static let iosSafariGuide = URL(string: "https://tokenary.io/guide-ios")!
static let updateApp = URL(string: "https://lil.org/update")!
static let x = URL(string: "https://x.lil.org")!
static let warpcast = URL(string: "https://f.lil.org")!
static let github = URL(string: "https://g.lil.org")!
static let email = URL(string: "mailto:support@lil.org")!
static let iosSafariGuide = URL(string: "https://lil.org/guide-ios")!
static let farcasterScheme = URL(string: "farcaster://")!
var mimeType: String {

2
Shared/Services/ConfigurationService.swift
View File

@ -15,7 +15,7 @@ class ConfigurationService {
}
private func getInfuraKeysFromCloudKit(completion: @escaping ([String]) -> Void) {
let container = CKContainer(identifier: "iCloud.tokenary")
let container = CKContainer(identifier: "iCloud.tinywallet")
let publicDatabase = container.publicCloudDatabase
let predicate = NSPredicate(value: true)
let query = CKQuery(recordType: "Config", predicate: predicate)

2
Shared/Services/Keychain.swift
View File

@ -17,7 +17,7 @@ struct Keychain {
case wallet(id: String)
case raw(key: String)
private static let commonPrefix = "io.tokenary.macos."
private static let commonPrefix = "org.lil.wallet."
private static let walletPrefix = "wallet."
private static let fullWalletPrefix = commonPrefix + walletPrefix
private static let fullWalletPrefixCount = fullWalletPrefix.count

10
Shared/Strings.swift
View File

@ -15,11 +15,11 @@ struct Strings {
static let failedToSend = "Failed to send"
static let failedToSign = "Failed to sign"
static let failedToSwitchChain = "Failed to switch chain"
static let tokenary = "Tokenary"
static let showTokenary = "Show " + tokenary
static let enterTokenary = "Enter " + tokenary
static let tinyWallet = "tiny wallet"
static let showWallet = "Show Wallet"
static let enterWallet = "Enter Wallet"
static let quit = "Quit"
static let quitTokenary = "Quit Tokenary?"
static let quitTinyWallet = "Quit tiny wallet?"
static let enableSafariExtension = "Enable Safari extension"
static let dropUsALine = "Drop us a line"
static let viewOnGithub = "View on GitHub"
@ -72,7 +72,7 @@ struct Strings {
static let tryAgain = "Try again"
static let noData = "There is no data yet"
static let refresh = "Refresh"
static let tokenaryIsEmpty = "Tokenary is empty"
static let tinyWalletIsEmpty = "tiny wallet is empty"
static let pleaseTypeAtLeast = "Please type at least 4 characters"
static let unknownWebsite = "Unknown website ⚠️"
static let calculating = "Calculating..."

0
Shared/Wallets/TokenaryAccount.swift → Shared/Wallets/Account.swift
View File

4
Shared/Wallets/TokenaryWallet.swift → Shared/Wallets/WalletContainer.swift
View File

@ -4,7 +4,7 @@
import Foundation
import WalletCore
final class TokenaryWallet: Hashable, Equatable {
final class WalletContainer: Hashable, Equatable {
let id: String
var key: StoredKey
@ -43,7 +43,7 @@ final class TokenaryWallet: Hashable, Equatable {
hasher.combine(id)
}
static func == (lhs: TokenaryWallet, rhs: TokenaryWallet) -> Bool {
static func == (lhs: WalletContainer, rhs: WalletContainer) -> Bool {
return lhs.id == rhs.id
}

46
Shared/Wallets/WalletsManager.swift
View File

@ -19,7 +19,7 @@ final class WalletsManager {
static let shared = WalletsManager()
private let keychain = Keychain.shared
private let defaultCoin = CoinType.ethereum
private(set) var wallets = [TokenaryWallet]()
private(set) var wallets = [WalletContainer]()
private init() {}
@ -38,16 +38,16 @@ final class WalletsManager {
}
}
func createWallet() throws -> TokenaryWallet {
func createWallet() throws -> WalletContainer {
guard let password = keychain.password else { throw Error.keychainAccessFailure }
return try createWallet(name: defaultWalletName, password: password)
}
func getWallet(id: String) -> TokenaryWallet? {
func getWallet(id: String) -> WalletContainer? {
return wallets.first(where: { $0.id == id })
}
func addWallet(input: String, inputPassword: String?) throws -> TokenaryWallet {
func addWallet(input: String, inputPassword: String?) throws -> WalletContainer {
guard let password = keychain.password else { throw Error.keychainAccessFailure }
let name = defaultWalletName
let trimmedInput = input.singleSpaced
@ -81,7 +81,7 @@ final class WalletsManager {
return []
}
func previewAccounts(wallet: TokenaryWallet, page: Int) throws -> [Account] {
func previewAccounts(wallet: WalletContainer, page: Int) throws -> [Account] {
guard let password = keychain.password, let hdWallet = wallet.key.wallet(password: Data(password.utf8)) else { throw Error.keychainAccessFailure }
let coin = defaultCoin
let range = (page * 21)..<((page + 1) * 21)
@ -97,17 +97,17 @@ final class WalletsManager {
return accounts
}
private func createWallet(name: String, password: String) throws -> TokenaryWallet {
private func createWallet(name: String, password: String) throws -> WalletContainer {
let key = StoredKey(name: name, password: Data(password.utf8))
let id = makeNewWalletId()
let wallet = TokenaryWallet(id: id, key: key)
let wallet = WalletContainer(id: id, key: key)
_ = try wallet.getAccount(password: password, coin: defaultCoin)
wallets.append(wallet)
try save(wallet: wallet, isUpdate: false)
return wallet
}
private func importJSON(_ json: Data, name: String, password: String, newPassword: String, coin: CoinType, onlyToKeychain: Bool) throws -> TokenaryWallet {
private func importJSON(_ json: Data, name: String, password: String, newPassword: String, coin: CoinType, onlyToKeychain: Bool) throws -> WalletContainer {
guard let key = StoredKey.importJSON(json: json) else { throw KeyStore.Error.invalidKey }
guard let data = key.decryptPrivateKey(password: Data(password.utf8)) else { throw KeyStore.Error.invalidPassword }
if let mnemonic = checkMnemonic(data) { return try self.importMnemonic(mnemonic, name: name, encryptPassword: newPassword) }
@ -120,10 +120,10 @@ final class WalletsManager {
return mnemonic
}
private func importPrivateKey(_ privateKey: PrivateKey, name: String, password: String, coin: CoinType, onlyToKeychain: Bool) throws -> TokenaryWallet {
private func importPrivateKey(_ privateKey: PrivateKey, name: String, password: String, coin: CoinType, onlyToKeychain: Bool) throws -> WalletContainer {
guard let newKey = StoredKey.importPrivateKey(privateKey: privateKey.data, name: name, password: Data(password.utf8), coin: coin) else { throw KeyStore.Error.invalidKey }
let id = makeNewWalletId()
let wallet = TokenaryWallet(id: id, key: newKey)
let wallet = WalletContainer(id: id, key: newKey)
_ = try wallet.getAccount(password: password, coin: coin)
if !onlyToKeychain {
wallets.append(wallet)
@ -132,39 +132,39 @@ final class WalletsManager {
return wallet
}
private func importMnemonic(_ mnemonic: String, name: String, encryptPassword: String) throws -> TokenaryWallet {
private func importMnemonic(_ mnemonic: String, name: String, encryptPassword: String) throws -> WalletContainer {
guard let key = StoredKey.importHDWallet(mnemonic: mnemonic, name: name, password: Data(encryptPassword.utf8), coin: defaultCoin) else { throw KeyStore.Error.invalidMnemonic }
let id = makeNewWalletId()
let wallet = TokenaryWallet(id: id, key: key)
let wallet = WalletContainer(id: id, key: key)
_ = try wallet.getAccount(password: encryptPassword, coin: defaultCoin)
wallets.append(wallet)
try save(wallet: wallet, isUpdate: false)
return wallet
}
func exportPrivateKey(wallet: TokenaryWallet) throws -> Data {
func exportPrivateKey(wallet: WalletContainer) throws -> Data {
guard let password = keychain.password else { throw Error.keychainAccessFailure }
guard let key = wallet.key.decryptPrivateKey(password: Data(password.utf8)) else { throw KeyStore.Error.invalidPassword }
return key
}
func exportMnemonic(wallet: TokenaryWallet) throws -> String {
func exportMnemonic(wallet: WalletContainer) throws -> String {
guard let password = keychain.password else { throw Error.keychainAccessFailure }
guard let mnemonic = wallet.key.decryptMnemonic(password: Data(password.utf8)) else { throw KeyStore.Error.invalidPassword }
return mnemonic
}
func update(wallet: TokenaryWallet, newPassword: String) throws {
func update(wallet: WalletContainer, newPassword: String) throws {
guard let password = keychain.password else { throw Error.keychainAccessFailure }
try update(wallet: wallet, password: password, newPassword: newPassword, newName: wallet.key.name)
}
func update(wallet: TokenaryWallet, newName: String) throws {
func update(wallet: WalletContainer, newName: String) throws {
guard let password = keychain.password else { throw Error.keychainAccessFailure }
try update(wallet: wallet, password: password, newPassword: password, newName: newName)
}
func delete(wallet: TokenaryWallet) throws {
func delete(wallet: WalletContainer) throws {
guard let password = keychain.password else { throw Error.keychainAccessFailure }
guard let index = wallets.firstIndex(of: wallet) else { throw KeyStore.Error.accountNotFound }
guard var privateKey = wallet.key.decryptPrivateKey(password: Data(password.utf8)) else { throw KeyStore.Error.invalidKey }
@ -183,12 +183,12 @@ final class WalletsManager {
let ids = keychain.getAllWalletsIds()
for id in ids {
guard let data = keychain.getWalletData(id: id), let key = StoredKey.importJSON(json: data) else { continue }
let wallet = TokenaryWallet(id: id, key: key)
let wallet = WalletContainer(id: id, key: key)
wallets.append(wallet)
}
}
func update(wallet: TokenaryWallet, enabledAccounts: [Account]) throws {
func update(wallet: WalletContainer, enabledAccounts: [Account]) throws {
for account in wallet.accounts {
wallet.key.removeAccountForCoinDerivationPath(coin: account.coin, derivationPath: account.derivationPath)
}
@ -203,7 +203,7 @@ final class WalletsManager {
try save(wallet: wallet, isUpdate: true)
}
func update(wallet: TokenaryWallet, removeAccounts toRemove: [Account]) throws {
func update(wallet: WalletContainer, removeAccounts toRemove: [Account]) throws {
for account in toRemove {
wallet.key.removeAccountForCoinDerivationPath(coin: account.coin, derivationPath: account.derivationPath)
}
@ -211,7 +211,7 @@ final class WalletsManager {
try save(wallet: wallet, isUpdate: true)
}
private func update(wallet: TokenaryWallet, password: String, newPassword: String, newName: String) throws {
private func update(wallet: WalletContainer, password: String, newPassword: String, newName: String) throws {
guard let index = wallets.firstIndex(of: wallet) else { throw KeyStore.Error.accountNotFound }
guard var privateKeyData = wallet.key.decryptPrivateKey(password: Data(password.utf8)) else { throw KeyStore.Error.invalidPassword }
defer { privateKeyData.resetBytes(in: 0..<privateKeyData.count) }
@ -239,7 +239,7 @@ final class WalletsManager {
try save(wallet: wallets[index], isUpdate: true)
}
private func save(wallet: TokenaryWallet, isUpdate: Bool) throws {
private func save(wallet: WalletContainer, isUpdate: Bool) throws {
guard let data = wallet.key.exportJSON() else { throw KeyStore.Error.invalidPassword }
if isUpdate {
try keychain.updateWallet(id: wallet.id, data: data)
@ -279,7 +279,7 @@ extension WalletsManager {
}
}
func getWalletAndAccount(coin: CoinType, address: String) -> (TokenaryWallet, Account)? {
func getWalletAndAccount(coin: CoinType, address: String) -> (WalletContainer, Account)? {
let needle = address.lowercased()
for wallet in wallets {
for account in wallet.accounts where account.coin == coin {

116
Wallet.xcodeproj/project.pbxproj
View File

@ -57,8 +57,8 @@
2C2AA1D628AFB1AD00E35DBF /* MultipleResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2AA1D428AFB1AD00E35DBF /* MultipleResponseToExtension.swift */; };
2C2AA1D728AFB1AD00E35DBF /* MultipleResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2AA1D428AFB1AD00E35DBF /* MultipleResponseToExtension.swift */; };
2C2AA1D828AFB1AD00E35DBF /* MultipleResponseToExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C2AA1D428AFB1AD00E35DBF /* MultipleResponseToExtension.swift */; };
2C3024FC28C1193100C304ED /* TokenaryAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C3024FB28C1193100C304ED /* TokenaryAccount.swift */; };
2C3024FD28C1193100C304ED /* TokenaryAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C3024FB28C1193100C304ED /* TokenaryAccount.swift */; };
2C3024FC28C1193100C304ED /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C3024FB28C1193100C304ED /* Account.swift */; };
2C3024FD28C1193100C304ED /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C3024FB28C1193100C304ED /* Account.swift */; };
2C3B7F022756A08600931264 /* Identifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C3B7F012756A08600931264 /* Identifiers.swift */; };
2C40709027667A6600AB3D55 /* MultilineLabelTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C40708E27667A6600AB3D55 /* MultilineLabelTableViewCell.swift */; };
2C40709127667A6600AB3D55 /* MultilineLabelTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = 2C40708F27667A6600AB3D55 /* MultilineLabelTableViewCell.xib */; };
@ -185,7 +185,7 @@
2CC8C5B4276A96760083FB1B /* Haptic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CC8C5B3276A96760083FB1B /* Haptic.swift */; };
2CCEB83727594E2A00768473 /* manifest.json in Resources */ = {isa = PBXBuildFile; fileRef = 2CCEB83627594E2A00768473 /* manifest.json */; };
2CCEB84527594E2A00768473 /* Safari iOS.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 2CCEB82D27594E2A00768473 /* Safari iOS.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
2CD0669126B5537B00728C20 /* TokenaryWallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD0668B26B2142000728C20 /* TokenaryWallet.swift */; };
2CD0669126B5537B00728C20 /* WalletContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD0668B26B2142000728C20 /* WalletContainer.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 */; };
@ -223,7 +223,7 @@
2CF25598275A46D600AE54B9 /* Strings.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C901C492689F01700D0926A /* Strings.swift */; };
2CF2559B275A46E700AE54B9 /* AuthenticationReason.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DC850E626B73A5900809E82 /* AuthenticationReason.swift */; };
2CF2559C275A477F00AE54B9 /* ApprovalSubject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0D059AD126C2796200EE3023 /* ApprovalSubject.swift */; };
2CF2559D275A479800AE54B9 /* TokenaryWallet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD0668B26B2142000728C20 /* TokenaryWallet.swift */; };
2CF2559D275A479800AE54B9 /* WalletContainer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD0668B26B2142000728C20 /* WalletContainer.swift */; };
2CF2559E275A479800AE54B9 /* WalletsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CD0668926B213E500728C20 /* WalletsManager.swift */; };
2CF255A0275A47DD00AE54B9 /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C6706A4267A6BFE006AAEF2 /* Bundle.swift */; };
2CF255A1275A47DD00AE54B9 /* Notification.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C03D1D4269B428C00EF10EA /* Notification.swift */; };
@ -339,7 +339,7 @@
2C1995432674C4BA00A8E370 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2C1995462674C4BA00A8E370 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
2C1995482674C4BA00A8E370 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2C1995492674C4BA00A8E370 /* Tokenary.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Tokenary.entitlements; sourceTree = "<group>"; };
2C1995492674C4BA00A8E370 /* Wallet macOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Wallet macOS.entitlements"; sourceTree = "<group>"; };
2C1995552674D0F300A8E370 /* Ethereum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Ethereum.swift; sourceTree = "<group>"; };
2C209B642AF7B3BC00FF9012 /* Secrets.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Secrets.plist; sourceTree = "<group>"; };
2C264BBB27B2F25E00234393 /* SafariRequest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SafariRequest.swift; sourceTree = "<group>"; };
@ -350,7 +350,7 @@
2C264BEA27B6B50700234393 /* DappRequestProcessor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DappRequestProcessor.swift; sourceTree = "<group>"; };
2C2AA1D128AD1DC100E35DBF /* SpecificWalletAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpecificWalletAccount.swift; sourceTree = "<group>"; };
2C2AA1D428AFB1AD00E35DBF /* MultipleResponseToExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultipleResponseToExtension.swift; sourceTree = "<group>"; };
2C3024FB28C1193100C304ED /* TokenaryAccount.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenaryAccount.swift; sourceTree = "<group>"; };
2C3024FB28C1193100C304ED /* Account.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Account.swift; sourceTree = "<group>"; };
2C3B7F012756A08600931264 /* Identifiers.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Identifiers.swift; sourceTree = "<group>"; };
2C40708E27667A6600AB3D55 /* MultilineLabelTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultilineLabelTableViewCell.swift; sourceTree = "<group>"; };
2C40708F27667A6600AB3D55 /* MultilineLabelTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MultilineLabelTableViewCell.xib; sourceTree = "<group>"; };
@ -457,14 +457,14 @@
2CCEB83627594E2A00768473 /* manifest.json */ = {isa = PBXFileReference; lastKnownFileType = text.json; path = manifest.json; sourceTree = "<group>"; };
2CCEB84227594E2A00768473 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
2CD0668926B213E500728C20 /* WalletsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletsManager.swift; sourceTree = "<group>"; };
2CD0668B26B2142000728C20 /* TokenaryWallet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TokenaryWallet.swift; sourceTree = "<group>"; };
2CD0668B26B2142000728C20 /* WalletContainer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WalletContainer.swift; sourceTree = "<group>"; };
2CD0B3F426A0DAA900488D92 /* NSPasteboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NSPasteboard.swift; sourceTree = "<group>"; };
2CD0B3F626AC619900488D92 /* AddAccountOptionCellView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AddAccountOptionCellView.swift; sourceTree = "<group>"; };
2CD7FC8C2B1115AE00659439 /* EditTransactionView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditTransactionView.swift; sourceTree = "<group>"; };
2CDAB3712675B3F0009F8B97 /* PasswordViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasswordViewController.swift; sourceTree = "<group>"; };
2CE059362763D60A0042D844 /* KeyboardObserver.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = KeyboardObserver.swift; sourceTree = "<group>"; };
2CE059382763F3FF0042D844 /* CGFloat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGFloat.swift; sourceTree = "<group>"; };
2CE059482764169E0042D844 /* Tokenary iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Tokenary iOS.entitlements"; sourceTree = "<group>"; };
2CE059482764169E0042D844 /* Wallet iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Wallet iOS.entitlements"; sourceTree = "<group>"; };
2CE0594B2764DF9A0042D844 /* Safari iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "Safari iOS.entitlements"; sourceTree = "<group>"; };
2CE3D011267F73C00032A62E /* Transaction.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Transaction.swift; sourceTree = "<group>"; };
2CED86A22AF00BC9006F9E26 /* Tools */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = Tools; sourceTree = BUILT_PRODUCTS_DIR; };
@ -662,7 +662,7 @@
isa = PBXGroup;
children = (
2C1995482674C4BA00A8E370 /* Info.plist */,
2C1995492674C4BA00A8E370 /* Tokenary.entitlements */,
2C1995492674C4BA00A8E370 /* Wallet macOS.entitlements */,
);
path = "Supporting Files";
sourceTree = "<group>";
@ -728,7 +728,7 @@
2C5FF97026C84F7B00B32ACC /* App iOS */ = {
isa = PBXGroup;
children = (
2CE059482764169E0042D844 /* Tokenary iOS.entitlements */,
2CE059482764169E0042D844 /* Wallet iOS.entitlements */,
2C5FF97126C84F7B00B32ACC /* AppDelegate.swift */,
2C5FF97326C84F7B00B32ACC /* SceneDelegate.swift */,
2C96D394276237F600687301 /* Library */,
@ -962,8 +962,8 @@
isa = PBXGroup;
children = (
2CD0668926B213E500728C20 /* WalletsManager.swift */,
2CD0668B26B2142000728C20 /* TokenaryWallet.swift */,
2C3024FB28C1193100C304ED /* TokenaryAccount.swift */,
2CD0668B26B2142000728C20 /* WalletContainer.swift */,
2C3024FB28C1193100C304ED /* Account.swift */,
);
path = Wallets;
sourceTree = "<group>";
@ -1659,7 +1659,7 @@
files = (
2CB4031B281C99C800BAEBEE /* AccountsHeaderRowView.swift in Sources */,
2C728B612AFBFAF100E4DD47 /* Image.swift in Sources */,
2C3024FC28C1193100C304ED /* TokenaryAccount.swift in Sources */,
2C3024FC28C1193100C304ED /* Account.swift in Sources */,
2C901C4A2689F01700D0926A /* Strings.swift in Sources */,
2C2AA1D228AD1DC100E35DBF /* SpecificWalletAccount.swift in Sources */,
2C6706A5267A6BFE006AAEF2 /* Bundle.swift in Sources */,
@ -1671,7 +1671,7 @@
2C773F62274523DC007B04E7 /* ResponseToExtension.swift in Sources */,
0DC850E726B73A5900809E82 /* AuthenticationReason.swift in Sources */,
2CAA412526C7CD93009F3535 /* ReviewRequester.swift in Sources */,
2CD0669126B5537B00728C20 /* TokenaryWallet.swift in Sources */,
2CD0669126B5537B00728C20 /* WalletContainer.swift in Sources */,
2C8944CB2AEB0C10006A711F /* EthereumRPC.swift in Sources */,
2C89D26827BADCA9006C0C8D /* DappRequestAction.swift in Sources */,
2C7A94C12B73B5B60030B684 /* DirectTransactionRequest.swift in Sources */,
@ -1742,7 +1742,7 @@
files = (
2C6F6D5A28273FE500D6E8FB /* EditAccountsViewController.swift in Sources */,
2CF255BA275A749300AE54B9 /* ApproveViewController.swift in Sources */,
2C3024FD28C1193100C304ED /* TokenaryAccount.swift in Sources */,
2C3024FD28C1193100C304ED /* Account.swift in Sources */,
2CD7FC8E2B1115AE00659439 /* EditTransactionView.swift in Sources */,
2C96D3962762380400687301 /* ButtonWithExtendedArea.swift in Sources */,
2C264BC227B2F2C100234393 /* EthereumSafariRequest.swift in Sources */,
@ -1759,7 +1759,7 @@
2C73215B2AEE8F5200AA8A71 /* ConfigurationService.swift in Sources */,
2CF25597275A46D300AE54B9 /* Defaults.swift in Sources */,
2CF255A2275A47DD00AE54B9 /* String.swift in Sources */,
2CF2559D275A479800AE54B9 /* TokenaryWallet.swift in Sources */,
2CF2559D275A479800AE54B9 /* WalletContainer.swift in Sources */,
2CC8C5B4276A96760083FB1B /* Haptic.swift in Sources */,
2CF255AB275A48CF00AE54B9 /* Ethereum.swift in Sources */,
2C8944CF2AEC34EB006A711F /* Blockies.swift in Sources */,
@ -1960,7 +1960,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Safari macOS/Info.plist";
@ -1977,7 +1977,7 @@
"-framework",
SafariServices,
);
PRODUCT_BUNDLE_IDENTIFIER = mac.tokenary.io.Safari;
PRODUCT_BUNDLE_IDENTIFIER = org.lil.wallet.Safari;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
@ -1995,7 +1995,7 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_HARDENED_RUNTIME = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Safari macOS/Info.plist";
@ -2012,7 +2012,7 @@
"-framework",
SafariServices,
);
PRODUCT_BUNDLE_IDENTIFIER = mac.tokenary.io.Safari;
PRODUCT_BUNDLE_IDENTIFIER = org.lil.wallet.Safari;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
@ -2145,24 +2145,24 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "App macOS/Supporting Files/Tokenary.entitlements";
CODE_SIGN_ENTITLEMENTS = "App macOS/Supporting Files/Wallet macOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 42;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "$(SRCROOT)/App macOS/Supporting Files/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = Tokenary;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
INFOPLIST_KEY_CFBundleDisplayName = Wallet;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 2.0.31;
PRODUCT_BUNDLE_IDENTIFIER = mac.tokenary.io;
PRODUCT_BUNDLE_IDENTIFIER = org.lil.wallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
@ -2176,24 +2176,24 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "App macOS/Supporting Files/Tokenary.entitlements";
CODE_SIGN_ENTITLEMENTS = "App macOS/Supporting Files/Wallet macOS.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 42;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_HARDENED_RUNTIME = YES;
INFOPLIST_FILE = "$(SRCROOT)/App macOS/Supporting Files/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = Tokenary;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
INFOPLIST_KEY_CFBundleDisplayName = Wallet;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 12.0;
MARKETING_VERSION = 2.0.31;
PRODUCT_BUNDLE_IDENTIFIER = mac.tokenary.io;
PRODUCT_BUNDLE_IDENTIFIER = org.lil.wallet;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SWIFT_VERSION = 5.0;
@ -2207,13 +2207,13 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "App iOS/Tokenary iOS.entitlements";
CODE_SIGN_ENTITLEMENTS = "App iOS/Wallet iOS.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
INFOPLIST_FILE = "App iOS/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = Tokenary;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
INFOPLIST_KEY_CFBundleDisplayName = Wallet;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@ -2221,7 +2221,7 @@
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 2.0.31;
PRODUCT_BUNDLE_IDENTIFIER = mac.tokenary.io;
PRODUCT_BUNDLE_IDENTIFIER = org.lil.wallet;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@ -2239,13 +2239,13 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = "$(inherited)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = "App iOS/Tokenary iOS.entitlements";
CODE_SIGN_ENTITLEMENTS = "App iOS/Wallet iOS.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
INFOPLIST_FILE = "App iOS/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = Tokenary;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.finance";
INFOPLIST_KEY_CFBundleDisplayName = Wallet;
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
@ -2253,7 +2253,7 @@
);
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
MARKETING_VERSION = 2.0.31;
PRODUCT_BUNDLE_IDENTIFIER = mac.tokenary.io;
PRODUCT_BUNDLE_IDENTIFIER = org.lil.wallet;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
@ -2273,7 +2273,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
@ -2288,7 +2288,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 2.0.31;
PRODUCT_BUNDLE_IDENTIFIER = "mac.tokenary.io.Mint-iOS";
PRODUCT_BUNDLE_IDENTIFIER = "org.lil.wallet.Mint-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
@ -2310,7 +2310,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
@ -2325,7 +2325,7 @@
);
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MARKETING_VERSION = 2.0.31;
PRODUCT_BUNDLE_IDENTIFIER = "mac.tokenary.io.Mint-iOS";
PRODUCT_BUNDLE_IDENTIFIER = "org.lil.wallet.Mint-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
@ -2347,7 +2347,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
@ -2355,7 +2355,7 @@
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 14.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "org.lil.Tests-macOS";
PRODUCT_BUNDLE_IDENTIFIER = "org.lil.wallet.Tests-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
@ -2375,7 +2375,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
@ -2383,7 +2383,7 @@
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 14.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "org.lil.Tests-macOS";
PRODUCT_BUNDLE_IDENTIFIER = "org.lil.wallet.Tests-macOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
@ -2402,7 +2402,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
@ -2410,7 +2410,7 @@
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 14.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "org.lil.Tests-iOS";
PRODUCT_BUNDLE_IDENTIFIER = "org.lil.wallet.Tests-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
@ -2430,7 +2430,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GENERATE_INFOPLIST_FILE = YES;
@ -2438,7 +2438,7 @@
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 14.2;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "org.lil.Tests-iOS";
PRODUCT_BUNDLE_IDENTIFIER = "org.lil.wallet.Tests-iOS";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
@ -2456,7 +2456,7 @@
CODE_SIGN_ENTITLEMENTS = "Safari iOS/Safari iOS.entitlements";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Safari iOS/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Safari iOS";
@ -2473,7 +2473,7 @@
"-framework",
SafariServices,
);
PRODUCT_BUNDLE_IDENTIFIER = mac.tokenary.io.Safari;
PRODUCT_BUNDLE_IDENTIFIER = org.lil.wallet.Safari;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
SKIP_INSTALL = YES;
@ -2494,7 +2494,7 @@
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 42;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "Safari iOS/Info.plist";
INFOPLIST_KEY_CFBundleDisplayName = "Safari iOS";
@ -2511,7 +2511,7 @@
"-framework",
SafariServices,
);
PRODUCT_BUNDLE_IDENTIFIER = mac.tokenary.io.Safari;
PRODUCT_BUNDLE_IDENTIFIER = org.lil.wallet.Safari;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = iphoneos;
@ -2533,7 +2533,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_STYLE = Automatic;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
@ -2552,7 +2552,7 @@
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CODE_SIGN_STYLE = Automatic;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_TEAM = XWNXDSM6BU;
DEVELOPMENT_TEAM = 8DXC3N7E7P;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;