Extend AbstractEnvelope to all gas related properties,

to let them get values by resolver, to reach this had made them optional.

Author: yaroslavyaroslav

Sources/Core/Transaction/CodableTransaction.swift

@@ -79,14 +79,23 @@ public struct CodableTransaction {
     }
 
     /// the price per gas unit for the tranaction (Legacy and EIP-2930 only)
-    public internal (set) var gasPrice: BigUInt?
+    public internal (set) var gasPrice: BigUInt? {
+        get { return envelope.gasPrice }
+        set { return envelope.gasPrice = newValue }
+    }
 
     /// the max base fee per gas unit (EIP-1559 only)
     /// this value must be >= baseFee + maxPriorityFeePerGas
-    public internal (set) var maxFeePerGas: BigUInt?
+    public internal (set) var maxFeePerGas: BigUInt? {
+        get { return envelope.maxFeePerGas }
+        set { return envelope.maxFeePerGas = newValue }
+    }
 
     /// the maximum tip to pay the miner (EIP-1559 only)
-    public internal (set) var maxPriorityFeePerGas: BigUInt?
+    public internal (set) var maxPriorityFeePerGas: BigUInt? {
+        get { return envelope.maxPriorityFeePerGas }
+        set { return envelope.maxPriorityFeePerGas = newValue }
+    }
 
     public var callOnBlock: BlockNumber?
 
