Merge branch 'master' of github.com:bitpay/mystery into feature/stream-new-txs

Conflicts:
	public/css/common.css
	public/js/app.js

app/models/Address.js

@@ -24,25 +24,39 @@ function spec() {
       this.addrStr        = addrStr;
     } catch(e){
     }
+
+
+    Object.defineProperty(this, "totalSent", {
+      get: function() {
+        return parseFloat(this.totalSentSat) / parseFloat(BitcoreUtil.COIN);
+      },
+      set:  function(i) {
+        totalSentSat =  i * BitcoreUtil.COIN;
+      },
+      enumerable: 1,
+    });
+
+    Object.defineProperty(this, "balance", {
+      get: function() {
+        return parseFloat(this.balanceSat) / parseFloat(BitcoreUtil.COIN);
+      },
+      set:  function(i) {
+        balance =   i * BitcoreUtil.COIN;
+      },
+      enumerable: 1,
+    });
+
+    Object.defineProperty(this, "totalReceived", {
+      get: function() {
+        return parseFloat(this.totalReceivedSat) / parseFloat(BitcoreUtil.COIN);
+      },
+      set:  function(i) {
+        totalReceived =  i * BitcoreUtil.COIN;
+      },
+      enumerable: 1,
+    });
   }
 
-
-  Address.prototype.__defineGetter__('balance', function(){
-    return parseFloat(this.balanceSat) / parseFloat(BitcoreUtil.COIN);
-  });
-
-
-  Address.prototype.__defineGetter__('totalReceived', function(){
-    return parseFloat(this.totalReceivedSat) / parseFloat(BitcoreUtil.COIN);
-  });
-
-
-  Address.prototype.__defineGetter__('totalSent', function(){
-    return parseFloat(this.totalSentSat) / parseFloat(BitcoreUtil.COIN);
-  });
-
-
-
   Address.prototype.update = function(next) {
 
     if (! this.addrStr) {

app/models/Block.js

@@ -5,7 +5,10 @@
  */
 var mongoose    = require('mongoose'),
     Schema      = mongoose.Schema,
+    bignum      = require('bignum'),
     RpcClient   = require('bitcore/RpcClient').class(),
+    util        = require('bitcore/util/util'),
+    BitcoreBlock= require('bitcore/Block').class(),
     config      = require('../../config/config')
     ;
 
@@ -26,7 +29,6 @@ var BlockSchema = new Schema({
   fromP2P: Boolean,
 });
 
-
 /**
  * Validations
  */
@@ -82,6 +84,8 @@ BlockSchema.methods.getInfo = function (next) {
 
     that.info = blockInfo.result;
 
+    that.info.reward =  BitcoreBlock.getBlockValue(that.info.height) / util.COIN ;
+
     //console.log("THAT", that);
     return next(null, that.info);
   });

app/models/Transaction.js

@@ -10,6 +10,7 @@ var mongoose    = require('mongoose'),
     RpcClient   = require('bitcore/RpcClient').class(),
     Transaction = require('bitcore/Transaction').class(),
     Address     = require('bitcore/Address').class(),
+    BitcoreBlock= require('bitcore/Block').class(),
     networks    = require('bitcore/networks'),
     util        = require('bitcore/util/util'),
     bignum      = require('bignum'),
@@ -296,9 +297,17 @@ TransactionSchema.methods.queryInfo = function (next) {
         that.info.valueIn  = valueIn / util.COIN;
         that.info.feeds    = (valueIn - valueOut) / util.COIN;
       }
+      else  {
+        var reward =  BitcoreBlock.getBlockValue(that.info.height) / util.COIN;
+        that.info.vin[0].reward = reward;
+        that.info.valueIn = reward;
+      }
+
 
       that.info.size     = b.length;
 
+
+
       return next(err, that.info);
     });
   });

app/views/includes/foot.jade

@@ -38,4 +38,5 @@ script(type='text/javascript', src='/js/controllers/header.js')
 script(type='text/javascript', src='/js/controllers/blocks.js')
 script(type='text/javascript', src='/js/controllers/transactions.js')
 script(type='text/javascript', src='/js/controllers/address.js')
+script(type='text/javascript', src='/js/controllers/search.js')
 script(type='text/javascript', src='/js/init.js')

public/css/common.css

@@ -48,9 +48,11 @@ body {
   font-size: 10px;
 }
 
