Commit Graph

605 Commits

Author SHA1 Message Date
arkpar
6502399e6b Fixed build aftre botched merge 2016-01-17 12:11:39 +01:00
arkpar
efccde7b66 Merge branch 'master' of github.com:gavofyork/ethcore into client 2016-01-17 12:08:40 +01:00
arkpar
0d394c0502 target in .gitignore 2016-01-17 12:07:35 +01:00
arkpar
e39e7491b8 Use ethash for verification 2016-01-17 12:00:34 +01:00
Tomasz Drwięga
a350aae82b Merge pull request #103 from gavofyork/evm
EVM Interpreter
2016-01-17 11:54:04 +01:00
Tomusdrw
1414fe28b9 Merge branch 'master' into evm 2016-01-17 11:41:46 +01:00
Marek Kotewicz
9d3c1ee444 Merge pull request #141 from gavofyork/gav
Homestead transition support, maybe.
2016-01-17 11:40:21 +01:00
Tomusdrw
62597cb294 Merge branch 'evm+gav' into evm 2016-01-17 11:26:59 +01:00
Tomusdrw
57129f4fd3 Changing to AddAsign 2016-01-17 11:26:37 +01:00
Tomusdrw
94f23ac5ba Merge branch 'gav' into evm+gav
Conflicts:
	src/ethereum/ethash.rs
2016-01-17 01:18:35 +01:00
Tomusdrw
48040590f5 Fixing create-gasleft 2016-01-16 21:24:19 +01:00
Tomusdrw
56c059588d Changing state tests to support transition 2016-01-16 21:08:04 +01:00
Gav Wood
cbdc2ec80d Enable TransactionViews from the BlockView. 2016-01-16 21:04:14 +01:00
Gav Wood
667a0fad01 Merge remote-tracking branch 'origin/master' into gav 2016-01-16 21:02:59 +01:00
Gav Wood
bffbba32d2 Docs. 2016-01-16 21:02:31 +01:00
Tomusdrw
9849ce08e0 Merge branch 'master' into evm
Conflicts:
	src/evm/tests.rs
	src/executive.rs
	src/externalities.rs
	src/tests/executive.rs
2016-01-16 21:01:14 +01:00
Gav Wood
cf1e9f24b6 Enable TransactionView. 2016-01-16 21:01:02 +01:00
Tomusdrw
3979b787f7 merged with mk 2016-01-16 20:58:23 +01:00
Gav Wood
7a6ace6691 Merge pull request #131 from gavofyork/fix_ext
externalities refactor
2016-01-16 20:55:50 +01:00
Gav Wood
86a6fa95a6 Minor fixes to JSON files. 2016-01-16 19:09:36 +01:00
Gav Wood
14658d7da0 Merge branch 'master' into gav 2016-01-16 18:46:47 +01:00
Gav Wood
60f0ff8e9e Fix bug. 2016-01-16 18:46:23 +01:00
Arkadiy Paronyan
e89eb3715e Merge pull request #140 from gavofyork/gav
More open files.
2016-01-16 18:38:08 +01:00
Gav Wood
d8efbb2173 Change netspecs to real values. 2016-01-16 18:35:07 +01:00
Gav Wood
dd5fcb398f Support Homestead, 2016-01-16 18:30:27 +01:00
debris
1d8d038682 s/inc_sstore_clear_count/inc_sstore_clears/g 2016-01-16 17:33:46 +01:00
Arkadiy Paronyan
1d53d806b2 Merge pull request #133 from gavofyork/evm_stack_fix
Single array for logs output.
2016-01-16 17:29:01 +01:00
Tomusdrw
e9dab4d567 Merge branch 'evm' into evm_stack_fix
Conflicts:
	src/evm/instructions.rs
	src/evm/interpreter.rs
2016-01-16 17:27:54 +01:00
debris
d128d1fccd renamed inc_sstore_refund_count -> inc_sstore_clear_count 2016-01-16 17:26:32 +01:00
Tomusdrw
5b9097a9ca Renaming NO_OF_LOG_INSTRUCTIONS -> MAX_NO_OF_TOPICS 2016-01-16 17:24:42 +01:00
Tomusdrw
79c1cc02f7 Vec<u8> -> Bytes and clearing log API 2016-01-16 17:17:43 +01:00
Tomusdrw
09c46be74d Cleaning evm 2016-01-16 17:08:57 +01:00
debris
5171d566a3 Updated OriginInfo description. 2016-01-16 17:08:39 +01:00
debris
a66f46b4e9 Merge branch 'master' of https://github.com/gavofyork/ethcore into fix_ext 2016-01-16 17:06:37 +01:00
debris
9062771209 fixed review issues: add_sstore_refund -> inc_sstore_refund, sstore_refunds_count -> sstore_clears_count. Also removed all unnecessary copying of transaction code/data. 2016-01-16 17:06:15 +01:00
Tomusdrw
d496a66a30 Single array for logs output. 2016-01-16 16:11:57 +01:00
Tomusdrw
045d2ce44b Merge branch 'master' into evm 2016-01-16 14:16:56 +01:00
Tomusdrw
f7a745adee Fixing compilation 2016-01-16 14:14:35 +01:00
Tomusdrw
c10dc7fa17 Adding feature 2016-01-16 14:01:18 +01:00
Tomusdrw
012474b237 Fixing SSTORE gas calculation 2016-01-16 13:59:48 +01:00
Gav Wood
4f049358f2 Merge pull request #132 from gavofyork/client
Client app event handler
2016-01-16 13:44:16 +01:00
arkpar
d07934ffee Client app event handler 2016-01-16 13:30:27 +01:00
Gav Wood
b4556c3436 More open files. 2016-01-16 11:52:28 +01:00
debris
fa1f0d1cf4 executive tests fixed
Conflicts:
	src/executive.rs
2016-01-16 11:43:45 +01:00
Tomusdrw
a1a4c5a068 Merge branch 'master' into evm
Conflicts:
	src/evm/tests.rs
	src/executive.rs
2016-01-16 11:33:41 +01:00
debris
0d686b2327 cleanup 2016-01-16 08:56:03 +01:00
debris
4e321eb20f cleanup 2016-01-16 08:35:51 +01:00
debris
d79a7d7f40 Merge branch 'master' of https://github.com/gavofyork/ethcore into fix_ext 2016-01-16 08:25:28 +01:00
Marek Kotewicz
a53bbaef55 Merge pull request #130 from gavofyork/gav
Various consensus fixes.
2016-01-16 08:25:12 +01:00
debris
c67822a03c executive tests are working after the cleanup 2016-01-16 08:23:29 +01:00