Commit Graph

519 Commits

Author SHA1 Message Date
Nikolay Volf
8532f2dc2e removed tests that used fixedhash 2016-03-14 09:44:02 +01:00
Nikolay Volf
b4ba070619 Merge branch 'master' into master-version 2016-03-14 09:40:38 +01:00
Gav Wood
8ad66875e5 Merge pull request #710 from ethcore/fix-discovery
Fixed splitting Neighbours packet
2016-03-14 01:32:13 +01:00
arkpar
9e7ff2c00e Version 1.1 2016-03-14 01:00:17 +01:00
arkpar
615e03542e Use slice.chunks 2016-03-14 00:41:25 +01:00
arkpar
45c3600d5a Fixed splitting Neighbours packet 2016-03-13 23:20:26 +01:00
Gav Wood
97fe4fcab4 Merge pull request #701 from ethcore/sstore-key-exp
management of account expiration & memory
2016-03-13 23:19:49 +01:00
Gav Wood
26f41b711c Bring back batching. 2016-03-13 21:54:06 +01:00
Gav Wood
0ccb9df4f1 Merge remote-tracking branch 'origin/master' into rcdb 2016-03-13 21:43:41 +01:00
Gav Wood
1be92ea8ef Fixes and traces for refcountdb. 2016-03-13 21:21:30 +01:00
Tomasz Drwięga
54ff64c0e0 Merge branch 'master' into merge_ethminer
Conflicts:
	parity/main.rs
2016-03-13 20:42:33 +01:00
Nikolay Volf
c5edf237b2 adding shrink-to-fit 2016-03-13 19:52:37 +01:00
Gav Wood
81291622eb Avoid batches for now. 2016-03-13 19:22:42 +01:00
Gav Wood
706c56f56a Usage of LATEST_ERA fixes for archive and ref-counted DBs. 2016-03-13 18:19:52 +01:00
Gav Wood
5107fc5897 Update options. 2016-03-13 18:09:44 +01:00
Gav Wood
ac655af091 Update overlaydb 2016-03-13 18:07:36 +01:00
Gav Wood
9e912c7c0d Add new file. 2016-03-13 18:07:10 +01:00
Gav Wood
02f43f2e8c Merge branch 'ethminer_crate' 2016-03-13 15:00:47 +01:00
Nikolay Volf
735aa8ca17 Merge branch 'sstore-key-exp' into account-io 2016-03-13 14:46:49 +01:00
Nikolay Volf
89dc6fa9cc io handlers 2016-03-13 14:46:45 +01:00
Gav Wood
4e8092b008 Merge pull request #690 from ethcore/fixjdb
Fix JournalDB era marker
2016-03-13 13:11:12 +01:00
Nikolay Volf
450ae4147f memory and expiration mngmt 2016-03-13 13:03:02 +01:00
arkpar
1131618630 Fixed test 2016-03-13 11:55:48 +01:00
Gav Wood
ead43eecd0 Merge pull request #694 from ethcore/heaviaze-key-tests
mark some key tests as heavy
2016-03-13 11:52:00 +01:00
arkpar
ff51d0fa67 Additional tests 2016-03-13 11:50:09 +01:00
Nikolay Volf
0f21779ec4 make heavy 2016-03-13 11:06:57 +01:00
Marek Kotewicz
70624f816a Merge pull request #693 from ethcore/network
Limit incoming connections
2016-03-13 10:11:42 +01:00
Tomasz Drwięga
dac90992ad Merge branch 'master' into updating_clippy
Conflicts:
	Cargo.lock
	util/src/journaldb/overlayrecentdb.rs
2016-03-13 00:20:31 +01:00
arkpar
361280a9be Limit incoming connections 2016-03-12 19:52:37 +01:00
arkpar
707f67c6b4 Optional last era 2016-03-12 19:19:45 +01:00
arkpar
1ca7c35c19 Fix latest era marker 2016-03-12 17:30:46 +01:00
Arkadiy Paronyan
8ce073ed9a Merge pull request #683 from ethcore/jdb-state-queries
state query for archive jdb
2016-03-12 16:19:00 +01:00
Gav Wood
6c6d919eac Merge branch 'master' into fixjdb1 2016-03-12 12:16:08 +01:00
Gav Wood
b03679e1a6 Fix typos. 2016-03-12 11:22:02 +01:00
Gav Wood
82a8810057 Rename into something that is a little more descriptive. 2016-03-12 11:19:42 +01:00
Gav Wood
d7039b72e2 Update archivedb.rs 2016-03-12 10:48:28 +01:00
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