grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,593 Commits 1 Branch 329 Tags 59 MiB
9f4bfd9e7a
Commit Graph

748 Commits

Author SHA1 Message Date
Tomasz Drwięga
c6dc6c0c41 One more warning 2016-03-12 10:41:35 +01:00
Tomasz Drwięga
d0f7555348 Merge branch 'master' into updating_clippy 
Conflicts:
	util/src/journaldb/archivedb.rs
 2016-03-12 10:40:22 +01:00
Tomasz Drwięga
4b6e1dd4d2 Fixing warnings 2016-03-12 10:25:51 +01:00
Tomasz Drwięga
3ea52c2324 Merge branch 'master' into ethminer_crate 
Conflicts:
	parity/main.rs
 2016-03-12 10:22:43 +01:00
Tomasz Drwięga
e10457d235 Bumping clippy 2016-03-12 10:06:50 +01:00
Gav Wood
88e23fcb9a Merge pull request #634 from ethcore/jdb_option2 
JournalDB with in-memory overlay (option2)
 2016-03-12 10:01:17 +01:00
Gav Wood
874393ba06 Fix tests, 2016-03-12 09:57:57 +01:00
Gav Wood
e6a273f3a7 Fix tests. 2016-03-12 09:53:54 +01:00
Gav Wood
12e1abdfb7 Port fixes to new infrastrtcutre. 2016-03-12 09:51:17 +01:00
Tomasz Drwięga
aebc91d96f Merge branch 'master' into ethminer_crate 
Conflicts:
	Cargo.toml
	rpc/Cargo.toml
	sync/Cargo.toml
 2016-03-12 09:50:18 +01:00
Tomasz Drwięga
7cfe1d258b Adding more detailed logging 2016-03-11 23:49:32 +01:00
Arkadiy Paronyan
1031ce641d Merge pull request #682 from ethcore/additional_sstore_test 
additional (failing) SecretStore test
 2016-03-11 22:45:43 +01:00
arkpar
896ba57555 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-11 22:43:59 +01:00
Nikolay Volf
b1327a045f fixed new account generation 2016-03-11 22:47:12 +04:00
debris
90e20cbcad additional (failing) sstore test 2016-03-11 20:08:01 +01:00
Tomasz Drwięga
c3a79c1478 Merge branch 'master' into ethminer_crate 
Conflicts:
	ethcore/src/client/client.rs
	parity/main.rs
	sync/src/chain.rs
	sync/src/lib.rs
 2016-03-11 19:22:40 +01:00
Tomasz Drwięga
f724cab92d Merge branch 'master' into updating_clippy 
Conflicts:
	ethcore/src/lib.rs
	sync/src/chain.rs
	sync/src/lib.rs
	util/src/keys/store.rs
	util/src/lib.rs
 2016-03-11 19:17:09 +01:00
Nikolay Volf
1e40997ff7 state query for archive jdb 2016-03-11 22:15:56 +04:00
Nikolay Volf
87fb0b31eb Merge branch 'master' into reorgjdb 2016-03-11 20:05:41 +04:00
Nikolay Volf
03a4f9e268 Merge pull request #673 from ethcore/boxjdb 
JournalDB -> Box<JournalDB>, and it's a trait.
 2016-03-11 20:03:39 +03:00
Tomasz Drwięga
9f19d2993c Merge branch 'master' into ethminer_crate 
Conflicts:
	util/bigint/src/uint.rs
 2016-03-11 16:24:52 +01:00
Tomasz Drwięga
179569f9f8 Adding std::mem back 2016-03-11 16:01:18 +01:00
Tomasz Drwięga
0dbe6684ad adding std::mem 2016-03-11 15:58:12 +01:00
Nikolay Volf
04af38bb0d fix test compilation 2016-03-11 18:54:28 +04:00
Nikolay Volf
fcc0432856 Merge pull request #675 from ethcore/rpc_unit_tests 
fixed U256 and transaction request deserialization
 2016-03-11 17:25:13 +03:00
Nikolay Volf
8d67316ece Merge branch 'master' into reorgjdb 
Conflicts:
	parity/main.rs
 2016-03-11 17:41:04 +04:00
