| 
							
							
								 Paweł Bylica | 7557e4b73f | Merge branch 'develop' into evmjit-develop Conflicts:
	evmjit/include/evmjit/JIT.h
	evmjit/libevmjit-cpp/Env.cpp
	evmjit/libevmjit-cpp/JitVM.h
	evmjit/libevmjit/ExecutionEngine.cpp
	evmjit/libevmjit/JIT.cpp | 2015-05-26 13:31:39 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 4ee8b7a757 | Add secret store test. Remove unneccessary components of scrypt. | 2015-05-25 09:28:06 +01:00 |  | 
			
				
					| 
							
							
								 yann300 | ba2b77bb9a | Merge remote-tracking branch 'up/develop' into bugFix | 2015-05-21 10:19:31 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | a97a326ffe | Merge pull request #1980 from CJentzsch/shaingTestOutput handle output larger than 4069 bytes in test | 2015-05-20 22:07:31 +02:00 |  | 
			
				
					| 
							
							
								 chriseth | e5a4a8fca4 | Merge pull request #1988 from LianaHus/sol_Check_ref_problems_for_structs Check: Reference problems concerning structs | 2015-05-20 18:41:34 +02:00 |  | 
			
				
					| 
							
							
								 Liana Husikyan | e38eefa9f6 | Update SolidityEndToEndTest.cpp | 2015-05-20 18:40:00 +02:00 |  | 
			
				
					| 
							
							
								 Liana Husikyan | 19262c12cf | Update SolidityEndToEndTest.cpp | 2015-05-20 18:38:52 +02:00 |  | 
			
				
					| 
							
							
								 Liana Husikyan | a92591e519 | style fix | 2015-05-20 18:35:05 +02:00 |  | 
			
				
					| 
							
							
								 chriseth | 42a36548e2 | Merge pull request #1983 from chriseth/sol_knowledgeableGasEstimation Gas estimation taking known state into account. | 2015-05-20 18:31:47 +02:00 |  | 
			
				
					| 
							
							
								 Liana Husikyan | 007c88216b | Update SolidityEndToEndTest.cpp | 2015-05-20 18:05:51 +02:00 |  | 
			
				
					| 
							
							
								 Liana Husikyan | d006006c57 | added tests to check references to struct type. | 2015-05-20 17:57:41 +02:00 |  | 
			
				
					| 
							
							
								 CJentzsch | 8971baec8f | remove eth_solidity dependency for statetests | 2015-05-20 13:20:34 +02:00 |  | 
			
				
					| 
							
							
								 yann300 | 91dbf63978 | Merge remote-tracking branch 'up/develop' into bugFix Conflicts:
	mix/CodeModel.cpp | 2015-05-20 12:17:04 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | b0d5cbf698 | Pregenerate DAG when mining on AZ/eth/ethminer. Use regeneratable key for decrets by default. | 2015-05-20 09:31:38 +02:00 |  | 
			
				
					| 
							
							
								 chriseth | 79f11974ea | Gas estimation taking known state into account. | 2015-05-20 00:28:15 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 2a23521564 | Move OverlayDB (leveldb dependent) back into libdevcrypto. | 2015-05-19 20:04:48 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 8c5f139983 | Merge branch 'bc' of https://github.com/arkpar/cpp-ethereum into arkpar-bc | 2015-05-19 19:52:38 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | a5005aefff | Move non-cryptopp dependent stuff into devcore. | 2015-05-19 19:51:38 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | bae5779ab2 | SHA3, RIPEMD160 and SHA256 are now not cryptopp impls. | 2015-05-19 19:38:17 +02:00 |  | 
			
				
					| 
							
							
								 CJentzsch | aefd0e9ca5 | handle output larger than 4069 bytes in test | 2015-05-19 16:46:00 +02:00 |  | 
			
				
					| 
							
							
								 Paweł Bylica | 711933ab79 | Merge remote-tracking branch 'upstream/develop' into evmjit-develop | 2015-05-19 14:11:06 +02:00 |  | 
			
				
					| 
							
							
								 arkpar | a052b53051 | orderedTrieRoot testing | 2015-05-19 11:39:46 +02:00 |  | 
			
				
					| 
							
							
								 arkpar | 148fd2638b | use TrieHash for transactions and receipts roots | 2015-05-19 11:39:45 +02:00 |  | 
			
				
					| 
							
							
								 yann300 | 51d94ae1b9 | merge with develop | 2015-05-19 10:31:32 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 8512e30f0a | Merge pull request #1966 from CJentzsch/addTests Add tests | 2015-05-18 20:27:41 +02:00 |  | 
			
				
					| 
							
							
								 yann300 | 38691f743c | add list of second errorannotation instead of single item. | 2015-05-18 19:28:31 +02:00 |  | 
			
				
					| 
							
							
								 CJentzsch | bc62f3be4b | add create retrun value tests | 2015-05-18 16:29:26 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 06654ab8fb | Merge pull request #1899 from debris/web.js4.2 web.js 4.2 | 2015-05-18 13:32:28 +02:00 |  | 
			
				
					| 
							
							
								 winsvega | e12588ada4 | Blocktests: SimpleTx3 | 2015-05-18 13:32:43 +03:00 |  | 
			
				
					| 
							
							
								 winsvega | 1e71518871 | New Tests validBlockTestFix
