Commit Graph

3334 Commits

Author SHA1 Message Date
NikVolf 579d41b174 fix lib 2016-03-26 19:04:42 +03:00
NikVolf c2ffb6c255 test socket to common test tools 2016-03-26 19:04:12 +03:00
Gav Wood b34ff82987 Merge branch 'master' of github.com:ethcore/parity 2016-03-26 12:40:04 +01:00
Gav Wood af14c68acc Merge pull request #822 from ethcore/netidfix
Use network id for the web3_net_version return.
2016-03-26 11:25:09 +01:00
Gav Wood 2aa3183c16 Merge branch 'master' of github.com:ethcore/parity 2016-03-26 11:21:49 +01:00
Gav Wood 8ea53b69eb Merge pull request #824 from ethcore/web3-sha3
json-rpc web3_sha3
2016-03-26 11:20:52 +01:00
Gav Wood 44d9ccf2c5 Update web3.rs
[ci-skip]
2016-03-26 11:19:51 +01:00
Gav Wood c981d6431d Merge pull request #819 from ethcore/travis-cleanup
remove some unused files
2016-03-26 11:19:04 +01:00
NikVolf 52726088f3 actually fix build 2016-03-26 04:06:40 +03:00
NikVolf 079a39a5f1 wiki test 2016-03-26 03:19:55 +03:00
NikVolf dc4654fa4c avoid copy 2016-03-26 03:15:27 +03:00
NikVolf 3d94670f1f web3_sha3 2016-03-26 03:00:05 +03:00
Gav Wood b30fc3a715 Fix build. 2016-03-26 00:53:35 +01:00
Gav Wood 51d182eb5a Merge pull request #818 from ethcore/debug-symbols
debug symbols for master/beta
2016-03-26 00:30:29 +01:00
Gav Wood 3f04f4e5c6 Merge pull request #809 from ethcore/ipc-syntax
Syntax helpers for IPC RPC
2016-03-26 00:30:00 +01:00
Gav Wood f231440480 Use network id for the web3_net_version return. 2016-03-26 00:23:07 +01:00
NikVolf 8184e27cb8 deleted atavisms 2016-03-25 17:24:04 +03:00
NikVolf c014d5d12e debug symbols for master/beta 2016-03-25 16:55:48 +03:00
Gav Wood 100e6fa88f Merge pull request #803 from ethcore/executive_tests
refactored loading of execution tests
2016-03-25 10:43:33 +00:00
Marek Kotewicz 2c2e8ef154 Merge pull request #805 from ethcore/rustfmt
Rustfmt.toml
2016-03-25 10:39:59 +01:00
NikVolf cb2e1e1572 one more 2016-03-25 00:44:02 +03:00
NikVolf 1864c243fa indents 2016-03-25 00:42:09 +03:00
NikVolf 19e05595c8 whitespace extra 2016-03-25 00:41:15 +03:00
NikVolf 17a9bb81e8 whitespaces 2016-03-25 00:39:20 +03:00
Gav Wood 28122a1e89 Merge pull request #810 from ethcore/debris-patch-1
install-partiy runs brew reinstall parity on osx
2016-03-24 21:27:20 +00:00
Marek Kotewicz ee337471c2 install-partiy runs brew reinstall parity on osx 2016-03-24 22:22:04 +01:00
NikVolf aa7ecdbd65 initial commit 2016-03-25 00:07:01 +03:00
Arkadiy Paronyan 01a39e4f4e Merge pull request #807 from ethcore/tracegetwork
Fix mining from spinning
2016-03-24 18:27:17 +01:00
Arkadiy Paronyan b2665d0c5e Update install-parity.sh 2016-03-24 18:11:07 +01:00
arkpar 416040f313 Fixed test 2016-03-24 17:09:41 +01:00
Gav Wood 8dbd6f36b5 Avoid warning. 2016-03-24 16:00:32 +00:00
debris a7ce6fca9e fixed checking if state is correct in executive tests 2016-03-24 16:40:52 +01:00
Gav Wood ae5eece76f Don't care if engaged in sync since it's typically doing so. 2016-03-24 14:40:13 +00:00
Gav Wood 6c18a1f285 Fix logic. agaib. 2016-03-24 14:40:10 +00:00
Gav Wood cbba403992 Fix logic error. 2016-03-24 14:39:32 +00:00
Gav Wood e6136eb075 Fix mining. 2016-03-24 14:39:29 +00:00
Gav Wood e214489106 Fix compile. 2016-03-24 13:56:22 +00:00
Gav Wood 0ab57c48c3 Add tracing. 2016-03-24 13:51:51 +00:00
Tomasz Drwięga bc03040b0f Removing ethash sizes 2016-03-24 11:50:33 +01:00
Gav Wood 1700b6a087 Add UsingQueue. 2016-03-24 07:49:54 +00:00
debris 1aa34e9dd4 fixed loading of executive tests, unrevealed failing consensus tests 2016-03-24 01:25:59 +01:00
debris 3352b0e916 json-tests vm loading 2016-03-23 18:36:05 +01:00
Tomasz Drwięga 9a867ad277 Adding new crates 2016-03-23 18:20:06 +01:00
Tomasz Drwięga a0db1d5416 Merge branch 'master' into rustfmt
Conflicts:
	ethash/src/sizes.rs
	util/src/uint.rs
2016-03-23 16:55:54 +01:00
Gav Wood 038b67cbd4 Merge pull request #802 from ethcore/tx_queue_bugs
Fixing future-current transactions clash
2016-03-23 14:02:44 +01:00
Tomasz Drwięga c2d2e41624 Fixing future-current transactions clash 2016-03-23 12:23:50 +01:00
Arkadiy Paronyan ebd7273071 Merge pull request #800 from ethcore/fixjsonrpc
Increase threads to num_cpus & fix author reporting
2016-03-22 21:08:59 +01:00
Gav Wood 0e026ed11f Fix author reporting. num_cpus for JSONRPC threads. 2016-03-22 19:12:17 +01:00
Gav Wood 7624bcf49e Increase threads to 4. 2016-03-22 18:43:06 +01:00
Gav Wood d7fb464fa9 Merge pull request #798 from ethcore/eth_rpc
another batch of rpc improvements
2016-03-22 18:38:55 +01:00