Commit Graph

16406 Commits

Author SHA1 Message Date
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
chriseth
44146e6674 Merge pull request #1979 from LianaHus/sol_constructorForSolAbi
Added constructor as part of Solidity ABI
2015-05-20 21:11:29 +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
ea85e382c9 Update InterfaceHandler.cpp 2015-05-20 18:37:09 +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
d015945a1d Gas estimation taking known state into account. 2015-05-20 00:28:15 +02:00
chriseth
2be64c7026 Gas estimation taking known state into account. 2015-05-20 00:28:15 +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
3ecd54a835 Move non-cryptopp dependent stuff into devcore. 2015-05-19 19:51:38 +02:00
Gav Wood
70d9eb3f1d Move non-cryptopp dependent stuff into devcore. 2015-05-19 19:51: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
Liana Husikyan
ec136e7bb0 added ';' 2015-05-19 15:37:46 +02:00
Liana Husikyan
e7931ade61 added constructor to solidiy abi 2015-05-19 15:28:44 +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
9c85254751 Merge pull request #1931 from chriseth/sol_callcode
Bare callcode for addresses and contracts.
2015-05-18 12:29:00 +02: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
chriseth
840d06fe14 Fixed error message about explicit type conversion. 2015-05-18 11:34:16 +02:00
Martin Holst Swende
8dd1cd593b Fixed error introduced in 953be7886b5681f0fa8ecde94b1fdb8c25afbfd4 2015-05-18 07:35:02 +00:00
Paweł Bylica
c7facd6d37 Little improved base64 implementation.
Global variable type changed from dynamic constructed std::string to constant char array.
Truncating conversion eliminated (no MSVC warning).
Unit tests added.
2015-05-17 23:03:39 +02: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
dba5ffc280 Bare callcode for addresses and contracts. 2015-05-15 18:02:09 +02:00