Solidity Contract Inheritance
singletest for blockchain | 2015-05-18 13:32:43 +03:00 |  | 
			
				
					| 
							
							
								 chriseth | accf43ae4b | Merge pull request #1931 from chriseth/sol_callcode Bare callcode for addresses and contracts. | 2015-05-18 12:29:00 +02:00 |  | 
			
				
					| 
							
							
								 Martin Holst Swende | 8dd1cd593b | Fixed error introduced in 953be7886b5681f0fa8ecde94b1fdb8c25afbfd4 | 2015-05-18 07:35:02 +00:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 5cc910e9fd | Merge pull request #1908 from arkpar/trie_perf Trie performance optimizations | 2015-05-17 21:25:20 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 384226ba25 | Parallelised BlockQueue. Setup for using TrieRoot. | 2015-05-17 19:21:33 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | f7aa46ca6f | Merge pull request #1890 from LefterisJP/ethash_aux_use_seedhash Use seedhash everywhere in EthashAux | 2015-05-15 19:10:36 +02:00 |  | 
			
				
					| 
							
							
								 chriseth | 563f9098b2 | Bare callcode for addresses and contracts. | 2015-05-15 18:02:09 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | d9be6b64c1 | Merge pull request #1912 from CJentzsch/fixGasPricerTests update gas Pricer tests | 2015-05-15 17:37:34 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | 550144362b | Merge pull request #1911 from CJentzsch/ficInChainUncleTests fix in chain uncle tests | 2015-05-15 17:36:22 +02:00 |  | 
			
				
					| 
							
							
								 chriseth | 5f8a5f672d | Store copied assembly items in test. Fixes OSX issues. | 2015-05-15 13:25:44 +02:00 |  | 
			
				
					| 
							
							
								 chriseth | 7d5bebd464 | Disable test. | 2015-05-15 11:46:32 +02:00 |  | 
			
				
					| 
							
							
								 chriseth | 779ce0131a | Merge pull request #1889 from chriseth/sol_multipleTagsOnStack Known state: store tags on stack as unions. | 2015-05-15 11:12:13 +02:00 |  | 
			
				
					| 
							
							
								 CJentzsch | 5241e941aa | update gas Pricer tests | 2015-05-14 22:56:19 +02:00 |  | 
			
				
					| 
							
							
								 CJentzsch | bb9c2e3cb9 | fix in chain uncle tests | 2015-05-14 21:59:36 +02:00 |  | 
			
				
					| 
							
							
								 Lefteris Karapetsas | f1f1ab847f | Stricter interface for EthashAux::light() | 2015-05-14 21:53:59 +02:00 |  | 
			
				
					| 
							
							
								 Gav Wood | b53e7cc76e | Merge pull request #1891 from imapp-pl/pr/tests More arithmetic VM tests | 2015-05-14 20:05:26 +02:00 |  | 
			
				
					| 
							
							
								 arkpar | e61d7e07f7 | style | 2015-05-14 19:50:30 +02:00 |  | 
			
				
					| 
							
							
								 arkpar | ee318eecd9 | Trie optimizations | 2015-05-14 19:48:01 +02:00 |  | 
			
				
					| 
							
							
								 Paweł Bylica | 6a8bb26cf8 | Tests: SMOD edge case test. | 2015-05-14 16:41:02 +02:00 |  | 
			
				
					| 
							
							
								 Paweł Bylica | 047e72c679 | Tests: SMOD edge case test. | 2015-05-14 16:39:40 +02:00 |  | 
			
				
					| 
							
							
								 CJentzsch | 130b397550 | correct expext value for in chain uncle tests | 2015-05-14 16:20:42 +02:00 |  |