fix: fixed typo in function name testBloomForEventPrecence -> testBloomForEventPresence (typo in word Presence)

Author: JeneaVranceanu

Sources/web3swift/Contract/ContractProtocol.swift

@@ -106,7 +106,7 @@ public protocol ContractProtocol {
     /// Attempts to parse given event based on the data from `allEvents`, or in other words based on the given smart contract ABI.
     func parseEvent(_ eventLog: EventLog) -> (eventName:String?, eventData:[String: Any]?)
 
-    func testBloomForEventPrecence(eventName: String, bloom: EthereumBloomFilter) -> Bool?
+    func testBloomForEventPresence(eventName: String, bloom: EthereumBloomFilter) -> Bool?
 }
 
 extension ContractProtocol {
@@ -223,7 +223,7 @@ extension DefaultContractProtocol {
         return (nil, nil)
     }
 
-    public func testBloomForEventPrecence(eventName: String, bloom: EthereumBloomFilter) -> Bool? {
+    public func testBloomForEventPresence(eventName: String, bloom: EthereumBloomFilter) -> Bool? {
         guard let event = events[eventName] else { return nil }
         if event.anonymous {
             return true

Sources/web3swift/Contract/EventFiltering.swift

@@ -197,7 +197,7 @@ internal func parseReceiptForLogs(receipt: TransactionReceipt, contract: Contrac
             return [EventParserResultProtocol]()
         }
     }
-    guard let eventOfSuchTypeIsPresent = contract.testBloomForEventPrecence(eventName: eventName, bloom: bloom) else {return nil}
+    guard let eventOfSuchTypeIsPresent = contract.testBloomForEventPresence(eventName: eventName, bloom: bloom) else {return nil}
     if (!eventOfSuchTypeIsPresent) {
         return [EventParserResultProtocol]()
     }

Sources/web3swift/Web3/Web3+EventParser.swift

@@ -136,7 +136,7 @@ extension web3.web3contract.EventParser {
             }
         }
 
-        guard let eventOfSuchTypeIsPresent = self.contract.testBloomForEventPrecence(eventName: self.eventName, bloom: bloom) else {
+        guard let eventOfSuchTypeIsPresent = self.contract.testBloomForEventPresence(eventName: self.eventName, bloom: bloom) else {
             throw Web3Error.processingError(desc: "Error processing bloom for events")
         }
         if (!eventOfSuchTypeIsPresent) {

Sources/web3swift/Web3/Web3+MutatingTransaction.swift

@@ -10,28 +10,15 @@ import Core
 
 public class WriteTransaction: ReadTransaction {
 
-    public func assemblePromise(transactionOptions: TransactionOptions? = nil) async throws -> EthereumTransaction {
+    public func assembleTransaction(transactionOptions: TransactionOptions? = nil) async throws -> EthereumTransaction {
         var assembledTransaction: EthereumTransaction = transaction
-        let queue = web3.requestDispatcher.queue
-        let returnPromise = Promise<EthereumTransaction> { seal in
-            if method != "fallback" {
-                guard let method = contract.methods[method]?.first else {
-                    seal.reject(Web3Error.inputError(desc: "Contract's ABI does not have such method"))
-                    return
-                }
-
-                if method.constant {
-                    seal.reject(Web3Error.inputError(desc: "Trying to transact to the constant function"))
-                    return
-                }
-            }
 
         if self.method != "fallback" {
             let function = self.contract.methods[self.method]?.first
             if function == nil {
                 throw Web3Error.inputError(desc: "Contract's ABI does not have such method")
             }
-            if function.constant {
+            if function!.constant {
                 throw Web3Error.inputError(desc: "Trying to transact to the constant function")
             }
         }
@@ -190,24 +177,24 @@ public class WriteTransaction: ReadTransaction {
     }
 
     public func send(password: String = "web3swift", transactionOptions: TransactionOptions? = nil) async throws -> TransactionSendingResult {
-        let transaction = try await self.assembleTransaction(transactionOptions: transactionOptions)
+        let transaction = try await assembleTransaction(transactionOptions: transactionOptions)
         let mergedOptions = self.transactionOptions.merge(transactionOptions)
         var cleanedOptions = TransactionOptions()
         cleanedOptions.from = mergedOptions.from
         cleanedOptions.to = mergedOptions.to
-        return try await self.web3.eth.send(transaction, transactionOptions: cleanedOptions, password: password)
+        return try await web3.eth.send(transaction, transactionOptions: cleanedOptions, password: password)
     }
 
     public func assemble(transactionOptions: TransactionOptions? = nil) async throws -> EthereumTransaction {
-        return try await self.assembleTransaction(transactionOptions: transactionOptions)
+        return try await assembleTransaction(transactionOptions: transactionOptions)
     }
 
     func gasEstimate(for policy: TransactionOptions.GasLimitPolicy,
                      assembledTransaction: EthereumTransaction,
                      optionsForGasEstimation: TransactionOptions) async throws -> BigUInt {
         switch policy {
         case .automatic, .withMargin, .limited:
-            return try await self.web3.eth.estimateGas(for: assembledTransaction, transactionOptions: optionsForGasEstimation)
+            return try await web3.eth.estimateGas(for: assembledTransaction, transactionOptions: optionsForGasEstimation)
         case .manual(let gasLimit):
             return gasLimit
         }

Tests/web3swiftTests/localTests/EIP681Tests.swift

@@ -18,7 +18,7 @@ class EIP681Tests: XCTestCase {
     //ethereum:0x8932404A197D84Ec3Ea55971AADE11cdA1dddff1/transfer?address=0x6891dC3962e710f0ff711B9c6acc26133Fd35Cb4&uint256=1
 
     func testEIP681Parsing() async throws {
-        let parsed = Web3.EIP681CodeParser.parse("ethereum:0x5ffc014343cd971b7eb70732021e26c35b744cc4?value=2.014e18")
+        let parsed = await Web3.EIP681CodeParser.parse("ethereum:0x5ffc014343cd971b7eb70732021e26c35b744cc4?value=2.014e18")
         XCTAssert(parsed != nil)
     }
 

Tests/web3swiftTests/localTests/EthereumContractTest.swift

@@ -7,15 +7,17 @@
 //
 
 import XCTest
+@testable import Core
 @testable import web3swift
 
 class EthereumContractTest: LocalTestCase {
     private static let eventsOnlyABI = "[{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"operation\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"contractAddress\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"ContractCreated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"dataKey\",\"type\":\"bytes32\"}],\"name\":\"DataChanged\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"operation\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes4\",\"name\":\"selector\",\"type\":\"bytes4\"}],\"name\":\"Executed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"previousOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"typeId\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"bytes\",\"name\":\"returnedValue\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"receivedData\",\"type\":\"bytes\"}],\"name\":\"UniversalReceiver\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"ValueReceived\",\"type\":\"event\"}]"
 
     private static let overloadedFunctionsABI = "[{\"inputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"constructor\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"operation\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"contractAddress\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"ContractCreated\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"dataKey\",\"type\":\"bytes32\"}],\"name\":\"DataChanged\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"operation\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"to\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":false,\"internalType\":\"bytes4\",\"name\":\"selector\",\"type\":\"bytes4\"}],\"name\":\"Executed\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"previousOwner\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"address\",\"name\":\"newOwner\",\"type\":\"address\"}],\"name\":\"OwnershipTransferred\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"from\",\"type\":\"address\"},{\"indexed\":false,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"},{\"indexed\":true,\"internalType\":\"bytes32\",\"name\":\"typeId\",\"type\":\"bytes32\"},{\"indexed\":true,\"internalType\":\"bytes\",\"name\":\"returnedValue\",\"type\":\"bytes\"},{\"indexed\":false,\"internalType\":\"bytes\",\"name\":\"receivedData\",\"type\":\"bytes\"}],\"name\":\"UniversalReceiver\",\"type\":\"event\"},{\"anonymous\":false,\"inputs\":[{\"indexed\":true,\"internalType\":\"address\",\"name\":\"sender\",\"type\":\"address\"},{\"indexed\":true,\"internalType\":\"uint256\",\"name\":\"value\",\"type\":\"uint256\"}],\"name\":\"ValueReceived\",\"type\":\"event\"},{\"stateMutability\":\"payable\",\"type\":\"fallback\"},{\"inputs\":[{\"internalType\":\"bytes32[]\",\"name\":\"dataKeys\",\"type\":\"bytes32[]\"}],\"name\":\"getData\",\"outputs\":[{\"internalType\":\"bytes[]\",\"name\":\"dataValues\",\"type\":\"bytes[]\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"dataKey\",\"type\":\"bytes32\"}],\"name\":\"getData\",\"outputs\":[{\"internalType\":\"bytes\",\"name\":\"dataValue\",\"type\":\"bytes\"}],\"stateMutability\":\"view\",\"type\":\"function\"},{\"inputs\":[],\"name\":\"noInputFunction\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32[]\",\"name\":\"dataKeys\",\"type\":\"bytes32[]\"},{\"internalType\":\"bytes[]\",\"name\":\"dataValues\",\"type\":\"bytes[]\"}],\"name\":\"setData\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"},{\"inputs\":[{\"internalType\":\"bytes32\",\"name\":\"dataKey\",\"type\":\"bytes32\"},{\"internalType\":\"bytes\",\"name\":\"dataValue\",\"type\":\"bytes\"}],\"name\":\"setData\",\"outputs\":[],\"stateMutability\":\"nonpayable\",\"type\":\"function\"}]"
 
-    func test_decodeEvents() throws {
-        let contract = ganache.contract(EthereumContractTest.eventsOnlyABI)!
+    func test_decodeEvents() async throws {
+        let web3 = try! await Web3.new(LocalTestCase.url)
+        let contract = web3.contract(EthereumContractTest.eventsOnlyABI)!
 
         XCTAssertTrue(contract.contract.allEvents.count == 6)
         XCTAssertNotNil(contract.contract.events["ContractCreated"])
@@ -26,8 +28,9 @@ class EthereumContractTest: LocalTestCase {
         XCTAssertNotNil(contract.contract.events["ValueReceived"])
     }
 
-    func test_decodedAllFunctions() throws {
-        let contract = ganache.contract(EthereumContractTest.overloadedFunctionsABI)!
+    func test_decodedAllFunctions() async throws {
+        let web3 = try! await Web3.new(LocalTestCase.url)
+        let contract = web3.contract(EthereumContractTest.overloadedFunctionsABI)!
 
         XCTAssertTrue(contract.contract.allMethods.count == 5)
 
@@ -48,17 +51,19 @@ class EthereumContractTest: LocalTestCase {
         XCTAssertTrue(contract.contract.methods[getFuncSignature("noInputFunction()")]?.count == 1)
     }
 
-    func test_encodeMethodBasedOnNameWithParameters_mustFail() throws {
-        let contract = ganache.contract(EthereumContractTest.overloadedFunctionsABI)!
+    func test_encodeMethodBasedOnNameWithParameters_mustFail() async throws {
+        let web3 = try! await Web3.new(LocalTestCase.url)
+        let contract = web3.contract(EthereumContractTest.overloadedFunctionsABI)!
 
         /// Encoding method that expects parameters but we are not giving any.
         /// Result must be `nil`.
         XCTAssertNil(contract.method("setData(bytes32,bytes)"))
         XCTAssertNil(contract.method(getFuncSignature("setData(bytes32,bytes)")))
     }
 
-    func test_encodeMethodBasedOnNameWithParameters() throws {
-        let contract = ganache.contract(EthereumContractTest.overloadedFunctionsABI,
+    func test_encodeMethodBasedOnNameWithParameters() async throws {
+        let web3 = try! await Web3.new(LocalTestCase.url)
+        let contract = web3.contract(EthereumContractTest.overloadedFunctionsABI,
                                         at: EthereumAddress("0x6394b37Cf80A7358b38068f0CA4760ad49983a1B")!)!
         let parameters: [AnyObject] = [
             [Data.randomBytes(length: 32)!,
@@ -81,8 +86,9 @@ class EthereumContractTest: LocalTestCase {
         testDecoding(getFuncSignature(functionNameWithParameters))
     }
 
-    func test_encodeMethodBasedOnHexSignature() throws {
-        let contract = ganache.contract(EthereumContractTest.overloadedFunctionsABI,
+    func test_encodeMethodBasedOnHexSignature() async throws {
+        let web3 = try! await Web3.new(LocalTestCase.url)
+        let contract = web3.contract(EthereumContractTest.overloadedFunctionsABI,
                                         at: EthereumAddress("0x6394b37Cf80A7358b38068f0CA4760ad49983a1B")!)!
         let parameters: [AnyObject] = [Data.randomBytes(length: 32)!, Data.randomBytes(length: 32)!] as [AnyObject]
         let functionSignature = getFuncSignature("setData(bytes32,bytes)")