Gav Wood
38d470f3bc Reorganise command line options into more general engine. 2016-03-11 14:45:19 +01:00
Gav Wood
7e8b6c3660 Merge branch 'boxjdb' into reorgjdb 2016-03-11 14:06:32 +01:00
Gav Wood
b25551be7b Merge pull request #671 from ethcore/clippy_hook 
Removing running clippy by default on nightly.
 2016-03-11 14:03:16 +01:00
Gav Wood
51cfd4b0ea Remove unneeded clone. 2016-03-11 13:58:11 +01:00
debris
ecd33a6093 fixed U256 and transaction request deserialization, added tests for transaction request 2016-03-11 13:54:52 +01:00
Gav Wood
4771fdf0fb Rearrange journaldb infrastructure. 2016-03-11 13:50:39 +01:00
Gav Wood
2a856a13f0 Obvious typo fix. 2016-03-11 13:21:53 +01:00
Gav Wood
d71c5d4c17 Place Sync/Send in trait. 2016-03-11 13:19:10 +01:00
Gav Wood
e461916f5a Merge remote-tracking branch 'origin/master' into boxjdb 2016-03-11 12:56:33 +01:00
Gav Wood
756f964130 JournalDB -> Box<JournalDB>, and it's a trait. 2016-03-11 12:54:48 +01:00
arkpar
8f54c24e47 Merged changes from jdb_option1, keep LATEST_ERA from decreasing 2016-03-11 11:52:11 +01:00
Tomasz Drwięga
d84e008e00 Removing superflous check for nightly 2016-03-11 11:16:49 +01:00
Tomasz Drwięga
8709dd28f8 Fixing clippy warnings 2016-03-11 10:58:51 +01:00
Tomasz Drwięga
3a4a7ac822 Bumping clippy version 2016-03-11 10:35:26 +01:00
arkpar
06a3abd01e Removed unused return type 2016-03-10 21:15:43 +01:00
arkpar
8785bd37e8 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-10 21:06:21 +01:00
Nikolay Volf
a2dea3885b refactoring to AccountService 2016-03-10 23:09:45 +04:00
Nikolay Volf
5571503c22 traitified secret store 2016-03-10 20:18:01 +04:00
Gav Wood
1a28e9297c Merge pull request #655 from ethcore/io 
Stop workers before stopping event loop
 2016-03-10 12:53:00 +01:00
arkpar
ff12b53ba6 Stop workers before stopping event loop 2016-03-10 10:40:16 +01:00
Nikolay Volf
0f056f3abb Merge branch 'master' into clippy-dev 
Conflicts:
	Cargo.toml
 2016-03-10 02:45:53 +04:00
arkpar
c302fa9a4e Style 2016-03-09 18:37:44 +01:00
Nikolay Volf
6ad0ba8fe2 basic commands 2016-03-09 17:11:15 +04:00
Tomasz Drwięga
79d2beb42a Same bug in full_mul 2016-03-09 11:50:35 +01:00
Tomasz Drwięga
9c714688cd Merge branch 'uint_opt' of github.com:ethcore/parity into uint_opt 2016-03-09 11:32:39 +01:00
Tomasz Drwięga
b3fc16ed9a Fixing bug in multiplication implementation 2016-03-09 11:32:23 +01:00
Tomasz Drwięga
389779d86c Updating benchmarks to avoid inlining/optimizing 2016-03-09 00:05:47 +01:00
arkpar
ca7d3b91d0 Merge branch 'master' of github.com:ethcore/parity into jdb_option2 2016-03-08 18:35:25 +01:00
Tomasz Drwięga
c47209e9bf Using better subtraction when optimizations are enabled 2016-03-08 12:09:04 +01:00
Tomasz Drwięga
9ae2341ba9 Couple of more aggresive optimizations 2016-03-08 10:05:46 +01:00
Tomasz Drwięga
17b2d2a2d7 Implementing mul and full_mul 2016-03-08 01:20:16 +01:00
Tomasz Drwięga
76865694ce Subtraction optimization 2016-03-07 19:03:29 +01:00
Tomasz Drwięga
c5840be1cb Small improvements 2016-03-07 18:36:17 +01:00
Tomasz Drwięga
e7be3c5378 Simplifing mul_u32 and add carry 2016-03-07 17:09:19 +01:00
Tomasz Drwięga
cc0adf5442 Optimizing and simplifying add and shl 2016-03-07 17:06:08 +01:00
Tomasz Drwięga
4717be07d6 Optimizing mul_u32 2016-03-07 16:45:50 +01:00
Tomasz Drwięga
0fd52176dc Fixing tests in bigint and util 2016-03-07 16:28:51 +01:00
Tomasz Drwięga
b61c0397bc removing unused variable 2016-03-07 14:36:38 +01:00
Tomasz Drwięga
69db469d39 Merge branch 'master' into clippy-dev 
Conflicts:
	util/src/journaldb.rs
 2016-03-07 14:35:42 +01:00
