Commit Graph

770 Commits

Author SHA1 Message Date
Paweł Bylica
35d8b94e73 Merge branch 'develop' into develop-evmcc
Conflicts:
	CMakeLists.txt
	alethzero/CMakeLists.txt
	eth/CMakeLists.txt
	exp/CMakeLists.txt
	libethereum/CMakeLists.txt
	neth/CMakeLists.txt
	test/CMakeLists.txt
	test/TestHelper.cpp
	windows/Eth.vcxproj
	windows/Ethereum.sln
	windows/LibEthereum.vcxproj
	windows/LibEthereum.vcxproj.filters
	windows/TestEthereum.vcxproj
	windows/TestEthereum.vcxproj.filters
	windows/bootstrap.sh
2014-12-18 19:08:04 +01:00
CJentzsch
f4cdc4a9fa style 2014-12-18 09:50:45 +01:00
CJentzsch
1f15cdf95c more refund tests 2014-12-18 09:48:14 +01:00
CJentzsch
fc3fafbaee refund test inclusion 2014-12-18 09:48:14 +01:00
CJentzsch
1ccfda18ec refund tests 2014-12-18 09:48:14 +01:00
Paweł Bylica
f591197692 Windows fix 2014-12-17 17:56:54 +01:00
ethdev
fd275b6d37 fixed msvc not expanding macros correctly 2014-12-17 16:47:22 +01:00
chriseth
8e87e85937 Merge pull request #623 from chriseth/sol_constructorChecks
Checks for the constructor and ability to call functions
2014-12-17 15:18:49 +01:00
Gav Wood
9ef4fbe2d0 Merge pull request #639 from debris/msvc_fix
windows fix for initializer-list cannot convert to dev::bytes
2014-12-17 13:50:16 +01:00
Gav Wood
79341771f7 Merge pull request #636 from chriseth/sol_fix_foreignFunctions
Fix: Resolve function types of all contracts before checking types inside functions.
2014-12-17 13:49:31 +01:00
ethdev
30eb6334a2 initializer-list fix 2014-12-17 12:19:10 +01:00
ethdev
9def93fab4 windows fix for initializer-list cannot convert to dev::bytes 2014-12-17 11:57:32 +01:00
Marek Kotewicz
36532d9ab4 clang requires explicit initialization of map 2014-12-17 11:48:43 +01:00
Gav Wood
c83db9e6db Merge pull request #599 from wanderer/develop
changed output stacktrace format to json
2014-12-17 11:21:30 +01:00
Lefteris Karapetsas
0050a1a8f9 Solidity: More tests for the ForStatement 2014-12-17 00:03:30 +01:00
Lefteris Karapetsas
9f5f39300d Solidity ForStatement Compiler part
- Work in progress
2014-12-17 00:03:30 +01:00
Lefteris Karapetsas
28fc881547 Minor issues, grammar update, new ForStatement test 2014-12-17 00:03:30 +01:00
Lefteris Karapetsas
b76a5ecc23 Solidity ForStatements expressions are now optional 2014-12-17 00:03:30 +01:00
Lefteris Karapetsas
72e4d08918 new ForStatement parsing test and small grammar fix 2014-12-17 00:03:30 +01:00
Lefteris Karapetsas
321f88b1be Adding a ForStatement solidity AST Node.
- Adding ForStatement node
- Implemented Parsing for ForStatement
- A simple parsing test for the ForStatement
- Work in progress
2014-12-17 00:03:30 +01:00
Christian
ff143b06c4 Add functions needed by constructor. 2014-12-16 23:49:45 +01:00
Christian
5e148ae4b6 Fix: Resolve function types of all contracts before checking types inside functions. 2014-12-16 23:49:02 +01:00
wanderer
9e7fcbb7bd append JSON objects to log 2014-12-16 14:28:28 -05:00
wanderer
35aa48567f using json_spirit 2014-12-16 14:28:28 -05:00
wanderer
ab5953b555 changed output stacktrace format to json 2014-12-16 14:28:28 -05:00
chriseth
350953e598 Merge pull request #621 from chriseth/sol_createContracts
Contract creation ("new" operator).
2014-12-16 19:47:36 +01:00
Marek Kotewicz
4b907092e6 Merge branch 'develop' into windows_debug 2014-12-16 15:20:01 +01:00
Christoph Jentzsch
9c18e7bc24 Merge pull request #3 from winsvega/NewStateTests
Transaction Test Filler
2014-12-15 22:06:05 +01:00
winsvega
93593540ab Transaction Test Filler 2014-12-15 23:50:43 +03:00
CJentzsch
51a8c528b4 Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-12-15 20:30:03 +01:00
ethdev
8266da7f60 boost library -> libraries 2014-12-15 19:01:20 +01:00
Christian
a1f61684b0 Check that constructor does not have "returns" directive. 2014-12-15 16:09:50 +01:00
Paweł Bylica
59fe1fdf92 Merge commit '1b8f9fdc3b44503890ed1bcb5da8bd5cb8dd83a5' into develop-evmcc
Conflicts:
	test/TestHelper.cpp
2014-12-15 15:11:35 +01:00
Christian
17c433e7c9 Packing and unpacking of constructor arguments. 2014-12-15 13:05:18 +01:00
Christian
ab5347100b Create contracts. 2014-12-15 13:05:18 +01:00
Lu Guanqun
a576b38125 update to the correct file name 2014-12-14 21:57:38 +08:00
CJentzsch
aff990f5ab Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-12-13 22:56:38 +01:00
CJentzsch
1ee9fbbc19 Merge branch 'NewStateTests' of https://github.com/CJentzsch/cpp-ethereum into NewStateTests 2014-12-13 22:56:14 +01:00
Gav Wood
bb5e9040b2 Silly windows fix. 2014-12-13 21:48:23 +01:00
CJentzsch
87a76faadd Merge remote-tracking branch 'upstream/develop' into NewStateTests 2014-12-13 21:45:12 +01:00
CJentzsch
e00df9b681 Merge remote-tracking branch 'upstream/develop' into NewStateTests
Conflicts:
	test/state.cpp
2014-12-13 21:40:42 +01:00
Gav Wood
f7447fc653 Fixes for windows? 2014-12-13 21:40:04 +01:00
CJentzsch
66154817f9 merge 2014-12-13 21:39:21 +01:00
Gav Wood
25faab7009 Another Windows fix? 2014-12-13 21:24:13 +01:00
Gav Wood
ce2798db7c Windows fix? 2014-12-13 21:21:36 +01:00
Gav Wood
994fe6a80e Merge pull request #601 from CJentzsch/newTests
Added recursive create test + lesser output for safe VM exceptions
2014-12-13 19:13:27 +01:00
winsvega
67291aa24b Init code test filler 2014-12-13 18:55:25 +03:00
sveneh
8e9659752d Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into build_enhancement
Conflicts:
	windows/LibEthereum.vcxproj
	windows/LibEthereum.vcxproj.filters

Solved by removing files (not necessary anymore)
2014-12-12 23:42:28 +01:00
CJentzsch
ba3d2b43ae Added recursive create test + lesser output for safe VM exceptions 2014-12-12 22:16:51 +01:00
Gav Wood
dd309de94c Merge pull request #600 from CJentzsch/bugfix
set first 12 bytes to zero in ecrecover
2014-12-12 21:50:08 +01:00