a2b4997888
Merge pull request #1525 from ethcore/client-api-refact2
...
Client API refactoring - limiting errors to crate-level error types
2016-07-05 12:15:38 +04:00
1aee197d79
Make signer default as long as --unlock isn't used. ( #1524 )
2016-07-03 17:11:31 +01:00
0f7b66f557
fixed compilation & warnings
2016-07-01 22:40:54 +03:00
6ae467252c
Fix no colour on windows. ( #1498 )
2016-06-30 15:49:00 +02:00
93a89049ed
More colour!
2016-06-30 08:20:34 +02:00
92edf7f511
Safe coloured logging.
2016-06-30 08:20:34 +02:00
1667808ecb
More miner options.
...
- Optional limit for the amount of gas transactions may have;
- option to restruct transactions returned/queried to only those
which have been executed.
2016-06-27 18:27:06 +02:00
6c1802e412
Allow configuration of when to reseal blocks.
2016-06-27 17:23:54 +02:00
2bd0c5ebcb
Unwrap or default
2016-06-26 22:48:09 +02:00
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
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
3e7edb2665
More cases
2016-06-24 14:29:15 +02:00
568dc90769
Signer enabled by default for UI
2016-06-24 14:20:39 +02:00
b9649c0e78
Merge pull request #1414 from ethcore/uifix
...
Fixing interface and port for parity ui
2016-06-24 14:08:06 +02:00
4e0d6f735a
Merge pull request #1405 from ethcore/sfedgecase
...
Configurable gas limit cap.
2016-06-24 13:36:40 +02:00
566bb030ec
Fixing detecting if dapps are off
2016-06-24 12:21:21 +02:00
23732fa516
Fixing interface and port for parity ui
2016-06-24 12:10:36 +02:00
6edb981bfa
Merge branch 'master' into miner-no-default
...
Conflicts:
sync/src/lib.rs
2016-06-23 21:18:43 +02:00
416781a8d4
Tweaked cli options ( #1407 )
2016-06-23 18:57:42 +02:00
bca9e1f31a
Merge branch 'master' into sfedgecase
2016-06-23 14:43:42 +02:00
8fcec20398
Gas limit ceiling option.
2016-06-23 14:29:16 +02:00
5bf906625b
Fixing warnings
2016-06-23 12:19:38 +02:00
8a867262ad
Build fix.
2016-06-23 02:42:56 +02:00
9a1e1b7c89
Signer with Unlocked Account ( #1398 )
2016-06-22 21:32:26 +02:00
e346cbc7f9
Make --signer default. ( #1392 )
2016-06-22 21:32:17 +02:00
bbe5cd001a
presale wallet cli for parity
2016-06-21 17:50:22 +02:00
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
855ae91c4c
Merge pull request #1354 from ethcore/warnings-fix
...
Fixing clippy warnings
2016-06-20 21:21:51 +02:00
da7b30628b
Fixing warnings
2016-06-20 15:20:55 +02:00
7a6fa97d98
Revert "Revert "Reserved peers, reserved-only flag""
2016-06-20 14:13:33 +02:00
3d3041d418
Revert "Reserved peers, reserved-only flag"
2016-06-20 14:09:41 +02:00
a6713467a7
Merge pull request #1347 from rphmeier/reserved-peers
...
Reserved peers, reserved-only flag
2016-06-20 14:03:47 +02:00
a4b35180d1
Merge pull request #1334 from ethcore/givetoken
...
Provide a signer UI token by default.
2016-06-20 12:53:42 +02:00
06a3557e3e
reserved_only CLI flag
2016-06-20 12:17:06 +02:00
a2f24a0083
Removing Default from Miner
2016-06-20 10:28:38 +02:00
4b3f23f0ac
Fixed network service dispose
2016-06-20 01:16:15 +02:00
6b074e8fb2
secret store separated from util ( #1304 )
...
* bump rust-crypto
* initial version of account provider utilizing secret store
* update lazy_static to latest version
* AccountProvider accounts method
* new AccountProvider tests in progress
* basic tests for new AccountProvider
* ethcore compiles with new account provider and secret store
* ethcore-rpc build now compiling with new AccountProvider
* most rpc tests passing with new accounts_provider
* fixed basic_authority tests
* fixed eth_transaction_count rpc test
* fixed mocked/eth.rs tests
* fixed personal tests
* fixed personal signer rpc tests
* removed warnings
* parity compiling fine with new sstore
* fixed import direction
* do not unlock temporarily when we have the password
* removed TODO in account import
* display warning on auto account import failure
* fixed compiling of ethstore on windows
* ethstore as a part of parity repo
* added ethkey
2016-06-20 00:10:34 +02:00
ab4561b5bc
fix compilation errors
2016-06-19 21:34:02 +02:00
08522eec37
--geth prevent getTransactionReceipt from using pending. ( #1325 )
...
This mimics the fucntionality of Geth and the current unratified
JSONRPC spec (but not the functionality of eth and the ratified
spec).
2016-06-19 14:51:51 +02:00
46d588dcae
CLI option and colour.
2016-06-19 12:28:24 +02:00
591fa9625d
Merge pull request #1313 from ethcore/net
...
Network start/stop
2016-06-18 11:04:24 +02:00
d6701065ea
Refactor to use a const.
2016-06-18 10:52:50 +02:00
da058d0e86
Fix read-ahead bug.
...
Re-ahead 8 bytes rather than 3 to ensure large blocks import fine.
2016-06-18 10:52:50 +02:00
c340d8a34f
Tests
2016-06-17 18:26:54 +02:00
b38488dd07
Network shutdown
2016-06-17 12:58:28 +02:00
5920a7068f
installer initial, ui option for executable
2016-06-14 17:12:46 +03:00
dbddb6a566
Fixing generating new token while another parity instance is running. ( #1272 )
2016-06-14 12:23:01 +02:00
6b12334136
Windows build ( #1253 )
...
* Networking refactoring
* Fixed typo
* Trace logging
* Updated dependencies for windows build
* Windows fixes
* use mio 0.5
* nix build
* Windows build fix
* style
* removed unused import
* ipc crate version bump
* ipc config for named pipes
* tweaks and fixes
* tweaks and fixes
* final version bump
* Fixed tests
* Disable color output on windows
* Added missing doc
2016-06-13 18:55:24 +02:00
e5e238746b
Bumping sysui & topbar. personal_signerEnabled returns port
2016-06-10 15:39:34 +02:00
b4b883b341
keys import ( #1240 )
...
* pattern importing
* tests for import
* cli options for account import
* [options] for import also
* removed globbing
* removed glob crate refs
2016-06-08 06:17:37 -07:00
f61ee1a5f1
SystemUIs authorization ( #1233 )
...
* Initial implementation of AuthCodeStore for SystemUIs
* SystemUIs authorization
* Renaming SystemUI -> SignerUI
* Fixing clippy warnings
* Lowering time threshold
* Bumping sysui
* Fixing test
2016-06-07 08:21:19 -07:00
bb1b8cc08a
Loading local Dapps from FS. ( #1214 )
...
* apps list to separate module
* Preparing to support serving files from disk
* Serving files from disk
* Using dapps path from CLI
* Adding more docs
2016-06-03 11:51:11 +02:00
6676c6cf7e
Merge branch 'master' into client-refact
2016-06-01 19:42:32 +02:00
99e26b8480
Simple signing queue, confirmation APIs exposed in signer WebSockets. ( #1182 )
...
* Splitting methods requiring signing into separate trait
* Single place where RPC apis are created.
* Separating eth_filter
* Separating eth_signing
* Stubs for Personal Signer methods
* Test for EthSigningQueueClient
* TransactionConfirmation API
* Exposing PersonalSigner API
* Defining ApiSets dependent on context
* Removing types
* Fixing default impl
* Fixing un-mocked tests
* Update signing_queue.rs
[ci skip]
* Removing unused import [ci skip]
2016-06-01 19:37:34 +02:00
c33b1caf21
executable all issues resolved
2016-05-31 21:38:07 +02:00
77cef76518
rpc bindings resolved
2016-05-31 21:31:42 +02:00
d74fc2c285
Merge branch 'master' into signer-rpc
...
Conflicts:
dapps/src/lib.rs
parity/main.rs
parity/signer.rs
signer/Cargo.toml
signer/src/lib.rs
2016-05-28 19:36:57 +02:00
87d0f09a44
Base for Signer Websockets server ( #1158 )
...
* Basic signing queue
* Adding docs
* WebSockets server for signer
* Removing TODO
* Shortening the syntax
* Exposing types from RPC
* Fixing indentation
* Update main.rs
2016-05-28 19:30:31 +02:00
c4e2f65051
Exposing RPC over websockets
2016-05-27 17:55:12 +02:00
b77fdcdd68
WebSockets server for signer
2016-05-27 13:03:00 +02:00
7370776af1
Bloomchain ( #1014 )
...
* use bloomchain crate in blockchain module. remove obsole chainfilter submodule
* update database version to 6.0
* removed redundant line
* simple db migration
* make migration slightly more functional
* bloomchain migration
* migration version is just a single unsigned integer
* updated migration v6
* parity migration
* db migration
* removed hardcoded migration dir
* replace ptr::copy with clone_from_slice, removed potential endianess problem from trace/db.rs
* removed superfluous line
* blockchains log blooms config is not exposed any more
2016-05-26 18:24:51 +02:00
cc1a334ba7
Renaming dapps repos. Updating dapps ( #1142 )
...
* Renaming dapps repos. Updating dapps
* Skipping legacy options for compatibility. Fixing tabs
* Fixing CLI options
2016-05-26 18:21:15 +02:00
a0bc1f9dae
Display progress when importing ( #1136 )
...
* Display progress when importing
* Additional polish.
* Fix strange yielding behaviour.
* Allow colour to be disabled.
Fixed #1135
2016-05-25 09:57:31 +02:00
27380cdadb
Coloured, padding logging. ( #1133 )
...
* Add info message for mined block.
* Coloured, padding logging.
* Remove superfluous logs.
* Use better term colour module.
2016-05-24 20:30:21 +02:00
2969d015ed
Importing ( #1132 )
...
* Basic hex block exporting.
* Export formats and to file.
* First bits.
* Block importing.
* Fix error text.
* Wait for queue to empty before shutting down after import.
2016-05-24 20:29:19 +02:00
78d3dfbfa6
Fix error text.
2016-05-24 13:31:03 +02:00
6c64aec137
Export formats and to file.
2016-05-23 18:42:59 +02:00
564a996620
Basic hex block exporting.
2016-05-23 09:51:36 +02:00
6c6bbe9c57
Merge branch 'master' into miner-spec-refact
...
Conflicts:
ethcore/src/client/client.rs
ethcore/src/client/mod.rs
ethcore/src/client/test_client.rs
miner/src/miner.rs
2016-05-19 03:51:05 +03:00
a950b81ee8
Fixing clippy warnings
2016-05-17 10:32:05 +02:00
994d056922
miner will use separate spec
2016-05-16 19:16:56 +03:00
2b78e511c9
Configurable keys security ( #1080 )
...
* adding options & cli flags
* adding it to the key deriving
* removed duplicated option
2016-05-14 12:30:25 +01:00
0d642f3109
removing unused externs
2016-05-06 16:43:29 +04:00
0d507922ce
Tidy up CLI options and make JSONRPC & webapps on by default. ( #1045 )
...
* Tidy up CLI options and make JSONRPC & webapps on by default.
* Fix test.
2016-05-04 22:44:42 +02:00
ad00bd7bc8
Merge pull request #1044 from ethcore/clippy-warnings
...
Fixing clippy warnings
2016-05-04 18:10:03 +03:00
c449bf5663
JSON-RPC over IPC ( #1039 )
...
* moving namespaces for http/rpc
* cli options for ipc
* jsonrpc exposed fully
* updating json-ipc-server & removing non-standart traces api from defaults
* spelling & format
2016-05-04 15:37:09 +02:00
15a8860e8a
Fixing clippy warnings
2016-05-04 15:22:22 +02:00
ac73b2628a
Basic Authority ( #991 )
...
* Firt commit.
* First non-functional but correct implementation of BasicAuthority.
Still needs:
- Sealing infrastructure.
* Punch a hole to give miner access to key store.
* Fix test built.
* Basic version of synchronous mining.
This will seal a block whenever a new transaction comes through.
To be made better we need a timer which will wait for one second after the
last block before sealing a new one - better still would be to cooperatively
interleave blocks with other sealing nodes.
* Add tests.
* Fix minor issues from repotting.
* Address grumbles.
2016-05-03 17:23:53 +02:00
0595caf50c
Flush password prompt
2016-05-02 16:28:15 +02:00
fdd030d101
Fixing status page displaying homestead ( #1020 )
...
* Fixing status page displaying homestead when running with --testnet switch
* Putting cli parsing logic in single place. Adding tests
2016-04-30 18:58:28 +01:00
f83a8f3ba1
More detailed fatal error reporting ( #1016 )
2016-04-28 20:48:00 +01:00
36104edc63
Merge branch 'master' into rpc-exception-handling
2016-04-25 17:37:55 +02:00
8956d7e02b
Exception handling in RPC & WebApps
2016-04-23 12:29:12 +02:00
8b84b4f128
Merge branch 'master' into rpc-shared-miner
...
Conflicts:
parity/main.rs
2016-04-22 12:16:15 +02:00
0458a3378c
Additional RPC methods for settings
2016-04-21 19:24:10 +02:00
f5c2bea134
Shared instance of ExternalMiner
2016-04-21 17:32:53 +02:00
3e280a3386
Splitting Configuration to separate module
2016-04-21 16:45:07 +02:00
bad735a8e6
Separating
2016-04-21 15:41:25 +02:00
3e4adcb3b6
Splitting informant,io_handler and webapps
2016-04-21 13:57:27 +02:00
09b2d7b3a6
Separating RPC
2016-04-21 13:12:43 +02:00
f2a08d57e4
Merge branch 'master' into rpc-logs
...
Conflicts:
rpc/src/v1/tests/ethcore.rs
rpc/src/v1/traits/ethcore.rs
2016-04-19 19:59:50 +02:00
a21f2a0998
Exposing loggin via RPC
2016-04-19 18:27:12 +02:00
5df817c8e0
Setting limit from CLI
2016-04-18 23:03:41 +02:00
13c25c5d49
Merge branch 'master' into webapps-mio
...
Conflicts:
Cargo.lock
parity/main.rs
2016-04-15 17:14:39 +02:00
38fa25edbe
Merge pull request #960 from ethcore/upgrade-path
...
using db_path directory when upgrading
2016-04-15 16:30:44 +02:00
b441750cc9
Merge pull request #958 from ethcore/ipc-hypervisor
...
IPC hypervisor
2016-04-15 10:31:19 +02:00
222a1bd29b
using db_path directory
2016-04-15 02:49:42 +03:00
9b2f545391
Merge pull request #956 from ethcore/cors-option
...
Changing cors header to be optional
2016-04-14 21:16:57 +02:00
d909bc05c4
Sensible gas limits for eth_sendTransaction ( #953 )
...
* Sensible gas limits for eth_sendTransaction
Fixes #859
* Compile fix.
* Remove !.
2016-04-14 12:01:12 -07:00
dc7e105ef8
Merge branch 'master' into ipc-hypervisor
2016-04-14 21:57:24 +03:00
f81914351d
Rewriting webapps to use hyper-mio branch
2016-04-14 20:38:48 +02:00
5b2d726a02
Changing cors header to be optional
2016-04-14 14:38:07 +02:00
32ca8066e9
Tracing and docs. ( #952 )
2016-04-13 11:26:41 -07:00
405e3e2e7d
initial setup
2016-04-13 19:03:57 +03:00
bdb35cfaed
Merge pull request #927 from ethcore/pruning_auto
...
Pruning auto
2016-04-12 16:00:39 +03:00
283ce13454
Merge pull request #914 from ethcore/upgrades
...
Upgrade logic between versions
2016-04-12 11:30:52 +02:00
fa95419c27
--pruning=auto option.
2016-04-11 18:42:50 -07:00
6e97496b27
Support for --pruning=auto.
2016-04-11 15:51:14 -07:00
3fe21f5931
Ethcore-specific RPC methods ( #923 )
...
* Ethcore-specific rpc methods
* Initializing ethcore-rpc
2016-04-11 12:06:32 -07:00
c48374dbc6
Parameter to allow user to force the sealing mechanism ( #918 )
...
* Allow block sealing mechanism to be forced, even when not mining.
* Fix deadlock in dispatch_transaction. Fix tests.
* Horrible workaround for transaction importing.
* Reduce tracing. Cleanups.
* Remove logging.
* Remove broken code inherited from dodgy implementation.
* pre-query tx queue nonce also if any
* remove outside nonce queries
* remove queue nonces
2016-04-11 11:52:33 -07:00
1d09844950
Merge branch 'master' into upgrades
2016-04-11 21:43:07 +03:00
26e23da4c0
some newver/oldver logics
2016-04-10 17:15:40 +03:00
69add61174
basic upgrade scenario
2016-04-10 16:12:20 +03:00
6ebd5009fc
--unlock is comma-delimited.
2016-04-09 12:58:13 -07:00
373284ca0a
spec loading cleanup ( #858 )
...
* spec loading cleanup in progress
* changed engine field in json spec
* refactored engine params
* polishing spec loading refactor
* fixed compiling json tests
* fixed compiling parity
* removed warnings
* removed commented out code
* fixed failing test
* bringing back removed TODO in spec.
2016-04-09 10:20:35 -07:00
dab54cf2a7
HTTP Basic Authorization for WebApps server.
2016-04-08 16:11:58 +02:00
9bd41761fc
Reverting back to old-hyper version of rpc
2016-04-07 16:31:42 +02:00
b7c790d741
Disabling rpc until we switch to async hyper
2016-04-07 16:22:02 +02:00
bf4ab6daa8
Merge branch 'master' into webapps2
...
Conflicts:
parity/main.rs
2016-04-07 16:13:58 +02:00
4569c25127
Specifying webapp interface
2016-04-07 15:59:45 +02:00
8074fee28c
Use new json RPC server
2016-04-07 14:32:44 +02:00
db2354a252
Merge branch 'fixing-rpc' into webapps2
...
Conflicts:
parity/main.rs
2016-04-07 13:09:58 +02:00
2adeb9fe88
Removing Option from setup_rpc_server method return type
2016-04-07 12:55:06 +02:00
d1e3c633e5
Fixing compilation with rpc feature disabled
2016-04-07 12:50:35 +02:00
91f1f4c174
Changing default setup to be safer for now
2016-04-07 12:20:35 +02:00
1e9e0c32fa
Disabling webapp server by default
2016-04-07 12:15:39 +02:00
da05aa51fe
Adding all APIs to webapp rpc server
2016-04-07 12:12:26 +02:00
ad37b7fd2a
Adding webapps router
2016-04-07 12:10:26 +02:00
5d6ca1498e
CLI options to run webapp server
2016-04-07 11:06:49 +02:00
e3ce5d94e1
Adding webapps crate
2016-04-07 10:49:00 +02:00
f27d88f6ab
More descriptive message when closing
2016-04-06 23:58:23 +02:00
fd03f58eae
Rewriting messages
2016-04-06 19:22:10 +02:00
a52043d5b3
Removing additional thread from JSON-RPC
2016-04-06 19:14:05 +02:00
1f9eb97d0a
Merge branch 'master' into closing
2016-04-06 19:07:56 +02:00
dc91e57c2f
Additional logging and error messages
2016-04-06 19:07:27 +02:00
a8eb34ddb8
Merge pull request #891 from ethcore/issue-882
...
passing key path to all invocations
2016-04-06 15:05:47 +02:00
e6be5016f9
replacing /home/nikky also
2016-04-06 14:21:19 +03:00
8b3e84f7fe
passing key path to all invocations
2016-04-06 14:03:53 +03:00
85da55a537
Fixing warnings
2016-04-06 10:55:40 +02:00
167f61bef0
[ci skip] update misleading cli help msg for author
2016-04-04 04:03:20 +04:00
b606fb68cf
USD-based pricing of gas.
2016-03-28 00:49:35 +02:00
6db02134e9
Merge branch 'master' into unlock-pass
2016-03-27 04:49:02 +03:00
156a2336de
Allow passwords on multiple lines in --password files.
2016-03-27 03:15:41 +02:00
32fd35843f
in cli call
2016-03-27 03:45:43 +03:00
8805d04183
Minor refactor.
2016-03-27 01:41:28 +01:00
53c4ed09a3
Unlock accounts on CLI.
2016-03-27 01:35:42 +01:00
0e026ed11f
Fix author reporting. num_cpus for JSONRPC threads.
2016-03-22 19:12:17 +01:00
7624bcf49e
Increase threads to 4.
2016-03-22 18:43:06 +01:00
05a9c16329
JSONRPC interface defaults to local.
...
Please enter the commit message for your changes. Lines starting
2016-03-20 10:34:34 +01:00
c611566a3e
Listen on all interfaces for JSONRPC by default.
2016-03-20 10:19:21 +01:00
387d0743e6
Allow 0x prefix for --author.
2016-03-19 23:51:24 +01:00
e58ec31e20
Fixing warnings
2016-03-18 10:14:19 +01:00
4e5ebc9457
missing mut
2016-03-14 14:22:18 +01:00
f6e8c03ff6
Merge branch 'master' of github.com:ethcore/parity into titi
2016-03-14 14:18:59 +01:00
5503cd4646
Lock reports to avoid out of order badness.
2016-03-14 12:41:11 +01:00
7320ad077f
Merge remote-tracking branch 'origin/master' into targetgaslimit
2016-03-14 10:54:38 +01:00
d5fa49376e
Merge pull request #713 from ethcore/docoptclean
...
docopts cleanups
2016-03-14 10:26:38 +01:00
f6b7884a1d
Allow configuration of target gas limit.
2016-03-14 02:00:22 +01:00
2d1a837a8b
docopts cleanups.
...
one for @LefterisJP: 80-character line for docopts.
2016-03-14 00:52:31 +01:00
97fe4fcab4
Merge pull request #701 from ethcore/sstore-key-exp
...
management of account expiration & memory
2016-03-13 23:19:49 +01:00
8fd8f687ee
Remove EarlyMerge from user docs.
2016-03-13 23:12:47 +01:00
0ccb9df4f1
Merge remote-tracking branch 'origin/master' into rcdb
2016-03-13 21:43:41 +01:00
54ff64c0e0
Merge branch 'master' into merge_ethminer
...
Conflicts:
parity/main.rs
2016-03-13 20:42:33 +01:00
81291622eb
Avoid batches for now.
2016-03-13 19:22:42 +01:00
5107fc5897
Update options.
2016-03-13 18:09:44 +01:00
08b9cc2c41
Merge changes from #674 into branch.
2016-03-13 15:29:55 +01:00
a4f03100e9
registering timer
2016-03-13 15:11:16 +01:00
02f43f2e8c
Merge branch 'ethminer_crate'
2016-03-13 15:00:47 +01:00
89dc6fa9cc
io handlers
2016-03-13 14:46:45 +01:00
e85a2f3804
Update main.rs
...
[noci]
2016-03-12 19:22:38 +01:00
89986ec0e0
Update main.rs
...
[noci]
2016-03-12 19:19:16 +01:00
19b6c74675
Two more warnings
2016-03-12 13:39:17 +01:00
e1c0177932
Update main.rs
2016-03-12 10:44:48 +01:00
d0f7555348
Merge branch 'master' into updating_clippy
...
Conflicts:
util/src/journaldb/archivedb.rs
2016-03-12 10:40:22 +01:00
4b6e1dd4d2
Fixing warnings
2016-03-12 10:25:51 +01:00
3ea52c2324
Merge branch 'master' into ethminer_crate
...
Conflicts:
parity/main.rs
2016-03-12 10:22:43 +01:00
aebc91d96f
Merge branch 'master' into ethminer_crate
...
Conflicts:
Cargo.toml
rpc/Cargo.toml
sync/Cargo.toml
2016-03-12 09:50:18 +01:00
896ba57555
Merge branch 'master' of github.com:ethcore/parity into jdb_option2
2016-03-11 22:43:59 +01:00
cd835e88fc
Merge pull request #661 from ethcore/rpc_pending_filter
...
RPC Pending Transactions Filter
2016-03-11 19:40:35 +01:00
fadbc61dff
Merge branch 'ethminer_crate' into rpc_pending_filter
...
Conflicts:
miner/src/miner.rs
parity/main.rs
2016-03-11 19:27:09 +01:00
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
08b4488ef3
Merge branch 'master' into personal-rpc-cli
...
Conflicts:
parity/main.rs
2016-03-11 20:54:18 +04:00
36ff65d050
Fixing warnings
2016-03-11 14:53:03 +01:00
197ea7f7d6
Using miner in rpc instead of sync
2016-03-11 14:51:07 +01:00
8d67316ece
Merge branch 'master' into reorgjdb
...
Conflicts:
parity/main.rs
2016-03-11 17:41:04 +04:00
38d470f3bc
Reorganise command line options into more general engine.
2016-03-11 14:45:19 +01:00
03da6c991f
Merge branch 'master' into ethminer_crate
...
Conflicts:
Cargo.lock
Cargo.toml
ethcore/src/client/client.rs
hook.sh
parity/main.rs
rpc/Cargo.toml
rpc/src/v1/impls/eth.rs
sync/Cargo.toml
sync/src/tests/helpers.rs
2016-03-11 14:37:07 +01:00
22d1def894
Merge pull request #666 from ethcore/moregethcli
...
More geth compatibility.
2016-03-11 16:05:27 +03:00
b25551be7b
Merge pull request #671 from ethcore/clippy_hook
...
Removing running clippy by default on nightly.
2016-03-11 14:03:16 +01:00
d3f83ad7be
Merge branch 'master' into personal-rpc-cli
2016-03-11 16:05:22 +04:00
ed0047725c
adding cli extension
2016-03-11 15:49:49 +04:00
2fd036b073
Merge branch 'ethminer_crate' into rpc_pending_filter
...
Conflicts:
rpc/src/v1/helpers/poll_manager.rs
rpc/src/v1/impls/eth.rs
2016-03-11 11:44:44 +01:00
d84e008e00
Removing superflous check for nightly
2016-03-11 11:16:49 +01:00
5b204a5ff5
Merge branch 'master' into ethminer_crate
...
Conflicts:
parity/main.rs
rpc/src/v1/impls/eth.rs
sync/src/lib.rs
2016-03-11 10:31:07 +01:00
d9c462a3d3
Use proper listen address. Tidyups.
2016-03-11 10:05:27 +01:00
4c757997f6
Merge remote-tracking branch 'origin/master' into moregethcli
2016-03-10 21:41:29 +01:00
29916edb91
More geth compatibility.
2016-03-10 21:36:45 +01:00
a2dea3885b
refactoring to AccountService
2016-03-10 23:09:45 +04:00
84a48142de
Add more geth options.
2016-03-10 19:50:04 +01:00
a207b6a17e
Merge pull request #664 from ethcore/sync-provider
...
extend sync status interface to sync provider
2016-03-10 21:18:41 +03:00
Nikolay Volf
Gav Wood
Tomasz Drwięga
arkpar
Tomasz Drwięga
debris
Robert Habermeier
Tomusdrw
Gav Wood