From 714df393b406c515b0bb3abd4fcd8bde4ad53fde Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 6 Sep 2017 14:27:21 -0700
Subject: [PATCH 01/13] Add test template

---
 test/unit/pending-balance-test.js | 37 +++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 test/unit/pending-balance-test.js

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
new file mode 100644
index 000000000..845d6d552
--- /dev/null
+++ b/test/unit/pending-balance-test.js
@@ -0,0 +1,37 @@
+const assert = require('assert')
+const PendingBalanceCalculator = require('../../app/scripts/lib/pending-balance-calculator')
+const MockTxGen = require('../lib/mock-tx-gen')
+const BN = require('ethereumjs-util').BN
+let providerResultStub = {}
+
+describe('PendingBalanceCalculator', function () {
+  let nonceTracker
+
+  describe('if you have no pending txs and one ether', function () {
+    const ether = '0x' + (new BN(1e18)).toString(16)
+
+    beforeEach(function () {
+      nonceTracker = generateNonceTrackerWith([], ether)
+    })
+
+    it('returns the network balance', function () {
+      const result = nonceTracker.getBalance()
+      assert.equal(result, ether, 'returns one ether')
+    })
+  })
+})
+
+function generateBalaneCalcWith (transactions, providerStub = '0x0') {
+  const getPendingTransactions = () => transactions
+  providerResultStub.result = providerStub
+  const provider = {
+    sendAsync: (_, cb) => { cb(undefined, providerResultStub) },
+    _blockTracker: {
+      getCurrentBlock: () => '0x11b568',
+    },
+  }
+  return new PendingBalanceCalculator({
+    provider,
+    getPendingTransactions,
+  })
+}

From f9a052deed8749a1c6dd544df561967a568749d9 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 6 Sep 2017 14:36:15 -0700
Subject: [PATCH 02/13] Add first passing balance calc test

