Merge pull request #428 from skywinder/master

Author: yaroslavyaroslav

Sources/web3swift/EthereumABI/ABIElements.swift

@@ -187,6 +187,40 @@ extension ABI.Element {
         case .fallback(_):
             return nil
         case .function(let function):
+            // the response size greater than equal 100 bytes, when read function aborted by "require" statement.
+            // if "require" statement has no message argument, the response is empty (0 byte).
+            if( data.bytes.count >= 100 ){
+                let check00_31 = BigUInt( "08C379A000000000000000000000000000000000000000000000000000000000", radix:16 )!
+                let check32_63 = BigUInt( "0000002000000000000000000000000000000000000000000000000000000000", radix:16 )!
+
+                // check data[00-31] and data[32-63]
+                if check00_31 == BigUInt( data[0...31] ) && check32_63 == BigUInt( data[32...63] ) {
+                    // data.bytes[64-67] contains the length of require message
+                    let len = (Int(data.bytes[64])<<24) | (Int(data.bytes[65])<<16) | (Int(data.bytes[66])<<8) | Int(data.bytes[67])
+
+                    let message = String( bytes:data.bytes[68..<(68+len)], encoding:.utf8 )!
+
+                    print( "read function aborted by require statement: \(message)" )
+
+                    var returnArray = [String:Any]()
+
+                    // set infomation
+                    returnArray["_abortedByRequire"] = true
+                    returnArray["_errorMessageFromRequire"] = message
+
+                    // set empty values
+                    for i in 0 ..< function.outputs.count {
+                        let name = "\(i)"
+                        returnArray[name] = function.outputs[i].type.emptyValue
+                        if function.outputs[i].name != "" {
+                            returnArray[function.outputs[i].name] = function.outputs[i].type.emptyValue
+                        }
+                    }
+
+                    return returnArray
+                }
+            }
+            // the "require" statement with no message argument will be caught here
             if (data.count == 0 && function.outputs.count == 1) {
                 let name = "0"
                 let value = function.outputs[0].type.emptyValue
@@ -210,6 +244,8 @@ extension ABI.Element {
                 }
                 i = i + 1
             }
+            // set a flag to detect the request succeeded
+            returnArray["_success"] = true
             return returnArray
         case .receive(_):
             return nil

web3swift.podspec

@@ -2,7 +2,7 @@ Pod::Spec.new do |spec|
     spec.name         = 'web3swift'
     spec.version      = '2.5.0'
     spec.ios.deployment_target = "9.0"
-    spec.osx.deployment_target = "10.11"
+    spec.osx.deployment_target = "10.12"
     spec.license      = { :type => 'Apache License 2.0', :file => 'LICENSE.md' }
     spec.summary      = 'Web3 implementation in vanilla Swift for iOS, macOS, and Linux'
     spec.homepage     = 'https://github.com/matter-labs/web3swift'