Merge branch 'develop' into feature/EIP-1559

Author: yaroslavyaroslav

.github/workflows/ci.yml

@@ -32,8 +32,16 @@ jobs:
         run: swift package resolve
       - name: Build
         run: swift build --build-tests
-      # - name: Run local tests
-      #   run: swift test --skip-build -c debug --filter localTests
+      - name: Install ganache
+        run: npm install ganache --global
+      - name: Start ganache in background
+        run: ganache &
+      - name: Wait till ganache starts
+        run: sleep 1
+      - name: Run local tests
+        run: swift test --skip-build -c debug --filter localTests
+      # - name: Run remote tests
+      #   run: swift test --skip-build -c debug --filter remoteTests
   carthage:
     name: Carthage
     runs-on: macOS-11
@@ -53,5 +61,13 @@ jobs:
         run: carthage build --no-use-binaries --platform iOS Simulator --use-xcframeworks
       - name: Building framework
         run: xcodebuild build-for-testing -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}" -testPlan LocalTests
-      # - name: Running local tests
-      #   run: xcodebuild test-without-building -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}" -testPlan LocalTests
+      - name: Install ganache
+        run: npm install ganache --global
+      - name: Start ganache in background
+        run: ganache &
+      - name: Wait till ganache starts
+        run: sleep 1
+      - name: Run local tests
+        run: xcodebuild test-without-building -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}" -testPlan LocalTests
+      # - name: Run remote tests
+      #   run: xcodebuild test-without-building -project "web3swift.xcodeproj" -scheme "web3swift" -destination "${{matrix.destination}}" -testPlan RemoteTests

CHANGELOG.md

@@ -42,7 +42,7 @@ let package = Package(
         .testTarget(
             name: "localTests",
             dependencies: ["web3swift"],
-            path: "Tests/web3swiftTests/local_tests",
+            path: "Tests/web3swiftTests/localTests",
             resources: [
                 .copy("../../../TestToken/Helpers/SafeMath/SafeMath.sol"),
                 .copy("../../../TestToken/Helpers/TokenBasics/ERC20.sol"),
@@ -53,7 +53,7 @@ let package = Package(
         .testTarget(
             name: "remoteTests",
             dependencies: ["web3swift"],
-            path: "Tests/web3swiftTests/infura_tests",
+            path: "Tests/web3swiftTests/remoteTests",
             resources: [
                 .copy("../../../TestToken/Helpers/SafeMath/SafeMath.sol"),
                 .copy("../../../TestToken/Helpers/TokenBasics/ERC20.sol"),

Package.resolved

@@ -9,8 +9,9 @@ import Foundation
 public extension Data {
 
     init<T>(fromArray values: [T]) {
-        var values = values
-        self.init(buffer: UnsafeBufferPointer(start: &values, count: values.count))
+        let values = values
+        let ptrUB = values.withUnsafeBufferPointer { (ptr: UnsafeBufferPointer) in return ptr }
+        self.init(buffer: ptrUB)
     }
 
     func toArray<T>(type: T.Type) throws -> [T] {

Package.swift

@@ -116,7 +116,7 @@ extension SECP256K1 {
         let result = privateKey.withUnsafeBytes { (pkRawBufferPointer: UnsafeRawBufferPointer) -> Int32? in
             if let pkRawPointer = pkRawBufferPointer.baseAddress, pkRawBufferPointer.count > 0 {
                 let privateKeyPointer = pkRawPointer.assumingMemoryBound(to: UInt8.self)
-                let res = secp256k1_ec_pubkey_create(context!, UnsafeMutablePointer<secp256k1_pubkey>(&publicKey), privateKeyPointer)
+                let res = secp256k1_ec_pubkey_create(context!, &publicKey, privateKeyPointer)
                 return res
             } else {
                 return nil
@@ -163,7 +163,7 @@ extension SECP256K1 {
         let result = serializedKey.withUnsafeBytes { (serializedKeyRawBufferPointer: UnsafeRawBufferPointer) -> Int32? in
             if let serializedKeyRawPointer = serializedKeyRawBufferPointer.baseAddress, serializedKeyRawBufferPointer.count > 0 {
                 let serializedKeyPointer = serializedKeyRawPointer.assumingMemoryBound(to: UInt8.self)
-                let res = secp256k1_ec_pubkey_parse(context!, UnsafeMutablePointer<secp256k1_pubkey>(&publicKey), serializedKeyPointer, keyLen)
+                let res = secp256k1_ec_pubkey_parse(context!, &publicKey, serializedKeyPointer, keyLen)
                 return res
             } else {
                 return nil

Sources/web3swift/Convenience/Data+Extension.swift

@@ -205,7 +205,7 @@ extension ABIDecoder {
             guard data.count >= pointer + type.memoryUsage else {return (nil, nil)}
             let dataSlice = data[pointer ..< pointer + type.memoryUsage]
             let bn = BigUInt(dataSlice)
-            if bn > UINT64_MAX || bn >= data.count {
+            if bn > UInt64.max || bn >= data.count {
                 // there are ERC20 contracts that use bytes32 intead of string. Let's be optimistic and return some data
                 if case .string = type {
                     let nextElement = pointer + type.memoryUsage

Sources/web3swift/Convenience/SECP256k1.swift

@@ -79,10 +79,7 @@ public class HDNode {
         }
         depth = data[4..<5].bytes[0]
         parentFingerprint = data[5..<9]
-        let cNum = data[9..<13].bytes
-        childNumber = UnsafePointer(cNum).withMemoryRebound(to: UInt32.self, capacity: 1) {
-            $0.pointee
-        }
+        childNumber = data[9..<13].bytes.withUnsafeBytes { $0.load(as: UInt32.self) }
         chaincode = data[13..<45]
         if serializePrivate {
             privateKey = data[46..<78]