Skip to content

Commit 75079bd

Browse files
TonioMacaronioTonioMacaronio
authored
Merge pull request #135 from matter-labs/fix/podspec
Fix/podspec
2 parents 368b0a1 + 2cdb1cb commit 75079bd

File tree

3 files changed

+35
-37
lines changed

3 files changed

+35
-37
lines changed

‎web3swift.podspec

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

66
s.description = <<-DESC
77
Web3 implementation in vanilla Swift, intended for mobile developers of wallets, Dapps and Web3.0
88
DESC
99

10-
s.homepage = "https://github.com/matterinc/web3swift"
10+
s.homepage = "https://github.com/matter-labs/web3swift"
1111
s.license = 'Apache License 2.0'
1212
s.author = { "Alex Vlasov" => "alex.m.vlasov@gmail.com" }
13-
s.source = { :git => 'https://github.com/matterinc/web3swift.git', :tag => s.version.to_s }
13+
s.source = { :git => 'https://github.com/matter-labs/web3swift.git', :tag => s.version.to_s }
1414
s.social_media_url = 'https://twitter.com/shamatar'
1515

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

2424
s.frameworks = 'CoreImage'
25+
s.dependency 'scrypt', '~> 2.0'
26+
s.dependency 'PromiseKit', '~> 6.4.1'
2527
s.dependency 'BigInt', '~> 3.1'
2628
s.dependency 'CryptoSwift', '~> 0.13'
27-
s.dependency 'PromiseKit', '~> 6.3'
28-
s.dependency 'scrypt', '~> 2.0'
29+
s.dependency 'Result', '~> 4.0'
2930
s.dependency 'secp256k1_swift', '~> 1.0.3'
3031
s.dependency 'SwiftRLP', '~> 1.1'
3132
s.dependency 'EthereumAddress', '~> 1.0.0'
3233
s.dependency 'EthereumABI', '~> 1.1.1'
34+
3335
end

‎web3swift.xcodeproj/project.pbxproj

-4
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,6 @@
183183
81DFB400210775320011DC85 /* Web3+Infura.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81DFB3FE210775320011DC85 /* Web3+Infura.swift */; };
184184
81EB1E4B208173D7003BD47F /* Web3+Personal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81EB1E4A208173D7003BD47F /* Web3+Personal.swift */; };
185185
81EB1E4C208173D7003BD47F /* Web3+Personal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81EB1E4A208173D7003BD47F /* Web3+Personal.swift */; };
186-
81ED4EA82190D922003E932E /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
187-
81ED4EA92190D922003E932E /* NonceMiddleware.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81ED4EA72190D922003E932E /* NonceMiddleware.swift */; };
188186
81FA43F62044097100EE14D5 /* web3swift_macOS_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81FA43F52044097100EE14D5 /* web3swift_macOS_Tests.swift */; };
189187
81FA43F82044097100EE14D5 /* web3swift_macOS.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 417715D420362916005C3E16 /* web3swift_macOS.framework */; };
190188
81FB21FE207BB297007F9A83 /* EIP67Code.swift in Sources */ = {isa = PBXBuildFile; fileRef = 81FB21F8207BA78B007F9A83 /* EIP67Code.swift */; };
@@ -1239,7 +1237,6 @@
12391237
8160E5CE20B8245A0070070B /* IBAN.swift in Sources */,
12401238
81909D1521862D37007D2AE5 /* Web3+MutatingTransaction.swift in Sources */,
12411239
810B0F9C1FEC520500CF0DA2 /* Web3+Methods.swift in Sources */,
1242-
81ED4EA82190D922003E932E /* NonceMiddleware.swift in Sources */,
12431240
81A1822520D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,
12441241
8113DE7C1FD8514400CD8DF1 /* NSRegularExpressionExtension.swift in Sources */,
12451242
E2F8082A21CAA07000B6BF15 /* Web3+ERC1643.swift in Sources */,
@@ -1369,7 +1366,6 @@
13691366
41948131203630530065A83B /* BIP32KeystoreJSONStructure.swift in Sources */,
13701367
41948132203630530065A83B /* BIP32HDNode.swift in Sources */,
13711368
81A7B2522143C3A8004CD2C7 /* NameHash.swift in Sources */,
1372-
81ED4EA92190D922003E932E /* NonceMiddleware.swift in Sources */,
13731369
81A1824920D7DDA20016741F /* Promise+Web3+Personal+Sign.swift in Sources */,
13741370
81A1822620D678590016741F /* Promise+Web3+Eth+GetGasPrice.swift in Sources */,
13751371
81909D1621862D37007D2AE5 /* Web3+MutatingTransaction.swift in Sources */,

