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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Test Cases Changes	winsvega	2015-03-04	4	-76/+78
\| \| \| \|	userDefinedFile test now goes with --test option for all cases
*	Transaction Tests	winsvega	2015-03-04	3	-2/+33
\| \| \| \|	A few changes
*	Merge pull request #1193 from chriseth/sol_fixABIArrays	Gav Wood	2015-03-03	1	-4/+4
\|\ \| \| \| \|	Fixed arrays in ABI.
\| *	Fixed arrays in ABI.	Christian	2015-03-03	1	-4/+4
\| \|
* \|	Fix test after change in call failure semantics.	Christian	2015-03-03	1	-4/+7
\|/
*	Implemented passing arguments to the base constructor.	Liana Husikyan	2015-03-02	1	-0/+64
\|
*	Merge pull request #1146 from LefterisJP/sol_fixBaseClassAccessors	chriseth	2015-03-02	1	-1/+53
\|\ \| \| \| \|	Sol fix accessing public variable of base class
\| *	getInheritableMembers() does not look at BaseContracts	Lefteris Karapetsas	2015-03-02	1	-0/+29
\| \| \| \| \| \| \| \|	- Also adding tests for improper accessing members of other contracts.
\| *	VisibleInDerivedContracts() is now virtual()	Lefteris Karapetsas	2015-03-02	1	-1/+12
\| \| \| \| \| \| \| \|	- Plus an extra test for internal visibility in a base class variable
\| *	Add structs to inheritable members	Lefteris Karapetsas	2015-03-02	1	-2/+2
\| \|
\| *	Adding test for base class statevar accessors	Lefteris Karapetsas	2015-03-02	1	-0/+12
\| \|
* \|	Merge pull request #1157 from chriseth/sol_arrayShortening	chriseth	2015-03-02	2	-0/+233
\|\ \ \| \|/ \|/\|	Copying arrays and shortening of dynamic arrays.
\| *	Array copy storage to storage.	Christian	2015-02-28	1	-0/+88
\| \|
\| *	Type checks for array assignment.	Christian	2015-02-28	1	-0/+55
\| \|
\| *	Shortening of dynamic arrays.	Christian	2015-02-28	1	-0/+90
\| \|
* \|	Merge pull request #1160 from CJentzsch/addTests	Gav Wood	2015-03-01	8	-96/+861
\|\ \ \| \| \| \| \| \|	Add tests
\| * \|	move extrem memory test to stMemoryStressTest.json	CJentzsch	2015-03-01	4	-68/+92
\| \| \|
\| * \|	more memmory hard quadratic complexity tests	CJentzsch	2015-03-01	1	-0/+330
\| \| \|
\| * \|	more jump tests	CJentzsch	2015-02-27	1	-0/+85
\| \| \|
\| * \|	add more addmod mulmod overflow tests	CJentzsch	2015-02-27	1	-0/+224
\| \| \|
\| * \|	A calls B to refund	CJentzsch	2015-02-27	1	-28/+130
\| \|/
* /	add several var related test cases	Lu Guanqun	2015-03-01	1	-0/+34
\|/
*	Merge pull request #1149 from winsvega/develop	Gav Wood	2015-02-27	3	-23/+182
\|\ \| \| \| \|	More Transaction Tests
\| *	Test Helper	winsvega	2015-02-27	1	-2/+2
\| \| \| \| \| \| \| \|	style changes
\| *	More Transaction Tests	winsvega	2015-02-26	3	-23/+182
\| \| \| \| \| \| \| \|	Some tests to check YP statements
* \|	more calldatacopy return tests (for Pawel)	CJentzsch	2015-02-27	2	-1/+205
\| \|
* \|	Merge branch 'memTests' into addTests	CJentzsch	2015-02-26	1	-7/+231
\|\ \
\| * \	Merge remote-tracking branch 'upstream/develop' into memTests	CJentzsch	2015-02-26	12	-115/+1136
\| \|\ \
\| * \ \	Merge remote-tracking branch 'upstream/develop' into memTests	CJentzsch	2015-02-23	7	-14/+35
\| \|\ \ \
\| * \| \| \|	add new mem test for quadratic mem gas costs	CJentzsch	2015-02-23	1	-7/+231
\| \| \| \| \|
* \| \| \| \|	adjust to new quadratic memory rule	CJentzsch	2015-02-26	1	-9/+9
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into addTests	CJentzsch	2015-02-26	3	-2/+132
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	LValue refactoring.	Christian	2015-02-25	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge pull request #1132 from LefterisJP/sol_DebuggingInformation	chriseth	2015-02-25	3	-1/+131
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Location information in AssemblyItems, filled by Solidity.
\| \| * \| \| \|	Re-adding braces to if in test/Assembly.cpp	Lefteris Karapetsas	2015-02-25	1	-0/+4
\| \| \| \| \| \|
\| \| * \| \| \|	Move SourceLocation to evmcore	Lefteris Karapetsas	2015-02-25	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Tighter coupling for Assembly items retrieval	Lefteris Karapetsas	2015-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Exposing only assembly items, not the entire compiler context
\| \| * \| \| \|	LocationSetter in some extra places during Compiling	Lefteris Karapetsas	2015-02-25	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also adjusted the test, and fixed its error reporting
\| \| * \| \| \|	Styling changes for SourceLocation and friends	Lefteris Karapetsas	2015-02-25	1	-5/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Simple Assembly Locations test	Lefteris Karapetsas	2015-02-25	1	-0/+128
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also adding some helper functions to SourceLocation
\| \| * \| \| \|	Reset CompilerContext's visited nodes at compile start	Lefteris Karapetsas	2015-02-25	1	-0/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Moving Source Location libdevcore	Lefteris Karapetsas	2015-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Big plus is we now remove the useless header libsolibity/BaseTypes.h
* \| \| \| \| \|	add more sdiv smod tests	CJentzsch	2015-02-26	1	-1/+141
\| \| \| \| \| \|
* \| \| \| \| \|	tests for mem at 32,64 KB +- 1, 31,32,33 for mstore and mstore8	CJentzsch	2015-02-26	1	-0/+1360
\| \| \| \| \| \|
* \| \| \| \| \|	include invalid transaction rlp block test	CJentzsch	2015-02-25	1	-0/+5
\| \| \| \| \| \|
* \| \| \| \| \|	add memory tests	CJentzsch	2015-02-25	2	-0/+142
\| \| \| \| \| \|
* \| \| \| \| \|	add commandline flag for tt10MBtxTest	CJentzsch	2015-02-25	1	-1/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	bugix in trie test undo trie test change
* \| \| \| \| \|	use 50000 bytes for CALLDATACOPY	CJentzsch	2015-02-25	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	add --all flag for time consuming tests	CJentzsch	2015-02-25	1	-3/+3
\| \| \| \| \| \|
* \| \| \| \| \|	add quadratic complexity tests	CJentzsch	2015-02-25	3	-60/+321
\| \| \| \| \| \|
* \| \| \| \| \|	add test for quadratic complexity	CJentzsch	2015-02-25	4	-1/+102
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	remove file with wrong name
* \| \| \| \| \|	add wrong v value tx test	CJentzsch	2015-02-25	2	-6/+21
\| \| \| \| \| \|
* \| \| \| \| \|	add create contract with existing address test	CJentzsch	2015-02-25	2	-464/+506
\|/ / / / /
* \| \| \| \|	Merge pull request #1129 from imapp-pl/pr/old_tests	Gav Wood	2015-02-25	4	-1/+729
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Old VM tests used in EVM JIT development
\| * \| \| \| \|	Move old VM jump tests from EVM JIT to JSON file	Paweł Bylica	2015-02-25	1	-28/+280
\| \| \| \| \| \|
\| * \| \| \| \|	Move old VM stack tests from EVM JIT to JSON file	Paweł Bylica	2015-02-24	2	-0/+141
\| \| \| \| \| \|
\| * \| \| \| \|	Move old VM return tests from EVM JIT to JSON file	Paweł Bylica	2015-02-24	1	-0/+56
\| \| \| \| \| \|
\| * \| \| \| \|	Move old VM memory tests from EVM JIT to JSON file	Paweł Bylica	2015-02-24	1	-0/+84
\| \| \| \| \| \|
\| * \| \| \| \|	Move old VM environmental test from EVM JIT to JSON file	Paweł Bylica	2015-02-24	1	-1/+29
\| \| \| \| \| \|
\| * \| \| \| \|	Move old VM arithmetic tests from EVM JIT to JSON file	Paweł Bylica	2015-02-24	1	-0/+167
\| \|/ / / /
* \| \| \| \|	Merge pull request #1110 from winsvega/develop	Gav Wood	2015-02-25	1	-30/+74
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| / \| \| \|_\|/ \| \|/\| \|	Quadratic complexity test
\| * \| \|	Solidity Tests	winsvega	2015-02-24	1	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cosmetics2
\| * \| \|	Solidity Tests	winsvega	2015-02-24	1	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixing cosmetics
\| * \| \|	Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop	winsvega	2015-02-23	7	-13/+176
\| \|\ \ \
\| * \| \| \|	Quadratic complexity test	winsvega	2015-02-23	1	-30/+75
\| \| \| \| \|
* \| \| \| \|	Merge pull request #1119 from chriseth/sol_arraysIndexAccess	chriseth	2015-02-24	1	-0/+101
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Index access for arrays.
\| * \| \| \| \|	Out-of-bounds checking.	Christian	2015-02-24	1	-2/+47
\| \| \| \| \| \|
\| * \| \| \| \|	Index and length access for dynamic arrays.	Christian	2015-02-24	1	-0/+29
\| \| \| \| \| \|
\| * \| \| \| \|	Implementation of index access.	Christian	2015-02-24	1	-0/+27
\| \| \| \| \| \|
* \| \| \| \| \|	fixed test buid	arkpar	2015-02-24	1	-1/+1
\|/ / / / /
* \| \| \| \|	Merge pull request #1113 from CJentzsch/addTests	Gav Wood	2015-02-24	2	-82/+40
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	remove/adapt tests with impossible pre conditions
\| * \| \| \| \|	remove tests with impossible pre conditions	CJentzsch	2015-02-23	2	-82/+40
\| \| \|_\|_\|/ \| \|/\| \| \|
* \| \| \| \|	Merge pull request #1100 from chriseth/sol_arrays	Gav Wood	2015-02-23	2	-0/+60
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \|	Parsing support for arrays.
\| * \| \| \|	Allow conversion to dynamic arrays and update grammar.	Christian	2015-02-22	1	-0/+11
\| \| \| \| \|
\| * \| \| \|	Parsing of array types and basic implementation.	Christian	2015-02-21	2	-0/+49
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge remote-tracking branch 'upstream/develop' into addTests	CJentzsch	2015-02-23	49	-1824/+7736
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/CMakeLists.txt test/ttTransactionTestFiller.json
\| * \| \|	Merge pull request #1109 from CJentzsch/TransactionBugFix	Gav Wood	2015-02-23	2	-3/+8
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Transaction bug fix
\| \| * \| \|	fix too-small-address-length bug in transaction	CJentzsch	2015-02-23	2	-3/+8
\| \| \|/ /
\| * \| \|	Merge pull request #1107 from chriseth/sol_inheritableIsInternal	Gav Wood	2015-02-23	2	-9/+9
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \|	Replaced "inheritable" by "internal".
\| \| * \| \|	Replaced "inheritable" by "internal".	Christian	2015-02-23	2	-9/+9
\| \| \|/ /
\| * / /	Stack height checks and fix.	Christian	2015-02-23	1	-1/+0
\| \|/ /
\| * \|	Inline member initialisation	Liana Husikyan	2015-02-21	1	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	renamed VariableDefinition class to VariableDeclarationStatement added tests
\| * \|	Merge pull request #1091 from chriseth/accountProxyQueues	Gav Wood	2015-02-21	2	-0/+104
\| \|\ \ \| \| \|/ \| \|/\|	Account proxy queues
\| \| *	Implemented account proxy queues.	Christian	2015-02-21	2	-0/+104
\| \| \|
\| * \|	New Solidity Tests	winsvega	2015-02-20	2	-4/+355
\| \| \|
\| * \|	Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop	winsvega	2015-02-20	2	-0/+15
\| \|\\|
\| \| *	Merge pull request #1092 from LefterisJP/sol_BugOverrideFunctionByteArrayParam	chriseth	2015-02-20	1	-0/+13
\| \| \|\ \| \| \| \| \| \| \| \|	Bugfix for functions override
\| \| \| *	Bugfix for functions override	Lefteris Karapetsas	2015-02-20	1	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Functions with byte array type parameters can now be safely overriden. Parameter location is now set at the right place. - Also made a test for the fix
\| \| * \|	Merge pull request #1071 from winsvega/develop	Gav Wood	2015-02-20	2	-18/+229
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	Test Correction
\| \| * \ \	Merge pull request #1082 from debris/jsonrpc	Gav Wood	2015-02-20	0	-0/+0
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	latest changes from ethereum.js
\| \| \| * \ \	Merge branch 'develop' into jsonrpc	Marek Kotewicz	2015-02-19	3	-9/+45
\| \| \| \|\ \ \ \| \| \| \| \| \|/ \| \| \| \| \|/\|
\| \| \| * \| \|	Merge commit '4fbeff27d613a4e13452489acd6cfc5e94e8f620' into jsonrpc	Marek Kotewicz	2015-02-18	0	-0/+0
\| \| \| \|\ \ \
\| \| \| \| * \| \|	Squashed 'libjsqrc/ethereumjs/' changes from 82cc5f6..9a85b09	Marek Kotewicz	2015-02-18	3	-0/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	9a85b09 version upgrade ec6f9b3 added transactionCount && uncleCount methods b96a7aa gulp cleanup d6128f2 coveralls badge points to master efee649 coveralls badge 339f565 travis coveralls 27d53dd travis coveralls 001077e Merge pull request #59 from cubedro/master 9902977 updated dist af7c26b check request.status in httpsync.js to prevent throwing errors when undefined ad8112c Merge pull request #15 from ethereum/master d1e6b20 updated README c184728 version upgrade 3d652e8 fixed web3.reset() 26561e4 fixed #51 03661d3 eth_polling_timeout const 9e806cc Merge branch 'master' into develop 82d32bb providermanager -> requestmanager a86fccf web3 refactor (in progress) c29f4a1 filters refactor 9d84609 Merge branch 'master' of https://github.com/ethereum/ethereum.js 859a199 Merge pull request #55 from ethereum/develop fd5146d Merge pull request #12 from debris/master git-subtree-dir: libjsqrc/ethereumjs git-subtree-split: 9a85b098a082f9ed38bcf92ab5ee6ba64489d7cf
\| \| * \| \| \| \|	Fix gas limit.	Gav Wood	2015-02-20	1	-0/+2
\| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Disable whisper test until alex fixes networking.
\| * \| \| \| \|	Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop	winsvega	2015-02-19	3	-9/+45
\| \|\\| \| \| \|
\| \| * \| \| \|	Merge pull request #1087 from chriseth/sol_changeProtectedToInheritable	Gav Wood	2015-02-18	2	-9/+9
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rename "protected" to "inheritable".
\| \| \| * \| \| \|	Rename "protected" to "inheritable".	Christian	2015-02-18	2	-9/+9
\| \| \| \|/ / /
\| \| * / / /	Fixes for assigning and deleting structs containing byte arrays.	Christian	2015-02-18	1	-0/+36
\| \| \|/ / /
\| * \| \| /	Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop	winsvega	2015-02-18	19	-97/+3832
\| \|\\| \| \| \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Merge pull request #1080 from debris/transactionCount	Gav Wood	2015-02-18	1	-0/+40
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \|	JSON-RPC transactionCount && uncleCount, fixed #1027
\| \| \| * \|	JSON-RPC transactionCount && uncleCount, fixed #1027	Marek Kotewicz	2015-02-18	1	-0/+40
\| \| \| \| \|
\| \| * \| \|	Merge pull request #1072 from chriseth/sol_external	Gav Wood	2015-02-18	4	-8/+149
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	bytes ABI type and external visibility specifier
\| \| \| * \| \|	Calldata byte arrays stored on the stack.	Christian	2015-02-17	1	-4/+32
\| \| \| \| \| \|
\| \| \| * \| \|	loadFromMemoryDynamic	Christian	2015-02-17	1	-5/+5
\| \| \| \| \| \|
\| \| \| * \| \|	No write access to parameters of external functions.	Christian	2015-02-17	2	-0/+45
\| \| \| \| \| \|
\| \| \| * \| \|	"external" visibility specifier.	Christian	2015-02-17	2	-0/+68
\| \| \| \|/ /
\| \| * \| \|	Merge pull request #1070 from debris/shh_getMessages	Gav Wood	2015-02-18	1	-0/+10
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	added shh_getMessages, fixed #899
\| \| \| * \| \|	added shh_getMessages, fixed #899	Marek Kotewicz	2015-02-17	1	-0/+10
\| \| \| \| \| \|
\| \| * \| \| \|	Merge pull request #1068 from imapp-pl/pr/performance_tests	Gav Wood	2015-02-18	3	-0/+1566
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	ManyFunctions performance test
\| \| \| * \| \| \|	ManyFunctions performance test: replace xor with correct exp operator	Paweł Bylica	2015-02-17	3	-201/+229
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	ManyFunctions performance test: ~200 functions in a contract, half of them ↵	Paweł Bylica	2015-02-16	3	-0/+1538
\| \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	are called randomly
\| \| * \| \| \|	Merge pull request #1066 from debris/include_order	Gav Wood	2015-02-18	1	-1/+1
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improved headers include_directories order, fixed #1022
\| \| \| * \| \| \|	fixed #1022	Marek Kotewicz	2015-02-16	1	-1/+1
\| \| \| \|/ / /
\| \| * \| \| \|	Merge pull request #1065 from CJentzsch/blockTests	Gav Wood	2015-02-18	7	-48/+1626
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|	Block tests
\| \| \| * \| \|	OS independency by using file system	CJentzsch	2015-02-16	2	-337/+373
\| \| \| \| \| \|
\| \| \| * \| \|	remove unnecessary function	CJentzsch	2015-02-16	1	-1/+0
\| \| \| \| \| \|
\| \| \| * \| \|	fix typo	CJentzsch	2015-02-16	2	-51/+2
\| \| \| \| \| \|
\| \| \| * \| \|	add invalid block header tests	CJentzsch	2015-02-16	3	-52/+1083
\| \| \| \| \| \|
\| \| \| * \| \|	extra data fix	CJentzsch	2015-02-16	3	-132/+120
\| \| \| \| \| \|
\| \| \| * \| \|	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-16	2	-1/+16
\| \| \| \|\\| \|
\| \| \| * \| \|	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-14	7	-28/+297
\| \| \| \|\ \ \
\| \| \| * \| \| \|	add possibility to create bad blocks in fillers	CJentzsch	2015-02-14	3	-277/+186
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-13	10	-29/+529
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/transaction.cpp
\| \| \| * \| \| \| \|	switch to secretKey in fillers	CJentzsch	2015-02-13	3	-43/+64
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	fix tx output	CJentzsch	2015-02-13	1	-2/+2
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	fix import transaction	CJentzsch	2015-02-13	1	-2/+29
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-13	2	-1/+61
\| \| \| \|\ \ \ \ \
\| \| \| * \ \ \ \ \	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-13	7	-91/+349
\| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	add valid tx output	CJentzsch	2015-02-13	3	-75/+266
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-12	1	-6/+6
\| \| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \|	style	CJentzsch	2015-02-12	1	-26/+22
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	avoid code doubling	CJentzsch	2015-02-12	1	-291/+223
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	check transactions	CJentzsch	2015-02-11	5	-85/+113
\| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-11	26	-1682/+2096
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/transaction.cpp
\| \| \| * \| \| \| \| \| \| \| \|	validate block (the not fill tests path)	CJentzsch	2015-02-11	2	-163/+179
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-10	10	-75/+311
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \|	start with test defined genesis block	CJentzsch	2015-02-10	4	-182/+274
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	write block header and uncle list	CJentzsch	2015-02-09	1	-5/+27
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-07	11	-3/+515
\| \| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \|	create block from transaction with genesis block as parent	CJentzsch	2015-02-07	5	-101/+169
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	include transaction list	CJentzsch	2015-02-06	1	-0/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-06	10	-12/+77
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	first definition of block tests - header only	CJentzsch	2015-02-05	2	-2/+203
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'upstream/develop' into blockTests	CJentzsch	2015-02-04	21	-109/+2302
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	new file block.cpp	CJentzsch	2015-01-21	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Removing events from Solidity Interface	Lefteris Karapetsas	2015-02-17	1	-26/+2
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Forced cleanup for conversion to enum.	Christian	2015-02-14	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Some changes to enums.	Christian	2015-02-14	1	-1/+1
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1011 from LefterisJP/jsonrpc_cpp_v0.4.2	Gav Wood	2015-02-14	1	-15/+15
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changes required for upgrade to jsonrpccpp 0.4.2
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Changes required for upgrade to jsonrpccpp 0.4.2	Lefteris Karapetsas	2015-02-13	1	-15/+15
\| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Removing ';' from the end of EnumDefinition	Lefteris Karapetsas	2015-02-14	3	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Explicit conversion from int to Enum	Lefteris Karapetsas	2015-02-14	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Addressing issues with Enums in Solidity	Lefteris Karapetsas	2015-02-14	2	-20/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Indentation fixes	Lefteris Karapetsas	2015-02-14	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Enum Value member access should now work properly	Lefteris Karapetsas	2015-02-14	1	-0/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also detection of duplicate enum values and tests for them have been added
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Enum type conversion and member value access.	Lefteris Karapetsas	2015-02-14	2	-1/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Added tests for the type conversion part. - Enum member value access still needs some work
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Correcting and testing enum member access	Lefteris Karapetsas	2015-02-14	1	-1/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Enums NameAndTypeResolution - WIP	Lefteris Karapetsas	2015-02-14	2	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Also adding an EndToEnd enum test
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Disallow trailing comma in Enum Declaration	Lefteris Karapetsas	2015-02-14	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Introducing EnumType and some Parser tests	Lefteris Karapetsas	2015-02-14	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Adding test for Enum Parsing	Lefteris Karapetsas	2015-02-14	1	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1040 from CJentzsch/performanceTests	Gav Wood	2015-02-14	1	-2/+2
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	style - auto
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	style - auto	CJentzsch	2015-02-13	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Performance tests: more ackermann calls, fibonacci.	Paweł Bylica	2015-02-13	2	-11/+137
\| \| \| \|/ / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- ackermann(3, 1) - ackermann(3, 2) - fibonacci(10) - fibonacci(16) Contract code included: PerformanceTester.sol
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #1039 from CJentzsch/performanceTests	Gav Wood	2015-02-13	2	-0/+64
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Performance test
\| \| \| * \| \| \| \| \| \| \| \| \| \|	use auto for steady clock and chrono::milliseconds	CJentzsch	2015-02-13	1	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	style fix	CJentzsch	2015-02-13	1	-32/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	performance test	CJentzsch	2015-02-13	2	-0/+66
\| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #1037 from chriseth/sol_bytesCalldataToMemory	Gav Wood	2015-02-13	1	-0/+15
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Copying calldata directly to memory.
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Copying calldata directly to memory.	Christian	2015-02-13	1	-0/+15
\| \| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge pull request #1035 from winsvega/develop	Gav Wood	2015-02-13	6	-28/+449
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New Tests
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge pull request #1038 from debris/before_jsoncpp	Gav Wood	2015-02-13	1	-2/+3
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|	fixed issue with including wrong json/json.h file
\| \| \| * \| \| \| \| \| \| \| \| \| \|	fixed issue with including wrong json/json.h file	Marek Kotewicz	2015-02-13	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Copying structs.	Christian	2015-02-13	2	-1/+61
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Test Correction	winsvega	2015-02-17	2	-19/+92
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	WrongAddress removed new suicides
\| * \| \| \| \| \| \| \| \| \| \| \|	Suicide Tests	winsvega	2015-02-13	1	-3/+141
\| \| \|_\|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	New Tests	winsvega	2015-02-13	3	-8/+157
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Transaction with RLP object and catching exceptions from importByteArray
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop	winsvega	2015-02-13	7	-94/+352
\| \|\\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-13	1	-0/+39
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \	Merge pull request #1029 from chriseth/sol_bytesContinuation	Gav Wood	2015-02-13	1	-0/+39
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \|	length member for bytes
\| \| \| \| * \| \| \| \| \| \| \| \|	length member for byte arrays.	Christian	2015-02-12	1	-0/+15
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \|	Test for bytes in mapping.	Christian	2015-02-12	1	-0/+24
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-13	4	-7/+138
\| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: eth/main.cpp libwebthree/WebThree.cpp libwebthree/WebThree.h neth/main.cpp
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge pull request #1019 from chriseth/sol_bytes	Gav Wood	2015-02-12	2	-2/+133
\| \| \| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Basic implementation of byte arrays.
\| \| \| \| * \| \| \| \| \| \| \| \|	Moved copy code to CompilerUtils.	Christian	2015-02-12	2	-11/+60
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \|	Dynamic copy to memory.	Christian	2015-02-12	1	-44/+42
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \|	Simple copy of bytes to storage.	Christian	2015-02-12	1	-3/+62
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \|	Tests and some code for msg.data.	Christian	2015-02-12	1	-0/+25
\| \| \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Merge pull request #999 from debris/jsoncpp_path	Gav Wood	2015-02-12	2	-2/+2
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixed jsoncpp find_path
\| \| \| \| * \ \ \ \ \ \ \ \	Merge branch 'jsoncpp_path' of https://github.com/debris/cpp-ethereum into ↵	Marek Kotewicz	2015-02-12	0	-0/+0
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	jsoncpp_path
\| \| \| \| \| * \ \ \ \ \ \ \ \	Merge branch 'develop' into jsoncpp_path	debris	2015-02-11	31	-1772/+2158
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \| \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into jsoncpp_path	Marek Kotewicz	2015-02-12	1	-6/+6
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \|_\|/ / / / / / / \| \| \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into jsoncpp_path	Marek Kotewicz	2015-02-11	31	-1772/+2158
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|_\|/ / / / / / / / \| \| \| \| \|/\| \| / / / / / / / \| \| \| \| \| \| \|/ / / / / / / \| \| \| \| \| \|/\| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \| \|	fixed jsoncpp find_path	Marek Kotewicz	2015-02-10	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Another try in fixing windows build.	Christian	2015-02-12	1	-3/+3
\| \| \| \| \|_\|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-12	1	-6/+6
\| \| \|\\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Some windows fixes.	Christian	2015-02-12	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-12	0	-0/+0
\| \| \|\\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Merge pull request #979 from debris/win_fixes	Marek Kotewicz	2015-02-12	0	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \|	windows fixes
\| \| \| \| * \| \| \| \| \| \| \|	fixed transitive dependencies for msvc	debris	2015-02-11	1	-6/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| * \| \| \| \| \| \| \|	cmake mess	debris	2015-02-09	1	-0/+6
\| \| \| \| \| \|_\|_\|_\|/ / / \| \| \| \| \|/\| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-11	31	-1772/+2158
\| \| \|\\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-10	3	-6/+41
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|/ / / / / / \| \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-10	3	-0/+140
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'develop' into p2p	subtly	2015-02-09	1	-2/+63
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \|	update for cr. update whisper test.	subtly	2015-02-09	1	-8/+11
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-07	1	-0/+18
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|/ / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	update packet test	subtly	2015-02-07	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	update remaining whisper tests	subtly	2015-02-07	1	-24/+24
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	update whisper topic and forwarding tests for node-discovery	subtly	2015-02-07	1	-40/+47
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-07	10	-3/+497
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \|	updates for code-review	subtly	2015-02-07	2	-15/+15
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	fix whispertopic test	subtly	2015-02-05	1	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-05	8	-12/+49
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libp2p/Host.cpp
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-05	5	-19/+190
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	update whisper test for node-network	subtly	2015-02-03	1	-6/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-02-02	19	-105/+2104
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: test/whisperTopic.cpp
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	import/export peers and nodes	subtly	2015-01-31	2	-1/+47
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	add test-require to p2p/host	subtly	2015-01-26	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-01-26	1	-0/+31
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fix ping-timeouts	subtly	2015-01-26	2	-10/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	updates and fixes for code review	subtly	2015-01-26	2	-24/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	update whisper test. move ports out of private ranges and specify ip address.	subtly	2015-01-23	1	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-01-23	9	-23/+476
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	coding standards	subtly	2015-01-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	cleanup	subtly	2015-01-17	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-01-17	4	-53/+58
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' into p2p	subtly	2015-01-15	13	-110/+817
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libp2p/Host.cpp libwebthree/WebThree.h
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Connectivity and nodetable callbacks. Disable stale code.	subtly	2015-01-12	1	-0/+23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' into p2p	subtly	2015-01-11	21	-283/+3696
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merging in new data structure for nodes from node-table. End result will be ↵	subtly	2015-01-11	2	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	consolidation into NodeId, Node (id and endpoints), NodeEntry (as in table), and Peer (connected node as in host). Rename PeerInfo to PeerSessionInfo. Rename NodeInfo to PeerInfo. PeerSessionInfo which is information about the Peer connection and will be split/merged into Node and PeerInfo. Add node-table callbacks for Host to perform connect node if there are not enough nodes.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Consolidate use of pingAll into keepAlivePeers. Add bool operators for Node ↵	subtly	2015-01-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	and NodeIPEndpoint population. NodeTable returns Node instead of NodeEntry (subject to change). Begin transition from NodeInfo to NodeTable Node.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pass 2 integrating node table. Pruning and merging old node lifecycle logic ↵	subtly	2015-01-07	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	with new. Begin moving node identification and authentication into Host so session can be directly-constructed with NodeInfo and is not created until after authentication. Require session to be passed a valid node.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'p2p-udp-nodetable' into p2p	subtly	2015-01-07	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'p2p-udp-nodetable' into p2p	subtly	2015-01-06	2	-7/+14
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libp2p/NodeTable.h
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'p2p-udp-nodetable' into p2p	subtly	2015-01-06	3	-149/+2312
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: libp2p/NodeTable.cpp
\| \| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'develop' into p2p	subtly	2015-01-05	7	-12/+440
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New Tests	winsvega	2015-02-13	3	-20/+292
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Solidity test Transaction test update
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop	winsvega	2015-02-11	5	-3/+85
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Test stuff into cpp from header.	Gav Wood	2015-02-11	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Additional debug stuff in cmake.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #916 from winsvega/develop	Gav Wood	2015-02-11	24	-1705/+2009
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	transaction address length test fix
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	small fixes per chris's comments	Lu Guanqun	2015-02-10	2	-5/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add two more exp tests	Lu Guanqun	2015-02-10	1	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	add exponent operator	Lu Guanqun	2015-02-10	2	-0/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://www.pivotaltracker.com/n/projects/1189488/stories/83746404
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Arbitrary parameters for call() and all hash functions.	Christian	2015-02-10	1	-0/+23
\| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop	winsvega	2015-02-10	23	-136/+1249
\| \|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|/ / / / / / / / / / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge pull request #986 from LefterisJP/sol_StyleFix	chriseth	2015-02-10	5	-67/+67
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Solidity enum style fix
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Addressing issues in Enum style fix	Lefteris Karapetsas	2015-02-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Styling in Natspec Enums	Lefteris Karapetsas	2015-02-09	3	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Camelcasing enums in Types.h	Lefteris Karapetsas	2015-02-09	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|