Merge pull request #15 from byteball/master

upd

angular-bitcore-wallet-client/bitcore-wallet-client/lib/api.js

@@ -454,7 +454,7 @@ API.prototype.createWallet = function(walletName, m, n, opts, cb) {
         //self.credentials.account = account;
     }
 
-    walletDefinedByKeys.createWalletByDevices(self.credentials.xPubKey, opts.account || 0, m, opts.cosigners || [], walletName, function(wallet){
+    walletDefinedByKeys.createWalletByDevices(self.credentials.xPubKey, opts.account || 0, m, opts.cosigners || [], walletName, opts.isSingleAddress, function(wallet){
         self.credentials.walletId = wallet;
         console.log("wallet created: " + JSON.stringify(self.credentials));
         if (network != self.credentials.network)
@@ -545,10 +545,17 @@ API.prototype.sendMultiPayment = function(opts, cb) {
 		if (opts.change_address)
 			return Wallet.sendMultiPayment(opts, cb);
 		// create a new change address or select first unused one
-		walletDefinedByKeys.issueOrSelectNextChangeAddress(self.credentials.walletId, function(objAddr){
-			opts.change_address = objAddr.address;
-			Wallet.sendMultiPayment(opts, cb);
-		});
+		if (!opts.isSingleAddress) {
+			walletDefinedByKeys.issueOrSelectNextChangeAddress(self.credentials.walletId, function(objAddr){
+				opts.change_address = objAddr.address;
+				Wallet.sendMultiPayment(opts, cb);
+			});
+		} else {
+			walletDefinedByKeys.readAddresses(self.credentials.walletId, {}, function(addresses){
+				opts.change_address = addresses[0].address;
+				Wallet.sendMultiPayment(opts, cb);
+			});
+		}
 	}
 };
 

bower.json

@@ -6,23 +6,22 @@
     "multisignature"
   ],
   "dependencies": {
-    "angular": "1.4.6",
+    "angular": "1",
     "angular-foundation": "byteball/angular-foundation",
-    "angular-gettext": "2.1.0",
-    "angular-touch": "1.4.6",
+    "angular-gettext": "2",
+    "angular-touch": "1",
     "angular-carousel": "*",
-    "angular-moment": "0.10.1",
+    "angular-moment": "1",
     "angular-qrcode": "monospaced/angular-qrcode#~6.0.3",
-    "angular-ui-router": "0.2.15",
-    "angular-ui-switch": "0.1.1",
-    "animate.css": "3.4.0",
-    "fastclick": "1.0.6",
-    "foundation": "5.5.2",
+    "angular-ui-router": "0.2",
+    "angular-ui-switch": "0.1",
+    "animate.css": "3",
+    "fastclick": "1",
+    "foundation": "5",
     "foundation-icon-fonts": "*",
-    "moment": "2.10.3",
-    "ng-lodash": "0.2.3",
+    "ng-lodash": "0.2",
     "qrcode-decoder-js": "*",
-    "angular-elastic": "^2.5.1",
-    "ui-router-extras": "^0.1.3"
+    "angular-elastic": "2",
+    "ui-router-extras": "0.1"
   }
 }

building-for-ios.md

@@ -4,7 +4,7 @@ Apple takes cautious approach to new cryptocurrencies and didn't approve our app
 
 1. Download [Xcode](https://itunes.apple.com/us/app/xcode/id497799835?mt=12) (4.5GB), if not already.
 1. Sign up for [Apple Developer Program](https://developer.apple.com/) (if not already), it's free.
-1. Download [Byteball Xcode project](../../releases/download/v1.9.1/ios-xcode-project.zip), it contains all the source code necessary to build.
+1. Download [Byteball Xcode project](../../releases/download/v1.10.1/ios-xcode-project.zip), it contains all the source code necessary to build.
 1. Unzip and open Byteball.xcodeproj in Xcode.
 1. Select a Team in the project properties.
 1. Connect your iPhone to your Mac via USB.

cordova/build.sh

@@ -170,6 +170,7 @@ fi
 
 echo "${OpenColor}${Green}* Copying files...${CloseColor}"
 cd $BUILDDIR/..
+mkdir $PROJECT/www
 cp -af public/** $PROJECT/www
 checkOK
 

cordova/config.xml

@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='utf-8'?>
 <widget id="org.byteball.wallet"
-  version="1.10.1"
-  android-versionCode="1047"
-  ios-CFBundleVersion="1.10.1">
+  version="1.11.0"
+  android-versionCode="1053"
+  ios-CFBundleVersion="1.11.0">
     <name>Byteball</name>
     <description>
       Byteball wallet.