@@ -317,7 +326,7 @@ extension CodableTransaction {
         let oracle = Oracle(provider)
         switch gasPricePolicy {
         case .automatic, .withMargin:
-            return await oracle.gasPriceLegacyPercentiles().max()!
+            return await oracle.gasPriceLegacyPercentiles().max() ?? 0
         case .manual(let value):
             return value
         }
@@ -344,7 +353,7 @@ extension CodableTransaction {
         let oracle = Oracle(provider)
         switch maxFeePerGasPolicy {
         case .automatic:
-            return await oracle.baseFeePercentiles().max()!
+            return await oracle.baseFeePercentiles().max() ?? 0
         case .manual(let value):
             return value
         }
@@ -354,7 +363,7 @@ extension CodableTransaction {
         let oracle = Oracle(provider)
         switch maxPriorityFeePerGasPolicy {
         case .automatic:
-            return await oracle.tipFeePercentiles().max()!
+            return await oracle.tipFeePercentiles().max() ?? 0
         case .manual(let value):
             return value
         }
@@ -395,9 +404,6 @@ extension CodableTransaction {
                 accessList: [AccessListEntry]? = nil, v: BigUInt = 1, r: BigUInt = 0, s: BigUInt = 0) {
         // FIXME: This is duplication and should be fixed.
         self.data = data
-        self.gasPrice = gasPrice
-        self.maxFeePerGas = maxFeePerGas
-        self.maxPriorityFeePerGas = maxPriorityFeePerGas
         self.accessList = accessList
         self.gasLimitPolicy = .automatic
         self.noncePolicy = .pending

Sources/Core/Transaction/Envelope/AbstractEnvelope.swift

@@ -83,6 +83,15 @@ protocol AbstractEnvelope: CustomStringConvertible { // possibly add Codable?
     var value: BigUInt { get set }
 
     var gasLimit: BigUInt { get set }
+
+    var gasPrice: BigUInt? { get set }
+
+    /// the max base fee per gas unit (EIP-1559 only)
+    /// this value must be >= baseFee + maxPriorityFeePerGas
+    var maxFeePerGas: BigUInt? { get set }
+
+    /// the maximum tip to pay the miner (EIP-1559 only)
+    var maxPriorityFeePerGas: BigUInt? { get set }
 
     /// Any encoded data accompanying the transaction
     var data: Data { get set }

Sources/Core/Transaction/Envelope/EIP1559Envelope.swift

@@ -28,10 +28,13 @@ public struct EIP1559Envelope: EIP2718Envelope {
 
     // EIP-1559 specific parameters
     public var gasLimit: BigUInt
+
+    var gasPrice: BigUInt? = nil
+
     /// Value of the tip to the miner for transaction processing.
     ///
     /// Full amount of this variable goes to a miner.
-    public var maxPriorityFeePerGas: BigUInt
+    public var maxPriorityFeePerGas: BigUInt?
     /// Value of the fee for one gas unit
     ///
     /// This value should be greater than sum of:
@@ -44,7 +47,7 @@ public struct EIP1559Envelope: EIP2718Envelope {
     /// If amount of this will be **lower** than sum of `Block.baseFeePerGas` and `maxPriorityFeePerGas`
     /// miner will recieve amount calculated by the following equation: `maxFeePerGas - Block.baseFeePerGas`
     /// where 'Block' is the block that the transaction will be included.
-    public var maxFeePerGas: BigUInt
+    public var maxFeePerGas: BigUInt?
     public var accessList: [AccessListEntry] // from EIP-2930
 
     // for CustomStringConvertible

Sources/Core/Transaction/Envelope/EIP2930Envelope.swift

@@ -22,18 +22,21 @@ public struct EIP2930Envelope: EIP2718Envelope {
     public var s: BigUInt
 
     // EIP-2930 specific parameters
-    public var gasPrice: BigUInt = 0
+    public var gasPrice: BigUInt? = 0
     public var gasLimit: BigUInt = 0
     public var accessList: [AccessListEntry] = []
     public var publicKey: Data?
 
+    var maxFeePerGas: BigUInt? = nil
+    var maxPriorityFeePerGas: BigUInt? = nil
+
     // for CustomStringConvertible
     public var description: String {
         var toReturn = ""
         toReturn += "Type: " + String(describing: self.type) + "\n"
         toReturn += "chainID: " + String(describing: self.chainID) + "\n"
         toReturn += "Nonce: " + String(describing: self.nonce) + "\n"
-        toReturn += "Gas price: " + String(self.gasPrice) + "\n"
+        toReturn += "Gas price: " + String(self.gasPrice ?? 0) + "\n"
         toReturn += "Gas limit: " + String(describing: self.gasLimit) + "\n"
         toReturn += "To: " + self.to.address + "\n"
         toReturn += "Value: " + String(describing: self.value) + "\n"

Sources/Core/Transaction/Envelope/LegacyEnvelope.swift

@@ -27,9 +27,12 @@ public struct LegacyEnvelope: AbstractEnvelope {
     public var s: BigUInt
 
     // legacy specific parameters
-    public var gasPrice: BigUInt = 0
+    public var gasPrice: BigUInt? = 0
     public var gasLimit: BigUInt = 0
 
+    var maxFeePerGas: BigUInt? = nil
+    var maxPriorityFeePerGas: BigUInt? = nil
+
     // legacy chainID Mechanism
     private var explicitChainID: BigUInt? // set directly or via options
     // private var impliedChainID: BigUInt? // we calculate this once, or when explicitely asked to
@@ -44,7 +47,7 @@ public struct LegacyEnvelope: AbstractEnvelope {
         var toReturn = ""
         toReturn += "Type: " + String(describing: self.type) + "\n"
         toReturn += "Nonce: " + String(describing: self.nonce) + "\n"
-        toReturn += "Gas price: " + String(self.gasPrice) + "\n"
+        toReturn += "Gas price: " + String(self.gasPrice ?? 0) + "\n"
         toReturn += "Gas limit: " + String(describing: self.gasLimit) + "\n"
         toReturn += "To: " + self.to.address + "\n"
         toReturn += "Value: " + String(describing: self.value) + "\n"

Sources/web3swift/Operations/ReadTransaction.swift

@@ -34,6 +34,7 @@ public class ReadOperation {
 
     // TODO: Remove type erasing here, some broad wide protocol should be added instead
     public func callContractMethod() async throws -> [String: Any] {
+        await transaction.resolve(provider: web3.provider)
         // MARK: Read data from ABI flow
         // FIXME: This should be dropped, and after `execute()` call, just to decode raw data.
         let data: Data = try await self.web3.eth.callTransaction(transaction)

Sources/web3swift/Operations/WriteOperation.swift

@@ -12,6 +12,7 @@ public class WriteOperation: ReadOperation {
 
     // FIXME: Rewrite this to CodableTransaction
     public func writeToChain(password: String) async throws -> TransactionSendingResult {
+        await transaction.resolve(provider: web3.provider)
         if let attachedKeystoreManager = self.web3.provider.attachedKeystoreManager {
             do {
                 try Web3Signer.signTX(transaction: &transaction,