Tomasz Drwięga
cbc2c0cf0c Fixing clippy warnings. When building on nightly it is required to enable clippy 2016-03-07 14:34:17 +01:00
Gav Wood
72016196cd Remove println!s. 2016-03-07 10:56:39 +01:00
Gav Wood
318e7e9e04 Merge pull request #613 from ethcore/jdb_option1 
JournalDB option 1 fix
 2016-03-07 09:38:50 +01:00
Gav Wood
4d1effb008 Fix tests. 2016-03-07 09:10:02 +01:00
Gav Wood
73207c2355 Revert accidental beta regressions. 2016-03-07 08:01:14 +01:00
Gav Wood
fd87633db6 Remove superfluous LATEST_KEY write. 2016-03-07 07:57:50 +01:00
arkpar
744c4c7d8b JournalDB documentation 2016-03-07 07:06:55 +01:00
Gav Wood
0980c7130a Fix replay_keys 
Counters should never have an entry with zero value.
 2016-03-07 06:58:43 +01:00
Gav Wood
4230fdfffe More veriosning fixups. 2016-03-06 22:43:21 +01:00
Gav Wood
bc2fb14b5d Add memory usage reports. 
Update to be similar to master.
 2016-03-06 22:39:04 +01:00
Gav Wood
bfd882c7e0 Fix warnings. 2016-03-06 22:05:12 +01:00
Gav Wood
51c95d4d67 Implement option 1. 2016-03-06 21:57:55 +01:00
arkpar
d77d9ad9d8 JournalDB with history overlay 2016-03-06 19:57:00 +01:00
arkpar
003d1fd0cc Network tracing improvements 2016-03-05 23:32:38 +01:00
Nikolay Volf
cfbaa2d6e9 fixed namespaces 2016-03-05 14:25:46 +03:00
Nikolay Volf
1d04a7b8f9 changing warning to trace 2016-03-05 13:16:09 +03:00
arkpar
a4640beb2c Typo 2016-03-05 00:00:43 +01:00
arkpar
2d6738fcde Additional logging and assert 2016-03-04 23:53:57 +01:00
Gav Wood
8ed632eb96 Merge pull request #592 from ethcore/network 
Fixed potential deadlock on startup
 2016-03-04 23:51:56 +01:00
Gav Wood
e11b74e8d2 Merge pull request #589 from ethcore/disablejournaldb 
JournalDB can now operate in "archive" mode
 2016-03-04 23:51:21 +01:00
Gav Wood
559e01ea84 Review remarks resolved. 2016-03-04 22:54:59 +01:00
arkpar
182aec2f94 Fixed potential deadlock on startup 2016-03-04 22:01:36 +01:00
Gav Wood
ba67b67ff3 JournalDB can now operate in "archive" mode. 2016-03-04 20:19:36 +01:00
Nikolay Volf
2e3fb103ab extended secret store operations 2016-03-04 20:08:42 +03:00
Nikolay Volf
d59972a9ac deserialization for uint generic 2016-03-04 20:07:23 +03:00
Nikolay Volf
ae51d99fb8 [ci skip] trailing commas 2016-03-04 16:40:17 +03:00
Nikolay Volf
0d01099f44 moving unlock logics to secret-store itself 2016-03-04 16:23:00 +03:00
Nikolay Volf
e17b2a4db8 replacing unsafe cell with rwlock 2016-03-04 14:48:05 +03:00
Gav Wood
1a7ef8cc85 Merge pull request #560 from ethcore/clippy_warnings 
Fixing clippy warnings = small refactoring of `request_blocks`
 2016-03-02 19:06:45 +01:00
