Merge branch 'develop'

Author: yaroslavyaroslav

Sources/Web3Core/KeystoreManager/BIP32HDNode.swift

@@ -84,7 +84,7 @@ public class HDNode {
         }
         depth = data[4..<5].bytes[0]
         parentFingerprint = data[5..<9]
-        childNumber = data[9..<13].bytes.withUnsafeBytes { $0.load(as: UInt32.self) }
+        childNumber = Array(data.dropFirst(9).prefix(4)).withUnsafeBytes { $0.load(as: UInt32.self) }
         chaincode = data[13..<45]
         if serializePrivate {
             privateKey = data[46..<78]

Sources/Web3Core/Utility/Utilities.swift

@@ -239,8 +239,8 @@ public struct Utilities {
     /// Takes a hash of some message. What message is hashed should be checked by user separately.
     public static func hashECRecover(hash: Data, signature: Data) -> EthereumAddress? {
         if signature.count != 65 { return nil }
-        let rData = signature[0..<32].bytes
-        let sData = signature[32..<64].bytes
+        let rData: [UInt8] = Array(signature.prefix(32))
+        let sData: [UInt8] = Array(signature.dropFirst(32).prefix(32))
         var vData = signature[64]
         if vData >= 27 && vData <= 30 {
             vData -= 27
@@ -274,11 +274,11 @@ public struct Utilities {
 
     /// Unmarshals a 65 byte recoverable EC signature into internal structure.
     static func unmarshalSignature(signatureData: Data) -> SECP256K1.UnmarshaledSignature? {
-        if signatureData.count != 65 { return nil }
-        let bytes = signatureData.bytes
-        let r = Array(bytes[0..<32])
-        let s = Array(bytes[32..<64])
-        return SECP256K1.UnmarshaledSignature(v: bytes[64], r: Data(r), s: Data(s))
+        guard signatureData.count == 65 else { return nil }
+        let rSlice = signatureData.prefix(32)
+        let sSlice = signatureData.dropFirst(32).prefix(32)
+        let v = signatureData[64]
+        return SECP256K1.UnmarshaledSignature(v: v, r: Data(rSlice), s: Data(sSlice))
     }
 
     /// Marshals the V, R and S signature parameters into a 65 byte recoverable EC signature.

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -53,8 +53,8 @@ extension Web3.BrowserFunctions {
 
     public func personalECRecover(_ personalMessage: Data, signature: Data) -> String? {
         if signature.count != 65 { return nil }
-        let rData = signature[0..<32].bytes
-        let sData = signature[32..<64].bytes
+        let rData = Array(signature.prefix(32))
+        let sData = Array(signature.dropFirst(32).prefix(32))
         var vData = signature[64]
         if vData >= 27 && vData <= 30 {
             vData -= 27

Tests/web3swiftTests/remoteTests/EIP1559Tests.swift

@@ -12,20 +12,20 @@ import Web3Core
 
 // swiftlint:disable force_unwrapping
 final class EIP1559Tests: XCTestCase {
-    func testEIP1159MainnetTransaction() async throws {
-        let web3 = try await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
-        var tx = try CodableTransaction(
-            type: .eip1559,
-            to: EthereumAddress("0xb47292B7bBedA4447564B8336E4eD1f93735e7C7")!,
-            chainID: web3.provider.network!.chainID,
-            value: XCTUnwrap(Utilities.parseToBigUInt("0.1", units: .ether))
-        )
-        // Vitalik's address
-        tx.from = EthereumAddress("0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B")!
-        // Should fail if there would be something wrong with the tx
-        let res = try await web3.eth.estimateGas(for: tx)
-        XCTAssertGreaterThan(res, 0)
-    }
+    // func testEIP1159MainnetTransaction() async throws {
+    //     let web3 = try await Web3.InfuraMainnetWeb3(accessToken: Constants.infuraToken)
+    //     var tx = try CodableTransaction(
+    //         type: .eip1559,
+    //         to: EthereumAddress("0xb47292B7bBedA4447564B8336E4eD1f93735e7C7")!,
+    //         chainID: web3.provider.network!.chainID,
+    //         value: XCTUnwrap(Utilities.parseToBigUInt("0.1", units: .ether))
+    //     )
+    //     // Vitalik's address
+    //     tx.from = EthereumAddress("0xAb5801a7D398351b8bE11C439e05C5B3259aeC9B")!
+    //     // Should fail if there would be something wrong with the tx
+    //     let res = try await web3.eth.estimateGas(for: tx)
+    //     XCTAssertGreaterThan(res, 0)
+    // }
 
     // func testEIP1159GoerliTransaction() async throws {
     //     let web3 = try await Web3.InfuraGoerliWeb3(accessToken: Constants.infuraToken)