Commit Graph

2760 Commits

Author SHA1 Message Date
Gav Wood
b4faad8469 Merge branch 'master' into cliopt 2016-02-10 23:51:22 +01:00
Nikolay Volf
7bfb832312 type metadata for key files 2016-02-11 01:06:35 +03:00
debris
e577431051 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-10 23:06:03 +01:00
debris
4fe86a4419 eth_getBlockByNumber 2016-02-10 22:54:12 +01:00
debris
93975be5e3 transaction by block number and index 2016-02-10 22:36:59 +01:00
debris
df0fa06e8a applied client interface changes to sync tests 2016-02-10 22:16:25 +01:00
debris
484a4d8bdd Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-10 21:52:52 +01:00
Gav Wood
3e49c960a0 Install both rocksdb deps. 2016-02-10 21:31:21 +01:00
Gav Wood
cb09768145 Fix deps script again. 2016-02-10 21:22:24 +01:00
Gav Wood
30f291e6ce Merge branch 'master' of github.com:ethcore/parity 2016-02-10 21:21:32 +01:00
Gav Wood
25c3e49b4f Fix deps script. 2016-02-10 21:21:17 +01:00
Gav Wood
9ac4f51601 Allow path to be configured. 2016-02-10 21:17:47 +01:00
Nikolay Volf
428962df35 Merge pull request #400 from ethcore/upnp
Upnp
2016-02-10 22:25:19 +03:00
debris
db35e21bcd few client methods use BlockId instead of hash and BlockNumber 2016-02-10 19:29:27 +01:00
Arkadiy Paronyan
0f665a6cbc Merge pull request #398 from ethcore/jsonrpc2
eth_syncing, fixed #397
2016-02-10 19:13:00 +01:00
Gav Wood
1d60e38f14 Merge pull request #399 from ethcore/sigterm
Using modified version of ctrlc that catches SIGTERM
2016-02-10 18:34:53 +01:00
Gav Wood
0e679fbee5 Revert collecting trie stats. 2016-02-10 18:26:39 +01:00
debris
2c360d6c9b fixed protocol_version, hash_rate, block_number and gas_price methods 2016-02-10 18:26:06 +01:00
Gav Wood
e8aaf26ab4 Revert printing trie insertion stats. 2016-02-10 18:26:03 +01:00
Gav Wood
637ca97dc6 Synchronous UPnP. 2016-02-10 18:11:10 +01:00
debris
a938ac67d1 eth_syncing use best_block_hash instead of last_imported_block_number 2016-02-10 18:03:29 +01:00
Gav Wood
39d5b68785 Merge branch 'master' of github.com:ethcore/parity 2016-02-10 17:21:07 +01:00
Nikolay Volf
66a370af9b Merge pull request #396 from ethcore/close_gently
Catching panics.
2016-02-10 18:55:53 +03:00
Tomusdrw
d7a36f4a9d Using modified version of ctrlc that catches SIGTERM 2016-02-10 16:55:15 +01:00
Gav Wood
5c73c298dc Merge branch 'master' of github.com:ethcore/parity 2016-02-10 16:46:06 +01:00
Gav Wood
35374ac09c Start of UPnP. 2016-02-10 16:45:54 +01:00
Tomusdrw
96dda7b73a Forwarding panics from threads 2016-02-10 16:35:52 +01:00
debris
373f0da56a Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-10 16:29:05 +01:00
debris
9159d5812b eth_syncing, fixed #397 2016-02-10 16:28:59 +01:00
Marek Kotewicz
e69cd0f8c3 Merge pull request #391 from ethcore/jsonrpc2
jsonrpc
2016-02-10 15:33:02 +01:00
Tomusdrw
7925642b1b Removing overengineered stuff 2016-02-10 15:28:43 +01:00
debris
5347d4fe43 changed BlockPosition -> Location 2016-02-10 15:15:28 +01:00
debris
dc8fa4ebfd moved BlockId and TransactionId to blockchain.rs 2016-02-10 15:09:38 +01:00
Tomusdrw
0d121dd51a Removing unecessary locks causing dead-locks 2016-02-10 14:49:31 +01:00
Tomusdrw
31bcc541d0 Fixing parity build 2016-02-10 14:16:53 +01:00
Tomusdrw
6b0cc0c8fa Merge branch 'master' into close_gently
Conflicts:
	parity/main.rs
2016-02-10 13:13:04 +01:00
Tomusdrw
2a498fc3eb Implementing PanicHandlers for all places when new thread is spawned. Handling Client panics 2016-02-10 12:50:27 +01:00
debris
75b54cc277 updated BlockId and TransactionId description 2016-02-10 12:43:26 +01:00
debris
8c43c989af fixed Uniquely typo 2016-02-10 12:41:36 +01:00
debris
7491815e27 fixed ethsync tests 2016-02-10 11:44:03 +01:00
debris
626277ef9a block and transaction ids, jsonrpcs eth_getTransactionByHash 2016-02-10 11:28:40 +01:00
debris
b86ddbb923 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-10 10:13:07 +01:00
debris
bceae29fca small clenaup 2016-02-10 10:12:56 +01:00
Gav Wood
9f8766c8da Merge pull request #394 from ethcore/ext-tests
Externalities tests (still clumsy)
2016-02-10 02:50:02 +01:00
Gav Wood
f0e26e3495 Merge pull request #395 from ethcore/coverage-reasonable
excluding test code itself from coverage
2016-02-10 01:49:28 +01:00
Nikolay Volf
92a08c26ad excluding test code itself from coverage 2016-02-10 03:27:54 +03:00
Nikolay Volf
4ab99a6bb3 fixed conflicting namespaces 2016-02-10 02:20:36 +03:00
debris
4df096fed3 optimize blockchains transaction_at 2016-02-10 00:12:09 +01:00
debris
d0792dff31 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-09 23:23:35 +01:00
Nikolay Volf
dabce9ab45 cleanup, warnings 2016-02-10 01:11:22 +03:00