Commit graph

9637 commits

Author SHA1 Message Date
Gregory Markou
fb5bf32637
Merge pull request #36 from ShyftNetwork/greg/tracing
Greg/tracing
2018-06-08 15:37:56 -04:00
greg
c5b3b93fb4 fix merge 2018-06-08 14:11:27 -04:00
greg
3f957e6ad1 Add tracer logs 2018-06-08 14:08:04 -04:00
greg
ede486a68a Add test cases to shyft-clie/web3 and removed logs from consesnus.go and blockchain.go 2018-06-08 14:07:46 -04:00
greg
d5e345a517 Merge branch 'shyftBlockExplorer' into greg/tracing 2018-06-06 11:55:48 -04:00
Gregory Markou
c5c0086b13
Merge pull request #35 from ShyftNetwork/change-db-param-structure
Change db param structure
2018-06-05 16:37:47 -04:00
greg
432a3e1fe1 inital 2018-06-05 15:11:57 -04:00
Tim Williams
d2b1dcad27 restructure the db shyftBlockExplorer param so it is initialized in the functions where it is called, rather than outside in the main blockchain object 2018-06-05 14:35:58 -04:00
Gregory Markou
4ed9dc09dc
Merge pull request #32 from ShyftNetwork/add-in-log-for-serving-port
add logs for the http server
2018-06-05 13:22:56 -04:00
Priom Chowdhury
b3a159a9ec
Merge pull request #34 from ShyftNetwork/travis-ci
fixing travis CI
2018-06-04 19:31:53 -04:00
priom
c95c755e97 rollback go_import_path 2018-06-04 17:43:16 -04:00
priom
4b756b4a1d travis config testing 2018-06-04 17:24:06 -04:00
priom
f6d6f18b2e added shyft repo url to ci build 2018-06-04 17:21:27 -04:00
priom
b591392b17 added shyft repo url to ci build 2018-06-04 17:13:40 -04:00
priom
2236c17d01 shyft geth github url linked 2018-06-04 17:05:51 -04:00
priom
89ab4080b6 travis config mod 2018-06-04 15:57:28 -04:00
Tim Williams
f90fa8275b add logs for the http server 2018-06-04 15:56:26 -04:00
Tim Williams
d24335048a
Merge pull request #31 from ShyftNetwork/greg/cli
Greg/cli
2018-06-04 10:41:20 -04:00
greg
285be847d7 update readme 2018-06-03 18:47:34 -04:00
greg
0719d414e6 add help log for clie 2018-06-03 18:40:20 -04:00
greg
88d516c9d0 update readme 2018-06-03 18:15:16 -04:00
greg
985ddce0d2 remove newline 2018-06-03 17:27:01 -04:00
greg
4617325367 Convert all scripts into a basic bash cli 2018-06-03 17:19:33 -04:00
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