Commit Graph

14695 Commits

Author SHA1 Message Date
Liana Husikyan
e32bf97e87 to include source lines in output stream AssemblyItem's appropriate function is now receiving the map of fileNames to sourceCodes as argument. 2015-03-05 12:08:43 +01:00
Gav Wood
7e11889b31 Merge pull request #1210 from winsvega/poc9trie
VMTest Fillers
2015-03-05 11:26:01 +01:00
Marek Kotewicz
4aaa414a83 jsonrpc api changes in progress6, almost finished 2015-03-05 11:16:54 +01:00
Gav Wood
66e6fb6d2a Bunch of repotting/curating.
[10:59:28] Vitalik Buterin: block.parent.gas_limit * 1023 / 1024 <=
block.gas_limit <= block.parent.gas_limit * 1025/1024
2015-03-05 11:09:34 +01:00
winsvega
fb0fac191b VMTest Fillers
execution gas amount changed
2015-03-05 12:48:30 +03:00
Marek Kotewicz
46d40d399d jsonrpc api changes in progress5 2015-03-05 10:12:01 +01:00
subtly
c49a2e6fd9 Merge branch 'develop' into p2p
Conflicts:
	libp2p/Host.cpp
	libp2p/Host.h
2015-03-05 04:06:51 +01:00
subtly
5d8e800324 authenticated capability (hello) and handshake authentication 2015-03-05 03:07:14 +01:00
Marek Kotewicz
bbe0e15208 jsonrpc api changes in progress4 2015-03-05 02:02:42 +01:00
Marek Kotewicz
d3e65ba8a4 jsonrpc api changes in progress3 2015-03-05 01:34:02 +01:00
Marek Kotewicz
13d14289d8 jsonrpc api changes in progress2 2015-03-05 01:14:31 +01:00
Marek Kotewicz
5d20782dea jsonrpc api changes in progress 2015-03-05 00:33:44 +01:00
subtly
7ce91422ff test initial secrets and ciphers, interop with go 2015-03-05 00:22:35 +01:00
Gav Wood
0c2a7fbe7d Merge pull request #1186 from onepremise/develop
Updates for Building all cpp-ethereum on MinGW(64)
2015-03-04 22:49:47 +01:00
Gav Wood
713e5e5d1e Merge pull request #1200 from debris/ethereumjs
ethereum.js 0.0.16
2015-03-04 22:46:47 +01:00
Gav Wood
6a64f2564b Merge pull request #1203 from winsvega/poc9trie
Transaction Test Fillers POC9
2015-03-04 22:46:08 +01:00
CJentzsch
93fd580b94 merge 2015-03-04 21:32:26 +01:00
Gav Wood
de2ed72e6b Params & JSON file. 2015-03-04 19:55:52 +01:00
Gav Wood
ec3384a23f Add date/time language to solidity. 2015-03-04 17:35:23 +01:00
Gav Wood
5aff9fbde2 Add date/time language to solidity. 2015-03-04 17:35:23 +01:00
jhuntley
e229b5d291 Revert all asio.h includes except for in 2 files, DebuggingStateWrapper.h and Transact.cpp. After enabling WIN32_LEAN_AND_MEAN, all the asio.h include issues, commit 20b6e24ffcab088e71092e07030a377d3135da3c, went away. 2015-03-04 11:18:32 -05:00
jhuntley
a4d772315d Consolidating macro resolution to one header file as per project owner request. Added inline comments covering reasons for undef of macros. Resolves issues with problem #832:
Adding UndefWindowsMacros.h to handle V8 CPP conflicts in Windows #832
2015-03-04 11:17:46 -05:00
jhuntley
5ae585f7cf asio.h and windows.h build comments as per request. 2015-03-04 11:17:46 -05:00
jhuntley
055f45f11b Update to resolve "#error : The macro "DELETE" from windows.h conflicts with this file." on windows vs build. 2015-03-04 11:17:46 -05:00
jhuntley
b6b80b0200 Avoid boost include order issue on windows:
http://stackoverflow.com/questions/9750344/boostasio-winsock-and-winsock-2-compatibility-issue
http://stackoverflow.com/questions/9750344/boostasio-winsock-and-winsock-2-compatibility-issue/16288859#16288859

Make sure boost/asio.hpp is included before windows.h.
2015-03-04 11:17:46 -05:00
jhuntley
d2a5153722 Adding comments for #undef per project owner request. 2015-03-04 11:17:46 -05:00
jhuntley
62ec556a9d Mingw cmake updates. Make sure Boost_INCLUDE_DIRS is included for each library using boost. When installing libraries, don't forget to copy DLLs, add target 'RUNTIME DESTINATION bin'. 2015-03-04 11:17:45 -05:00
jhuntley
26ba1086b8 Avoid boost include order issue on windows:
http://stackoverflow.com/questions/9750344/boostasio-winsock-and-winsock-2-compatibility-issue
http://stackoverflow.com/questions/9750344/boostasio-winsock-and-winsock-2-compatibility-issue/16288859#16288859

