Merge pull request #1 from JeneaVranceanu/feat/decode-error

fix: decode error PR update
web3swift-team · Nov 27, 2023 · ab90bda · ab90bda
2 parents e66dd35 + 0ba7039
commit ab90bda
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 3 deletions.
diff --git a/Sources/Web3Core/Contract/ContractProtocol.swift b/Sources/Web3Core/Contract/ContractProtocol.swift
@@ -356,7 +356,7 @@ extension DefaultContractProtocol {
                 throw Web3Error.inputError(desc: "Make sure ABI you use contains error that can match signature: 0x\(selector.toHexString())")
             }
         default:
-            throw Web3Error.inputError(desc: "Invalid data count")
+            throw Web3Error.inputError(desc: "Given data has invalid bytes count.")
         }
     }
 
@@ -395,7 +395,7 @@ extension DefaultContractProtocol {
     @discardableResult
     public func callStatic(_ method: String, parameters: [Any], provider: Web3Provider) async throws -> [String: Any] {
         guard let address = address else {
-            throw Web3Error.inputError(desc: "address field is missing")
+            throw Web3Error.inputError(desc: "RPC failed: contract is missing an address.")
         }
         guard let data = self.method(method, parameters: parameters, extraData: nil) else {
             throw Web3Error.dataError

diff --git a/Sources/Web3Core/Utility/String+Extension.swift b/Sources/Web3Core/Utility/String+Extension.swift
@@ -137,7 +137,17 @@ extension String {
     }
 
     public var isHex: Bool {
-        stripHexPrefix().reduce(true, { $0 && $1.isHexDigit } )
+        var _str = self.trim()
+        if _str.isEmpty {
+            return false
+        }
+        _str = _str.stripHexPrefix()
+        for char in _str {
+            if !char.isHexDigit {
+                return false
+            }
+        }
+        return true
     }
 
     /// Splits a string into groups of `every` n characters, grouping from left-to-right by default. If `backwards` is true, right-to-left.

diff --git a/Tests/web3swiftTests/localTests/String+ExtensionTests.swift.swift b/Tests/web3swiftTests/localTests/String+ExtensionTests.swift.swift
@@ -0,0 +1,31 @@
+//
+//  String+ExtensionTests.swift
+//
+//  Created by JeneaVranceanu on 26.11.2023.
+//
+
+import Foundation
+import XCTest
+
+class StringExtensionsTest: XCTestCase {
+
+    func testIsHex() throws {
+        XCTAssertTrue("0x".isHex)
+        XCTAssertTrue("0xF".isHex)
+        XCTAssertTrue("F".isHex)
+        XCTAssertTrue("0xFF".isHex)
+        XCTAssertTrue("0x0123456789abcdefABCDEF".isHex)
+        XCTAssertTrue("0123456789abcdefABCDEF".isHex)
+        XCTAssertTrue("0123456789abcdefABCDEF ".isHex)
+        XCTAssertTrue(" 0123456789abcdefABCDEF ".isHex)
+        XCTAssertTrue(" 0123456789abcdefABCDEF".isHex)
+
+        XCTAssertFalse("".isHex)
+        XCTAssertFalse("-".isHex)
+        XCTAssertFalse("xyz".isHex)
+        XCTAssertFalse("0xCAFEQ".isHex)
+        XCTAssertFalse("R0123456789abcdefABCDEF ".isHex)
+        XCTAssertFalse(" R0123456789abcdefABCDEF ".isHex)
+    }
+
+}