Preparing to merge TransactionOptions into CodableTransaction,

by setting `gasPrice` to accessibility level `public private (set)`.

Author: yaroslavyaroslav

Sources/Core/TransactionOptions.swift

@@ -50,7 +50,7 @@ public struct TransactionOptions {
         case withMargin(Double)
     }
 
-    public var gasPrice: GasPricePolicy?
+    public private (set) var gasPrice: GasPricePolicy?
 
     // new gas parameters for EIP-1559 support
     public enum FeePerGasPolicy {

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

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

Sources/web3swift/Web3/Web3+MutatingTransaction.swift

@@ -148,17 +148,18 @@ public class WriteTransaction: ReadTransaction {
         finalOptions.accessList = mergedOptions.accessList
 
         // set the finalized gas parameters
-        if let gasPrice = finalGasPrice {
-            finalOptions.gasPrice = .manual(mergedOptions.resolveGasPrice(gasPrice))
-        }
-
-        if let tipFee = finalTipFee {
-            finalOptions.maxPriorityFeePerGas = .manual(mergedOptions.resolveMaxPriorityFeePerGas(tipFee))
-        }
-
-        if let gasFee = finalGasFee {
-            finalOptions.maxFeePerGas = .manual(mergedOptions.resolveMaxFeePerGas(gasFee))
-        }
+        // FIXME: Make this working again.
+//        if let gasPrice = finalGasPrice {
+//            finalOptions.gasPrice = .manual(mergedOptions.resolveGasPrice(gasPrice))
+//        }
+//
+//        if let tipFee = finalTipFee {
+//            finalOptions.maxPriorityFeePerGas = .manual(mergedOptions.resolveMaxPriorityFeePerGas(tipFee))
+//        }
+//
+//        if let gasFee = finalGasFee {
+//            finalOptions.maxFeePerGas = .manual(mergedOptions.resolveMaxFeePerGas(gasFee))
+//        }
 
         assembledTransaction.applyOptions(finalOptions)
 

Sources/web3swift/Web3/Web3+ReadingTransaction.swift

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