Commit Graph

1280 Commits

Author SHA1 Message Date
arkpar
5d0e186632 Merge branch 'master' of github.com:gavofyork/ethcore into network 2016-01-11 01:07:58 +01:00
Gav Wood
e116bd3d20 Merge pull request #33 from gavofyork/network
Padding decryption, connection registration fixed
2016-01-10 23:58:53 +01:00
Gav Wood
e7f840ce79 Use getter in header in preparation for a Header trait; additional testing in enact_block(). 2016-01-10 23:42:59 +01:00
Arkadiy Paronyan
0d5aaa69fa Merge pull request #63 from gavofyork/ethash
Block enactment (including test)
2016-01-10 23:40:50 +01:00
arkpar
452294ab8d ImportResult becomes a result 2016-01-10 23:37:09 +01:00
Gav Wood
4512322d3e Block enactment with test. 2016-01-10 23:10:06 +01:00
Gav Wood
abb4975400 Set timestamp in enactment. 2016-01-10 22:57:31 +01:00
Gav Wood
74f88f9b9b Initial implementation of enacted.
number is now usize, timestamp u64.
2016-01-10 22:55:07 +01:00
arkpar
6f3c3fa020 Documentation 2016-01-10 22:42:27 +01:00
Gav Wood
3fb401c611 Merge branch 'master' into ethash 2016-01-10 21:57:33 +01:00
Gav Wood
4f68662e53 Proper rewarding; needs consensus test doing though. 2016-01-10 21:55:03 +01:00
arkpar
e6572e34fa Documentation 2016-01-10 21:30:22 +01:00
arkpar
5f4cd7f197 Merge branch 'network' into verification 2016-01-10 19:47:32 +01:00
Gav Wood
fea418703b Better API allowing one fewer clone. 2016-01-10 17:11:46 +01:00
Gav Wood
2cc3ee66d7 Allow fields to be returned so they can be used simultaneously. 2016-01-10 17:09:02 +01:00
debris
b72da41ea7 proper calculatng of executive gas in progress 2016-01-10 16:21:01 +01:00
arkpar
daab45f599 Merge branch 'master' of github.com:gavofyork/ethcore into verification 2016-01-10 15:21:11 +01:00
arkpar
02b530f4aa Style 2016-01-10 15:13:12 +01:00
arkpar
5f5f26de48 Do not insert new blocks out of order 2016-01-10 15:08:57 +01:00
arkpar
11dd92f1f5 Merge branch 'master' of github.com:gavofyork/ethcore into network 2016-01-10 14:13:42 +01:00
Arkadiy Paronyan
1bcb6f8ee3 Merge pull request #62 from gavofyork/ethash
Block complete. Needs tests.
2016-01-10 14:13:32 +01:00
arkpar
51584f5202 Networking fixes 2016-01-10 14:11:23 +01:00
arkpar
39fb29ffcc Merge branch 'master' of github.com:gavofyork/ethcore-util into network 2016-01-10 14:10:29 +01:00
Arkadiy Paronyan
4ed6a0054b Merge pull request #32 from gavofyork/gav
Remove unneeded error.
2016-01-10 14:10:07 +01:00
arkpar
2f45d22b38 Merge branch 'master' of github.com:gavofyork/ethcore-util into network 2016-01-10 14:09:51 +01:00
Gav Wood
dfd31f96e1 Merge branch 'master' into gav 2016-01-10 14:06:53 +01:00
Gav Wood
6410759bc3 Remove unneeded error. 2016-01-10 14:06:38 +01:00
Gav Wood
76bb480afb Block sealing, tests updated. 2016-01-10 14:05:39 +01:00
arkpar
b0cef968e7 Networking fixes 2016-01-10 14:02:01 +01:00
Arkadiy Paronyan
8254b4283b Merge pull request #31 from gavofyork/gav
Bloom stuff and RlpStandard
2016-01-10 13:23:04 +01:00
Gav Wood
3277b23b9e Merge branch 'master' into gav 2016-01-10 12:55:04 +01:00
Gav Wood
5862d58379 Reworked network errors (now NetworkError) to be a subset of UtilErrors rather than the
other way around.
2016-01-10 12:53:55 +01:00
debris
9f06c2f2e6 errors, fees, and refunds 2016-01-10 12:29:35 +01:00
Gav Wood
ffc28bf495 Additional bloom-related functionality.
RlpStandard for non-emit_*-based RlpStream extesions.
2016-01-09 23:47:46 +01:00
Gav Wood
53fada4f4a OpenBlock::close() should be complete. No tests yet though. 2016-01-09 23:47:15 +01:00
arkpar
5ce27152b4 Merge branch 'master' of github.com:gavofyork/ethcore into network 2016-01-09 23:24:38 +01:00
debris
efa6c424c1 fixed jit tests 2016-01-09 23:24:01 +01:00
arkpar
85ddbba893 Enabled logger for client app 2016-01-09 23:21:57 +01:00
Marek Kotewicz
c649c134b7 Merge pull request #30 from gavofyork/gav
Refactoring, BitOrAssign for hash, minor additions.
2016-01-09 23:02:30 +01:00
debris
55a023554a Merge branch 'master' of https://github.com/gavofyork/ethcore into evm 2016-01-09 23:02:01 +01:00
Marek Kotewicz
e807f36e83 Merge pull request #61 from gavofyork/ethash
More on OpenBlock::close; State::kill_account added
2016-01-09 23:01:44 +01:00
debris
3e90859d9d executive call 2016-01-09 22:54:16 +01:00
Gav Wood
9a79a9032d on_close_block fixed and tested. 2016-01-09 22:45:27 +01:00
Gav Wood
568d28e94b Bitwise Or Assign and some additional convenience in Hash. 2016-01-09 22:30:13 +01:00
Gav Wood
25a9f74d84 Merge remote-tracking branch 'origin/master' into ethash 2016-01-09 22:29:02 +01:00
Gav Wood
cf8ef01c6d State::kill_account added with tests & docs. 2016-01-09 22:28:31 +01:00
Gav Wood
249c615752 Minor refactoring, OpenBlock::close closer to working. 2016-01-09 22:13:13 +01:00
debris
f7e9816d33 substate in progress 2016-01-09 21:39:38 +01:00
arkpar
32bfa69106 More docs 2016-01-09 19:13:58 +01:00
arkpar
0eb69c7f1c Removed verification from this branch 2016-01-09 19:10:58 +01:00