Merge pull request #60 from BANKEX/develop

fix regression of abi encoding
BANKEX · Apr 16, 2018 · c47647c · c47647c
2 parents 38a7c6e + cc56825
commit c47647c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/web3swift.podspec b/web3swift.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
 s.name             = "web3swift"
-s.version          = "0.5.2"
+s.version          = "0.5.4"
 s.summary          = "Web3 implementation in vanilla Swift for iOS ans macOS"
 
 s.description      = <<-DESC

diff --git a/web3swift/ABIv2/Classes/ABIv2Encoding.swift b/web3swift/ABIv2/Classes/ABIv2Encoding.swift
@@ -19,7 +19,12 @@ extension ABIv2Encoder {
         case let v as BigUInt:
             return v
         case let v as BigInt:
-            return v.magnitude
+            switch v.sign {
+            case .minus:
+                return nil
+            case .plus:
+                return v.magnitude
+            }
         case let v as String:
             let base10 = BigUInt(v, radix: 10)
             if base10 != nil {
@@ -103,9 +108,11 @@ extension ABIv2Encoder {
         case let d as Data:
             return d
         case let d as String:
-            let hex = Data.fromHex(d.stripHexPrefix())
-            if hex != nil {
-                return hex
+            if d.hasHexPrefix() {
+                let hex = Data.fromHex(d)
+                if hex != nil {
+                    return hex
+                }
             }
             let str = d.data(using: .utf8)
             if str != nil {