All tests are green.

Remove private setters for TransactionOptions resolvable properties.

Author: yaroslavyaroslav

Sources/Core/TransactionOptions.swift

@@ -57,8 +57,8 @@ public struct TransactionOptions {
         case automatic
         case manual(BigUInt)
     }
-    public private (set) var maxFeePerGasPolicy: FeePerGasPolicy?
-    public private (set) var maxPriorityFeePerGasPolicy: FeePerGasPolicy?
+    public var maxFeePerGasPolicy: FeePerGasPolicy?
+    public var maxPriorityFeePerGasPolicy: FeePerGasPolicy?
 
     /// The value transferred for the transaction in wei, also the endowment if it’s a contract-creation transaction.
     public var value: BigUInt?
@@ -69,7 +69,7 @@ public struct TransactionOptions {
         case manual(BigUInt)
     }
 
-    public private (set) var noncePolicy: NoncePolicy?
+    public var noncePolicy: NoncePolicy?
 
     public var callOnBlock: BlockNumber?
 

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -140,8 +140,7 @@ extension web3.BrowserFunctions {
             guard let _ = options.from else {return (nil, nil)}
             let gasPrice = try await self.web3.eth.gasPrice()
             transaction.gasPrice = gasPrice
-            // FIXME: Make this work again
-//            options.gasPricePolicy = .manual(gasPricePolicy)
+            options.gasPricePolicy = .manual(gasPrice)
             guard let gasEstimate = await self.estimateGas(transaction, transactionOptions: options) else {return (nil, nil)}
             transaction.gasLimit = gasEstimate
 

Sources/web3swift/Utils/Hooks/NonceMiddleware.swift

@@ -66,8 +66,7 @@ extension Web3.Utils {
             //            var modifiedTX = tx
             //            modifiedTX.nonce = newNonce
             var newOptions = transactionOptions
-            // FIXME: Make this wotk again.
-//            newOptions.nonce = .manual(newNonce)
+            newOptions.noncePolicy = .manual(newNonce)
             return (tx, contract, newOptions, true)
         }
 

Sources/web3swift/Web3/Web3+MutatingTransaction.swift

@@ -143,24 +143,22 @@ public class WriteTransaction: ReadTransaction {
 
         var finalOptions = TransactionOptions()
         finalOptions.type = mergedOptions.type
-        // FIXME: Make this work again.
-//        finalOptions.nonce = .manual(nonce)
+        finalOptions.noncePolicy = .manual(nonce)
         finalOptions.gasLimitPolicy = .manual(mergedOptions.resolveGasLimit(gasEstimate))
         finalOptions.accessList = mergedOptions.accessList
 
         // set the finalized gas parameters
-        // FIXME: Make this working again.
-//        if let gasPrice = finalGasPrice {
-//            finalOptions.gasPricePolicy = .manual(mergedOptions.resolveGasPrice(gasPrice))
-//        }
-//
-//        if let tipFee = finalTipFee {
-//            finalOptions.maxPriorityFeePerGasPolicy = .manual(mergedOptions.resolveMaxPriorityFeePerGas(tipFee))
-//        }
-//
-//        if let gasFee = finalGasFee {
-//            finalOptions.maxFeePerGasPolicy = .manual(mergedOptions.resolveMaxFeePerGas(gasFee))
-//        }
+        if let gasPrice = finalGasPrice {
+            finalOptions.gasPricePolicy = .manual(mergedOptions.resolveGasPrice(gasPrice))
+        }
+
+        if let tipFee = finalTipFee {
+            finalOptions.maxPriorityFeePerGasPolicy = .manual(mergedOptions.resolveMaxPriorityFeePerGas(tipFee))
+        }
+
+        if let gasFee = finalGasFee {
+            finalOptions.maxFeePerGasPolicy = .manual(mergedOptions.resolveMaxFeePerGas(gasFee))
+        }
 
         assembledTransaction.applyOptions(finalOptions)
 

Sources/web3swift/Web3/Web3+ReadingTransaction.swift

@@ -77,15 +77,14 @@ public class ReadTransaction {
         optionsForGasEstimation.value = mergedOptions.value
 
         // MARK: - Fixing estimate gas problem: gas price param shouldn't be nil
-        // FIXME: Make this work again.
-//        if let gasPricePolicy = mergedOptions.gasPricePolicy {
-//            switch gasPricePolicy {
-//            case .manual(_):
-//                optionsForGasEstimation.gasPricePolicy = gasPricePolicy
-//            default:
-//                optionsForGasEstimation.gasPricePolicy = .manual(1) // 1 wei to fix wrong estimating gas problem
-//            }
-//        }
+        if let gasPricePolicy = mergedOptions.gasPricePolicy {
+            switch gasPricePolicy {
+            case .manual(_):
+                optionsForGasEstimation.gasPricePolicy = gasPricePolicy
+            default:
+                optionsForGasEstimation.gasPricePolicy = .manual(1) // 1 wei to fix wrong estimating gas problem
+            }
+        }
 
         optionsForGasEstimation.callOnBlock = mergedOptions.callOnBlock
         if mergedOptions.value != nil {

Tests/web3swiftTests/localTests/LocalTestCase.swift

@@ -9,7 +9,7 @@ import web3swift
 // while this class does show up in the navigator, it has no associated tests
 class LocalTestCase: XCTestCase {
 
-    static let url = URL(string: "http://127.0.0.1:8545")!
+    static let url = URL(string: "http://proxyman.local:8545")!
 
     override func setUp() async throws {
         let web3 = try! await Web3.new(LocalTestCase.url)