Commit Graph

17282 Commits

Author SHA1 Message Date
CJentzsch
6971bd2af7 Merge remote-tracking branch 'upstream/develop' into blockTests 2015-02-12 20:14:29 +01:00
CJentzsch
f3e9c325d1 add valid tx output 2015-02-12 20:13:44 +01:00
subtly
5eae51be12 Merge branch 'develop' into p2p 2015-02-12 13:30:55 -05:00
Gav Wood
0e40b21c56 Merge pull request #1029 from chriseth/sol_bytesContinuation
length member for bytes
2015-02-12 19:30:08 +01:00
Gav Wood
b04258b6f4 Merge pull request #1029 from chriseth/sol_bytesContinuation
length member for bytes
2015-02-12 19:30:08 +01:00
subtly
e332dfa147 Merge branch 'develop' into p2p
Conflicts:
	eth/main.cpp
	libwebthree/WebThree.cpp
	libwebthree/WebThree.h
	neth/main.cpp
2015-02-12 11:35:00 -05:00
Gav Wood
cb60c1e65d Merge pull request #1019 from chriseth/sol_bytes
Basic implementation of byte arrays.
2015-02-12 16:33:15 +01:00
Gav Wood
1f6198a9ae Merge pull request #1019 from chriseth/sol_bytes
Basic implementation of byte arrays.
2015-02-12 16:33:15 +01:00
Gav Wood
0fea318c9b Merge pull request #999 from debris/jsoncpp_path
fixed jsoncpp find_path
2015-02-12 16:26:41 +01:00
Christian
b836d952b2 length member for byte arrays. 2015-02-12 15:44:35 +01:00
Christian
c90adbf593 length member for byte arrays. 2015-02-12 15:44:35 +01:00
Christian
2472e2b998 Test for bytes in mapping. 2015-02-12 15:18:50 +01:00
Christian
5e40b79426 Bytes type cleanup. 2015-02-12 15:01:38 +01:00
CJentzsch
004918d400 Merge remote-tracking branch 'upstream/develop' into blockTests 2015-02-12 13:10:04 +01:00
Christian
6bbba22690 Another try in fixing windows build. 2015-02-12 11:54:44 +01:00
Christian
5673f994fc Added some comments. 2015-02-12 11:50:47 +01:00
Christian
d089703254 Moved copy code to CompilerUtils. 2015-02-12 11:33:10 +01:00
Christian
9b8cf4af1d Moved copy code to CompilerUtils. 2015-02-12 11:33:10 +01:00
Christian
a5449d9b3e Dynamic copy to memory. 2015-02-12 11:33:10 +01:00
Christian
8a2879a603 Copy storage to storage. 2015-02-12 11:33:10 +01:00
Christian
adb434569c Dynamic copy to memory. 2015-02-12 11:33:10 +01:00
Christian
6e0ade681d Simple copy of bytes to storage. 2015-02-12 11:33:09 +01:00
Christian
79aec95228 Simple copy of bytes to storage. 2015-02-12 11:33:09 +01:00
Christian
8787413a86 Tests and some code for msg.data. 2015-02-12 11:33:09 +01:00
Christian
20b4c69009 Tests and some code for msg.data. 2015-02-12 11:33:09 +01:00
Christian
1369337808 Introduced byte array type. 2015-02-12 11:33:09 +01:00
Marek Kotewicz
e559854e33 Merge branch 'jsoncpp_path' of https://github.com/debris/cpp-ethereum into jsoncpp_path 2015-02-12 09:06:32 +01:00
Marek Kotewicz
c5d18d2f0c Merge branch 'jsoncpp_path' of https://github.com/debris/cpp-ethereum into jsoncpp_path 2015-02-12 09:06:32 +01:00
Marek Kotewicz
ff995be648 Merge branch 'jsoncpp_path' of https://github.com/debris/cpp-ethereum into jsoncpp_path 2015-02-12 09:06:32 +01:00
Marek Kotewicz
3f7d59e201 Merge branch 'jsoncpp_path' of https://github.com/debris/cpp-ethereum into jsoncpp_path 2015-02-12 09:06:32 +01:00
Marek Kotewicz
f723627c85 Merge branch 'develop' into jsoncpp_path 2015-02-12 09:03:32 +01:00
Marek Kotewicz
b3c0cfef4b Merge branch 'develop' into jsoncpp_path 2015-02-12 09:03:32 +01:00
subtly
ca39f95248 Merge branch 'develop' into p2p 2015-02-12 00:02:05 -05:00
CJentzsch
0e634cb1fc style 2015-02-11 22:05:34 +01:00
Christian
d37f6cfb9f Some windows fixes. 2015-02-11 20:20:37 +01:00
Christian
2119a758b3 Some windows fixes. 2015-02-11 20:20:37 +01:00
subtly
d14c5eb85a Merge branch 'develop' into p2p 2015-02-11 12:29:55 -05:00
CJentzsch
9e63ab10ca avoid code doubling 2015-02-11 18:17:01 +01:00
Marek Kotewicz
3e35ca9001 Merge pull request #979 from debris/win_fixes
windows fixes
2015-02-11 17:46:41 +01:00
Marek Kotewicz
6a0cd77c75 Merge pull request #979 from debris/win_fixes
windows fixes
2015-02-11 17:46:41 +01:00
debris
af0357898b fixed cmake include_directories 2015-02-11 16:47:56 +01:00
debris
ef5dce950d fixed cmake include_directories 2015-02-11 16:47:56 +01:00
CJentzsch
f0b2d0f30b check transactions 2015-02-11 16:36:00 +01:00
debris
05624c15b1 Merge branch 'develop' into jsoncpp_path 2015-02-11 16:24:37 +01:00
debris
396649409e Merge branch 'develop' into jsoncpp_path 2015-02-11 16:24:37 +01:00
Marek Kotewicz
7035ae638a Merge branch 'develop' into jsoncpp_path 2015-02-11 15:43:47 +01:00
Marek Kotewicz
437979a781 Merge branch 'develop' into jsoncpp_path 2015-02-11 15:43:47 +01:00
winsvega
a44feb813e Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into develop 2015-02-11 14:12:18 +03:00
debris
037474713a fixed transitive dependencies for msvc 2015-02-11 11:42:13 +01:00
debris
a70d7f04c9 fixed transitive dependencies for msvc 2015-02-11 11:42:13 +01:00