Merge pull request #95 from BANKEX/develop

Implement decoding of input data for ABIv2 bound contracts

Author: shamatar

web3swift/ABIv2/Classes/ABIv2Elements.swift

@@ -141,6 +141,65 @@ extension ABIv2.Element {
             return returnArray
         }
     }
+    
+    func decodeInputData(_ data: Data) -> [String: Any]? {
+        switch self {
+        case .constructor(let function):
+            if (data.count == 0 && function.inputs.count == 1) {
+                let name = "0"
+                let value = function.inputs[0].type.emptyValue
+                var returnArray = [String:Any]()
+                returnArray[name] = value
+                if function.inputs[0].name != "" {
+                    returnArray[function.inputs[0].name] = value
+                }
+                return returnArray
+            }
+            
+            guard function.inputs.count*32 <= data.count else {return nil}
+            var returnArray = [String:Any]()
+            var i = 0;
+            guard let values = ABIv2Decoder.decode(types: function.inputs, data: data) else {return nil}
+            for input in function.inputs {
+                let name = "\(i)"
+                returnArray[name] = values[i]
+                if input.name != "" {
+                    returnArray[input.name] = values[i]
+                }
+                i = i + 1
+            }
+            return returnArray
+        case .event(_):
+            return nil
+        case .fallback(_):
+            return nil
+        case .function(let function):
+            if (data.count == 0 && function.inputs.count == 1) {
+                let name = "0"
+                let value = function.inputs[0].type.emptyValue
+                var returnArray = [String:Any]()
+                returnArray[name] = value
+                if function.inputs[0].name != "" {
+                    returnArray[function.inputs[0].name] = value
+                }
+                return returnArray
+            }
+            
+            guard function.inputs.count*32 <= data.count else {return nil}
+            var returnArray = [String:Any]()
+            var i = 0;
+            guard let values = ABIv2Decoder.decode(types: function.inputs, data: data) else {return nil}
+            for input in function.inputs {
+                let name = "\(i)"
+                returnArray[name] = values[i]
+                if input.name != "" {
+                    returnArray[input.name] = values[i]
+                }
+                i = i + 1
+            }
+            return returnArray
+        }
+    }
 }
 
 extension ABIv2.Element.Event {

web3swift/Contract/Classes/Contract.swift

@@ -206,4 +206,8 @@ public struct Contract:ContractProtocol {
     public func testBloomForEventPrecence(eventName: String, bloom: EthereumBloomFilter) -> Bool? {
         return false
     }
+    
+    public func decodeInputData(_ method: String, data: Data) -> [String : Any]? {
+        return nil
+    }
 }

web3swift/Contract/Classes/ContractABIv2.swift

@@ -228,4 +228,19 @@ public struct ContractV2:ContractProtocol {
         guard case .function(_) = function else {return nil}
         return function.decodeReturnData(data)
     }
+    
+    public func decodeInputData(_ method: String, data: Data) -> [String : Any]? {
+        if method == "fallback" {
+            return [String:Any]()
+        }
+        guard let function = methods[method] else {return nil}
+        switch function {
+        case .function(_):
+            return function.decodeInputData(data)
+        case .constructor(_):
+            return function.decodeInputData(data)
+        default:
+            return [String:Any]()
+        }
+    }
 }

web3swift/Contract/Classes/ContractProtocol.swift

@@ -17,6 +17,7 @@ public protocol ContractProtocol {
     func method(_ method:String, parameters: [AnyObject], extraData: Data, options: Web3Options?) -> EthereumTransaction?
     init?(_ abiString: String, at: EthereumAddress?)
     func decodeReturnData(_ method:String, data: Data) -> [String:Any]?
+    func decodeInputData(_ method:String, data: Data) -> [String:Any]?
     func parseEvent(_ eventLog: EventLog) -> (eventName:String?, eventData:[String:Any]?)
     func testBloomForEventPrecence(eventName: String, bloom: EthereumBloomFilter) -> Bool?
 //    func createEventFilter(eventName:String, filter: EventFilter?)