From 47021be7b2c21d6e43011a26b323ffd992595d85 Mon Sep 17 00:00:00 2001 From: BaldyAsh Date: Wed, 17 Oct 2018 18:10:20 +0300 Subject: [PATCH 1/4] deleted red folders --- web3swift.xcodeproj/project.pbxproj | 32 ----------------------------- 1 file changed, 32 deletions(-) diff --git a/web3swift.xcodeproj/project.pbxproj b/web3swift.xcodeproj/project.pbxproj index efef69d14..02c6f2a0d 100755 --- a/web3swift.xcodeproj/project.pbxproj +++ b/web3swift.xcodeproj/project.pbxproj @@ -467,7 +467,6 @@ 81FECD43211ADE20006DA367 /* ObjectiveCbridge */, 0073F22320D949D7000791F1 /* BlockExplorer */, 81A1821220D5A2430016741F /* Promises */, - 81FB2204207BCFD9007F9A83 /* Resources */, 81C5DA082072542300424CD6 /* ABIv2 */, 81C0FCED20440BDF00D82FAF /* HookedFunctions */, 81C0FCEA20440BB400D82FAF /* Web3 */, @@ -613,25 +612,9 @@ path = ERC20; sourceTree = ""; }; - 8159C50721343EDD00197B91 /* ERC721 */ = { - isa = PBXGroup; - children = ( - ); - path = ERC721; - sourceTree = ""; - }; - 8159C50821343EED00197B91 /* PrivateKeyControlledAccount */ = { - isa = PBXGroup; - children = ( - ); - path = PrivateKeyControlledAccount; - sourceTree = ""; - }; 8159C50921343EF900197B91 /* PrecompiledContracts */ = { isa = PBXGroup; children = ( - 8159C50821343EED00197B91 /* PrivateKeyControlledAccount */, - 8159C50721343EDD00197B91 /* ERC721 */, 8159C50621343ED300197B91 /* ERC20 */, ); path = PrecompiledContracts; @@ -793,21 +776,6 @@ path = Classes; sourceTree = ""; }; - 81FB2204207BCFD9007F9A83 /* Resources */ = { - isa = PBXGroup; - children = ( - 81FB2205207BCFE4007F9A83 /* Classes */, - ); - path = Resources; - sourceTree = ""; - }; - 81FB2205207BCFE4007F9A83 /* Classes */ = { - isa = PBXGroup; - children = ( - ); - path = Classes; - sourceTree = ""; - }; 81FECD43211ADE20006DA367 /* ObjectiveCbridge */ = { isa = PBXGroup; children = ( From d6a710c60c4aa51495c112ef47e134c12c30e7c5 Mon Sep 17 00:00:00 2001 From: BaldyAsh Date: Wed, 17 Oct 2018 19:50:31 +0300 Subject: [PATCH 2/4] started erc721 --- web3swift.xcodeproj/project.pbxproj | 12 ++ .../ERC721/Web3+ERC721.swift | 204 ++++++++++++++++++ 2 files changed, 216 insertions(+) create mode 100644 web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift diff --git a/web3swift.xcodeproj/project.pbxproj b/web3swift.xcodeproj/project.pbxproj index 02c6f2a0d..2034d498d 100755 --- a/web3swift.xcodeproj/project.pbxproj +++ b/web3swift.xcodeproj/project.pbxproj @@ -209,6 +209,7 @@ E23B5AE320EA69B900DC7F32 /* web3swift_numberFormattingUtil_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E23B5AE220EA69B900DC7F32 /* web3swift_numberFormattingUtil_Tests.swift */; }; E23B5AE520EA6A0A00DC7F32 /* web3swift_contractV2_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = E23B5AE420EA6A0A00DC7F32 /* web3swift_contractV2_Tests.swift */; }; E2C590762152835400FF53D3 /* JSONRPCrequestDispatcher+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2C590752152835400FF53D3 /* JSONRPCrequestDispatcher+ObjC.swift */; }; + E2E94C60217788E0005F54A0 /* Web3+ERC721.swift in Sources */ = {isa = PBXBuildFile; fileRef = E2E94C5F217788E0005F54A0 /* Web3+ERC721.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -376,6 +377,7 @@ E23B5AE220EA69B900DC7F32 /* web3swift_numberFormattingUtil_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = web3swift_numberFormattingUtil_Tests.swift; sourceTree = ""; }; E23B5AE420EA6A0A00DC7F32 /* web3swift_contractV2_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = web3swift_contractV2_Tests.swift; sourceTree = ""; }; E2C590752152835400FF53D3 /* JSONRPCrequestDispatcher+ObjC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "JSONRPCrequestDispatcher+ObjC.swift"; sourceTree = ""; }; + E2E94C5F217788E0005F54A0 /* Web3+ERC721.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3+ERC721.swift"; sourceTree = ""; }; FB43EC035C593F9E5A3644B6 /* Pods-web3swift-macOS.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-web3swift-macOS.debug.xcconfig"; path = "Pods/Target Support Files/Pods-web3swift-macOS/Pods-web3swift-macOS.debug.xcconfig"; sourceTree = ""; }; FC1E6C115639177F2629E42A /* Pods_web3swift_osx.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_web3swift_osx.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ @@ -615,6 +617,7 @@ 8159C50921343EF900197B91 /* PrecompiledContracts */ = { isa = PBXGroup; children = ( + E2E94C5E2177886C005F54A0 /* ERC721 */, 8159C50621343ED300197B91 /* ERC20 */, ); path = PrecompiledContracts; @@ -815,6 +818,14 @@ name = Pods; sourceTree = ""; }; + E2E94C5E2177886C005F54A0 /* ERC721 */ = { + isa = PBXGroup; + children = ( + E2E94C5F217788E0005F54A0 /* Web3+ERC721.swift */, + ); + path = ERC721; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -1095,6 +1106,7 @@ 817EBB122004FE2F00E02EAA /* BIP32HDNode.swift in Sources */, 8113D2C41FD7E1590074282C /* CryptoExtensions.swift in Sources */, 81A1822220D678060016741F /* Promise+Web3+Eth+GetBlockNumber.swift in Sources */, + E2E94C60217788E0005F54A0 /* Web3+ERC721.swift in Sources */, 81C5DA252072E14E00424CD6 /* ABIv2Encoding.swift in Sources */, 81A1824220D7AA750016741F /* Promise+Web3+Eth+SendTransaction.swift in Sources */, 817EBB2920075D2E00E02EAA /* BIP39.swift in Sources */, diff --git a/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift b/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift new file mode 100644 index 000000000..b12555819 --- /dev/null +++ b/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift @@ -0,0 +1,204 @@ +// +// Web3+ERC721.swift +// web3swift-iOS +// +// Created by Anton Grigorev on 17.10.2018. +// Copyright © 2018 The Matter Inc. All rights reserved. +// + +import Foundation +import BigInt +import Result + +// This namespace contains functions to work with ERC721 tokens. +// variables are lazyly evaluated or global token information (name, ticker, total supply) +// can be imperatively read and saved +class ERC721 { + private var _name: String? = nil + private var _symbol: String? = nil + private var _tokenId: BigUInt? = nil + private var _tokenURI: String? = nil + private var _owner: EthereumAddress? = nil + private var _hasReadProperties: Bool = false + + public var options: Web3Options + public var web3: web3 + public var provider: Web3Provider + public var address: EthereumAddress + + lazy var contract: web3.web3contract = { + let contract = self.web3.contract(Web3.Utils.erc721ABI, at: self.address, abiVersion: 2) + precondition(contract != nil) + return contract! + }() + + public init(web3: web3, provider: Web3Provider, address: EthereumAddress) { + self.web3 = web3 + self.provider = provider + self.address = address + var mergedOptions = web3.options + mergedOptions.to = address + self.options = mergedOptions + } + + public var name: String { + self.readProperties() + if self._name != nil { + return self._name! + } + return "" + } + + public var symbol: String { + self.readProperties() + if self._symbol != nil { + return self._symbol! + } + return "" + } + + public var tokenId: BigUInt { + self.readProperties() + if self._tokenId != nil { + return self._tokenId! + } + return 0 + } + + public var tokenURI: String { + self.readProperties() + if self._tokenURI != nil { + return self._tokenURI! + } + return "" + } + + public func readProperties() { + if self._hasReadProperties { + return + } + defer { self._hasReadProperties = true } + let contract = self.contract + guard contract.contract.address != nil else {return} + guard let nameResult = contract.method("name", parameters: [] as [AnyObject], extraData: Data(), options: self.options)?.call(options: nil, onBlock: "latest") else {return} + switch nameResult { + case .success(let returned): + guard let res = returned["0"] as? String else {break} + self._name = res + default: + self._name = "" + } + + guard let symbol = contract.method("symbol", parameters: [] as [AnyObject], extraData: Data(), options: self.options)?.call(options: nil, onBlock: "latest") else {return} + switch symbol { + case .success(let returned): + guard let res = returned["0"] as? String else {break} + self._symbol = res + default: + self._symbol = "" + } + + guard let tokenId = contract.method("tokenId", parameters: [] as [AnyObject], extraData: Data(), options: self.options)?.call(options: nil, onBlock: "latest") else {return} + switch tokenId { + case .success(let returned): + guard let res = returned["0"] as? BigUInt else {break} + self._tokenId = res + default: + self._tokenId = 0 + } + + guard let tokenURI = contract.method("tokenURI", parameters: [_tokenId] as [AnyObject], extraData: Data(), options: self.options)?.call(options: nil, onBlock: "latest") else {return} + switch tokenURI { + case .success(let returned): + guard let res = returned["0"] as? String else {return} + self._tokenURI = res + default: + self._tokenURI = "" + } + } + + func getBalance(account: EthereumAddress) -> Result { + let contract = self.contract + let result = contract.method("balanceOf", parameters: [account] as [AnyObject], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") + switch result { + case .success(let returned): + guard let res = returned["0"] as? BigUInt else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))} + return Result(res) + case .failure(let error): + return Result.failure(error) + } + } + + func getOwner(tokenId: BigUInt) -> Result { + let contract = self.contract + let result = contract.method("ownerOf", parameters: [account] as [tokenId], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") + switch result { + case .success(let returned): + guard let res = returned["0"] as? EthereumAddress else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))} + return Result(res) + case .failure(let error): + return Result.failure(error) + } + } + +// func getAllowance(originalOwner: EthereumAddress, delegate: EthereumAddress) -> Result { +// let contract = self.contract +// let result = contract.method("allowance", parameters: [originalOwner, delegate] as [AnyObject], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") +// switch result { +// case .success(let returned): +// guard let res = returned["0"] as? BigUInt else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))} +// return Result(res) +// case .failure(let error): +// return Result.failure(error) +// } +// } + + func transfer(from: EthereumAddress, to: EthereumAddress, tokenId: BigUInt) -> Result { + let contract = self.contract + var basicOptions = Web3Options() + basicOptions.from = from + basicOptions.to = self.address + + let intermediateToSend = contract.method("transfer", parameters: [to, tokenId] as [AnyObject], options: basicOptions)! + return Result(intermediateToSend) + } + + func transferFrom(from: EthereumAddress, to: EthereumAddress, originalOwner: EthereumAddress, tokenId: BigUInt) -> Result { + let contract = self.contract + var basicOptions = Web3Options() + basicOptions.from = from + basicOptions.to = self.address + + let intermediateToSend = contract.method("transferFrom", parameters: [originalOwner, to, tokenId] as [AnyObject], options: basicOptions)! + return Result(intermediateToSend) + } + +// func setAllowance(from: EthereumAddress, to: EthereumAddress, newAmount: String) -> Result { +// let contract = self.contract +// var basicOptions = Web3Options() +// basicOptions.from = from +// basicOptions.to = self.address +// +// // get the decimals manually +// let intermediate = contract.method("setAllowance", options: basicOptions)! +// let callResult = intermediate.call(options: basicOptions, onBlock: "latest") +// var decimals = BigUInt(0) +// switch callResult { +// case .success(let response): +// guard let dec = response["0"], let decTyped = dec as? BigUInt else { +// return Result.failure(Web3Error.inputError(desc: "Contract may be not ERC20 compatible, can not get decimals"))} +// decimals = decTyped +// break +// case .failure(let error): +// return Result.failure(error) +// } +// let intDecimals = Int(decimals) +// guard let value = Web3.Utils.parseToBigUInt(newAmount, decimals: intDecimals) else { +// return Result.failure(Web3Error.inputError(desc: "Can not parse inputted amount")) +// } +// let intermediateToSend = contract.method("setAllowance", parameters: [to, value] as [AnyObject], options: basicOptions)! +// return Result(intermediateToSend) +// } + + +} From 568ec5d18c59a97b515516918f77f691cd6227c5 Mon Sep 17 00:00:00 2001 From: BaldyAsh Date: Wed, 17 Oct 2018 20:01:43 +0300 Subject: [PATCH 3/4] finished erc721 --- .../ERC721/Web3+ERC721.swift | 76 +++++++++---------- 1 file changed, 35 insertions(+), 41 deletions(-) diff --git a/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift b/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift index b12555819..8cfe4890a 100644 --- a/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift +++ b/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift @@ -11,14 +11,12 @@ import BigInt import Result // This namespace contains functions to work with ERC721 tokens. -// variables are lazyly evaluated or global token information (name, ticker, total supply) // can be imperatively read and saved class ERC721 { private var _name: String? = nil private var _symbol: String? = nil private var _tokenId: BigUInt? = nil private var _tokenURI: String? = nil - private var _owner: EthereumAddress? = nil private var _hasReadProperties: Bool = false public var options: Web3Options @@ -141,17 +139,41 @@ class ERC721 { } } -// func getAllowance(originalOwner: EthereumAddress, delegate: EthereumAddress) -> Result { -// let contract = self.contract -// let result = contract.method("allowance", parameters: [originalOwner, delegate] as [AnyObject], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") -// switch result { -// case .success(let returned): -// guard let res = returned["0"] as? BigUInt else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))} -// return Result(res) -// case .failure(let error): -// return Result.failure(error) -// } -// } + func getApproved(tokenId: BigUInt) -> Result { + let contract = self.contract + let result = contract.method("getApproved", parameters: [account] as [tokenId], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") + switch result { + case .success(let returned): + guard let res = returned["0"] as? EthereumAddress else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))} + return Result(res) + case .failure(let error): + return Result.failure(error) + } + } + + func tokenByIndex(index: BigUInt) -> Result { + let contract = self.contract + let result = contract.method("tokenByIndex", parameters: [account] as [index], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") + switch result { + case .success(let returned): + guard let res = returned["0"] as? BigUInt else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))} + return Result(res) + case .failure(let error): + return Result.failure(error) + } + } + + func tokenOfOwnerByIndex(owner: EthereumAddress, index: BigUInt) -> Result { + let contract = self.contract + let result = contract.method("tokenOfOwnerByIndex", parameters: [account] as [owner, index], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") + switch result { + case .success(let returned): + guard let res = returned["0"] as? BigUInt else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))} + return Result(res) + case .failure(let error): + return Result.failure(error) + } + } func transfer(from: EthereumAddress, to: EthereumAddress, tokenId: BigUInt) -> Result { let contract = self.contract @@ -173,32 +195,4 @@ class ERC721 { return Result(intermediateToSend) } -// func setAllowance(from: EthereumAddress, to: EthereumAddress, newAmount: String) -> Result { -// let contract = self.contract -// var basicOptions = Web3Options() -// basicOptions.from = from -// basicOptions.to = self.address -// -// // get the decimals manually -// let intermediate = contract.method("setAllowance", options: basicOptions)! -// let callResult = intermediate.call(options: basicOptions, onBlock: "latest") -// var decimals = BigUInt(0) -// switch callResult { -// case .success(let response): -// guard let dec = response["0"], let decTyped = dec as? BigUInt else { -// return Result.failure(Web3Error.inputError(desc: "Contract may be not ERC20 compatible, can not get decimals"))} -// decimals = decTyped -// break -// case .failure(let error): -// return Result.failure(error) -// } -// let intDecimals = Int(decimals) -// guard let value = Web3.Utils.parseToBigUInt(newAmount, decimals: intDecimals) else { -// return Result.failure(Web3Error.inputError(desc: "Can not parse inputted amount")) -// } -// let intermediateToSend = contract.method("setAllowance", parameters: [to, value] as [AnyObject], options: basicOptions)! -// return Result(intermediateToSend) -// } - - } From bf7538dd9a5257735b939e7ddefce9e0389bee8e Mon Sep 17 00:00:00 2001 From: BaldyAsh Date: Wed, 17 Oct 2018 20:05:52 +0300 Subject: [PATCH 4/4] fixed erc721 and updated pods --- Podfile.lock | 8 ++++---- Pods/Headers/Public/BigInt/BigInt-iOS-umbrella.h | 2 +- Pods/Headers/Public/BigInt/BigInt-iOS.modulemap | 2 +- Pods/Headers/Public/BigInt/BigInt-macOS-umbrella.h | 2 +- Pods/Headers/Public/BigInt/BigInt-macOS.modulemap | 2 +- .../Headers/Public/CryptoSwift/CryptoSwift-iOS-umbrella.h | 2 +- Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS.modulemap | 2 +- .../Public/CryptoSwift/CryptoSwift-macOS-umbrella.h | 2 +- .../Public/CryptoSwift/CryptoSwift-macOS.modulemap | 2 +- Pods/Headers/Public/PromiseKit/PromiseKit-umbrella.h | 2 +- Pods/Headers/Public/PromiseKit/PromiseKit.modulemap | 2 +- .../PromiseKit.root-CorePromise-Foundation-umbrella.h | 2 +- .../PromiseKit.root-CorePromise-Foundation.modulemap | 2 +- Pods/Headers/Public/Result/Result-iOS-umbrella.h | 2 +- Pods/Headers/Public/Result/Result-iOS.modulemap | 2 +- Pods/Headers/Public/Result/Result-macOS-umbrella.h | 2 +- Pods/Headers/Public/Result/Result-macOS.modulemap | 2 +- Pods/Headers/Public/SipHash/SipHash-iOS-umbrella.h | 2 +- Pods/Headers/Public/SipHash/SipHash-iOS.modulemap | 2 +- Pods/Headers/Public/SipHash/SipHash-macOS-umbrella.h | 2 +- Pods/Headers/Public/SipHash/SipHash-macOS.modulemap | 2 +- Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS-umbrella.h | 2 +- Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS.modulemap | 2 +- Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS-umbrella.h | 2 +- Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS.modulemap | 2 +- Pods/Headers/Public/scrypt/scrypt-iOS-umbrella.h | 2 +- Pods/Headers/Public/scrypt/scrypt-iOS.modulemap | 2 +- Pods/Headers/Public/scrypt/scrypt-macOS-umbrella.h | 2 +- Pods/Headers/Public/scrypt/scrypt-macOS.modulemap | 2 +- .../Public/secp256k1_swift/secp256k1_swift-iOS-umbrella.h | 2 +- .../Public/secp256k1_swift/secp256k1_swift-iOS.modulemap | 2 +- .../secp256k1_swift/secp256k1_swift-macOS-umbrella.h | 2 +- .../secp256k1_swift/secp256k1_swift-macOS.modulemap | 2 +- Pods/Manifest.lock | 8 ++++---- Pods/secp256k1_swift/Classes/secp256k1.swift | 4 ++-- web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift | 8 ++++---- 36 files changed, 46 insertions(+), 46 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index 6fb4da11f..2b73ac7d2 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -14,7 +14,7 @@ PODS: - Result (4.0.0) - scrypt (2.0): - CryptoSwift (~> 0.11) - - secp256k1_swift (1.0.2) + - secp256k1_swift (1.0.3) - SipHash (1.2.2) - SwiftRLP (1.0.1): - BigInt (~> 3.1) @@ -25,7 +25,7 @@ DEPENDENCIES: - PromiseKit (~> 6.4.1) - Result (~> 4.0) - scrypt (~> 2.0) - - secp256k1_swift (~> 1.0.2) + - secp256k1_swift (~> 1.0.3) - SwiftRLP (~> 1.0.1) SPEC REPOS: @@ -45,10 +45,10 @@ SPEC CHECKSUMS: PromiseKit: 4c76a6506638034e3d7bede97b2ff7743f7bd2dc Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713 scrypt: 3fe5b1a3b0976f97cd87488673a8f7c65708cc84 - secp256k1_swift: 1e6ac4ee77fbef7f97f87e096a918a1248b8c4f6 + secp256k1_swift: 4fc5c4b2d2c6d21ee8ccb868cdc92da12f38bed9 SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4 SwiftRLP: 9de2c9512a9a6bf0909cd84cc143a7ff1aff7820 -PODFILE CHECKSUM: bce98dcdfceae57faa2cd3bcb3d595f16beaad0b +PODFILE CHECKSUM: c1d9470cb065e1f6c00709092108f522105e869f COCOAPODS: 1.6.0.beta.1 diff --git a/Pods/Headers/Public/BigInt/BigInt-iOS-umbrella.h b/Pods/Headers/Public/BigInt/BigInt-iOS-umbrella.h index d04d0f479..54c439564 120000 --- a/Pods/Headers/Public/BigInt/BigInt-iOS-umbrella.h +++ b/Pods/Headers/Public/BigInt/BigInt-iOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/BigInt-iOS/BigInt-iOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/BigInt-iOS/BigInt-iOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/BigInt/BigInt-iOS.modulemap b/Pods/Headers/Public/BigInt/BigInt-iOS.modulemap index 5e3ba93be..5827ffd6f 120000 --- a/Pods/Headers/Public/BigInt/BigInt-iOS.modulemap +++ b/Pods/Headers/Public/BigInt/BigInt-iOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/BigInt-iOS/BigInt-iOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/BigInt-iOS/BigInt-iOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/BigInt/BigInt-macOS-umbrella.h b/Pods/Headers/Public/BigInt/BigInt-macOS-umbrella.h index 7c100fb6e..15cd9101e 120000 --- a/Pods/Headers/Public/BigInt/BigInt-macOS-umbrella.h +++ b/Pods/Headers/Public/BigInt/BigInt-macOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/BigInt-macOS/BigInt-macOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/BigInt-macOS/BigInt-macOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/BigInt/BigInt-macOS.modulemap b/Pods/Headers/Public/BigInt/BigInt-macOS.modulemap index 309999e26..db0458375 120000 --- a/Pods/Headers/Public/BigInt/BigInt-macOS.modulemap +++ b/Pods/Headers/Public/BigInt/BigInt-macOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/BigInt-macOS/BigInt-macOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/BigInt-macOS/BigInt-macOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS-umbrella.h b/Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS-umbrella.h index 53d6c211e..38ee2e270 120000 --- a/Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS-umbrella.h +++ b/Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/CryptoSwift-iOS/CryptoSwift-iOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/CryptoSwift-iOS/CryptoSwift-iOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS.modulemap b/Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS.modulemap index c3e3c3a34..d3c8afa43 120000 --- a/Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS.modulemap +++ b/Pods/Headers/Public/CryptoSwift/CryptoSwift-iOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/CryptoSwift-iOS/CryptoSwift-iOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/CryptoSwift-iOS/CryptoSwift-iOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/CryptoSwift/CryptoSwift-macOS-umbrella.h b/Pods/Headers/Public/CryptoSwift/CryptoSwift-macOS-umbrella.h index 1bf7d4d73..4f6598359 120000 --- a/Pods/Headers/Public/CryptoSwift/CryptoSwift-macOS-umbrella.h +++ b/Pods/Headers/Public/CryptoSwift/CryptoSwift-macOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/CryptoSwift-macOS/CryptoSwift-macOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/CryptoSwift-macOS/CryptoSwift-macOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/CryptoSwift/CryptoSwift-macOS.modulemap b/Pods/Headers/Public/CryptoSwift/CryptoSwift-macOS.modulemap index 19cb03653..13bb9bda2 120000 --- a/Pods/Headers/Public/CryptoSwift/CryptoSwift-macOS.modulemap +++ b/Pods/Headers/Public/CryptoSwift/CryptoSwift-macOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/CryptoSwift-macOS/CryptoSwift-macOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/CryptoSwift-macOS/CryptoSwift-macOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/PromiseKit/PromiseKit-umbrella.h b/Pods/Headers/Public/PromiseKit/PromiseKit-umbrella.h index 54a39550a..384f088cd 120000 --- a/Pods/Headers/Public/PromiseKit/PromiseKit-umbrella.h +++ b/Pods/Headers/Public/PromiseKit/PromiseKit-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/PromiseKit/PromiseKit-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/PromiseKit/PromiseKit-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/PromiseKit/PromiseKit.modulemap b/Pods/Headers/Public/PromiseKit/PromiseKit.modulemap index 03e17826b..5b105d963 120000 --- a/Pods/Headers/Public/PromiseKit/PromiseKit.modulemap +++ b/Pods/Headers/Public/PromiseKit/PromiseKit.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/PromiseKit/PromiseKit.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/PromiseKit/PromiseKit.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/PromiseKit/PromiseKit.root-CorePromise-Foundation-umbrella.h b/Pods/Headers/Public/PromiseKit/PromiseKit.root-CorePromise-Foundation-umbrella.h index 2202ae821..6026bec84 120000 --- a/Pods/Headers/Public/PromiseKit/PromiseKit.root-CorePromise-Foundation-umbrella.h +++ b/Pods/Headers/Public/PromiseKit/PromiseKit.root-CorePromise-Foundation-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/PromiseKit.root-CorePromise-Foundation/PromiseKit.root-CorePromise-Foundation-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/PromiseKit.root-CorePromise-Foundation/PromiseKit.root-CorePromise-Foundation-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/PromiseKit/PromiseKit.root-CorePromise-Foundation.modulemap b/Pods/Headers/Public/PromiseKit/PromiseKit.root-CorePromise-Foundation.modulemap index 377be965b..515bc96ce 120000 --- a/Pods/Headers/Public/PromiseKit/PromiseKit.root-CorePromise-Foundation.modulemap +++ b/Pods/Headers/Public/PromiseKit/PromiseKit.root-CorePromise-Foundation.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/PromiseKit.root-CorePromise-Foundation/PromiseKit.root-CorePromise-Foundation.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/PromiseKit.root-CorePromise-Foundation/PromiseKit.root-CorePromise-Foundation.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/Result/Result-iOS-umbrella.h b/Pods/Headers/Public/Result/Result-iOS-umbrella.h index a7f847b9e..5017bcc62 120000 --- a/Pods/Headers/Public/Result/Result-iOS-umbrella.h +++ b/Pods/Headers/Public/Result/Result-iOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/Result-iOS/Result-iOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/Result-iOS/Result-iOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/Result/Result-iOS.modulemap b/Pods/Headers/Public/Result/Result-iOS.modulemap index bc4f23ca4..a9cb518ea 120000 --- a/Pods/Headers/Public/Result/Result-iOS.modulemap +++ b/Pods/Headers/Public/Result/Result-iOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/Result-iOS/Result-iOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/Result-iOS/Result-iOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/Result/Result-macOS-umbrella.h b/Pods/Headers/Public/Result/Result-macOS-umbrella.h index 5c92b47bc..d933679ed 120000 --- a/Pods/Headers/Public/Result/Result-macOS-umbrella.h +++ b/Pods/Headers/Public/Result/Result-macOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/Result-macOS/Result-macOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/Result-macOS/Result-macOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/Result/Result-macOS.modulemap b/Pods/Headers/Public/Result/Result-macOS.modulemap index a1725381e..6ff87c94a 120000 --- a/Pods/Headers/Public/Result/Result-macOS.modulemap +++ b/Pods/Headers/Public/Result/Result-macOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/Result-macOS/Result-macOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/Result-macOS/Result-macOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/SipHash/SipHash-iOS-umbrella.h b/Pods/Headers/Public/SipHash/SipHash-iOS-umbrella.h index 909a01c80..736829e4f 120000 --- a/Pods/Headers/Public/SipHash/SipHash-iOS-umbrella.h +++ b/Pods/Headers/Public/SipHash/SipHash-iOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/SipHash-iOS/SipHash-iOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/SipHash-iOS/SipHash-iOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/SipHash/SipHash-iOS.modulemap b/Pods/Headers/Public/SipHash/SipHash-iOS.modulemap index 60dbe3748..363bde1c4 120000 --- a/Pods/Headers/Public/SipHash/SipHash-iOS.modulemap +++ b/Pods/Headers/Public/SipHash/SipHash-iOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/SipHash-iOS/SipHash-iOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/SipHash-iOS/SipHash-iOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/SipHash/SipHash-macOS-umbrella.h b/Pods/Headers/Public/SipHash/SipHash-macOS-umbrella.h index b1f95e224..c56e6a45b 120000 --- a/Pods/Headers/Public/SipHash/SipHash-macOS-umbrella.h +++ b/Pods/Headers/Public/SipHash/SipHash-macOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/SipHash-macOS/SipHash-macOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/SipHash-macOS/SipHash-macOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/SipHash/SipHash-macOS.modulemap b/Pods/Headers/Public/SipHash/SipHash-macOS.modulemap index 5ea25fc9c..835353525 120000 --- a/Pods/Headers/Public/SipHash/SipHash-macOS.modulemap +++ b/Pods/Headers/Public/SipHash/SipHash-macOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/SipHash-macOS/SipHash-macOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/SipHash-macOS/SipHash-macOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS-umbrella.h b/Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS-umbrella.h index b1b552e68..b77347325 120000 --- a/Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS-umbrella.h +++ b/Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/SwiftRLP-iOS/SwiftRLP-iOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/SwiftRLP-iOS/SwiftRLP-iOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS.modulemap b/Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS.modulemap index 0842d08e1..ae407f989 120000 --- a/Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS.modulemap +++ b/Pods/Headers/Public/SwiftRLP/SwiftRLP-iOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/SwiftRLP-iOS/SwiftRLP-iOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/SwiftRLP-iOS/SwiftRLP-iOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS-umbrella.h b/Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS-umbrella.h index b77715c02..4740a4f84 120000 --- a/Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS-umbrella.h +++ b/Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/SwiftRLP-macOS/SwiftRLP-macOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/SwiftRLP-macOS/SwiftRLP-macOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS.modulemap b/Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS.modulemap index c5cebdd37..d1421e204 120000 --- a/Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS.modulemap +++ b/Pods/Headers/Public/SwiftRLP/SwiftRLP-macOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/SwiftRLP-macOS/SwiftRLP-macOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/SwiftRLP-macOS/SwiftRLP-macOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/scrypt/scrypt-iOS-umbrella.h b/Pods/Headers/Public/scrypt/scrypt-iOS-umbrella.h index e82a48440..1c81cd5a7 120000 --- a/Pods/Headers/Public/scrypt/scrypt-iOS-umbrella.h +++ b/Pods/Headers/Public/scrypt/scrypt-iOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/scrypt-iOS/scrypt-iOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/scrypt-iOS/scrypt-iOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/scrypt/scrypt-iOS.modulemap b/Pods/Headers/Public/scrypt/scrypt-iOS.modulemap index 082fbbbba..02bd8338d 120000 --- a/Pods/Headers/Public/scrypt/scrypt-iOS.modulemap +++ b/Pods/Headers/Public/scrypt/scrypt-iOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/scrypt-iOS/scrypt-iOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/scrypt-iOS/scrypt-iOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/scrypt/scrypt-macOS-umbrella.h b/Pods/Headers/Public/scrypt/scrypt-macOS-umbrella.h index 7a0dabd86..75f99866d 120000 --- a/Pods/Headers/Public/scrypt/scrypt-macOS-umbrella.h +++ b/Pods/Headers/Public/scrypt/scrypt-macOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/scrypt-macOS/scrypt-macOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/scrypt-macOS/scrypt-macOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/scrypt/scrypt-macOS.modulemap b/Pods/Headers/Public/scrypt/scrypt-macOS.modulemap index 9ec4c6ed1..2e33aed25 120000 --- a/Pods/Headers/Public/scrypt/scrypt-macOS.modulemap +++ b/Pods/Headers/Public/scrypt/scrypt-macOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/scrypt-macOS/scrypt-macOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/scrypt-macOS/scrypt-macOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-iOS-umbrella.h b/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-iOS-umbrella.h index 554c654f1..70cc63a67 120000 --- a/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-iOS-umbrella.h +++ b/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-iOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/secp256k1_swift-iOS/secp256k1_swift-iOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/secp256k1_swift-iOS/secp256k1_swift-iOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-iOS.modulemap b/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-iOS.modulemap index 44829fb84..c5b6fa265 120000 --- a/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-iOS.modulemap +++ b/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-iOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/secp256k1_swift-iOS/secp256k1_swift-iOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/secp256k1_swift-iOS/secp256k1_swift-iOS.modulemap \ No newline at end of file diff --git a/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-macOS-umbrella.h b/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-macOS-umbrella.h index 56967ab47..d75b444d6 120000 --- a/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-macOS-umbrella.h +++ b/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-macOS-umbrella.h @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/secp256k1_swift-macOS/secp256k1_swift-macOS-umbrella.h \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/secp256k1_swift-macOS/secp256k1_swift-macOS-umbrella.h \ No newline at end of file diff --git a/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-macOS.modulemap b/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-macOS.modulemap index 0ec25a913..c0e372d55 120000 --- a/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-macOS.modulemap +++ b/Pods/Headers/Public/secp256k1_swift/secp256k1_swift-macOS.modulemap @@ -1 +1 @@ -/Users/alexvlasov/Blockchain/web3swift/web3swift/Pods/Target Support Files/secp256k1_swift-macOS/secp256k1_swift-macOS.modulemap \ No newline at end of file +/Users/antongrigorev/Developer/web3swift/Pods/Target Support Files/secp256k1_swift-macOS/secp256k1_swift-macOS.modulemap \ No newline at end of file diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 6fb4da11f..2b73ac7d2 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -14,7 +14,7 @@ PODS: - Result (4.0.0) - scrypt (2.0): - CryptoSwift (~> 0.11) - - secp256k1_swift (1.0.2) + - secp256k1_swift (1.0.3) - SipHash (1.2.2) - SwiftRLP (1.0.1): - BigInt (~> 3.1) @@ -25,7 +25,7 @@ DEPENDENCIES: - PromiseKit (~> 6.4.1) - Result (~> 4.0) - scrypt (~> 2.0) - - secp256k1_swift (~> 1.0.2) + - secp256k1_swift (~> 1.0.3) - SwiftRLP (~> 1.0.1) SPEC REPOS: @@ -45,10 +45,10 @@ SPEC CHECKSUMS: PromiseKit: 4c76a6506638034e3d7bede97b2ff7743f7bd2dc Result: 7645bb3f50c2ce726dd0ff2fa7b6f42bbe6c3713 scrypt: 3fe5b1a3b0976f97cd87488673a8f7c65708cc84 - secp256k1_swift: 1e6ac4ee77fbef7f97f87e096a918a1248b8c4f6 + secp256k1_swift: 4fc5c4b2d2c6d21ee8ccb868cdc92da12f38bed9 SipHash: fad90a4683e420c52ef28063063dbbce248ea6d4 SwiftRLP: 9de2c9512a9a6bf0909cd84cc143a7ff1aff7820 -PODFILE CHECKSUM: bce98dcdfceae57faa2cd3bcb3d595f16beaad0b +PODFILE CHECKSUM: c1d9470cb065e1f6c00709092108f522105e869f COCOAPODS: 1.6.0.beta.1 diff --git a/Pods/secp256k1_swift/Classes/secp256k1.swift b/Pods/secp256k1_swift/Classes/secp256k1.swift index 07283f85e..80b97b4d8 100755 --- a/Pods/secp256k1_swift/Classes/secp256k1.swift +++ b/Pods/secp256k1_swift/Classes/secp256k1.swift @@ -27,7 +27,7 @@ public struct SECP256K1 { extension SECP256K1 { static let context = secp256k1_context_create(UInt32(SECP256K1_CONTEXT_SIGN|SECP256K1_CONTEXT_VERIFY)) - public static func signForRecovery(hash: Data, privateKey: Data, useExtraEntropy: Bool = true) -> (serializedSignature:Data?, rawSignature: Data?) { + public static func signForRecovery(hash: Data, privateKey: Data, useExtraEntropy: Bool = false) -> (serializedSignature:Data?, rawSignature: Data?) { if (hash.count != 32 || privateKey.count != 32) {return (nil, nil)} if !SECP256K1.verifyPrivateKey(privateKey: privateKey) { return (nil, nil) @@ -198,7 +198,7 @@ extension SECP256K1 { return Data(serializedSignature) } - public static func recoverableSign(hash: Data, privateKey: Data, useExtraEntropy: Bool = false) -> secp256k1_ecdsa_recoverable_signature? { + internal static func recoverableSign(hash: Data, privateKey: Data, useExtraEntropy: Bool = false) -> secp256k1_ecdsa_recoverable_signature? { if (hash.count != 32 || privateKey.count != 32) { return nil } diff --git a/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift b/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift index 8cfe4890a..728a7fed5 100644 --- a/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift +++ b/web3swift/PrecompiledContracts/ERC721/Web3+ERC721.swift @@ -129,7 +129,7 @@ class ERC721 { func getOwner(tokenId: BigUInt) -> Result { let contract = self.contract - let result = contract.method("ownerOf", parameters: [account] as [tokenId], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") + let result = contract.method("ownerOf", parameters: [tokenId] as [AnyObject], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") switch result { case .success(let returned): guard let res = returned["0"] as? EthereumAddress else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))} @@ -141,7 +141,7 @@ class ERC721 { func getApproved(tokenId: BigUInt) -> Result { let contract = self.contract - let result = contract.method("getApproved", parameters: [account] as [tokenId], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") + let result = contract.method("getApproved", parameters: [tokenId] as [AnyObject], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") switch result { case .success(let returned): guard let res = returned["0"] as? EthereumAddress else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))} @@ -153,7 +153,7 @@ class ERC721 { func tokenByIndex(index: BigUInt) -> Result { let contract = self.contract - let result = contract.method("tokenByIndex", parameters: [account] as [index], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") + let result = contract.method("tokenByIndex", parameters: [index] as [AnyObject], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") switch result { case .success(let returned): guard let res = returned["0"] as? BigUInt else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))} @@ -165,7 +165,7 @@ class ERC721 { func tokenOfOwnerByIndex(owner: EthereumAddress, index: BigUInt) -> Result { let contract = self.contract - let result = contract.method("tokenOfOwnerByIndex", parameters: [account] as [owner, index], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") + let result = contract.method("tokenOfOwnerByIndex", parameters: [owner, index] as [AnyObject], extraData: Data(), options: self.options)!.call(options: nil, onBlock: "latest") switch result { case .success(let returned): guard let res = returned["0"] as? BigUInt else {return Result.failure(Web3Error.processingError(desc: "Failed to get result of expected type from the Ethereum node"))}