fix errors with typealiases

Author: skywinder

Example/web3swiftBrowser/Pods/Pods.xcodeproj/project.pbxproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1210"
+   LastUpgradeVersion = "1170"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Example/web3swiftBrowser/web3swiftBrowser.xcodeproj/xcshareddata/xcschemes/web3swiftBrowser.xcscheme

@@ -196,7 +196,7 @@ extension web3.BrowserFunctions {
                 transaction.chainID = self.web3.provider.network?.chainID
             }
 
-            guard let keystore = keystoreManager.walletForAddress(from) else {return nil}
+            guard let keystore: AbstractKeystore = keystoreManager.walletForAddress(from)  else {return nil}
             try Web3Signer.signTX(transaction: &transaction, keystore: keystore, account: from, password: password)
             print(transaction)
             let signedData = transaction.encode(forSignature: false, chainID: nil)?.toHexString().addHexPrefix()

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -9,7 +9,7 @@ import Foundation
 //import EthereumAddress
 
 public protocol AbstractKeystore {
-    public associatedtype Params: AbstractKeystoreParams
+    associatedtype Params: AbstractKeystoreParams
     func giveKeystoreParams() -> Params
     var addresses: [EthereumAddress]? { get }
     var isHDKeystore: Bool { get }

Sources/web3swift/KeystoreManager/AbstractKeystore.swift

@@ -12,9 +12,9 @@ import Foundation
 
 public class BIP32Keystore: AbstractKeystore {
 
-    typealias Params = KeystoreParamsBIP32
+    public typealias Params = KeystoreParamsBIP32
     public func giveKeystoreParams() -> Params {
-        self.keystoreParams
+        self.keystoreParams!
     }
 
     // Protocol

Sources/web3swift/KeystoreManager/BIP32Keystore.swift

@@ -9,11 +9,11 @@ import CryptoSwift
 import Foundation
 
 public class EthereumKeystoreV3: AbstractKeystore {
-    typealias Params = KeystoreParamsV3
-    public var keystoreParams: KeystoreParamsV3?
+    public typealias Params = KeystoreParamsV3
+    public var keystoreParams: Params?
 
     public func giveKeystoreParams() -> Params {
-        keystoreParams
+        keystoreParams!
     }
 
 

Sources/web3swift/KeystoreManager/EthereumKeystoreV3.swift

@@ -9,10 +9,9 @@ import Foundation
 //import EthereumAddress
 
 public class KeystoreManager: AbstractKeystore {
-    associatedtype Params = KeystoreParamsV3
+    public typealias Params = KeystoreParamsV3
     public func giveKeystoreParams() -> Params {
         fatalError("giveKeystoreParams() is not available for manager implemented")
-        return nil
     }
 
     public var isHDKeystore: Bool = false
@@ -109,13 +108,13 @@ public class KeystoreManager: AbstractKeystore {
 
     public var path: String
 
-    public func walletForAddress(_ address: EthereumAddress) -> AbstractKeystore? {
+    public func walletForAddress(_ address: EthereumAddress) -> <T: AbstractKeystore> T  {
         for keystore in _keystores {
             guard let key = keystore.addresses?.first else {
                 continue
             }
             if key == address && key.isValid {
-                return keystore
+                return keystore as? T
             }
         }
         for keystore in _bip32keystores {
@@ -124,7 +123,7 @@ public class KeystoreManager: AbstractKeystore {
             }
             for addr in allAddresses {
                 if addr == address && addr.isValid {
-                    return keystore
+                    return keystore as? T
                 }
             }
         }
@@ -133,7 +132,7 @@ public class KeystoreManager: AbstractKeystore {
                 continue
             }
             if key == address && key.isValid {
-                return keystore
+                return keystore as? T
             }
         }
         return nil

Sources/web3swift/KeystoreManager/KeystoreManager.swift

@@ -10,12 +10,12 @@ import Foundation
 //import EthereumAddress
 
 public class PlainKeystore: AbstractKeystore {
-    typealias Params = KeystoreParamsV3
+    public typealias Params = KeystoreParamsV3
 
     public var keystoreParams: KeystoreParamsV3?
 
-    public func giveKeystoreParams() -> T {
-        keystoreParams
+    public func giveKeystoreParams() -> Params {
+        keystoreParams!
     }
 
 

Sources/web3swift/KeystoreManager/PlainKeystore.swift

@@ -14,7 +14,7 @@ public enum TransactionSignerError: Error {
 }
 
 public struct Web3Signer {
-    public static func signTX(transaction:inout EthereumTransaction, keystore: AbstractKeystore, account: EthereumAddress, password: String, useExtraEntropy: Bool = false) throws {
+    public static func signTX<T: AbstractKeystore>(transaction:inout EthereumTransaction, keystore: T, account: EthereumAddress, password: String, useExtraEntropy: Bool = false) throws {
         var privateKey = try keystore.UNSAFE_getPrivateKeyData(password: password, account: account)
         defer {Data.zero(&privateKey)}
         if (transaction.chainID != nil) {
@@ -24,7 +24,7 @@ public struct Web3Signer {
         }
     }
 
-    public static func signPersonalMessage(_ personalMessage: Data, keystore: AbstractKeystore, account: EthereumAddress, password: String, useExtraEntropy: Bool = false) throws -> Data? {
+    public static func signPersonalMessage<T:AbstractKeystore>(_ personalMessage: Data, keystore: T, account: EthereumAddress, password: String, useExtraEntropy: Bool = false) throws -> Data? {
         var privateKey = try keystore.UNSAFE_getPrivateKeyData(password: password, account: account)
         defer {Data.zero(&privateKey)}
         guard let hash = Web3.Utils.hashPersonalMessage(personalMessage) else {return nil}