Added checks if scanned / typed in address is actually the correct type (private / public)

D-32 · D-32 · commit c3aa980d882b · 2014-09-23T18:12:13.000+02:00
diff --git a/BitStore.xcodeproj/project.pbxproj b/BitStore.xcodeproj/project.pbxproj
@@ -87,6 +87,7 @@
 		9A8D3C49195E247800E88A1C /* ShopsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A8D3C48195E247800E88A1C /* ShopsViewController.m */; };
 		9A8D3C50195E248C00E88A1C /* ChangeCurrencyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A8D3C4E195E248C00E88A1C /* ChangeCurrencyViewController.m */; };
 		9A8D3C53195E258600E88A1C /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A8D3C52195E258600E88A1C /* SettingsViewController.m */; };
+		9A91EF7D19D1D1B00011D982 /* BTCAddress+BitStore.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A91EF7C19D1D1B00011D982 /* BTCAddress+BitStore.m */; };
 		9A97A0BD19D058530023C9AD /* piwiktracker.xcdatamodeld in Sources */ = {isa = PBXBuildFile; fileRef = 9A97A0BB19D058530023C9AD /* piwiktracker.xcdatamodeld */; };
 		9A97A0C319D05BBF0023C9AD /* libicucore.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A97A0C219D05BBF0023C9AD /* libicucore.dylib */; };
 		9A97A0C519D05C820023C9AD /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9A97A0C419D05C820023C9AD /* CFNetwork.framework */; };