Gav Wood
f5de0187e7 Merge remote-tracking branch 'origin/master' into clippy_warnings 2016-03-02 13:40:35 +01:00
arkpar
041cfda80b Improved journaldb logging 2016-03-02 13:21:33 +01:00
Gav Wood
931c293426 Merge pull request #567 from ethcore/fix-kcov 
Fix coverage test run
 2016-03-02 13:01:14 +01:00
Gav Wood
162300a4a6 Merge pull request #547 from ethcore/mining 
Mining
 2016-03-02 13:00:22 +01:00
Marek Kotewicz
c9bb7ea0f4 Merge pull request #565 from ethcore/uint-warnings 
fix uint warnings
 2016-03-02 12:32:01 +01:00
Nikolay Volf
771fbcbd27 remove redundant modification 2016-03-02 13:02:33 +03:00
Nikolay Volf
5dfc3d2849 resolving path at runtime 2016-03-02 13:01:38 +03:00
Nikolay Volf
34b812696b remove unused imports 2016-03-02 08:49:48 +03:00
Gav Wood
d55aa54412 Merge branch 'master' into mining 2016-03-02 00:59:39 +01:00
Gav Wood
0082d12ea9 Merge pull request #544 from ethcore/uint-refact 
uint to separate crate
 2016-03-02 00:59:03 +01:00
Gav Wood
30c6820437 Refactor and cleanup. 2016-03-02 00:52:18 +01:00
Tomasz Drwięga
30e7ac8d6d Fixing trivial warnings 2016-03-01 22:05:50 +01:00
Tomusdrw
aab274d3ef Changing RefCell to Cell in transaction. Implementing Copy on Uints. 2016-03-01 21:29:22 +01:00
Gav Wood
140711dd8a Fixups from review. 
Reduce size of default extra-data.
Introduce find_uncle_headers.
 2016-03-01 19:59:12 +01:00
Gav Wood
f705f6957a Merge branch 'master' into mining 2016-03-01 16:59:39 +01:00
Gav Wood
48df869202 --author and --extra-data options. Fixed null parent-hash. 2016-03-01 16:58:14 +01:00
Nikolay Volf
be4cfa83b3 Merge pull request #545 from ethcore/table 
Sparse Table Implementation (Row, Col) -> Val
 2016-03-01 15:01:35 +03:00
Tomasz Drwięga
816e549d4c Changing implementation of is_empty to something more efficient 2016-03-01 00:40:55 +01:00
Tomasz Drwięga
ed6a35f618 More idiomatic implementations 2016-03-01 00:00:52 +01:00
Tomasz Drwięga
2f3b0c9d1c Removing get_ prefix 2016-02-29 23:57:02 +01:00
Nikolay Volf
82a528961b remove line 2016-03-01 01:13:00 +03:00
Tomasz Drwięga
212aac42bd Removing clippy warnings 2016-02-29 23:09:51 +01:00
Tomasz Drwięga
f2fdb8b69b Table tests 2016-02-29 22:56:56 +01:00
Nikolay Volf
16038d9555 hash&uint -> numbers 2016-03-01 00:23:49 +03:00
Nikolay Volf
d0125f3ff5 uint to separated crate 2016-03-01 00:21:15 +03:00
Tomusdrw
4bf77c03f5 Moving Table to utils. Fixing couple of small things 2016-02-29 22:16:28 +01:00
Gav Wood
ffc5c2ea7b eth_getwork implemented. 2016-02-29 19:30:13 +01:00
Gav Wood
5869dc8273 Merge pull request #539 from ethcore/bigint-u512mul 
u256 full multiplication
 2016-02-29 19:05:03 +01:00
Nikolay Volf
b30f066651 tabified 2016-02-29 19:15:13 +03:00
Nikolay Volf
1a4e95a9dc u256*u256->u512 2016-02-29 18:57:46 +03:00
Gav Wood
72f4dfdd7a Merge pull request #534 from ethcore/bigint-autoinclude 
changing x64 asm config
 2016-02-29 15:16:30 +01:00
