Commit graph

9614 commits

Author SHA1 Message Date
greg
1a5118de49 add debug and admin to http modules 2018-06-03 14:15:29 -04:00
greg
3e8be96a58 Merge branch 'shyftBlockExplorer' of github.com:ShyftNetwork/shyft_go-ethereum into shyftBlockExplorer 2018-06-03 12:02:48 -04:00
Dustin Brickwood
70eb2106e4
Merge pull request #30 from ShyftNetwork/token-test
Token test
2018-06-03 11:41:57 -04:00
greg
bd5849a786 Merge branch 'shyftBlockExplorer' of github.com:ShyftNetwork/shyft_go-ethereum into shyftBlockExplorer 2018-06-03 10:06:28 -04:00
greg
952648549f remove miner table 2018-06-03 10:06:25 -04:00
Tim Williams
9df3ad8b97 update files 2018-05-30 18:12:47 -04:00
Tim Williams
24b0700e27 fix typo 2018-05-29 14:17:06 -04:00
Tim Williams
ac74523d1a add tests for greeter contracts 2018-05-29 14:14:16 -04:00
greg
0f9bbd2e62
Merge pull request #28 from ShyftNetwork/UIChanges
Ui changes
2018-05-24 14:42:00 -04:00
greg
0747775068
Merge pull request #27 from ShyftNetwork/token-test
add test cases for tokens
2018-05-24 14:41:47 -04:00
Dustin Brickwood
a934a911d8 typo 2018-05-24 14:25:29 -04:00
Dustin Brickwood
abdeb11c3c UI, API changes 2018-05-24 14:18:51 -04:00
Dustin Brickwood
3a9affe2a0 UI changes for rewards 2018-05-24 10:10:25 -04:00
Tim Williams
020d720bea add test cases for tokens 2018-05-23 16:32:49 -04:00
Dustin Brickwood
f9b1ed77b4 added rewards to UI 2018-05-23 14:32:23 -04:00
Dustin Brickwood
8e6ff5f621 changed a few UI components 2018-05-22 17:29:29 -04:00
Dustin Brickwood
076b975878 removed line that was causing issues 2018-05-22 13:43:25 -04:00
priom
1303dd291e fix duplicate files 2018-05-22 12:59:10 -04:00
greg
ae7f45bb54 Revert "remove deuplicate shydb dir"
This reverts commit fa34ee403d.
2018-05-22 12:45:16 -04:00
greg
fa34ee403d remove deuplicate shydb dir 2018-05-22 12:41:49 -04:00
greg
421cb81193
Merge pull request #26 from ShyftNetwork/rewards
Rewards
2018-05-22 12:34:33 -04:00
greg
2240d274e0 Merge branch 'shyftBlockExplorer' of github.com:ShyftNetwork/shyft_go-ethereum into rewards 2018-05-22 12:31:37 -04:00
Dustin Brickwood
041d757046
Merge pull request #25 from ShyftNetwork/apiDevelopment
Block 0 and Gen Txs
2018-05-22 12:28:35 -04:00
Dustin Brickwood
d673c8cb2f refactored block 0 2018-05-18 13:57:32 -04:00
Dustin Brickwood
d7b426e9ca updated API requests 2018-05-18 13:19:42 -04:00
greg
cd38014fde fix merge conflict 2018-05-17 17:39:18 -04:00
greg
30860fa7e0 remove todo 2018-05-17 17:32:38 -04:00
greg
d19ff3191b Uncle reward logic implimented 2018-05-17 17:25:44 -04:00
Dustin Brickwood
fff2271833 fixing spacing 2018-05-17 17:25:18 -04:00
Dustin Brickwood
65a228204b commented out code 2018-05-17 17:22:43 -04:00
Dustin Brickwood
fd296e83e3 Block 0 and txs being written into db, UI modifications 2018-05-17 17:19:00 -04:00
greg
64453a4d5b uncle rewards in process 2018-05-17 16:53:48 -04:00
greg
5dee19495c Refactor reward system into two seperate functions 2018-05-17 16:35:20 -04:00
greg
41748a394d Removed old code add snippet for how uncle reward should be calculated 2018-05-17 15:18:24 -04:00
greg
ecf7349a2b Add shyft conduit reward 2018-05-17 15:16:46 -04:00
Tim Williams
573cb28a43
Merge pull request #24 from ShyftNetwork/writeContracts
Updated writeTransactions
2018-05-17 11:11:38 -04:00
Dustin Brickwood
1b5ee8a1f1 cleaned up console logs 2018-05-17 11:09:52 -04:00
Dustin Brickwood
5804bd113f cleaned up fmt 2018-05-17 10:36:55 -04:00
greg
bc24aef25e Base miner reward updating 2018-05-16 16:37:37 -04:00
greg
83c8f4c2c6 Add script to drop tables, re-init tables & reset shyftGeth 2018-05-16 16:21:58 -04:00
priom
56dd351ac6 initial miner reward 2018-05-16 15:48:16 -04:00
Dustin Brickwood
a7af9c9255 updated getters and write fns for contextual data 2018-05-16 15:23:08 -04:00
Dustin Brickwood
844106b8d7 fixed db order 2018-05-16 12:20:59 -04:00
Dustin Brickwood
79e140e4cf writing contract address when isContract is true 2018-05-16 12:02:51 -04:00
greg
a12801d019
Merge pull request #23 from ShyftNetwork/uiIntegration
Ui integration
2018-05-16 11:41:27 -04:00
Dustin Brickwood
97e2d5f603 added boolean for isContract 2018-05-16 10:21:08 -04:00
Dustin Brickwood
8e29670852 modified UI 2018-05-16 10:07:41 -04:00
Dustin Brickwood
13ae71cb05 renamed folder 2018-05-15 17:51:21 -04:00
Dustin Brickwood
6ac10cefc8 typo 2018-05-15 17:14:21 -04:00
Dustin Brickwood
d6dd62204c modifed ignore 2018-05-15 17:13:13 -04:00