Commit Graph

10155 Commits

Author SHA1 Message Date
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
arkpar
af21038bb9 More block verifications 2016-01-09 19:10:05 +01:00
Gav Wood
8b5b493f7d Sketch of how OpenBlock::close() might look. 2016-01-09 18:58:04 +01:00
arkpar
28a658015d Merge branch 'master' of github.com:gavofyork/ethcore into network 2016-01-09 18:50:45 +01:00
debris
9cc88e2cb1 Merge branch 'master' of https://github.com/gavofyork/ethcore into evm 2016-01-09 18:41:12 +01:00
arkpar
10fe6b937f Docs 2016-01-09 18:40:13 +01:00
Gav Wood
71670e6277 Fix test warnings. 2016-01-09 18:26:35 +01:00
debris
300a9506ed evmjit output data 2016-01-09 18:25:18 +01:00
Arkadiy Paronyan
7b4fb9c30e Merge pull request #60 from gavofyork/ethash
Remove genesis module, add more chain specs and separate out ethereum-specific stuff
2016-01-09 18:23:05 +01:00
Gav Wood
4622882fda Separate out Ethereum-network-specific resources.
Fix State to use secure trie variants.
2016-01-09 18:20:31 +01:00
debris
130b2fc46a separated executive and externalities 2016-01-09 17:55:47 +01:00
Gav Wood
fbeb4d84ce Merge remote-tracking branch 'origin/master' into ethash 2016-01-09 17:16:49 +01:00
Gav Wood
a978cbad52 Remove genesis module, add more chain specs and separate out ethereum-specific stuff. 2016-01-09 17:15:55 +01:00
arkpar
8cd3aa4b43 Merge branch 'master' of github.com:gavofyork/ethcore into network 2016-01-09 14:41:04 +01:00
Arkadiy Paronyan
3c25c062af Merge pull request #59 from gavofyork/ethash
State::new_contract, camelCase engine params, missing param
2016-01-09 14:30:30 +01:00
Gav Wood
88810a5762 Merge branch 'master' into gav 2016-01-09 14:20:49 +01:00
Gav Wood
20341072a9 Merge branch 'master' into ethash 2016-01-09 14:20:30 +01:00
Gav Wood
2b022e11e1 State::new_contract. 2016-01-09 14:19:35 +01:00
debris
50af19a7c8 contract creating contract 2016-01-09 13:51:59 +01:00
Arkadiy Paronyan
6aa8c32621 Merge pull request #58 from gavofyork/ethash
Use reorganisation
2016-01-09 13:05:03 +01:00
Arkadiy Paronyan
ebe554d226 Merge pull request #29 from gavofyork/gav
Introduce use-dependency amalgamation.
2016-01-09 13:04:44 +01:00
Gav Wood
6eac110b65 Merge branch 'master' into gav 2016-01-09 12:33:40 +01:00
Gav Wood
23d22db95c Merge branch 'master' into ethash 2016-01-09 12:32:40 +01:00
Gav Wood
4fc6b0dc60 Introduce use common::*; for common stuff (modules that themselves require no other modules in this crate).
Fix build.
2016-01-09 12:30:41 +01:00
Gav Wood
2b90f7d03a Introduce use-dependency amalgamation. We now have:
- `use standard;` (bring in a set of standard and external dependencies)
- `use common;` (bring in a low-level subset of this crate; basically anything that itself requires only `use standard;`)

And, from an external create:
- `use ethcore_util::*;` (bring in the entirety of this module and the standard dependencies)
2016-01-09 12:12:36 +01:00
Gav Wood
11c244a5e3 Merge pull request #24 from gavofyork/network
IO and networking
2016-01-09 11:02:04 +01:00