Commit Graph

2789 Commits

Author SHA1 Message Date
chriseth
9cb646697d Merge pull request #2312 from chriseth/sol_updateWallet
Updated wallet test to latest wallet source.
2015-06-29 16:46:50 +02:00
Vlad Gluhovsky
c2d3dfe87b a minor refactoring 2015-06-29 15:29:58 +02:00
chriseth
4a369a8eee Updated wallet test to latest wallet source. 2015-06-29 12:48:03 +02:00
chriseth
e1b2a79b8b Another test for arrays in constructors. 2015-06-29 12:47:04 +02:00
subtly
43c6eca73e Update/fix test for builds. 2015-06-27 07:00:43 -04:00
subtly
8e5daa7d88 Merge branch 'netFix' into rlpx
Conflicts:
	libp2p/Session.cpp
2015-06-27 06:55:53 -04:00
subtly
102d729592 Merge branch 'develop' into secp-prep 2015-06-26 23:50:27 -04:00
subtly
3ffde5148b Disable libsecp256k1-specific tests for windows compile. 2015-06-26 23:49:52 -04:00
subtly
a6d742ca17 Merge branch 'develop' into netFix 2015-06-26 23:46:27 -04:00
chriseth
7100b14d4d Delete for memory objects. 2015-06-26 21:28:02 +02:00
chriseth
65d89bde6d Do not copy reference types to memory in-place. 2015-06-26 19:15:00 +02:00
subtly
1ed7bc1562 Don't link secp256k1 on windows. 2015-06-26 07:41:42 -04:00
subtly
fb73be737f Merge branch 'develop' into netFix
Conflicts:
	libp2p/Session.cpp
2015-06-26 06:59:16 -04:00
subtly
88f8eb6ad2 Prep for supporting both cryptopp and secp256k1. Link (old) secp256k1 library to devcrypto. Rename cryptopp Secp256k1 to Secp256k1PP. Update toPublic to use secp256k1 library and add test. 2015-06-26 06:46:49 -04:00
Marek Kotewicz
0dabcf1195 Merge branch 'develop' into client_ref 2015-06-26 09:42:08 +02:00
subtly
ae2f4acdc4 Merge branch 'develop' into rlpx
Conflicts:
	libp2p/Session.cpp
2015-06-26 00:55:16 -04:00
chriseth
e4a1a5446b Merge pull request #2276 from chriseth/sol_memoryArrays7
Copy routines for non-byte arrays.
2015-06-25 18:52:19 +02:00
Gav Wood
639a313798 Merge pull request #2291 from CJentzsch/KeyManagerTests
fix keymanager test
2015-06-25 18:11:50 +02:00
CJentzsch
1b6785f75b fix keymanager test 2015-06-25 18:09:12 +02:00
Gav Wood
2856c0b5ab Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop
Conflicts:
	ethconsole/main.cpp
2015-06-25 16:29:02 +02:00
Vlad Gluhovsky
de1cfebc44 Topics of interest advertising made asynchronous 2015-06-25 12:40:19 +02:00
Marek Kotewicz
d8d968a680 getBlockBy** and getBlockTransactionCountBy** return null if block is not found 2015-06-24 23:25:13 +02:00
Marek Kotewicz
5746674ffd blockchain isKnown block / transaction 2015-06-24 23:07:05 +02:00
arkpar
434afef272 Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into ldb_limit 2015-06-24 21:56:22 +02:00
Gav Wood
3f9e411883 Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop 2015-06-24 20:15:29 +02:00
chriseth
5664f62613 Initialisation of memory types. 2015-06-24 19:34:43 +02:00
Paweł Bylica
209e16e211 Do not compute code hash twice in VM test engine. 2015-06-24 17:43:47 +02:00
Paweł Bylica
79e7325e3f Merge remote-tracking branch 'upstream/develop' into evmjit-develop
Conflicts:
	evmjit/CMakeLists.txt
	evmjit/libevmjit/Arith256.cpp
