Commit Graph

17053 Commits

Author SHA1 Message Date
chriseth
be3f9e2681 Style fixes. 2015-04-22 11:33:26 +02:00
Christian
83cc8dfe00 JSON compiler. 2015-04-22 11:33:25 +02:00
Christian
21a4c342d8 JSON compiler. 2015-04-22 11:33:25 +02:00
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
subtly
685d08c41b more test updates (v4 endpoints. #1557, #1558) 2015-04-21 18:13:45 -04:00
chriseth
a44bcb6909 Fix for declarations. 2015-04-21 19:04:08 +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
1f44d93e05 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
5f6a396765 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
8125f93b12 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
e3bd21f4dd Fixed byte alignment for return type of ripemd160 built-in contract. 2015-04-21 13:03:26 +02:00
subtly
e8b0470eb6 update peer host test. support unspecified ip. 2015-04-21 06:13:31 -04: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
subtly
78a0355343 update net tests (v4 endpoint) 2015-04-21 05:38:39 -04:00
subtly
ca1ac5df60 update tests (v4 endpoint) 2015-04-21 05:31:33 -04: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
8cd5eed17d Styling. 2015-04-20 15:29:04 +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
chriseth
7a467bbf07 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
2eb7c95d88 Merge pull request #1665 from chriseth/sol_jsoncppDocker
Add jsoncpp dependency for solidity-js.
2015-04-19 15:49:22 +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
41c2990ed7 Add jsoncpp dependency for solidity-js. 2015-04-17 18:33:55 +02:00
Liana Husikyan
e4808305a1 removed unused parameter from streamAsmJson 2015-04-17 17:45:25 +02:00
Liana Husikyan
d99247cb5d reordered output
Conflicts:
	libevmcore/Assembly.cpp
2015-04-17 17:41:50 +02:00
Liana Husikyan
8e04b27252 fixed extension of file json format
changed value for PUSH to hex
2015-04-17 17:41:50 +02:00
Liana Husikyan
1cfa964990 style fixes 2015-04-17 17:41:50 +02:00
Liana Husikyan
104c5bca07 initial output for asm-json flag.
Conflicts:
	libevmcore/Assembly.cpp
2015-04-17 17:41:50 +02:00