From d13f9ce3bdeeea450c7f580c14a9c856b4d996ef Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 14 Jan 2014 12:58:45 -0300
Subject: [PATCH 1/3] add reward to block api

---
 app/controllers/addresses.js |  4 +++
 app/models/Address.js        | 48 +++++++++++++++++++++++-------------
 app/models/Block.js          |  6 ++++-
 test/model/addr.js           |  2 ++
 4 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/app/controllers/addresses.js b/app/controllers/addresses.js
index e13000c..09dd17c 100644
--- a/app/controllers/addresses.js
+++ b/app/controllers/addresses.js
@@ -31,6 +31,10 @@ exports.address = function(req, res, next, addr) {
  */
 exports.show = function(req, res) {
   if (req.address) {
+
+console.log(req.address);
+console.log(req.address.totalSent);
+console.log(JSON.stringify(req.address));
     res.jsonp(req.address);
   }
 };
diff --git a/app/models/Address.js b/app/models/Address.js
index b01cc2d..dd6da83 100644
--- a/app/models/Address.js
+++ b/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) {
diff --git a/app/models/Block.js b/app/models/Block.js
index 19e6d53..46af590 100644
--- a/app/models/Block.js
+++ b/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);
   });
diff --git a/test/model/addr.js b/test/model/addr.js
index 1a300f1..dfeea71 100644
--- a/test/model/addr.js
+++ b/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) {

From 6ebb282b900cff711fa6661e5ce92964983c0f0d Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 14 Jan 2014 13:03:29 -0300
Subject: [PATCH 2/3] add reward to coinbase txs

---
 app/models/Transaction.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/models/Transaction.js b/app/models/Transaction.js
index 29b0499..57d2fc2 100644
--- a/app/models/Transaction.js
+++ b/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);
     });
   });

From 843e62eb572faf65d8a8abdb4ca3e40e0fa3f6d5 Mon Sep 17 00:00:00 2001
From: Matias Alejo Garcia <ematiu@gmail.com>
Date: Tue, 14 Jan 2014 14:24:42 -0300
Subject: [PATCH 3/3] rm console.logs

---
 app/controllers/addresses.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/controllers/addresses.js b/app/controllers/addresses.js
index 09dd17c..e13000c 100644
--- a/app/controllers/addresses.js
+++ b/app/controllers/addresses.js
@@ -31,10 +31,6 @@ exports.address = function(req, res, next, addr) {
  */
 exports.show = function(req, res) {
   if (req.address) {
-
-console.log(req.address);
-console.log(req.address.totalSent);
-console.log(JSON.stringify(req.address));
     res.jsonp(req.address);
   }
 };