Rename all all resolvable TransactionOptions property

to `WhateverProlicy`, to avoid it's conflicts with `CodableTransaction` properties.

Author: yaroslavyaroslav

Sources/Core/Transaction/CodableTransaction.swift

@@ -273,6 +273,33 @@ extension CodableTransaction: Codable {
 
 }
 
+extension CodableTransaction {
+    public enum GasLimitPolicy {
+        case automatic
+        case manual(BigUInt)
+        case limited(BigUInt)
+        case withMargin(Double)
+    }
+
+    public enum GasPricePolicy {
+        case automatic
+        case manual(BigUInt)
+        case withMargin(Double)
+    }
+
+    public enum FeePerGasPolicy {
+        case automatic
+        case manual(BigUInt)
+    }
+
+    public enum NoncePolicy {
+        case pending
+        case latest
+        case manual(BigUInt)
+    }
+}
+
+
 extension CodableTransaction: CustomStringConvertible {
     /// required by CustomString convertable
     /// returns a string description for the transaction and its data

Sources/Core/Transaction/Envelope/EIP1559Envelope.swift

@@ -235,7 +235,7 @@ extension EIP1559Envelope {
 //        self.nonce = transaction.resolveNonce(self.nonce)
 //        self.maxPriorityFeePerGas = transaction.resolveMaxPriorityFeePerGas(self.maxPriorityFeePerGas)
 //        self.maxFeePerGas = transaction.resolveMaxFeePerGas(self.maxFeePerGas)
-//        self.gasLimit = transaction.resolveGasLimit(self.gasLimit)
+//        self.gasLimitPolicy = transaction.resolveGasLimit(self.gasLimit)
 //        self.value = transaction.value ?? self.value
 //        self.to = transaction.to ?? self.to
 //        self.accessList = transaction.accessList ?? self.accessList

Sources/Core/Transaction/Envelope/LegacyEnvelope.swift

@@ -181,7 +181,7 @@ extension LegacyEnvelope {
 //        // type cannot be changed here, and is ignored
 //        self.nonce = transaction.resolveNonce(self.nonce)
 //        self.gasPrice = transaction.resolveGasPrice(self.gasPrice)
-//        self.gasLimit = transaction.resolveGasLimit(self.gasLimit)
+//        self.gasLimitPolicy = transaction.resolveGasLimit(self.gasLimit)
 //        // swiftlint:disable force_unwrapping
 //        if transaction.value != nil { self.value = transaction.value! }
 //        if transaction.to != nil { self.to = transaction.to! }

Sources/Core/TransactionOptions.swift

@@ -42,23 +42,23 @@ public struct TransactionOptions {
         case limited(BigUInt)
         case withMargin(Double)
     }
-    public var gasLimit: GasLimitPolicy?
+    public var gasLimitPolicy: GasLimitPolicy?
 
     public enum GasPricePolicy {
         case automatic
         case manual(BigUInt)
         case withMargin(Double)
     }
 
-    public private (set) var gasPrice: GasPricePolicy?
+    public var gasPricePolicy: GasPricePolicy?
 
     // new gas parameters for EIP-1559 support
     public enum FeePerGasPolicy {
         case automatic
         case manual(BigUInt)
     }
-    public private (set) var maxFeePerGas: FeePerGasPolicy?
-    public private (set) var maxPriorityFeePerGas: FeePerGasPolicy?
+    public private (set) var maxFeePerGasPolicy: FeePerGasPolicy?
+    public private (set) 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 nonce: NoncePolicy?
+    public private (set) var noncePolicy: NoncePolicy?
 
     public var callOnBlock: BlockNumber?
 
@@ -78,11 +78,11 @@ public struct TransactionOptions {
     public static var emptyTransaction: TransactionOptions {
         var opts = TransactionOptions()
         opts.type = .legacy
-        opts.gasLimit = .automatic
-        opts.gasPrice = .automatic
-        opts.maxFeePerGas = .automatic
-        opts.maxPriorityFeePerGas = .automatic
-        opts.nonce = .pending
+        opts.gasLimitPolicy = .automatic
+        opts.gasPricePolicy = .automatic
+        opts.maxFeePerGasPolicy = .automatic
+        opts.maxPriorityFeePerGasPolicy = .automatic
+        opts.noncePolicy = .pending
         opts.callOnBlock = .pending
         return opts
     }
@@ -92,18 +92,18 @@ public struct TransactionOptions {
         self.to = to
         self.from = from
         self.chainID = chainID
-        self.gasLimit = gasLimit
-        self.gasPrice = gasPrice
-        self.maxFeePerGas = maxFeePerGas
-        self.maxPriorityFeePerGas = maxPriorityFeePerGas
+        self.gasLimitPolicy = gasLimit
+        self.gasPricePolicy = gasPrice
+        self.maxFeePerGasPolicy = maxFeePerGas
+        self.maxPriorityFeePerGasPolicy = maxPriorityFeePerGas
         self.value = value
-        self.nonce = nonce
+        self.noncePolicy = nonce
         self.callOnBlock = callOnBlock
         self.accessList = accessList
     }
 
     public func resolveNonce(_ suggestedByNode: BigUInt) -> BigUInt {
-        guard let noncePolicy = self.nonce else { return suggestedByNode }
+        guard let noncePolicy = self.noncePolicy else { return suggestedByNode }
         switch noncePolicy {
         case .pending, .latest:
             return suggestedByNode
@@ -113,7 +113,7 @@ public struct TransactionOptions {
     }
 
     public func resolveGasPrice(_ suggestedByNode: BigUInt) -> BigUInt {
-        guard let gasPricePolicy = self.gasPrice else { return suggestedByNode }
+        guard let gasPricePolicy = self.gasPricePolicy else { return suggestedByNode }
         switch gasPricePolicy {
         case .automatic, .withMargin:
             return suggestedByNode
@@ -123,7 +123,7 @@ public struct TransactionOptions {
     }
 
     public func resolveGasLimit(_ suggestedByNode: BigUInt) -> BigUInt {
-        guard let gasLimitPolicy = self.gasLimit else { return suggestedByNode }
+        guard let gasLimitPolicy = self.gasLimitPolicy else { return suggestedByNode }
         switch gasLimitPolicy {
         case .automatic, .withMargin:
             return suggestedByNode
@@ -139,7 +139,7 @@ public struct TransactionOptions {
     }
 
     public func resolveMaxFeePerGas(_ suggestedByNode: BigUInt) -> BigUInt {
-        guard let maxFeePerGasPolicy = self.maxFeePerGas else { return suggestedByNode }
+        guard let maxFeePerGasPolicy = self.maxFeePerGasPolicy else { return suggestedByNode }
         switch maxFeePerGasPolicy {
         case .automatic:
             return suggestedByNode
@@ -149,7 +149,7 @@ public struct TransactionOptions {
     }
 
     public func resolveMaxPriorityFeePerGas(_ suggestedByNode: BigUInt) -> BigUInt {
-        guard let maxPriorityFeePerGasPolicy = self.maxPriorityFeePerGas else { return suggestedByNode }
+        guard let maxPriorityFeePerGasPolicy = self.maxPriorityFeePerGasPolicy else { return suggestedByNode }
         switch maxPriorityFeePerGasPolicy {
         case .automatic:
             return suggestedByNode
@@ -165,12 +165,12 @@ public struct TransactionOptions {
         opts.to = mergeIfNotNil(first: self.to, second: other.to)
         opts.from = mergeIfNotNil(first: self.from, second: other.from)
         opts.chainID = mergeIfNotNil(first: self.chainID, second: other.chainID)
-        opts.gasLimit = mergeIfNotNil(first: self.gasLimit, second: other.gasLimit)
-        opts.gasPrice = mergeIfNotNil(first: self.gasPrice, second: other.gasPrice)
-        opts.maxFeePerGas = mergeIfNotNil(first: self.maxFeePerGas, second: other.maxFeePerGas)
-        opts.maxPriorityFeePerGas = mergeIfNotNil(first: self.maxPriorityFeePerGas, second: other.maxPriorityFeePerGas)
+        opts.gasLimitPolicy = mergeIfNotNil(first: self.gasLimitPolicy, second: other.gasLimitPolicy)
+        opts.gasPricePolicy = mergeIfNotNil(first: self.gasPricePolicy, second: other.gasPricePolicy)
+        opts.maxFeePerGasPolicy = mergeIfNotNil(first: self.maxFeePerGasPolicy, second: other.maxFeePerGasPolicy)
+        opts.maxPriorityFeePerGasPolicy = mergeIfNotNil(first: self.maxPriorityFeePerGasPolicy, second: other.maxPriorityFeePerGasPolicy)
         opts.value = mergeIfNotNil(first: self.value, second: other.value)
-        opts.nonce = mergeIfNotNil(first: self.nonce, second: other.nonce)
+        opts.noncePolicy = mergeIfNotNil(first: self.noncePolicy, second: other.noncePolicy)
         opts.callOnBlock = mergeIfNotNil(first: self.callOnBlock, second: other.callOnBlock)
         return opts
     }

Sources/web3swift/EthereumAPICalls/Ethereum/Eth+EstimateGas.swift

@@ -17,7 +17,7 @@ extension web3.Eth {
         let request: APIRequest = .estimateGas(transaction, transactionOptions?.callOnBlock ?? .latest)
         let response: APIResponse<BigUInt> = try await APIRequest.sendRequest(with: provider, for: request)
 
-        if let policy = transactionOptions?.gasLimit {
+        if let policy = transactionOptions?.gasLimitPolicy {
             switch policy {
             case .automatic:
                 return response.result

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -79,8 +79,8 @@ extension web3.BrowserFunctions {
 //          transactionOptions.from = options.from
 //          transactionOptions.to = options.to
 //          transactionOptions.value = options.value ?? 0
-//          transactionOptions.gasLimit = options.gasLimit ?? .automatic
-//          transactionOptions.gasPrice = options.gasPrice ?? .automatic
+//          transactionOptions.gasLimitPolicy = options.gasLimitPolicy ?? .automatic
+//          transactionOptions.gasPricePolicy = options.gasPricePolicy ?? .automatic
 //            return await self.sendTransaction(transaction, transactionOptions: transactionOptions, password: password)
 //        } catch { return nil }
 //    }
@@ -104,8 +104,8 @@ extension web3.BrowserFunctions {
 //            transactionOptions.from = options.from
 //            transactionOptions.to = options.to
 //            transactionOptions.value = options.value ?? 0
-//            transactionOptions.gasLimit = .automatic
-//            transactionOptions.gasPrice = options.gasPrice ?? .automatic
+//            transactionOptions.gasLimitPolicy = .automatic
+//            transactionOptions.gasPricePolicy = options.gasPricePolicy ?? .automatic
 //            return await self.estimateGas(transaction, transactionOptions: transactionOptions)
 //        } catch { return nil }
 //    }
@@ -141,11 +141,11 @@ extension web3.BrowserFunctions {
             let gasPrice = try await self.web3.eth.gasPrice()
             transaction.gasPrice = gasPrice
             // FIXME: Make this work again
-//            options.gasPrice = .manual(gasPrice)
+//            options.gasPricePolicy = .manual(gasPricePolicy)
             guard let gasEstimate = await self.estimateGas(transaction, transactionOptions: options) else {return (nil, nil)}
             transaction.gasLimit = gasEstimate
 
-            options.gasLimit = .limited(gasEstimate)
+            options.gasLimitPolicy = .limited(gasEstimate)
             print(transaction)
             return (transaction, options)
         } catch {
@@ -163,8 +163,8 @@ extension web3.BrowserFunctions {
 //            transactionOptions.from = options.from
 //            transactionOptions.to = options.to
 //            transactionOptions.value = options.value ?? 0
-//            transactionOptions.gasLimit = options.gasLimit ?? .automatic
-//            transactionOptions.gasPrice = options.gasPrice ?? .automatic
+//            transactionOptions.gasLimitPolicy = options.gasLimit ?? .automatic
+//            transactionOptions.gasPricePolicy = options.gasPrice ?? .automatic
 //            if let nonceString = transactionJSON["nonce"] as? String, let nonce = BigUInt(nonceString.stripHexPrefix(), radix: 16) {
 //                transactionOptions.nonce = .manual(nonce)
 //            } else {

Sources/web3swift/Tokens/ERC1155/Web3+ERC1155.swift

@@ -134,7 +134,7 @@ public class ERC1155: IERC1155 {
         let contract = self.contract
         var transactionOptions = TransactionOptions()
         transactionOptions.callOnBlock = .latest
-        transactionOptions.gasLimit = .manual(30000)
+        transactionOptions.gasLimitPolicy = .manual(30000)
         let result = try await contract.read("supportsInterface", parameters: [interfaceID] as [AnyObject], extraData: Data(), transactionOptions: self.transactionOptions)!.decodedData(with: transactionOptions)
         guard let res = result["0"] as? Bool else {throw Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node")}
         return res

Sources/web3swift/Tokens/ERC1400/Web3+ERC1400.swift

@@ -729,7 +729,7 @@ extension ERC1400: IERC777 {
         let contract = self.contract
         var transactionOptions = TransactionOptions()
         transactionOptions.callOnBlock = .latest
-        transactionOptions.gasLimit = .manual(30000)
+        transactionOptions.gasLimitPolicy = .manual(30000)
         let result = try await contract.read("supportsInterface", parameters: [interfaceID] as [AnyObject], extraData: Data(), transactionOptions: self.transactionOptions)!.decodedData(with: transactionOptions)
         guard let res = result["0"] as? Bool else {throw Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node")}
         return res

Sources/web3swift/Tokens/ERC1410/Web3+ERC1410.swift

@@ -463,7 +463,7 @@ extension ERC1410: IERC777 {
         let contract = self.contract
         var transactionOptions = TransactionOptions()
         transactionOptions.callOnBlock = .latest
-        transactionOptions.gasLimit = .manual(30000)
+        transactionOptions.gasLimitPolicy = .manual(30000)
         let result = try await contract.read("supportsInterface", parameters: [interfaceID] as [AnyObject], extraData: Data(), transactionOptions: self.transactionOptions)!.decodedData(with: transactionOptions)
         guard let res = result["0"] as? Bool else {throw Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node")}
         return res

Sources/web3swift/Tokens/ERC1633/Web3+ERC1633.swift

@@ -187,7 +187,7 @@ public class ERC1633: IERC1633, ERC20BaseProperties {
         let contract = self.contract
         var transactionOptions = TransactionOptions()
         transactionOptions.callOnBlock = .latest
-        transactionOptions.gasLimit = .manual(30000)
+        transactionOptions.gasLimitPolicy = .manual(30000)
         let result = try await contract.read("supportsInterface", parameters: [interfaceID] as [AnyObject], extraData: Data(), transactionOptions: self.transactionOptions)!.decodedData(with: transactionOptions)
         guard let res = result["0"] as? Bool else {throw Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node")}
         return res