Commit graph

9654 commits

Author SHA1 Message Date
Tim Williams
db82bc9603 compiles 2018-07-15 13:59:50 -04:00
Tim Williams
802c1b061e compiles 2018-07-15 13:59:49 -04:00
Tim Williams
6b4eb6abef fix parameter 2018-07-15 13:59:13 -04:00
greg
62cfec3787 updates for dustin 2018-07-15 13:59:13 -04:00
Chris
80698f7bc6 [ changed line endings for bash files to LF ] 2018-07-14 19:02:23 -04:00
ChainSafe
5d622ab49e
Merge pull request #40 from ShyftNetwork/rm-unused-file
delete file
2018-07-11 23:14:58 -04:00
Tim Williams
bfa29cc6d4 delete file 2018-06-21 15:08:29 -04:00
Gregory Markou
abcc686b9b
Merge pull request #38 from ShyftNetwork/testing/dbUtils
Testing/db utils
2018-06-14 14:45:20 -04:00
Dustin Brickwood
dfe2907f44 changes made from PR comments 2018-06-14 14:27:05 -04:00
Gregory Markou
93249923c6
Merge pull request #39 from ShyftNetwork/revert-change-in-chainmakers
revert unnecessary change in chain_makers.go
2018-06-14 14:19:01 -04:00
Tim Williams
414f64b8b3 revert unnecessary change in chain_makers.go 2018-06-13 15:27:37 -04:00
Dustin Brickwood
c4063835bb resolved conflicts 2018-06-13 14:29:28 -04:00
Dustin Brickwood
41494cbd0f quick fix 2018-06-13 14:00:09 -04:00
Dustin Brickwood
13258b70ac unit testing place for review 2018-06-13 13:07:17 -04:00
Gregory Markou
d7afc81fb1
Merge pull request #37 from ShyftNetwork/addBroadcastTxRoute
add broadcast tx route
2018-06-12 14:29:00 -04:00
Tim Williams
84fe574331 refactor broadcasttx function 2018-06-12 14:11:40 -04:00
Tim Williams
26de99f4d5 add broadcast tx route 2018-06-12 13:55:13 -04:00
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