2015-06-24 17:28:56 +02:00
Vlad Gluhovsky
cf2919dc3f minor clean up 2015-06-24 15:56:05 +02:00
Vlad Gluhovsky
e22544e037 BF size changed 2015-06-24 15:56:04 +02:00
Vlad Gluhovsky
44ffc55c1a deleted unused variable 2015-06-24 15:56:03 +02:00
Vlad Gluhovsky
3a71f292d9 bugfix 2015-06-24 15:56:00 +02:00
Vlad Gluhovsky
0f50090b35 bloom filter exchage protocol 2015-06-24 15:55:59 +02:00
Gav Wood
f15b7905d2 Merge pull request #2254 from arkpar/bc_rf
p2p/sync fixes
2015-06-24 15:02:42 +02:00
Gav Wood
eed8a96496 Merge pull request #2271 from CJentzsch/disableDag
disable dagcreation during tests
2015-06-24 15:01:36 +02:00
Gav Wood
eaa53d5ddc Merge pull request #2266 from CJentzsch/KeyManagerTests
Key manager tests
2015-06-24 15:01:21 +02:00
arkpar
40ebf7fc06 Merge branch 'develop' of https://github.com/ethereum/cpp-ethereum into bc_rf 2015-06-24 12:46:33 +02:00
chriseth
eede8cf2d6 Copy routines for non-byte arrays. 2015-06-24 12:18:19 +02:00
CJentzsch
e4947b5619 disbale dagcreaion during tests 2015-06-23 23:01:32 +02:00
Gav Wood
afc3c13e2b Merge pull request #2253 from CJentzsch/moreTests
add test for suicide of coinbase
2015-06-23 19:05:32 +02:00
chriseth
bb732b822e Merge pull request #2257 from chriseth/sol_memoryArrays6
Strings in constructor and memory-storage copy.
2015-06-23 17:17:23 +02:00
CJentzsch
5ef3deba83 style 2015-06-23 15:14:29 +02:00
CJentzsch
3e75a19e71 add hints tests 2015-06-23 13:59:08 +02:00
Gav Wood
fd657b0661 Merge pull request #2260 from debris/web3.js.6.0
web3.js.6.0 + web3.admin extension
2015-06-23 13:51:00 +02:00
CJentzsch
668c8adc93 add keymanager tests 2015-06-23 10:37:03 +02:00
Marek Kotewicz
a1ec0ba4cf Merge commit 'ae9fdda9ac2b451b8f4cc46828a2b9f4bed872c8' into web3.js.6.0
Conflicts:
	libjsqrc/ethereumjs/dist/web3-light.js
	libjsqrc/ethereumjs/dist/web3-light.min.js
	libjsqrc/ethereumjs/dist/web3.js
	libjsqrc/ethereumjs/dist/web3.min.js
2015-06-23 10:07:36 +02:00
Marek Kotewicz
9470fa2d4c Squashed 'libjsqrc/ethereumjs/' changes from ca46cb5..ecde334
ecde334 Merge pull request #241 from SilentCicero/master
3af1e82 Update eth.js
86d9b58 Added sendRawTransaction
4228b02 common fixes in requestmanager
47e292a version 0.6.0
c597034 gulp
9417bbf Merge branch 'master' into develop
15df5d6 Merge branch 'master' of https://github.com/ethereum/ethereum.js
e947252 Merge pull request #234 from ethereum/ethers-patch-1
4d165de update license per name change to web3.js
03ae21b special logs will never be nulls, so there is no reason to check for null value
66f1def updated dependencies, gulp
ccb436e Merge branch 'master' into develop
d729884 unrelevant change in example
fdf46ed fixed providor not set in request manager
811e3b2 Merge branch 'develop' of https://github.com/ethereum/ethereum.js into develop
f454dda Merge branch 'develop' of https://github.com/asinyagin/web3.js into develop
4384805 build files
b09bf31 Merge branch 'develop' into allAsync
6ea0d67 Set requests content type to application/json
fe703f5 Merge pull request #229 from ethereum/extendWeb3
a90a85a mereg develop
a2e5fbd add tests for the outputformatters
556eb45 re-add map files
08d2212 small fix on outputFormatters, dont transform null to 0
1495a0c add comlexity push for poll, does only show on travis
7518ed4 changed extend to _extend
1aefebd merged develop
b6c49d4 improved async polling
16252f3 imporved async callback adding, without setinterval
f242489 add optional default block parameter to contract call fixes #159
1d3d727 improved comment
d9ce08e improved filter interval
ddafe00 asyncified filters
d14c706 build and improved extend function
733e19e add extend method and tests

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: ecde3345e0e6d4bca0ce03e08ee4957395cd6194
2015-06-23 10:00:27 +02:00
chriseth
1e8c26421b Decoding for constructor. 2015-06-22 20:55:46 +02:00
chriseth
90ee186044 Remove dynamic return types. 2015-06-22 20:50:47 +02:00
chriseth
128fbccd42 Memory-storage copy. 2015-06-22 20:50:47 +02:00