Skip to content

Commit af13383

Browse files
TonioMacaronioTonioMacaronio
authored
Merge pull request #152 from matter-labs/develop
2.1.3 fix No2
2 parents 67f656a + 2b80e1e commit af13383

File tree

3 files changed

+28
-24
lines changed

3 files changed

+28
-24
lines changed

‎web3swift.podspec

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "web3swift"
3-
s.version = "2.1.4"
3+
s.version = "2.1.3"
44
s.summary = "Web3 implementation in vanilla Swift for iOS ans macOS"
55

66
s.description = <<-DESC
@@ -17,7 +17,7 @@ s.swift_version = '5.0'
1717
s.module_name = 'Web3swift'
1818
s.ios.deployment_target = "9.0"
1919
s.osx.deployment_target = "10.11"
20-
s.source_files = "web3swift/{Promises,Web3,Contract,KeystoreManager,Transaction,Convenience,HookedFunctions}/Classes/*.{h,swift}", "web3swift/Utils/Classes/{EIP67Code, EIP681}.swift", "web3swift/PrecompiledContracts/**/*.swift", "web3swift/web3swift.h"
20+
s.source_files = "web3swift/{Promises,Web3,Contract,KeystoreManager,Transaction,Convenience,HookedFunctions}/Classes/*.{h,swift}", "web3swift/Utils/Classes/{EIP67Code, EIP681, ENS, ENSResolver, NonceMiddleware}.swift", "web3swift/PrecompiledContracts/**/*.swift", "web3swift/web3swift.h"
2121
s.public_header_files = "web3swift/web3swift.h"
2222
s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }
2323

‎web3swift.xcodeproj/project.pbxproj

+16-16
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@
1010
00E5FE8220EA3FF40030E0D6 /* web3swift_infura_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 00E5FE8120EA3FF40030E0D6 /* web3swift_infura_Tests.swift */; };
1111
13AE5971A972F5B55FA6FB69 /* libPods-web3swift-iOS_Tests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8349531F1984454E50389370 /* libPods-web3swift-iOS_Tests.a */; };
1212
1CD91B341FD769A6007BFB45 /* web3swift_iOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1CD91AFC1FD76910007BFB45 /* web3swift_iOS.framework */; };
13+
3A3F59B822592F5B0075C9E7 /* Web3+BrowserFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81C0FCF8204456E600D82FAF /* Web3+BrowserFunctions.swift */; };
14+
3A3F59B922592F6A0075C9E7 /* Web3+BrowserFunctions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81C0FCF8204456E600D82FAF /* Web3+BrowserFunctions.swift */; };
15+
3A3F59BA225931710075C9E7 /* ENS.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E668CD214F8A7B00C3CC2D /* ENS.swift */; };
16+
3A3F59BB225931780075C9E7 /* ENSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B219DC162154F3EE0035BF94 /* ENSResolver.swift */; };
17+
3A3F59BC225931B00075C9E7 /* NameHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A7B2502143C3A8004CD2C7 /* NameHash.swift */; };
18+
3A3F59BD225931BE0075C9E7 /* NameHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A7B2502143C3A8004CD2C7 /* NameHash.swift */; };
19+
3A3F59BE225931BE0075C9E7 /* ENS.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E668CD214F8A7B00C3CC2D /* ENS.swift */; };
20+
3A3F59BF225931BE0075C9E7 /* ENSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B219DC162154F3EE0035BF94 /* ENSResolver.swift */; };
1321
3AE8913C2256286C00D08E99 /* Web3+ERC1155.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8911C2256286B00D08E99 /* Web3+ERC1155.swift */; };
1422
3AE8913D2256286C00D08E99 /* Web3+ERC1155.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8911C2256286B00D08E99 /* Web3+ERC1155.swift */; };
1523
3AE8913E2256286C00D08E99 /* Web3+ERC1376.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AE8911E2256286B00D08E99 /* Web3+ERC1376.swift */; };
@@ -173,8 +181,6 @@
173181
81A1824920D7DDA20016741F /* Promise+Web3+Personal+Sign.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1824720D7DDA20016741F /* Promise+Web3+Personal+Sign.swift */; };
174182
81A1824B20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1824A20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift */; };
175183
81A1824C20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A1824A20D7DF1B0016741F /* Promise+Web3+Personal+UnlockAccount.swift */; };
176-
81A7B2512143C3A8004CD2C7 /* NameHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A7B2502143C3A8004CD2C7 /* NameHash.swift */; };
177-
81A7B2522143C3A8004CD2C7 /* NameHash.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A7B2502143C3A8004CD2C7 /* NameHash.swift */; };
178184
81C0FCF220440EB500D82FAF /* Web3+Protocols.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81C0FCF120440EB500D82FAF /* Web3+Protocols.swift */; };
179185
81C0FCF420440F0900D82FAF /* Web3+Options.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81C0FCF320440F0900D82FAF /* Web3+Options.swift */; };
180186
81C0FCF720441A1D00D82FAF /* TransactionSigner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81C0FCF520440F9900D82FAF /* TransactionSigner.swift */; };
@@ -199,8 +205,6 @@
199205
81DFB400210775320011DC85 /* Web3+InfuraProviders.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81DFB3FE210775320011DC85 /* Web3+InfuraProviders.swift */; };
200206
81EB1E4B208173D7003BD47F /* Web3+Personal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81EB1E4A208173D7003BD47F /* Web3+Personal.swift */; };
201207
81EB1E4C208173D7003BD47F /* Web3+Personal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81EB1E4A208173D7003BD47F /* Web3+Personal.swift */; };
202-
81ED4EA82190D922003E932E /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
203-
81ED4EA92190D922003E932E /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
204208
81FA43F62044097100EE14D5 /* web3swift_macOS_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81FA43F52044097100EE14D5 /* web3swift_macOS_Tests.swift */; };
205209
81FA43F82044097100EE14D5 /* web3swift_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 417715D420362916005C3E16 /* web3swift_macOS.framework */; };
206210
81FB21FE207BB297007F9A83 /* EIP67Code.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81FB21F8207BA78B007F9A83 /* EIP67Code.swift */; };
@@ -215,10 +219,6 @@
215219
E2065FBA2181D7D700701068 /* Promise+Web3+TxPool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 985BFD4D216E2E0A00B28C14 /* Promise+Web3+TxPool.swift */; };
216220
E2065FBB2181D7D700701068 /* Web3+TxPool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 985BFD49216CE8B100B28C14 /* Web3+TxPool.swift */; };
217221
E2DCA653218C875100F94FBA /* web3swift_ENS_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81A7B2782143C978004CD2C7 /* web3swift_ENS_Tests.swift */; };
218-
E2DCA654218C879900F94FBA /* ENS.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E668CD214F8A7B00C3CC2D /* ENS.swift */; };
219-
E2DCA655218C879900F94FBA /* ENSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B219DC162154F3EE0035BF94 /* ENSResolver.swift */; };
220-
E2DCA656218C87A500F94FBA /* ENS.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2E668CD214F8A7B00C3CC2D /* ENS.swift */; };
221-
E2DCA657218C87A500F94FBA /* ENSResolver.swift in Sources */ = {isa = PBXBuildFile; fileRef = B219DC162154F3EE0035BF94 /* ENSResolver.swift */; };
222222
/* End PBXBuildFile section */
223223

