Tomasz Drwięga
2bd0c5ebcb
Unwrap or default
2016-06-26 22:48:09 +02:00
Tomasz Drwięga
6bbaced3cd
Merge branch 'master' into miner-no-default
...
Conflicts:
ethcore/src/miner/miner.rs
parity/main.rs
2016-06-26 22:44:34 +02:00
Gav Wood
516b015325
Don't mine without --author ( #1436 )
...
Requires --author to be set before mining is allowed to happen.
2016-06-26 22:02:17 +02:00
Gav Wood
2574d000a3
Revert the rescuedao extradata.
2016-06-25 14:35:43 +02:00
Arkadiy Paronyan
313d9048bf
Merge pull request #1417 from ethcore/ui
...
Signer enabled by default for UI
2016-06-24 16:31:14 +02:00
Arkadiy Paronyan
29e2ba91a7
Merge pull request #1415 from ethcore/removebadpruningoptions
...
Remove experimental pruning options.
2016-06-24 16:16:48 +02:00
Gav Wood
bf11fb6633
Fix up selection.
2016-06-24 16:12:15 +02:00
arkpar
3e7edb2665
More cases
2016-06-24 14:29:15 +02:00
arkpar
568dc90769
Signer enabled by default for UI
2016-06-24 14:20:39 +02:00
Arkadiy Paronyan
b9649c0e78
Merge pull request #1414 from ethcore/uifix
...
Fixing interface and port for parity ui
2016-06-24 14:08:06 +02:00
Arkadiy Paronyan
4e0d6f735a
Merge pull request #1405 from ethcore/sfedgecase
...
Configurable gas limit cap.
2016-06-24 13:36:40 +02:00
Gav Wood
44d6e1f443
Remove experimental pruning options.
2016-06-24 13:32:43 +02:00
Tomasz Drwięga
653a368783
Changing macos impl
2016-06-24 12:30:54 +02:00
Tomasz Drwięga
566bb030ec
Fixing detecting if dapps are off
2016-06-24 12:21:21 +02:00
Tomasz Drwięga
23732fa516
Fixing interface and port for parity ui
2016-06-24 12:10:36 +02:00
Tomasz Drwięga
6edb981bfa
Merge branch 'master' into miner-no-default
...
Conflicts:
sync/src/lib.rs
2016-06-23 21:18:43 +02:00
Arkadiy Paronyan
416781a8d4
Tweaked cli options ( #1407 )
2016-06-23 18:57:42 +02:00
Gav Wood
bca9e1f31a
Merge branch 'master' into sfedgecase
2016-06-23 14:43:42 +02:00
Gav Wood
8fcec20398
Gas limit ceiling option.
2016-06-23 14:29:16 +02:00
Tomasz Drwięga
5bf906625b
Fixing warnings
2016-06-23 12:19:38 +02:00
Robert Habermeier
9ac30ad409
Merge pull request #1400 from ethcore/ipc-rpc-api-fix
...
rpc api by default for ipc
2016-06-23 10:32:25 +02:00
Gav Wood
8a867262ad
Build fix.
2016-06-23 02:42:56 +02:00
Tomasz Drwięga
9a1e1b7c89
Signer with Unlocked Account ( #1398 )
2016-06-22 21:32:26 +02:00
Gav Wood
e346cbc7f9
Make --signer default. ( #1392 )
2016-06-22 21:32:17 +02:00
NikVolf
cc7038383a
rpc api by default for ipc
2016-06-22 20:51:36 +03:00
debris
927ffa7e9c
Merge branch 'master' into presale_wallet
2016-06-22 16:14:02 +02:00
Robert Habermeier
f947a9cb71
Optional gas price in transactions come from statistics ( #1388 )
...
* use gas price statistics for default transaction gas price
* create new signing queue client properly
* replace one more usage of sensible_gas_price
* fill_optional_fields as a free function
* keep test client alive
2016-06-22 15:55:07 +02:00
Gav Wood
353b9e91e6
Update SF to latest spec ( #1386 )
...
* Introduce whitelist for softfork
* Use extradata for fork id.
* Fix condition.
2016-06-22 15:37:25 +02:00
Arkadiy Paronyan
7c94b1495e
Merge pull request #1329 from ethcore/softforktrigger
...
Install trigger for DAO-rescue soft-fork.
2016-06-21 22:25:24 +02:00
debris
bbe5cd001a
presale wallet cli for parity
2016-06-21 17:50:22 +02:00
arkpar
3aaf938add
Fixed build
2016-06-21 15:24:17 +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
Tomasz Drwięga
7cfb9a2b0b
RPC for number of unconfirmed transactions
2016-06-21 14:57:35 +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
Gav Wood
70db48961a
Fix up flag struct.
2016-06-21 13:18:07 +02:00
Gav Wood
d2057a3f72
Make names slightly less contentious.
2016-06-21 11:30:30 +02:00
debris
7aa73f300a
fixed migration of empty pruning dir
2016-06-20 22:35:59 +02:00
Arkadiy Paronyan
855ae91c4c
Merge pull request #1354 from ethcore/warnings-fix
...
Fixing clippy warnings
2016-06-20 21:21:51 +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
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
debris
7b9db37d84
removed unnecessary logs
2016-06-20 16:29:04 +02:00
Tomasz Drwięga
da7b30628b
Fixing warnings
2016-06-20 15:20:55 +02:00
Robert Habermeier
7a6fa97d98
Revert "Revert "Reserved peers, reserved-only flag""
2016-06-20 14:13:33 +02:00
Robert Habermeier
3d3041d418
Revert "Reserved peers, reserved-only flag"
2016-06-20 14:09:41 +02:00
Marek Kotewicz
a6713467a7
Merge pull request #1347 from rphmeier/reserved-peers
...
Reserved peers, reserved-only flag
2016-06-20 14:03:47 +02:00
Nikolay Volf
deb20c6249
fix docopt
2016-06-20 14:02:09 +03:00
Arkadiy Paronyan
a4b35180d1
Merge pull request #1334 from ethcore/givetoken
...
Provide a signer UI token by default.
2016-06-20 12:53:42 +02:00
Robert Habermeier
8d61c0298c
indentation fix
...
[ci skip]
2016-06-20 12:48:00 +02:00
Nikolay Volf
7e452ab2e0
configurable cache size
2016-06-20 13:42:04 +03:00