ContractProtocol.method now returns Data instead of CodableTransaction

Delete for `Contract.createReadOperation` `transactionOptions` parameter (and in all calls too).
Builds.

Author: yaroslavyaroslav

Documentation/README.md

@@ -154,7 +154,7 @@ let parameters: [AnyObject] = <PARAMETERS>
 let extraData: Data = <DATA>
 let transactionOptions: TransactionOptions = <OPTIONS>
 
-let transaction = contract.read(method, parameters: parameters, extraData: extraData, transactionOptions: transactionOptions)
+let transaction = contract.read(method, parameters: parameters, extraData: extraData )
 ```
 
 Here is the example how you should send transaction to some contract method:
@@ -164,7 +164,7 @@ let method: String = <CONTRACT METHOD NAME>
 let parameters: [AnyObject] = <PARAMETERS>
 let extraData: Data = <DATA>
 let transactionOptions: TransactionOptions = <OPTIONS>
-let transaction = contract.write(method, parameters: parameters, extraData: extraData, transactionOptions: transactionOptions)
+let transaction = contract.write(method, parameters: parameters, extraData: extraData )
 ```
 
 > How to test on a local node?

Sources/Core/Contract/ContractProtocol.swift

@@ -135,7 +135,7 @@ public protocol ContractProtocol {
     ///   - parameters: method input arguments;
     ///   - extraData: additional data to append at the end of `transaction.data` field;
     /// - Returns: transaction object if `method` was found and `parameters` were successfully encoded.
-    func method(_ method: String, parameters: [AnyObject], extraData: Data?) -> CodableTransaction?
+    func method(_ method: String, parameters: [AnyObject], extraData: Data?) -> Data?
 
     /// Decode output data of a function.
     /// - Parameters:
@@ -261,17 +261,10 @@ extension DefaultContractProtocol {
     ///   - params: EthereumParameters with no contract method call encoded data.
     public func method(_ method: String,
                        parameters: [AnyObject],
-                       extraData: Data?) -> CodableTransaction? {
-        guard let to = self.address else { return nil }
-
-        // FIXME: This should be changed up to release
-        var transaction = CodableTransaction(to: to)
-
+                       extraData: Data?) -> Data? {
         // MARK: - Encoding ABI Data flow
         if method == "fallback" {
-            // FIXME: Return parameters
-            return CodableTransaction(to: to, value: BigUInt(0), data: extraData ?? Data()//, parameters: params
-            )
+            return extraData ?? Data()
         }
 
         let method = Data.fromHex(method) == nil ? method : method.addHexPrefix().lowercased()
@@ -285,10 +278,8 @@ extension DefaultContractProtocol {
             encodedData.append(extraData)
         }
 
-        transaction.data = encodedData
-
         // MARK: - Encoding ABI Data flow
-        return transaction
+        return encodedData
     }
 
     public func parseEvent(_ eventLog: EventLog) -> (eventName: String?, eventData: [String: Any]?) {

Sources/web3swift/HookedFunctions/Web3+BrowserFunctions.swift

@@ -81,7 +81,7 @@ extension web3.BrowserFunctions {
 //          transactionOptions.value = options.value ?? 0
 //          transactionOptions.gasLimitPolicy = options.gasLimitPolicy ?? .automatic
 //          transactionOptions.gasPricePolicy = options.gasPricePolicy ?? .automatic
-//            return await self.sendTransaction(transaction, transactionOptions: transactionOptions, password: password)
+//            return await self.sendTransaction(transaction , password: password)
 //        } catch { return nil }
 //    }
 
@@ -96,7 +96,7 @@ extension web3.BrowserFunctions {
 //            transactionOptions.value = options.value ?? 0
 //            transactionOptions.gasLimitPolicy = .automatic
 //            transactionOptions.gasPricePolicy = options.gasPricePolicy ?? .automatic
-//            return await self.estimateGas(transaction, transactionOptions: transactionOptions)
+//            return await self.estimateGas(transaction )
 //        } catch { return nil }
 //    }
 
@@ -159,7 +159,7 @@ extension web3.BrowserFunctions {
 //            } else {
 //                transactionOptions.nonce = .pending
 //            }
-//            return await self.signTransaction(transaction, transactionOptions: transactionOptions, password: password)
+//            return await self.signTransaction(transaction , password: password)
 //        } catch { return nil }
 //    }
 
@@ -184,7 +184,7 @@ extension web3.BrowserFunctions {
 //            case .manual(let gasLimit):
 //                transaction.parameters.gasLimit = gasLimit
 //            default:
-//                let gasLimit = try await self.web3.eth.estimateGas(for: transaction, transactionOptions: transactionOptions)
+//                let gasLimit = try await self.web3.eth.estimateGas(for: transaction )
 //                transaction.parameters.gasLimit = gasLimit
 //            }
 //

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

@@ -73,7 +73,7 @@ public class ERC1155: IERC1155 {
         var transactionOptions = CodableTransaction.emptyTransaction
         transactionOptions.callOnBlock = .latest
 
-        guard let tokenIdPromise = try await contract.createReadOperation("id", parameters: [] as [AnyObject], extraData: Data(), transactionOptions: transactionOptions)?.decodedData() else {return}
+        guard let tokenIdPromise = try await contract.createReadOperation("id", parameters: [] as [AnyObject], extraData: Data())?.decodedData() else {return}
 
         guard let tokenId = tokenIdPromise["0"] as? BigUInt else {return}
         self._tokenId = tokenId
@@ -87,7 +87,7 @@ public class ERC1155: IERC1155 {
         basicOptions.from = from
         basicOptions.to = self.address
 
-        let tx = contract.createWriteOperation("safeTransferFrom", parameters: [originalOwner, to, id, value, data] as [AnyObject], transactionOptions: basicOptions)!
+        let tx = contract.createWriteOperation("safeTransferFrom", parameters: [originalOwner, to, id, value, data] as [AnyObject] )!
         return tx
     }
 
@@ -98,7 +98,7 @@ public class ERC1155: IERC1155 {
         basicOptions.to = self.address
 
         let tx = contract
-            .createWriteOperation("safeBatchTransferFrom", parameters: [originalOwner, to, ids, values, data] as [AnyObject], transactionOptions: basicOptions)!
+            .createWriteOperation("safeBatchTransferFrom", parameters: [originalOwner, to, ids, values, data] as [AnyObject] )!
         return tx
     }
 
@@ -107,12 +107,12 @@ public class ERC1155: IERC1155 {
         var transactionOptions = CodableTransaction.emptyTransaction
         transactionOptions.callOnBlock = .latest
         let result = try await contract
-            .createReadOperation("balanceOf", parameters: [account, id] as [AnyObject], extraData: Data(), transactionOptions: self.transactionOptions)!
+            .createReadOperation("balanceOf", parameters: [account, id] as [AnyObject], extraData: Data() )!
             .decodedData()
 
         /*
          let result = try await contract
-             .prepareToRead("balanceOf", parameters: [account, id] as [AnyObject], extraData: Data(), transactionOptions: self.transactionOptions)!
+             .prepareToRead("balanceOf", parameters: [account, id] as [AnyObject], extraData: Data() )!
              .execute()
              .decodeData()
 
@@ -127,15 +127,15 @@ public class ERC1155: IERC1155 {
         basicOptions.from = from
         basicOptions.to = self.address
 
-        let tx = contract.createWriteOperation("setApprovalForAll", parameters: [user, approved, scope] as [AnyObject], transactionOptions: basicOptions)!
+        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
-        let result = try await contract.createReadOperation("isApprovedForAll", parameters: [owner, user, scope] as [AnyObject], extraData: Data(), transactionOptions: self.transactionOptions)!.decodedData()
+        let result = try await contract.createReadOperation("isApprovedForAll", parameters: [owner, user, scope] as [AnyObject], extraData: Data() )!.decodedData()
         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
     }
@@ -145,7 +145,7 @@ public class ERC1155: IERC1155 {
         var transactionOptions = CodableTransaction.emptyTransaction
         transactionOptions.callOnBlock = .latest
         transactionOptions.gasLimitPolicy = .manual(30000)
-        let result = try await contract.createReadOperation("supportsInterface", parameters: [interfaceID] as [AnyObject], extraData: Data(), transactionOptions: self.transactionOptions)!.decodedData()
+        let result = try await contract.createReadOperation("supportsInterface", parameters: [interfaceID] as [AnyObject], extraData: Data() )!.decodedData()
         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
     }