224224
/* Begin PBXContainerItemProxy section */
@@ -1197,8 +1197,10 @@
11971197
isa = PBXSourcesBuildPhase;
11981198
buildActionMask = 2147483647;
11991199
files = (
1200-
E2DCA654218C879900F94FBA /* ENS.swift in Sources */,
1201-
E2DCA655218C879900F94FBA /* ENSResolver.swift in Sources */,
1200+
3A3F59BC225931B00075C9E7 /* NameHash.swift in Sources */,
1201+
3A3F59BB225931780075C9E7 /* ENSResolver.swift in Sources */,
1202+
3A3F59BA225931710075C9E7 /* ENS.swift in Sources */,
1203+
3A3F59B822592F5B0075C9E7 /* Web3+BrowserFunctions.swift in Sources */,
12021204
81C146F71FF274B200AA943E /* Web3+Structures.swift in Sources */,
12031205
8104E2281FE82BDC00F952CB /* Web3+Utils.swift in Sources */,
12041206
818ABD5D1FE95FC9002657BB /* Web3+Contract.swift in Sources */,
@@ -1243,7 +1245,6 @@
12431245
3AE8914C2256286C00D08E99 /* Web3+ERC1644.swift in Sources */,
12441246
810B0F9C1FEC520500CF0DA2 /* Web3+Methods.swift in Sources */,
12451247
3AE891482256286C00D08E99 /* Web3+ERC20.swift in Sources */,
1246-
81ED4EA82190D922003E932E /* NonceMiddleware.swift in Sources */,
12471248
3AE891612256611E00D08E99 /* Web3+Eth+Websocket.swift in Sources */,
12481249
81A1822520D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,
12491250
8113DE7C1FD8514400CD8DF1 /* NSRegularExpressionExtension.swift in Sources */,
@@ -1263,7 +1264,6 @@
12631264
3AE891502256286C00D08E99 /* Web3+ERC1643.swift in Sources */,
12641265
81A1823420D6E1FD0016741F /* Promise+Web3+Eth+GetBlockByNumber.swift in Sources */,
12651266
81A1822820D678BF0016741F /* Promise+Web3+Eth+GetAccounts.swift in Sources */,
1266-
81A7B2512143C3A8004CD2C7 /* NameHash.swift in Sources */,
12671267
81C5DA312074EC1E00424CD6 /* ContractProtocol.swift in Sources */,
12681268
815630002007B48800A0EC2F /* BIP32KeystoreJSONStructure.swift in Sources */,
12691269
8123E1CB200CBB2200B6D3AB /* Array+Extension.swift in Sources */,
@@ -1321,8 +1321,10 @@
13211321
isa = PBXSourcesBuildPhase;
13221322
buildActionMask = 2147483647;
13231323
files = (
1324-
E2DCA656218C87A500F94FBA /* ENS.swift in Sources */,
1325-
E2DCA657218C87A500F94FBA /* ENSResolver.swift in Sources */,
1324+
3A3F59BD225931BE0075C9E7 /* NameHash.swift in Sources */,
1325+
3A3F59BE225931BE0075C9E7 /* ENS.swift in Sources */,
1326+
3A3F59BF225931BE0075C9E7 /* ENSResolver.swift in Sources */,
1327+
3A3F59B922592F6A0075C9E7 /* Web3+BrowserFunctions.swift in Sources */,
13261328
E2065FB82181D7D700701068 /* Promise+Web3+Eth+EstimateGas.swift in Sources */,
13271329
E2065FB92181D7D700701068 /* Promise+Web3+Contract+GetIndexedEvents.swift in Sources */,
13281330
E2065FBA2181D7D700701068 /* Promise+Web3+TxPool.swift in Sources */,
@@ -1365,9 +1367,7 @@
13651367
41948131203630530065A83B /* BIP32KeystoreJSONStructure.swift in Sources */,
13661368
41948132203630530065A83B /* BIP32HDNode.swift in Sources */,
13671369
3AE8914D2256286C00D08E99 /* Web3+ERC1644.swift in Sources */,
1368-
81A7B2522143C3A8004CD2C7 /* NameHash.swift in Sources */,
13691370
3AE891492256286C00D08E99 /* Web3+ERC20.swift in Sources */,
1370-
81ED4EA92190D922003E932E /* NonceMiddleware.swift in Sources */,
13711371
3AE891622256611E00D08E99 /* Web3+Eth+Websocket.swift in Sources */,
13721372
81A1824920D7DDA20016741F /* Promise+Web3+Personal+Sign.swift in Sources */,
13731373
81A1822620D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,

‎web3swift/HookedFunctions/Classes/Web3+BrowserFunctions.swift

+10-6
Original file line numberDiff line numberDiff line change
@@ -108,23 +108,27 @@ extension web3.BrowserFunctions {
108108
}
109109
}
110110

111-
public func prepareTxForApproval(_ transactionJSON: [String: Any]) -> (transaction: EthereumTransaction?, options: Web3Options?) {
111+
public func prepareTxForApproval(_ transactionJSON: [String: Any]) -> (transaction: EthereumTransaction?, options: TransactionOptions?) {
112112
guard let transaction = EthereumTransaction.fromJSON(transactionJSON) else {return (nil, nil)}
113113
guard let options = TransactionOptions.fromJSON(transactionJSON) else {return (nil, nil)}
114-
return self.prepareTxForApproval(transaction, options: options)
114+
do {
115+
return try self.prepareTxForApproval(transaction, options: options)
116+
} catch {
117+
return (nil, nil)
118+
}
115119
}
116120

117-
public func prepareTxForApproval(_ trans: EthereumTransaction, options opts: TransactionOptions) throws -> (transaction: EthereumTransaction?, options: TransactionOptions?) {
121+
public func prepareTxForApproval(_ trans: EthereumTransaction, options opts: TransactionOptions) throws -> (transaction: EthereumTransaction?, options: TransactionOptions?) {
118122
do {
119123
var transaction = trans
120124
var options = opts
121125
guard let _ = options.from else {return (nil, nil)}
122126
let gasPrice = try self.web3.eth.getGasPrice()
123127
transaction.gasPrice = gasPrice
124-
options.gasPrice = gasPrice
125-
guard let gasEstimate = self.estimateGas(transaction, options: options) else {return (nil, nil)}
128+
options.gasPrice = .manual(gasPrice)
129+
guard let gasEstimate = self.estimateGas(transaction, transactionOptions: options) else {return (nil, nil)}
126130
transaction.gasLimit = gasEstimate
127-
options.gasLimit = gasEstimate
131+
options.gasLimit = .limited(gasEstimate)
128132
print(transaction)
129133
return (transaction, options)
130134
} catch {

0 commit comments

Comments
 (0)