Tomasz Drwięga
fe09d8d291
Merge branch 'master' into txqueue-assert
...
Conflicts:
ethcore/src/miner/transaction_queue.rs
2016-06-21 16:35:18 +02:00
NikVolf
de079ebe31
Merge branch 'master' into rocksdb-flush-limit
2016-06-21 17:32:07 +03:00
NikVolf
9132895d0e
limit flush rate
2016-06-21 17:20:47 +03:00
Arkadiy Paronyan
b2891fcdda
Update sealing on new transactions ( #1365 )
2016-06-21 16:00:34 +02:00
Arkadiy Paronyan
bca4e23df6
Fixed panic on aborted connection ( #1370 )
2016-06-21 15:56:00 +02:00
arkpar
3aaf938add
Fixed build
2016-06-21 15:24:17 +02:00
debris
94a0193047
Merge branch 'master' of github.com:ethcore/parity into presale_wallet
2016-06-21 15:19:31 +02:00
Tomasz Drwięga
a8bc86151e
Merge branch 'master' into txcount-rpc
...
Conflicts:
rpc/src/v1/tests/mocked/ethcore.rs
2016-06-21 15:13:41 +02:00
debris
7136cd7057
improved import wallet test
2016-06-21 15:07:15 +02:00
debris
be03a6acbd
import-wallet option for ethstore executable
2016-06-21 15:04:36 +02:00
Tomasz Drwięga
7cfb9a2b0b
RPC for number of unconfirmed transactions
2016-06-21 14:57:35 +02:00
Marek Kotewicz
57e9ed3f08
importing presale wallet ( #1368 )
...
* importing presale wallet in progress
* PresaleWallet data structure
2016-06-21 14:42:27 +02:00
Gav Wood
840f961dc2
don't bother assigning queue.
2016-06-21 14:34:22 +02:00
Nikolay Volf
c5f6250668
Set default database file size large enough ( #1363 )
...
* make default 100mb file size
* update again
* fix type
* little less extreme file sizes
2016-06-21 13:57:06 +02:00
Robert Habermeier
951512f9c9
Reserved peers rpc API ( #1360 )
...
* reserved peers: lock them, use a hashset, and provide to networkcontext
* adding and removing reserved peer service API
* add NonReservedPeerMode, and setters in host
* setting non reserved mode, restriction accepted connections
* implement RPC apis
* fix deadlock
* fix rpc tests
2016-06-21 13:56:33 +02:00
Robert Habermeier
878298f061
bump jsonrpc-http-server
2016-06-21 13:56:06 +02:00
Tomasz Drwięga
e0b4eab819
Fixing replacing transaction with lower gas_price in one of the edge cases ( #1343 )
2016-06-21 13:55:26 +02:00
debris
a8a731ba11
PresaleWallet data structure
2016-06-21 13:30:32 +02:00
Gav Wood
70db48961a
Fix up flag struct.
2016-06-21 13:18:07 +02:00
debris
c2ffa90478
importing presale wallet in progress
2016-06-21 13:11:32 +02:00
Tomasz Drwięga
3de482a431
Additional assertions for internal state of queue
2016-06-21 12:31:50 +02:00
Robert Habermeier
06ba7e258e
Merge pull request #1362 from ethcore/fix_migration
...
fixed migration of empty pruning dir
2016-06-21 12:21:31 +02:00
Gav Wood
d2057a3f72
Make names slightly less contentious.
2016-06-21 11:30:30 +02:00
arkpar
b667378820
Release lock while pushing transactions
2016-06-21 11:26:43 +02:00
NikVolf
d42f8eac1e
little less extreme file sizes
2016-06-21 12:07:07 +03:00
arkpar
c912bb8c17
Fix lock order
2016-06-20 23:48:47 +02:00
Arkadiy Paronyan
f58e211b11
Merge pull request #1335 from ethcore/tx_perf
...
Transaction processing queue
2016-06-20 23:47:35 +02:00
Arkadiy Paronyan
7e424d2713
Merge pull request #1359 from ethcore/lastnonce-fix
...
Fixing last nonce values in case transaction is replaced
2016-06-20 23:03:09 +02:00
debris
7aa73f300a
fixed migration of empty pruning dir
2016-06-20 22:35:59 +02:00
NikVolf
1f599ac6f9
fix type
2016-06-20 23:01:09 +03:00
NikVolf
f4f842f48e
update again
2016-06-20 22:52:31 +03:00
NikVolf
d874555310
make default 100mb file size
2016-06-20 22:45:24 +03:00
Arkadiy Paronyan
05583c2cd7
Merge pull request #1358 from ethcore/no_docopt_deps
...
docopt is an optional dependency of ethkey and ethstore
2016-06-20 21:37:52 +02:00
Arkadiy Paronyan
855ae91c4c
Merge pull request #1354 from ethcore/warnings-fix
...
Fixing clippy warnings
2016-06-20 21:21:51 +02:00
Arkadiy Paronyan
5705ecf95f
Merge pull request #1357 from ethcore/sync
...
Reduce locking when syncing
2016-06-20 21:21:47 +02:00
Tomasz Drwięga
beedbd5126
Merge pull request #1356 from ethcore/clean_parity_start
...
removed unnecessary logs
2016-06-20 21:15:32 +02:00
Gav Wood
72debeebcf
Update code hash.
2016-06-20 20:47:07 +02:00
Tomasz Drwięga
69c29fce84
Updating parity-dapps ( #1353 )
2016-06-20 18:51:36 +02:00
Marek Kotewicz
71bfda3534
moved keystore tests files from util to ethstore ( #1352 )
2016-06-20 18:51:11 +02:00
arkpar
09b8116cde
TX processing queue
2016-06-20 18:42:50 +02:00
Tomasz Drwięga
8fa9a240cc
Fixing last nonce values in case transaction is replaced
2016-06-20 18:37:59 +02:00
debris
0716eaa036
docopt is an optional dependency of ethkey and ethstore
2016-06-20 17:50:38 +02:00
Arkadiy Paronyan
38b9264de6
Merge pull request #1351 from ethcore/removed_bigint_deps
...
removed redundant bigint deps
2016-06-20 17:36:33 +02:00
Arkadiy Paronyan
5f7bdc028d
Merge pull request #1350 from ethcore/revert-1349-revert-1347-reserved-peers
...
Reopen "reserved peers and reserved-only flag"
2016-06-20 17:29:39 +02:00
Arkadiy Paronyan
8b845e56da
Merge pull request #1348 from ethcore/db-cache-size
...
Configurable rocksdb cache size
2016-06-20 17:29:18 +02:00
arkpar
1ffe0c185c
Reduce locking
2016-06-20 17:28:48 +02:00
debris
7b9db37d84
removed unnecessary logs
2016-06-20 16:29:04 +02:00
Marek Kotewicz
75a38500f1
Merge pull request #1346 from ethcore/txqueue-future
...
Fixing future order and errors when reaching limit.
2016-06-20 15:31:39 +02:00
Marek Kotewicz
e9900be6ea
Merge pull request #1342 from ethcore/txqueue-local-noprio
...
Removing priority on local transactions
2016-06-20 15:31:06 +02:00
Tomasz Drwięga
da7b30628b
Fixing warnings
2016-06-20 15:20:55 +02:00
