Nikolay Volf
94f9501702
Merge branch 'master' into geth-import
2016-02-22 23:41:06 +03:00
Nikolay Volf
4061799e90
scrypto decrypt fix
2016-02-22 23:40:38 +03:00
Nikolay Volf
e604c97a43
more account tests
2016-02-22 23:12:13 +03:00
Nikolay Volf
93f2ee66bc
geth directory import
2016-02-22 22:19:33 +03:00
Arkadiy Paronyan
4e023a1bb8
Merge pull request #494 from ethcore/usererrors
...
Manage final user-input errors.
2016-02-22 20:04:17 +01:00
Gav Wood
72d0719223
Update docs.
2016-02-22 18:11:53 +01:00
Gav Wood
a6c41514d4
Update docs.
2016-02-22 18:10:21 +01:00
Nikolay Volf
61a3e687f5
store extra interface
2016-02-22 20:08:16 +03:00
Nikolay Volf
753f52fc22
geth import finish
2016-02-22 20:07:56 +03:00
debris
4b69b96f9b
added assert checking bloom index size
2016-02-22 15:14:35 +01:00
Arkadiy Paronyan
5fdc9c8adb
Merge pull request #495 from ethcore/netcleanups
...
Remove unneeded code, fix minor potential issue with length.
2016-02-22 14:38:31 +01:00
Gav Wood
5917290562
Remove unneeded code, fix minor potential issue with length.
2016-02-22 13:59:25 +01:00
Gav Wood
64d566ff52
Manage final user-input errors.
2016-02-22 13:58:41 +01:00
arkpar
764f6e9347
Merge branch 'db' of github.com:ethcore/parity into db
2016-02-22 13:48:43 +01:00
arkpar
077c5662a8
Fixed a warning
2016-02-22 13:47:25 +01:00
arkpar
61949d0ed4
Merge branch 'master' of github.com:ethcore/parity into db
2016-02-22 13:44:25 +01:00
debris
90184658a7
jsonrpc security, cors headers, fixed #359
2016-02-22 13:41:38 +01:00
debris
5e27e1b9aa
Merge branch 'master' of github.com:ethcore/parity into jsonrpc2
2016-02-22 11:08:51 +01:00
Marek Kotewicz
38ccc24577
Merge pull request #488 from ethcore/shortversio
...
Remove "unknown" from version string.
2016-02-22 10:54:34 +01:00
debris
2be4f2f737
added trailin ,
2016-02-22 10:14:31 +01:00
debris
8f4c2d98ba
added trailin ,
2016-02-22 10:11:07 +01:00
debris
61e1720d07
fork back tests
2016-02-22 09:54:56 +01:00
debris
4adb7ee969
tests for blockchain reseting chain head and rebuilding blooms
2016-02-22 09:12:15 +01:00
Gav Wood
e63aba73c5
Remove "unknown" from version string.
2016-02-22 09:04:44 +01:00
debris
155404bf92
Merge branch 'master' of github.com:ethcore/parity into jsonrpc2
2016-02-22 08:50:03 +01:00
debris
8db8e5b5f8
unit tests for reset chain head
2016-02-22 08:46:47 +01:00
Gav Wood
aedc65dbbf
Merge branch 'master' of github.com:ethcore/parity
2016-02-21 21:46:17 +01:00
Gav Wood
fbee46d69d
Fix netstats.
2016-02-21 21:45:56 +01:00
Nikolay Volf
a8f4d24dad
Merge branch 'master' into geth-import
2016-02-21 23:44:52 +03:00
Nikolay Volf
8bc0b7c77c
import pub
2016-02-21 23:44:12 +03:00
Gav Wood
0477d245bc
Merge pull request #486 from ethcore/gitversion
...
Include git commit date & hash.
2016-02-21 21:41:20 +01:00
Nikolay Volf
5b05cbb128
extended keys with accont meta
2016-02-21 23:23:46 +03:00
Gav Wood
0c832853b6
Avoid the dep = "*"
2016-02-21 21:22:11 +01:00
Gav Wood
ea187253a2
Include git commit date & hash.
2016-02-21 21:14:09 +01:00
Gav Wood
22ff5bb7d7
Merge pull request #485 from ethcore/properversion
...
Use proper version string.
2016-02-21 20:23:37 +01:00
Gav Wood
6fa2284c68
Remove unneeded deps.
2016-02-21 20:03:01 +01:00
Gav Wood
63bbd0ccd8
Use proper version string.
2016-02-21 20:00:45 +01:00
Gav Wood
75129613c5
Merge pull request #480 from ethcore/network
...
Networking fixes
2016-02-21 18:57:10 +01:00
arkpar
67cd29f4e1
Whitespaces
2016-02-21 16:58:56 +01:00
arkpar
91276ad82e
Added comments
2016-02-21 16:52:25 +01:00
Gav Wood
8b50fa658f
Fix typo in deps script.
2016-02-21 16:32:11 +01:00
Gav Wood
8b692e6d9d
Merge pull request #484 from ethcore/discovery
...
Fix potential deadlock on node table update
2016-02-21 15:11:13 +01:00
arkpar
fe84eb4ff6
Fix locking
2016-02-21 14:04:10 +01:00
Nikolay Volf
bcc4ca48ab
to new namespace
2016-02-21 15:19:08 +03:00
Nikolay Volf
a6316b1e20
Merge branch 'master' into db
2016-02-21 15:05:36 +03:00
Peter
ce81a24bfd
Tests for issue #161
...
Implementations of get_cache_size and get_data_size in Rust (issue #161 )
Removed sizes module, containing replaced data tables
Fixed whitespace issues after code review
2016-02-21 02:11:09 +00:00
arkpar
93d259e8cb
Merge branch 'master' of github.com:ethcore/parity into network
2016-02-21 00:11:32 +01:00
Gav Wood
6448d073a7
Merge pull request #481 from ethcore/warnings
...
Squash more warnings
2016-02-20 22:00:08 +01:00
Gav Wood
26ad918e03
Merge pull request #477 from ethcore/temp-path
...
dev/test/build tools to separate crate
2016-02-20 21:59:59 +01:00
arkpar
7bc2853de9
Removed TODO
2016-02-20 15:14:54 +01:00
