Commit Graph

16524 Commits

Author SHA1 Message Date
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
CJentzsch
b3de3493bf add memory tests 2015-03-03 17:08:35 +01:00
CJentzsch
2b3cbabef9 only check rootHash of state if FATDB is off 2015-03-03 17:05:53 +01:00
Gav Wood
c416c8873b Fix FakeExtVM. 2015-03-03 17:05:53 +01:00
Gav Wood
ac1b7fde0e State integration test.
Fixes to the FatTrie.
2015-03-03 17:04:34 +01:00
Gav Wood
aa3f5f8c2d Fat Trie and tests for it. 2015-03-03 17:04:33 +01:00
Gav Wood
de671024b5 Merge pull request #1193 from chriseth/sol_fixABIArrays
Fixed arrays in ABI.
2015-03-03 16:12:10 +01:00
Gav Wood
102c8a5301 Merge pull request #1193 from chriseth/sol_fixABIArrays
Fixed arrays in ABI.
2015-03-03 16:12:10 +01:00
subtly
42f7632c3c ECIES interop with go is a go. 2015-03-03 13:01:47 +01:00
Gav Wood
3f45ed8c38 Update precompiled stuff.
Add extra tests for secure trie.
2015-03-03 13:00:09 +01:00
Christian
7112696993 Fixed arrays in ABI. 2015-03-03 12:58:48 +01:00
Christian
99263f0e3e Fixed arrays in ABI. 2015-03-03 12:58:48 +01:00
Christian
66d2ec1d15 Fix test after change in call failure semantics. 2015-03-03 11:36:54 +01:00
Gav Wood
f7f2861f5f Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2015-03-03 11:20:12 +01:00
Gav Wood
226c4a89b2 Solidity STOPs in case of failed call. 2015-03-03 11:19:24 +01:00
subtly
0a7b5bb62b ecies interop fix and tests. 128-bit keys. 2015-03-03 02:23:48 +01:00
CJentzsch
deee7322b1 add memory tests 2015-03-02 21:19:36 +01:00
CJentzsch
8e46c888eb only check rootHash of state if FATDB is off 2015-03-02 20:45:42 +01:00
Gav Wood
28dbaf3478 Fix FakeExtVM. 2015-03-02 19:54:16 +01:00
Gav Wood
d8ddf59497 Solidity STOPs in case of failed call. 2015-03-02 18:10:32 +01:00
arkpar
5efd2fbab7 Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into mix_srcdbg 2015-03-02 17:34:53 +01:00
arkpar
c3def50c93 style 2015-03-02 17:34:43 +01:00