Delete transactionOptions from ERC specs

Author: yaroslavyaroslav

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -75,12 +75,12 @@ extension web3.BrowserFunctions {
 //          let jsonData: Data = try JSONSerialization.data(withJSONObject: transactionJSON, options: [])
 //          let transaction: CodableTransaction = try JSONDecoder().decode(CodableTransaction.self, from: jsonData)
 //          let options: CodableTransaction = try JSONDecoder().decode(CodableTransaction.self, from: jsonData)
-//          var transactionOptions = CodableTransaction.emptyTransaction
-//          transactionOptions.from = options.from
-//          transactionOptions.to = options.to
-//          transactionOptions.value = options.value ?? 0
-//          transactionOptions.gasLimitPolicy = options.gasLimitPolicy ?? .automatic
-//          transactionOptions.gasPricePolicy = options.gasPricePolicy ?? .automatic
+//          var transaction = CodableTransaction.emptyTransaction
+//          transaction.from = options.from
+//          transaction.to = options.to
+//          transaction.value = options.value ?? 0
+//          transaction.gasLimitPolicy = options.gasLimitPolicy ?? .automatic
+//          transaction.gasPricePolicy = options.gasPricePolicy ?? .automatic
 //            return await self.sendTransaction(transaction , password: password)
 //        } catch { return nil }
 //    }
@@ -90,12 +90,12 @@ extension web3.BrowserFunctions {
 //            let jsonData: Data = try JSONSerialization.data(withJSONObject: transactionJSON, options: [])
 //            let transaction: CodableTransaction = try JSONDecoder().decode(CodableTransaction.self, from: jsonData)
 //            let options: CodableTransaction = try JSONDecoder().decode(CodableTransaction.self, from: jsonData)
-//            var transactionOptions = CodableTransaction.emptyTransaction
-//            transactionOptions.from = options.from
-//            transactionOptions.to = options.to
-//            transactionOptions.value = options.value ?? 0
-//            transactionOptions.gasLimitPolicy = .automatic
-//            transactionOptions.gasPricePolicy = options.gasPricePolicy ?? .automatic
+//            var transaction = CodableTransaction.emptyTransaction
+//            transaction.from = options.from
+//            transaction.to = options.to
+//            transaction.value = options.value ?? 0
+//            transaction.gasLimitPolicy = .automatic
+//            transaction.gasPricePolicy = options.gasPricePolicy ?? .automatic
 //            return await self.estimateGas(transaction )
 //        } catch { return nil }
 //    }
@@ -148,30 +148,30 @@ extension web3.BrowserFunctions {
 //            let jsonData: Data = try JSONSerialization.data(withJSONObject: transactionJSON, options: [])
 //            let transaction: EthereumTransaction = try JSONDecoder().decode(EthereumTransaction.self, from: jsonData)
 //            let options: CodableTransaction = try JSONDecoder().decode(TransactionOptions.self, from: jsonData)
-//            var transactionOptions = TransactionOptions.emptyTransaction
-//            transactionOptions.from = options.from
-//            transactionOptions.to = options.to
-//            transactionOptions.value = options.value ?? 0
-//            transactionOptions.gasLimitPolicy = options.gasLimit ?? .automatic
-//            transactionOptions.gasPricePolicy = options.gasPrice ?? .automatic
+//            var transaction = TransactionOptions.emptyTransaction
+//            transaction.from = options.from
+//            transaction.to = options.to
+//            transaction.value = options.value ?? 0
+//            transaction.gasLimitPolicy = options.gasLimit ?? .automatic
+//            transaction.gasPricePolicy = options.gasPrice ?? .automatic
 //            if let nonceString = transactionJSON["nonce"] as? String, let nonce = BigUInt(nonceString.stripHexPrefix(), radix: 16) {
-//                transactionOptions.nonce = .manual(nonce)
+//                transaction.nonce = .manual(nonce)
 //            } else {
-//                transactionOptions.nonce = .pending
+//                transaction.nonce = .pending
 //            }
 //            return await self.signTransaction(transaction , password: password)
 //        } catch { return nil }
 //    }
 
     // FIXME: Rewrite this to EthereumTransaction
-//    public func signTransaction(_ trans: EthereumTransaction, transactionOptions: TransactionOptions, password: String ) async -> String? {
+//    public func signTransaction(_ trans: EthereumTransaction, transaction: TransactionOptions, password: String ) async -> String? {
 //        do {
 //            var transaction = trans
-//            guard let from = transactionOptions.from else {return nil}
+//            guard let from = transaction.from else {return nil}
 //            guard let keystoreManager = self.web3.provider.attachedKeystoreManager else {return nil}
-//            guard let gasPricePolicy = transactionOptions.gasPrice else {return nil}
-//            guard let gasLimitPolicy = transactionOptions.gasLimit else {return nil}
-//            guard let noncePolicy = transactionOptions.nonce else {return nil}
+//            guard let gasPricePolicy = transaction.gasPrice else {return nil}
+//            guard let gasLimitPolicy = transaction.gasLimit else {return nil}
+//            guard let noncePolicy = transaction.nonce else {return nil}
 //            switch gasPricePolicy {
 //            case .manual(let gasPrice):
 //                transaction.parameters.gasPrice = gasPrice

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

@@ -35,7 +35,7 @@ public class ERC1155: IERC1155 {
     private var _tokenId: BigUInt? = nil
     private var _hasReadProperties: Bool = false
 
-    public var transactionOptions: CodableTransaction
+    public var transaction: CodableTransaction
     public var web3: web3
     public var provider: Web3Provider
     public var address: EthereumAddress
@@ -51,8 +51,8 @@ public class ERC1155: IERC1155 {
         self.web3 = web3
         self.provider = provider
         self.address = address
-        self.transactionOptions = transaction
-        self.transactionOptions.to = address
+        self.transaction = transaction
+        self.transaction.to = address
         self.abi = abi
     }
 
@@ -70,8 +70,7 @@ public class ERC1155: IERC1155 {
         }
         let contract = self.contract
         guard contract.contract.address != nil else {return}
-        var transactionOptions = CodableTransaction.emptyTransaction
-        transactionOptions.callOnBlock = .latest
+        self.transaction.callOnBlock = .latest
 
         guard let tokenIdPromise = try await contract.createReadOperation("id", parameters: [] as [AnyObject], extraData: Data())?.callContractMethod() else {return}
 
@@ -83,19 +82,17 @@ public class ERC1155: IERC1155 {
 
     public func safeTransferFrom(from: EthereumAddress, to: EthereumAddress, originalOwner: EthereumAddress, id: BigUInt, value: BigUInt, data: [UInt8]) throws -> WriteOperation {
         let contract = self.contract
-        var basicOptions = CodableTransaction.emptyTransaction
-        basicOptions.from = from
-        basicOptions.to = self.address
+        self.transaction.from = from
+        self.transaction.to = self.address
 
         let tx = contract.createWriteOperation("safeTransferFrom", parameters: [originalOwner, to, id, value, data] as [AnyObject] )!
         return tx
     }
 
     public func safeBatchTransferFrom(from: EthereumAddress, to: EthereumAddress, originalOwner: EthereumAddress, ids: [BigUInt], values: [BigUInt], data: [UInt8]) throws -> WriteOperation {
         let contract = self.contract
-        var basicOptions = CodableTransaction.emptyTransaction
-        basicOptions.from = from
-        basicOptions.to = self.address
+        self.transaction.from = from
+        self.transaction.to = self.address
 
         let tx = contract
             .createWriteOperation("safeBatchTransferFrom", parameters: [originalOwner, to, ids, values, data] as [AnyObject] )!
@@ -104,8 +101,7 @@ public class ERC1155: IERC1155 {
 
     public func balanceOf(account: EthereumAddress, id: BigUInt) async throws -> BigUInt {
         let contract = self.contract
-        var transactionOptions = CodableTransaction.emptyTransaction
-        transactionOptions.callOnBlock = .latest
+        self.transaction.callOnBlock = .latest
         let result = try await contract
             .createReadOperation("balanceOf", parameters: [account, id] as [AnyObject], extraData: Data() )!
             .callContractMethod()
@@ -123,28 +119,25 @@ public class ERC1155: IERC1155 {
 
     public func setApprovalForAll(from: EthereumAddress, operator user: EthereumAddress, approved: Bool, scope: Data) throws -> WriteOperation {
         let contract = self.contract
-        var basicOptions = CodableTransaction.emptyTransaction
-        basicOptions.from = from
-        basicOptions.to = self.address
+        self.transaction.from = from
+        self.transaction.to = self.address
 
         let tx = contract.createWriteOperation("setApprovalForAll", parameters: [user, approved, scope] as [AnyObject] )!
         return tx
     }
 
     public func isApprovedForAll(owner: EthereumAddress, operator user: EthereumAddress, scope: Data) async throws -> Bool {
         let contract = self.contract
-        var basicOptions = CodableTransaction.emptyTransaction
-        basicOptions.callOnBlock = .latest
+        self.transaction.callOnBlock = .latest
         let result = try await contract.createReadOperation("isApprovedForAll", parameters: [owner, user, scope] as [AnyObject], extraData: Data() )!.callContractMethod()
         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
     }
 
     public func supportsInterface(interfaceID: String) async throws -> Bool {
         let contract = self.contract
-        var transactionOptions = CodableTransaction.emptyTransaction
-        transactionOptions.callOnBlock = .latest
-        transactionOptions.gasLimitPolicy = .manual(30000)
+        self.transaction.callOnBlock = .latest
+        self.transaction.gasLimitPolicy = .manual(30000)
         let result = try await contract.createReadOperation("supportsInterface", parameters: [interfaceID] as [AnyObject], extraData: Data() )!.callContractMethod()
         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