Chore/update dependencies and fix issues with changed BigInt API

Package.swift

@@ -13,9 +13,9 @@ let package = Package(
         .library(name: "web3-zksync.swift", targets: ["web3-zksync"])
     ],
     dependencies: [
-        .package(url: "https://github.com/attaswift/BigInt", from: "5.3.0"),
+        .package(url: "https://github.com/attaswift/BigInt", from: "5.7.0"),
         .package(url: "https://github.com/iwill/generic-json-swift", .upToNextMajor(from: "2.0.2")),
-        .package(url: "https://github.com/GigaBitcoin/secp256k1.swift.git", .upToNextMajor(from: "0.6.0")),
+        .package(url: "https://github.com/21-DOT-DEV/swift-secp256k1", exact: "0.21.1"),
         .package(url: "https://github.com/vapor/websocket-kit.git", from: "2.16.1"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.6.4")
     ],
@@ -29,7 +29,7 @@ let package = Package(
                     .target(name: "Internal_CryptoSwift_PBDKF2"),
                     "BigInt",
                     .product(name: "GenericJSON", package: "generic-json-swift"),
-                    .product(name: "secp256k1", package: "secp256k1.swift"),
+                    .product(name: "P256K", package: "swift-secp256k1"),
                     .product(name: "WebSocketKit", package: "websocket-kit"),
                     .product(name: "Logging", package: "swift-log")
                 ],

Package@swift-6.1.swift

@@ -13,9 +13,9 @@ let package = Package(
         .library(name: "web3-zksync.swift", targets: ["web3-zksync"])
     ],
     dependencies: [
-        .package(url: "https://github.com/attaswift/BigInt", from: "5.3.0"),
+        .package(url: "https://github.com/attaswift/BigInt", from: "5.7.0"),
         .package(url: "https://github.com/iwill/generic-json-swift", .upToNextMajor(from: "2.0.2")),
-        .package(url: "https://github.com/GigaBitcoin/secp256k1.swift.git", .upToNextMajor(from: "0.6.0")),
+        .package(url: "https://github.com/21-DOT-DEV/swift-secp256k1", exact: "0.21.1"),
         .package(url: "https://github.com/vapor/websocket-kit.git", from: "2.16.1"),
         .package(url: "https://github.com/apple/swift-log.git", from: "1.6.4")
     ],
@@ -29,7 +29,7 @@ let package = Package(
                     .target(name: "Internal_CryptoSwift_PBDKF2"),
                     "BigInt",
                     .product(name: "GenericJSON", package: "generic-json-swift"),
-                    .product(name: "secp256k1", package: "secp256k1.swift"),
+                    .product(name: "P256K", package: "swift-secp256k1"),
                     .product(name: "WebSocketKit", package: "websocket-kit"),
                     .product(name: "Logging", package: "swift-log")
                 ],

web3sTests/Account/EthereumKeyStorageTests.swift

@@ -17,7 +17,7 @@ class EthereumKeyStorageTests: XCTestCase {
     }
 
     func testStoreLocalPrivateKey() {
-        let randomData = Data.randomOfLength(256)!
+        let randomData = Data.randomOfLength(32)!
         let keyStorage = EthereumKeyLocalStorage()
 
         do {
@@ -29,7 +29,7 @@ class EthereumKeyStorageTests: XCTestCase {
     }
 
     func testStoreAndLoadLocalPrivateKey() {
-        let randomData = Data.randomOfLength(256)!
+        let randomData = Data.randomOfLength(32)!
         let keyStorage = EthereumKeyLocalStorage()
         let ethereumAddress = EthereumAddress(TestConfig.publicKey)
         do {

web3swift/src/Account/EthereumKeyStorage.swift

@@ -31,50 +31,59 @@ public class EthereumKeyLocalStorage: EthereumSingleKeyStorageProtocol, @uncheck
     private let address: ThreadSafeBox<EthereumAddress?> = ThreadSafeBox(nil)
     private let localFileName = "ethereumkey"
 
-    private var addressPath: String? {
+    private var addressURL: URL? {
         guard let address = address.value else {
             return nil
         }
         if let url = folderPath {
-            return url.appendingPathComponent(address.asString()).path
+            return url.appendingPathComponent(address.asString())
         }
         return nil
     }
 
+    private var addressPath: String? { addressURL?.path }
+
     private var folderPath: URL? {
         if let url = fileManager.urls(for: .cachesDirectory, in: .userDomainMask).first {
             return url
         }
         return nil
     }
 
+    private var localURL: URL? {
+        fileManager
+            .urls(for: .cachesDirectory, in: .userDomainMask)
+            .first?
+            .appendingPathComponent(localFileName)
+    }
+
     private var localPath: String? {
-        if let url = fileManager.urls(for: .cachesDirectory, in: .userDomainMask).first {
-            return url.appendingPathComponent(localFileName).path
-        }
-        return nil
+        localURL?.path
     }
 
     private let fileManager = FileManager.default
 
     public func storePrivateKey(key: Data) throws {
-        guard let localPath else {
+        guard let localURL else {
             throw EthereumKeyStorageError.failedToSave
         }
 
-        let success = NSKeyedArchiver.archiveRootObject(key, toFile: localPath)
-
-        if !success {
+        do {
+            try NSKeyedArchiver
+                .archivedData(withRootObject: key, requiringSecureCoding: false)
+                .write(to: localURL)
+        } catch {
             throw EthereumKeyStorageError.failedToSave
         }
     }
 
     public func loadPrivateKey() throws -> Data {
-        guard let localPath else {
+        guard let localURL else {
             throw EthereumKeyStorageError.failedToLoad
         }
 
-        guard let data = NSKeyedUnarchiver.unarchiveObject(withFile: localPath) as? Data else {
+        guard let archivedData = try? Data(contentsOf: localURL),
+              let data = try NSKeyedUnarchiver.unarchivedObject(ofClass: NSData.self, from: archivedData) as? Data else {
             throw EthereumKeyStorageError.failedToLoad
         }
 
@@ -112,13 +121,15 @@ extension EthereumKeyLocalStorage: EthereumMultipleKeyStorageProtocol {
             }
         }
 
-        guard let localPath = self.addressPath else {
+        guard let localURL = self.addressURL else {
             throw EthereumKeyStorageError.failedToSave
         }
 
-        let success = NSKeyedArchiver.archiveRootObject(key, toFile: localPath)
-
-        if !success {
+        do {
+            try NSKeyedArchiver
+                .archivedData(withRootObject: key, requiringSecureCoding: false)
+                .write(to: localURL)
+        } catch {
             throw EthereumKeyStorageError.failedToSave
         }
     }
@@ -134,11 +145,12 @@ extension EthereumKeyLocalStorage: EthereumMultipleKeyStorageProtocol {
             }
         }
 
-        guard let localPath = self.addressPath else {
+        guard let localURL = self.addressURL else {
             throw EthereumKeyStorageError.failedToLoad
         }
 
-        guard let data = NSKeyedUnarchiver.unarchiveObject(withFile: localPath) as? Data else {
+        guard let archivedData = try? Data(contentsOf: localURL),
+              let data = try NSKeyedUnarchiver.unarchivedObject(ofClass: NSData.self, from: archivedData) as? Data else {
             throw EthereumKeyStorageError.failedToLoad
         }
 

web3swift/src/Contract/Statically Typed/ABIRawType+Static.swift

@@ -44,9 +44,6 @@ extension EthereumAddress: ABIType {
     }
 }
 
-extension BigInt: @unchecked Sendable {}
-extension BigUInt: @unchecked Sendable {}
-
 extension BigInt: ABIType {
     public static var rawType: ABIRawType { .FixedInt(256) }
     public static var parser: ParserFunction {

web3swift/src/Extensions/HexExtensions.swift

@@ -8,7 +8,7 @@ import Foundation
 
 public extension BigUInt {
     init?(hex: String) {
-        self.init(hex.web3.noHexPrefix.lowercased(), radix: 16)
+        self.init(hex.web3.noHexPrefix.web3.orZero.lowercased(), radix: 16)
     }
 }
 
@@ -24,7 +24,7 @@ public extension Web3Extensions where Base == BigUInt {
 
 public extension BigInt {
     init?(hex: String) {
-        self.init(hex.web3.noHexPrefix.lowercased(), radix: 16)
+        self.init(hex.web3.noHexPrefix.web3.orZero.lowercased(), radix: 16)
     }
 }
 
@@ -79,6 +79,13 @@ public extension Web3Extensions where Base == String {
         return base
     }
 
+    var orZero: String {
+        if base.isEmpty {
+            return "0"
+        }
+        return base
+    }
+
     var stringValue: String {
         if let byteArray = try? HexUtil.byteArray(fromHex: base.web3.noHexPrefix), let str = String(bytes: byteArray, encoding: .utf8) {
             return str