Commit Graph

556 Commits

Author SHA1 Message Date
arkpar 570d2c21d3 Merge branch 'sync' into beta 2016-03-15 19:44:15 +01:00
arkpar 1964ed7eb3 Merge remote-tracking branch 'origin/sync' into beta 2016-03-15 12:56:17 +01:00
Gav Wood b0f233a06c Merge pull request #737 from ethcore/sync
Sync fixed again
2016-03-15 12:13:44 +01:00
arkpar b9b0444662 Trace sending to unconfirmed session 2016-03-15 11:20:19 +01:00
Tomasz Drwięga d5ec1775ef Merge branch 'master' into uint_opt
Conflicts:
	test.sh
	util/bigint/src/uint.rs
2016-03-14 23:45:16 +01:00
arkpar 78821bb935 Merge remote-tracking branch 'origin/unclesminingfix' into beta 2016-03-14 18:56:27 +01:00
arkpar 8eeda2b1a3 Fixed handshake leak 2016-03-14 15:50:03 +01:00
Arkadiy Paronyan 0087568c16 Merge pull request #712 from ethcore/beta-version
Version 1.0 in beta
2016-03-14 14:56:44 +01:00
arkpar c8b65c769b Fixed handshake leak 2016-03-14 13:54:06 +01:00
Arkadiy Paronyan 42499addc8 Merge pull request #714 from ethcore/master-version
Version 1.1 in master
2016-03-14 13:40:52 +01:00
Nikolay Volf 4ac9807bc1 fixing tests for beta 2016-03-14 11:12:15 +01:00
arkpar 1c26ffa208 Merge branch 'network' into beta 2016-03-14 11:11:36 +01:00
Gav Wood 44223f3658 Merge pull request #720 from ethcore/network
Silence UDP warnings
2016-03-14 11:10:12 +01:00
Nikolay Volf 3eb08b0d61 fix tests and deuncommented 2016-03-14 10:53:37 +01:00
Nikolay Volf 829ed4d0a6 commented empty slice/vec comparison 2016-03-14 10:47:22 +01:00
arkpar b327e79b42 Merge remote-tracking branch 'origin/fixing_warnings' into beta 2016-03-14 10:28:38 +01:00
Arkadiy Paronyan a1fe1a6136 Merge pull request #704 from ethcore/fixing_warnings
Fixing warnings
2016-03-14 10:28:28 +01:00
arkpar d3c1b5455b Silenced UDP warnings 2016-03-14 10:25:04 +01:00
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
arkpar 320581a3e4 Merge branch 'fix-discovery' into beta 2016-03-14 01:33:41 +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 f77b4119da Version 1.0 2016-03-14 01:01:15 +01:00
arkpar 9e7ff2c00e Version 1.1 2016-03-14 01:00:17 +01:00
Gav Wood e792998d0a Merge remote-tracking branch 'origin/master' into fixing_warnings 2016-03-14 01:00:12 +01:00
Gav Wood fe722419e7 Merge branch 'master' into fixing_warnings 2016-03-14 00:57:49 +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
Tomasz Drwięga fd834084f9 unknonw lint 2016-03-13 21:39:23 +01:00
Gav Wood 1be92ea8ef Fixes and traces for refcountdb. 2016-03-13 21:21:30 +01:00
Tomasz Drwięga 13df958f4a Fixing warnings 2016-03-13 21:14:00 +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