ObjectiveC Update!

W3 classes now automatically casts to swift classes in transaction arguments
Added SolidityFunction support
Added hex string to data and data to hex string functions
Added W3UInt init with decimals
You can now easily add accounts with mnemonics and private key using [web3 addAccountWithMnemonics:password:] and [web3 addAccountWithPrivateKey:password:]

Author: v57

Cartfile.resolved

@@ -1,3 +1,3 @@
 github "attaswift/BigInt" "v3.1.0"
 github "attaswift/SipHash" "v1.2.2"
-github "mxcl/PromiseKit" "6.7.0"
+github "mxcl/PromiseKit" "6.7.1"

Sources/web3swift/ObjectiveC/Bridging.swift

@@ -8,14 +8,43 @@
 
 import Foundation
 
-public protocol SwiftBridgeable {
+
+// This protocol allows you to init objc class with its original swift class
+public protocol SwiftContainer: SwiftBridgeable {
+    init(_ swift: SwiftType)
+}
+
+public protocol SwiftBridgeable: SwiftBridgeableHack {
     associatedtype SwiftType
     var swift: SwiftType { get }
 }
-public protocol SwiftContainer: SwiftBridgeable {
-    init(_ swift: SwiftType)
+
+// This protocol allows you to get swift value as Any.
+// Without this protocol .toSwift() function cannot convert Any to SwiftBridgeable
+// because it contains associatedtype
+public protocol SwiftBridgeableHack {
+    var __swift: Any { get }
+}
+extension SwiftBridgeable {
+    public var __swift: Any { return swift }
+}
+func toSwift(_ any: Any) -> Any {
+    if let string = any as? String {
+        return string
+    } else if let objc = any as? SwiftBridgeableHack {
+        return objc.__swift
+    } else {
+        return any
+    }
 }
 
+extension Array where Element: Any {
+    var swift: [Any] {
+        return map(toSwift)
+    }
+}
+
+
 //public extension _ObjectiveCBridgeable where _ObjectiveCType: SwiftBridgeable, _ObjectiveCType.SwiftType == Self {
 //    static func _forceBridgeFromObjectiveC(_ source: _ObjectiveCType, result: inout Self?) {
 //        result = source.swift

Sources/web3swift/ObjectiveC/W3Contract.swift

@@ -76,12 +76,12 @@ extension ContractProtocol {
 
     @objc public func deploy(bytecode: Data, parameters: [Any], extraData: Data?, options: W3Options?) throws -> W3EthereumTransaction {
         let extraData = extraData ?? Data()
-        return try swift.deploy(bytecode: bytecode, parameters: parameters, extraData: extraData, options: options?.swift).objc
+        return try swift.deploy(bytecode: bytecode, parameters: parameters.swift, extraData: extraData, options: options?.swift).objc
     }
 
     @objc public func method(_ method: String, parameters: [Any], extraData: Data?, options: W3Options?) throws -> W3EthereumTransaction {
         let extraData = extraData ?? Data()
-        return try swift.method(method, parameters: parameters, extraData: extraData, options: options?.swift).objc
+        return try swift.method(method, parameters: parameters.swift, extraData: extraData, options: options?.swift).objc
     }
 
     @objc public func parseEvent(_ eventLog: W3EventLog) -> W3ContractParsedEvent {
@@ -105,4 +105,3 @@ extension ContractProtocol {
         return swift.decodeInputData(data)
     }
 }
-

Sources/web3swift/ObjectiveC/W3JsonRpc.swift

@@ -163,7 +163,7 @@ extension JsonRpcParams {
 
 	@objc public var params: [Any] {
 		get { return swift.params }
-		set { swift.params = newValue }
+		set { swift.params = newValue.swift }
 	}
 }
 

Sources/web3swift/ObjectiveC/W3Structs.swift

@@ -8,6 +8,18 @@
 
 import Foundation
 
+@objc public extension NSData {
+    @objc func hexString() -> NSString {
+        return (self as Data).hex as NSString
+    }
+}
+
+@objc public extension NSString {
+    @objc func hexData() -> NSData? {
+        return (try? (self as String).dataFromHex()) as NSData?
+    }
+}
+
 var opt: ObjcError {
 	return .returnsOptionalValue
 }
@@ -44,11 +56,11 @@ extension Address.AddressType {
     public required init(_ swift: Address) {
 		self.swift = swift
 	}
-	@objc public init(string: String, type: W3AddressType = .normal) {
-		swift = Address(string, type: type.swift)
+	@objc public init(string: String) {
+		swift = Address(string, type: .normal)
 	}
-	@objc public init(data: Data, type: W3AddressType = .normal) {
-		swift = Address(data, type: type.swift)
+	@objc public init(data: Data) {
+		swift = Address(data, type: .normal)
 	}
 	@objc public var isValid: Bool {
 		return swift.isValid
@@ -78,9 +90,19 @@ extension Address.AddressType {
 	@objc public override var description: String {
 		return swift.description
 	}
+    
+    @objc public func call(method: String, arguments: [Any]) throws -> W3SolidityDataReader {
+        return try swift.call(method, arguments.swift).wait().objc
+    }
+    @objc public func send(method: String, arguments: [Any], password: String, options: W3Options?) throws -> W3TransactionSendingResult {
+        return try swift.send(method, arguments.swift, password: password, web3: .default, options: options?.swift).wait().objc
+    }
 }
 
 @objc public extension NSString {
+    var address: W3Address {
+        return W3Address(string: self as String)
+    }
 	var isContractAddress: Bool {
 		return (self as String).hex.count > 0
 	}
@@ -90,7 +112,7 @@ extension Address.AddressType {
 	}
 
 	var contractAddress: W3Address {
-		return W3Address(string: self as String, type: .contractDeployment)
+		return W3Address(string: self as String)
 	}
 }
 

Sources/web3swift/ObjectiveC/W3TransactionIntermediate.swift

@@ -9,12 +9,12 @@
 import Foundation
 
 extension SolidityDataReader {
-    public var objc: W3DataResponse {
-        return W3DataResponse(self)
+    public var objc: W3SolidityDataReader {
+        return W3SolidityDataReader(self)
     }
 }
 
-@objc public class W3DataResponse: NSObject, SwiftContainer {
+@objc public class W3SolidityDataReader: NSObject, SwiftContainer {
     public let swift: SolidityDataReader
     public required init(_ swift: SolidityDataReader) {
         self.swift = swift

Sources/web3swift/ObjectiveC/W3UInt.swift

@@ -106,7 +106,7 @@ extension BigUInt {
 		self.value = value
 	}
 
-	public init?(_ string: String, decimals: Int) {
+	@objc public init?(_ string: String, decimals: Int) {
 		guard let value = BigUInt(string, decimals: decimals) else { return nil }
 		self.value = value
 	}
@@ -126,14 +126,21 @@ extension BigUInt {
 	@objc public func string(unitDecimals: Int, decimals: Int = 18, decimalSeparator: String = ".", options: W3StringOptions = .default) -> String {
 		return value.string(unitDecimals: unitDecimals, decimals: decimals, decimalSeparator: decimalSeparator, options: options.swift)
 	}
+    
+    public override var description: String {
+        return swift.description
+    }
 }
 
 extension BigInt {
     public var objc: W3Int {
 		return W3Int(value: self)
 	}
 }
-@objc public class W3Int: NSObject {
+@objc public class W3Int: NSObject, SwiftBridgeable {
+    public var swift: BigInt {
+        return value
+    }
 	let value: BigInt
 	init(value: BigInt) {
 		self.value = value
@@ -220,6 +227,10 @@ extension BigInt {
 	@objc public func string(units: W3Units, decimals: Int = 18, decimalSeparator: String = ".", options: W3StringOptions = .default) -> String {
 		return value.string(units: units.swift, decimals: decimals, decimalSeparator: decimalSeparator, options: options.swift)
 	}
+    
+    public override var description: String {
+        return swift.description
+    }
 }
 
 extension Web3Units {

Sources/web3swift/ObjectiveC/W3Web3.swift

@@ -94,4 +94,18 @@ extension Web3 {
 		super.init()
 		options = W3Options(object: self)
 	}
+    
+    @objc public func addAccount(mnemonics: String, password: String) throws -> W3Address {
+        let mnemonics = try Mnemonics(mnemonics)
+        let keystore = try BIP32Keystore(mnemonics: mnemonics, password: password)
+        keystoreManager.swift.append(keystore)
+        return keystore.addresses.first!.objc
+    }
+    
+    @objc public func addAccount(privateKey: Data, password: String) throws -> W3Address {
+        guard let keystore = try EthereumKeystoreV3(privateKey: privateKey, password: password)
+            else { throw SECP256K1Error.invalidPrivateKeySize }
+        keystoreManager.swift.append(keystore)
+        return keystore.addresses.first!.objc
+    }
 }