Jaco Greeff
|
054a6a9daf
|
Merge branch 'master' into check-updates
# Conflicts:
# .gitlab-ci.yml
# js/webpack/dev.server.js
|
2016-12-15 13:52:28 +01:00 |
|
keorn
|
fa504e510f
|
Merge branch 'master' into auth-bft
|
2016-12-12 21:28:46 +01:00 |
|
Gav Wood
|
ab4d666681
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-12 16:35:11 +01:00 |
|
Gav Wood
|
c0a2d5c8f5
|
Merge pull request #3796 from ethcore/tx-broadcast
Avoid broadcasting transactions to peers that send them
|
2016-12-12 04:13:56 +01:00 |
|
Gav Wood
|
d8ad09b654
|
Make updater an IPC module.
|
2016-12-11 22:47:43 +01:00 |
|
Gav Wood
|
94f5501c61
|
authors & homepage => Parity
|
2016-12-11 19:43:58 +01:00 |
|
Gav Wood
|
58b72c521d
|
Rename ethcore -> parity in licenses.
|
2016-12-11 19:31:31 +01:00 |
|
Gav Wood
|
17cc2be4b5
|
Rename ethcore -> parity in license.
|
2016-12-11 19:30:54 +01:00 |
|
Gav Wood
|
10b0898bdf
|
Crate tidyups.
- Move Updater into its own crate.
- Change ethcore -> parity in authors, homepages and licenses.
|
2016-12-11 19:14:42 +01:00 |
|
Tomasz Drwięga
|
b56f12adc6
|
Merge branch 'master' into tx-broadcast
Conflicts:
ethcore/light/src/net/context.rs
ethcore/light/src/net/tests/mod.rs
|
2016-12-11 17:31:56 +01:00 |
|
arkpar
|
c777362d02
|
Sync channel for consensus test
|
2016-12-11 12:32:01 +01:00 |
|
Gav Wood
|
0a494962e4
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-11 02:13:52 +01:00 |
|
Gav Wood
|
fa30dfd4b9
|
Refactor into system service, add exe redirect.
|
2016-12-10 23:58:39 +01:00 |
|
Tomasz Drwięga
|
1f9adc8622
|
Merge branch 'master' into txqueue-gc
Conflicts:
ethcore/src/miner/miner.rs
|
2016-12-10 17:00:29 +01:00 |
|
Tomasz Drwięga
|
aaf6da4c00
|
Returning persistent node id
|
2016-12-10 16:55:29 +01:00 |
|
arkpar
|
02c788a403
|
Network connectivity fixes
|
2016-12-10 14:20:34 +01:00 |
|
Gav Wood
|
316c25d9f8
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-10 14:08:41 +01:00 |
|
Robert Habermeier
|
d427d60156
|
Merge pull request #3776 from ethcore/p2p-event-ordering
network: process packets only after connection handler finishes
|
2016-12-09 23:00:59 +01:00 |
|
Robert Habermeier
|
b772901d77
|
network: process packets only after connection handler finishes
|
2016-12-09 21:17:05 +01:00 |
|
Gav Wood
|
46af3d18da
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-09 20:45:15 +01:00 |
|
Tomasz Drwięga
|
5d054f08c3
|
Clearing old transactions
|
2016-12-09 15:05:03 +01:00 |
|
arkpar
|
364dd9dda4
|
Make stop const
|
2016-12-09 13:25:02 +01:00 |
|
arkpar
|
22a63f6fd3
|
Added IO Service explicit stop
|
2016-12-09 11:45:16 +01:00 |
|
Gav Wood
|
8903384840
|
Merge branch 'master' into check-updates
|
2016-12-07 19:19:44 +01:00 |
|
Gav Wood
|
1f0a02b638
|
Merge pull request #3633 from ethcore/fix-tx-rpc
Fix up the transaction JSON serialisation for RPC.
|
2016-12-07 14:34:51 +01:00 |
|
Robert Habermeier
|
085b8ad553
|
Merge pull request #3527 from ethcore/client-provider
LES Part 2
|
2016-12-07 09:31:50 +01:00 |
|
Gav Wood
|
5e1fdc4b11
|
Merge remote-tracking branch 'origin/master' into fix-tx-rpc
|
2016-12-05 10:44:19 -08:00 |
|
NikVolf
|
42fc770d30
|
use crates.io crate
|
2016-12-05 16:25:03 +03:00 |
|
Gav Wood
|
90a20a217f
|
Merge branch 'master' into check-updates
|
2016-12-04 09:01:50 -08:00 |
|
Robert Habermeier
|
6e1a1f9dec
|
Merge branch 'master' into client-provider
|
2016-12-02 10:06:09 +01:00 |
|
Gav Wood
|
d3e684698a
|
Merge remote-tracking branch 'origin/master' into fix-tx-rpc
|
2016-11-30 17:15:05 -08:00 |
|
Gav Wood
|
d525a6d7f0
|
Merge pull request #3654 from ethcore/clippy-bump
Bumping clippy
|
2016-11-29 18:00:13 +01:00 |
|
Gav Wood
|
d58905ae13
|
fix comment
|
2016-11-29 17:59:17 +01:00 |
|
Gav Wood
|
436016ef02
|
Introduce to_hex() utility in bigint. Fix tests.
|
2016-11-29 13:46:06 +01:00 |
|
Tomasz Drwięga
|
64b1b898f1
|
Fixing compilation on stable
|
2016-11-28 17:43:38 +01:00 |
|
Tomasz Drwięga
|
2b3d100de2
|
Fixing some clippy warnings
|
2016-11-28 15:54:22 +01:00 |
|
Tomasz Drwięga
|
e1e7886918
|
Bumping clippy
|
2016-11-28 12:23:06 +01:00 |
|
arkpar
|
c7b359fcee
|
Style
|
2016-11-28 01:37:25 +01:00 |
|
arkpar
|
3aceac60de
|
Use sha3 for fat key
|
2016-11-28 01:37:24 +01:00 |
|
arkpar
|
b0555fbe7c
|
State export
|
2016-11-28 01:37:24 +01:00 |
|
arkpar
|
8b3cdc513b
|
Seekable iterator
|
2016-11-28 01:37:24 +01:00 |
|
Gav Wood
|
8cddf9976a
|
Better information.
|
2016-11-25 15:43:49 +01:00 |
|
Gav Wood
|
90b5d1c62d
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-11-23 20:13:47 +01:00 |
|
arkpar
|
4e9c690640
|
Use patched MIO
|
2016-11-23 19:08:40 +01:00 |
|
Gav Wood
|
45dead9d49
|
Naming consistency and make Updater improvements.
- ID -> Id (consistency with rust libs)
|
2016-11-22 10:24:22 +01:00 |
|
Robert Habermeier
|
06f5bf809f
|
Merge branch 'master' into client-provider
|
2016-11-21 12:19:11 +01:00 |
|
Gav Wood
|
601e0fb0fd
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-11-21 11:43:29 +01:00 |
|
Tomasz Drwięga
|
cc8a9d410b
|
Adding fetch API to the crate
|
2016-11-20 18:44:23 +01:00 |
|
Robert Habermeier
|
f1c665081a
|
Merge branch 'master' into client-provider
|
2016-11-18 16:07:50 +01:00 |
|
Gav Wood
|
28aabcdb6c
|
Merge branch 'master' into check-updates
|
2016-11-18 11:45:04 +08:00 |
|