Commit Graph

2846 Commits

Author SHA1 Message Date
ethdev zug
8586aae5e6 Merge branch 'develop' of https://github.com/lotrf3/cpp-ethereum into develop 2015-05-26 22:27:28 +01:00
lotrf3
373a296314 Fix dumbest syntax error ever 2015-05-26 14:24:58 -05:00
lotrf3
6790177df1 Ensure dependencies are conditional on Windows 2015-05-26 14:09:15 -05:00
chriseth
cfaa99727a Merge pull request #2006 from chriseth/sol_functionalGasEstimator
Functional gas estimator
2015-05-26 15:48:10 +02:00
CJentzsch
0f510a40c6 fix blockhashOutOfRange test 2015-05-26 14:44:26 +02:00
Paweł Bylica
1887f1c91a Merge branch 'develop' into no_warnings 2015-05-26 14:16:43 +02:00
Paweł Bylica
bef2f9ea2c Merge branch 'develop' into feature/vm_gas_counter_refactor
Conflicts:
	evmjit/libevmjit-cpp/JitVM.h
2015-05-26 13:56:29 +02:00
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
CJentzsch
45f1a44e0a update wallet contract to latest changes 2015-05-26 13:21:33 +02:00
CJentzsch
d9b853adc4 Merge remote-tracking branch 'upstream/develop' into walletTests 2015-05-26 12:52:55 +02:00
CJentzsch
c3befb4028 update wallet tests 2015-05-26 12:51:33 +02:00
chriseth
fbc331bd35 Removed redundant std. 2015-05-26 11:31:04 +02:00
CJentzsch
6d87100377 style 2015-05-26 10:53:49 +02:00
lotrf3
64db54a67a Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop 2015-05-26 02:23:22 -05:00
lotrf3
c9640e58ce Added upnp support to Windows 2015-05-26 02:18:19 -05:00
CJentzsch
ba9806b945 more tests 2015-05-26 03:14:39 +02:00
CJentzsch
7781f4dd7b fix output memory for CALL 2015-05-26 03:07:26 +02:00
Gav Wood
4ee8b7a757 Add secret store test.
Remove unneccessary components of scrypt.
2015-05-25 09:28:06 +01:00
CJentzsch
2e907bcf92 test clearing pending transactions 2015-05-22 18:32:44 +02:00
CJentzsch
4c7d0bd5e8 update and expand wallet tests 2015-05-22 18:32:43 +02:00
CJentzsch
3bbd4ba4e2 update wallet tests 2015-05-22 18:32:43 +02:00
chriseth
964bcd6b85 Functional gas estimator. 2015-05-22 16:12:40 +02:00
chriseth
ec76302b85 Path gas meter. 2015-05-22 16:12:40 +02:00
Paweł Bylica
3605d3e965 Fix code duplication in Executive::call overloadings. 2015-05-21 11:01:19 +02:00
yann300
ba2b77bb9a Merge remote-tracking branch 'up/develop' into bugFix 2015-05-21 10:19:31 +02:00
Paweł Bylica
3e786f792e Merge branch 'develop' into feature/vm_gas_counter_refactor
Conflicts:
	test/libevm/vm.cpp
2015-05-21 09:45:01 +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
Paweł Bylica
d67cacfcba Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_refactor 2015-05-20 20:14:38 +02:00
Paweł Bylica
a3c4b5cd03 One more unit test for base64 encoding. 2015-05-20 19:10:55 +02:00
Paweł Bylica
c6816b942a Merge remote-tracking branch 'upstream/develop' into no_warnings
Conflicts:
	test/libdevcrypto/hexPrefix.cpp
2015-05-20 18:54:33 +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
Paweł Bylica
3108f4efe9 testeth: let expected be expected. 2015-05-20 18:16:18 +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
Paweł Bylica
b85345cc91 Merge remote-tracking branch 'upstream/develop' into feature/vm_gas_counter_refactor
Conflicts:
	libethereum/ExtVM.cpp
	libevm/SmartVM.h
	libevm/VM.cpp
	libevm/VM.h
	libevm/VMFace.h
2015-05-20 17:34:09 +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