dexon-solidity - DEXON fork of Solidity (https://github.com/dexon-foundation/dsolidity)

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'upstream/develop' into NewStateTests	CJentzsch	2014-12-14	33	-907/+6517
\|\ \| \| \| \| \| \| \| \|	Conflicts: test/state.cpp
\| *	Another Windows fix?	Gav Wood	2014-12-14	1	-0/+2
\| \|
\| *	Windows fix?	Gav Wood	2014-12-14	1	-1/+1
\| \|
\| *	Merge pull request #601 from CJentzsch/newTests	Gav Wood	2014-12-14	3	-1/+6
\| \|\ \| \| \| \| \| \|	Added recursive create test + lesser output for safe VM exceptions
\| \| *	Added recursive create test + lesser output for safe VM exceptions	CJentzsch	2014-12-13	3	-1/+6
\| \| \|
\| * \|	Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into ↵	sveneh	2014-12-13	13	-37/+138
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	build_enhancement Conflicts: windows/LibEthereum.vcxproj windows/LibEthereum.vcxproj.filters Solved by removing files (not necessary anymore)
\| \| *	Merge pull request #600 from CJentzsch/bugfix	Gav Wood	2014-12-13	0	-0/+0
\| \| \|\ \| \| \| \| \| \| \| \|	set first 12 bytes to zero in ecrecover
\| \| \| *	Merge remote-tracking branch 'upstream/develop' into bugfix	CJentzsch	2014-12-13	23	-254/+3199
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libevm/VM.h
\| \| \| * \|	fix stackoverflow in calldataload, codecopy, extcodecopy + some tests	CJentzsch	2014-12-06	3	-0/+195
\| \| \| \| \|
\| \| * \| \|	Fix import state for state tests	CJentzsch	2014-12-13	1	-4/+4
\| \| \| \|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/TestHelper.cpp
\| \| * \|	Style fix.	Gav Wood	2014-12-13	1	-2/+0
\| \| \| \|
\| \| * \|	Merge pull request #594 from imapp-pl/tests	Gav Wood	2014-12-13	1	-0/+6
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Test unexpected storage entries
\| \| \| * \|	Replace spaces with tabs	Paweł Bylica	2014-12-12	1	-5/+5
\| \| \| \| \|
\| \| \| * \|	Report wrong account address in case of unexpected storege key	Paweł Bylica	2014-12-12	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	Test unexpected storage entries	Paweł Bylica	2014-12-12	1	-0/+6
\| \| \| \| \|
\| \| * \| \|	Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop	Gav Wood	2014-12-13	4	-9/+102
\| \| \|\ \ \
\| \| \| * \ \	Merge remote-tracking branch 'ethereum/develop' into sol_swapConstants	Christian	2014-12-13	10	-26/+108
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/solidityOptimizerTest.cpp
\| \| \| \| * \ \	Merge pull request #584 from chriseth/sol_strings	chriseth	2014-12-13	2	-0/+78
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	String types.
\| \| \| \| \| * \| \|	Support empty strings.	Christian	2014-12-11	2	-8/+14
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	Tests for empty and too long strings.	Christian	2014-12-11	1	-0/+16
\| \| \| \| \| \| \| \|
\| \| \| \| \| * \| \|	String types.	Christian	2014-12-10	1	-0/+56
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Do not add at the end of the function selector "loop".	Christian	2014-12-12	1	-7/+7
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Swap literals to the end if optimizing.	Christian	2014-12-12	1	-2/+17
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Cleanups.	Gav Wood	2014-12-13	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Beginnings of cleaning up the Executive/State code.	Gav Wood	2014-12-12	6	-12/+14
\| \| \| \|/ / / / \| \| \|/\| \| \| \|
\| \| * \| \| \| \|	Minor warning fix.	Gav Wood	2014-12-12	1	-1/+1
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop	Gav Wood	2014-12-12	2	-7/+9
\| \| \|\ \ \ \ \
\| \| \| * \ \ \ \	Merge pull request #583 from imapp-pl/vm	Gav Wood	2014-12-12	2	-7/+9
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	VM interface & factory
\| \| \| \| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into vm	Paweł Bylica	2014-12-12	6	-126/+385
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libethereum/Executive.cpp libethereum/Executive.h libethereum/State.cpp
\| \| \| \| * \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into vm	Paweł Bylica	2014-12-11	8	-43/+280
\| \| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \|_\|/ / / \| \| \| \| \| \|/\| \| \| \|
\| \| \| \| * \| \| \| \| \|	VMFactory - a new way of creating VMs	Paweł Bylica	2014-12-11	2	-7/+8
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Merge branch 'develop' into vm	Paweł Bylica	2014-12-08	13	-52/+2176
\| \| \| \| \|\ \ \ \ \ \
\| \| \| \| * \| \| \| \| \| \|	Use safe pointers in Executive	Paweł Bylica	2014-12-06	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix tests.	Gav Wood	2014-12-12	3	-7/+6
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Reduce verbosity.	Gav Wood	2014-12-12	1	-1/+2
\| \| \|/ / / / / / / /
\| * \| \| \| \| \| \| \| \|	jsonrpc _library -> _libraries	Marek Kotewicz	2014-12-12	1	-4/+4
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	renamed _DIR -> _DIRS && _LIBRARY -> _LIBRARIES according to cmake guidelines	Marek Kotewicz	2014-12-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into build_enhancement	Marek Kotewicz	2014-12-12	2	-7/+11
\| \|\\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Whisper test fix.	Gav Wood	2014-12-12	1	-6/+10
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fix genesis test.	Gav Wood	2014-12-12	1	-1/+1
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor/cleaning.
\| * \| \| \| \| \| \| \|	Merge branch 'develop' into build_enhancement	Marek Kotewicz	2014-12-12	5	-126/+297
\| \|\\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Remove extraneous old stuff for PoC-7.	Gav Wood	2014-12-12	2	-6/+4
\| \| \| \|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix gas remaining issue.
\| \| * \| \| \| \| \|	Whitespace change.	chriseth	2014-12-12	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Some (few) tests for the optimizer.	Christian	2014-12-11	3	-120/+293
\| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	fixed styling issues	Marek Kotewicz	2014-12-11	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'macox_fixes' into build_enhancement	Marek Kotewicz	2014-12-11	1	-1/+89
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/solidityNatspecJSON.cpp
\| \| * \| \| \| \|	Merge pull request #586 from LefterisJP/natspec_contract_tags	chriseth	2014-12-11	1	-0/+88
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|	Natspec title and author tag.
\| \| \| * \| \| \|	Natspec title and author tag.	Lefteris Karapetsas	2014-12-10	1	-0/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adding the title and author natspec documentation tags for contracts - Also using the author tag for functions now - Tests
\| * \| \| \| \| \|	Merge branch 'develop' into build_enhancement	Marek Kotewicz	2014-12-10	2	-2/+37
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	Merge pull request #582 from chriseth/sol_varSizeVariables	chriseth	2014-12-10	2	-2/+37
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \|	Variably sized elements on the stack
\| \| \| * \| \| \|	Variable-size stack elements for expression compiler.	Christian	2014-12-09	1	-0/+35
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Register variably-sized variables on stack.	Christian	2014-12-08	1	-2/+2
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	fix for windows compliation (circular dependency between statics initialized ↵	subtly	2014-12-10	1	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	dynamically and dynamically initialized statics)
\| * \| \| \| \| \|	empty sha test && common fix on mac	Marek Kotewicz	2014-12-09	1	-0/+9
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	added curl libaries, which are required for testeth project	debris	2014-12-09	1	-0/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	msvc changes in tests, but tests not yet working there	debris	2014-12-09	6	-51/+32
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' into build_enhancement	Marek Kotewicz	2014-12-08	2	-4/+139
\| \|\\| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'develop' into network	subtly	2014-12-08	7	-41/+235
\| \| \|\\| \| \| \|
\| \| \| * \| \| \|	Calling functions of other contracts.	Christian	2014-12-08	1	-4/+131
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	cryptopp crash w/null plaintext passed to decrypt	subtly	2014-12-08	1	-0/+8
\| \| \| \|_\|/ / \| \| \|/\| \| \|
\| * \| \| \| \|	Merge branch 'develop' into build_enhancement	Marek Kotewicz	2014-12-08	15	-86/+2082
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'ethereum/develop' into sol_import	Christian	2014-12-08	13	-52/+2176
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libsolidity/CompilerStack.cpp libsolidity/CompilerStack.h libsolidity/InterfaceHandler.cpp libsolidity/InterfaceHandler.h solc/main.cpp test/solidityJSONInterfaceTest.cpp test/solidityNatspecJSON.cpp
\| \| \| * \| \|	Merge remote-tracking branch 'upstream/develop' into stateLogTests	CJentzsch	2014-12-07	2	-14/+429
\| \| \| \|\ \ \
\| \| \| * \| \| \|	state log tests	CJentzsch	2014-12-06	9	-49/+1978
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	fix stackoverflow in calldataload, codecopy, extcodecopy + some tests	CJentzsch	2014-12-05	3	-0/+195
\| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	Comments and braces.	Christian	2014-12-07	1	-2/+0
\| \| \| \| \| \|
\| \| * \| \| \|	Merge remote-tracking branch 'ethereum/develop' into sol_import	Christian	2014-12-05	3	-20/+435
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libsolidity/CompilerStack.cpp libsolidity/CompilerStack.h solc/main.cpp
\| \| * \| \| \|	Improved external interface for multi-source and multi-contract compilation.	Christian	2014-12-04	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Multi-source and multi-contract compiler.	Christian	2014-12-04	3	-3/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Import directive.	Christian	2014-12-03	4	-37/+102
\| \| \| \| \| \|
\| * \| \| \| \|	Merge branch 'develop' into build_enhancement	Marek Kotewicz	2014-12-07	5	-14/+624
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	Merge pull request #568 from CJentzsch/newTests	Gav Wood	2014-12-06	3	-0/+195
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix vm overflow
\| \| \| * \| \| \|	fix stackoverflow in calldataload, codecopy, extcodecopy + some tests	CJentzsch	2014-12-06	3	-0/+195
\| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	Replacing old cstyle enums with c++11 enums in natspec	Lefteris Karapetsas	2014-12-05	2	-3/+3
\| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	Stack compiler now correctly returns a string and not a pointer	Lefteris Karapetsas	2014-12-05	2	-3/+3
\| \| \| \| \|
\| \| * \| \|	Newline right after doctag is now a valid natspec entry	Lefteris Karapetsas	2014-12-05	1	-0/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Plus tests for that
\| \| * \| \|	Using iterators in Natspec comment parsing	Lefteris Karapetsas	2014-12-05	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Used iterators in the entirety of the InterfaceHandler natspec comment parsing pipeline - Fixed issue where @param continuing in new line would not get a space
\| \| * \| \|	Natspec @return tag parsing	Lefteris Karapetsas	2014-12-05	1	-2/+72
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also omitting tags from the output JSON file if they are missing instead of providing an empty string for their value
\| \| * \| \|	Merge branch 'develop' into natspec_export_json	Lefteris Karapetsas	2014-12-05	9	-20/+141
\| \| \|\\| \|
\| \| * \| \|	Natspec parsing @param doctags	Lefteris Karapetsas	2014-12-05	1	-16/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Plus additional work on generally parsing doctags. One important missing feature is to parse a tag midline - Adding more tests
\| \| * \| \|	Parsing notice and dev doxytags.	Lefteris Karapetsas	2014-12-04	1	-11/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Only initial work done. Still need to refine the logic and incorporate all the other types of tags. - Added/Modified some tests - Work in progress
\| \| * \| \|	Moving all Interface and Documentation functionality to own class	Lefteris Karapetsas	2014-12-03	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Creating the Interface Handler class which will take care of the parsing of Natspec comments and of interfacing with and outputing to JSON files. - Will also handle the ABI interface creation
\| \| * \| \|	Separate user and dev natspec documentation	Lefteris Karapetsas	2014-12-03	1	-15/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- plus other small changes according to the spec
\| \| * \| \|	More Natspec JSON export tests and better error reporting	Lefteris Karapetsas	2014-12-02	2	-3/+90
\| \| \| \| \|
\| \| * \| \|	Using jsoncpp for exporting ABI interface from solidity	Lefteris Karapetsas	2014-12-02	1	-12/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also changing the interface JSON test to have a shorter name plus to provide meaningful error message in case of failure
\| \| * \| \|	Exporting Natspec documentation to a JSON interface	Lefteris Karapetsas	2014-12-02	1	-0/+77
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adding a getDocumentation() function to solidity compiler stack so that we can obtain the natspec interface for a contract - Adding libjsoncpp as a dependency of libsolidity. This is done in a dirty way, using libjsonrpc-cpp s an intermediate dependency for the moment. Will fix soon. - Start of a test file for Natspec exporting to JSON
\| * \| \| \|	Merge branch 'develop' into build_enhancement	Marek Kotewicz	2014-12-04	18	-37/+1996
\| \|\ \ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: eth/main.cpp neth/main.cpp
\| \| * \| \|	Merge pull request #555 from CJentzsch/newTests	Gav Wood	2014-12-03	1	-6/+6
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|	test update due to CALLCODE <-> RETURN
\| \| \| * \|	test update due to CALLCODA <-> RETURN	CJentzsch	2014-12-03	1	-6/+6
\| \| \| \| \|
\| \| * \| \|	Merge pull request #549 from chriseth/sol_saveScope	Gav Wood	2014-12-03	1	-0/+30
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|	Disallow assignments to structs and mappings
\| \| \| * \|	Disallow assignments to structs and mappings.	Christian	2014-12-02	1	-0/+30
\| \| \| \|/
\| \| * \|	Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop	Gav Wood	2014-12-03	8	-14/+264
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/vm.cpp
\| \| \| * \|	style	CJentzsch	2014-12-02	3	-38/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libevm/VM.h
\| \| \| * \|	updated createRandomTest to correct exception behavior	CJentzsch	2014-12-02	1	-9/+16
\| \| \| \| \|
\| \| \| * \|	added logs to state tests	CJentzsch	2014-12-02	6	-39/+87
\| \| \| \|/
\| \| \| *	Adding natspec comment test being between keyword and signature	Lefteris Karapetsas	2014-12-01	1	-2/+24
\| \| \| \|
\| \| \| *	Solidity natspec docstring test improvements	Lefteris Karapetsas	2014-11-28	1	-23/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Adding a test for docstring being between function signature and function body - Properly checking for exceptions in parsing - Small parser fix
\| \| \| *	Solidity FunctionDefinition used ASTString shared ptr for docstrings	Lefteris Karapetsas	2014-11-28	1	-9/+11
\| \| \| \|
\| \| \| *	Adding solidity natspec comment inside function body	Lefteris Karapetsas	2014-11-28	1	-0/+30
\| \| \| \|
\| \| \| *	Fixing multiline comment parsing in solidity	Lefteris Karapetsas	2014-11-28	1	-2/+0
\| \| \| \|
\| \| \| *	Solidity work for documentation strings	Lefteris Karapetsas	2014-11-28	1	-0/+52
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Still a work in progress - Parser now properly gets each function's doc comment - Small changes in the scanner - Multiline comments are considered
\| \| \| *	Solidity function AST nodes get documentation attribute	Lefteris Karapetsas	2014-11-27	1	-1/+32
\| \| \| \|
\| \| * \|	PV46. Minor protocol alterations.	Gav Wood	2014-12-03	1	-1/+1
\| \| \|/
\| \| *	Global functions.	Christian	2014-11-26	1	-1/+90
\| \| \|
\| \| *	Sending ether.	Christian	2014-11-26	1	-0/+15
\| \| \|
\| \| *	More general function types and references.	Christian	2014-11-26	1	-0/+20
\| \| \|
\| \| *	Merge pull request #540 from chriseth/sol_actualBlockchainAccess	Gav Wood	2014-11-25	1	-0/+13
\| \| \|\ \| \| \| \| \| \| \| \|	Access to blockchain data.
\| \| \| *	Access to blockchain data.	Christian	2014-11-24	1	-0/+13
\| \| \| \|
\| \| * \|	Merge pull request #533 from CJentzsch/stateTests	Gav Wood	2014-11-25	1	-3/+16
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Specify user defined test
\| \| \| * \|	style	Christoph Jentzsch	2014-11-21	1	-1/+1
\| \| \| \| \|
\| \| \| * \|	Specify user defined test	Christoph Jentzsch	2014-11-21	1	-3/+16
\| \| \| \| \|
\| \| * \| \|	Merge pull request #529 from CJentzsch/newTests	Gav Wood	2014-11-25	10	-4/+1474
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|	more tests + log tests
\| \| \| * \|	style	Christoph Jentzsch	2014-11-21	2	-4/+2
\| \| \| \| \|
\| \| \| * \|	Merge remote-tracking branch 'upstream/develop' into newTests	Christoph Jentzsch	2014-11-20	4	-37/+106
\| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/vm.cpp
\| \| \| * \|	add make money test	Christoph Jentzsch	2014-11-20	2	-0/+46
\| \| \| \| \|
\| \| \| * \|	more log tests	Christoph Jentzsch	2014-11-19	1	-7/+1160
\| \| \| \| \|
\| \| \| * \|	Add Log tests	Christoph Jentzsch	2014-11-19	5	-1/+177
\| \| \| \| \|
\| \| \| * \|	new push32 test and renaming	Christoph Jentzsch	2014-11-19	1	-1/+30
\| \| \| \| \|
\| \| \| * \|	Changed name of some tests	Christoph Jentzsch	2014-11-19	1	-2/+2
\| \| \| \| \|
\| \| \| * \|	more precompiled contract tests	Christoph Jentzsch	2014-11-19	1	-0/+68
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libevm/VM.h
\| \| * \| \|	Another test for struct references.	Christian	2014-11-24	1	-0/+28
\| \| \| \| \|
\| \| * \| \|	Magic variables.	Christian	2014-11-24	4	-22/+22
\| \| \| \| \|
\| \| * \| \|	Contracts as types and framework for special global variables.	Christian	2014-11-24	5	-12/+43
\| \| \| \| \|
\| * \| \| \|	Merge branch 'develop' into build_enhancement	Marek Kotewicz	2014-12-04	5	-33/+142
\| \|\\| \| \|
\| \| * \| \|	Merge pull request #524 from LefterisJP/sol_parse_comments	chriseth	2014-11-21	1	-0/+40
\| \| \|\ \ \ \| \| \| \|_\|/ \| \| \|/\| \|	Solidity scanner taking documentation comments into account
\| \| \| * \|	extra comments scanning test	Lefteris Karapetsas	2014-11-21	1	-0/+11
\| \| \| \| \|
\| \| \| * \|	documentation comments are now always skipped but saved as special tokens at ↵	Lefteris Karapetsas	2014-11-19	1	-20/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the Scanner
\| \| \| * \|	solidity scanner takes triple slash doc comments into account	Lefteris Karapetsas	2014-11-19	1	-0/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Conditionally scanning for the documentation comments and gettings their contents. - Adding tests for this functionality of the scanner
\| \| * \| \|	Merge pull request #528 from chriseth/sol_constructor	Gav Wood	2014-11-20	1	-0/+22
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Special handling for constructor.
\| \| \| * \| \|	Special handling for constructor.	Christian	2014-11-19	1	-0/+22
\| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	Merge pull request #527 from imapp-pl/pr-changes	Gav Wood	2014-11-20	2	-33/+45
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Check only if an exception occurred if an exception expected
\| \| \| * \| \|	In VM tests, check only if an exception occurred if an exception expected ↵	Paweł Bylica	2014-11-19	2	-33/+45
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(no post state and output checking)
\| \| * \| \|	Merge pull request #520 from wanderer/develop	Gav Wood	2014-11-20	1	-0/+35
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \|	added filler
\| \| \| * \|	added filler.json	wanderer	2014-11-18	1	-0/+35
\| \| \| \| \|
\| * \| \| \|	common changes	Marek Kotewicz	2014-12-02	1	-0/+1
\| \| \| \| \|
\| * \| \| \|	use CMAKE_PREFIX_PATH instead of CMAKE_FILE_ROOT_PATH; removed the	sveneh	2014-11-28	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	requirement to use EXACT version numbers for dependencies, cleanup
\| * \| \| \|	Merge remote-tracking branch 'debris/mk_jsonrpc_upgrade' into build_enhancement	sveneh	2014-11-20	7	-423/+645
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This basically pulls in libjson-rpc-cpp 0.3.2, updated from previous 0.2.1. v0.3.2 completely changes its own setup, hence such a massive change builds fine on Ubuntu, needs check on OS X Conflicts: CMakeLists.txt cmake/EthDependenciesDeprecated.cmake eth/CMakeLists.txt libqethereum/CMakeLists.txt libweb3jsonrpc/CMakeLists.txt neth/CMakeLists.txt test/CMakeLists.txt
\| \| * \| \| \|	Merge branch 'develop' into mk_jsonrpc_upgrade	Marek Kotewicz	2014-11-18	2	-4/+110
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libweb3jsonrpc/abstractwebthreestubserver.h libweb3jsonrpc/spec.json test/webthreestubclient.h
\| \| \| * \| \|	Merge branch 'filter_logs' into develop	Gav Wood	2014-11-18	2	-17/+134
\| \| \| \|\ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| \| \| * \|	common changes	Marek Kotewicz	2014-11-18	1	-11/+24
\| \| \| \| \| \|
\| \| \| \| * \|	Merge branch 'filter_logs' of https://github.com/ethereum/cpp-ethereum into logs	Marek Kotewicz	2014-11-18	1	-24/+11
\| \| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libweb3jsonrpc/abstractwebthreestubserver.h libweb3jsonrpc/spec.json test/webthreestubclient.h
\| \| \| \| \| * \|	Renaming and fixes.	Gav Wood	2014-11-18	1	-2/+2
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	logs in spec	Marek Kotewicz	2014-11-18	1	-11/+24
\| \| \| \| \|/ /
\| \| \| \| * \|	ethereum.js not minified, serpent compiler, jsonrpc handles compilers exceptions	Marek Kotewicz	2014-11-17	1	-0/+13
\| \| \| \| \| \|
\| \| \| \| * \|	Merge branch 'develop' into js_abi	Marek Kotewicz	2014-11-17	2	-199/+129
\| \| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libweb3jsonrpc/WebThreeStubServer.cpp
\| \| \| \| * \|	Merge branch 'develop' into js_abi	Marek Kotewicz	2014-11-14	6	-112/+404
\| \| \| \| \|\ \
\| \| \| \| * \| \|	storage dump test	Marek Kotewicz	2014-11-14	1	-0/+38
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	added storageAt which dumps contract storage	Marek Kotewicz	2014-11-14	1	-0/+13
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	removed unnecessary methods from jsonrpc and added contract call tests	Marek Kotewicz	2014-11-13	2	-27/+28
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	contract calls working from js	Marek Kotewicz	2014-11-13	1	-2/+1
\| \| \| \| \| \| \|
\| \| \| \| * \| \|	Merge branch 'develop' into js_abi	Marek Kotewicz	2014-11-12	3	-5/+104
\| \| \| \| \|\ \ \
\| \| \| \| * \| \| \|	contract create and contract call working	Marek Kotewicz	2014-11-11	1	-3/+2
\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \|	Merge branch 'develop' into js_abi	Marek Kotewicz	2014-11-11	0	-0/+0
\| \| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libjsqrc/main.js libweb3jsonrpc/WebThreeStubServer.cpp libweb3jsonrpc/WebThreeStubServer.h libweb3jsonrpc/abstractwebthreestubserver.h libweb3jsonrpc/spec.json test/webthreestubclient.h
\| \| \| \| * \| \| \| \|	merge	Marek Kotewicz	2014-11-11	9	-222/+2335
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	js abi connection	Marek Kotewicz	2014-11-11	1	-14/+56
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Build fix.	Gav Wood	2014-11-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Remove overly verbose log.	Gav Wood	2014-11-18	1	-1/+1
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	fixed test	Marek Kotewicz	2014-11-18	1	-3/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	common changes	Marek Kotewicz	2014-11-18	1	-4/+4
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'develop' into mk_jsonrpc_upgrade	Marek Kotewicz	2014-11-18	32	-2021/+5930
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: alethzero/MainWin.cpp libweb3jsonrpc/WebThreeStubServer.cpp libweb3jsonrpc/abstractwebthreestubserver.h libweb3jsonrpc/spec.json test/jsonrpc.cpp test/webthreestubclient.h
\| \| \| * \| \| \| \| \|	Merge pull request #515 from chriseth/sol_structs	chriseth	2014-11-18	3	-2/+242
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \|	Mappings and structs for Solidity
\| \| \| \| * \| \| \| \|	Struct types.	Christian	2014-11-14	2	-0/+75
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	Mapping types.	Christian	2014-11-14	2	-2/+167
\| \| \| \| \| \|_\|_\|/ \| \| \| \| \|/\| \| \|
\| \| \| * \| \| \| \|	Windows build fix.	Gav Wood	2014-11-17	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	fixed WebThreeStubServer constructor	Marek Kotewicz	2014-11-04	1	-1/+3
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	little cleanup after upgrading jsonrpc	Marek Kotewicz	2014-11-04	2	-3/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	jsonrpc 0.3.0 working, needs cleanup	Marek Kotewicz	2014-11-03	3	-424/+301
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into ↵	sveneh	2014-11-17	8	-311/+533
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	build_enhancement Conflicts: libdevcrypto/EC.cpp -> accept-incoming
\| \| * \| \| \| \| \|	pr fix	subtly	2014-11-14	1	-2/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'develop' into crypto	subtly	2014-11-14	6	-112/+404
\| \| \|\ \ \ \ \ \ \| \| \| \| \|/ / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libdevcrypto/EC.cpp
\| \| \| * \| \| \| \|	Compile fixes.	Gav Wood	2014-11-14	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Version bump.
\| \| \| * \| \| \| \|	Merge pull request #512 from ethereum/sol_jsonInterfaceTests	Gav Wood	2014-11-14	1	-0/+214
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Solidity json interface tests
\| \| \| \| * \| \| \| \|	solidity json interface tests fixes	Marek Kotewicz	2014-11-12	1	-3/+4
\| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \|	solidity JSON interface tests	Marek Kotewicz	2014-11-12	1	-0/+213
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge pull request #510 from CJentzsch/NewStateTests	Gav Wood	2014-11-14	3	-41/+78
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	create new tests with command line options
\| \| \| * \ \ \ \ \ \	Merge pull request #509 from chriseth/sol_jsonInterface	Gav Wood	2014-11-14	1	-1/+1
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / \| \| \| \| \|/\| \| \| \| \|	Provide interface for calls in JSON and some other formatting changes.
\| \| \| \| * \| \| \| \| \|	Provide interface for calls in JSON and some other formatting changes.	Christian	2014-11-12	1	-1/+1
\| \| \| \| \| \|_\|_\|_\|/ \| \| \| \| \|/\| \| \| \|
\| \| \| * \| \| \| \| \|	Merge pull request #501 from chriseth/sol_testFramework	Gav Wood	2014-11-14	1	-63/+88
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tests on ranges of input data.
\| \| \| \| * \| \| \| \| \|	Working template magic for void function.	Christian	2014-11-11	1	-19/+22
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Allow void return type.	Christian	2014-11-11	1	-23/+35
\| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \|	Tests on ranges of input data.	Christian	2014-11-10	1	-52/+62
\| \| \| \| \| \|_\|_\|/ / \| \| \| \| \|/\| \| \| \|
\| \| \| * \| \| \| \| \|	Merge pull request #500 from chriseth/sol_jumptable	Gav Wood	2014-11-14	2	-7/+23
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \|_\|/ / / / \| \| \| \|/\| \| \| \| \|	Replace function selector jump table by more resilient linear time check.
\| \| \| \| * \| \| \| \|	Merge remote-tracking branch 'ethereum/develop' into sol_jumptable	Christian	2014-11-11	9	-210/+2324
\| \| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \|_\|_\|/ \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libsolidity/Compiler.cpp
\| \| \| \| * \| \| \| \|	Replace function selector jump table by more resilient linear time check.	Christian	2014-11-10	2	-7/+23
\| \| \| \| \| \|/ / / \| \| \| \| \|/\| \| \|
\| \| * \| \| \| \| \|	changes for code review	subtly	2014-11-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'develop' into crypto	subtly	2014-11-13	3	-5/+104
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libdevcrypto/Common.cpp libdevcrypto/EC.cpp
\| \| * \| \| \| \| \|	refactor and thread-safe cryptopp. for now, remove secp256klib calls. ecdh ↵	subtly	2014-11-13	1	-98/+45
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and tests. move sha3mac into sha3.
\| \| * \| \| \| \| \|	cryptopp recover public key	subtly	2014-11-12	1	-4/+4
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	ecdh, ecdhe, initial aes classes	subtly	2014-11-12	2	-105/+89
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into ↵	sveneh	2014-11-11	30	-1929/+5384
\| \|\ \ \ \ \ \ \| \| \| \|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	build_enhancement Conflicts: alethzero/CMakeLists.txt cmake/EthDependenciesDeprecated.cmake libdevcrypto/CryptoPP.h libdevcrypto/EC.cpp third/CMakeLists.txt
\| * \| \| \| \| \|	compiles fine now (on Linux) with both cryptopp and json-rpc-cpp dependencies	sveneh	2014-11-11	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	full project compile with crypto++ dependency	sveneh	2014-11-06	1	-1/+7
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	... addition to last commit, these were lost.	sveneh	2014-11-06	1	-2/+2
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	merge	CJentzsch	2014-12-14	1	-1/+24
\| \|_\|_\|_\|/ / \|/\| \| \| \| \|
* \| \| \| \| \|	changed name of command line option to filltests	Christoph Jentzsch	2014-11-12	1	-1/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Create state test with commandline flag	Christoph Jentzsch	2014-11-12	2	-22/+59
\| \| \| \| \| \|
* \| \| \| \| \|	Store return value of call to precompiled contract in test	Christoph Jentzsch	2014-11-12	1	-19/+19
\| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #504 from CJentzsch/NewStateTests	Gav Wood	2014-11-11	2	-5/+20
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	All unintended VM exceptions work like OOG in tests
\| * \ \ \ \	Merge remote-tracking branch 'upstream/develop' into NewStateTests	Christoph Jentzsch	2014-11-11	3	-222/+355
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| * \| \| \| \|	All unintended VM exceptions work like OOG in tests	Christoph Jentzsch	2014-11-11	2	-5/+20
\| \| \| \| \| \|
* \| \| \| \| \|	Make OOG on precompileds consistent.	Gav Wood	2014-11-11	1	-0/+84
\| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Warning fix. Use high-res clock for randoms. Whisper test.
* \| \| \| \|	Merge pull request #499 from CJentzsch/NewStateTests	Gav Wood	2014-11-11	7	-21/+2134
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \|	New state tests, precompiled contracts tests and user defined tests
\| * \| \| \|	build fix	Christoph Jentzsch	2014-11-11	4	-4/+6
\| \| \| \| \|
\| * \| \| \|	added generic userDefinedTest function	Christoph Jentzsch	2014-11-11	4	-74/+44
\| \| \| \| \|
\| * \| \| \|	undefine FILL_TESTS	Christoph Jentzsch	2014-11-10	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into NewStateTests	Christoph Jentzsch	2014-11-10	7	-85/+38
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/state.cpp test/tmpFiller.json
\| * \| \| \| \|	specified user defined test	Christoph Jentzsch	2014-11-10	2	-21/+71
\| \| \| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into NewStateTests	Christoph Jentzsch	2014-11-07	7	-74/+203
\| \|\ \ \ \ \
\| * \| \| \| \| \|	Added random test execution	Christoph Jentzsch	2014-11-07	2	-8/+36
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into NewStateTests	Christoph Jentzsch	2014-11-07	1	-0/+49
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Added precompiledContracts tests	Christoph Jentzsch	2014-11-07	3	-27/+741
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'stateTests' into NewStateTests	Christoph Jentzsch	2014-11-06	11	-352/+1059
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/TestHelper.cpp test/vm.cpp
\| \| * \| \| \| \| \| \|	update SIGNEXTEND tests	Christoph Jentzsch	2014-11-06	2	-8/+8
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	added state system operations test	Christoph Jentzsch	2014-11-05	3	-13/+81
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'StateBug' into NewStateTests	Christoph Jentzsch	2014-11-05	3	-10/+8
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into NewStateTests	Christoph Jentzsch	2014-11-05	1	-51/+45
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'newTests' into NewStateTests	Christoph Jentzsch	2014-11-05	6	-971/+1023
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/vm.cpp test/vmArithmeticTestFiller.json test/vmSha3TestFiller.json
\| * \| \| \| \| \| \| \| \| \|	Added stSystemOperationsTest	Christoph Jentzsch	2014-11-05	4	-19/+1283
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into NewStateTests	Christoph Jentzsch	2014-11-04	1	-0/+2
\| \|\ \ \ \ \ \ \ \ \ \
* \| \ \ \ \ \ \ \ \ \ \	Merge pull request #486 from chriseth/sol_optimizer	Gav Wood	2014-11-11	0	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix and activate optimizer for Solidity, add some new rules.
\| * \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'ethereum/develop' into sol_optimizer	Christian	2014-11-10	8	-139/+207
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libevmcore/Instruction.cpp
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'ethereum/develop' into sol_optimizer	Christian	2014-11-07	5	-72/+201
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'ethereum/develop' into sol_optimizer	Christian	2014-11-06	1	-0/+49
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #482 from ethereum/jsonrpc_interface	Gav Wood	2014-11-11	2	-189/+190
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|_\|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	renaming calls to include a subprotocol prefix
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into jsonrpc_interface	Marek Kotewicz	2014-11-09	6	-105/+41
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into jsonrpc_interface	Marek Kotewicz	2014-11-08	7	-71/+249
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	added eth_lll	Marek Kotewicz	2014-11-06	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	renaming calls to include a subprotocol prefix	Marek Kotewicz	2014-11-06	2	-195/+183
\| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #494 from chriseth/sol_stateVariables	Gav Wood	2014-11-10	1	-0/+25
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	State variables for Solidity
\| * \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'ethereum/develop' into sol_stateVariables	Christian	2014-11-10	6	-105/+41
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libsolidity/ExpressionCompiler.cpp
\| * \| \| \| \| \| \| \| \| \| \| \| \|	State variables.	Christian	2014-11-08	1	-0/+25
\| \| \|_\|/ / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #488 from LefterisJP/develop	Gav Wood	2014-11-10	1	-33/+140
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \|	solidity endToEnd testing gets equivalent CPP contracts
\| * \| \| \| \| \| \| \| \| \| \| \|	style fixes	Lefteris Karapetsas	2014-11-09	1	-10/+20
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	solidity endToEnd testing gets equivalent CPP contracts	Lefteris Karapetsas	2014-11-09	1	-33/+130
\| \| \|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Just testing the waters of our codebase by introducing C++ version of the contract functions in the end to end solidity tests - This way there is no need to check for some specific output but instead strive for consistency between the C++ and solidity code.
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop	Gav Wood	2014-11-09	6	-105/+41
\|\ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge pull request #490 from CJentzsch/StateBug	Gav Wood	2014-11-09	5	-66/+7
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Quick fix for OOG in deep calls
\| \| * \| \| \| \| \| \| \| \| \| \| \|	style	Christoph Jentzsch	2014-11-07	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Clean up state tests	Christoph Jentzsch	2014-11-07	3	-59/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into StateBug	Christoph Jentzsch	2014-11-07	19	-1326/+2263
\| \| \|\\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into StateBug	Christoph Jentzsch	2014-11-05	1	-51/+45
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| / / \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into StateBug	Christoph Jentzsch	2014-11-04	1	-0/+2
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix ABAcalls OOG bug	Christoph Jentzsch	2014-11-04	3	-10/+8
\| \| \| \|_\|_\|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #487 from chriseth/sol_arbitraryEvaluationOrder	Gav Wood	2014-11-09	1	-39/+34
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \|	Evaluate expressions in convenient order.
\| \| * \| \| \| \| \| \| \| \| \| \|	Evaluate expressions in convenient order.	Christian	2014-11-07	1	-39/+34
\| \| \| \|_\|_\|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \|
\| * / \| \| \| \| \| \| \| \| \|	small fix in solidityCompiler	Marek Kotewicz	2014-11-07	1	-1/+1
\| \|/ / / / / / / / / /
* / / / / / / / / / /	Fixes for warnings. Take note.	Gav Wood	2014-11-07	1	-1/+1
\|/ / / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #478 from chriseth/sol_typePromotion	Gav Wood	2014-11-07	5	-72/+201
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Type promotion
\| * \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'ethereum/develop' into sol_typePromotion	Christian	2014-11-07	1	-0/+49
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Support for negative literals.	Christian	2014-11-06	2	-5/+62
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Fixes for test framework (sign the transaction).	Christian	2014-11-06	1	-62/+49
\| \| \| \| \| \| \| \| \| \| \|