Preparing to merge TransactionOptions into CodableTransaction

yaroslavyaroslav · yaroslavyaroslav · commit 1760791fb9c1 · 2022-09-05T16:37:29.000+07:00
by renaming `.defaultOptions` to `.emptyTransaction`.
diff --git a/Sources/Core/TransactionOptions.swift b/Sources/Core/TransactionOptions.swift
@@ -75,7 +75,7 @@ public struct TransactionOptions {
 
     public var accessList: [AccessListEntry]?
 
-    public static var defaultOptions: TransactionOptions {
+    public static var emptyTransaction: TransactionOptions {
         var opts = TransactionOptions()
         opts.type = .legacy
         opts.gasLimit = .automatic
@@ -180,7 +180,7 @@ public struct TransactionOptions {
     ///
     /// Returns default options if both parameters are nil.
     public static func merge(_ options: TransactionOptions?, with other: TransactionOptions?) -> TransactionOptions? {
-        var newOptions = TransactionOptions.defaultOptions // default has lowest priority
+        var newOptions = TransactionOptions.emptyTransaction // default has lowest priority
         newOptions = newOptions.merge(options)
         newOptions = newOptions.merge(other) // other has highest priority
         return newOptions
diff --git a/Sources/web3swift/Tokens/ERC1155/Web3+ERC1155.swift b/Sources/web3swift/Tokens/ERC1155/Web3+ERC1155.swift
@@ -71,7 +71,7 @@ public class ERC1155: IERC1155 {
         }
         let contract = self.contract
         guard contract.contract.address != nil else {return}
-        var transactionOptions = TransactionOptions.defaultOptions
+        var transactionOptions = TransactionOptions.emptyTransaction
         transactionOptions.callOnBlock = .latest
 
         guard let tokenIdPromise = try await contract.read("id", parameters: [] as [AnyObject], extraData: Data(), transactionOptions: transactionOptions)?.decodedData() else {return}
diff --git a/Sources/web3swift/Tokens/ERC20/Web3+ERC20.swift b/Sources/web3swift/Tokens/ERC20/Web3+ERC20.swift
@@ -216,7 +216,7 @@ extension ERC20BaseProperties {
         }
         let contract = self.contract
         guard contract.contract.address != nil else {return}
-        var transactionOptionsVAR = TransactionOptions.defaultOptions
+        var transactionOptionsVAR = TransactionOptions.emptyTransaction
         transactionOptionsVAR.callOnBlock = .latest
         let transactionOptions = transactionOptionsVAR
         async let namePromise = contract
diff --git a/Sources/web3swift/Tokens/ERC721/Web3+ERC721.swift b/Sources/web3swift/Tokens/ERC721/Web3+ERC721.swift
@@ -92,7 +92,7 @@ public class ERC721: IERC721 {
         }
         let contract = self.contract
         guard contract.contract.address != nil else {return}
-        var transactionOptionsVAR = TransactionOptions.defaultOptions
+        var transactionOptionsVAR = TransactionOptions.emptyTransaction
         transactionOptionsVAR.callOnBlock = .latest
         let transactionOptions = transactionOptionsVAR
 
diff --git a/Sources/web3swift/Tokens/ERC721x/Web3+ERC721x.swift b/Sources/web3swift/Tokens/ERC721x/Web3+ERC721x.swift
@@ -76,7 +76,7 @@ public class ERC721x: IERC721x {
         }
         let contract = self.contract
         guard contract.contract.address != nil else {return}
-        var transactionOptions = TransactionOptions.defaultOptions
+        var transactionOptions = TransactionOptions.emptyTransaction
         transactionOptions.callOnBlock = .latest
 
         guard let tokenIdPromise = try await contract.read("tokenId", parameters: [] as [AnyObject], extraData: Data(), transactionOptions: transactionOptions)?.decodedData() else {return}
diff --git a/Sources/web3swift/Utils/ENS/ENS.swift b/Sources/web3swift/Utils/ENS/ENS.swift
@@ -76,7 +76,7 @@ public class ENS {
 
     // FIXME: Rewrite this to CodableTransaction
     lazy var defaultOptions: TransactionOptions = {
-        return TransactionOptions.defaultOptions
+        return TransactionOptions.emptyTransaction
     }()
 
     // MARK: - Convenience public resolver methods
diff --git a/Sources/web3swift/Utils/ENS/ENSBaseRegistrar.swift b/Sources/web3swift/Utils/ENS/ENSBaseRegistrar.swift
@@ -13,7 +13,7 @@ import Core
 public extension ENS {
     class BaseRegistrar: ERC721 {
         lazy var defaultOptions: TransactionOptions = {
-            return TransactionOptions.defaultOptions
+            return TransactionOptions.emptyTransaction
         }()
 
         public init(web3: web3, address: EthereumAddress) {
diff --git a/Sources/web3swift/Utils/ENS/ENSRegistry.swift b/Sources/web3swift/Utils/ENS/ENSRegistry.swift
@@ -37,7 +37,7 @@ public extension ENS {
 
         // FIXME: Rewrite this to CodableTransaction
         lazy var defaultOptions: TransactionOptions = {
-            return TransactionOptions.defaultOptions
+            return TransactionOptions.emptyTransaction
         }()
 
         lazy var registryContract: web3.web3contract = {
diff --git a/Sources/web3swift/Utils/ENS/ENSResolver.swift b/Sources/web3swift/Utils/ENS/ENSResolver.swift
@@ -53,7 +53,7 @@ public extension ENS {
 
         // FIXME: Rewrite this to CodableTransaction
         lazy var defaultOptions: TransactionOptions = {
-            return TransactionOptions.defaultOptions
+            return TransactionOptions.emptyTransaction
         }()
 
         public init(web3: web3, resolverContractAddress: EthereumAddress) {
diff --git a/Sources/web3swift/Utils/ENS/ENSReverseRegistrar.swift b/Sources/web3swift/Utils/ENS/ENSReverseRegistrar.swift
@@ -22,7 +22,7 @@ public extension ENS {
 
         // FIXME: Rewrite this to CodableTransaction
         lazy var defaultOptions: TransactionOptions = {
-            return TransactionOptions.defaultOptions
+            return TransactionOptions.emptyTransaction
         }()
 
         public init(web3: web3, address: EthereumAddress) {
diff --git a/Sources/web3swift/Utils/ENS/ETHRegistrarController.swift b/Sources/web3swift/Utils/ENS/ETHRegistrarController.swift
@@ -22,7 +22,7 @@ public extension ENS {
 
         // FIXME: Rewrite this to CodableTransaction
         lazy var defaultOptions: TransactionOptions = {
-            return TransactionOptions.defaultOptions
+            return TransactionOptions.emptyTransaction
         }()
 
         public init(web3: web3, address: EthereumAddress) {
diff --git a/Sources/web3swift/Web3/Web3+Instance.swift b/Sources/web3swift/Web3/Web3+Instance.swift
@@ -11,7 +11,7 @@ import Core
 /// A web3 instance bound to provider. All further functionality is provided under web.*. namespaces.
 public class web3 {
     public var provider: Web3Provider
-    public var transactionOptions: TransactionOptions = TransactionOptions.defaultOptions
+    public var transactionOptions: TransactionOptions = TransactionOptions.emptyTransaction
 
     /// Raw initializer using a Web3Provider protocol object, dispatch queue and request dispatcher.
     public init(provider prov: Web3Provider) {
diff --git a/Sources/web3swift/Web3/Web3+ReadingTransaction.swift b/Sources/web3swift/Web3/Web3+ReadingTransaction.swift
@@ -14,7 +14,7 @@ public class ReadTransaction {
     public var transaction: CodableTransaction
     public var contract: EthereumContract
     public var method: String
-    public var transactionOptions: TransactionOptions = TransactionOptions.defaultOptions
+    public var transactionOptions: TransactionOptions = TransactionOptions.emptyTransaction
 
     var web3: web3
 
diff --git a/Tests/web3swiftTests/localTests/ERC20Tests.swift b/Tests/web3swiftTests/localTests/ERC20Tests.swift
@@ -44,7 +44,7 @@ class ERC20Tests: LocalTestCase {
 //        let erc20ContractAddress = EthereumAddress(token.address)!
 //        let contract = web3.contract(Web3.Utils.erc20ABI, at: erc20ContractAddress, abiVersion: 2)!
 //        let amount = Web3.Utils.parseToBigUInt(value, units: .eth)
-//        var options = TransactionOptions.defaultOptions
+//        var options = TransactionOptions.emptyTransaction
 //        options.value = amount
 //        options.from = walletAddress
 //        options.gasPrice = .automatic
diff --git a/Tests/web3swiftTests/localTests/PromisesTests.swift b/Tests/web3swiftTests/localTests/PromisesTests.swift
@@ -72,7 +72,7 @@ class web3swiftPromisesTests: XCTestCase {
             return
         }
 
-        var options = TransactionOptions.defaultOptions
+        var options = TransactionOptions.emptyTransaction
         let fromAddress = tempKeystore!.addresses?.first
         options.from = fromAddress
 

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public class ERC1155: IERC1155 {`
`71`	`71`	`}`
`72`	`72`	`let contract = self.contract`
`73`	`73`	`guard contract.contract.address != nil else {return}`
`74`		`- var transactionOptions = TransactionOptions.defaultOptions`
	`74`	`+ var transactionOptions = TransactionOptions.emptyTransaction`
`75`	`75`	`transactionOptions.callOnBlock = .latest`
`76`	`76`
`77`	`77`	`guard let tokenIdPromise = try await contract.read("id", parameters: [] as [AnyObject], extraData: Data(), transactionOptions: transactionOptions)?.decodedData() else {return}`
Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ extension ERC20BaseProperties {`
`216`	`216`	`}`
`217`	`217`	`let contract = self.contract`
`218`	`218`	`guard contract.contract.address != nil else {return}`
`219`		`- var transactionOptionsVAR = TransactionOptions.defaultOptions`
	`219`	`+ var transactionOptionsVAR = TransactionOptions.emptyTransaction`
`220`	`220`	`transactionOptionsVAR.callOnBlock = .latest`
`221`	`221`	`let transactionOptions = transactionOptionsVAR`
`222`	`222`	`async let namePromise = contract`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ public class ERC721: IERC721 {`
`92`	`92`	`}`
`93`	`93`	`let contract = self.contract`
`94`	`94`	`guard contract.contract.address != nil else {return}`
`95`		`- var transactionOptionsVAR = TransactionOptions.defaultOptions`
	`95`	`+ var transactionOptionsVAR = TransactionOptions.emptyTransaction`
`96`	`96`	`transactionOptionsVAR.callOnBlock = .latest`
`97`	`97`	`let transactionOptions = transactionOptionsVAR`
`98`	`98`
Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ public class ERC721x: IERC721x {`
`76`	`76`	`}`
`77`	`77`	`let contract = self.contract`
`78`	`78`	`guard contract.contract.address != nil else {return}`
`79`		`- var transactionOptions = TransactionOptions.defaultOptions`
	`79`	`+ var transactionOptions = TransactionOptions.emptyTransaction`
`80`	`80`	`transactionOptions.callOnBlock = .latest`
`81`	`81`
`82`	`82`	`guard let tokenIdPromise = try await contract.read("tokenId", parameters: [] as [AnyObject], extraData: Data(), transactionOptions: transactionOptions)?.decodedData() else {return}`