Nikolay Volf
06623333d9 fix tabs 2016-02-29 15:23:43 +03:00
Nikolay Volf
e0c158c12f removed space 2016-02-29 14:40:59 +03:00
Nikolay Volf
9b9e054dc3 changing x64 asm config 2016-02-29 14:29:51 +03:00
Gav Wood
b1fc9bb342 Merge pull request #528 from ethcore/bigint-opt 
Multiplication issue + very exhaustive tests for it
 2016-02-27 18:27:15 +01:00
Gav Wood
22a2de971b Merge pull request #498 from ethcore/eip8 
EIP-8
 2016-02-27 17:49:11 +01:00
Nikolay Volf
afbf41c48c Merge branch 'master' into bigint-opt 
Conflicts:
	util/src/uint.rs
 2016-02-27 19:17:51 +03:00
Nikolay Volf
6a0e9c5ed0 tabified 2016-02-27 18:55:07 +03:00
Gav Wood
734adf0214 Merge pull request #527 from ethcore/determinatetests 
Make "random" trie tests fully deterministic.
 2016-02-27 16:50:56 +01:00
Nikolay Volf
019638628c removed duplicates 2016-02-27 18:45:19 +03:00
arkpar
4bdd5267b0 Ack size test 2016-02-27 16:44:47 +01:00
Nikolay Volf
dc604c21b5 most complete carry test ever 2016-02-27 18:43:38 +03:00
arkpar
e6bab014d1 Fixed outgoing ack size 2016-02-27 16:40:22 +01:00
Gav Wood
ec8c1cb5f9 Make "random" trie tests fully determinate. 2016-02-27 15:49:44 +01:00
Gav Wood
faa6347896 Update handshake.rs 2016-02-27 15:07:21 +01:00
Gav Wood
213bfc4417 Update handshake.rs 2016-02-27 15:05:13 +01:00
Gav Wood
b2dd6ded1d Update discovery.rs 2016-02-27 15:02:05 +01:00
debris
11de5b4923 udpated serde to version 0.7.0 2016-02-27 13:14:58 +01:00
Nikolay Volf
e3c8c99583 finally caught mul bug 2016-02-27 15:02:02 +03:00
Gav Wood
07b9f9f6f3 Merge pull request #521 from ethcore/bigint-u512-opt 
U512 add/sub optimize
 2016-02-26 23:46:47 +01:00
Gav Wood
a211520d19 Merge pull request #509 from ethcore/geth-import-no-utility-crate 
Account management + geth keystore import (no utility crate added)
 2016-02-26 23:13:20 +01:00
Gav Wood
52faf8164d Update store.rs 2016-02-26 21:38:05 +01:00
Nikolay Volf
98a75d06d1 benches 2016-02-26 23:37:13 +03:00
Gav Wood
8bd585b2b9 Merge pull request #505 from ethcore/network 
Delayed UPnP initialization
 2016-02-26 21:33:29 +01:00
Nikolay Volf
9585138f20 add/sub 512 2016-02-26 23:24:04 +03:00
Gav Wood
a51ba5ca33 Merge pull request #515 from ethcore/bigint-opt 
optimization of U256
 2016-02-26 17:25:18 +01:00
Nikolay Volf
3750a8964c removed redundant clones 2016-02-26 17:48:50 +03:00
Nikolay Volf
5013c4d1f1 naughty overflow bug fixed 2016-02-26 16:50:12 +03:00
arkpar
34bc02af1e Merge branch 'master' of github.com:ethcore/parity into network 2016-02-26 14:23:10 +01:00
Nikolay Volf
023c623650 mul overflow multipart test 2016-02-26 16:19:55 +03:00
Nikolay Volf
3858a2011f [ci skip] mul multipart tests 2016-02-26 16:12:47 +03:00
Nikolay Volf
228e3fefe0 [ci skip] multipart sub test 2016-02-26 16:03:04 +03:00
Nikolay Volf
e95538f3ec [ci skip] style fixes, multipart add test 2016-02-26 15:56:55 +03:00
arkpar
9920dcea17 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-26 13:16:22 +01:00
Gav Wood
7a706fa0d2 Merge pull request #418 from ethcore/jsonrpc2 
bloomfilter
 2016-02-26 13:08:41 +01:00
