Repoint secp256k1 dependency to 21-DOT-DEV/swift-secp256k1

Package.swift

@@ -14,16 +14,25 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/attaswift/BigInt.git", .upToNextMinor(from: "5.4.0")),
         .package(url: "https://github.com/krzyzanowskim/CryptoSwift.git", from: "1.5.1"),
-        .package(name: "secp256k1", url: "https://github.com/GigaBitcoin/secp256k1.swift", .upToNextMinor(from: "0.10.0"))
+        .package(url: "https://github.com/21-DOT-DEV/swift-secp256k1", from: "0.21.1")
     ],
     targets: [
         .target(
-            name: "Web3Core",
-            dependencies: ["BigInt", "secp256k1", "CryptoSwift"]
-        ),
+			name: "Web3Core",
+			dependencies: [
+				"BigInt",
+				.product(name: "P256K", package: "swift-secp256k1"),
+				.product(name: "libsecp256k1", package: "swift-secp256k1"),
+				"CryptoSwift"
+			],
+			swiftSettings: [
+				.unsafeFlags(["-suppress-warnings"])
+			]
+		),
+
         .target(
             name: "web3swift",
-            dependencies: ["Web3Core", "BigInt", "secp256k1"],
+            dependencies: ["Web3Core", "BigInt", .product(name: "P256K", package: "swift-secp256k1")],
             resources: [
                 .copy("./Browser/browser.js"),
                 .copy("./Browser/browser.min.js"),

Sources/Web3Core/EthereumNetwork/Request/APIRequest+Methods.swift

@@ -6,6 +6,10 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 import BigInt
 
 /// TODO: should we do more error explain like ethers.js?

Sources/Web3Core/EthereumNetwork/Request/APIRequest.swift

@@ -5,6 +5,10 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 import BigInt
 
 public typealias Hash = String // 32 bytes hash of block (64 chars length without 0x)

Sources/Web3Core/EthereumNetwork/Utility/Async+BackwardCapability.swift

@@ -6,6 +6,10 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 
 @available(iOS, obsoleted: 15.0, message: "Use the built-in API instead")
 @available(macOS, obsoleted: 12.0, message: "Use the built-in API instead")

Sources/Web3Core/KeystoreManager/EtherscanTransactionChecker.swift

@@ -4,6 +4,10 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 
 public struct EtherscanTransactionChecker: TransactionChecker {
     private let urlSession: URLSessionProxy

Sources/Web3Core/KeystoreManager/PlainKeystore.swift

@@ -4,7 +4,8 @@
 //
 
 import Foundation
-import secp256k1
+import P256K
+import libsecp256k1
 
 public class PlainKeystore: AbstractKeystore {
 

Sources/Web3Core/Structure/SECP256k1.swift

@@ -4,7 +4,8 @@
 //
 
 import Foundation
-import secp256k1
+import P256K
+import libsecp256k1
 
 public struct SECP256K1 {
     public struct UnmarshaledSignature {
@@ -339,6 +340,7 @@ extension SECP256K1 {
     }
 
     internal static func randomBytes(length: Int) -> Data? {
+#if canImport(Security)
         for _ in 0...1024 {
             var data = Data(repeating: 0, count: length)
             let result = data.withUnsafeMutableBytes { mutableRBBytes -> Int32? in
@@ -351,11 +353,18 @@ extension SECP256K1 {
             }
             if let res = result, res == errSecSuccess {
                 return data
-            } else {
-                continue
             }
         }
         return nil
+#else
+        var rng = SystemRandomNumberGenerator()
+        var data = Data(repeating: 0, count: length)
+        data.withUnsafeMutableBytes { buf in
+            guard let base = buf.baseAddress?.assumingMemoryBound(to: UInt8.self) else { return }
+            for i in 0..<length { base[i] = UInt8.random(in: 0...255, using: &rng) }
+        }
+        return data
+#endif
     }
 
     internal static func toByteArray<T>(_ value: T) -> [UInt8] {

Sources/Web3Core/Structure/Web3ProviderProtocol.swift

@@ -6,6 +6,10 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 
 public protocol Web3Provider {
     var network: Networks? {get set}

Sources/Web3Core/Utility/Data+Extension.swift

@@ -53,12 +53,15 @@ public extension Data {
      - Returns: optional `Data` object containing the generated random bytes, or `nil` if an error occurred during generation.
      */
     static func randomBytes(length: Int) -> Data? {
+#if canImport(Security)
         var entropyBytes = [UInt8](repeating: 0, count: length)
         let status = SecRandomCopyBytes(kSecRandomDefault, entropyBytes.count, &entropyBytes)
-        guard status == errSecSuccess else {
-            return nil
-        }
+        guard status == errSecSuccess else { return nil }
         return Data(entropyBytes)
+#else
+        var rng = SystemRandomNumberGenerator()
+        return Data((0..<length).map { _ in UInt8.random(in: 0...255, using: &rng) })
+#endif
     }
 
     func bitsInRange(_ startingBit: Int, _ length: Int) -> UInt64? { // return max of 8 bytes for simplicity, non-public

Sources/web3swift/Browser/Bridge.swift

@@ -6,6 +6,7 @@
 //  Copyright © 2017 Samaritan. All rights reserved.
 //
 
+#if canImport(WebKit)
 import WebKit
 
 /// Bridge for WKWebView and JavaScript
@@ -189,7 +190,7 @@ extension Bridge: WKScriptMessageHandler {
 public extension WKWebView {
 
     private struct STPrivateStatic {
-        fileprivate static var bridgeKey = "STPrivateStatic.bridgeKey"
+        fileprivate static var bridgeKey: UInt8 = 0
     }
 
     /// Bridge for WKWebView and JavaScript. Initialize `lazy`
@@ -245,3 +246,5 @@ fileprivate extension WKWebView {
         evaluateJavaScript(jsString, completionHandler: completionHandler)
     }
 }
+
+#endif // canImport(WebKit)

Sources/web3swift/Utils/EIP/EIP67Code.swift

@@ -4,7 +4,9 @@
 //
 
 import Foundation
+#if canImport(CoreImage)
 import CoreImage
+#endif
 import BigInt
 import Web3Core
 

Sources/web3swift/Utils/EIP/EIP681.swift

@@ -366,7 +366,9 @@ extension Web3 {
                 case .ensAddress(let ens):
                     guard let chainID = chainID else { return nil }
                     do {
-                        let web = await Web3(provider: InfuraProvider(.fromInt(UInt(chainID)))!)
+                        let network = Networks.fromInt(UInt(chainID))
+                        let infuraProvider = try await InfuraProvider(net: network)
+                        let web = Web3(provider: infuraProvider)
                         let ensModel = ENS(web3: web)
                         try await ensModel?.setENSResolver(withDomain: ens)
                         let address = try await ensModel?.getAddress(forNode: ens)

Sources/web3swift/Web3/Web3+HttpProvider.swift

@@ -4,6 +4,10 @@
 //
 
 import Foundation
+#if canImport(FoundationNetworking)
+import FoundationNetworking
+#endif
+
 import BigInt
 import Web3Core