Make bitcoin payment code more robust

Author: OstlerDev

.gitignore

@@ -8,3 +8,5 @@ src/static/js/bundle.js
 wallets.txt
 
 config.codekit
+
+config.codekit

config.codekit

@@ -1031,12 +1031,12 @@
 		"outputStyle": 1,
 		"syntaxCheckerStyle": 1
 		},
-	"\/src\/static\/js\/BitcoinJS-lib.js": {
+	"\/src\/static\/js\/bitcoinjs-lib.min.js": {
 		"fileType": 64,
 		"ignore": 0,
 		"ignoreWasSetByUser": 0,
-		"inputAbbreviatedPath": "\/src\/static\/js\/BitcoinJS-lib.js",
-		"outputAbbreviatedPath": "\/src\/static\/js\/min\/BitcoinJS-lib-min.js",
+		"inputAbbreviatedPath": "\/src\/static\/js\/bitcoinjs-lib.min.js",
+		"outputAbbreviatedPath": "\/src\/static\/js\/min\/bitcoinjs-lib.min-min.js",
 		"outputPathIsOutsideProject": 0,
 		"outputPathIsSetByUser": 0,
 		"outputStyle": 1,
@@ -1064,6 +1064,17 @@
 		"outputStyle": 1,
 		"syntaxCheckerStyle": 1
 		},
+	"\/src\/static\/js\/cryptojs.min.js": {
+		"fileType": 64,
+		"ignore": 0,
+		"ignoreWasSetByUser": 0,
+		"inputAbbreviatedPath": "\/src\/static\/js\/cryptojs.min.js",
+		"outputAbbreviatedPath": "\/src\/static\/js\/min\/cryptojs.min-min.js",
+		"outputPathIsOutsideProject": 0,
+		"outputPathIsSetByUser": 0,
+		"outputStyle": 1,
+		"syntaxCheckerStyle": 1
+		},
 	"\/src\/static\/js\/cryptorates.js": {
 		"fileType": 64,
 		"ignore": 0,

src/static/js/SimpleWalletBitcoin.js

@@ -364,11 +364,19 @@ var BTCWallet = (function () {
 			if (CurrentAmount > (amount + 2005) / Math.pow(10,8)) {
 				 break;
 			} else {
-				CurrentAmount += (this.known_unspent[v].value / Math.pow(10,8));
-				var tmp = this.known_unspent[v];
-				// Convert value to amount
-				tmp.amount = tmp.value;
-				CutUnspent.push(tmp);
+				if (this.known_unspent && this.known_unspent[v] && this.known_unspent[v].value){
+					CurrentAmount += (this.known_unspent[v].value / Math.pow(10,8));
+					var tmp = this.known_unspent[v];
+					// Convert value to amount
+					if (!tmp.amount){
+						// Make sure to save amount as the value in full BTC and NOT satoshi
+						tmp.amount = tmp.value / Math.pow(10,8);
+					}
+					CutUnspent.push(tmp);
+				} else if (this.known_unspent && this.known_unspent[v] && this.known_unspent[v].amount){
+					CurrentAmount += this.known_unspent[v].amount;
+					CutUnspent.push(this.known_unspent[v]);
+				}
 			}
 		}
 		console.log((amount + 2005) / Math.pow(10,8));
@@ -472,6 +480,11 @@ var BTCWallet = (function () {
 					console.log(unspents);
 					for (var v in unspents) {
 						// Add them regardless of if there is zero confirmations.
+						if (!unspents[v].tx){
+							if(unspents[v].txid){
+								unspents[v].tx = unspents[v].txid
+							}
+						}
 						if (unspents[v].tx && (unspents[v].n == 1 || unspents[v].n == 0)){
 							tx.addInput(unspents[v].tx, unspents[v].n);
 							_this.putSpent(unspents[v]);
@@ -528,7 +541,7 @@ var BTCWallet = (function () {
 						if (toAddress == fromAddress) {
 							_this.putUnspent({
 								address: toAddress,
-								txid: data.txid,
+								txid: data.data,
 								vout: 0,
 								confirmations: -1,
 								amount: amount / Math.pow(10, 8)
@@ -538,7 +551,7 @@ var BTCWallet = (function () {
 						if (changeValue >= minFeePerKb)
 							_this.putUnspent({
 								address: fromAddress,
-								txid: data.txid,
+								txid: data.data,
 								vout: 1,
 								confirmations: -1,
 								amount: changeValue / Math.pow(10, 8)

src/static/js/media.js

@@ -461,6 +461,7 @@ function showPaymentOption(e) {
             	sentFunds = false;
             	watchForLocalWalletPayment(btc_wallet.getFirstAddress(), price, function (a) {
 	                console.log(a);
+	                return onPaymentDone(action, fileData);
 	            });
             } catch (e) {
             	console.log(e);

src/static/js/wallet-bitcoin.js

@@ -83,11 +83,13 @@ function watchForLocalWalletPayment(address, amount, done) {
 					// Add in 100 extra satoshi just in case :)
 					console.log(amount, BTCUSD);
 					btc_wallet.sendCoins(btc_wallet.getFirstAddress(), btcAddress, amount/BTCUSD, function(err, data){
+
 						if (err){
 							console.error(err);
 						}
 						console.log(data);
 						sentFunds = true;
+
 						restartWalletWebSocket = false;
 						bitcoinWalletWebsocket.close();
 					});
@@ -121,14 +123,20 @@ var payArtifactFromLocalWallet = function(type){
 
 	var amount = $($('.pwyw-btc-' + type + '-price')[0]).text();
 
+	$('#payment-select-buttons-localwallet-' + type).text("Sending...").prop("disabled",true);
+
 	btc_wallet.sendCoins(btc_wallet.getFirstAddress(), btcAddress, parseFloat(amount), function(err, data){
 		if (err){
 			console.error(err);
+			return;
 		}
+		$('#payment-select-buttons-localwallet-' + type).text("Sent!").prop("disabled",false);
 		console.log(data);
 		sentFunds = true;
 		restartWalletWebSocket = false;
 		bitcoinWalletWebsocket.close();
+		var	fileData = $('.playlist tr.active').data();
+		onPaymentDone(type, fileData);
 	});
 }