Nikolay Volf
f29417eea9 allow dead code for macros expansion 2016-02-26 14:50:55 +03:00
arkpar
c66178e3f7 Fixed a race condition when a connecting peer disconnects immediately 2016-02-26 11:38:06 +01:00
Nikolay Volf
4b0ec64299 random init for benches 2016-02-25 22:48:34 +03:00
Nikolay Volf
e946e2ab18 epic mul overflow bug 2016-02-25 22:27:22 +03:00
Nikolay Volf
600859ed04 [ci skip] flush 2016-02-25 19:58:09 +03:00
Nikolay Volf
2ee4a0c8c6 mistake of ne/jcxz 2016-02-25 18:16:08 +03:00
Nikolay Volf
5d22ad3fc8 counter jump better 2016-02-25 18:10:33 +03:00
Nikolay Volf
864e754074 overflowing_sub in sub 2016-02-25 18:02:08 +03:00
Nikolay Volf
7525ff23cf removed artefact cls/pushf/popf 2016-02-25 17:59:08 +03:00
Nikolay Volf
fb5779a00e specific feature for asm opt 2016-02-25 16:55:03 +03:00
Nikolay Volf
5467b06c4f fix bench iter 2016-02-25 16:40:36 +03:00
Nikolay Volf
f17d893f53 fixed mul, fixed register pref 2016-02-25 16:20:57 +03:00
Nikolay Volf
ae76a509dc inline test 2016-02-25 03:10:02 +03:00
Nikolay Volf
da69ea51fe inline 2016-02-25 03:09:33 +03:00
Nikolay Volf
0794049d18 fix naughty macros 2016-02-25 02:05:59 +03:00
Nikolay Volf
ccaa194681 mul, bench showtime 2016-02-25 02:00:34 +03:00
arkpar
5a9bba3fa5 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-24 21:32:21 +01:00
Nikolay Volf
7821505139 sub x64 optimize 2016-02-24 23:08:21 +03:00
Nikolay Volf
476bb85d41 r m/r + setc/xor 2016-02-24 21:36:31 +03:00
Nikolay Volf
dd8652dbf4 u256 to inline assembly opt 2016-02-24 21:17:29 +03:00
debris
ad268d27d7 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-24 10:10:49 +01:00
Nikolay Volf
5bd355e0af removing extra crate 2016-02-24 09:55:09 +03:00
arkpar
8beba717f8 Delayed UPnP initialization 2016-02-23 19:38:06 +01:00
arkpar
492bf7154e Log address 2016-02-23 15:02:08 +01:00
debris
52ed69b619 Merge branch 'master' into jsonrpc2 2016-02-23 14:53:09 +01:00
Tomusdrw
3734959f55 Deriving PartialEq and disabling clippy warning 2016-02-23 11:54:10 +01:00
Tomusdrw
07e704c968 Fixing clippy warnings. Implementing PartialEq for Uints 2016-02-23 11:40:23 +01:00
Tomusdrw
c2952b49b4 Bumping clippy version Fixes #496 2016-02-23 10:47:57 +01:00
arkpar
000d2446b5 EIP8 2016-02-22 23:05:27 +01:00
Nikolay Volf
bceafe9094 fix import statement 2016-02-23 00:05:28 +03:00
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
61a3e687f5 store extra interface 2016-02-22 20:08:16 +03:00
Gav Wood
5917290562 Remove unneeded code, fix minor potential issue with length. 2016-02-22 13:59:25 +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
5e27e1b9aa Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-22 11:08:51 +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
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
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
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
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
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
arkpar
8bd052b986 Fixed warnings 2016-02-20 11:54:12 +01:00
arkpar
b1bfd00875 Zombie connections 2016-02-20 11:47:39 +01:00
arkpar
69df91de68 Deregister handshake properly when converting to session 2016-02-20 01:36:08 +01:00
arkpar
00f2c6e3e4 Merge branch 'master' of github.com:ethcore/parity into db 2016-02-20 00:48:36 +01:00
arkpar
5572d1792d Back to original slab crate 2016-02-19 18:43:55 +01:00
Nikolay Volf
84e7ce2758 Merge branch 'master' into temp-path 
Conflicts:
	util/Cargo.toml
	util/src/lib.rs
 2016-02-19 19:11:24 +03:00