Make sure boost/asio.hpp is included before windows.h.
2015-03-04 11:17:45 -05:00
jhuntley
f046be3cc1 Updates for mingw support. #undef conflicting defines on windows. 2015-03-04 11:17:45 -05:00
jhuntley
d82b8c2738 Mingw cmake updates. Make sure Boost_INCLUDE_DIRS is included for each library using boost. When installing libraries, don't forget to copy DLLs, add target 'RUNTIME DESTINATION bin'. 2015-03-04 11:17:45 -05:00
winsvega
5d0567bfe6 Gas Fee Test Changes (1)
State Tests
2015-03-04 19:01:37 +03:00
CJentzsch
4d0695c3af update block tests to latest changes PoW changes 2015-03-04 14:54:13 +01:00
winsvega
3b87ce2488 Transaction Test Fillers POC9
gas fees increased, most tests are incorrect now
need to review (wip)
2015-03-04 16:01:13 +03:00
CJentzsch
18779ba942 more block tests + bugfix for longer chains 2015-03-04 12:04:25 +01:00
CJentzsch
6563c2fca2 blockchain tests
Conflicts:
	test/block.cpp
2015-03-04 12:04:15 +01:00
Gav Wood
ebd7ac43e0 Merge pull request #1195 from CJentzsch/POC9tests
remove genesis state from state tests
2015-03-04 11:58:57 +01:00
Gav Wood
366b9e8b71 New Proof-of-Work. 2015-03-04 11:55:22 +01:00
Marek Kotewicz
de55a0bda8 Merge commit '0807e2ee7c32d10f86622c7cd143b6ae37005f48' into develop
Conflicts:
	libjsqrc/ethereumjs/dist/ethereum.min.js
2015-03-04 01:17:40 +01:00
Marek Kotewicz
628a07d541 Squashed 'libjsqrc/ethereumjs/' changes from 5bd166c..7d6b35a
7d6b35a Merge branch 'master' into cpp
9b3a0f0 Merge branch 'event_hash'
9887972 version
63dcee6 ignore for maxcomplexity warning
8376bfa gulp
a59f3a4 Merge pull request #85 from ethers/abiString
0dd6cc4 gulp
688faec Merge pull request #81 from ethers/arraySupport
64f6630 updated README.md
4f9aaec Merge pull request #94 from ethereum/signature
91321fb removed web3 dependency from abi.js
5c7d8a7 separated event signature
81b19cc event hash
ea250e6 Merge commit 'be3bfb76bef1d1f113033cd9093e03a00066d5d1' into ethereumjs_timeout
c08cea1 Improvement to AZ - confirmation disabler. Fix network crash.

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: 7d6b35af1c2b59feae5a01c899fae68298d71211
2015-03-04 01:17:08 +01:00
subtly
454c851260 update host for ecies interop. test sha3 output of interim digest. 2015-03-03 20:56:05 +01:00
winsvega
b5693332fb Transaction Tests
missing TestHelper.h file
2015-03-03 20:12:17 +03:00
winsvega
d311a82444 Test Cases Changes
userDefinedFile test now goes with --test option for all cases
2015-03-03 20:12:10 +03:00
winsvega
af6b44fb90 Transaction Tests
A few changes
2015-03-03 20:06:04 +03:00
Paweł Bylica
1840fa5678 Merge remote-tracking branch 'upstream/develop' into evmjit 2015-03-03 17:42:17 +01:00
Paweł Bylica
326bf6c771 Merge remote-tracking branch 'upstream/develop' into evmjit 2015-03-03 17:42:17 +01:00
CJentzsch
a35c9d8e35 remove genesis state from state tests
Conflicts:
	test/state.cpp
2015-03-03 17:36:09 +01:00
Gav Wood
60c8709d6e Merge branch 'poc9trie' of github.com:ethereum/cpp-ethereum into poc9trie
Conflicts:
	libethereum/Client.cpp
	test/state.cpp
2015-03-03 17:21:37 +01:00
Gav Wood
14067cb7ed Merge branch 'poc9trie' of github.com:ethereum/cpp-ethereum into poc9trie
Conflicts:
	libethereum/Client.cpp
	test/state.cpp
2015-03-03 17:21:37 +01:00
Gav Wood
858203ecb7 state rebase. 2015-03-03 17:12:27 +01:00
Gav Wood
731543e21c Update precompiled stuff.
Add extra tests for secure trie.
2015-03-03 17:08:35 +01:00