Skip to content

Commit bac93d1

Browse files
yaroslavyaroslavyaroslavyaroslav
committed
Delete for Contract.createWriteOperation transactionOptions parameter (and in all calls too).
Builds.
1 parent f5fdc91 commit bac93d1

File tree

4 files changed

+12
-14
lines changed

4 files changed

+12
-14
lines changed

‎Documentation/web3swift 2.0 Migration Guide.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ return value
218218
let options = options ?? transaction.transactionOptions
219219
guard let result = password == nil ?
220220
try? transaction.send() :
221-
try? transaction.send(password: <your password>, transactionOptions: options) else {return}
221+
try? transaction.send(password: <your password> ) else {return}
222222
return result
223223
```
224224

‎Sources/web3swift/Utils/ENS/ENSRegistry.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public extension ENS {
7777
options.to = contractAddress
7878
}
7979
guard let nameHash = NameHash.nameHash(node) else {throw Web3Error.processingError(desc: "Failed to get name hash")}
80-
guard let transaction = self.registryContract.createWriteOperation("setOwner", parameters: [nameHash, owner] as [AnyObject], extraData: Data(), transactionOptions: options) else {throw Web3Error.transactionSerializationError}
80+
guard let transaction = self.registryContract.createWriteOperation("setOwner", parameters: [nameHash, owner] as [AnyObject], extraData: Data() ) else {throw Web3Error.transactionSerializationError}
8181
guard let result = await password == nil
8282
? try? transaction.send(password: "web3swift")
8383
: try? transaction.send(password: password!)
@@ -93,7 +93,7 @@ public extension ENS {
9393
}
9494
guard let nameHash = NameHash.nameHash(node) else {throw Web3Error.processingError(desc: "Failed to get name hash")}
9595
guard let labelHash = NameHash.nameHash(label) else {throw Web3Error.processingError(desc: "Failed to get label hash")}
96-
guard let transaction = self.registryContract.createWriteOperation("setSubnodeOwner", parameters: [nameHash, labelHash, owner] as [AnyObject], extraData: Data(), transactionOptions: options) else {throw Web3Error.transactionSerializationError}
96+
guard let transaction = self.registryContract.createWriteOperation("setSubnodeOwner", parameters: [nameHash, labelHash, owner] as [AnyObject], extraData: Data() ) else {throw Web3Error.transactionSerializationError}
9797
guard let result = await password == nil
9898
? try? transaction.send(password: "web3swift")
9999
: try? transaction.send(password: password!)
@@ -108,7 +108,7 @@ public extension ENS {
108108
options.to = contractAddress
109109
}
110110
guard let nameHash = NameHash.nameHash(node) else {throw Web3Error.processingError(desc: "Failed to get name hash")}
111-
guard let transaction = self.registryContract.createWriteOperation("setResolver", parameters: [nameHash, resolver] as [AnyObject], extraData: Data(), transactionOptions: options) else {throw Web3Error.transactionSerializationError}
111+
guard let transaction = self.registryContract.createWriteOperation("setResolver", parameters: [nameHash, resolver] as [AnyObject], extraData: Data() ) else {throw Web3Error.transactionSerializationError}
112112
guard let result = await password == nil
113113
? try? transaction.send(password: "web3swift")
114114
: try? transaction.send(password: password!)
@@ -123,7 +123,7 @@ public extension ENS {
123123
options.to = contractAddress
124124
}
125125
guard let nameHash = NameHash.nameHash(node) else {throw Web3Error.processingError(desc: "Failed to get name hash")}
126-
guard let transaction = self.registryContract.createWriteOperation("setTTL", parameters: [nameHash, ttl] as [AnyObject], extraData: Data(), transactionOptions: options) else {throw Web3Error.transactionSerializationError}
126+
guard let transaction = self.registryContract.createWriteOperation("setTTL", parameters: [nameHash, ttl] as [AnyObject], extraData: Data() ) else {throw Web3Error.transactionSerializationError}
127127
guard let result = await password == nil
128128
? try? transaction.send(password: "web3swift")
129129
: try? transaction.send(password: password!)

‎Sources/web3swift/Utils/ENS/ENSResolver.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public extension ENS {
9595
var options = options ?? defaultOptions
9696
options.to = self.resolverContractAddress
9797
guard let nameHash = NameHash.nameHash(node) else {throw Web3Error.processingError(desc: "Failed to get name hash")}
98-
guard let transaction = self.resolverContract.createWriteOperation("setAddr", parameters: [nameHash, address] as [AnyObject], extraData: Data(), transactionOptions: options) else {throw Web3Error.transactionSerializationError}
98+
guard let transaction = self.resolverContract.createWriteOperation("setAddr", parameters: [nameHash, address] as [AnyObject], extraData: Data() ) else {throw Web3Error.transactionSerializationError}
9999
guard let result = await password == nil
100100
? try? transaction.send(password: "web3swift")
101101
: try? transaction.send(password: password!)
@@ -117,7 +117,7 @@ public extension ENS {
117117
var options = options ?? defaultOptions
118118
options.to = self.resolverContractAddress
119119
guard let nameHash = NameHash.nameHash(node) else {throw Web3Error.processingError(desc: "Failed to get name hash")}
120-
guard let transaction = self.resolverContract.createWriteOperation("setName", parameters: [nameHash, name] as [AnyObject], extraData: Data(), transactionOptions: options) else {throw Web3Error.transactionSerializationError}
120+
guard let transaction = self.resolverContract.createWriteOperation("setName", parameters: [nameHash, name] as [AnyObject], extraData: Data() ) else {throw Web3Error.transactionSerializationError}
121121
guard let result = await password == nil
122122
? try? transaction.send(password: "web3swift")
123123
: try? transaction.send(password: password!)
@@ -139,7 +139,7 @@ public extension ENS {
139139
var options = options ?? defaultOptions
140140
options.to = self.resolverContractAddress
141141
guard let nameHash = NameHash.nameHash(node) else {throw Web3Error.processingError(desc: "Failed to get name hash")}
142-
guard let transaction = self.resolverContract.createWriteOperation("setContenthash", parameters: [nameHash, hash] as [AnyObject], extraData: Data(), transactionOptions: options) else {throw Web3Error.transactionSerializationError}
142+
guard let transaction = self.resolverContract.createWriteOperation("setContenthash", parameters: [nameHash, hash] as [AnyObject], extraData: Data() ) else {throw Web3Error.transactionSerializationError}
143143
guard let result = await password == nil
144144
? try? transaction.send(password: "web3swift")
145145
: try? transaction.send(password: password!)
@@ -162,7 +162,7 @@ public extension ENS {
162162
var options = options ?? defaultOptions
163163
options.to = self.resolverContractAddress
164164
guard let nameHash = NameHash.nameHash(node) else {throw Web3Error.processingError(desc: "Failed to get name hash")}
165-
guard let transaction = self.resolverContract.createWriteOperation("setABI", parameters: [nameHash, contentType.rawValue, data] as [AnyObject], extraData: Data(), transactionOptions: options) else {throw Web3Error.transactionSerializationError}
165+
guard let transaction = self.resolverContract.createWriteOperation("setABI", parameters: [nameHash, contentType.rawValue, data] as [AnyObject], extraData: Data() ) else {throw Web3Error.transactionSerializationError}
166166
guard let result = await password == nil
167167
? try? transaction.send(password: "web3swift")
168168
: try? transaction.send(password: password!)
@@ -187,7 +187,7 @@ public extension ENS {
187187
options.to = self.resolverContractAddress
188188
let pubkeyWithoutPrefix = publicKey.getComponentsWithoutPrefix()
189189
guard let nameHash = NameHash.nameHash(node) else {throw Web3Error.processingError(desc: "Failed to get name hash")}
190-
guard let transaction = self.resolverContract.createWriteOperation("setPubkey", parameters: [nameHash, pubkeyWithoutPrefix.x, pubkeyWithoutPrefix.y] as [AnyObject], extraData: Data(), transactionOptions: options) else {throw Web3Error.transactionSerializationError}
190+
guard let transaction = self.resolverContract.createWriteOperation("setPubkey", parameters: [nameHash, pubkeyWithoutPrefix.x, pubkeyWithoutPrefix.y] as [AnyObject], extraData: Data() ) else {throw Web3Error.transactionSerializationError}
191191
guard let result = await password == nil
192192
? try? transaction.send(password: "web3swift")
193193
: try? transaction.send(password: password!)
@@ -209,7 +209,7 @@ public extension ENS {
209209
var options = options ?? defaultOptions
210210
options.to = self.resolverContractAddress
211211
guard let nameHash = NameHash.nameHash(node) else {throw Web3Error.processingError(desc: "Failed to get name hash")}
212-
guard let transaction = self.resolverContract.createWriteOperation("setText", parameters: [nameHash, key, value] as [AnyObject], extraData: Data(), transactionOptions: options) else {throw Web3Error.transactionSerializationError}
212+
guard let transaction = self.resolverContract.createWriteOperation("setText", parameters: [nameHash, key, value] as [AnyObject], extraData: Data() ) else {throw Web3Error.transactionSerializationError}
213213
guard let result = await password == nil
214214
? try? transaction.send(password: "web3swift")
215215
: try? transaction.send(password: password!)

‎Sources/web3swift/Web3/Web3+Contract.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ extension web3 {
8080
///
8181
/// Returns a "Transaction intermediate" object.
8282
public func createReadOperation(_ method: String = "fallback", parameters: [AnyObject] = [AnyObject](), extraData: Data = Data()) -> ReadOperation? {
83-
// let mergedTransaction = self.transaction.merge(transactionOptions)
8483
// MARK: - Encoding ABI Data flow
8584
guard var data = self.contract.method(method, parameters: parameters, extraData: extraData) else { return nil }
8685

@@ -102,8 +101,7 @@ extension web3 {
102101
/// Elements of "parameters" can be other arrays or instances of String, Data, BigInt, BigUInt, Int or EthereumAddress.
103102
///
104103
/// Returns a "Transaction intermediate" object.
105-
public func createWriteOperation(_ method: String = "fallback", parameters: [AnyObject] = [AnyObject](), extraData: Data = Data(), transactionOptions: CodableTransaction? = nil) -> WriteOperation? {
106-
let mergedTransaction = self.transaction.merge(transactionOptions)
104+
public func createWriteOperation(_ method: String = "fallback", parameters: [AnyObject] = [AnyObject](), extraData: Data = Data()) -> WriteOperation? {
107105
guard var data = self.contract.method(method, parameters: parameters, extraData: extraData) else {return nil}
108106
transaction.data = data
109107
if let network = self.web3.provider.network {

0 commit comments

Comments
 (0)