Commit Graph

2598 Commits

Author SHA1 Message Date
CJentzsch
3f03b3e14f style 2015-07-03 00:01:12 +02:00
CJentzsch
b8ffd2a40c Merge remote-tracking branch 'upstream/develop' into fixTxNonce 2015-07-02 16:59:10 +02:00
CJentzsch
05254514c1 add transactionQueue tests 2015-07-02 15:17:20 +02:00
Gav Wood
5b43ff6295 Merge pull request #2329 from gluk256/_distribution
Distribution Rate test introduced
2015-07-01 18:01:36 +02:00
Paweł Bylica
7ce128e322 Merge remote-tracking branch 'upstream/develop' into evmjit-develop 2015-07-01 15:29:32 +02:00
Vlad Gluhovsky
5476196c65 super mega enhanced update 2015-07-01 14:48:30 +02:00
Vlad Gluhovsky
380ebe817f mega enhanced style fix 2015-07-01 14:48:29 +02:00
Vlad Gluhovsky
1af066d529 style fix 2015-07-01 14:48:27 +02:00
Vlad Gluhovsky
c42110c90a Distribution Rate test introduced 2015-07-01 14:48:26 +02:00
Marek Kotewicz
3fec6c5bca Merge commit '1e652c0757b5440feb5ba32d46f8a887c32f57c2' into develop 2015-07-01 14:36:10 +02:00
Marek Kotewicz
72dc1c76fd Squashed 'libjsqrc/ethereumjs/' changes from 2a0b46a..d5d2115
d5d2115 example contract using array, fixed #185
21ed235 removed connection keep-alive
c44fe01 version 0.7.1
d9b785e fixed #248
490dde5 fixed encoding/decoding strings, #249
b3f5d09 fixed long bytes dynamic decoding/encoding, #249
d097821 small filter improvement
d59b1cd removed xhr from browser
42b6e9d version 0.7.0
fe6defd gulp
44dcd24 set connection keepalive
2b17c0f gulpfile changes
4a46c73 Merge pull request #228 from ethereum/strings
93c8006 tests for encoding and decoding prematurely terminated strings and strings containing internal zeros
7dd44e7 Merge branch 'strings' of https://github.com/ethereum/ethereum.js into strings
390a9ff Merge branch 'develop' into strings
bcd9cfb updated deps, removed unused karma
ef15fc1 Merge pull request #244 from ethereum/allevents
6f74d57 Merge branch 'develop' into allevents
7aca17e Merge branch 'develop' into allevents
c5ee34d fix for optional event parameters
8170a0a Merge pull request #245 from ethereum/filterInstantWatch
76a094c fixed all issues noted by marek
d78b512 add possible callback to filters
e1b17a9 re-build develop
af9c027 all events filter
b270616 version 0.6.1
c47d6a8 gulp
7cf7cf3 map file
6da1d3e gulp
450042e Update eth.js
3951286 Added sendRawTransaction
323b529 merged develop
16ffdf6 merged master
ecf0a2c changed | to Math.floor
d2b5ba2 Merge pull request #239 from ethereum/mistFixes
9e6bf9d removed browser XHR
9061116 fixed build issues in formatInputDynamicBytes
0e3b29c fixed coverage issue
d51e9a2 merged latest develop
f0247aa made meteor package available on the server side as well
e97c5f5 fixed and tested meteor package init
3e49f56 add currentProvidor and mist fixes
bd6d9ba merged develop
7b730b1 Merge branch 'strings' of github.com:ethereum/web3.js into strings
cc533d9 fixed bytes wrong encoding
8c6f976 Merge branch 'develop' into strings
7c970e3 add bytes32 test with leading 0
9c7f7bb re-add .map files
189484f add extra int tests
73cc711 Merge branch 'develop' into strings
fa3239f abi string type, fixes #216, #218, #219

git-subtree-dir: libjsqrc/ethereumjs
git-subtree-split: d5d2115bf9ad07a736a189e1022b7d3a549e4006
2015-07-01 14:36:10 +02:00
Gav Wood
b82e0b93a4 Merge pull request #2246 from subtly/netFix
Prep for #2179. Abstract parsing frame header. Catch ASIO exceptions.
2015-06-30 22:19:39 +02:00
Gav Wood
e7b00b43a5 Merge pull request #2336 from arkpar/build_fix
Fixed gcc build
2015-06-30 18:56:11 +02:00
arkpar
48eff32c8f style 2015-06-30 17:24:32 +02:00
Gav Wood
40f03ded27 Merge pull request #2330 from gluk256/_bugfix
libp2p test and bugfix
2015-06-30 16:16:13 +02:00
chriseth
807f7e6579 Fixed checking of abstract functions.
Fixes #2264
2015-06-30 11:55:21 +02:00
Vlad Gluhovsky
c707811fe3 uninstallWatch() fixed + test 2015-06-30 11:51:44 +02:00
Gav Wood
c81ab63779 Merge pull request #2297 from subtly/secp-prep
Prep for #2094 and supporting both cryptopp and secp256k1
2015-06-30 11:32:08 +02:00
Gav Wood
59399f6f03 Merge pull request #2321 from chriseth/sol_memoryArraysNotResizeable
Memory arrays cannot be resized.
2015-06-30 11:29:24 +02:00
Gav Wood
b7ad2ff5e6 Merge pull request #2263 from gluk256/_topic_advert
topic advertisement
2015-06-30 11:28:36 +02:00
subtly
3cdb34a7c9 Merge branch 'develop' into netFix 2015-06-29 17:09:08 -04:00
chriseth
4e62efc7ff Memory arrays cannot be resized. 2015-06-29 20:08:02 +02:00
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
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
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
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