Merge branch 'develop' into ganache-tests

Author: yaroslavyaroslav

.github/workflows/ci.yml

@@ -8,6 +8,9 @@ on:
       - hotfix
       - ganache-tests
     paths:
+      - Packag*.swift
+      - web3swift.podspec
+      - Cartfile
       - Sources/**
       - 'Tests/**'
       - 'web3swift*/**'

Cartfile

@@ -1,5 +1,5 @@
-github "attaswift/BigInt" ~> 5.2.1
+github "attaswift/BigInt" ~> 5.3.0
 github "attaswift/SipHash" ~> 1.2.2
 github "daltoniam/Starscream" ~> 4.0.4
-github "krzyzanowskim/CryptoSwift" ~> 1.4.0
-github "mxcl/PromiseKit" ~> 6.15.3
+github "krzyzanowskim/CryptoSwift" ~> 1.4.2
+github "mxcl/PromiseKit" ~> 6.16.2

Cartfile.resolved

@@ -2,4 +2,4 @@ github "attaswift/BigInt" "v5.3.0"
 github "attaswift/SipHash" "v1.2.2"
 github "daltoniam/Starscream" "4.0.4"
 github "krzyzanowskim/CryptoSwift" "1.4.2"
-github "mxcl/PromiseKit" "6.16.1"
+github "mxcl/PromiseKit" "6.16.2"

Package.swift

@@ -23,7 +23,7 @@ let package = Package(
 
     dependencies: [
         .package(url: "https://github.com/attaswift/BigInt.git", from: "5.3.0"),
-        .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.15.4"),
+        .package(url: "https://github.com/mxcl/PromiseKit.git", from: "6.16.2"),
         .package(url: "https://github.com/daltoniam/Starscream.git", from: "4.0.4"),
         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.4.2")
     ],

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

Sources/web3swift/KeystoreManager/BIP32HDNode.swift

@@ -231,7 +231,7 @@ extension HDNode {
             let newNode = HDNode()
             newNode.chaincode = cc
             newNode.depth = self.depth + 1
-            newNode.publicKey = pubKeyCandidate
+            newNode.publicKey = newPublicKey
             newNode.childNumber = index
             guard let fprint = try? RIPEMD160.hash(message: self.publicKey.sha256())[0..<4] else {
                 return nil

web3swift.podspec

@@ -1,8 +1,8 @@
 Pod::Spec.new do |spec|
     spec.name         = 'web3swift'
-    spec.version      = '2.3.0'
+    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'
@@ -13,9 +13,9 @@ Pod::Spec.new do |spec|
     spec.resource_bundle = { "Browser" => "Sources/web3swift/Browser/*.js" }
     spec.swift_version = '5.0'
     spec.frameworks = 'CoreImage'
-    spec.dependency 'BigInt', '~> 5.2'
+    spec.dependency 'BigInt', '~> 5.2.0'
     spec.dependency 'Starscream', '~> 4.0.4'
-    spec.dependency 'CryptoSwift', '~> 1.4.0'
+    spec.dependency 'CryptoSwift', '~> 1.4.2'
     spec.dependency 'secp256k1.c', '~> 0.1'
     spec.dependency 'PromiseKit', '~> 6.15.3'
 end