Commit Graph

2846 Commits

Author SHA1 Message Date
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
arkpar
6112129bf3 improved logging 2015-06-22 19:13:07 +02:00
Dimitry Khokhlov
98ce5a10fb FuzzTests: windows build fix 2015-06-22 19:50:59 +04:00
Dimitry Khokhlov
0824727ce4 FuzzTest: filltest option 2015-06-22 19:50:59 +04:00
Dimitry Khokhlov
2bdf36ef27 FuzzTests: Boost exception 2015-06-22 19:50:59 +04:00
Dimitry Khokhlov
0fc274fd6a fuzzTests: debug support 2015-06-22 19:50:59 +04:00
Gav Wood
b447fcda09 Merge pull request #2245 from CJentzsch/updateTestPath
Update test path
2015-06-22 15:16:50 +02:00
CJentzsch
15e908226e add test for suicide of coinbase 2015-06-22 14:15:50 +02:00
CJentzsch
bbcba66443 Merge remote-tracking branch 'upstream/develop' into moreTests 2015-06-22 12:17:57 +02:00
CJentzsch
c7c495838e update gas pricer test path 2015-06-22 07:17:07 +02:00
Gav Wood
20f05abfe5 Merge pull request #2244 from gluk256/_topic_bloom_filter
topic bloom filter
2015-06-21 16:45:32 +02:00
subtly
310a151d11 Initial reader test. Something broken with encframes vector of bytes. 2015-06-20 08:34:53 -04:00
subtly
533984d522 Windows compile complaint. 2015-06-20 07:35:04 -04:00
subtly
0341486a7b Merge branch 'netFix' into rlpx 2015-06-20 07:32:08 -04:00
subtly
fed25986f2 Prep for #2179. Abstract parsing of frame header from Session into struct. Catch unhandled exceptions thrown by ASIO. 2015-06-20 07:24:03 -04:00
subtly
e87c4b919f rename drain to mux 2015-06-20 03:24:11 -04:00
subtly
6343bea67d rlpx frame reader fixes. rename writer::drain to mux. 2015-06-19 23:42:16 -04:00
subtly
b2ddbaec02 Merge branch 'develop' into rlpx 2015-06-19 21:08:06 -04:00
CJentzsch
b2ed0e6061 mv BlockTestsFiller -> BlockchainTestsFiller in blockchain.cpp 2015-06-19 20:51:56 +02:00
CJentzsch
9f81945c72 mv BlockTestsFiller -> BlockchainTestsFiller 2015-06-19 20:51:09 +02:00
Vlad Gluhovsky
199968ee98 made TopicBloomFilter a template 2015-06-19 15:44:56 +02:00
chriseth
2a870afc7b Merge pull request #2232 from chriseth/sol_externalConstructorTests
Tests for constructor arguments "from outside".
2015-06-19 10:29:59 +02:00
Gav Wood
93a6f63669 Merge pull request #2235 from chriseth/sol_fix_recursiveStructs
Fix and test for not really recursive structs.
2015-06-19 10:17:45 +08:00
Gav Wood
4f52ad7e5b Merge pull request #2144 from chriseth/cleanupSecretStore
Cleanup of SecretStore.
2015-06-18 23:38:04 +08:00
chriseth
ff96f48487 Fixed build errors. 2015-06-18 16:49:38 +02:00
chriseth
4adc684939 Fix and test for not really recursive structs.
Fixes #2223.
2015-06-18 16:37:06 +02:00
Gav Wood
1541aa403b Merge pull request #2230 from CJentzsch/testethForBuildServer
make network test optional
2015-06-18 21:38:11 +08:00
chriseth
5e23bd707b Merge pull request #2216 from chriseth/sol_memoryArrays5
Accessors for strings and type conversion to memory.
2015-06-18 15:21:35 +02:00
chriseth
06245784eb Safe file writing and some tests. 2015-06-18 15:20:30 +02:00
CJentzsch
77f8b992ab Merge remote-tracking branch 'upstream/develop' into moreTests 2015-06-18 15:13:08 +02:00
chriseth
6d2f2f668b Tests for constructor arguments "from outside". 2015-06-18 14:41:46 +02:00
CJentzsch
ba65702982 avoid network tests when --nonetwork is set 2015-06-18 12:31:58 +02:00
chriseth
8603d0c734 Fix to correctly write nonce during tests. 2015-06-18 11:38:14 +02:00
chriseth
5185b75add Cleanup of SecretStore.
Added documentation, more failure checking and some general cleanup.
2015-06-18 11:38:13 +02:00
CJentzsch
bfcfbf8ea7 make network tests optional 2015-06-18 08:00:46 +02:00
CJentzsch
e325f33856 add network flag 2015-06-18 08:00:16 +02:00
Gav Wood
6c27ef7367 Merge pull request #2075 from winsvega/fuzz
FuzzTests
2015-06-18 10:31:41 +08:00
subtly
ae2213effc Add test for frame writer. Cleanup abstraction in preparation for reader. Initial reader code. 2015-06-17 21:28:27 -04:00
Vlad Gluhovsky
81b6590c7e false positive test introduced 2015-06-18 00:44:20 +02:00
Gav Wood
0b44e4be94 Merge pull request #2202 from CJentzsch/PoWTests
Pow tests
2015-06-18 02:35:45 +08:00
Gav Wood
47aee5ae63 Merge pull request #2170 from gluk256/_bloom_filter
bloom filter
2015-06-18 02:35:21 +08:00
chriseth
366e25b8d1 Storage array reference test. 2015-06-17 18:51:47 +02:00
Dimitry
1a88eaa6bd FuzzTests: simple block test + NOBOOST flag 2015-06-17 18:31:14 +03:00
Dimitry
9db2beacc2 FuzzTests: blocktests (before merge) 2015-06-17 17:01:31 +03:00