arkpar
ab233a941f Slightly improved tests 2016-02-19 16:34:31 +01:00
Nikolay Volf
ab0fe65f3f unlisting as dev-dependencies 2016-02-19 18:09:31 +03:00
Nikolay Volf
fed90c126e dev/test tools to separate crate 2016-02-19 17:18:20 +03:00
arkpar
beab90c707 Added is_valid_node_url 2016-02-19 14:13:20 +01:00
debris
8113c689fc Merge branch 'master' into jsonrpc2 2016-02-19 14:07:11 +01:00
arkpar
f15275bb5b Merge branch 'master' of github.com:ethcore/parity into db 2016-02-19 13:52:07 +01:00
arkpar
1d60d82698 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:44:57 +01:00
arkpar
d9fec87143 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-19 13:39:43 +01:00
Gav Wood
8747fe2dc9 Merge pull request #449 from ethcore/secret-store-enc 
Secret store (part2 - encrypted key/value svc)
 2016-02-19 13:30:45 +01:00
Gav Wood
d43b23d663 Update directory.rs 2016-02-19 13:30:36 +01:00
Nikolay Volf
63c5a2e58f copy instead of ref-map 2016-02-19 14:52:29 +03:00
debris
ef8055f900 Merge branch 'master' into jsonrpc2 2016-02-19 12:52:16 +01:00
Nikolay Volf
25bae2897b [ci skip] merging master 2016-02-19 14:25:51 +03:00
debris
f50bf528e6 fixed allow warnings in util 2016-02-19 11:57:52 +01:00
Gav Wood
a4846e4aad Update bytes.rs 2016-02-19 11:31:40 +01:00
debris
8831e73d98 ignore panic forwarding tests 2016-02-19 11:05:39 +01:00
debris
bef6d5f2a1 fixed insecure rlp uint conversion, and failing json tests 2016-02-19 10:51:35 +01:00
debris
df3d17789a compiling ethcore on beta 2016-02-19 00:06:06 +01:00
arkpar
af8ba06795 utils compilable in beta 2016-02-18 23:29:41 +01:00
arkpar
68795ea031 Fixed typos 2016-02-18 21:40:17 +01:00
arkpar
99600ba370 DB Test 2016-02-18 21:15:56 +01:00
Gav Wood
8e93989eec Merge branch 'rustup' into rustbeta 2016-02-18 21:09:36 +01:00
Nikolay Volf
8b4278aeaa feature dep for heapsize 2016-02-18 22:06:59 +03:00
Nikolay Volf
198119466b forking heapsize 2016-02-18 19:21:24 +03:00
debris
80f4f422fc updated heapsizeof 2016-02-18 15:17:26 +01:00
debris
ebe8e19cc0 fixed compiling with rustc 1.8.0-nightly (57c357d89 2016-02-16) 2016-02-18 14:36:59 +01:00
arkpar
e99f604133 rocksdb abstraction layer 2016-02-18 03:46:34 +01:00
arkpar
68d606b5f0 rocksdb abstraction layer 2016-02-18 03:46:24 +01:00
Nikolay Volf
fffd93607d just in case check 2016-02-17 23:38:16 +03:00
Nikolay Volf
95c74dbd30 more func 2016-02-17 23:34:55 +03:00
Nikolay Volf
aad49cb19f more functional 2016-02-17 23:25:25 +03:00
debris
ed880b3b58 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-17 15:59:36 +01:00
arkpar
0cfc4cbb34 More tests 2016-02-17 14:07:26 +01:00
arkpar
c9f3f5e544 Tweaked connection limits to be a bit more aggressive 2016-02-17 14:07:11 +01:00
arkpar
eef193e8bd Don't add useless peers to table 2016-02-17 14:06:19 +01:00
Nikolay Volf
ca99679d1d fixed test names 2016-02-17 11:57:13 +03:00
Nikolay Volf
14b02ff26f tests and fixes 2016-02-17 11:48:12 +03:00
arkpar
e4baf37bf8 Fixed adding boot nodes to discovery table; Ping optimization 2016-02-17 02:55:46 +01:00
arkpar
a179722542 Merge branch 'discovery' of github.com:ethcore/parity into discovery 2016-02-17 01:39:27 +01:00
arkpar
39a98cd555 Prevent connection deletion until unregister is called; minor tweaks 2016-02-17 01:39:16 +01:00
Nikolay Volf
0b916e0a51 Merge branch 'master' into discovery 2016-02-17 03:21:41 +03:00
Nikolay Volf
d63f13245f doc typo 2016-02-17 03:17:02 +03:00
Nikolay Volf
4a028f5faf cleanup asserts 2016-02-17 02:49:13 +03:00
Nikolay Volf
63f6ab4e6d resolved with bytes-encodable issue 2016-02-17 02:32:16 +03:00
arkpar
b6ccbdb694 Lower max handshakes to reduce network load 2016-02-16 23:37:24 +01:00
arkpar
7e0dfb41d0 Minor test tweaks and code cleanup 2016-02-16 23:33:32 +01:00
Manish Goregaokar
8802fb2fd8 Make clippy an optional dependency 2016-02-17 02:07:41 +05:30
arkpar
fbe06d3f2f More tests 2016-02-16 21:25:01 +01:00
arkpar
217cbec50e Disconnect test 2016-02-16 19:08:58 +01:00
Nikolay Volf
9895f00e5e warnings, docs, and finding bugs 2016-02-16 20:52:36 +03:00
arkpar
f4fa747cd0 ip_utils tests 2016-02-16 17:55:37 +01:00
arkpar
a4ea0737b2 Fixed some tests 2016-02-16 17:54:34 +01:00
arkpar
d95e971030 Prevent deadlocks 2016-02-16 17:53:31 +01:00
Nikolay Volf
a649d6f131 first vector up 2016-02-16 19:19:32 +03:00
Nikolay Volf
ac0ca94230 Merge branch 'master' into secret-store-enc 2016-02-16 17:02:08 +03:00
Nikolay Volf
feb9b96ce7 version bump, test script for full suite 2016-02-16 13:40:58 +03:00
Tomusdrw
22e2458ce5 Adding rustfmt_skip and fixing couple of places that have troubles after formatting. 2016-02-16 11:01:04 +01:00
Tomusdrw
771bcb5bda Adding formatting script 2016-02-16 10:57:58 +01:00
Nikolay Volf
26e992ad2e encrypting any bytes covertible now via hashmap 2016-02-16 11:30:22 +03:00
arkpar
33e8d749d2 Max handhsakes reached is now a debug warning 2016-02-16 03:05:05 +01:00
arkpar
fa316c21ae Merge branch 'discovery' of github.com:ethcore/parity into discovery 2016-02-16 02:31:53 +01:00
arkpar
58fdfe77d3 Handle pinning and enable_discovery options 2016-02-16 02:31:17 +01:00
arkpar
f771306867 Get public address/UPNP refactoring 2016-02-16 02:05:45 +01:00
arkpar
203947388b Get public address/UPNP refactoring 2016-02-16 02:05:36 +01:00
arkpar
681350b03d Merge branch 'discovery' of github.com:ethcore/parity into discovery 2016-02-16 01:36:23 +01:00
arkpar
fb0b5b2e5b Raise fd limit in linux 2016-02-16 00:22:44 +01:00
Nikolay Volf
734652d913 work in progress 2016-02-16 00:56:25 +03:00
arkpar
64913d5009 Additional address filter 2016-02-15 21:43:30 +01:00
debris
9e760e9fb8 Merge branch 'master' of github.com:ethcore/parity into jsonrpc2 2016-02-15 21:39:38 +01:00
arkpar
0bef355494 Removed temp test code 2016-02-15 20:34:05 +01:00
arkpar
a2c0508792 Merge branch 'master' of github.com:ethcore/parity into discovery 2016-02-15 20:30:08 +01:00
Arkadiy Paronyan
482292551b Merge pull request #423 from ethcore/secret-store 
Secret store (part1 - key management)
 2016-02-15 20:29:54 +01:00
arkpar
01a83e6031 Populate discovery from node table 2016-02-15 20:28:27 +01:00
arkpar
4b9c7f7517 Add incoming connection to node table 2016-02-15 19:54:27 +01:00
arkpar
0e1e80477a Save key to a file 2016-02-15 18:36:34 +01:00
Nikolay Volf
017a1adb24 fixing issues and moving 2016-02-15 18:01:52 +03:00
arkpar
4d40991c1a Discovery test 2016-02-15 16:01:45 +01:00