@@ -279,6 +280,8 @@
 		9A8D3C4E195E248C00E88A1C /* ChangeCurrencyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChangeCurrencyViewController.m; sourceTree = "<group>"; };
 		9A8D3C51195E258600E88A1C /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = "<group>"; };
 		9A8D3C52195E258600E88A1C /* SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsViewController.m; sourceTree = "<group>"; };
+		9A91EF7B19D1D1B00011D982 /* BTCAddress+BitStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "BTCAddress+BitStore.h"; sourceTree = "<group>"; };
+		9A91EF7C19D1D1B00011D982 /* BTCAddress+BitStore.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "BTCAddress+BitStore.m"; sourceTree = "<group>"; };
 		9A97A0BC19D058530023C9AD /* piwiktracker.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = piwiktracker.xcdatamodel; sourceTree = "<group>"; };
 		9A97A0C219D05BBF0023C9AD /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; };
 		9A97A0C419D05C820023C9AD /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
@@ -438,6 +441,8 @@
 		9A265ED71965EE03005BE50A /* Utils */ = {
 			isa = PBXGroup;
 			children = (
+				9A91EF7B19D1D1B00011D982 /* BTCAddress+BitStore.h */,
+				9A91EF7C19D1D1B00011D982 /* BTCAddress+BitStore.m */,
 				9AA466BA1972D82A00A7B562 /* Color.h */,
 				9AA466BB1972D82A00A7B562 /* Color.m */,
 				9AF0C4F5196B3A0200F62DB5 /* iOSFix.h */,
@@ -968,6 +973,7 @@
 				9A67A75C1950D70A001FCE32 /* AddContactViewController.m in Sources */,
 				9A70263B195F2F960033026C /* SwipeViewController.m in Sources */,
 				9A073F3F1996EDCD007E0D0F /* Order.m in Sources */,
+				9A91EF7D19D1D1B00011D982 /* BTCAddress+BitStore.m in Sources */,
 				9A67A7841950D70A001FCE32 /* Receiver.m in Sources */,
 				9A702653196098BF0033026C /* MessageHelper.m in Sources */,
 				9A65236F196F630C00AD5EFB /* AddressHelper.m in Sources */,
diff --git a/BitStore/BitStore-Prefix.pch b/BitStore/BitStore-Prefix.pch
@@ -23,6 +23,7 @@
 #import "Environment.h"
 #import "Settings.h"
 #import "Keys.h"
+#import "BTCAddress+BitStore.h"
 
 #define l10n(key) NSLocalizedString(key, nil)
 
diff --git a/BitStore/Controller/Account/Send/SendViewController.m b/BitStore/Controller/Account/Send/SendViewController.m
@@ -191,7 +191,7 @@ - (void)updateFields {
     }
 
     BTCAddress* addr = [BTCAddress addressWithBase58String:[self address]];
-    if (!error && addr != nil && _satoshi > 0) {
+    if (!error && addr != nil && [addr isPublicAddress] && _satoshi > 0) {
         self.navigationItem.rightBarButtonItem.enabled = YES;
     } else {
         self.navigationItem.rightBarButtonItem.enabled = NO;
diff --git a/BitStore/Controller/Contact/AddContactViewController.m b/BitStore/Controller/Contact/AddContactViewController.m
@@ -99,7 +99,7 @@ - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRang
     }
 
     BTCAddress* addr = [BTCAddress addressWithBase58String:_addressField.text];
-    if (addr != nil && _nameField.text.length > 0 && !exists) {
+    if (addr != nil && [addr isPublicAddress] && _nameField.text.length > 0 && !exists) {
         self.navigationItem.rightBarButtonItem.enabled = YES;
     } else {
         self.navigationItem.rightBarButtonItem.enabled = NO;
diff --git a/BitStore/Controller/Settings/KeysViewController.m b/BitStore/Controller/Settings/KeysViewController.m
@@ -65,14 +65,18 @@ - (void)add:(id)sender {
 
 - (void)scannedAddress:(NSString *)address amount:(NSString *)amount {
     [_scanViewController dismissViewControllerAnimated:YES completion:nil];
-    BTCKey* k = [[BTCKey alloc] initWithPrivateKeyAddress:[BTCPrivateKeyAddress addressWithBase58String:address]];
-    if (k != nil) {
-        [Lockbox setArray:[[Lockbox arrayForKey:@"bitstore_3"] arrayByAddingObject:k.privateKeyAddress.base58String] forKey:@"bitstore_3"];
-        Address* addr = [[Address alloc] init];
-        addr.address = k.uncompressedPublicKeyAddress.base58String;
-        [addr refresh];
-        [[AddressHelper instance] addAddress:addr];
-        [self updateValues];
+    BTCAddress* btcaddr = [BTCAddress addressWithBase58String:address];
+    BTCKey* k;
+    if ([btcaddr isPrivateAddress]) {
+        k = [[BTCKey alloc] initWithPrivateKeyAddress:(BTCPrivateKeyAddress *)btcaddr];
+        if (k != nil) {
+            [Lockbox setArray:[[Lockbox arrayForKey:@"bitstore_3"] arrayByAddingObject:k.privateKeyAddress.base58String] forKey:@"bitstore_3"];
+            Address* addr = [[Address alloc] init];
+            addr.address = k.uncompressedPublicKeyAddress.base58String;
+            [addr refresh];
+            [[AddressHelper instance] addAddress:addr];
+            [self updateValues];
+        }
     }
 }
 
diff --git a/BitStore/Controller/Settings/SwipeViewController.m b/BitStore/Controller/Settings/SwipeViewController.m
@@ -64,7 +64,15 @@ - (void)scannedAddress:(NSString *)address amount:(NSString *)amount {
     BTCPrivateKeyAddress* addr = [BTCPrivateKeyAddress addressWithBase58String:address];
     [self stopScan];
     
-    if (addr == nil) {
+    if (addr != nil && [addr isPrivateAddress]) {
+        BTCKey* key = [[BTCKey alloc] initWithPrivateKeyAddress:addr];
+        
+        _loadingAlert = [[UIAlertView alloc] init];
+        _loadingAlert.title = l10n(@"please_wait");
+        [_loadingAlert show];
+        
+        [self performSelector:@selector(checkBalance:) withObject:key afterDelay:0.01];
+    } else {
         UIBAlertView* av = [[UIBAlertView alloc] initWithTitle:l10n(@"error") message:l10n(@"not_a_key") cancelButtonTitle:l10n(@"cancel") otherButtonTitles:l10n(@"retry"), nil];
         [av showWithDismissHandler:^(NSInteger selectedIndex, NSString *selectedTitle, BOOL didCancel) {
             if (didCancel) {
@@ -73,14 +81,6 @@ - (void)scannedAddress:(NSString *)address amount:(NSString *)amount {
                 [self startScan];
             }
         }];
-    } else {
-        BTCKey* key = [[BTCKey alloc] initWithPrivateKeyAddress:addr];
-        
-        _loadingAlert = [[UIAlertView alloc] init];
-        _loadingAlert.title = l10n(@"please_wait");
-        [_loadingAlert show];
-        
-        [self performSelector:@selector(checkBalance:) withObject:key afterDelay:0.01];
     }
 }
 
diff --git a/BitStore/Utils/BTCAddress+BitStore.h b/BitStore/Utils/BTCAddress+BitStore.h
@@ -0,0 +1,16 @@
+//
+//  BTCAddress+BitStore.h
+//  BitStore
+//
+//  Created by Dylan Marriott on 23.09.14.
+//  Copyright (c) 2014 Dylan Marriott. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface BTCAddress (BitStore)
+
+- (BOOL)isPrivateAddress;
+- (BOOL)isPublicAddress;
+
+@end
diff --git a/BitStore/Utils/BTCAddress+BitStore.m b/BitStore/Utils/BTCAddress+BitStore.m
@@ -0,0 +1,21 @@
+//
+//  BTCAddress+BitStore.m
+//  BitStore
+//
+//  Created by Dylan Marriott on 23.09.14.
+//  Copyright (c) 2014 Dylan Marriott. All rights reserved.
+//
+
+#import "BTCAddress+BitStore.h"
+
+@implementation BTCAddress (BitStore)
+
+- (BOOL)isPrivateAddress {
+    return [self isKindOfClass:[BTCPrivateKeyAddress class]];
+}
+
+- (BOOL)isPublicAddress {
+    return [self isKindOfClass:[BTCPublicKeyAddress class]];
+}
+
+@end

Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ - (void)updateFields {`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`BTCAddress* addr = [BTCAddress addressWithBase58String:[self address]];`
`194`		`- if (!error && addr != nil && _satoshi > 0) {`
	`194`	`+ if (!error && addr != nil && [addr isPublicAddress] && _satoshi > 0) {`
`195`	`195`	`self.navigationItem.rightBarButtonItem.enabled = YES;`
`196`	`196`	`} else {`
`197`	`197`	`self.navigationItem.rightBarButtonItem.enabled = NO;`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRang`
`99`	`99`	`}`
`100`	`100`
`101`	`101`	`BTCAddress* addr = [BTCAddress addressWithBase58String:_addressField.text];`
`102`		`- if (addr != nil && _nameField.text.length > 0 && !exists) {`
	`102`	`+ if (addr != nil && [addr isPublicAddress] && _nameField.text.length > 0 && !exists) {`
`103`	`103`	`self.navigationItem.rightBarButtonItem.enabled = YES;`
`104`	`104`	`} else {`
`105`	`105`	`self.navigationItem.rightBarButtonItem.enabled = NO;`