‎web3swiftTests/web3swift_Eventloop_Tests.swift

+27-27
Original file line numberDiff line numberDiff line change
@@ -35,33 +35,33 @@ class web3swift_Eventloop_Tests: XCTestCase {
3535
waitForExpectations(timeout: 60, handler: nil)
3636
}
3737

38-
func testNonceMiddleware() {
39-
let web3 = Web3.InfuraRinkebyWeb3()
40-
let middleware = Web3.Utils.NonceMiddleware()
41-
middleware.attach(web3)
42-
43-
let sendToAddress = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
44-
let ksData = getKeystoreData()
45-
let tempKeystore = EthereumKeystoreV3(ksData!)
46-
let keystoreManager = KeystoreManager([tempKeystore!])
47-
web3.addKeystoreManager(keystoreManager)
48-
49-
var tx = web3.eth.sendETH(to: sendToAddress, amount: 1000)
50-
tx!.transactionOptions.from = tempKeystore!.addresses!.first!
51-
var result = try! tx!.send(password: "web3swift")
52-
let newNonce = result.transaction.nonce
53-
sleep(1)
54-
let hookNewNonce = middleware.nonceLookups[tempKeystore!.addresses!.first!]!
55-
XCTAssertEqual(newNonce, hookNewNonce)
56-
57-
tx = web3.eth.sendETH(to: sendToAddress, amount: 1000)
58-
tx!.transactionOptions.from = tempKeystore!.addresses!.first!
59-
result = try! tx!.send(password: "web3swift")
60-
sleep(1)
61-
let newNonce2 = result.transaction.nonce
62-
let hookNewNonce2 = middleware.nonceLookups[tempKeystore!.addresses!.first!]!
63-
XCTAssert(newNonce2 == hookNewNonce2)
64-
}
38+
// func testNonceMiddleware() {
39+
// let web3 = Web3.InfuraRinkebyWeb3()
40+
// let middleware = Web3.Utils.NonceMiddleware()
41+
// middleware.attach(web3)
42+
//
43+
// let sendToAddress = EthereumAddress("0xe22b8979739D724343bd002F9f432F5990879901")!
44+
// let ksData = getKeystoreData()
45+
// let tempKeystore = EthereumKeystoreV3(ksData!)
46+
// let keystoreManager = KeystoreManager([tempKeystore!])
47+
// web3.addKeystoreManager(keystoreManager)
48+
//
49+
// var tx = web3.eth.sendETH(to: sendToAddress, amount: 1000)
50+
// tx!.transactionOptions.from = tempKeystore!.addresses!.first!
51+
// var result = try! tx!.send(password: "web3swift")
52+
// let newNonce = result.transaction.nonce
53+
// sleep(1)
54+
// let hookNewNonce = middleware.nonceLookups[tempKeystore!.addresses!.first!]!
55+
// XCTAssertEqual(newNonce, hookNewNonce)
56+
//
57+
// tx = web3.eth.sendETH(to: sendToAddress, amount: 1000)
58+
// tx!.transactionOptions.from = tempKeystore!.addresses!.first!
59+
// result = try! tx!.send(password: "web3swift")
60+
// sleep(1)
61+
// let newNonce2 = result.transaction.nonce
62+
// let hookNewNonce2 = middleware.nonceLookups[tempKeystore!.addresses!.first!]!
63+
// XCTAssert(newNonce2 == hookNewNonce2)
64+
// }
6565

6666

6767
func getKeystoreData() -> Data? {

0 commit comments

Comments
 (0)