Commit Graph

2009 Commits

Author SHA1 Message Date
CJentzsch
dd417c73e8 Merge remote-tracking branch 'upstream/develop' into gasPricerTests 2015-04-22 09:32:57 +02:00
Marek Kotewicz
be689e8a08 Merge pull request #1593 from debris/cmake3.2.1
fixed #1590, msvc build with cmake 3.2.1
2015-04-22 07:59:04 +02:00
CJentzsch
4012546925 add gasPrice tests 2015-04-21 18:00:12 +02:00
Gav Wood
817f3d53e9 Merge pull request #1685 from chriseth/sol_fix_ripemd_alignment
Fixed byte alignment for return type of ripemd160 built-in contract.
2015-04-21 17:33:02 +02:00
Gav Wood
60d364540e Merge pull request #1699 from chriseth/sol_fix_contractTypesAsArguments
Fix for Contract and Enum types as external function arguments.
2015-04-21 17:32:01 +02:00
Gav Wood
6122aedb90 Merge pull request #1695 from imapp-pl/pr/testeth
testeth: Handle command line options for user defined tests
2015-04-21 17:29:15 +02:00
CJentzsch
00b058ad25 avoid stack overflow and div by zero 2015-04-21 17:09:32 +02:00
chriseth
e65b9825d6 Merge pull request #1634 from chriseth/sol_overloadingFunctions
Function overloading.
2015-04-21 15:58:06 +02:00
chriseth
3190c9ec09 Fix for Contract and Enum types as external function arguments. 2015-04-21 15:50:37 +02:00
chriseth
c834ee5ce1 Fixed byte alignment for return type of ripemd160 built-in contract. 2015-04-21 13:03:26 +02:00
chriseth
ddbaa99056 Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions 2015-04-21 12:04:12 +02:00
chriseth
02121683f5 Removed (and added) some #ifs (but removed more than I added). 2015-04-21 11:46:11 +02:00
Paweł Bylica
332fcaebb9 testeth: Handle command line options for user defined tests 2015-04-21 10:37:47 +02:00
Marek Kotewicz
6bf24491b8 Merge branch 'develop' into cmake3.2.1
Conflicts:
	test/CMakeLists.txt
2015-04-21 08:16:12 +02:00
Gav Wood
e375612a7e Version bump and client rename. 2015-04-21 01:14:45 +02:00
Gav Wood
dc9a49cc39 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2015-04-21 01:10:48 +02:00
Gav Wood
fdc524377f More colourful logging. 2015-04-20 23:32:42 +02:00
CJentzsch
d3611017b8 properly mv webthreestubclient.h 2015-04-20 23:21:50 +02:00
CJentzsch
8f8eb35974 fixes 2015-04-20 23:17:19 +02:00
CJentzsch
6a3bb95473 Merge remote-tracking branch 'upstream/develop' into RestructureTestFolders
Conflicts:
	test/libethereum/BlockTestsFiller/bcJS_API_TestFiller.json
	test/libethereum/blockchain.cpp
2015-04-20 22:53:04 +02:00
CJentzsch
b2adcf3bf3 Restructure test folders 2015-04-20 22:48:53 +02:00
chriseth
8caf1f723f Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions
Conflicts:
	libsolidity/AST.cpp
	libsolidity/AST.h
2015-04-20 14:55:58 +02:00
CJentzsch
0919cacb3c fix hex encoding blockheader and use tmp directories for stateDB 2015-04-20 11:37:21 +02:00
CJentzsch
4d103ccef1 xMerge remote-tracking branch 'upstream/develop' into JSON_testContract 2015-04-20 09:33:02 +02:00
Gav Wood
71012a83e8 Remote miner fixes. 2015-04-19 22:59:57 +02:00
Gav Wood
b6ff445114 Minor fix for integration tests. 2015-04-19 17:31:56 +02:00
Gav Wood
8ef8f2e805 Merge pull request #1666 from CJentzsch/allhexfix
0x -> 0x0 for numbers
2015-04-19 15:48:05 +02:00
CJentzsch
d399f077ef simplification 2015-04-17 22:44:26 +02:00
CJentzsch
22d16c048b 0x -> 0x0 for numbers 2015-04-17 18:41:27 +02:00
chriseth
4a44493a13 Merge pull request #1501 from LefterisJP/abstract_contract_contructors
Abstract contract contructors
2015-04-17 17:31:47 +02:00
CJentzsch
4a6a667a58 update test after solidity fix 2015-04-17 16:39:51 +02:00
chriseth
6b08b99b5e Merge remote-tracking branch 'ethereum/develop' into sol_overloadingFunctions 2015-04-17 16:24:23 +02:00
CJentzsch
e847b4cba0 Merge remote-tracking branch 'upstream/develop' into JSON_testContract 2015-04-17 15:28:06 +02:00
Lefteris Karapetsas
a063e1c5a1 Check all constructors in inheritance chain get args
- Also add a missing override in a function of EnumValue
2015-04-17 15:27:31 +02:00
Lefteris Karapetsas
f2f0aec91c Allowing abstract contracts constructor to have no args
- If a constructor is part of an abstract contract we can omit its
  arguments

- IF a contract is abstract make sure to not create and/or request
  Assembly code about it since it's not compiled
2015-04-17 15:27:31 +02:00
chriseth
7571971ca0 Merge pull request #1654 from chriseth/sol_fix_smallNegativeStorageValues
Fix for small negative storage values.
2015-04-17 15:26:16 +02:00
CJentzsch
6a146f727b use this_thread::sleep_for instead of sleep 2015-04-17 15:08:42 +02:00
CJentzsch
182b2a6219 retrigger build 2015-04-17 14:51:01 +02:00
subtly
fbf48b6501 network save/restore: merge fixes, simpler code, limit parse of require flag to peers (reflecting save code). 2015-04-17 07:54:22 -04:00
chriseth
d0470999b2 Tests for signed integers in storage. 2015-04-17 13:25:28 +02:00
subtly
7219642569 Merge branch 'develop' into discoveryEndpoints 2015-04-17 06:50:33 -04:00
subtly
6803c4f2db style 2015-04-17 06:41:45 -04:00
CJentzsch
66d8f1067a style 2015-04-17 12:19:20 +02:00
CJentzsch
35dafa7479 add sleep 1 second to avoid invalid blocks due to same timestamp during creation
Conflicts:
	test/blockchain.cpp
2015-04-17 12:19:12 +02:00
CJentzsch
f6cfe40010 update JSON_test.sol 2015-04-17 12:18:00 +02:00
CJentzsch
b18a4b5eae remove old contract 2015-04-17 12:18:00 +02:00
CJentzsch
2f2800d743 add JSON test
Conflicts:
	test/bcJS_API_TestFiller.json
2015-04-17 12:17:51 +02:00
Gav Wood
3c353e2d0e Merge pull request #1569 from winsvega/allfieldshex
All Test Fields As Hex
2015-04-17 11:45:26 +02:00
subtly
c38641374a Fix for fix #1475, #1476. 2015-04-16 22:55:12 -04:00
subtly
106a7d10cc Merge branch 'develop' into discoveryEndpoints 2015-04-16 20:54:28 -04:00