Tests passing

Author: yaroslavyaroslav

Sources/Core/Convenience/BigUInt+Extensions.swift

@@ -8,7 +8,7 @@
 import Foundation
 import struct BigInt.BigUInt
 
-extension BigUInt {
+public extension BigUInt {
     init?(_ naturalUnits: String, _ ethereumUnits: Utilities.Units) {
         guard let value = Utilities.parseToBigUInt(naturalUnits, units: ethereumUnits) else {return nil}
         self = value

Sources/Core/KeystoreManager/BIP32Keystore.swift

@@ -64,7 +64,7 @@ public class BIP32Keystore: AbstractKeystore {
 
     private static let KeystoreParamsBIP32Version = 4
 
-    private (set) var addressStorage: PathAddressStorage
+    public private (set) var addressStorage: PathAddressStorage
 
     public convenience init?(_ jsonString: String) {
         let lowercaseJSON = jsonString.lowercased()

Sources/Core/KeystoreManager/PathAddressStorage.swift

@@ -9,8 +9,8 @@
 import Foundation
 
 public struct PathAddressStorage {
-    private(set) var addresses: [EthereumAddress]
-    private(set) var paths: [String]
+    public private(set) var addresses: [EthereumAddress]
+    public private(set) var paths: [String]
 
     init() {
         addresses = []

Sources/Core/Transaction/Web3+Options.swift

@@ -82,6 +82,21 @@ public struct TransactionOptions {
         opts.callOnBlock = .pending
         return opts
     }
+    
+    public init(type: TransactionType? = nil, to: EthereumAddress? = nil, from: EthereumAddress? = nil, chainID: BigUInt? = nil, gasLimit: GasLimitPolicy? = nil, gasPrice: GasPricePolicy? = nil, maxFeePerGas: FeePerGasPolicy? = nil, maxPriorityFeePerGas: FeePerGasPolicy? = nil, value: BigUInt? = nil, nonce: NoncePolicy? = nil, callOnBlock: BlockNumber? = nil, accessList: [AccessListEntry]? = nil) {
+        self.type = type
+        self.to = to
+        self.from = from
+        self.chainID = chainID
+        self.gasLimit = gasLimit
+        self.gasPrice = gasPrice
+        self.maxFeePerGas = maxFeePerGas
+        self.maxPriorityFeePerGas = maxPriorityFeePerGas
+        self.value = value
+        self.nonce = nonce
+        self.callOnBlock = callOnBlock
+        self.accessList = accessList
+    }
 
     public func resolveNonce(_ suggestedByNode: BigUInt) -> BigUInt {
         guard let noncePolicy = self.nonce else { return suggestedByNode }

Sources/web3swift/Web3/Web3+GasOracle.swift

@@ -92,12 +92,12 @@ extension Web3 {
 
             /// We're explicitly checking that feeHistory is not nil before force unwrapping it.
             // swiftlint: disable force_unwrapping
-            guard feeHistory == nil, forceDropCache, feeHistory!.timestamp.distance(to: Date()) > cacheTimeout else { return feeHistory! }
-
-            feeHistory = try await eth.feeHistory(blockCount: blockCount, block: block, percentiles: percentiles)
+            guard let feeHistory, !forceDropCache, feeHistory.timestamp.distance(to: Date()) < cacheTimeout else {
+                return try await eth.feeHistory(blockCount: blockCount, block: block, percentiles: percentiles)
+            }
 
             /// We're assigning this value the line very above, so it's free to force unwrapping here
-            return feeHistory!
+            return feeHistory
             // swiftlint: enable force_unwrapping
         }
 

Sources/web3swift/Web3/Web3+MutatingTransaction.swift

@@ -218,21 +218,3 @@ public class WriteTransaction: ReadTransaction {
         }
     }
 }
-
-extension TransactionOptions {
-    init() {
-        self.init()
-//        self.from = nil
-//        self.to = nil
-//        self.accessList = nil
-//        self.callOnBlock = nil
-//        self.chainID = nil
-//        self.gasLimit = nil
-//        self.gasPrice = nil
-//        self.maxFeePerGas = nil
-//        self.maxPriorityFeePerGas = nil
-//        self.nonce = nil
-//        self.type = nil
-//        self.value = nil
-    }
-}

Tests/web3swiftTests/localTests/EIP1559BlockTests.swift

@@ -1,10 +1,12 @@
 import XCTest
 import BigInt
-import Core
 
 @testable
 import web3swift
 
+@testable
+import Core
+
 class EIP1559BlockTests: LocalTestCase {
     let uselessBlockPart = (
         number: BigUInt(12_965_000),

Tests/web3swiftTests/localTests/web3swiftKeystoresTests.swift

@@ -132,7 +132,7 @@ class web3swiftKeystoresTests: LocalTestCase {
         XCTAssertNotNil(keystore)
         let account = keystore!.addresses![0]
         let key = try! keystore!.UNSAFE_getPrivateKeyData(password: "", account: account)
-        let pubKey = Web3.Utils.privateToPublic(key, compressed: true)
+        let pubKey = Utilities.privateToPublic(key, compressed: true)
         XCTAssert(pubKey?.toHexString() == "027160bd3a4d938cac609ff3a11fe9233de7b76c22a80d2b575e202cbf26631659")
     }
 
@@ -148,7 +148,7 @@ class web3swiftKeystoresTests: LocalTestCase {
         XCTAssertNotNil(keystore)
         let account = keystore!.addresses![0]
         let key = try! keystore!.UNSAFE_getPrivateKeyData(password: "", account: account)
-        let pubKey = Web3.Utils.privateToPublic(key, compressed: true)
+        let pubKey = Utilities.privateToPublic(key, compressed: true)
         XCTAssert(pubKey?.toHexString() == "027160bd3a4d938cac609ff3a11fe9233de7b76c22a80d2b575e202cbf26631659")
     }
 

Tests/web3swiftTests/localTests/web3swiftPromisesTests.swift

@@ -45,7 +45,7 @@ class web3swiftPromisesTests: XCTestCase {
         let contract = web3.contract(Web3.Utils.coldWalletABI, at: sendToAddress, abiVersion: 2)
         guard let writeTX = contract?.write("fallback") else {return XCTFail()}
         writeTX.transactionOptions.from = tempKeystore!.addresses?.first
-        writeTX.transactionOptions.value = BigUInt("1.0", Web3.Utils.eth)
+        writeTX.transactionOptions.value = BigUInt("1.0", Utilities.Units.eth)
         let estimate = try await writeTX.estimateGas(with: nil)
         print(estimate)
         XCTAssert(estimate == 21000)