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 |
|
arkpar
|
49ae375605
|
Don't coneect peers on each sync
|
2016-12-13 13:23:10 +01:00 |
|
keorn
|
fa504e510f
|
Merge branch 'master' into auth-bft
|
2016-12-12 21:28:46 +01:00 |
|
keorn
|
19adb84527
|
TestNet flushing and cleanup
|
2016-12-12 19:44:24 +01:00 |
|
keorn
|
722cd4d086
|
AuthorityRound fork test
|
2016-12-12 17:24:48 +01:00 |
|
Gav Wood
|
ab4d666681
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-12 16:35:11 +01:00 |
|
keorn
|
8ed89bb74f
|
propagate proposal to all peers
|
2016-12-12 13:00:51 +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
|
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 |
|
keorn
|
a4bf914683
|
Merge branch 'auth-bft' of https://github.com/ethcore/parity into auth-bft
|
2016-12-11 18:23:54 +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 |
|
Gav Wood
|
e09b1faf20
|
Fix semver version issues.
|
2016-12-11 17:13:26 +01:00 |
|
arkpar
|
c777362d02
|
Sync channel for consensus test
|
2016-12-11 12:32:01 +01:00 |
|
Tomasz Drwięga
|
19ca9ad460
|
Prevent broadcasting transactions to peer that send them.
|
2016-12-10 21:22:19 +01:00 |
|
keorn
|
f3af0f46be
|
Merge branch 'master' into auth-bft
|
2016-12-10 18:14:35 +01:00 |
|
keorn
|
1611d190ba
|
initial tendetmint consensus test
|
2016-12-10 17:40:53 +01:00 |
|
Tomasz Drwięga
|
aaf6da4c00
|
Returning persistent node id
|
2016-12-10 16:55:29 +01:00 |
|
Robert Habermeier
|
a6fcd8a0d9
|
Merge pull request #3794 from ethcore/net-fix
Network connectivity fixes
|
2016-12-10 16:55:17 +01:00 |
|
Tomasz Drwięga
|
704054ef40
|
Merge branch 'master' into tx-broadcast
Conflicts:
ethcore/src/client/traits.rs
|
2016-12-10 15:23:53 +01:00 |
|
Tomasz Drwięga
|
e1ade5b375
|
Maintaining a list of transactions propagated from other peers
|
2016-12-10 15:18:44 +01:00 |
|
arkpar
|
02c788a403
|
Network connectivity fixes
|
2016-12-10 14:20:34 +01:00 |
|
Gav Wood
|
82efa2675e
|
Merge remote-tracking branch 'origin/master' into consistent-id
|
2016-12-10 13:36:30 +01:00 |
|
keorn
|
e5f8044cad
|
Merge branch 'master' into auth-bft
|
2016-12-10 11:01:23 +01:00 |
|
Gav Wood
|
5f1fcf95e0
|
Make *ID names consistent with std Rust (Id)
|
2016-12-09 23:01:43 +01:00 |
|
Robert Habermeier
|
503b126c93
|
Merge branch 'master' into lightserv
|
2016-12-09 21:37:55 +01:00 |
|
arkpar
|
97f358ced9
|
AuthorityRound network simulation test
|
2016-12-09 20:38:06 +01:00 |
|
arkpar
|
ca7406773f
|
AuthorityRound network simulation test
|
2016-12-09 19:27:16 +01:00 |
|
keorn
|
762e5f1e3e
|
proposed block sync tests
|
2016-12-09 12:05:56 +01:00 |
|
Robert Habermeier
|
e7ce8c9558
|
light: broadcast status updates to peers
|
2016-12-08 23:57:09 +01:00 |
|
Robert Habermeier
|
6f5f1f5e26
|
light: integrate with sync + serve_light CLI
|
2016-12-08 23:21:47 +01:00 |
|
Robert Habermeier
|
efd66f566d
|
ethsync: optional ipc codegen
|
2016-12-08 19:52:48 +01:00 |
|
keorn
|
3ebfa1481d
|
better proposal block handling
|
2016-12-08 12:03:34 +01:00 |
|
Robert Habermeier
|
cdc758368a
|
les: flesh out event handler
|
2016-12-07 13:52:45 +01:00 |
|
keorn
|
6fc943ca6d
|
Merge branch 'master' into auth-bft
|
2016-12-05 16:37:35 +00:00 |
|
Gav Wood
|
43ec3d8f79
|
network_id -> u64
|
2016-12-05 06:54:31 -08:00 |
|
keorn
|
c946ffebf3
|
Merge branch 'master' into auth-bft
|
2016-12-05 11:30:11 +00:00 |
|
arkpar
|
4eca687bbb
|
Fixed network context
|
2016-12-01 15:49:26 +01:00 |
|
arkpar
|
b7dc60ace5
|
Don't share the snapshot while downloading old blocks
|
2016-11-30 23:33:17 +01:00 |
|
arkpar
|
84cf27c3ef
|
Advertise protocol version 2
|
2016-11-30 16:48:30 +01:00 |
|
keorn
|
61f1699c0e
|
fix merge
|
2016-11-30 13:39:28 +00:00 |
|
keorn
|
155da50fcd
|
Merge branch 'master' into auth-bft
|
2016-11-30 13:06:21 +00:00 |
|
Gav Wood
|
d525a6d7f0
|
Merge pull request #3654 from ethcore/clippy-bump
Bumping clippy
|
2016-11-29 18:00:13 +01:00 |
|
arkpar
|
95f81b2a2f
|
Moved consensus networking into Parity handler
|
2016-11-29 16:54:30 +01:00 |
|
Gav Wood
|
7c2cccc60c
|
Merge pull request #3655 from ethcore/sync
Disable peer if no common block found
|
2016-11-29 12:10:19 +01:00 |
|
Tomasz Drwięga
|
44314c5d02
|
Merge branch 'master' into clippy-bump
Conflicts:
rpc/src/v1/types/filter.rs
|
2016-11-29 11:56:55 +01:00 |
|
Tomasz Drwięga
|
64b1b898f1
|
Fixing compilation on stable
|
2016-11-28 17:43:38 +01:00 |
|
arkpar
|
bae8acee74
|
Allow pv62 peers
|
2016-11-28 17:24:02 +01:00 |
|