Tomasz Drwięga
4ece68349c
Fixing sync doctests
2016-06-24 12:41:48 +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
7c94b1495e
Merge pull request #1329 from ethcore/softforktrigger
...
Install trigger for DAO-rescue soft-fork.
2016-06-21 22:25:24 +02:00
arkpar
1ffe0c185c
Reduce locking
2016-06-20 17:28:48 +02:00
Tomasz Drwięga
a2f24a0083
Removing Default from Miner
2016-06-20 10:28:38 +02:00
Gav Wood
2245baaaab
Provide CLI options to disable aspects of soft-fork.
...
Soft-fork will remain default behaviour, but you can now disable
either the whole mechanism (you'll lose money if you mine with this
when the majority network doesn't) or just vote against it but
otherwise go with the flow.
2016-06-19 13:20:14 +02:00
Tomasz Drwięga
81df97a737
Fixing warnings ( #1321 )
2016-06-18 15:11:10 +02:00
arkpar
c340d8a34f
Tests
2016-06-17 18:26:54 +02:00
arkpar
b38488dd07
Network shutdown
2016-06-17 12:58:28 +02:00
Tomasz Drwięga
3905717d5d
Fixing warnings
2016-06-03 11:36:30 +02:00
Nikolay Volf
db749dc564
fix remaining tests & doctest
2016-06-01 12:44:11 +02:00
Nikolay Volf
495e7feb62
dispatching message return
2016-05-31 21:13:32 +02:00
Nikolay Volf
f5ed31792f
fixed sync with client only
2016-05-31 20:54:02 +02:00
Nikolay Volf
4f732972bc
refactoring to hold miner within the client
2016-05-31 19:01:37 +02:00
Marek Kotewicz
852155959d
Merge pull request #1098 from ethcore/trace_err
...
pretty print trace error
2016-05-19 18:00:39 +02:00
arkpar
ca6c91f591
New sync algorithm
2016-05-19 16:16:11 +02:00
debris
506ca15a15
Merge branch 'master' of github.com:ethcore/parity into trace_err
2016-05-19 11:07:53 +02:00
debris
8f6febae18
fixed docs compilation error
2016-05-18 16:44:11 +02:00
Nikolay Volf
f3f45a1dd9
ethsync tests fixed
2016-05-16 20:25:05 +03:00
Marek Kotewicz
225a5ee825
removed redundant unwraps ( #935 )
...
* removed redundant unwraps
* fixed compilation error, removed warnings
* fixed transaction queue merge conflict
* fixed failing ethminer doc test
2016-04-19 10:35:32 -07:00
Gav Wood
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
arkpar
3438cda432
Propagate transaction queue
2016-04-06 23:03:07 +02:00
Gav Wood
9592ccc0df
Publish locally-made transactions to peers.
2016-03-28 18:11:00 +02:00
Nikolay Volf
0f96ce9bd2
no flag also
2016-03-17 14:56:19 +01:00
Nikolay Volf
a285fbab6d
overhaul to flag
2016-03-17 14:11:32 +01:00
Nikolay Volf
03ca9d2c06
adding message from client to sync and disabling sending transactions to the queue while syncing
2016-03-17 12:17:53 +01:00
Tomasz Drwięga
4cf18c728d
Fixing sync invalid sync test
2016-03-13 20:53:47 +01:00
Gav Wood
08b9cc2c41
Merge changes from #674 into branch.
2016-03-13 15:29:55 +01:00
Gav Wood
e7574d4516
Update lib.rs
2016-03-12 19:29:18 +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
f724cab92d
Merge branch 'master' into updating_clippy
...
Conflicts:
ethcore/src/lib.rs
sync/src/chain.rs
sync/src/lib.rs
util/src/keys/store.rs
util/src/lib.rs
2016-03-11 19:17:09 +01:00
Nikolay Volf
eaf22198e2
Merge pull request #676 from ethcore/fix-tx-warnings
...
fix warning for transaction_queue.add usage
2016-03-11 19:48:05 +03:00
Tomasz Drwięga
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
Nikolay Volf
99c5794929
fix warning for transaction_queue.add usage
2016-03-11 16:00:30 +04:00
Tomasz Drwięga
d84e008e00
Removing superflous check for nightly
2016-03-11 11:16:49 +01:00
Tomasz Drwięga
8709dd28f8
Fixing clippy warnings
2016-03-11 10:58:51 +01:00
Tomasz Drwięga
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
Tomasz Drwięga
3bbdc03d0c
Fixing doctest.
2016-03-11 10:17:51 +01:00
Nikolay Volf
25a63611f8
extend sync status interface to sync provider
2016-03-10 20:32:17 +04:00
Tomasz Drwięga
92022ac14d
Merge branch 'master' into ethminer_crate
...
Conflicts:
ethcore/src/client.rs
parity/main.rs
rpc/src/v1/impls/eth.rs
sync/src/chain.rs
2016-03-10 16:38:58 +01:00
Gav Wood
8dd41bfe0c
Merge pull request #641 from ethcore/jsonrpc_interfaces
...
jsonrpc uses client and sync interfaces
2016-03-10 15:44:05 +01:00
Gav Wood
5764ec5ddc
Merge pull request #609 from ethcore/tx-rpc-expose
...
Expose transaction insertion in sync lib
2016-03-10 15:28:43 +01:00
Tomasz Drwięga
2e72173620
Merge branch 'master' into ethminer_crate
...
Conflicts:
Cargo.lock
Cargo.toml
hook.sh
miner/src/transaction_queue.rs
rpc/Cargo.toml
sync/Cargo.toml
sync/src/chain.rs
2016-03-10 12:25:36 +01:00
Tomasz Drwięga
d4e7eafede
Merge branch 'master' into tx_queue_integration
...
Conflicts:
sync/src/transaction_queue.rs
2016-03-10 11:23:39 +01:00
Gav Wood
249a89fc2d
Merge pull request #627 from ethcore/clippy-dev
...
`dev` feature enabled when compiling without `--release`
2016-03-10 11:05:56 +01:00
Nikolay Volf
a2046b429f
exposing only one func
2016-03-10 13:27:33 +04:00
Nikolay Volf
ddc3440712
Merge branch 'master' into tx-rpc-expose
...
Conflicts:
sync/src/chain.rs
2016-03-10 03:22:32 +04:00
debris
082a4d9078
jsonrpc uses client and sync interfaces as a preparetion for jsonrpc tests
2016-03-09 17:31:43 +01:00
Tomasz Drwięga
363de973c9
Adding documentation and ditching EthMiner
2016-03-09 14:26:28 +01:00
Tomasz Drwięga
5db84c3233
Adding transactions to block
2016-03-09 13:09:34 +01:00