From 076b9758787a2148739b23ce87b48d69a8259905 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Tue, 22 May 2018 13:43:25 -0400
Subject: [PATCH 1/7] removed line that was causing issues

---
 shyftDb/shyft_database_util.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/shyftDb/shyft_database_util.go b/shyftDb/shyft_database_util.go
index 30fb97a020..09c50eb9ae 100644
--- a/shyftDb/shyft_database_util.go
+++ b/shyftDb/shyft_database_util.go
@@ -22,7 +22,7 @@ type SBlock struct {
 	Number   string
 	GasUsed	 string
 	GasLimit string
-	TxCount  stringgit@github.com:ShyftNetwork/shyft_go-ethereum.git
+	TxCount  string
 	UncleCount string
 	Age        string
 	ParentHash string

From 8e6ff5f621c414aef8df270107a1fd1b596bb106 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Tue, 22 May 2018 17:29:29 -0400
Subject: [PATCH 2/7] changed a few UI components

---
 shyftBlockExplorerUI/public/index.html        |  2 +-
 .../src/components/UI materials/loading.css   | 67 +++++++++++++++++++
 .../src/components/UI materials/loading.js    |  8 +++
 .../src/components/home/home.css              |  2 +
 .../src/components/home/home.js               |  2 +-
 .../components/table/accounts/accountRows.js  | 17 ++++-
 .../table/accounts/accountsTable.js           |  4 +-
 .../table/accounts/detailAccountsTable.js     |  8 ++-
 .../src/components/table/accounts/table.css   |  5 ++
 .../src/components/table/blocks/blockRows.js  |  5 +-
 .../src/components/table/blocks/blockTable.js |  4 +-
 .../table/transactions/transactionRow.js      |  1 +
 .../table/transactions/transactionTable.js    |  6 +-
 shyftBlockExplorerUI/src/containers/App.js    | 10 +--
 14 files changed, 122 insertions(+), 19 deletions(-)
 create mode 100644 shyftBlockExplorerUI/src/components/UI materials/loading.css
 create mode 100644 shyftBlockExplorerUI/src/components/UI materials/loading.js

diff --git a/shyftBlockExplorerUI/public/index.html b/shyftBlockExplorerUI/public/index.html
index 799c8d3180..d4b9ff03aa 100644
--- a/shyftBlockExplorerUI/public/index.html
+++ b/shyftBlockExplorerUI/public/index.html
@@ -21,7 +21,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>Block Explorer</title>
   </head>
   <body>
     <noscript>
diff --git a/shyftBlockExplorerUI/src/components/UI materials/loading.css b/shyftBlockExplorerUI/src/components/UI materials/loading.css
new file mode 100644
index 0000000000..cbaafaa9be
--- /dev/null
+++ b/shyftBlockExplorerUI/src/components/UI materials/loading.css	
@@ -0,0 +1,67 @@
+.Loader,
+.Loader:before,
+.Loader:after {
+    border-radius: 50%;
+}
+.Loader {
+    color: #521751;
+    font-size: 11px;
+    text-indent: -99999em;
+    margin: 55px auto;
+    position: relative;
+    width: 10em;
+    height: 10em;
+    box-shadow: inset 0 0 0 1em;
+    -webkit-transform: translateZ(0);
+    -ms-transform: translateZ(0);
+    transform: translateZ(0);
+}
+.Loader:before,
+.Loader:after {
+    position: absolute;
+    content: '';
+}
+.Loader:before {
+    width: 5.2em;
+    height: 10.2em;
+    background: #fff;
+    border-radius: 10.2em 0 0 10.2em;
+    top: -0.1em;
+    left: -0.1em;
+    -webkit-transform-origin: 5.2em 5.1em;
+    transform-origin: 5.2em 5.1em;
+    -webkit-animation: load2 2s infinite ease 1.5s;
+    animation: load2 2s infinite ease 1.5s;
+}
+.Loader:after {
+    width: 5.2em;
+    height: 10.2em;
+    background: #fff;
+    border-radius: 0 10.2em 10.2em 0;
+    top: -0.1em;
+    left: 5.1em;
+    -webkit-transform-origin: 0px 5.1em;
+    transform-origin: 0px 5.1em;
+    -webkit-animation: load2 2s infinite ease;
+    animation: load2 2s infinite ease;
+}
+@-webkit-keyframes load2 {
+    0% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    100% {
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
+@keyframes load2 {
+    0% {
+        -webkit-transform: rotate(0deg);
+        transform: rotate(0deg);
+    }
+    100% {
+        -webkit-transform: rotate(360deg);
+        transform: rotate(360deg);
+    }
+}
\ No newline at end of file
diff --git a/shyftBlockExplorerUI/src/components/UI materials/loading.js b/shyftBlockExplorerUI/src/components/UI materials/loading.js
new file mode 100644
index 0000000000..416fdc50bd
--- /dev/null
+++ b/shyftBlockExplorerUI/src/components/UI materials/loading.js	
@@ -0,0 +1,8 @@
+import React from 'react';
+import classes from './loading.css';
+
+const loading = () => (
+    <div className={classes.Loader}>Loading...</div>
+);
+
+export default loading;
\ No newline at end of file
diff --git a/shyftBlockExplorerUI/src/components/home/home.css b/shyftBlockExplorerUI/src/components/home/home.css
index a624cb6f4a..e8ca609b61 100644
--- a/shyftBlockExplorerUI/src/components/home/home.css
+++ b/shyftBlockExplorerUI/src/components/home/home.css
@@ -10,6 +10,8 @@
 }
 
 .Greeting {
+    padding-top: 5%;
+    padding-bottom: 5%;
     display: block;
 }
 
diff --git a/shyftBlockExplorerUI/src/components/home/home.js b/shyftBlockExplorerUI/src/components/home/home.js
index 06c2f110b1..46d25fe9d4 100644
--- a/shyftBlockExplorerUI/src/components/home/home.js
+++ b/shyftBlockExplorerUI/src/components/home/home.js
@@ -9,7 +9,7 @@ const home = props => {
     return (
        <div className={classes.Home}>
             <span className={classes.Greeting}>THIS IS A WIP</span>
-           <div className={classes.ButtonNav}>
+           <div>
            <div className={classes.Transactions}>
                <Link to="/transactions"><button className="btn btn-primary">Transactions</button></Link>
            </div>
diff --git a/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js b/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js
index 99db9d6dbe..fdd78a2766 100644
--- a/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js
+++ b/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js
@@ -21,15 +21,26 @@ class AccountTable extends Component {
     }
 
     render() {
-        const table = this.state.data.map((data, i) => {
+
+        let startNum = 1;
+        const sorted = [...this.state.data];
+            sorted.sort((a, b) => a.Balance > b.Balance);
+        const table = sorted.reverse().map((data, i) => {
+            const conversion = data.Balance / 1000000000000000000;
+            const total = sorted
+                .map(num => num.Balance / 1000000000000000000)
+                .reduce((acc, cur) => acc + cur ,0);
+            const percentage = ( (conversion / total) *100);
             return <AccountsTable
                 key={`${data.addr}${i}`}
+                Rank={startNum++}
+                Percentage={percentage.toFixed(2)}
                 Addr={data.Addr}
-                Balance={data.Balance}
+                Balance={conversion}
                 TxCountAccount={data.TxCountAccount}
                 detailAccountHandler={this.props.detailAccountHandler}
             />
-        })
+        });
 
         let combinedClasses = ['responsive-table', classes.table];
         return (
diff --git a/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js b/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js
index 152dde6c42..744e5e465f 100644
--- a/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js
+++ b/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js
@@ -6,12 +6,12 @@ const AccountsTable = (props) => {
     return (
           <tbody>
             <tr>
-                <td>1</td>
+                <td>{props.Rank}</td>
                 <td className={classes.addressTag}><Link to="/account/detail" onClick={() => props.detailAccountHandler(props.Addr)}>
                     {props.Addr}
                 </Link></td>
                 <td>{props.Balance}</td>
-                <td>12.01%</td>
+                <td>{props.Percentage}%</td>
                 <td>{props.TxCountAccount}</td>
             </tr>
             </tbody>
diff --git a/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsTable.js b/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsTable.js
index 4b7cedb9d1..ddeabc50fd 100644
--- a/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsTable.js
+++ b/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsTable.js
@@ -9,11 +9,17 @@ const DetailAccountsTable = (props) => {
         }else {
             flag = false
         }
+    let genFlag;
+    if(props.txHash.indexOf("GENESIS") !== -1) {
+        genFlag = false
+    }else {
+        genFlag = true
+    }
     return (
           <tbody>
             <tr>
                 <td className={classes.addressTag}>
-                    <Link to="/transaction/details" onClick={() => props.detailTransactionHandler(props.txHash)}>
+                    <Link to="/transaction/details" className={genFlag ? "" : classes.disabled} onClick={() => props.detailTransactionHandler(props.txHash)}>
                         {props.txHash}</Link>
                 </td>
                 <td>{props.blockNumber}</td>
diff --git a/shyftBlockExplorerUI/src/components/table/accounts/table.css b/shyftBlockExplorerUI/src/components/table/accounts/table.css
index 0dd7b521e7..e191b21ee3 100644
--- a/shyftBlockExplorerUI/src/components/table/accounts/table.css
+++ b/shyftBlockExplorerUI/src/components/table/accounts/table.css
@@ -77,4 +77,9 @@ th {
     text-transform: uppercase;
     text-align: center;
     vertical-align: middle;
+}
+
+.disabled {
+    pointer-events: none;
+    color: black;
 }
\ No newline at end of file
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js
index 900f3cf1d5..826f29452b 100644
--- a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js
@@ -1,5 +1,6 @@
 import React, { Component } from 'react';
 import BlockTable from './blockTable';
+import Loading from '../../UI materials/loading'
 import classes from './table.css';
 import axios from "axios/index";
 
@@ -35,7 +36,7 @@ class BlocksTable extends Component {
                 TxCount={data.TxCount}
                 detailBlockHandler={this.props.detailBlockHandler}
             />
-        })
+        });
 
         let combinedClasses = ['responsive-table', classes.table];
         return (
@@ -54,7 +55,7 @@ class BlocksTable extends Component {
                     <th scope="col">Reward</th>
                 </tr>
                 </thead>
-                {table}
+                        {table}
             </table>
         );
     }
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js
index aa66bee9f2..81aabfeaad 100644
--- a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js
@@ -16,8 +16,8 @@ const BlockTable = (props) => {
                 <td className={classes.addressTag}>{props.Coinbase}</td>
                 <td>{props.GasUsed}</td>
                 <td>{props.GasLimit}</td>
-                <td>12.01</td>
-                <td>3.2</td>
+                <td>TBD</td>
+                <td>TBD</td>
             </tr>
             </tbody>
     )
diff --git a/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js b/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js
index 76bd341d5c..0806cf78c9 100644
--- a/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js
+++ b/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js
@@ -35,6 +35,7 @@ class TransactionTable extends Component {
                 value={data.Amount}
                 cost={data.Cost}
                 detailTransactionHandler={this.props.detailTransactionHandler}
+                detailAccountHandler={this.props.detailAccountHandler}
             />
         })
 
diff --git a/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js b/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js
index a4b399efc5..ae32a137e9 100644
--- a/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js
+++ b/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js
@@ -5,7 +5,7 @@ import { Link } from 'react-router-dom'
 
 const TransactionTable = (props) => {
     let flag;
-    if(props.txHash.indexOf("GENESIS") != -1) {
+    if(props.txHash.indexOf("GENESIS") !== -1) {
         flag = false
     }else {
         flag = true
@@ -20,9 +20,9 @@ const TransactionTable = (props) => {
                 </td>
                 <td>{props.blockNumber}</td>
                 <td>{props.age}</td>
-                <td className={classes.fromTag}>{props.from}</td>
+                <td className={flag ? classes.fromTag : classes.disabled }><Link to="/account/detail" onClick={() => props.detailAccountHandler(props.from)}>{props.from}</Link></td>
                 <td><img className={classes.arrow} src={arrow} alt="arrow"/></td>
-                <td className={classes.toTag}>{props.to}</td>
+                <td className={classes.toTag}><Link to="/account/detail" onClick={() => props.detailAccountHandler(props.to)}>{props.to}</Link></td>
                 <td>{props.value}</td>
                 <td>{props.cost}</td>
             </tr>
diff --git a/shyftBlockExplorerUI/src/containers/App.js b/shyftBlockExplorerUI/src/containers/App.js
index f1561f6f63..3301e296c0 100644
--- a/shyftBlockExplorerUI/src/containers/App.js
+++ b/shyftBlockExplorerUI/src/containers/App.js
@@ -43,7 +43,7 @@ class App extends Component {
         catch(error) {
            console.log(error)
         }
-    }
+    };
 
     detailTransactionHandler = async(txHash) => {
         try {
@@ -53,7 +53,7 @@ class App extends Component {
         catch(error) {
             console.log(error)
         }
-    }
+    };
 
     detailAccountHandler = async(addr) => {
         try {
@@ -63,7 +63,7 @@ class App extends Component {
         catch(error) {
             console.log(error)
         }
-    }
+    };
 
   render() {
     return (
@@ -78,7 +78,9 @@ class App extends Component {
           <Route path="/transactions" render={({match}) =>
               <div>
                   <TransactionHeader />
-                  <TransactionRow detailTransactionHandler={this.detailTransactionHandler}/>
+                  <TransactionRow
+                      detailTransactionHandler={this.detailTransactionHandler}
+                      detailAccountHandler={this.detailAccountHandler}/>
               </div>}
           />
 

From f9b1ed77b4cc9bb57f9711f81d1a30e9355ec122 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Wed, 23 May 2018 14:32:23 -0400
Subject: [PATCH 3/7] added rewards to UI

---
 .../components/table/accounts/accountRows.js  |  4 +-
 .../src/components/table/blocks/blockRows.js  |  4 +-
 .../src/components/table/blocks/blockTable.js |  2 +-
 .../table/blocks/blocksDetailsRow.js          |  7 +-
 .../components/table/transactions/blockTx.js  | 51 +++++++++++++++
 .../transactions/transactionDetailsRow.js     |  3 +-
 .../table/transactions/transactionRow.js      |  4 +-
 .../table/transactions/transactionTable.js    |  2 +-
 shyftBlockExplorerUI/src/containers/App.js    | 32 +++++++++-
 shyftDb/postgres_setup/create_tables.psql     |  1 +
 shyftDb/shyft_database_util.go                | 64 ++++++++++++-------
 11 files changed, 140 insertions(+), 34 deletions(-)
 create mode 100644 shyftBlockExplorerUI/src/components/table/transactions/blockTx.js

diff --git a/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js b/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js
index fdd78a2766..da0b7aa3c9 100644
--- a/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js
+++ b/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js
@@ -26,9 +26,9 @@ class AccountTable extends Component {
         const sorted = [...this.state.data];
             sorted.sort((a, b) => a.Balance > b.Balance);
         const table = sorted.reverse().map((data, i) => {
-            const conversion = data.Balance / 1000000000000000000;
+            const conversion = data.Balance / 10000000000000000000;
             const total = sorted
-                .map(num => num.Balance / 1000000000000000000)
+                .map(num => num.Balance / 10000000000000000000)
                 .reduce((acc, cur) => acc + cur ,0);
             const percentage = ( (conversion / total) *100);
             return <AccountsTable
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js
index 826f29452b..daf5798345 100644
--- a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js
@@ -14,7 +14,7 @@ class BlocksTable extends Component {
 
     async componentDidMount() {
         try {
-            const response = await axios.get("http://localhost:8080/api/get_all_blocks")
+            const response = await axios.get("http://localhost:8080/api/get_all_blocks");
             await this.setState({data: response.data});
         } catch (err) {
             console.log(err);
@@ -24,6 +24,7 @@ class BlocksTable extends Component {
 
     render() {
         const table = this.state.data.map((data, i) => {
+            const conversion = data.Rewards / 10000000000000000000;
             return <BlockTable
                 key={`${data.TxHash}${i}`}
                 Hash={data.Hash}
@@ -34,6 +35,7 @@ class BlocksTable extends Component {
                 GasLimit={data.GasLimit}
                 UncleCount={data.UncleCount}
                 TxCount={data.TxCount}
+                Reward={conversion}
                 detailBlockHandler={this.props.detailBlockHandler}
             />
         });
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js
index 81aabfeaad..52ccdebd28 100644
--- a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js
@@ -17,7 +17,7 @@ const BlockTable = (props) => {
                 <td>{props.GasUsed}</td>
                 <td>{props.GasLimit}</td>
                 <td>TBD</td>
-                <td>TBD</td>
+                <td>{props.Reward}</td>
             </tr>
             </tbody>
     )
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blocksDetailsRow.js b/shyftBlockExplorerUI/src/components/table/blocks/blocksDetailsRow.js
index dc881a5b9c..12d06bc0b6 100644
--- a/shyftBlockExplorerUI/src/components/table/blocks/blocksDetailsRow.js
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blocksDetailsRow.js
@@ -1,10 +1,11 @@
 import React, { Component } from 'react';
 import classes from './table.css';
+import { Link } from 'react-router-dom'
 
 class DetailBlockTable extends Component {
 
     render() {
-        let data = this.props.data
+        let data = this.props.data;
         let combinedClasses = ['responsive-table', classes.table];
         return (
             <table className={combinedClasses.join(' ')}>
@@ -19,7 +20,7 @@ class DetailBlockTable extends Component {
                 </tr>
                 <tr>
                     <th scope="col">Txn:</th>
-                    <td>{data.TxCount} transactions</td>
+                    <td><Link to="/block/transactions" onClick={() => this.props.getBlockTransactions(data.Number)}>{data.TxCount} transactions</Link></td>
                 </tr>
                 <tr>
                     <th scope="col">Block Hash:</th>
@@ -67,7 +68,7 @@ class DetailBlockTable extends Component {
                 </tr>
                 <tr>
                     <th scope="col">Reward:</th>
-                    <td>TBD</td>
+                    <td>{data.Rewards}</td>
                 </tr>
                 </tbody>
             </table>
diff --git a/shyftBlockExplorerUI/src/components/table/transactions/blockTx.js b/shyftBlockExplorerUI/src/components/table/transactions/blockTx.js
new file mode 100644
index 0000000000..afdfd709b7
--- /dev/null
+++ b/shyftBlockExplorerUI/src/components/table/transactions/blockTx.js
@@ -0,0 +1,51 @@
+import React, { Component } from 'react';
+import TransactionsTable from './transactionTable';
+import classes from './table.css';
+
+class BlockTransactionTable extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            data: []
+        };
+    }
+
+    render() {
+        const table = this.props.data.map((data, i) => {
+            const conversion = data.Cost / 10000000000000000000;
+            return <TransactionsTable
+                key={`${data.TxHash}${i}`}
+                age={data.Age}
+                txHash={data.TxHash}
+                blockNumber={data.BlockNumber}
+                to={data.To}
+                from={data.From}
+                value={data.Amount}
+                cost={conversion}
+                getBlockTransactions={this.props.getBlockTransactions}
+                detailTransactionHandler={this.props.detailTransactionHandler}
+                detailAccountHandler={this.props.detailAccountHandler}
+            />
+        })
+
+        let combinedClasses = ['responsive-table', classes.table];
+        return (
+            <table key={this.props.data.TxHash} className={combinedClasses.join(' ')}>
+                <thead className={classes.tHead}>
+                <tr>
+                    <th scope="col">TxHash</th>
+                    <th scope="col">Block</th>
+                    <th scope="col">Age</th>
+                    <th scope="col">From</th>
+                    <th scope="col"></th>
+                    <th scope="col">To</th>
+                    <th scope="col">Value</th>
+                    <th scope="col">TxFee</th>
+                </tr>
+                </thead>
+                {table}
+            </table>
+        );
+    }
+}
+export default BlockTransactionTable;
diff --git a/shyftBlockExplorerUI/src/components/table/transactions/transactionDetailsRow.js b/shyftBlockExplorerUI/src/components/table/transactions/transactionDetailsRow.js
index 889bb3e33f..e130feb577 100644
--- a/shyftBlockExplorerUI/src/components/table/transactions/transactionDetailsRow.js
+++ b/shyftBlockExplorerUI/src/components/table/transactions/transactionDetailsRow.js
@@ -6,6 +6,7 @@ class DetailTransactionTable extends Component {
     render() {
         let data = this.props.data
         let combinedClasses = ['responsive-table', classes.table];
+        const conversion = data.Cost / 10000000000000000000;
         return (
             <table className={combinedClasses.join(' ')}>
                 <tbody>
@@ -51,7 +52,7 @@ class DetailTransactionTable extends Component {
                 </tr>
                 <tr>
                     <th scope="col">Actual Tx Cost/Fee:</th>
-                    <td>{data.Cost}</td>
+                    <td>{conversion}</td>
                 </tr>
                 <tr>
                     <th scope="col">Nonce:</th>
diff --git a/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js b/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js
index 0806cf78c9..af3f4f0b94 100644
--- a/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js
+++ b/shyftBlockExplorerUI/src/components/table/transactions/transactionRow.js
@@ -25,6 +25,7 @@ class TransactionTable extends Component {
     render() {
 
         const table = this.state.data.map((data, i) => {
+            const conversion = data.Cost / 10000000000000000000;
             return <TransactionsTable
                 key={`${data.TxHash}${i}`}
                 age={data.Age}
@@ -33,7 +34,8 @@ class TransactionTable extends Component {
                 to={data.To}
                 from={data.From}
                 value={data.Amount}
-                cost={data.Cost}
+                cost={conversion}
+                getBlockTransactions={this.props.getBlockTransactions}
                 detailTransactionHandler={this.props.detailTransactionHandler}
                 detailAccountHandler={this.props.detailAccountHandler}
             />
diff --git a/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js b/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js
index ae32a137e9..71ea807e01 100644
--- a/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js
+++ b/shyftBlockExplorerUI/src/components/table/transactions/transactionTable.js
@@ -18,7 +18,7 @@ const TransactionTable = (props) => {
                     <Link to="/transaction/details" className={flag ? "" : classes.disabled} onClick={() => props.detailTransactionHandler(props.txHash)}>
                         {props.txHash}</Link>
                 </td>
-                <td>{props.blockNumber}</td>
+                <td><Link to="/block/transactions" onClick={() => props.getBlockTransactions(props.blockNumber)}>{props.blockNumber}</Link></td>
                 <td>{props.age}</td>
                 <td className={flag ? classes.fromTag : classes.disabled }><Link to="/account/detail" onClick={() => props.detailAccountHandler(props.from)}>{props.from}</Link></td>
                 <td><img className={classes.arrow} src={arrow} alt="arrow"/></td>
diff --git a/shyftBlockExplorerUI/src/containers/App.js b/shyftBlockExplorerUI/src/containers/App.js
index 3301e296c0..a4fb1a571f 100644
--- a/shyftBlockExplorerUI/src/containers/App.js
+++ b/shyftBlockExplorerUI/src/containers/App.js
@@ -11,6 +11,8 @@ import TransactionRow from '../components/table/transactions/transactionRow';
 import TransactionHeader from "../components/nav/transactionHeader/transactionHeader";
 import TransactionDetailHeader from "../components/nav/transactionHeader/transactionDetailHeader";
 import DetailTransactionTable from "../components/table/transactions/transactionDetailsRow";
+import BlockTxs from "../components/table/transactions/blockTx";
+
 ///**BLOCKS**///
 import BlocksRow from '../components/table/blocks/blockRows';
 import DetailBlockTable from '../components/table/blocks/blocksDetailsRow';
@@ -31,6 +33,7 @@ class App extends Component {
         blockDetailData: [],
         transactionDetailData: [],
         accountDetailData: [],
+        blockTransactions: [],
         reqAccount: ''
     };
   }
@@ -65,6 +68,16 @@ class App extends Component {
         }
     };
 
+    getBlockTransactions = async(blockNumber) => {
+        try {
+            const response = await axios.get(`http://localhost:8080/api/get_all_transactions_from_block/${blockNumber}`)
+            await this.setState({ blockTransactions: response.data })
+        }
+        catch(error) {
+            console.log(error)
+        }
+    };
+
   render() {
     return (
         <BrowserRouter>
@@ -79,6 +92,7 @@ class App extends Component {
               <div>
                   <TransactionHeader />
                   <TransactionRow
+                      getBlockTransactions={this.getBlockTransactions}
                       detailTransactionHandler={this.detailTransactionHandler}
                       detailAccountHandler={this.detailAccountHandler}/>
               </div>}
@@ -87,7 +101,9 @@ class App extends Component {
           <Route path="/blocks" exact render={({match}) =>
               <div>
                   <BlockHeader/>
-                  <BlocksRow detailBlockHandler={this.detailBlockHandler}/>
+                  <BlocksRow
+                      getBlockTransactions={this.getBlockTransactions}
+                      detailBlockHandler={this.detailBlockHandler}/>
               </div>}
           />
 
@@ -112,10 +128,24 @@ class App extends Component {
                   <BlockDetailHeader
                       blockNumber={this.state.blockDetailData.Number}/>
                   <DetailBlockTable
+                      getBlockTransactions={this.getBlockTransactions}
                       data={this.state.blockDetailData}/>
               </div>}
           />
 
+          <Route path="/block/transactions" exact render={({match}) =>
+              <div>
+                  {/*<BlockDetailHeader*/}
+                      {/*blockNumber={this.state.blockTransactions.BlockNumber}/>*/}
+                  <BlockTxs
+                      data={this.state.blockTransactions}
+                      getBlockTransactions={this.getBlockTransactions}
+                      detailTransactionHandler={this.detailTransactionHandler}
+                      detailAccountHandler={this.detailAccountHandler}/>
+
+              </div>}
+          />
+
           <Route path="/account/detail" exact render={({match}) =>
               <div>
                   <AccountDetailHeader
diff --git a/shyftDb/postgres_setup/create_tables.psql b/shyftDb/postgres_setup/create_tables.psql
index b0bdb516d3..e1fa00141a 100644
--- a/shyftDb/postgres_setup/create_tables.psql
+++ b/shyftDb/postgres_setup/create_tables.psql
@@ -11,6 +11,7 @@ CREATE TABLE IF NOT EXISTS blocks (
   difficulty bigint,
   size text,
   nonce numeric,
+  rewards numeric,
   number bigint
 );
 
diff --git a/shyftDb/shyft_database_util.go b/shyftDb/shyft_database_util.go
index 09c50eb9ae..0e0b4a365b 100644
--- a/shyftDb/shyft_database_util.go
+++ b/shyftDb/shyft_database_util.go
@@ -30,6 +30,7 @@ type SBlock struct {
 	Difficulty string
 	Size string
 	Nonce string
+	Rewards string
 }
 
 //blockRes struct
@@ -104,12 +105,7 @@ type SendAndReceive struct {
 
 //WriteBlock writes to block info to sql db
 func WriteBlock(sqldb *sql.DB, block *types.Block, receipts []*types.Receipt) error {
-	//Need to create field in postgres db isContract : True || False
-	//Need to fix nonce numeric issue (attempt to reproduce and record)
-	//Need to update tx To Field where null with Contract Address
-	//Need to update account table with that Contract Address
-	//Need to update AccountNonce and Balance of Tx To field || Contract Address
-	WriteMinerRewards(sqldb,block)
+	rewards := WriteMinerRewards(sqldb,block)
 	coinbase := block.Header().Coinbase.String()
 	number := block.Header().Number.String()
 	gasUsed := block.Header().GasUsed
@@ -128,15 +124,14 @@ func WriteBlock(sqldb *sql.DB, block *types.Block, receipts []*types.Receipt) er
 	}
 	age := time.Unix(i, 0)
 
-	sqlStatement := `INSERT INTO blocks(hash, coinbase, number, gasUsed, gasLimit, txCount, uncleCount, age, parentHash, uncleHash, difficulty, size, nonce) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10), ($11), ($12),($13)) RETURNING number`
-	qerr := sqldb.QueryRow(sqlStatement, block.Header().Hash().Hex(), coinbase, number, gasUsed, gasLimit, txCount, uncleCount, age, parentHash, uncleHash, blockDifficulty, blockSize, blockNonce).Scan(&number)
+	sqlStatement := `INSERT INTO blocks(hash, coinbase, number, gasUsed, gasLimit, txCount, uncleCount, age, parentHash, uncleHash, difficulty, size, rewards, nonce) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10), ($11), ($12),($13), ($14)) RETURNING number`
+	qerr := sqldb.QueryRow(sqlStatement, block.Header().Hash().Hex(), coinbase, number, gasUsed, gasLimit, txCount, uncleCount, age, parentHash, uncleHash, blockDifficulty, blockSize, rewards, blockNonce).Scan(&number)
 	if qerr != nil {
 		panic(qerr)
 	}
 
 	if block.Transactions().Len() > 0 {
 		for _, tx := range block.Transactions() {
-			//WriteMinerRewards(sqldb, block)
 			WriteTransactions(sqldb, tx, block.Header().Hash(), block.Header().Number.String(), receipts, age, gasLimit)
 			if block.Transactions()[0].To() != nil {
 				WriteFromBalance(sqldb, tx)
@@ -411,7 +406,7 @@ func WriteBalanceHelper(sqldb *sql.DB, tx *types.Transaction) (SendAndReceive, s
 // uncle blocks, account balance updates based on reorgs, diverges that get dropped.
 // Reason for this is because the accounts are not deterministic like the block and tx hashes.
 // @TODO: Calculate reorg
-func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
+func WriteMinerRewards(sqldb *sql.DB, block *types.Block) string {
 	minerAddr := block.Coinbase().String()
 	shyftConduitAddress := Rewards.ShyftNetworkConduitAddress.String()
 	// Calculate the total gas used in the block
@@ -443,9 +438,18 @@ func WriteMinerRewards(sqldb *sql.DB, block *types.Block) {
 
 	StoreReward(sqldb, minerAddr, totalMinerReward)
 	StoreReward(sqldb, shyftConduitAddress, Rewards.ShyftNetworkBlockReward)
+	var uncRewards = new(big.Int)
 	for i := 0; i < len(uncleAddrs); i++ {
+		uncRewards := uncleRewards[i]
+		fmt.Println(uncRewards)
 		StoreReward(sqldb, uncleAddrs[i], uncleRewards[i])
 	}
+
+	fullRewardValue := new(big.Int)
+	fullRewardValue.Add(totalMinerReward, Rewards.ShyftNetworkBlockReward)
+	fullRewardValue.Add(fullRewardValue, uncRewards)
+
+	return fullRewardValue.String()
 }
 
 func StoreReward(sqldb *sql.DB, address string, reward *big.Int) {
@@ -497,16 +501,7 @@ func GetAllBlocks(sqldb *sql.DB) string {
 	var arr blockRes
 	var blockArr string
 	rows, err := sqldb.Query(`
-		SELECT
-			hash,
-			coinbase,
-			gasused,
-			gaslimit,
-			txcount,
-			unclecount,
-			age,
-			number
-		FROM blocks`)
+		SELECT * FROM blocks`)
 	if err != nil {
 		fmt.Println("err")
 	}
@@ -520,6 +515,12 @@ func GetAllBlocks(sqldb *sql.DB) string {
 		var txCount string
 		var uncleCount string
 		var age string
+		var parentHash string
+		var uncleHash string
+		var difficulty string
+		var size string
+		var nonce string
+		var rewards string
 		var num string
 
 		err = rows.Scan(
@@ -530,8 +531,13 @@ func GetAllBlocks(sqldb *sql.DB) string {
 			&txCount,
 			&uncleCount,
 			&age,
-			&num,
-		)
+			&parentHash,
+			&uncleHash,
+			&difficulty,
+			&size,
+			&nonce,
+			&rewards,
+			&num,)
 
 		arr.Blocks = append(arr.Blocks, SBlock{
 			Hash:     hash,
@@ -541,6 +547,12 @@ func GetAllBlocks(sqldb *sql.DB) string {
 			TxCount: txCount,
 			UncleCount: uncleCount,
 			Age: age,
+			ParentHash:parentHash,
+			UncleHash:uncleHash,
+			Difficulty:difficulty,
+			Size: size,
+			Nonce:nonce,
+			Rewards: rewards,
 			Number:   num,
 		})
 
@@ -568,6 +580,7 @@ func GetBlock(sqldb *sql.DB, blockNumber string) string {
 	var difficulty string
 	var size string
 	var nonce string
+	var rewards string
 	var num string
 	row.Scan(
 		&hash,
@@ -582,6 +595,7 @@ func GetBlock(sqldb *sql.DB, blockNumber string) string {
 		&difficulty,
 		&size,
 		&nonce,
+		&rewards,
 		&num,)
 
 	block := SBlock{
@@ -597,6 +611,7 @@ func GetBlock(sqldb *sql.DB, blockNumber string) string {
 		Difficulty:difficulty,
 		Size: size,
 		Nonce:nonce,
+		Rewards: rewards,
 		Number:   num,
 	}
 	json, _ := json.Marshal(block)
@@ -618,6 +633,7 @@ func GetRecentBlock(sqldb *sql.DB) string {
 	var difficulty string
 	var size string
 	var nonce string
+	var rewards string
 	var num string
 	row.Scan(
 		&hash,
@@ -632,6 +648,7 @@ func GetRecentBlock(sqldb *sql.DB) string {
 		&difficulty,
 		&size,
 		&nonce,
+		&rewards,
 		&num,)
 
 	block := SBlock{
@@ -647,6 +664,7 @@ func GetRecentBlock(sqldb *sql.DB) string {
 		Difficulty:difficulty,
 		Size: size,
 		Nonce:nonce,
+		Rewards: rewards,
 		Number:   num,
 	}
 	json, _ := json.Marshal(block)
@@ -656,7 +674,7 @@ func GetRecentBlock(sqldb *sql.DB) string {
 func GetAllTransactionsFromBlock(sqldb *sql.DB, blockNumber string) string {
 	var arr txRes
 	var txx string
-	sqlStatement := `SELECT * FROM txs WHERE blockNumber=$1`
+	sqlStatement := `SELECT * FROM txs WHERE blocknumber=$1`
 	rows, err := sqldb.Query(sqlStatement, blockNumber)
 	if err != nil {
 		fmt.Println("err")

From 020d720beab799410fa049cc4541ed5829d29385 Mon Sep 17 00:00:00 2001
From: Tim Williams <timwilliams@fastmail.com>
Date: Wed, 23 May 2018 16:32:49 -0400
Subject: [PATCH 4/7] add test cases for tokens

---
 simulations/token_test/README.md    |  9 +++++++++
 simulations/token_test/calltx.js    |  9 +++++++++
 simulations/token_test/deploy.js    | 17 +++++++++++++++++
 simulations/token_test/package.json | 14 ++++++++++++++
 simulations/token_test/token.sol    | 21 +++++++++++++++++++++
 5 files changed, 70 insertions(+)
 create mode 100644 simulations/token_test/README.md
 create mode 100644 simulations/token_test/calltx.js
 create mode 100644 simulations/token_test/deploy.js
 create mode 100644 simulations/token_test/package.json
 create mode 100644 simulations/token_test/token.sol

diff --git a/simulations/token_test/README.md b/simulations/token_test/README.md
new file mode 100644
index 0000000000..1160be7a88
--- /dev/null
+++ b/simulations/token_test/README.md
@@ -0,0 +1,9 @@
+`npm install`
+run `node deploy.js` to deploy the contract.
+
+this will log out a contract in the geth logs.
+
+set the ADDR environment variable to this contract address.  
+ie `export ADDR=<contract_addr>`
+
+then run `node calltx.js` 
diff --git a/simulations/token_test/calltx.js b/simulations/token_test/calltx.js
new file mode 100644
index 0000000000..f5b5896bd9
--- /dev/null
+++ b/simulations/token_test/calltx.js
@@ -0,0 +1,9 @@
+var Web3 = require('web3')
+var web3 = new Web3(new Web3.providers.HttpProvider("http://127.0.0.1:8545"));
+var contract_address = process.env.ADDR
+
+var mytokenContract = web3.eth.contract([{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[{"name":"initialSupply","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}]).at(contract_address)
+
+console.log(mytokenContract.balanceOf('0x43EC6d0942f7fAeF069F7F63D0384a27f529B062'))
+
+mytokenContract.transfer.sendTransaction('0x9e602164C5826ebb5A6B68E4AFD9Cd466043dc4A', 3, {from: '0x43EC6d0942f7fAeF069F7F63D0384a27f529B062', gas: 3000000})
diff --git a/simulations/token_test/deploy.js b/simulations/token_test/deploy.js
new file mode 100644
index 0000000000..65290fec83
--- /dev/null
+++ b/simulations/token_test/deploy.js
@@ -0,0 +1,17 @@
+var Web3 = require('web3')
+var web3 = new Web3(new Web3.providers.HttpProvider("http://127.0.0.1:8545"));
+
+var initialSupply = 50000
+var mytokenContract = web3.eth.contract([{"constant":true,"inputs":[{"name":"","type":"address"}],"name":"balanceOf","outputs":[{"name":"","type":"uint256"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[{"name":"_to","type":"address"},{"name":"_value","type":"uint256"}],"name":"transfer","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"},{"inputs":[{"name":"initialSupply","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"constructor"}]);
+var mytoken = mytokenContract.new(
+   initialSupply,
+   {
+     from: web3.eth.accounts[0], 
+     data: '0x608060405234801561001057600080fd5b5060405160208061033583398101806040528101908080519060200190929190505050806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550506102af806100866000396000f30060806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff16806370a0823114610051578063a9059cbb146100a8575b600080fd5b34801561005d57600080fd5b50610092600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291905050506100f5565b6040518082815260200191505060405180910390f35b3480156100b457600080fd5b506100f3600480360381019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061010d565b005b60006020528060005260406000206000915090505481565b806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020541015151561015a57600080fd5b6000808373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205401101515156101e757600080fd5b806000803373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008282540392505081905550806000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000828254019250508190555050505600a165627a7a72305820c12ed9899b0830fb3b1c8938b12a5e3ee651fb5e6febea7863ea990d72ab04420029', 
+     gas: '4700000'
+   }, function (e, contract){
+    console.log(e, contract);
+    if (typeof contract.address !== 'undefined') {
+         console.log('Contract mined! address: ' + contract.address + ' transactionHash: ' + contract.transactionHash);
+    }
+ })
diff --git a/simulations/token_test/package.json b/simulations/token_test/package.json
new file mode 100644
index 0000000000..f91a027ade
--- /dev/null
+++ b/simulations/token_test/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "token_contract",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "web3": "^0.20.5"
+  }
+}
diff --git a/simulations/token_test/token.sol b/simulations/token_test/token.sol
new file mode 100644
index 0000000000..704e809d2a
--- /dev/null
+++ b/simulations/token_test/token.sol
@@ -0,0 +1,21 @@
+pragma solidity ^0.4.20;
+
+contract MyToken {
+    /* This creates an array with all balances */
+    mapping (address => uint256) public balanceOf;
+
+    /* Initializes contract with initial supply tokens to the creator of the contract */
+    function MyToken(
+        uint256 initialSupply
+        ) public {
+        balanceOf[msg.sender] = initialSupply;              // Give the creator all initial tokens
+    }
+
+    /* Send coins */
+    function transfer(address _to, uint256 _value) public {
+        require(balanceOf[msg.sender] >= _value);           // Check if the sender has enough
+        require(balanceOf[_to] + _value >= balanceOf[_to]); // Check for overflows
+        balanceOf[msg.sender] -= _value;                    // Subtract from the sender
+        balanceOf[_to] += _value;                           // Add the same to the recipient
+    }
+}

From 3a9affe2a0bade8922748083adde6374bb103ce2 Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Thu, 24 May 2018 10:10:25 -0400
Subject: [PATCH 5/7] UI changes for rewards

---
 blockExplorerApi/handler.go                   | 23 ++++++-
 blockExplorerApi/routes.go                    |  6 ++
 .../nav/blockHeaders/blockCoinbaseHeader.js   | 12 ++++
 .../table/accounts/detailAccountsRow.js       |  7 +-
 .../src/components/table/blocks/blockRows.js  |  1 +
 .../src/components/table/blocks/blockTable.js |  2 +-
 .../components/table/blocks/blocksMined.js    | 55 ++++++++++++++++
 .../table/blocks/blocksMinedTable.js          | 26 ++++++++
 shyftBlockExplorerUI/src/containers/App.js    | 32 ++++++++-
 shyftDb/shyft_database_util.go                | 66 +++++++++++++++++++
 10 files changed, 224 insertions(+), 6 deletions(-)
 create mode 100644 shyftBlockExplorerUI/src/components/nav/blockHeaders/blockCoinbaseHeader.js
 create mode 100644 shyftBlockExplorerUI/src/components/table/blocks/blocksMined.js
 create mode 100644 shyftBlockExplorerUI/src/components/table/blocks/blocksMinedTable.js

diff --git a/blockExplorerApi/handler.go b/blockExplorerApi/handler.go
index a030a6b07a..b84d5d3537 100644
--- a/blockExplorerApi/handler.go
+++ b/blockExplorerApi/handler.go
@@ -74,13 +74,34 @@ func GetAllTransactionsFromBlock(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-
 	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
 	w.WriteHeader(http.StatusOK)
 
 	fmt.Fprintln(w, txsFromBlock)
 }
 
+func GetAllBlocksMinedByAddress(w http.ResponseWriter, r *http.Request) {
+	vars := mux.Vars(r)
+	coinbase := vars["coinbase"]
+	connStr := "user=postgres dbname=shyftdb sslmode=disable"
+	blockExplorerDb, err := sql.Open("postgres", connStr)
+	if err != nil {
+		return
+	}
+
+	blocksMined := shyftdb.GetAllBlocksMinedByAddress(blockExplorerDb, coinbase)
+
+	if err != nil {
+		http.Error(w, err.Error(), 500)
+		return
+	}
+
+	w.Header().Set("Content-Type", "application/json; charset=UTF-8")
+	w.WriteHeader(http.StatusOK)
+
+	fmt.Fprintln(w, blocksMined)
+}
+
 // GetAccount gets balance
 func GetAccount(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
diff --git a/blockExplorerApi/routes.go b/blockExplorerApi/routes.go
index a08e207f6e..4ce0dc80c8 100644
--- a/blockExplorerApi/routes.go
+++ b/blockExplorerApi/routes.go
@@ -69,6 +69,12 @@ var routes = Routes{
 		Pattern: "/api/get_all_transactions_from_block/{blockNumber}",
 		HandlerFunc: GetAllTransactionsFromBlock,
 	},
+	Route{
+		Name: "GetAllBlocksMinedByAddress",
+		Method: "GET",
+		Pattern: "/api/get_blocks_mined/{coinbase}",
+		HandlerFunc: GetAllBlocksMinedByAddress,
+	},
 	Route{
 		"GetInternalTransactions",
 		"GET",
diff --git a/shyftBlockExplorerUI/src/components/nav/blockHeaders/blockCoinbaseHeader.js b/shyftBlockExplorerUI/src/components/nav/blockHeaders/blockCoinbaseHeader.js
new file mode 100644
index 0000000000..a368883b9c
--- /dev/null
+++ b/shyftBlockExplorerUI/src/components/nav/blockHeaders/blockCoinbaseHeader.js
@@ -0,0 +1,12 @@
+import React from 'react';
+import classes from '../nav.css';
+
+const blocksCoinbaseHeader = (props) => {
+    return (
+        <div className={classes.Secondary}>
+            <span className={classes.Transactions}>Coinbase: {props.data.Coinbase}</span>
+        </div>
+    )
+};
+
+export default blocksCoinbaseHeader;
\ No newline at end of file
diff --git a/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsRow.js b/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsRow.js
index cec0b9e8de..45f8c3bf21 100644
--- a/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsRow.js
+++ b/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsRow.js
@@ -10,6 +10,11 @@ class AccountTransactionTable extends Component {
            return <ErrorHandler />
         }else {
             table = this.props.data.map((data, i) => {
+                console.log(this.props.data)
+                // const total = this.props.data
+                //     .map(num => num.Balance / 10000000000000000000)
+                //     .reduce((acc, cur) => acc + cur ,0);
+                const conversion = data.Cost / 10000000000000000000;
                 return <DetailAccountsTable
                     key={`${data.TxHash}${i}`}
                     age={data.Age}
@@ -18,7 +23,7 @@ class AccountTransactionTable extends Component {
                     to={data.To}
                     from={data.From}
                     value={data.Amount}
-                    cost={data.Cost}
+                    cost={conversion}
                     addr={this.props.addr}
                     detailTransactionHandler={this.props.transactionDetailHandler}
                 />
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js
index daf5798345..378e48ecfb 100644
--- a/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blockRows.js
@@ -37,6 +37,7 @@ class BlocksTable extends Component {
                 TxCount={data.TxCount}
                 Reward={conversion}
                 detailBlockHandler={this.props.detailBlockHandler}
+                getBlocksMined={this.props.getBlocksMined}
             />
         });
 
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js
index 52ccdebd28..0f0a025832 100644
--- a/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blockTable.js
@@ -13,7 +13,7 @@ const BlockTable = (props) => {
                 <td>{props.Age}</td>
                 <td>{props.TxCount}</td>
                 <td>{props.UncleCount}</td>
-                <td className={classes.addressTag}>{props.Coinbase}</td>
+                <td className={classes.addressTag}><Link to="/mined/blocks" onClick={() => props.getBlocksMined(props.Coinbase)}>{props.Coinbase}</Link></td>
                 <td>{props.GasUsed}</td>
                 <td>{props.GasLimit}</td>
                 <td>TBD</td>
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blocksMined.js b/shyftBlockExplorerUI/src/components/table/blocks/blocksMined.js
new file mode 100644
index 0000000000..782da7fe42
--- /dev/null
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blocksMined.js
@@ -0,0 +1,55 @@
+import React, { Component } from 'react';
+import MinedBlockTable from './blocksMinedTable';
+import Loading from '../../UI materials/loading'
+import classes from './table.css';
+
+class BlocksMinedTable extends Component {
+    constructor(props) {
+        super(props);
+        this.state = {
+            data: []
+        };
+    }
+
+    render() {
+        const table = this.props.data.map((data, i) => {
+            const conversion = data.Rewards / 10000000000000000000;
+            return <MinedBlockTable
+                key={`${data.Hash}${i}`}
+                Hash={data.Hash}
+                Number={data.Number}
+                Coinbase={data.Coinbase}
+                Age={data.Age}
+                GasUsed={data.GasUsed}
+                GasLimit={data.GasLimit}
+                UncleCount={data.UncleCount}
+                TxCount={data.TxCount}
+                Reward={conversion}
+                detailBlockHandler={this.props.detailBlockHandler}
+                getBlocksMined={this.props.getBlocksMined}
+            />
+        });
+
+        let combinedClasses = ['responsive-table', classes.table];
+        return (
+            <table className={combinedClasses.join(' ')}>
+                <thead className={classes.tHead}>
+                <tr>
+                    <th scope="col">Height</th>
+                    <th scope="col">Block Hash</th>
+                    <th scope="col">Age</th>
+                    <th scope="col">Txn</th>
+                    <th scope="col">Uncles</th>
+                    <th scope="col">Coinbase</th>
+                    <th scope="col">GasUsed</th>
+                    <th scope="col">GasLimit</th>
+                    <th scope="col">Avg.GasPrice</th>
+                    <th scope="col">Reward</th>
+                </tr>
+                </thead>
+                {table}
+            </table>
+        );
+    }
+}
+export default BlocksMinedTable;
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blocksMinedTable.js b/shyftBlockExplorerUI/src/components/table/blocks/blocksMinedTable.js
new file mode 100644
index 0000000000..16101a9ed2
--- /dev/null
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blocksMinedTable.js
@@ -0,0 +1,26 @@
+import React from 'react';
+import classes from './table.css';
+import { Link } from 'react-router-dom'
+
+const MinedBlockTable = (props) => {
+    return (
+        <tbody>
+        <tr>
+            <td><Link to="/blocks/detail" onClick={() => props.detailBlockHandler(props.Number)}>
+                {props.Number}
+            </Link></td>
+            <td className={classes.addressTag}>{props.Hash}</td>
+            <td>{props.Age}</td>
+            <td>{props.TxCount}</td>
+            <td>{props.UncleCount}</td>
+            <td className={classes.addressTag}><Link to="/blocks/mined" onClick={() => props.getBlocksMined(props.Coinbase)}>{props.Coinbase}</Link></td>
+            <td>{props.GasUsed}</td>
+            <td>{props.GasLimit}</td>
+            <td>TBD</td>
+            <td>{props.Reward}</td>
+        </tr>
+        </tbody>
+    )
+}
+
+export default MinedBlockTable;
diff --git a/shyftBlockExplorerUI/src/containers/App.js b/shyftBlockExplorerUI/src/containers/App.js
index a4fb1a571f..d73dd3c393 100644
--- a/shyftBlockExplorerUI/src/containers/App.js
+++ b/shyftBlockExplorerUI/src/containers/App.js
@@ -18,7 +18,8 @@ import BlocksRow from '../components/table/blocks/blockRows';
 import DetailBlockTable from '../components/table/blocks/blocksDetailsRow';
 import BlockDetailHeader from "../components/nav/blockHeaders/blockDetailHeader";
 import BlockHeader from "../components/nav/blockHeaders/blockHeader";
-
+import BlocksMinedTable from "../components/table/blocks/blocksMined";
+import BlockCoinbaseHeader from "../components/nav/blockHeaders/blockCoinbaseHeader";
 ///**ACCOUNTS**///
 import AccountsRow from '../components/table/accounts/accountRows';
 import DetailAccountsTable from "../components/table/accounts/detailAccountsRow";
@@ -33,6 +34,7 @@ class App extends Component {
         blockDetailData: [],
         transactionDetailData: [],
         accountDetailData: [],
+        blocksMined: [],
         blockTransactions: [],
         reqAccount: ''
     };
@@ -78,6 +80,18 @@ class App extends Component {
         }
     };
 
+    getBlocksMined = async(coinbase) => {
+        console.log("THIS RAN")
+        try {
+            const response = await axios.get(`http://localhost:8080/api/get_blocks_mined/${coinbase}`)
+            console.log(response.data);
+            await this.setState({ blocksMined: response.data })
+        }
+        catch(error) {
+            console.log(error)
+        }
+    };
+
   render() {
     return (
         <BrowserRouter>
@@ -102,6 +116,7 @@ class App extends Component {
               <div>
                   <BlockHeader/>
                   <BlocksRow
+                      getBlocksMined={this.getBlocksMined}
                       getBlockTransactions={this.getBlockTransactions}
                       detailBlockHandler={this.detailBlockHandler}/>
               </div>}
@@ -135,8 +150,8 @@ class App extends Component {
 
           <Route path="/block/transactions" exact render={({match}) =>
               <div>
-                  {/*<BlockDetailHeader*/}
-                      {/*blockNumber={this.state.blockTransactions.BlockNumber}/>*/}
+                  <BlockDetailHeader
+                      blockNumber={this.state.blockTransactions.BlockNumber}/>
                   <BlockTxs
                       data={this.state.blockTransactions}
                       getBlockTransactions={this.getBlockTransactions}
@@ -146,6 +161,17 @@ class App extends Component {
               </div>}
           />
 
+          <Route path="/mined/blocks" exact render={({match}) =>
+              <div>
+                  <BlockCoinbaseHeader
+                      data={this.state.blocksMined}/>
+                  <BlocksMinedTable
+                      getBlockTransactions={this.getBlockTransactions}
+                      getBlocksMined={this.getBlocksMined}
+                      data={this.state.blocksMined}/>
+              </div>}
+          />
+
           <Route path="/account/detail" exact render={({match}) =>
               <div>
                   <AccountDetailHeader
diff --git a/shyftDb/shyft_database_util.go b/shyftDb/shyft_database_util.go
index 0e0b4a365b..ad814cf8dd 100644
--- a/shyftDb/shyft_database_util.go
+++ b/shyftDb/shyft_database_util.go
@@ -739,6 +739,72 @@ func GetAllTransactionsFromBlock(sqldb *sql.DB, blockNumber string) string {
 	return txx
 }
 
+func GetAllBlocksMinedByAddress(sqldb *sql.DB, coinbase string) string {
+	var arr blockRes
+	var blockArr string
+	sqlStatement := `SELECT * FROM blocks WHERE coinbase=$1`
+	rows, err := sqldb.Query(sqlStatement, coinbase)
+	if err != nil {
+		fmt.Println("err")
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		var hash string
+		var coinbase string
+		var gasUsed string
+		var gasLimit string
+		var txCount string
+		var uncleCount string
+		var age string
+		var parentHash string
+		var uncleHash string
+		var difficulty string
+		var size string
+		var nonce string
+		var rewards string
+		var num string
+
+		err = rows.Scan(
+			&hash,
+			&coinbase,
+			&gasUsed,
+			&gasLimit,
+			&txCount,
+			&uncleCount,
+			&age,
+			&parentHash,
+			&uncleHash,
+			&difficulty,
+			&size,
+			&nonce,
+			&rewards,
+			&num,)
+
+		arr.Blocks = append(arr.Blocks, SBlock{
+			Hash:     hash,
+			Coinbase: coinbase,
+			GasUsed: gasUsed,
+			GasLimit: gasLimit,
+			TxCount: txCount,
+			UncleCount: uncleCount,
+			Age: age,
+			ParentHash:parentHash,
+			UncleHash:uncleHash,
+			Difficulty:difficulty,
+			Size: size,
+			Nonce:nonce,
+			Rewards: rewards,
+			Number:   num,
+		})
+
+		blocks, _ := json.Marshal(arr.Blocks)
+		blocksFmt := string(blocks)
+		blockArr = blocksFmt
+	}
+	return blockArr
+}
+
 //GetAllTransactions getter fn for API
 func GetAllTransactions(sqldb *sql.DB) string {
 	var arr txRes

From abdeb11c3caf2712eb6919fdc7fd228d4020ff2c Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Thu, 24 May 2018 14:18:51 -0400
Subject: [PATCH 6/7] UI, API changes

---
 core/genesis.go                               |  9 ++++++--
 .../nav/accountHeaders/accountDetailHeader.js |  6 ++++-
 .../nav/blockHeaders/blockCoinbaseHeader.js   |  2 +-
 .../components/table/accounts/accountRows.js  |  7 +++---
 .../table/accounts/accountsTable.js           |  2 +-
 .../table/accounts/detailAccountsRow.js       | 11 ++++-----
 .../table/accounts/detailAccountsTable.js     |  2 +-
 .../table/blocks/blocksMinedTable.js          |  4 ++--
 shyftBlockExplorerUI/src/containers/App.js    | 13 +++++------
 shyftDb/shyft_database_util.go                | 23 +++++++++++--------
 10 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/core/genesis.go b/core/genesis.go
index b53a48235d..b81b6f5d3f 100644
--- a/core/genesis.go
+++ b/core/genesis.go
@@ -161,6 +161,11 @@ func WriteShyftGen(sqldb *sql.DB, gen *Genesis, block *types.Block) {
 			number := block.Header().Number.String()
 			gasUsed := block.Header().GasUsed
 			gasLimit := block.Header().GasLimit
+			gasPrice := 0
+			txFee := 0
+			txStatus := ""
+			isContract := false
+			data:= ""
 			addr := k.String()
 			txCountAccount := v.Nonce +1
 			i, err := strconv.ParseInt(block.Time().String(), 10, 64)
@@ -179,8 +184,8 @@ func WriteShyftGen(sqldb *sql.DB, gen *Genesis, block *types.Block) {
 			}
 
 			var retNonce string
-			sqlGenTxStatement := `INSERT INTO txs(txhash, from_addr, to_addr, blockhash, blockNumber, amount, gas, gasLimit, nonce,age) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10)) RETURNING nonce`
-			insertError := sqldb.QueryRow(sqlGenTxStatement, txHash, GENESIS, addr, block.Header().Hash().Hex(), number, v.Balance.String(), gasUsed, gasLimit, txCountAccount, age).Scan(&retNonce)
+			sqlGenTxStatement := `INSERT INTO txs(txhash, from_addr, to_addr, blockhash, blockNumber, amount,gasPrice, gas, gasLimit,txFee,nonce,txstatus, iscontract,age, data) VALUES(($1), ($2), ($3), ($4), ($5), ($6), ($7), ($8), ($9), ($10), ($11), ($12), ($13), ($14), ($15)) RETURNING nonce`
+			insertError := sqldb.QueryRow(sqlGenTxStatement, txHash, GENESIS, addr, block.Header().Hash().Hex(), number, v.Balance.String(), gasPrice, gasUsed, gasLimit, txFee,txCountAccount,txStatus, isContract, age, data).Scan(&retNonce)
 			if insertError != nil {
 				panic(insertError)
 			}
diff --git a/shyftBlockExplorerUI/src/components/nav/accountHeaders/accountDetailHeader.js b/shyftBlockExplorerUI/src/components/nav/accountHeaders/accountDetailHeader.js
index 097c84d2ea..3f6de31bad 100644
--- a/shyftBlockExplorerUI/src/components/nav/accountHeaders/accountDetailHeader.js
+++ b/shyftBlockExplorerUI/src/components/nav/accountHeaders/accountDetailHeader.js
@@ -2,11 +2,15 @@ import React from 'react';
 import classes from '../nav.css';
 
 const accountsDetailHeader = (props) => {
+    const total = props.data
+        .map(num => Number(num.Amount) / 10000000000000000000)
+        .reduce((acc, cur) => acc + cur ,0);
     return (
         <div className={classes.Secondary}>
             <span className={classes.Transactions}>Account# {props.addr}</span>
+            <span className={classes.Transactions}>Total Value: {total}</span>
         </div>
     )
-}
+};
 
 export default accountsDetailHeader;
\ No newline at end of file
diff --git a/shyftBlockExplorerUI/src/components/nav/blockHeaders/blockCoinbaseHeader.js b/shyftBlockExplorerUI/src/components/nav/blockHeaders/blockCoinbaseHeader.js
index a368883b9c..7c629ba580 100644
--- a/shyftBlockExplorerUI/src/components/nav/blockHeaders/blockCoinbaseHeader.js
+++ b/shyftBlockExplorerUI/src/components/nav/blockHeaders/blockCoinbaseHeader.js
@@ -4,7 +4,7 @@ import classes from '../nav.css';
 const blocksCoinbaseHeader = (props) => {
     return (
         <div className={classes.Secondary}>
-            <span className={classes.Transactions}>Coinbase: {props.data.Coinbase}</span>
+            <span className={classes.Transactions}>Coinbase: {props.coinbase}</span>
         </div>
     )
 };
diff --git a/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js b/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js
index da0b7aa3c9..ecb160a04b 100644
--- a/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js
+++ b/shyftBlockExplorerUI/src/components/table/accounts/accountRows.js
@@ -24,11 +24,12 @@ class AccountTable extends Component {
 
         let startNum = 1;
         const sorted = [...this.state.data];
-            sorted.sort((a, b) => a.Balance > b.Balance);
+            sorted.sort((a, b) => Number(a.Balance) > Number(b.Balance));
+            console.log(sorted);
         const table = sorted.reverse().map((data, i) => {
-            const conversion = data.Balance / 10000000000000000000;
+            const conversion = Number(data.Balance) / 10000000000000000000;
             const total = sorted
-                .map(num => num.Balance / 10000000000000000000)
+                .map(num => Number(num.Balance) / 10000000000000000000)
                 .reduce((acc, cur) => acc + cur ,0);
             const percentage = ( (conversion / total) *100);
             return <AccountsTable
diff --git a/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js b/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js
index 744e5e465f..62451059dd 100644
--- a/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js
+++ b/shyftBlockExplorerUI/src/components/table/accounts/accountsTable.js
@@ -16,6 +16,6 @@ const AccountsTable = (props) => {
             </tr>
             </tbody>
     )
-}
+};
 
 export default AccountsTable;
diff --git a/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsRow.js b/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsRow.js
index 45f8c3bf21..98ccdf8d27 100644
--- a/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsRow.js
+++ b/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsRow.js
@@ -10,11 +10,8 @@ class AccountTransactionTable extends Component {
            return <ErrorHandler />
         }else {
             table = this.props.data.map((data, i) => {
-                console.log(this.props.data)
-                // const total = this.props.data
-                //     .map(num => num.Balance / 10000000000000000000)
-                //     .reduce((acc, cur) => acc + cur ,0);
-                const conversion = data.Cost / 10000000000000000000;
+                const costConversion = data.Cost / 10000000000000000000;
+                const amountConversion = data.Amount / 10000000000000000000;
                 return <DetailAccountsTable
                     key={`${data.TxHash}${i}`}
                     age={data.Age}
@@ -22,8 +19,8 @@ class AccountTransactionTable extends Component {
                     blockNumber={data.BlockNumber}
                     to={data.To}
                     from={data.From}
-                    value={data.Amount}
-                    cost={conversion}
+                    value={amountConversion}
+                    cost={costConversion}
                     addr={this.props.addr}
                     detailTransactionHandler={this.props.transactionDetailHandler}
                 />
diff --git a/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsTable.js b/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsTable.js
index ddeabc50fd..3164b7c164 100644
--- a/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsTable.js
+++ b/shyftBlockExplorerUI/src/components/table/accounts/detailAccountsTable.js
@@ -32,6 +32,6 @@ const DetailAccountsTable = (props) => {
             </tr>
             </tbody>
     )
-}
+};
 
 export default DetailAccountsTable;
diff --git a/shyftBlockExplorerUI/src/components/table/blocks/blocksMinedTable.js b/shyftBlockExplorerUI/src/components/table/blocks/blocksMinedTable.js
index 16101a9ed2..503dc9322c 100644
--- a/shyftBlockExplorerUI/src/components/table/blocks/blocksMinedTable.js
+++ b/shyftBlockExplorerUI/src/components/table/blocks/blocksMinedTable.js
@@ -13,7 +13,7 @@ const MinedBlockTable = (props) => {
             <td>{props.Age}</td>
             <td>{props.TxCount}</td>
             <td>{props.UncleCount}</td>
-            <td className={classes.addressTag}><Link to="/blocks/mined" onClick={() => props.getBlocksMined(props.Coinbase)}>{props.Coinbase}</Link></td>
+            <td className={classes.addressTag}>{props.Coinbase}</td>
             <td>{props.GasUsed}</td>
             <td>{props.GasLimit}</td>
             <td>TBD</td>
@@ -21,6 +21,6 @@ const MinedBlockTable = (props) => {
         </tr>
         </tbody>
     )
-}
+};
 
 export default MinedBlockTable;
diff --git a/shyftBlockExplorerUI/src/containers/App.js b/shyftBlockExplorerUI/src/containers/App.js
index d73dd3c393..043f430d14 100644
--- a/shyftBlockExplorerUI/src/containers/App.js
+++ b/shyftBlockExplorerUI/src/containers/App.js
@@ -73,7 +73,7 @@ class App extends Component {
     getBlockTransactions = async(blockNumber) => {
         try {
             const response = await axios.get(`http://localhost:8080/api/get_all_transactions_from_block/${blockNumber}`)
-            await this.setState({ blockTransactions: response.data })
+            await this.setState({ blockTransactions: response.data, reqBlockNum: blockNumber })
         }
         catch(error) {
             console.log(error)
@@ -81,11 +81,9 @@ class App extends Component {
     };
 
     getBlocksMined = async(coinbase) => {
-        console.log("THIS RAN")
         try {
             const response = await axios.get(`http://localhost:8080/api/get_blocks_mined/${coinbase}`)
-            console.log(response.data);
-            await this.setState({ blocksMined: response.data })
+            await this.setState({ blocksMined: response.data, reqCoinbase: coinbase })
         }
         catch(error) {
             console.log(error)
@@ -151,7 +149,7 @@ class App extends Component {
           <Route path="/block/transactions" exact render={({match}) =>
               <div>
                   <BlockDetailHeader
-                      blockNumber={this.state.blockTransactions.BlockNumber}/>
+                      blockNumber={this.state.reqBlockNum}/>
                   <BlockTxs
                       data={this.state.blockTransactions}
                       getBlockTransactions={this.getBlockTransactions}
@@ -164,7 +162,7 @@ class App extends Component {
           <Route path="/mined/blocks" exact render={({match}) =>
               <div>
                   <BlockCoinbaseHeader
-                      data={this.state.blocksMined}/>
+                      coinbase={this.state.reqCoinbase}/>
                   <BlocksMinedTable
                       getBlockTransactions={this.getBlockTransactions}
                       getBlocksMined={this.getBlocksMined}
@@ -175,7 +173,8 @@ class App extends Component {
           <Route path="/account/detail" exact render={({match}) =>
               <div>
                   <AccountDetailHeader
-                      addr={this.state.reqAccount}/>
+                      addr={this.state.reqAccount}
+                      data={this.state.accountDetailData}/>
                   <DetailAccountsTable
                       transactionDetailHandler={this.detailTransactionHandler}
                       addr={this.state.reqAccount}
diff --git a/shyftDb/shyft_database_util.go b/shyftDb/shyft_database_util.go
index ad814cf8dd..d82ccee1bd 100644
--- a/shyftDb/shyft_database_util.go
+++ b/shyftDb/shyft_database_util.go
@@ -13,6 +13,7 @@ import (
 
 	_ "github.com/lib/pq"
 	Rewards "github.com/ethereum/go-ethereum/consensus/ethash"
+	"reflect"
 )
 
 //SBlock type
@@ -77,10 +78,10 @@ type ShyftTxEntryPretty struct {
 	From      string
 	BlockHash string
 	BlockNumber string
-	Amount    uint64
+	Amount   string
 	GasPrice  uint64
 	Gas       uint64
-	GasLimit  uint64
+	GasLimit  string
 	Cost	  uint64
 	Nonce     uint64
 	Status	  string
@@ -686,10 +687,10 @@ func GetAllTransactionsFromBlock(sqldb *sql.DB, blockNumber string) string {
 		var from_addr string
 		var blockhash string
 		var blocknumber string
-		var amount uint64
+		var amount string
 		var gasprice uint64
 		var gas uint64
-		var gasLimit uint64
+		var gasLimit string
 		var txfee uint64
 		var nonce uint64
 		var status string
@@ -821,10 +822,10 @@ func GetAllTransactions(sqldb *sql.DB) string {
 		var from_addr string
 		var blockhash string
 		var blocknumber string
-		var amount uint64
+		var amount string
 		var gasprice uint64
 		var gas uint64
-		var gasLimit uint64
+		var gasLimit string
 		var txfee uint64
 		var nonce uint64
 		var status string
@@ -883,10 +884,10 @@ func GetTransaction(sqldb *sql.DB, txHash string) string {
 	var from_addr string
 	var blockhash string
 	var blocknumber string
-	var amount uint64
+	var amount string
 	var gasprice uint64
 	var gas uint64
-	var gasLimit uint64
+	var gasLimit string
 	var txfee uint64
 	var nonce uint64
 	var status string
@@ -994,6 +995,7 @@ func GetAllAccounts(sqldb *sql.DB) string {
 
 //GetAccount returns account balances
 func GetAccountTxs(sqldb *sql.DB, address string) string {
+	fmt.Println(address)
 	var arr txRes
 	var txx string
 	sqlStatement := `SELECT * FROM txs WHERE to_addr=$1 OR from_addr=$1;`
@@ -1008,10 +1010,10 @@ func GetAccountTxs(sqldb *sql.DB, address string) string {
 		var from_addr string
 		var blockhash string
 		var blocknumber string
-		var amount uint64
+		var amount string
 		var gasprice uint64
 		var gas uint64
-		var gasLimit uint64
+		var gasLimit string
 		var txfee uint64
 		var nonce uint64
 		var status string
@@ -1035,6 +1037,7 @@ func GetAccountTxs(sqldb *sql.DB, address string) string {
 			&age,
 			&data,
 		)
+		fmt.Println(reflect.TypeOf(amount))
 
 		arr.TxEntry = append(arr.TxEntry, ShyftTxEntryPretty{
 			TxHash:    txhash,

From a934a911d8b785c3ea374a8c6d351b261bfc01af Mon Sep 17 00:00:00 2001
From: Dustin Brickwood <dustinbrickwood204@gmail.com>
Date: Thu, 24 May 2018 14:25:29 -0400
Subject: [PATCH 7/7] typo

---
 shyftDb/shyft_database_util.go | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/shyftDb/shyft_database_util.go b/shyftDb/shyft_database_util.go
index d82ccee1bd..ad37752fc2 100644
--- a/shyftDb/shyft_database_util.go
+++ b/shyftDb/shyft_database_util.go
@@ -13,7 +13,6 @@ import (
 
 	_ "github.com/lib/pq"
 	Rewards "github.com/ethereum/go-ethereum/consensus/ethash"
-	"reflect"
 )
 
 //SBlock type
@@ -995,7 +994,6 @@ func GetAllAccounts(sqldb *sql.DB) string {
 
 //GetAccount returns account balances
 func GetAccountTxs(sqldb *sql.DB, address string) string {
-	fmt.Println(address)
 	var arr txRes
 	var txx string
 	sqlStatement := `SELECT * FROM txs WHERE to_addr=$1 OR from_addr=$1;`
@@ -1037,7 +1035,6 @@ func GetAccountTxs(sqldb *sql.DB, address string) string {
 			&age,
 			&data,
 		)
-		fmt.Println(reflect.TypeOf(amount))
 
 		arr.TxEntry = append(arr.TxEntry, ShyftTxEntryPretty{
 			TxHash:    txhash,
