Skip to content

Commit

Permalink
Release 0.17.1
Browse files Browse the repository at this point in the history
  • Loading branch information
SwenVanZanten committed Mar 7, 2019
1 parent cdfa5a4 commit 362cc92
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ github "danielgindi/Charts" ~> 3.2.1
github "JohnEstropia/CoreStore" >= 5.0.0
github "xmartlabs/Eureka" ~> 4.3
github "krzyzanowskim/CryptoSwift"
binary "https://vergecurrency.github.io/BitcoinKit/BitcoinKit.json" == 1.1.2
binary "https://vergecurrency.github.io/BitcoinKit/BitcoinKit.json" == 1.1.3
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
binary "https://icepa.github.io/Tor.framework/Tor.json" "305.8.1"
binary "https://vergecurrency.github.io/BitcoinKit/BitcoinKit.json" "1.1.2"
binary "https://vergecurrency.github.io/BitcoinKit/BitcoinKit.json" "1.1.3"
github "HamzaGhazouani/HGPlaceholders" "0.4.0"
github "JohnEstropia/CoreStore" "6.2.1"
github "SwiftyJSON/SwiftyJSON" "4.2.0"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<p align="center">
<a href="https://travis-ci.org/vergecurrency/vIOS" target="_blank"><img src="https://travis-ci.org/vergecurrency/vIOS.svg?branch=master"></a>
<img src="https://img.shields.io/badge/status-beta-yellow.svg">
<img src="https://img.shields.io/badge/latest build-0.17-lightgrey.svg">
<img src="https://img.shields.io/badge/latest build-0.17.1-lightgrey.svg">
<img src="https://img.shields.io/badge/iOS-^11.4-green.svg">
<img src="https://img.shields.io/badge/license-MIT-blue.svg">
</p>
Expand Down
2 changes: 2 additions & 0 deletions VergeiOS.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2145,6 +2145,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CF_BUNDLE_SHORT_VERSION_STRING = 0.17.1;
CODE_SIGN_ENTITLEMENTS = VergeiOS/Assets/VergeiOS.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 0.1;
Expand Down Expand Up @@ -2172,6 +2173,7 @@
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CF_BUNDLE_SHORT_VERSION_STRING = 0.17.1;
CODE_SIGN_ENTITLEMENTS = VergeiOS/Assets/VergeiOS.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 0.1;
Expand Down
15 changes: 15 additions & 0 deletions VergeiOS/Extensions/UIAlertController+Statics.swift
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,19 @@ extension UIAlertController {

return alert
}

static func createStartTorActionSheet() -> UIAlertController {
let actionSheet = UIAlertController(
title: "Tor is not activated",
message: "Do you want to send this transaction without Tor obfuscating your IP? " +
"Or do you want to start Tor and hide your identity?",
preferredStyle: .actionSheet
)

actionSheet.addAction(UIAlertAction(title: "Start Tor", style: .default))
actionSheet.addAction(UIAlertAction(title: "Without Tor", style: .destructive))
actionSheet.addAction(UIAlertAction(title: "Cancel", style: .cancel))

return actionSheet
}
}
3 changes: 0 additions & 3 deletions VergeiOS/Http/TorClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,12 @@ class TorClient {

self.controller?.authenticate(with: cookie) { success, error in
if let error = error {
NotificationCenter.default.post(name: .errorDuringTorConnection, object: error)

return print(error.localizedDescription)
}

var observer: Any? = nil
observer = self.controller?.addObserver(forCircuitEstablished: { established in
guard established else {
NotificationCenter.default.post(name: .errorDuringTorConnection, object: error)
return
}

Expand Down
10 changes: 9 additions & 1 deletion VergeiOS/Wallet/WalletClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ public class WalletClient {

private func getUnsignedTx(txp: TxProposalResponse) throws -> UnsignedTransaction {
let changeAddress: Address = try AddressFactory.create(txp.changeAddress.address)
let toAddress: Address = try AddressFactory.create(txp.outputs.first!.toAddress)
let toAddress: Address = try getToAddress(address: txp.outputs.first!.toAddress)

let unspentOutputs = txp.inputs
let unspentTransactions: [UnspentTransaction] = try unspentOutputs.map { output in
Expand Down Expand Up @@ -692,4 +692,12 @@ public class WalletClient {

return hexes
}

private func getToAddress(address: String) throws -> Address {
do {
return try AddressFactory.create(address)
} catch {
return try StealthAddress(address)
}
}
}

0 comments on commit 362cc92

Please sign in to comment.