Merge pull request #388 from nova-wallet/develop

v3.6

.github/workflows/deploy_staging.yml

@@ -44,6 +44,7 @@ jobs:
             ${{ runner.os }}-pods-
 
       - name: Install Cocoapods
+        if: steps.cache-cocoapods.outputs.cache-hit != 'true'
         run: pod install --repo-update
 
       - name: Set env BUILD_PROVISION_PROFILE_BASE64

.github/workflows/pull_request.yml

@@ -32,7 +32,7 @@ jobs:
             ${{ runner.os }}-pods-
 
       - name: Install Cocoapods
-        # if: steps.cache-cocoapods.outputs.cache-hit != 'true'
+        if: steps.cache-cocoapods.outputs.cache-hit != 'true'
         run: pod install --repo-update
 
       - name: Set Default Scheme

.github/workflows/push_develop.yml

@@ -27,7 +27,7 @@ jobs:
             ${{ runner.os }}-pods-
 
       - name: Install Cocoapods
-        # if: steps.cache-cocoapods.outputs.cache-hit != 'true'
+        if: steps.cache-cocoapods.outputs.cache-hit != 'true'
         run: pod install --repo-update
 
       # Source https://docs.github.com/en/actions/deployment/installing-an-apple-certificate-on-macos-runners-for-xcode-development#add-a-step-to-your-workflow

.swiftlint.yml

@@ -4,3 +4,6 @@ excluded:
   - R.generated.swift
   - novawalletTests
   - novawalletIntegrationTests
+identifier_name:
+  excluded:
+    - id

Podfile

@@ -1,3 +1,4 @@
+source 'https://cdn.cocoapods.org/'
 platform :ios, '13.0'
 
 abstract_target 'novawalletAll' do

Podfile.lock

@@ -240,6 +240,6 @@ SPEC CHECKSUMS:
   TweetNacl: 3abf4d1d2082b0114e7a67410e300892448951e6
   xxHash-Swift: 30bd6a7507b3b7348a277c49b1cb6346c2905ec7
 
-PODFILE CHECKSUM: c77a344ca52461c9928594f5bec896982db9f99d
+PODFILE CHECKSUM: 025707058333b98cf537c9612cc7b2efc5e099aa
 
-COCOAPODS: 1.11.2
+COCOAPODS: 1.11.3

novawallet.xcodeproj/xcshareddata/xcschemes/novawallet.xcscheme

@@ -26,9 +26,15 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
+      shouldUseLaunchSchemeArgsEnv = "NO"
       codeCoverageEnabled = "YES"
       onlyGenerateCoverageForSpecifiedTargets = "YES">
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-UNITTEST"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
       <CodeCoverageTargets>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -88,7 +94,7 @@
       </Testables>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Dev"
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"

novawallet.xcodeproj/xcshareddata/xcschemes/novawalletIntegrationTests.xcscheme

@@ -10,7 +10,13 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
+      shouldUseLaunchSchemeArgsEnv = "NO">
+      <CommandLineArguments>
+         <CommandLineArgument
+            argument = "-UNITTEST"
+            isEnabled = "YES">
+         </CommandLineArgument>
+      </CommandLineArguments>
       <Testables>
          <TestableReference
             skipped = "NO">

novawallet/Assets.xcassets/colorWhite100.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/colorWhite64.colorset/Contents.json

@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "0.640",
+          "blue" : "1.000",
+          "green" : "1.000",
+          "red" : "1.000"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Assets.xcassets/iconUsers.imageset/Contents.json

@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "filename" : "users.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

novawallet/Assets.xcassets/iconsSettings/iconCurrency.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "Currency.pdf",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

novawallet/Common/Crypto/NoKeysSigningWrapper.swift

@@ -23,6 +23,17 @@ extension Error {
         }
     }
 
