Added transactions (BBE inputs)

Author: brainwallet

index.html

@@ -240,15 +240,24 @@ <h3><span class="pull-right" id="qr_addr"></span></h3>
                         <input class="span4" id="txAddr" readonly type="text"> 
                         <div class="input-prepend"> <span class="add-on">BTC</span><input class="span2" id="txBalance" readonly type="text"> 
                         </div>
-                       <button class="btn" id="txGetUnspent" title="Get Outputs" type="button"><i class="icon-repeat"></i></button> 
-                       <button class="btn" type="button" id="txToggle" data-toggle="collapse" data-target="#txUnspentForm">Show Outputs</button>
+                        <button class="btn" id="txGetUnspent" title="Reload" type="button"><i class="icon-repeat"></i></button> 
+                        <button class="btn" data-target="#txUnspentForm" data-toggle="collapse" id="txToggle" type="button">Toggle Inputs</button> 
                     </div>
                 </div>
-                <div class="collapse" id="txUnspentForm">
+                <div class="collapse" id="txUnspentForm"> 
                     <div class="control-group"> 
-                        <label class="control-label" for="txUnspent">Unspent Outputs</label> 
+                        <label class="control-label" for="txBBE">Get History From</label> 
                         <div class="controls"> 
-                            <textarea class="span8" id="txUnspent" rows="16"></textarea>
+                            <div class="btn-group" data-toggle="buttons-radio" id="txType"> 
+                                <button class="btn active" id="txBCI" type="button">BlockChain Info</button> 
+                                <button class="btn" id="txBBE" type="button">Bitcoin Block Explorer</button> 
+                            </div>
+                        </div>
+                    </div>
+                    <div class="control-group"> 
+                        <label class="control-label" for="txUnspent">Transaction History</label> 
+                        <div class="controls"> 
+<textarea class="span8" id="txUnspent" rows="16"></textarea>
                         </div>
                     </div>
                 </div>
@@ -270,8 +279,8 @@ <h3><span class="pull-right" id="qr_addr"></span></h3>
                         <input class="span4" id="txDest" type="text"> 
                         <div class="input-prepend"> <span class="add-on">BTC</span><input class="span2" id="txValue" type="text"> 
                         </div><span class="help-inline errormsg"></span> 
-                        <button class="btn" type="button" id="txAddDest" disabled>+</button>
-                        <button class="btn" type="button" id="txSend">Send Transaction</button>
+                        <button class="btn" disabled id="txAddDest" type="button">+</button> 
+                        <button class="btn" id="txSend" type="button">Send Transaction</button> 
                     </div>
                 </div>
             </fieldset>

js/brainwallet.js

@@ -201,7 +201,7 @@
             var addr = eckey.getBitcoinAddress();
             setErrorState($('#hash'), false);
         } catch (err) {
-            console.info(err);
+            //console.info(err);
             setErrorState($('#hash'), true, 'Invalid secret exponent (must be non-zero value)');
             return;
         }
@@ -669,6 +669,8 @@
 
     // -- transactions --
 
+    var txType = 'txBCI';
+
     function txGenSrcAddr() {
         var sec = $('#txSec').val();
         var addr = '';
@@ -699,23 +701,14 @@
     }
 
     function txSetUnspent(text) {
-
-        if (text.length == 0) {
-            txUnspent = '{"unspent_outputs":[]}';
-            var value = 0;
-        } else {
-            var r = jQuery.parseJSON(text);
-            txUnspent = JSON.stringify(r, null, 4);
-            var value = TX.getBalance(txUnspent);
-        }
-
+        var r = JSON.parse(text);
+        txUnspent = JSON.stringify(r, null, 4);
         $('#txUnspent').val(txUnspent);
-
+        TX.parseInputs(txUnspent, addr);
+        var value = TX.getBalance();
         var fval = Bitcoin.Util.formatValue(value);
-
         $('#txBalance').val(fval);
         $('#txValue').val(fval);
-
         txRebuild();
     }
 
@@ -729,14 +722,18 @@
     }
 
     function txParseUnspent(text) {
-        alert(text == '' ? 'No unspent outputs' : text);
+        if (text == '')
+            alert('No data');
         txSetUnspent(text);
     }
 
     function txGetUnspent() {
         var addr = $('#txAddr').val();
-        var url = 'http://blockchain.info/unspent?address=' + addr;
-        url = prompt('Fetching unspent outputs:', url);
+
+        var url = (txType == 'txBCI') ? 'http://blockchain.info/unspent?address=' + addr :
+            'http://blockexplorer.com/q/mytransactions/' + addr;
+
+        url = prompt('Download transaction history:', url);
         if (url != null && url != "") {
             $('#txUnspent').val('');
             tx_fetch(url, txParseUnspent);
@@ -773,15 +770,17 @@
     function txSend() {
         var tx = $('#txHex').val();
         url = 'http://bitsend.rowit.co.uk/?transaction=' + tx;
-        url = prompt('Sending transaction:', url);
+        url = prompt('Send transaction:', url);
         if (url != null && url != "") {
             tx_fetch(url, txSent);
         }
         return false;
     }
 
     function txRebuild() {
+
         var sec = $('#txSec').val();
+        var addr = $('#txAddr').val();
         var dest = $('#txDest').val();
         var unspent = $('#txUnspent').val();
         var fval = parseFloat($('#txValue').val());
@@ -793,22 +792,15 @@
         } catch (err) {
             $('#txJSON').val('');
             $('#txHex').val('');
-            return
+            return;
         }
 
         var eckey = new Bitcoin.ECKey(payload);
 
         TX.init(eckey);
         TX.addOutput(dest, fval);
 
-        try {
-            var r = jQuery.parseJSON(unspent);
-            var unspent = r.unspent_outputs;
-        } catch (err) {
-            var unspent = {};
-        }
-
-        var sendTx = TX.construct(unspent);
+        var sendTx = TX.construct();
         var txJSON = TX.toBBE(sendTx);
         var buf = sendTx.serialize();
         var txHex = Crypto.util.bytesToHex(buf);
@@ -833,6 +825,11 @@
         }
     }
 
+    function txChangeType() {
+        txType = $(this).attr('id');
+        txGetUnspent();
+    }
+
     $(document).ready( function() {
 
         onInput('#pass', onChangePass);
@@ -887,6 +884,9 @@
 
         $('#txGetUnspent').click(txGetUnspent);
 
+        $('#txBCI').click(txChangeType);
+        $('#txBBE').click(txChangeType);
+
         onInput($('#txSec'), txOnChangeSec);
         onInput($('#txUnspent'), txOnChangeUnspent);
         onInput($('#txHex'), txOnChangeHex);