Merge pull request #276 from tangem/release/3.5.0

Author: tureck1y

CHANGELOG

@@ -17,14 +17,19 @@ class AppModel: ObservableObject {
 
     //Wallet creation
     @Published var curve: EllipticCurve = .secp256k1
+    @Published var mnemonicString: String = ""
+    @Published var passphrase: String = ""
     //Sign
     @Published var derivationPath: String = ""
+    @Published var signHashesCount: String = "15"
     //Attestation
     @Published var attestationMode: AttestationTask.Mode = .normal
     //JSON-RPC
     @Published var json: String =  ""
     //Personalization
     @Published var personalizationConfig: String =  ""
+    //Set user code recovery allowed
+    @Published var isUserCodeRecoveryAllowed: Bool = false
 
     //MARK:-  Outputs
     @Published var logText: String = DebugLogger.logPlaceholder
@@ -248,10 +253,15 @@ extension AppModel {
             self.complete(with: "Failed to parse hd path")
             return
         }
+
+        guard let hashesCount = Int(signHashesCount, radix: 10) else {
+            self.complete(with: "Failed to signed hashes count")
+            return
+        }
 
         UIApplication.shared.endEditing()
 
-        let hashes = (0..<5).map {_ -> Data in getRandomHash()}
+        let hashes = (0..<hashesCount).map {_ -> Data in getRandomHash()}
 
         tangemSdk.sign(hashes: hashes,
                        walletPublicKey: walletPublicKey,
@@ -285,11 +295,24 @@ extension AppModel {
             self.complete(with: "Scan card to retrieve cardId")
             return
         }
-        
+
         tangemSdk.createWallet(curve: curve,
                                cardId: cardId,
                                completion: handleCompletion)
     }
+
+    func importWallet() {
+        guard let cardId = card?.cardId else {
+            self.complete(with: "Scan card to retrieve cardId")
+            return
+        }
+
+        tangemSdk.importWallet(curve: curve,
+                               cardId: cardId,
+                               mnemonic: mnemonicString,
+                               passphrase: passphrase,
+                               completion: handleCompletion)
+    }
 
     func purgeWallet(walletPublicKey: Data) {
         guard let cardId = card?.cardId else {
@@ -579,6 +602,19 @@ extension AppModel {
     func resetToFactory() {
         tangemSdk.startSession(with: ResetToFactorySettingsTask(), completion: handleCompletion)
     }
+
+    func getEntropy() {
+        tangemSdk.startSession(with: GetEntropyCommand(), completion: handleCompletion)
+    }
+
+    func setUserCodeRecoveryAllowed() {
+        guard let cardId = card?.cardId else {
+            self.complete(with: "Please, scan card before")
+            return
+        }
+
+        tangemSdk.setUserCodeRecoveryAllowed(isUserCodeRecoveryAllowed, cardId: cardId, completion: handleCompletion)
+    }
 }
 
 //MARK:- Json RPC
@@ -652,6 +688,7 @@ extension AppModel {
         case setPasscode
         case resetUserCodes
         case createWallet
+        case importWallet
         case purgeWallet
         //files
         case readFiles
@@ -674,6 +711,8 @@ extension AppModel {
         case personalize
         case resetBackup
         case resetToFactory
+        case getEntropy
+        case setUserCodeRecoveryAllowed
     }
 
     private func chooseMethod(walletPublicKey: Data? = nil) {
@@ -688,6 +727,7 @@ extension AppModel {
         case .signHash: runWithPublicKey(signHash, walletPublicKey)
         case .signHashes: runWithPublicKey(signHashes, walletPublicKey)
         case .createWallet: createWallet()
+        case .importWallet: importWallet()
         case .purgeWallet: runWithPublicKey(purgeWallet, walletPublicKey)
         case .readFiles: readFiles()
         case .writeUserFile: writeUserFile()
@@ -706,6 +746,8 @@ extension AppModel {
         case .personalize: personalize()
         case .resetBackup: resetBackup()
         case .resetToFactory: resetToFactory()
+        case .getEntropy: getEntropy()
+        case .setUserCodeRecoveryAllowed: setUserCodeRecoveryAllowed()
         }
     }
 }

Example/TangemSdkExample/AppModel.swift

@@ -125,7 +125,7 @@ struct ContentView: View {
             .cornerRadius(8)
             .overlay(RoundedRectangle(cornerRadius: 8)
                         .stroke(Color.orange, lineWidth: 2))
-        case .createWallet:
+        case .createWallet, .importWallet:
             VStack {
                 Text("Create wallet configuration")
                     .font(.headline)
@@ -140,6 +140,16 @@ struct ContentView: View {
                     }
                     .pickerStyle(SegmentedPickerStyle())
                 }
+
+                if case .importWallet = model.method {
+                    TextField("Optional mnemonic", text: $model.mnemonicString)
+                        .textFieldStyle(RoundedBorderTextFieldStyle())
+                        .autocapitalization(.none)
+
+                    TextField("Optional passphrase", text: $model.passphrase)
+                        .textFieldStyle(RoundedBorderTextFieldStyle())
+                        .autocapitalization(.none)
+                }
             }
             .padding()
             .cornerRadius(8)
@@ -155,6 +165,16 @@ struct ContentView: View {
                     .textFieldStyle(RoundedBorderTextFieldStyle())
                     .autocapitalization(.none)
                     .disableAutocorrection(true)
+
+                if case .signHashes = model.method {
+                    Text("Sign hashes count")
+                        .font(.headline)
+                        .bold()
+
+                    TextField("", text: $model.signHashesCount)
+                        .textFieldStyle(RoundedBorderTextFieldStyle())
+                        .autocapitalization(.none)
+                }
             }
             .padding()
             .cornerRadius(8)
@@ -194,7 +214,10 @@ struct ContentView: View {
             .overlay(RoundedRectangle(cornerRadius: 8)
                         .stroke(Color.orange, lineWidth: 2))
             .onAppear(perform: model.onAppear)
-            
+        case .setUserCodeRecoveryAllowed:
+            Toggle(isOn: $model.isUserCodeRecoveryAllowed) {
+                Text("Is user code recovery allowed")
+            }
         default:
             EmptyView()
         }

Example/TangemSdkExample/ContentView.swift

@@ -48,6 +48,7 @@ extension AppModel {
         "disableFiles": false,
         "allowHDWallets": true,
         "allowBackup": true,
+        "allowKeysImport": true,
         "NDEF": [],
         "cardData": {
             "date": "2021-03-15",

Example/TangemSdkExample/Developer/StaticData.swift

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'TangemSdk'
-  s.version          = '3.4.0'
+  s.version          = '3.5.0'
   s.summary          = 'Use TangemSdk for Tangem cards integration'
 
 # This description is used to generate tags and improve search results.
@@ -53,6 +53,7 @@ Tangem is a Swiss-based secure hardware wallet manufacturer that enables blockch
   s.weak_frameworks = 'CoreNFC', 'CryptoKit', 'Combine', 'SwiftUI'
 
   s.resource_bundles = { 'TangemSdk' => ['TangemSdk/TangemSdk/**/*.lproj/*.strings', 
-					'TangemSdk/TangemSdk/Haptics/*.ahap']}
+					'TangemSdk/TangemSdk/Haptics/*.ahap',
+					'TangemSdk/TangemSdk/**/Wordlists/*.txt']}
 
 end