+    var isHardwareWalletSigningCancelled: Bool {
+        guard let hardwareWalletError = self as? HardwareSigningError else {
+            return false
+        }
+
+        switch hardwareWalletError {
+        case .signingCancelled:
+            return true
+        }
+    }
+
     var isNotSupportedByParitySigner: Bool {
         guard let notSupportedError = self as? NoSigningSupportError else {
             return false

novawallet/Common/Currency/Atomic.swift

@@ -0,0 +1,24 @@
+import Foundation
+
+@propertyWrapper
+struct Atomic<Value> {
+    private let lock = NSLock()
+    private var value: Value
+
+    init(defaultValue: Value) {
+        value = defaultValue
+    }
+
+    var wrappedValue: Value {
+        get {
+            lock.lock()
+            defer { lock.unlock() }
+            return value
+        }
+        set {
+            lock.lock()
+            value = newValue
+            lock.unlock()
+        }
+    }
+}

novawallet/Common/Currency/Currency+usd.swift

@@ -0,0 +1,13 @@
+import Foundation
+
+extension Currency {
+    static let usd = Currency(
+        id: 0,
+        code: "USD",
+        name: "United States Dollar",
+        symbol: "$",
+        category: .fiat,
+        isPopular: true,
+        coingeckoId: "usd"
+    )
+}

novawallet/Common/Currency/Currency.swift

@@ -0,0 +1,28 @@
+import Foundation
+
+struct Currency: Codable, Equatable {
+    let id: Int
+    let code: String
+    let name: String
+    let symbol: String?
+    let category: Category
+    let isPopular: Bool
+    let coingeckoId: String
+
+    enum CodingKeys: String, CodingKey {
+        case id
+        case code
+        case name
+        case symbol
+        case category
+        case isPopular = "popular"
+        case coingeckoId
+    }
+}
+
+extension Currency {
+    enum Category: String, Codable {
+        case fiat
+        case crypto
+    }
+}

novawallet/Common/Currency/CurrencyManager.swift

@@ -0,0 +1,91 @@
+import Foundation
+import SoraKeystore
+
+protocol CurrencyManagerProtocol: AnyObject {
+    var availableCurrencies: [Currency] { get }
+    var selectedCurrency: Currency { get set }
+
+    func addObserver(
+        with owner: AnyObject,
+        queue: DispatchQueue?,
+        closure: @escaping (Currency, Currency) -> Void
+    )
+    func addObserver(
+        with owner: AnyObject,
+        closure: @escaping (Currency, Currency) -> Void
+    )
+    func removeObserver(by owner: AnyObject)
+}
+
+final class CurrencyManager: Observable<Currency>, CurrencyManagerProtocol {
+    let availableCurrencies: [Currency]
+    var selectedCurrency: Currency {
+        get {
+            state
+        }
+        set {
+            state = newValue
+        }
+    }
+
+    private let settingsManager: SettingsManagerProtocol
+
+    init(
+        currencyRepository: CurrencyRepositoryProtocol,
+        settingsManager: SettingsManagerProtocol,
+        queue: OperationQueue
+    ) throws {
+        self.settingsManager = settingsManager
+
+        let currenciesOperationWrapper = currencyRepository.fetchAvailableCurrenciesWrapper()
+        queue.addOperations(currenciesOperationWrapper.allOperations, waitUntilFinished: true)
+
+        let currencies = try currenciesOperationWrapper.targetOperation.extractNoCancellableResultData()
+        let selectedCurrencyId = settingsManager.selectedCurrencyId
+        let currency = currencies.first(where: { $0.id == selectedCurrencyId }) ?? currencies.min { $0.id < $1.id }
+        guard let currency = currency else {
+            throw CurrencyManagerError.currencyListIsEmpty
+        }
+
+        availableCurrencies = currencies
+        super.init(state: currency)
+        sideEffectOnChangeState = { [weak self] in
+            self?.saveCurrencyInSettings()
+        }
+    }
+
+    init(
+        settingsManager: SettingsManagerProtocol,
+        availableCurrencies: [Currency],
+        selectedCurrency: Currency
+    ) {
+        self.availableCurrencies = availableCurrencies
+        self.settingsManager = settingsManager
+        super.init(state: selectedCurrency)
+        sideEffectOnChangeState = saveCurrencyInSettings
+    }
+
+    private func saveCurrencyInSettings() {
+        settingsManager.selectedCurrencyId = selectedCurrency.id
+    }
+}
+
+// MARK: - Shared instance
+
+extension CurrencyManager {
+    static let shared = CurrencyManager()
+
+    private convenience init?() {
+        try? self.init(
+            currencyRepository: CurrencyRepository.shared,
+            settingsManager: SettingsManager.shared,
+            queue: OperationManagerFacade.sharedDefaultQueue
+        )
+    }
+}
+
+// MARK: - Error
+
+enum CurrencyManagerError: Error {
+    case currencyListIsEmpty
+}

novawallet/Common/Currency/CurrencyRepository.swift

@@ -0,0 +1,36 @@
+import Foundation
+import RobinHood
+
+protocol CurrencyRepositoryProtocol {
+    func fetchAvailableCurrenciesWrapper() -> CompoundOperationWrapper<[Currency]>
+}
+
+final class CurrencyRepository: JsonFileRepository<[Currency]> {
+    static let shared = CurrencyRepository()
+
+    @Atomic(defaultValue: [])
+    private var currencies: [Currency]
+}
+
+extension CurrencyRepository: CurrencyRepositoryProtocol {
+    func fetchAvailableCurrenciesWrapper() -> CompoundOperationWrapper<[Currency]> {
+        guard currencies.isEmpty else {
+            return CompoundOperationWrapper.createWithResult(currencies)
+        }
+        let fetchCurrenciesOperation = fetchOperation(
+            by: R.file.currenciesJson(),
+            defaultValue: []
+        )
+        let cacheOperation: BaseOperation<[Currency]> = ClosureOperation { [weak self] in
+            let currencies = try fetchCurrenciesOperation.extractNoCancellableResultData()
+            self?.currencies = currencies
+            return currencies
+        }
+        cacheOperation.addDependency(fetchCurrenciesOperation)
+
+        return CompoundOperationWrapper(
+            targetOperation: cacheOperation,
+            dependencies: [fetchCurrenciesOperation]
+        )
+    }
+}