Tomasz Drwięga
|
55a14b3aaf
|
Fixing transaction queue test
|
2016-03-11 11:40:12 +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
|
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
|
2a24bb7cc6
|
Merge pull request #663 from ethcore/archive_default
--archive is default. --pruning is option.
|
2016-03-10 20:48:04 +03:00 |
|
Nikolay Volf
|
25a63611f8
|
extend sync status interface to sync provider
|
2016-03-10 20:32:17 +04:00 |
|
Gav Wood
|
c951dee766
|
--archive is default. --pruning is option.
|
2016-03-10 17:09:34 +01:00 |
|
Tomasz Drwięga
|
0eaf0a8db1
|
Updating hook.
|
2016-03-10 16:40:57 +01: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 |
|
Gav Wood
|
29ddf34d6d
|
Merge pull request #660 from ethcore/poll_get
Removing get prefix from poll_info
|
2016-03-10 15:24:09 +01:00 |
|
Tomasz Drwięga
|
9ea3c0eba0
|
Fixing compilation on beta & stable
|
2016-03-10 15:20:54 +01:00 |
|
Tomasz Drwięga
|
027f122aea
|
Removing get prefix from poll_info
|
2016-03-10 14:24:33 +01:00 |
|
Tomasz Drwięga
|
9db4720162
|
Fixing clippy warnings.
|
2016-03-10 14:15:47 +01:00 |
|
Tomasz Drwięga
|
0535fb30c6
|
Merge branch 'master' into ethminer_crate
Conflicts:
sync/src/lib.rs
|
2016-03-10 14:03:09 +01:00 |
|
Gav Wood
|
4cfcaf8521
|
Merge pull request #657 from ethcore/tx_queue_update_height_bug
Tx queue update height bug
|
2016-03-10 13:20:00 +01:00 |
|
Gav Wood
|
f708d36fad
|
Merge pull request #651 from ethcore/tx_queue_integration
Tx_queue_docs -> To master
|
2016-03-10 13:19:40 +01:00 |
|
Gav Wood
|
16e12b1ae5
|
Merge pull request #645 from ethcore/import_route
blockchain import_route
|
2016-03-10 13:14:56 +01:00 |
|
Gav Wood
|
1a28e9297c
|
Merge pull request #655 from ethcore/io
Stop workers before stopping event loop
|
2016-03-10 12:53:00 +01:00 |
|
Tomasz Drwięga
|
eb1fab9202
|
Adding clippy support to ethminer.
|
2016-03-10 12:33:29 +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 |
|
Tomasz Drwięga
|
6d0578e19c
|
Additional explanation for ordering of commit/insert_block
|
2016-03-10 11:16:54 +01:00 |
|
Tomasz Drwięga
|
0cf405527e
|
Fixing update height bug
|
2016-03-10 11:14:25 +01:00 |
|
Gav Wood
|
99e577ad2f
|
Merge pull request #650 from ethcore/tx_queue_validation
Validate sender before importing to queue
|
2016-03-10 11:14:22 +01:00 |
|
Tomasz Drwięga
|
276768a826
|
Failing test case for #656
|
2016-03-10 11:11:59 +01:00 |
|
Gav Wood
|
cd37fa7cb5
|
Merge pull request #640 from ethcore/tx_queue_min_gas
Gas price threshold for transactions
|
2016-03-10 11:09:09 +01:00 |
|
Gav Wood
|
90ae7500da
|
Update main.rs
|
2016-03-10 11:07:10 +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 |
|
arkpar
|
ff12b53ba6
|
Stop workers before stopping event loop
|
2016-03-10 10:40:16 +01:00 |
|
Nikolay Volf
|
a2046b429f
|
exposing only one func
|
2016-03-10 13:27:33 +04:00 |
|
debris
|
190a2c3b35
|
Merge branch 'master' of github.com:ethcore/parity into import_route
|
2016-03-10 10:17:44 +01:00 |
|
debris
|
0a7cda09ff
|
changed route name to enacted and retracted
|
2016-03-10 10:17:17 +01:00 |
|
Tomasz Drwięga
|
02b7e7698a
|
Breaking couple of lines to keep number of characters below limit
|
2016-03-10 10:09:55 +01:00 |
|
Tomasz Drwięga
|
ca2cf8e591
|
Lowering minimal gas price
|
2016-03-10 10:05:51 +01:00 |
|
Tomasz Drwięga
|
2f9b955210
|
Merge branch 'master' into ethminer_crate
Conflicts:
parity/main.rs
|
2016-03-10 09:39:26 +01:00 |
|
Tomasz Drwięga
|
9f77a85491
|
Fixing compilation on nightly
|
2016-03-10 09:35:46 +01:00 |
|
Tomasz Drwięga
|
878e38c0cf
|
Fixing deps again
|
2016-03-10 09:33:25 +01:00 |
|
Tomasz Drwięga
|
c3803807a9
|
Merge pull request #648 from ethcore/bq-fix
Don't call mark_as_bad needlessly
|
2016-03-10 09:28:26 +01:00 |
|
Tomasz Drwięga
|
6864a08000
|
Merge branch 'master' into tx_queue_validation
|
2016-03-10 09:26:57 +01:00 |
|
Tomasz Drwięga
|
3c1888c26a
|
Fixing deps
|
2016-03-10 09:26:04 +01:00 |
|
debris
|
4750d2f667
|
Merge branch 'master' into import_route
|
2016-03-10 01:04:05 +01:00 |
|
Gav Wood
|
2ecad23fab
|
Merge pull request #647 from ethcore/sync
Fixed sync handling large forks
|
2016-03-10 00:53:20 +01:00 |
|
Gav Wood
|
204d31a056
|
Merge pull request #631 from ethcore/tx_queue_docs
Additional documentation for transaction queue
|
2016-03-10 00:45:30 +01:00 |
|
Gav Wood
|
50c8d7f633
|
Merge pull request #607 from ethcore/tx_queue_integration
Transaction Queue Integration
|
2016-03-10 00:45:07 +01:00 |
|
Gav Wood
|
ac42045155
|
Merge pull request #639 from ethcore/keys-cli
Keys cli
|
2016-03-10 00:25:01 +01:00 |
|
Nikolay Volf
|
ddc3440712
|
Merge branch 'master' into tx-rpc-expose
Conflicts:
sync/src/chain.rs
|
2016-03-10 03:22:32 +04:00 |
|
arkpar
|
84a741d0f9
|
Don't call mark_as_bad needlessly
|
2016-03-10 00:21:07 +01:00 |
|
debris
|
f397fb210f
|
fixed typo
|
2016-03-10 00:11:35 +01:00 |
|