poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,951 Commits 22 Branches 24 Tags 156 MiB
Commit Graph

1951 Commits

Author SHA1 Message Date
obscuren d5d1e50365 Support multiple promises as data or mixed with non promises 2014-09-25 10:32:54 +02:00
obscuren 2458697dad Merge branch 'master' into develop 2014-09-24 21:37:05 +02:00
Jeffrey Wilcke 206672db5e Merge pull request #52 from nicksavers/winfix 
Add blank line after +build comment
 2014-09-24 21:36:37 +02:00
obscuren 5c2aa1d4f5 Merge branch 'master' into develop 2014-09-24 21:21:03 +02:00
obscuren 5cb4120ef5 queue get peers each 10 seconds 2014-09-24 21:20:57 +02:00
obscuren 496df5c29a Merge branch 'master' into develop 2014-09-24 21:13:35 +02:00
obscuren 3aeba50c38 merge error 2014-09-24 21:13:28 +02:00
obscuren 29f5dd38e3 Merge branch 'release/0.6.6' into develop 2014-09-24 20:41:22 +02:00
obscuren b8b1453392 Merge branch 'release/0.6.6' 2014-09-24 20:41:11 +02:00
obscuren ecdda01841 Merge branch 'release/0.6.6' into develop 2014-09-24 20:41:03 +02:00
obscuren bb4495722f Merge branch 'release/0.6.6' 2014-09-24 20:40:54 +02:00
obscuren 1118aaf840 Temp work around 2014-09-24 20:40:40 +02:00
obscuren 1cb12296f6 Temp work around 2014-09-24 20:40:18 +02:00
obscuren 96fd1ce270 Bump 2014-09-24 20:04:14 +02:00
obscuren 544b7fba7f Merge branch 'tmp' into develop 
Conflicts:
	peer.go
 2014-09-24 19:59:14 +02:00
obscuren 6ecbbe4006 Download indicator 2014-09-24 19:57:22 +02:00
obscuren cba2f6c2c4 Block pool stop / start 2014-09-24 19:56:21 +02:00
obscuren 1fe2d0d0e0 Peers no longer take care of block processing 2014-09-24 19:55:28 +02:00
obscuren 54558dd8ae Removed log 2014-09-24 19:54:51 +02:00
obscuren 60a8c9527c Mine without txs 2014-09-24 19:54:37 +02:00
obscuren 84690bfbbe Changed the block fetching code and hash distribution 2014-09-24 19:54:30 +02:00
obscuren d3a0bb4f35 Info => Debug 2014-09-24 19:54:14 +02:00
obscuren ad13b402d7 Fixed race condition 2014-09-24 17:47:01 +02:00
obscuren b66fcf85df checkp 2014-09-24 11:55:02 +02:00
obscuren ba43364f36 tmp 2014-09-24 11:41:57 +02:00
obscuren 57dc435f9b Added TD for each block 2014-09-24 11:39:17 +02:00
nicksavers c582890590 Add blank line after +build comment 2014-09-23 20:04:06 +02:00
obscuren 615d20598a Merge branch 'develop' 2014-09-23 18:19:56 +02:00
obscuren 46a496428f ugh 2014-09-23 18:19:51 +02:00
obscuren acfb5b85fb Merge branch 'hotfix/0.6.5-2' into develop 2014-09-23 17:56:50 +02:00
obscuren 70db149494 Merge branch 'hotfix/0.6.5-2' 2014-09-23 17:56:43 +02:00
obscuren a4007f3b68 Fixed min gas price on coin 2014-09-23 17:56:35 +02:00
obscuren bc1a173d2f Merge branch 'hotfix/0.6.5-3' into develop 2014-09-23 17:55:54 +02:00
obscuren 5c5db7d931 Merge branch 'hotfix/0.6.5-3' 2014-09-23 17:55:45 +02:00
obscuren 6800c3665a Re-added min gas price check on tx pool 2014-09-23 17:55:34 +02:00
obscuren b73c07dd80 Merge branch 'hotfix/0.6.5-2' into develop 2014-09-23 12:00:25 +02:00
obscuren ea67d853a8 Merge branch 'hotfix/0.6.5-2' 2014-09-23 12:00:10 +02:00
obscuren ac5e86b7ae Removed windows support for serpent :-( 2014-09-23 12:00:01 +02:00
obscuren 353b558536 Merge branch 'develop' 2014-09-23 10:23:46 +02:00
obscuren 8516e748ca Actually remove it alltogether 2014-09-23 10:23:37 +02:00
obscuren 8780deece9 Merge branch 'hotfix/0.6.5-1' into develop 2014-09-23 10:21:45 +02:00
obscuren 29ca238a7a Merge branch 'hotfix/0.6.5-1' 2014-09-23 10:21:39 +02:00
obscuren 1b66e1c93a Merge branch 'hotfix/0.6.5-1' into develop 2014-09-23 10:21:29 +02:00
obscuren 0705bb3fe5 Merge branch 'hotfix/0.6.5-1' 2014-09-23 10:21:13 +02:00
obscuren 48fd23dc10 don't mine without transactions 2014-09-23 10:20:55 +02:00
obscuren 6e4818d742 Konami 2014-09-23 10:20:35 +02:00
obscuren df30588eb6 Merge branch 'release/0.6.5' into develop 2014-09-22 19:34:49 +02:00
obscuren ce149d2733 Merge branch 'release/0.6.5' 2014-09-22 19:34:31 +02:00
obscuren 9ac4e23b66 Merge branch 'release/0.6.5' into develop 2014-09-22 19:34:07 +02:00
obscuren 154ca03228 Merge branch 'release/0.6.5' 2014-09-22 19:33:24 +02:00