fix: some version issue

sirily11 · sirily11 · commit b7c442e80ece · 2023-09-26T17:05:59.000+08:00
diff --git a/Shared/HomePage.swift b/Shared/HomePage.swift
@@ -5,44 +5,41 @@
 //  Created by Qiwei Li on 6/8/22.
 //
 
-import SwiftUI
 import CoreData
+import SwiftUI
 
 struct HomePage: View {
     @EnvironmentObject var userAccountModel: UserAccountModel
     @EnvironmentObject var cryptoPassModel: CryptoPassModel
     @EnvironmentObject var ethereumModel: EthereumModel
- 
+
     @Environment(\.managedObjectContext) private var viewContext
 
-    
     var body: some View {
         NavigationView {
-            if let _ = userAccountModel.userAccount{
+            if let _ = userAccountModel.userAccount {
                 LoginRequiredView {
                     Text("Login required")
                 } child: {
                     PasswordList()
                 }
-
             }
             TitleView(icon: .dotsAndLineVerticalAndCursorarrowRectangle, subtitle: "CryptoPass")
         }
-        .onAppear{
+        .onAppear {
             userAccountModel.initialize()
         }
         .onReceive(userAccountModel.$userAccount, perform: { account in
-            if let account = account{
+            if let account = account {
                 cryptoPassModel.setUp(client: ethereumModel.ethereumClient, account: account, privateKey: userAccountModel.privateKey!)
             }
         })
-        .sheet(isPresented: $userAccountModel.shouldInitAccount){
-           IntroductionPage()
+        .sheet(isPresented: $userAccountModel.shouldInitAccount) {
+            IntroductionPage()
         }
     }
 }
 
-
 struct ContentView_Previews: PreviewProvider {
     static var previews: some View {
         HomePage().environment(\.managedObjectContext, PersistenceController.preview.container.viewContext)
diff --git a/Shared/common/components/LoginRequiredView.swift b/Shared/common/components/LoginRequiredView.swift
@@ -9,41 +9,43 @@ import SwiftUI
 
 struct LoginRequiredView<Content: View, Login: View>: View {
     @EnvironmentObject var authenticationModel: AuthenticationModel
-    
+
     @ViewBuilder let loginScreen: () -> Login
     @ViewBuilder let child: () -> Content
 
-    
     @State var hasLogined = false
     @State var error: AuthenticationError?
     @State var hasError = false
-    
+
     var body: some View {
-        Group{
-            if hasLogined{
+        Group {
+            if hasLogined {
                 child()
             } else {
                 loginScreen()
             }
         }
         .alert(isPresented: $hasError, error: error, actions: {
             Button {
-             hasError = false
+                hasError = false
             } label: {
                 Text("ok")
             }
 
         })
-        .onAppear{
+        .onAppear {
+            if hasLogined {
+                return
+            }
             authenticationModel.authenticate { isAuthenticated, hasError in
-                if isAuthenticated{
+                if isAuthenticated {
                     hasLogined = true
                 } else {
                     self.hasError = true
                     self.error = .invalidIdentity
                 }
-                
-                if hasError{
+
+                if hasError {
                     self.hasError = true
                     self.error = .invalidDevice
                 }
diff --git a/Shared/common/objects/CryptoPassContract.swift b/Shared/common/objects/CryptoPassContract.swift
@@ -135,7 +135,7 @@ struct GetSecretSizeResponse: ABIResponse {
 
 
 struct CryptoPass{
-    let contractAddress = EthereumAddress(Environments.contractAddress!)
+    let contractAddress = EthereumAddress(Environments.contractAddress)
     let client: EthereumClient
     let account: EthereumAccount
     let privateKey: Data
diff --git a/Shared/common/settings/Environments.swift b/Shared/common/settings/Environments.swift
@@ -10,7 +10,7 @@ import Foundation
 /**
  System environments
  */
-struct Environments{
-    static let rpc = Bundle.main.object(forInfoDictionaryKey: "RPC_ENDPOINT") as? String
-    static let contractAddress = Bundle.main.object(forInfoDictionaryKey: "CONTRACT") as? String
+struct Environments {
+    static let rpc = RPC_URL
+    static let contractAddress = CONTRACT_ADDRESS
 }
diff --git a/Shared/models/AuthenticationModel.swift b/Shared/models/AuthenticationModel.swift
@@ -8,23 +8,21 @@
 import Foundation
 import LocalAuthentication
 
-
-
-class AuthenticationModel: ObservableObject{
+class AuthenticationModel: ObservableObject {
     private var context = LAContext()
-    
-    func authenticate(completion: @escaping (_ isAuthenticated: Bool, _ hasError: Bool) -> ()){
+
+    func authenticate(completion: @escaping (_ isAuthenticated: Bool, _ hasError: Bool) -> ()) {
         var error: NSError?
         if context.canEvaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, error: &error) {
-                // it's possible, so go ahead and use it
-                let reason = "We need to unlock your data."
-                context.evaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, localizedReason: reason) { success, authenticationError in
-                    if success {
-                        completion(true, false)
-                    } else {
-                       completion(false, false)
-                    }
+            // it's possible, so go ahead and use it
+            let reason = "We need to unlock your data."
+            context.evaluatePolicy(.deviceOwnerAuthenticationWithBiometrics, localizedReason: reason) { success, _ in
+                if success {
+                    completion(true, false)
+                } else {
+                    completion(false, false)
                 }
+            }
         } else {
             completion(false, true)
         }
diff --git a/Shared/models/EthereumModel.swift b/Shared/models/EthereumModel.swift
@@ -12,7 +12,7 @@ class EthereumModel: ObservableObject{
     @Published var ethereumClient: EthereumClient
     
     init(){
-        let clientUrl = URL(string: Environments.rpc!)
+        let clientUrl = URL(string: Environments.rpc)
         self.ethereumClient = EthereumClient(url: clientUrl!)
     }
 }
diff --git a/Shared/models/UserAccountModel.swift b/Shared/models/UserAccountModel.swift
@@ -8,42 +8,44 @@
 import Foundation
 import web3
 
-
-class UserAccountModel: ObservableObject{
+class UserAccountModel: ObservableObject {
     @Published var userAccount: EthereumAccount?
     @Published var hasInitAccount: Bool = false
     @Published var shouldInitAccount = false
     @Published var privateKey: Data?
     private let storage = EthereumKeyChainStorage()
-    
-    func initialize(){
+
+    func initialize() {
+        if hasInitAccount {
+            return
+        }
         do {
             privateKey = try storage.loadPrivateKey()
-            userAccount = try EthereumAccount.init(keyStorage: storage)
+            userAccount = try EthereumAccount(keyStorage: storage)
             shouldInitAccount = false
             hasInitAccount = true
         } catch PrivateKeyError.privateKeyNotFound {
             shouldInitAccount = true
             print("No previous stored private key")
-        }  catch{
+        } catch {
             print(error.localizedDescription)
         }
     }
-    
-    func importAccount(privateKey: String) throws{
+
+    func importAccount(privateKey: String) throws {
         let keyStoreage = EthereumKeyChainStorage()
-        //TODO: Replace 123
+        // TODO: Replace 123
         userAccount = try EthereumAccount.importAccount(keyStorage: keyStoreage, privateKey: privateKey)
         self.privateKey = privateKey.web3.hexData
     }
-    
-    func resetAccount(){
+
+    func resetAccount() {
         userAccount = nil
         hasInitAccount = false
         shouldInitAccount = true
     }
-    
-    func finishSetup(){
+
+    func finishSetup() {
         hasInitAccount = true
         shouldInitAccount = false
     }
diff --git a/Shared/pages/password/PasswordList.swift b/Shared/pages/password/PasswordList.swift
@@ -5,9 +5,9 @@
 //  Created by Qiwei Li on 6/8/22.
 //
 
+import BigInt
 import SwiftUI
 import web3
-import BigInt
 
 struct PasswordList: View {
     @EnvironmentObject var userAccountModel: UserAccountModel
@@ -16,14 +16,10 @@ struct PasswordList: View {
     @EnvironmentObject var transactionModel: TransactionModel
     @EnvironmentObject var passwordListModel: PasswordListModel
     
-
-    
     var body: some View {
-        Group{
-            NavigationLink(destination:  PasswordForm(), tag: 1, selection: $passwordListModel.selection){
-                
-            }
-            List{
+        Group {
+            NavigationLink(destination: PasswordForm(), tag: 1, selection: $passwordListModel.selection) {}
+            List {
                 Section(header: Text("Blockchain info")) {
                     InfoCard(title: "BlockNumber", subtitle: "\(passwordListModel.blockNumber)", color: .orange, unit: "blocks", icon: .boltBatteryblock)
                     
@@ -32,32 +28,29 @@ struct PasswordList: View {
                     InfoCard(title: "Password Count", subtitle: "\(passwordListModel.passwordSize)", color: .orange, unit: "", icon: .boltBatteryblock)
                 }
                 
-                
                 Section(header: Text("Passwords")) {
-                    ForEach(passwordListModel.passwords){ password in
+                    ForEach(passwordListModel.passwords) { password in
                         NavigationLink(destination: PasswordForm(editMode: false, password: password)) {
                             PasswordRow(password: password)
                         }
                     }
-                    .onDelete{
+                    .onDelete {
                         indexSet in
-                        Task{
+                        Task {
                             await delete(at: indexSet)
                         }
                     }
-                    
                 }
-                
             }
             .listStyle(InsetGroupedListStyle())
-            .toolbar{
-                ToolbarItem(placement: .navigationBarLeading){
-                    Button(action: { userAccountModel.resetAccount() }){
+            .toolbar {
+                ToolbarItem(placement: .navigationBarLeading) {
+                    Button(action: { userAccountModel.resetAccount() }) {
                         Image(systemSymbol: .externaldriveFill)
                     }
                 }
-                ToolbarItem(placement: .navigationBarTrailing){
-                    Button(action: { passwordListModel.selection = 1 }){
+                ToolbarItem(placement: .navigationBarTrailing) {
+                    Button(action: { passwordListModel.selection = 1 }) {
                         Image(systemSymbol: .plus)
                     }
                 }
@@ -68,18 +61,18 @@ struct PasswordList: View {
             print("BlockNumber: \(passwordListModel.blockNumber)")
             await fetchBlockchainData(isRefresh: true)
         }
-        .onReceive(userAccountModel.$userAccount){ _ in
+        .onReceive(userAccountModel.$userAccount) { _ in
             Task {
                 await fetchBlockchainData()
             }
         }
-        .onReceive(transactionModel.$transactionReceipt){
+        .onReceive(transactionModel.$transactionReceipt) {
             _ in
             Task {
                 await fetchBlockchainData()
             }
         }
-        .alert(isPresented: $passwordListModel.hasError){
+        .alert(isPresented: $passwordListModel.hasError) {
             Alert(title: Text("Error"), message: Text(passwordListModel.error!), dismissButton: .default(Text("ok")))
         }
         .task {
@@ -92,7 +85,7 @@ struct PasswordList: View {
     
     func delete(at offsets: IndexSet) async {
         let index = offsets.first
-        if let cryptoPass = cryptoPassModel.client{
+        if let cryptoPass = cryptoPassModel.client {
             if let index = index {
                 let transaction = try! await cryptoPass.prepareDeleteTransaction(at: BigUInt(index))
                 transactionModel.showConfirmation(transaction: transaction)
@@ -105,17 +98,17 @@ struct PasswordList: View {
      */
     private func fetchBlockchainData(isRefresh: Bool = false) async {
         passwordListModel.update()
-        withAnimation{
-            Task{
-                do{
-                    if let userAccount = userAccountModel.userAccount{
+        withAnimation {
+            Task {
+                do {
+                    if let userAccount = userAccountModel.userAccount {
                         passwordListModel.blockNumber = try await ethereumModel.ethereumClient.eth_blockNumber()
-                        passwordListModel.accountBalance = BigInt(try await ethereumModel.ethereumClient.eth_getBalance(address: userAccount.address, block: EthereumBlock.Latest))
+                        passwordListModel.accountBalance = try BigInt(await ethereumModel.ethereumClient.eth_getBalance(address: userAccount.address, block: EthereumBlock.Latest))
                         
-                        if let cryptoPass = cryptoPassModel.client{
+                        if let cryptoPass = cryptoPassModel.client {
                             passwordListModel.passwordSize = try await cryptoPass.getSecretSize()
-                            if passwordListModel.passwordSize > 0{
-                                passwordListModel.passwords = try await cryptoPass.getSecretsInRange(start: 0, end: passwordListModel.passwordSize).map{
+                            if passwordListModel.passwordSize > 0 {
+                                passwordListModel.passwords = try await cryptoPass.getSecretsInRange(start: 0, end: passwordListModel.passwordSize).map {
                                     password in
                                     CommonPassword.from(password: password)!
                                 }
@@ -125,7 +118,7 @@ struct PasswordList: View {
                         }
                     }
                     
-                } catch{
+                } catch {
                     print(error.localizedDescription)
                     passwordListModel.hasError = true
                     passwordListModel.error = error.localizedDescription
diff --git a/Shared/pages/transaction/ConfirmationPage.swift b/Shared/pages/transaction/ConfirmationPage.swift
@@ -34,7 +34,7 @@ struct ConfirmationPage: View {
                         
                     }
                 }
-                if let transaction = transaction {
+                if transaction != nil {
                     Form{
                         Section("Transaction Summary") {
                             FormTextField(leading: {Text("Value")}) {
@@ -147,7 +147,7 @@ struct ConfirmationPage: View {
             Task {
                 if let transaction =  transactionModel.transaction{
                     do {
-                        gasFee = try await ethereumModel.ethereumClient.eth_estimateGas(transaction, withAccount: userAccountModel.userAccount!)
+                        gasFee = try await ethereumModel.ethereumClient.eth_estimateGas(transaction)
                         gasPrice = try await ethereumModel.ethereumClient.eth_gasPrice()
                         nonce = try await ethereumModel.ethereumClient.eth_getTransactionCount(address: userAccountModel.userAccount!.address, block: .Latest)
                         chainId = try await ethereumModel.ethereumClient.chainId()
diff --git a/Shared/secrets.swift b/Shared/secrets.swift
@@ -0,0 +1,11 @@
+//
+//  secrets.swift
+//  cryptoPass
+//
+//  Created by Qiwei Li on 9/26/23.
+//
+
+import Foundation
+
+let RPC_URL = "https://rpc.etdchain.net"
+let CONTRACT_ADDRESS = "0x196016EB927A63BbCb7dA010b8fd945a356A66c0"
diff --git a/cryptoPass.xcodeproj/project.pbxproj b/cryptoPass.xcodeproj/project.pbxproj
diff --git a/cryptoPass.xcodeproj/project.xcworkspace/xcuserdata/sirily11.xcuserdatad/UserInterfaceState.xcuserstate b/cryptoPass.xcodeproj/project.xcworkspace/xcuserdata/sirily11.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/cryptoPass.xcodeproj/xcuserdata/sirily11.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/cryptoPass.xcodeproj/xcuserdata/sirily11.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class EthereumModel: ObservableObject{`
`12`	`12`	`@Published var ethereumClient: EthereumClient`
`13`	`13`
`14`	`14`	`init(){`
`15`		`- let clientUrl = URL(string: Environments.rpc!)`
	`15`	`+ let clientUrl = URL(string: Environments.rpc)`
`16`	`16`	`self.ethereumClient = EthereumClient(url: clientUrl!)`
`17`	`17`	`}`
`18`	`18`	`}`