---
 app/scripts/lib/pending-balance-calculator.js | 18 ++++++++++++++++++
 test/unit/pending-balance-test.js             | 15 ++++++++-------
 2 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 app/scripts/lib/pending-balance-calculator.js

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
new file mode 100644
index 000000000..5b30354a2
--- /dev/null
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -0,0 +1,18 @@
+const BN = require('ethereumjs-util').BN
+const EthQuery = require('ethjs-query')
+
+class PendingBalanceCalculator {
+
+  constructor ({ getBalance, getPendingTransactions }) {
+    this.getPendingTransactions = getPendingTransactions
+    this.getBalance = getBalance
+  }
+
+  async getBalance() {
+    const balance = await this.getBalance
+    return balance
+  }
+
+}
+
+module.exports = PendingBalanceCalculator
diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 845d6d552..dcf1926f0 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -8,21 +8,22 @@ describe('PendingBalanceCalculator', function () {
   let nonceTracker
 
   describe('if you have no pending txs and one ether', function () {
-    const ether = '0x' + (new BN(1e18)).toString(16)
+    const ether = '0x' + (new BN(String(1e18))).toString(16)
 
     beforeEach(function () {
-      nonceTracker = generateNonceTrackerWith([], ether)
+      nonceTracker = generateBalaneCalcWith([], ether)
     })
 
-    it('returns the network balance', function () {
-      const result = nonceTracker.getBalance()
-      assert.equal(result, ether, 'returns one ether')
+    it('returns the network balance', async function () {
+      const result = await nonceTracker.getBalance()
+      assert.equal(result, ether, `gave ${result} needed ${ether}`)
     })
   })
 })
 
 function generateBalaneCalcWith (transactions, providerStub = '0x0') {
-  const getPendingTransactions = () => transactions
+  const getPendingTransactions = () => Promise.resolve(transactions)
+  const getBalance = () => Promise.resolve(providerStub)
   providerResultStub.result = providerStub
   const provider = {
     sendAsync: (_, cb) => { cb(undefined, providerResultStub) },
@@ -31,7 +32,7 @@ function generateBalaneCalcWith (transactions, providerStub = '0x0') {
     },
   }
   return new PendingBalanceCalculator({
-    provider,
+    getBalance,
     getPendingTransactions,
   })
 }

From 74f7fc4613d136b57a4395d273ce4bf52d6685db Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Wed, 6 Sep 2017 14:37:46 -0700
Subject: [PATCH 03/13] Check balances in parallel

---
 app/scripts/lib/pending-balance-calculator.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index 5b30354a2..4f6e03138 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -9,7 +9,14 @@ class PendingBalanceCalculator {
   }
 
   async getBalance() {
-    const balance = await this.getBalance
+    const results = await Promise.all([
+      this.getBalance(),
+      this.getPendingTransactions(),
+    ])
+
+    const balance = results[0]
+    const pending = results[1]
+
     return balance
   }
 

From b6e8791bc2bc912d874edcc92fcf3c4ce5a9b72a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 11:59:15 -0700
Subject: [PATCH 04/13] test not passing

---
 app/scripts/lib/pending-balance-calculator.js | 18 +++++++++-
 test/unit/pending-balance-test.js             | 35 +++++++++++++++++--
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index 4f6e03138..9df87e34b 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -1,5 +1,6 @@
 const BN = require('ethereumjs-util').BN
 const EthQuery = require('ethjs-query')
+const normalize = require('eth-sig-util').normalize
 
 class PendingBalanceCalculator {
 
@@ -9,15 +10,30 @@ class PendingBalanceCalculator {
   }
 
   async getBalance() {
+    console.log('getting balance')
     const results = await Promise.all([
       this.getBalance(),
       this.getPendingTransactions(),
     ])
+    console.dir(results)
 
     const balance = results[0]
     const pending = results[1]
 
-    return balance
+    console.dir({ balance, pending })
+
+    const pendingValue = pending.reduce(function (total, tx) {
+      return total.sub(this.valueFor(tx))
+    }, new BN(0))
+
+    const balanceBn = new BN(normalize(balance))
+
+    return `0x${ balanceBn.sub(pendingValue).toString(16) }`
+  }
+
+  valueFor (tx) {
+    const value = new BN(normalize(tx.txParams.value))
+    return value
   }
 
 }
diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index dcf1926f0..9077e8f14 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -5,20 +5,49 @@ const BN = require('ethereumjs-util').BN
 let providerResultStub = {}
 
 describe('PendingBalanceCalculator', function () {
-  let nonceTracker
+  let balanceCalculator
 
   describe('if you have no pending txs and one ether', function () {
     const ether = '0x' + (new BN(String(1e18))).toString(16)
 
     beforeEach(function () {
-      nonceTracker = generateBalaneCalcWith([], ether)
+      balanceCalculator = generateBalaneCalcWith([], ether)
     })
 
     it('returns the network balance', async function () {
-      const result = await nonceTracker.getBalance()
+      const result = await balanceCalculator.getBalance()
       assert.equal(result, ether, `gave ${result} needed ${ether}`)
     })
   })
+
+  describe('if you have a one ether pending tx and one ether', function () {
+    const ether = '0x' + (new BN(String(1e18))).toString(16)
+
+    beforeEach(function () {
+      const txGen = new MockTxGen()
+      pendingTxs = txGen.generate({
+        status: 'submitted',
+        txParams: {
+          value: ether,
+          gasPrice: '0x0',
+          gas: '0x0',
+        }
+      }, { count: 1 })
+
+      balanceCalculator = generateBalaneCalcWith(pendingTxs, ether)
+    })
+
+    it('returns the network balance', async function () {
+      console.log('one')
+      console.dir(balanceCalculator)
+      const result = await balanceCalculator.getBalance()
+      console.log('two')
+      console.dir(result)
+      assert.equal(result, '0x0', `gave ${result} needed '0x0'`)
+      return true
+    })
+
+  })
 })
 
 function generateBalaneCalcWith (transactions, providerStub = '0x0') {

From 40585744365c128d1f64c5bf93ee8cedc9e91dae Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:30:25 -0700
Subject: [PATCH 05/13] Add basic test for valueFor

---
 app/scripts/lib/pending-balance-calculator.js | 13 +++++++---
 test/unit/pending-balance-test.js             | 25 ++++++++++++++++---
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index 9df87e34b..f2c9ce379 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -6,13 +6,13 @@ class PendingBalanceCalculator {
 
   constructor ({ getBalance, getPendingTransactions }) {
     this.getPendingTransactions = getPendingTransactions
-    this.getBalance = getBalance
+    this.getNetworkBalance = getBalance
   }
 
   async getBalance() {
     console.log('getting balance')
     const results = await Promise.all([
-      this.getBalance(),
+      this.getNetworkBalance(),
       this.getPendingTransactions(),
     ])
     console.dir(results)
@@ -21,18 +21,23 @@ class PendingBalanceCalculator {
     const pending = results[1]
 
     console.dir({ balance, pending })
+    console.dir(pending)
 
     const pendingValue = pending.reduce(function (total, tx) {
-      return total.sub(this.valueFor(tx))
+      return total.add(this.valueFor(tx))
     }, new BN(0))
 
     const balanceBn = new BN(normalize(balance))
+    console.log(`subtracting ${pendingValue.toString()} from ${balanceBn.toString()}`)
 
     return `0x${ balanceBn.sub(pendingValue).toString(16) }`
   }
 
   valueFor (tx) {
-    const value = new BN(normalize(tx.txParams.value))
+    const txValue = tx.txParams.value
+    const normalized = normalize(txValue).substring(2)
+    console.log({ txValue, normalized })
+    const value = new BN(normalize(txValue).substring(2), 16)
     return value
   }
 
diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 9077e8f14..7f20270cb 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -4,11 +4,31 @@ const MockTxGen = require('../lib/mock-tx-gen')
 const BN = require('ethereumjs-util').BN
 let providerResultStub = {}
 
+const etherBn = new BN(String(1e18))
+const ether = '0x' + etherBn.toString(16)
+
 describe('PendingBalanceCalculator', function () {
   let balanceCalculator
 
+  describe('#valueFor(tx)', function () {
+    it('returns a BN for a given tx value', function () {
+      const txGen = new MockTxGen()
+      pendingTxs = txGen.generate({
+        status: 'submitted',
+        txParams: {
+          value: ether,
+          gasPrice: '0x0',
+          gas: '0x0',
+        }
+      }, { count: 1 })
+
+      const balanceCalculator = generateBalaneCalcWith([], '0x0')
+      const result = balanceCalculator.valueFor(pendingTxs[0])
+      assert.equal(result.toString(), etherBn.toString(), 'computes one ether')
+    })
+  })
+
   describe('if you have no pending txs and one ether', function () {
-    const ether = '0x' + (new BN(String(1e18))).toString(16)
 
     beforeEach(function () {
       balanceCalculator = generateBalaneCalcWith([], ether)
@@ -21,8 +41,6 @@ describe('PendingBalanceCalculator', function () {
   })
 
   describe('if you have a one ether pending tx and one ether', function () {
-    const ether = '0x' + (new BN(String(1e18))).toString(16)
-
     beforeEach(function () {
       const txGen = new MockTxGen()
       pendingTxs = txGen.generate({
@@ -40,6 +58,7 @@ describe('PendingBalanceCalculator', function () {
     it('returns the network balance', async function () {
       console.log('one')
       console.dir(balanceCalculator)
+      console.dir(balanceCalculator.getBalance.toString())
       const result = await balanceCalculator.getBalance()
       console.log('two')
       console.dir(result)

From 7b92268428cc2de4374bc669c524bb61959801f1 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:43:10 -0700
Subject: [PATCH 06/13] Fix valueFor test

---
 app/scripts/lib/pending-balance-calculator.js | 15 ++++++++-------
 test/unit/pending-balance-test.js             |  9 +++++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index f2c9ce379..e4ff1e050 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -15,32 +15,33 @@ class PendingBalanceCalculator {
       this.getNetworkBalance(),
       this.getPendingTransactions(),
     ])
-    console.dir(results)
 
     const balance = results[0]
     const pending = results[1]
 
-    console.dir({ balance, pending })
     console.dir(pending)
 
-    const pendingValue = pending.reduce(function (total, tx) {
+    const pendingValue = pending.reduce((total, tx) => {
       return total.add(this.valueFor(tx))
     }, new BN(0))
 
-    const balanceBn = new BN(normalize(balance))
-    console.log(`subtracting ${pendingValue.toString()} from ${balanceBn.toString()}`)
+    console.log(`subtracting ${pendingValue.toString()} from ${balance.toString()}`)
 
-    return `0x${ balanceBn.sub(pendingValue).toString(16) }`
+    return `0x${ balance.sub(pendingValue).toString(16) }`
   }
 
   valueFor (tx) {
     const txValue = tx.txParams.value
     const normalized = normalize(txValue).substring(2)
     console.log({ txValue, normalized })
-    const value = new BN(normalize(txValue).substring(2), 16)
+    const value = this.hexToBn(txValue)
     return value
   }
 
+  hexToBn (hex) {
+    return new BN(normalize(hex).substring(2), 16)
+  }
+
 }
 
 module.exports = PendingBalanceCalculator
diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 7f20270cb..0937579e2 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -4,6 +4,7 @@ const MockTxGen = require('../lib/mock-tx-gen')
 const BN = require('ethereumjs-util').BN
 let providerResultStub = {}
 
+const zeroBn = new BN(0)
 const etherBn = new BN(String(1e18))
 const ether = '0x' + etherBn.toString(16)
 
@@ -22,7 +23,7 @@ describe('PendingBalanceCalculator', function () {
         }
       }, { count: 1 })
 
-      const balanceCalculator = generateBalaneCalcWith([], '0x0')
+      const balanceCalculator = generateBalanceCalcWith([], zeroBn)
       const result = balanceCalculator.valueFor(pendingTxs[0])
       assert.equal(result.toString(), etherBn.toString(), 'computes one ether')
     })
@@ -31,7 +32,7 @@ describe('PendingBalanceCalculator', function () {
   describe('if you have no pending txs and one ether', function () {
 
     beforeEach(function () {
-      balanceCalculator = generateBalaneCalcWith([], ether)
+      balanceCalculator = generateBalanceCalcWith([], zeroBn)
     })
 
     it('returns the network balance', async function () {
@@ -52,7 +53,7 @@ describe('PendingBalanceCalculator', function () {
         }
       }, { count: 1 })
 
-      balanceCalculator = generateBalaneCalcWith(pendingTxs, ether)
+      balanceCalculator = generateBalanceCalcWith(pendingTxs, etherBn)
     })
 
     it('returns the network balance', async function () {
@@ -69,7 +70,7 @@ describe('PendingBalanceCalculator', function () {
   })
 })
 
-function generateBalaneCalcWith (transactions, providerStub = '0x0') {
+function generateBalanceCalcWith (transactions, providerStub = zeroBn) {
   const getPendingTransactions = () => Promise.resolve(transactions)
   const getBalance = () => Promise.resolve(providerStub)
   providerResultStub.result = providerStub

From 74c6de7d23c979c091028d8bd599f389e2090bc1 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:45:00 -0700
Subject: [PATCH 07/13] Add constructor comment

---
 app/scripts/lib/pending-balance-calculator.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index e4ff1e050..d5e2e4c17 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -4,6 +4,11 @@ const normalize = require('eth-sig-util').normalize
 
 class PendingBalanceCalculator {
 
+  // Must be initialized with two functions:
+  // getBalance => Returns a promise of a BN of the current balance in Wei
+  // getPendingTransactions => Returns an array of TxMeta Objects,
+  // which have txParams properties, which include value, gasPrice, and gas,
+  // all in a base=16 hex format.
   constructor ({ getBalance, getPendingTransactions }) {
     this.getPendingTransactions = getPendingTransactions
     this.getNetworkBalance = getBalance

From a95a3c7e4f4d1331394a7bf92a77678fe8087c04 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:47:27 -0700
Subject: [PATCH 08/13] Fix balance calc test

---
 app/scripts/lib/pending-balance-calculator.js | 2 ++
 test/unit/pending-balance-test.js             | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index d5e2e4c17..4e1189a65 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -25,6 +25,8 @@ class PendingBalanceCalculator {
     const pending = results[1]
 
     console.dir(pending)
+    console.dir(balance.toString())
+    console.trace('but why')
 
     const pendingValue = pending.reduce((total, tx) => {
       return total.add(this.valueFor(tx))
diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 0937579e2..a9b0f7b66 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -32,7 +32,7 @@ describe('PendingBalanceCalculator', function () {
   describe('if you have no pending txs and one ether', function () {
 
     beforeEach(function () {
-      balanceCalculator = generateBalanceCalcWith([], zeroBn)
+      balanceCalculator = generateBalanceCalcWith([], etherBn)
     })
 
     it('returns the network balance', async function () {

From c616581001a7413a289b108b347005d53fb14732 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:47:52 -0700
Subject: [PATCH 09/13] Remove logs

---
 app/scripts/lib/pending-balance-calculator.js | 8 --------
 test/unit/pending-balance-test.js             | 5 -----
 2 files changed, 13 deletions(-)

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index 4e1189a65..8564f0134 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -15,7 +15,6 @@ class PendingBalanceCalculator {
   }
 
   async getBalance() {
-    console.log('getting balance')
     const results = await Promise.all([
       this.getNetworkBalance(),
       this.getPendingTransactions(),
@@ -24,23 +23,16 @@ class PendingBalanceCalculator {
     const balance = results[0]
     const pending = results[1]
 
-    console.dir(pending)
-    console.dir(balance.toString())
-    console.trace('but why')
-
     const pendingValue = pending.reduce((total, tx) => {
       return total.add(this.valueFor(tx))
     }, new BN(0))
 
-    console.log(`subtracting ${pendingValue.toString()} from ${balance.toString()}`)
-
     return `0x${ balance.sub(pendingValue).toString(16) }`
   }
 
   valueFor (tx) {
     const txValue = tx.txParams.value
     const normalized = normalize(txValue).substring(2)
-    console.log({ txValue, normalized })
     const value = this.hexToBn(txValue)
     return value
   }
diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index a9b0f7b66..e1d5f9303 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -57,12 +57,7 @@ describe('PendingBalanceCalculator', function () {
     })
 
     it('returns the network balance', async function () {
-      console.log('one')
-      console.dir(balanceCalculator)
-      console.dir(balanceCalculator.getBalance.toString())
       const result = await balanceCalculator.getBalance()
-      console.log('two')
-      console.dir(result)
       assert.equal(result, '0x0', `gave ${result} needed '0x0'`)
       return true
     })

From 532a4040de191d455053aa11432dcb9b407c9bf4 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:52:25 -0700
Subject: [PATCH 10/13] Add test for computing gas price

---
 test/unit/pending-balance-test.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index e1d5f9303..3029a849c 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -27,6 +27,22 @@ describe('PendingBalanceCalculator', function () {
       const result = balanceCalculator.valueFor(pendingTxs[0])
       assert.equal(result.toString(), etherBn.toString(), 'computes one ether')
     })
+
+    it('calculates gas costs as well', function () {
+      const txGen = new MockTxGen()
+      pendingTxs = txGen.generate({
+        status: 'submitted',
+        txParams: {
+          value: '0x0',
+          gasPrice: '0x2',
+          gas: '0x3',
+        }
+      }, { count: 1 })
+
+      const balanceCalculator = generateBalanceCalcWith([], zeroBn)
+      const result = balanceCalculator.valueFor(pendingTxs[0])
+      assert.equal(result.toString(), '6', 'computes one ether')
+    })
   })
 
   describe('if you have no pending txs and one ether', function () {

From fadc0617df016ad1fa3d1c92e220a8e9ede6379d Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:52:49 -0700
Subject: [PATCH 11/13] Make tx calculations account for gas prices

---
 app/scripts/lib/pending-balance-calculator.js | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index 8564f0134..29f1fd63a 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -32,9 +32,15 @@ class PendingBalanceCalculator {
 
   valueFor (tx) {
     const txValue = tx.txParams.value
-    const normalized = normalize(txValue).substring(2)
     const value = this.hexToBn(txValue)
-    return value
+    const gasPrice = this.hexToBn(tx.txParams.gasPrice)
+
+    const gas = tx.txParams.gas
+    const gasLimit = tx.txParams.gasLimit
+    const gasLimitBn = this.hexToBn(gas || gasLimit)
+
+    const gasCost = gasPrice.mul(gasLimitBn)
+    return value.add(gasCost)
   }
 
   hexToBn (hex) {

From 65c00e9fbbb4496db4adee13c227e47ba85837c6 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:53:30 -0700
Subject: [PATCH 12/13] Improve test name

---
 test/unit/pending-balance-test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/pending-balance-test.js b/test/unit/pending-balance-test.js
index 3029a849c..17be0306b 100644
--- a/test/unit/pending-balance-test.js
+++ b/test/unit/pending-balance-test.js
@@ -72,7 +72,7 @@ describe('PendingBalanceCalculator', function () {
       balanceCalculator = generateBalanceCalcWith(pendingTxs, etherBn)
     })
 
-    it('returns the network balance', async function () {
+    it('returns the subtracted result', async function () {
       const result = await balanceCalculator.getBalance()
       assert.equal(result, '0x0', `gave ${result} needed '0x0'`)
       return true

From d4d7c6d89eeddbe865e32b0f3636cc9de2a17cc1 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Sep 2017 12:54:28 -0700
Subject: [PATCH 13/13] Linted

---
 app/scripts/lib/pending-balance-calculator.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/scripts/lib/pending-balance-calculator.js b/app/scripts/lib/pending-balance-calculator.js
index 29f1fd63a..474ed3261 100644
--- a/app/scripts/lib/pending-balance-calculator.js
+++ b/app/scripts/lib/pending-balance-calculator.js
@@ -1,5 +1,4 @@
 const BN = require('ethereumjs-util').BN
-const EthQuery = require('ethjs-query')
 const normalize = require('eth-sig-util').normalize
 
 class PendingBalanceCalculator {
@@ -27,7 +26,7 @@ class PendingBalanceCalculator {
       return total.add(this.valueFor(tx))
     }, new BN(0))
 
-    return `0x${ balance.sub(pendingValue).toString(16) }`
+    return `0x${balance.sub(pendingValue).toString(16)}`
   }
 
   valueFor (tx) {