+#search { width: 400px; }
 
 
-/* Animations */
+
+/*Animations*/
 .fader.ng-enter {
   transition: opacity 1s;
   opacity: 0;

public/js/app.js

@@ -1,10 +1,24 @@
 'use strict';
 
-var app = angular.module('mystery', ['ngAnimate', 'ngCookies', 'ngResource', 'ngRoute', 'ui.bootstrap', 'ui.route', 'mystery.system', 'mystery.index', 'mystery.blocks', 'mystery.transactions', 'monospaced.qrcode', 'mystery.address']);
+var app = angular.module('mystery',
+    ['ngAnimate',
+    'ngCookies',
+    'ngResource',
+    'ngRoute',
+    'ui.bootstrap',
+    'ui.route',
+    'mystery.system',
+    'mystery.index',
+    'mystery.blocks',
+    'mystery.transactions',
+    'monospaced.qrcode',
+    'mystery.address',
+    'mystery.search'
+]);
 
 angular.module('mystery.system', []);
 angular.module('mystery.index', []);
 angular.module('mystery.blocks', []);
 angular.module('mystery.transactions', []);
 angular.module('mystery.address', []);
-
+angular.module('mystery.search', []);

public/js/controllers/search.js

@@ -0,0 +1,35 @@
+'use strict';
+
+angular.module('mystery.search').controller('SearchController', ['$scope', '$routeParams', '$location', 'Global', 'Block', 'Transaction', 'Address', function ($scope, $routeParams, $location, Global, Block, Transaction, Address) {
+  $scope.global = Global;
+
+  $scope.search = function() {
+    var q = $scope.q;
+    var path;
+
+    $scope.badQuery = false;
+    $scope.q = '';
+
+    Block.get({
+      blockHash: q
+    }, function() {
+      $location.path('block/' + q);
+    }, function () { //block not found, search on TX
+      Transaction.get({
+        txId: q
+      }, function() {
+        $location.path('tx/' + q);
+      }, function () { //tx not found, search on Address
+        Address.get({
+          addrStr: q
+        }, function() {
+          $location.path('address/' + q);
+        }, function () { //address not found, fail :(
+          $scope.badQuery = true;
+          $scope.q = q;
+        });
+      });
+    });
+  };
+
+}]);

public/js/services/address.js

@@ -3,6 +3,20 @@
 angular.module('mystery.address').factory('Address', ['$resource', function($resource) {
   return $resource('/api/addr/:addrStr', {
     addrStr: '@addStr'
+  }, {
+    get: {
+      method: 'GET',
+      interceptor: {
+        response: function (res) {
+          return res.data;
+        },
+        responseError: function (res) {
+          if (res.status === 404) {
+            return res;
+          }
+        }
+      }
+    }
   });
 }]);
 

public/js/services/blocks.js

@@ -3,6 +3,20 @@
 angular.module('mystery.blocks').factory('Block', ['$resource', function($resource) {
   return $resource('/api/block/:blockHash', {
     blockHash: '@blockHash'
+  }, {
+    get: {
+      method: 'GET',
+      interceptor: {
+        response: function (res) {
+          return res.data;
+        },
+        responseError: function (res) {
+          if (res.status === 404) {
+            return res;
+          }
+        }
+      }
+    }
   });
 }]);
 

public/js/services/transactions.js

@@ -3,6 +3,20 @@
 angular.module('mystery.transactions').factory('Transaction', ['$resource', function($resource) {
   return $resource('/api/tx/:txId', {
     txId: '@txId'
+  }, {
+    get: {
+      method: 'GET',
+      interceptor: {
+        response: function (res) {
+          return res.data;
+        },
+        responseError: function (res) {
+          if (res.status === 404) {
+            return res;
+          }
+        }
+      }
+    }
   });
 }]);
 

public/views/header.html

@@ -14,5 +14,13 @@
         <a href="#!/{{item.link}}">{{item.title}}</a>
       </li>
     </ul>
+    <div ng-controller="SearchController">
+      <form class="navbar-form navbar-left" role="search" ng-submit="search()">
+        <div class="form-group" ng-class="{'has-error': badQuery}">
+          <input id="search" type="text" class="form-control" ng-model="q" placeholder="Search for block, transaction or address">
+        </div>
+        <span class="text-danger" ng-show="badQuery">No matching records found!</span>
+      </form>
+    </div>
   </div>
 </div>

test/model/addr.js

@@ -40,6 +40,8 @@ describe('Address balances', function(){
           if (v.balance) assert.equal(v.balance, a.balance);
           if (v.totalReceived) assert.equal(v.totalReceived, a.totalReceived);
           if (v.totalSent) assert.equal(v.totalSent, a.totalSent);
+
+
           if (v.transactions) {
 
             v.transactions.forEach( function(tx) {