Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

PoC-1 consensus extracted to "rhododendron"#284

Merged
gavofyork merged 2 commits into from
Jul 9, 2018
Merged

PoC-1 consensus extracted to "rhododendron" #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed835ff
PoC-1 consensus extracted to "rhododendron"
rphmeier Jul 6, 2018
a568b75
Merge branch 'master' into rh-extract-poc1-consensus
rphmeier Jul 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions polkadot/consensus/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ ed25519 = { path = "../../substrate/ed25519" }
error-chain = "0.12"
log = "0.3"
exit-future = "0.1"
rhododendron = "0.2"
polkadot-api = { path = "../api" }
polkadot-collator = { path = "../collator" }
polkadot-parachain = { path = "../parachain" }
Expand Down
3 changes: 2 additions & 1 deletion polkadot/consensus/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ extern crate substrate_client as client;

extern crate exit_future;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate error_chain;
Expand DownExpand Up@@ -531,7 +532,7 @@ impl<C> bft::Proposer<Block> for Proposer<C>
}

fn import_misbehavior(&self, misbehavior: Vec<(AuthorityId, bft::Misbehavior<Hash>)>) {
use bft::generic::Misbehavior as GenericMisbehavior;
use rhododendron::Misbehavior as GenericMisbehavior;
use runtime_primitives::bft::{MisbehaviorKind, MisbehaviorReport};
use runtime_primitives::MaybeUnsigned;
use polkadot_runtime::{Call, Extrinsic, BareExtrinsic, UncheckedExtrinsic, ConsensusCall};
Expand Down
1 change: 1 addition & 0 deletions polkadot/network/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,4 @@ ed25519 = { path = "../../substrate/ed25519" }
futures = "0.1"
tokio = "0.1.7"
log = "0.4"
rhododendron = "0.2"
35 changes: 19 additions & 16 deletions polkadot/network/src/consensus.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -53,26 +53,29 @@ impl<E> Sink for BftSink<E> {
fn start_send(&mut self, message: bft::Communication<Block>) -> ::futures::StartSend<bft::Communication<Block>, E> {
let network_message = net::LocalizedBftMessage {
message: match message {
bft::generic::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
bft::generic::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
::rhododendron::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
::rhododendron::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
round_number: proposal.round_number as u32,
proposal: proposal.proposal,
digest: proposal.digest,
sender: proposal.sender,
digest_signature: proposal.digest_signature.signature,
full_signature: proposal.full_signature.signature,
}),
bft::generic::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
::rhododendron::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
sender: vote.sender,
signature: vote.signature.signature,
vote: match vote.vote {
bft::generic::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
bft::generic::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
bft::generic::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
::rhododendron::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
::rhododendron::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
::rhododendron::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
}
}),
}),
bft::generic::Communication::Auxiliary(justification) => msg::BftMessage::Auxiliary(justification.uncheck().into()),
::rhododendron::Communication::Auxiliary(justification) => {
let unchecked: bft::UncheckedJustification<_> = justification.uncheck().into();
msg::BftMessage::Auxiliary(unchecked.into())
}
},
parent_hash: self.parent_hash,
};
Expand All@@ -90,10 +93,10 @@ impl<E> Sink for BftSink<E> {
// check signature and authority validity of message.
fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &SessionKey, authorities: &[SessionKey]) -> Result<Option<bft::Communication<Block>>, bft::Error> {
Ok(Some(match msg.message {
msg::BftMessage::Consensus(c) => bft::generic::Communication::Consensus(match c {
msg::SignedConsensusMessage::Propose(proposal) => bft::generic::LocalizedMessage::Propose({
msg::BftMessage::Consensus(c) => ::rhododendron::Communication::Consensus(match c {
msg::SignedConsensusMessage::Propose(proposal) => ::rhododendron::LocalizedMessage::Propose({
if &proposal.sender == local_id { return Ok(None) }
let proposal = bft::generic::LocalizedProposal {
let proposal = ::rhododendron::LocalizedProposal {
round_number: proposal.round_number as usize,
proposal: proposal.proposal,
digest: proposal.digest,
Expand All@@ -112,18 +115,18 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
trace!(target: "bft", "importing proposal message for round {} from {}", proposal.round_number, Hash::from(proposal.sender.0));
proposal
}),
msg::SignedConsensusMessage::Vote(vote) => bft::generic::LocalizedMessage::Vote({
msg::SignedConsensusMessage::Vote(vote) => ::rhododendron::LocalizedMessage::Vote({
if &vote.sender == local_id { return Ok(None) }
let vote = bft::generic::LocalizedVote {
let vote = ::rhododendron::LocalizedVote {
sender: vote.sender,
signature: ed25519::LocalizedSignature {
signature: vote.signature,
signer: ed25519::Public(vote.sender.0),
},
vote: match vote.vote {
msg::ConsensusVote::Prepare(r, h) => bft::generic::Vote::Prepare(r as usize, h),
msg::ConsensusVote::Commit(r, h) => bft::generic::Vote::Commit(r as usize, h),
msg::ConsensusVote::AdvanceRound(r) => bft::generic::Vote::AdvanceRound(r as usize),
msg::ConsensusVote::Prepare(r, h) => ::rhododendron::Vote::Prepare(r as usize, h),
msg::ConsensusVote::Commit(r, h) => ::rhododendron::Vote::Commit(r as usize, h),
msg::ConsensusVote::AdvanceRound(r) => ::rhododendron::Vote::AdvanceRound(r as usize),
}
};
bft::check_vote::<Block>(authorities, &msg.parent_hash, &vote)?;
Expand All@@ -137,7 +140,7 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
// TODO: get proper error
let justification: Result<_, bft::Error> = bft::check_prepare_justification::<Block>(authorities, msg.parent_hash, justification)
.map_err(|_| bft::ErrorKind::InvalidJustification.into());
bft::generic::Communication::Auxiliary(justification?)
::rhododendron::Communication::Auxiliary(justification?)
},
}))
}
Expand Down
1 change: 1 addition & 0 deletions polkadot/network/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ extern crate ed25519;
extern crate futures;
extern crate parking_lot;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate log;
Expand Down
1 change: 1 addition & 0 deletions substrate/bft/Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ tokio = "0.1.7"
parking_lot = "0.4"
error-chain = "0.12"
log = "0.3"
rhododendron = "0.2"

[dev-dependencies]
substrate-keyring = { path = "../keyring" }
Expand Down
4 changes: 2 additions & 2 deletions substrate/bft/src/error.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ error_chain! {
}
}

impl From<::generic::InputStreamConcluded> for Error {
fn from(_: ::generic::InputStreamConcluded) -> Error {
impl From<::rhododendron::InputStreamConcluded> for Error {
fn from(_: ::rhododendron::InputStreamConcluded) -> Error {
ErrorKind::IoTerminated.into()
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
PoC-1 consensus extracted to "rhododendron" by rphmeier · Pull Request #284 · paritytech/substrate · GitHub
Skip to content

This repository was archived by the owner on Nov 15, 2023. It is now read-only.

PoC-1 consensus extracted to "rhododendron"#284
 Merged

gavofyork
merged 2 commits into

from

Jul 9, 2018
 Merged


PoC-1 consensus extracted to "rhododendron"
#284
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ed835ff

PoC-1 consensus extracted to "rhododendron"


rphmeier Jul 6, 2018
a568b75

Merge branch 'master' into rh-extract-poc1-consensus


rphmeier Jul 6, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 17 additions & 1 deletion
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
polkadot/consensus/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ ed25519 = { path = "../../substrate/ed25519" }
error-chain = "0.12"
log = "0.3"
exit-future = "0.1"
rhododendron = "0.2"
polkadot-api = { path = "../api" }
polkadot-collator = { path = "../collator" }
polkadot-parachain = { path = "../parachain" }
Expand Down

3 changes: 2 additions & 1 deletion
polkadot/consensus/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ extern crate substrate_client as client;

extern crate exit_future;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate error_chain;
Expand DownExpand Up@@ -531,7 +532,7 @@ impl<C> bft::Proposer<Block> for Proposer<C>
	}

	fn import_misbehavior(&self, misbehavior: Vec<(AuthorityId, bft::Misbehavior<Hash>)>) {
 use bft::generic::Misbehavior as GenericMisbehavior;
 use rhododendron::Misbehavior as GenericMisbehavior;
 use runtime_primitives::bft::{MisbehaviorKind, MisbehaviorReport};
 use runtime_primitives::MaybeUnsigned;
 use polkadot_runtime::{Call, Extrinsic, BareExtrinsic, UncheckedExtrinsic, ConsensusCall};
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,4 @@ ed25519 = { path = "../../substrate/ed25519" }
futures = "0.1"
tokio = "0.1.7"
log = "0.4"
rhododendron = "0.2"

35 changes: 19 additions & 16 deletions
polkadot/network/src/consensus.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,26 +53,29 @@ impl<E> Sink for BftSink<E> {
	fn start_send(&mut self, message: bft::Communication<Block>) -> ::futures::StartSend<bft::Communication<Block>, E> {
 let network_message = net::LocalizedBftMessage {
 message: match message {
bft::generic::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
bft::generic::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
::rhododendron::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
::rhododendron::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
 round_number: proposal.round_number as u32,
 proposal: proposal.proposal,
 digest: proposal.digest,
 sender: proposal.sender,
 digest_signature: proposal.digest_signature.signature,
 full_signature: proposal.full_signature.signature,
 }),
bft::generic::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
::rhododendron::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
 sender: vote.sender,
 signature: vote.signature.signature,
 vote: match vote.vote {
bft::generic::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
bft::generic::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
bft::generic::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
::rhododendron::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
::rhododendron::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
::rhododendron::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
 }
 }),
 }),
 bft::generic::Communication::Auxiliary(justification) => msg::BftMessage::Auxiliary(justification.uncheck().into()),
 ::rhododendron::Communication::Auxiliary(justification) => {
 let unchecked: bft::UncheckedJustification<_> = justification.uncheck().into();
 msg::BftMessage::Auxiliary(unchecked.into())
 }
 },
 parent_hash: self.parent_hash,
 };
Expand All@@ -90,10 +93,10 @@ impl<E> Sink for BftSink<E> {
// check signature and authority validity of message.
fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &SessionKey, authorities: &[SessionKey]) -> Result<Option<bft::Communication<Block>>, bft::Error> {
	Ok(Some(match msg.message {
 msg::BftMessage::Consensus(c) => bft::generic::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => bft::generic::LocalizedMessage::Propose({
 msg::BftMessage::Consensus(c) => ::rhododendron::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => ::rhododendron::LocalizedMessage::Propose({
 if &proposal.sender == local_id { return Ok(None) }
 let proposal = bft::generic::LocalizedProposal {
 let proposal = ::rhododendron::LocalizedProposal {
 round_number: proposal.round_number as usize,
 proposal: proposal.proposal,
 digest: proposal.digest,
Expand All@@ -112,18 +115,18 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 trace!(target: "bft", "importing proposal message for round {} from {}", proposal.round_number, Hash::from(proposal.sender.0));
 proposal
 }),
 msg::SignedConsensusMessage::Vote(vote) => bft::generic::LocalizedMessage::Vote({
 msg::SignedConsensusMessage::Vote(vote) => ::rhododendron::LocalizedMessage::Vote({
 if &vote.sender == local_id { return Ok(None) }
 let vote = bft::generic::LocalizedVote {
 let vote = ::rhododendron::LocalizedVote {
 sender: vote.sender,
 signature: ed25519::LocalizedSignature {
 signature: vote.signature,
 signer: ed25519::Public(vote.sender.0),
 },
 vote: match vote.vote {
 msg::ConsensusVote::Prepare(r, h) => bft::generic::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => bft::generic::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => bft::generic::Vote::AdvanceRound(r as usize),
 msg::ConsensusVote::Prepare(r, h) => ::rhododendron::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => ::rhododendron::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => ::rhododendron::Vote::AdvanceRound(r as usize),
 }
 };
 bft::check_vote::<Block>(authorities, &msg.parent_hash, &vote)?;
Expand All@@ -137,7 +140,7 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 // TODO: get proper error
 let justification: Result<_, bft::Error> = bft::check_prepare_justification::<Block>(authorities, msg.parent_hash, justification)
 .map_err(|_| bft::ErrorKind::InvalidJustification.into());
bft::generic::Communication::Auxiliary(justification?)
::rhododendron::Communication::Auxiliary(justification?)
 },
	}))
}
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ extern crate ed25519;
extern crate futures;
extern crate parking_lot;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate log;
Expand Down

1 change: 1 addition & 0 deletions
substrate/bft/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ tokio = "0.1.7"
parking_lot = "0.4"
error-chain = "0.12"
log = "0.3"
rhododendron = "0.2"

[dev-dependencies]
substrate-keyring = { path = "../keyring" }
Expand Down

4 changes: 2 additions & 2 deletions
substrate/bft/src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ error_chain! {
	}
}

impl From<::generic::InputStreamConcluded> for Error {
	fn from(_: ::generic::InputStreamConcluded) -> Error {
impl From<::rhododendron::InputStreamConcluded> for Error {
	fn from(_: ::rhododendron::InputStreamConcluded) -> Error {
 ErrorKind::IoTerminated.into()
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PoC-1 consensus extracted to "rhododendron" by rphmeier · Pull Request #284 · paritytech/substrate · GitHub
Skip to content

This repository was archived by the owner on Nov 15, 2023. It is now read-only.

PoC-1 consensus extracted to "rhododendron"#284
 Merged

gavofyork
merged 2 commits into

from

Jul 9, 2018
 Merged


PoC-1 consensus extracted to "rhododendron"
#284
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ed835ff

PoC-1 consensus extracted to "rhododendron"


rphmeier Jul 6, 2018
a568b75

Merge branch 'master' into rh-extract-poc1-consensus


rphmeier Jul 6, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 17 additions & 1 deletion
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
polkadot/consensus/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ ed25519 = { path = "../../substrate/ed25519" }
error-chain = "0.12"
log = "0.3"
exit-future = "0.1"
rhododendron = "0.2"
polkadot-api = { path = "../api" }
polkadot-collator = { path = "../collator" }
polkadot-parachain = { path = "../parachain" }
Expand Down

3 changes: 2 additions & 1 deletion
polkadot/consensus/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ extern crate substrate_client as client;

extern crate exit_future;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate error_chain;
Expand DownExpand Up@@ -531,7 +532,7 @@ impl<C> bft::Proposer<Block> for Proposer<C>
	}

	fn import_misbehavior(&self, misbehavior: Vec<(AuthorityId, bft::Misbehavior<Hash>)>) {
 use bft::generic::Misbehavior as GenericMisbehavior;
 use rhododendron::Misbehavior as GenericMisbehavior;
 use runtime_primitives::bft::{MisbehaviorKind, MisbehaviorReport};
 use runtime_primitives::MaybeUnsigned;
 use polkadot_runtime::{Call, Extrinsic, BareExtrinsic, UncheckedExtrinsic, ConsensusCall};
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,4 @@ ed25519 = { path = "../../substrate/ed25519" }
futures = "0.1"
tokio = "0.1.7"
log = "0.4"
rhododendron = "0.2"

35 changes: 19 additions & 16 deletions
polkadot/network/src/consensus.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,26 +53,29 @@ impl<E> Sink for BftSink<E> {
	fn start_send(&mut self, message: bft::Communication<Block>) -> ::futures::StartSend<bft::Communication<Block>, E> {
 let network_message = net::LocalizedBftMessage {
 message: match message {
bft::generic::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
bft::generic::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
::rhododendron::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
::rhododendron::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
 round_number: proposal.round_number as u32,
 proposal: proposal.proposal,
 digest: proposal.digest,
 sender: proposal.sender,
 digest_signature: proposal.digest_signature.signature,
 full_signature: proposal.full_signature.signature,
 }),
bft::generic::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
::rhododendron::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
 sender: vote.sender,
 signature: vote.signature.signature,
 vote: match vote.vote {
bft::generic::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
bft::generic::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
bft::generic::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
::rhododendron::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
::rhododendron::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
::rhododendron::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
 }
 }),
 }),
 bft::generic::Communication::Auxiliary(justification) => msg::BftMessage::Auxiliary(justification.uncheck().into()),
 ::rhododendron::Communication::Auxiliary(justification) => {
 let unchecked: bft::UncheckedJustification<_> = justification.uncheck().into();
 msg::BftMessage::Auxiliary(unchecked.into())
 }
 },
 parent_hash: self.parent_hash,
 };
Expand All@@ -90,10 +93,10 @@ impl<E> Sink for BftSink<E> {
// check signature and authority validity of message.
fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &SessionKey, authorities: &[SessionKey]) -> Result<Option<bft::Communication<Block>>, bft::Error> {
	Ok(Some(match msg.message {
 msg::BftMessage::Consensus(c) => bft::generic::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => bft::generic::LocalizedMessage::Propose({
 msg::BftMessage::Consensus(c) => ::rhododendron::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => ::rhododendron::LocalizedMessage::Propose({
 if &proposal.sender == local_id { return Ok(None) }
 let proposal = bft::generic::LocalizedProposal {
 let proposal = ::rhododendron::LocalizedProposal {
 round_number: proposal.round_number as usize,
 proposal: proposal.proposal,
 digest: proposal.digest,
Expand All@@ -112,18 +115,18 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 trace!(target: "bft", "importing proposal message for round {} from {}", proposal.round_number, Hash::from(proposal.sender.0));
 proposal
 }),
 msg::SignedConsensusMessage::Vote(vote) => bft::generic::LocalizedMessage::Vote({
 msg::SignedConsensusMessage::Vote(vote) => ::rhododendron::LocalizedMessage::Vote({
 if &vote.sender == local_id { return Ok(None) }
 let vote = bft::generic::LocalizedVote {
 let vote = ::rhododendron::LocalizedVote {
 sender: vote.sender,
 signature: ed25519::LocalizedSignature {
 signature: vote.signature,
 signer: ed25519::Public(vote.sender.0),
 },
 vote: match vote.vote {
 msg::ConsensusVote::Prepare(r, h) => bft::generic::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => bft::generic::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => bft::generic::Vote::AdvanceRound(r as usize),
 msg::ConsensusVote::Prepare(r, h) => ::rhododendron::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => ::rhododendron::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => ::rhododendron::Vote::AdvanceRound(r as usize),
 }
 };
 bft::check_vote::<Block>(authorities, &msg.parent_hash, &vote)?;
Expand All@@ -137,7 +140,7 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 // TODO: get proper error
 let justification: Result<_, bft::Error> = bft::check_prepare_justification::<Block>(authorities, msg.parent_hash, justification)
 .map_err(|_| bft::ErrorKind::InvalidJustification.into());
bft::generic::Communication::Auxiliary(justification?)
::rhododendron::Communication::Auxiliary(justification?)
 },
	}))
}
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ extern crate ed25519;
extern crate futures;
extern crate parking_lot;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate log;
Expand Down

1 change: 1 addition & 0 deletions
substrate/bft/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ tokio = "0.1.7"
parking_lot = "0.4"
error-chain = "0.12"
log = "0.3"
rhododendron = "0.2"

[dev-dependencies]
substrate-keyring = { path = "../keyring" }
Expand Down

4 changes: 2 additions & 2 deletions
substrate/bft/src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ error_chain! {
	}
}

impl From<::generic::InputStreamConcluded> for Error {
	fn from(_: ::generic::InputStreamConcluded) -> Error {
impl From<::rhododendron::InputStreamConcluded> for Error {
	fn from(_: ::rhododendron::InputStreamConcluded) -> Error {
 ErrorKind::IoTerminated.into()
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PoC-1 consensus extracted to "rhododendron" by rphmeier · Pull Request #284 · paritytech/substrate · GitHub
Skip to content

This repository was archived by the owner on Nov 15, 2023. It is now read-only.

PoC-1 consensus extracted to "rhododendron"#284
 Merged

gavofyork
merged 2 commits into

from

Jul 9, 2018
 Merged


PoC-1 consensus extracted to "rhododendron"
#284
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ed835ff

PoC-1 consensus extracted to "rhododendron"


rphmeier Jul 6, 2018
a568b75

Merge branch 'master' into rh-extract-poc1-consensus


rphmeier Jul 6, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 17 additions & 1 deletion
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
polkadot/consensus/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ ed25519 = { path = "../../substrate/ed25519" }
error-chain = "0.12"
log = "0.3"
exit-future = "0.1"
rhododendron = "0.2"
polkadot-api = { path = "../api" }
polkadot-collator = { path = "../collator" }
polkadot-parachain = { path = "../parachain" }
Expand Down

3 changes: 2 additions & 1 deletion
polkadot/consensus/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ extern crate substrate_client as client;

extern crate exit_future;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate error_chain;
Expand DownExpand Up@@ -531,7 +532,7 @@ impl<C> bft::Proposer<Block> for Proposer<C>
	}

	fn import_misbehavior(&self, misbehavior: Vec<(AuthorityId, bft::Misbehavior<Hash>)>) {
 use bft::generic::Misbehavior as GenericMisbehavior;
 use rhododendron::Misbehavior as GenericMisbehavior;
 use runtime_primitives::bft::{MisbehaviorKind, MisbehaviorReport};
 use runtime_primitives::MaybeUnsigned;
 use polkadot_runtime::{Call, Extrinsic, BareExtrinsic, UncheckedExtrinsic, ConsensusCall};
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,4 @@ ed25519 = { path = "../../substrate/ed25519" }
futures = "0.1"
tokio = "0.1.7"
log = "0.4"
rhododendron = "0.2"

35 changes: 19 additions & 16 deletions
polkadot/network/src/consensus.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,26 +53,29 @@ impl<E> Sink for BftSink<E> {
	fn start_send(&mut self, message: bft::Communication<Block>) -> ::futures::StartSend<bft::Communication<Block>, E> {
 let network_message = net::LocalizedBftMessage {
 message: match message {
bft::generic::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
bft::generic::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
::rhododendron::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
::rhododendron::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
 round_number: proposal.round_number as u32,
 proposal: proposal.proposal,
 digest: proposal.digest,
 sender: proposal.sender,
 digest_signature: proposal.digest_signature.signature,
 full_signature: proposal.full_signature.signature,
 }),
bft::generic::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
::rhododendron::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
 sender: vote.sender,
 signature: vote.signature.signature,
 vote: match vote.vote {
bft::generic::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
bft::generic::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
bft::generic::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
::rhododendron::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
::rhododendron::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
::rhododendron::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
 }
 }),
 }),
 bft::generic::Communication::Auxiliary(justification) => msg::BftMessage::Auxiliary(justification.uncheck().into()),
 ::rhododendron::Communication::Auxiliary(justification) => {
 let unchecked: bft::UncheckedJustification<_> = justification.uncheck().into();
 msg::BftMessage::Auxiliary(unchecked.into())
 }
 },
 parent_hash: self.parent_hash,
 };
Expand All@@ -90,10 +93,10 @@ impl<E> Sink for BftSink<E> {
// check signature and authority validity of message.
fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &SessionKey, authorities: &[SessionKey]) -> Result<Option<bft::Communication<Block>>, bft::Error> {
	Ok(Some(match msg.message {
 msg::BftMessage::Consensus(c) => bft::generic::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => bft::generic::LocalizedMessage::Propose({
 msg::BftMessage::Consensus(c) => ::rhododendron::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => ::rhododendron::LocalizedMessage::Propose({
 if &proposal.sender == local_id { return Ok(None) }
 let proposal = bft::generic::LocalizedProposal {
 let proposal = ::rhododendron::LocalizedProposal {
 round_number: proposal.round_number as usize,
 proposal: proposal.proposal,
 digest: proposal.digest,
Expand All@@ -112,18 +115,18 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 trace!(target: "bft", "importing proposal message for round {} from {}", proposal.round_number, Hash::from(proposal.sender.0));
 proposal
 }),
 msg::SignedConsensusMessage::Vote(vote) => bft::generic::LocalizedMessage::Vote({
 msg::SignedConsensusMessage::Vote(vote) => ::rhododendron::LocalizedMessage::Vote({
 if &vote.sender == local_id { return Ok(None) }
 let vote = bft::generic::LocalizedVote {
 let vote = ::rhododendron::LocalizedVote {
 sender: vote.sender,
 signature: ed25519::LocalizedSignature {
 signature: vote.signature,
 signer: ed25519::Public(vote.sender.0),
 },
 vote: match vote.vote {
 msg::ConsensusVote::Prepare(r, h) => bft::generic::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => bft::generic::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => bft::generic::Vote::AdvanceRound(r as usize),
 msg::ConsensusVote::Prepare(r, h) => ::rhododendron::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => ::rhododendron::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => ::rhododendron::Vote::AdvanceRound(r as usize),
 }
 };
 bft::check_vote::<Block>(authorities, &msg.parent_hash, &vote)?;
Expand All@@ -137,7 +140,7 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 // TODO: get proper error
 let justification: Result<_, bft::Error> = bft::check_prepare_justification::<Block>(authorities, msg.parent_hash, justification)
 .map_err(|_| bft::ErrorKind::InvalidJustification.into());
bft::generic::Communication::Auxiliary(justification?)
::rhododendron::Communication::Auxiliary(justification?)
 },
	}))
}
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ extern crate ed25519;
extern crate futures;
extern crate parking_lot;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate log;
Expand Down

1 change: 1 addition & 0 deletions
substrate/bft/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ tokio = "0.1.7"
parking_lot = "0.4"
error-chain = "0.12"
log = "0.3"
rhododendron = "0.2"

[dev-dependencies]
substrate-keyring = { path = "../keyring" }
Expand Down

4 changes: 2 additions & 2 deletions
substrate/bft/src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ error_chain! {
	}
}

impl From<::generic::InputStreamConcluded> for Error {
	fn from(_: ::generic::InputStreamConcluded) -> Error {
impl From<::rhododendron::InputStreamConcluded> for Error {
	fn from(_: ::rhododendron::InputStreamConcluded) -> Error {
 ErrorKind::IoTerminated.into()
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
PoC-1 consensus extracted to "rhododendron" by rphmeier · Pull Request #284 · paritytech/substrate · GitHub
Skip to content

This repository was archived by the owner on Nov 15, 2023. It is now read-only.

PoC-1 consensus extracted to "rhododendron"#284
 Merged

gavofyork
merged 2 commits into

from

Jul 9, 2018
 Merged


PoC-1 consensus extracted to "rhododendron"
#284
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ed835ff

PoC-1 consensus extracted to "rhododendron"


rphmeier Jul 6, 2018
a568b75

Merge branch 'master' into rh-extract-poc1-consensus


rphmeier Jul 6, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 17 additions & 1 deletion
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
polkadot/consensus/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ ed25519 = { path = "../../substrate/ed25519" }
error-chain = "0.12"
log = "0.3"
exit-future = "0.1"
rhododendron = "0.2"
polkadot-api = { path = "../api" }
polkadot-collator = { path = "../collator" }
polkadot-parachain = { path = "../parachain" }
Expand Down

3 changes: 2 additions & 1 deletion
polkadot/consensus/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ extern crate substrate_client as client;

extern crate exit_future;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate error_chain;
Expand DownExpand Up@@ -531,7 +532,7 @@ impl<C> bft::Proposer<Block> for Proposer<C>
	}

	fn import_misbehavior(&self, misbehavior: Vec<(AuthorityId, bft::Misbehavior<Hash>)>) {
 use bft::generic::Misbehavior as GenericMisbehavior;
 use rhododendron::Misbehavior as GenericMisbehavior;
 use runtime_primitives::bft::{MisbehaviorKind, MisbehaviorReport};
 use runtime_primitives::MaybeUnsigned;
 use polkadot_runtime::{Call, Extrinsic, BareExtrinsic, UncheckedExtrinsic, ConsensusCall};
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,4 @@ ed25519 = { path = "../../substrate/ed25519" }
futures = "0.1"
tokio = "0.1.7"
log = "0.4"
rhododendron = "0.2"

35 changes: 19 additions & 16 deletions
polkadot/network/src/consensus.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,26 +53,29 @@ impl<E> Sink for BftSink<E> {
	fn start_send(&mut self, message: bft::Communication<Block>) -> ::futures::StartSend<bft::Communication<Block>, E> {
 let network_message = net::LocalizedBftMessage {
 message: match message {
bft::generic::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
bft::generic::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
::rhododendron::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
::rhododendron::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
 round_number: proposal.round_number as u32,
 proposal: proposal.proposal,
 digest: proposal.digest,
 sender: proposal.sender,
 digest_signature: proposal.digest_signature.signature,
 full_signature: proposal.full_signature.signature,
 }),
bft::generic::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
::rhododendron::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
 sender: vote.sender,
 signature: vote.signature.signature,
 vote: match vote.vote {
bft::generic::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
bft::generic::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
bft::generic::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
::rhododendron::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
::rhododendron::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
::rhododendron::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
 }
 }),
 }),
 bft::generic::Communication::Auxiliary(justification) => msg::BftMessage::Auxiliary(justification.uncheck().into()),
 ::rhododendron::Communication::Auxiliary(justification) => {
 let unchecked: bft::UncheckedJustification<_> = justification.uncheck().into();
 msg::BftMessage::Auxiliary(unchecked.into())
 }
 },
 parent_hash: self.parent_hash,
 };
Expand All@@ -90,10 +93,10 @@ impl<E> Sink for BftSink<E> {
// check signature and authority validity of message.
fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &SessionKey, authorities: &[SessionKey]) -> Result<Option<bft::Communication<Block>>, bft::Error> {
	Ok(Some(match msg.message {
 msg::BftMessage::Consensus(c) => bft::generic::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => bft::generic::LocalizedMessage::Propose({
 msg::BftMessage::Consensus(c) => ::rhododendron::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => ::rhododendron::LocalizedMessage::Propose({
 if &proposal.sender == local_id { return Ok(None) }
 let proposal = bft::generic::LocalizedProposal {
 let proposal = ::rhododendron::LocalizedProposal {
 round_number: proposal.round_number as usize,
 proposal: proposal.proposal,
 digest: proposal.digest,
Expand All@@ -112,18 +115,18 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 trace!(target: "bft", "importing proposal message for round {} from {}", proposal.round_number, Hash::from(proposal.sender.0));
 proposal
 }),
 msg::SignedConsensusMessage::Vote(vote) => bft::generic::LocalizedMessage::Vote({
 msg::SignedConsensusMessage::Vote(vote) => ::rhododendron::LocalizedMessage::Vote({
 if &vote.sender == local_id { return Ok(None) }
 let vote = bft::generic::LocalizedVote {
 let vote = ::rhododendron::LocalizedVote {
 sender: vote.sender,
 signature: ed25519::LocalizedSignature {
 signature: vote.signature,
 signer: ed25519::Public(vote.sender.0),
 },
 vote: match vote.vote {
 msg::ConsensusVote::Prepare(r, h) => bft::generic::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => bft::generic::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => bft::generic::Vote::AdvanceRound(r as usize),
 msg::ConsensusVote::Prepare(r, h) => ::rhododendron::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => ::rhododendron::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => ::rhododendron::Vote::AdvanceRound(r as usize),
 }
 };
 bft::check_vote::<Block>(authorities, &msg.parent_hash, &vote)?;
Expand All@@ -137,7 +140,7 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 // TODO: get proper error
 let justification: Result<_, bft::Error> = bft::check_prepare_justification::<Block>(authorities, msg.parent_hash, justification)
 .map_err(|_| bft::ErrorKind::InvalidJustification.into());
bft::generic::Communication::Auxiliary(justification?)
::rhododendron::Communication::Auxiliary(justification?)
 },
	}))
}
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ extern crate ed25519;
extern crate futures;
extern crate parking_lot;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate log;
Expand Down

1 change: 1 addition & 0 deletions
substrate/bft/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ tokio = "0.1.7"
parking_lot = "0.4"
error-chain = "0.12"
log = "0.3"
rhododendron = "0.2"

[dev-dependencies]
substrate-keyring = { path = "../keyring" }
Expand Down

4 changes: 2 additions & 2 deletions
substrate/bft/src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ error_chain! {
	}
}

impl From<::generic::InputStreamConcluded> for Error {
	fn from(_: ::generic::InputStreamConcluded) -> Error {
impl From<::rhododendron::InputStreamConcluded> for Error {
	fn from(_: ::rhododendron::InputStreamConcluded) -> Error {
 ErrorKind::IoTerminated.into()
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PoC-1 consensus extracted to "rhododendron" by rphmeier · Pull Request #284 · paritytech/substrate · GitHub
Skip to content

This repository was archived by the owner on Nov 15, 2023. It is now read-only.

PoC-1 consensus extracted to "rhododendron"#284
 Merged

gavofyork
merged 2 commits into

from

Jul 9, 2018
 Merged


PoC-1 consensus extracted to "rhododendron"
#284
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ed835ff

PoC-1 consensus extracted to "rhododendron"


rphmeier Jul 6, 2018
a568b75

Merge branch 'master' into rh-extract-poc1-consensus


rphmeier Jul 6, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 17 additions & 1 deletion
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
polkadot/consensus/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ ed25519 = { path = "../../substrate/ed25519" }
error-chain = "0.12"
log = "0.3"
exit-future = "0.1"
rhododendron = "0.2"
polkadot-api = { path = "../api" }
polkadot-collator = { path = "../collator" }
polkadot-parachain = { path = "../parachain" }
Expand Down

3 changes: 2 additions & 1 deletion
polkadot/consensus/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ extern crate substrate_client as client;

extern crate exit_future;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate error_chain;
Expand DownExpand Up@@ -531,7 +532,7 @@ impl<C> bft::Proposer<Block> for Proposer<C>
	}

	fn import_misbehavior(&self, misbehavior: Vec<(AuthorityId, bft::Misbehavior<Hash>)>) {
 use bft::generic::Misbehavior as GenericMisbehavior;
 use rhododendron::Misbehavior as GenericMisbehavior;
 use runtime_primitives::bft::{MisbehaviorKind, MisbehaviorReport};
 use runtime_primitives::MaybeUnsigned;
 use polkadot_runtime::{Call, Extrinsic, BareExtrinsic, UncheckedExtrinsic, ConsensusCall};
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,4 @@ ed25519 = { path = "../../substrate/ed25519" }
futures = "0.1"
tokio = "0.1.7"
log = "0.4"
rhododendron = "0.2"

35 changes: 19 additions & 16 deletions
polkadot/network/src/consensus.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,26 +53,29 @@ impl<E> Sink for BftSink<E> {
	fn start_send(&mut self, message: bft::Communication<Block>) -> ::futures::StartSend<bft::Communication<Block>, E> {
 let network_message = net::LocalizedBftMessage {
 message: match message {
bft::generic::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
bft::generic::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
::rhododendron::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
::rhododendron::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
 round_number: proposal.round_number as u32,
 proposal: proposal.proposal,
 digest: proposal.digest,
 sender: proposal.sender,
 digest_signature: proposal.digest_signature.signature,
 full_signature: proposal.full_signature.signature,
 }),
bft::generic::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
::rhododendron::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
 sender: vote.sender,
 signature: vote.signature.signature,
 vote: match vote.vote {
bft::generic::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
bft::generic::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
bft::generic::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
::rhododendron::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
::rhododendron::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
::rhododendron::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
 }
 }),
 }),
 bft::generic::Communication::Auxiliary(justification) => msg::BftMessage::Auxiliary(justification.uncheck().into()),
 ::rhododendron::Communication::Auxiliary(justification) => {
 let unchecked: bft::UncheckedJustification<_> = justification.uncheck().into();
 msg::BftMessage::Auxiliary(unchecked.into())
 }
 },
 parent_hash: self.parent_hash,
 };
Expand All@@ -90,10 +93,10 @@ impl<E> Sink for BftSink<E> {
// check signature and authority validity of message.
fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &SessionKey, authorities: &[SessionKey]) -> Result<Option<bft::Communication<Block>>, bft::Error> {
	Ok(Some(match msg.message {
 msg::BftMessage::Consensus(c) => bft::generic::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => bft::generic::LocalizedMessage::Propose({
 msg::BftMessage::Consensus(c) => ::rhododendron::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => ::rhododendron::LocalizedMessage::Propose({
 if &proposal.sender == local_id { return Ok(None) }
 let proposal = bft::generic::LocalizedProposal {
 let proposal = ::rhododendron::LocalizedProposal {
 round_number: proposal.round_number as usize,
 proposal: proposal.proposal,
 digest: proposal.digest,
Expand All@@ -112,18 +115,18 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 trace!(target: "bft", "importing proposal message for round {} from {}", proposal.round_number, Hash::from(proposal.sender.0));
 proposal
 }),
 msg::SignedConsensusMessage::Vote(vote) => bft::generic::LocalizedMessage::Vote({
 msg::SignedConsensusMessage::Vote(vote) => ::rhododendron::LocalizedMessage::Vote({
 if &vote.sender == local_id { return Ok(None) }
 let vote = bft::generic::LocalizedVote {
 let vote = ::rhododendron::LocalizedVote {
 sender: vote.sender,
 signature: ed25519::LocalizedSignature {
 signature: vote.signature,
 signer: ed25519::Public(vote.sender.0),
 },
 vote: match vote.vote {
 msg::ConsensusVote::Prepare(r, h) => bft::generic::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => bft::generic::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => bft::generic::Vote::AdvanceRound(r as usize),
 msg::ConsensusVote::Prepare(r, h) => ::rhododendron::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => ::rhododendron::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => ::rhododendron::Vote::AdvanceRound(r as usize),
 }
 };
 bft::check_vote::<Block>(authorities, &msg.parent_hash, &vote)?;
Expand All@@ -137,7 +140,7 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 // TODO: get proper error
 let justification: Result<_, bft::Error> = bft::check_prepare_justification::<Block>(authorities, msg.parent_hash, justification)
 .map_err(|_| bft::ErrorKind::InvalidJustification.into());
bft::generic::Communication::Auxiliary(justification?)
::rhododendron::Communication::Auxiliary(justification?)
 },
	}))
}
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ extern crate ed25519;
extern crate futures;
extern crate parking_lot;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate log;
Expand Down

1 change: 1 addition & 0 deletions
substrate/bft/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ tokio = "0.1.7"
parking_lot = "0.4"
error-chain = "0.12"
log = "0.3"
rhododendron = "0.2"

[dev-dependencies]
substrate-keyring = { path = "../keyring" }
Expand Down

4 changes: 2 additions & 2 deletions
substrate/bft/src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ error_chain! {
	}
}

impl From<::generic::InputStreamConcluded> for Error {
	fn from(_: ::generic::InputStreamConcluded) -> Error {
impl From<::rhododendron::InputStreamConcluded> for Error {
	fn from(_: ::rhododendron::InputStreamConcluded) -> Error {
 ErrorKind::IoTerminated.into()
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
PoC-1 consensus extracted to "rhododendron" by rphmeier · Pull Request #284 · paritytech/substrate · GitHub
Skip to content

This repository was archived by the owner on Nov 15, 2023. It is now read-only.

PoC-1 consensus extracted to "rhododendron"#284
 Merged

gavofyork
merged 2 commits into

from

Jul 9, 2018
 Merged


PoC-1 consensus extracted to "rhododendron"
#284
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ed835ff

PoC-1 consensus extracted to "rhododendron"


rphmeier Jul 6, 2018
a568b75

Merge branch 'master' into rh-extract-poc1-consensus


rphmeier Jul 6, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 17 additions & 1 deletion
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
polkadot/consensus/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ ed25519 = { path = "../../substrate/ed25519" }
error-chain = "0.12"
log = "0.3"
exit-future = "0.1"
rhododendron = "0.2"
polkadot-api = { path = "../api" }
polkadot-collator = { path = "../collator" }
polkadot-parachain = { path = "../parachain" }
Expand Down

3 changes: 2 additions & 1 deletion
polkadot/consensus/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ extern crate substrate_client as client;

extern crate exit_future;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate error_chain;
Expand DownExpand Up@@ -531,7 +532,7 @@ impl<C> bft::Proposer<Block> for Proposer<C>
	}

	fn import_misbehavior(&self, misbehavior: Vec<(AuthorityId, bft::Misbehavior<Hash>)>) {
 use bft::generic::Misbehavior as GenericMisbehavior;
 use rhododendron::Misbehavior as GenericMisbehavior;
 use runtime_primitives::bft::{MisbehaviorKind, MisbehaviorReport};
 use runtime_primitives::MaybeUnsigned;
 use polkadot_runtime::{Call, Extrinsic, BareExtrinsic, UncheckedExtrinsic, ConsensusCall};
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,4 @@ ed25519 = { path = "../../substrate/ed25519" }
futures = "0.1"
tokio = "0.1.7"
log = "0.4"
rhododendron = "0.2"

35 changes: 19 additions & 16 deletions
polkadot/network/src/consensus.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,26 +53,29 @@ impl<E> Sink for BftSink<E> {
	fn start_send(&mut self, message: bft::Communication<Block>) -> ::futures::StartSend<bft::Communication<Block>, E> {
 let network_message = net::LocalizedBftMessage {
 message: match message {
bft::generic::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
bft::generic::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
::rhododendron::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
::rhododendron::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
 round_number: proposal.round_number as u32,
 proposal: proposal.proposal,
 digest: proposal.digest,
 sender: proposal.sender,
 digest_signature: proposal.digest_signature.signature,
 full_signature: proposal.full_signature.signature,
 }),
bft::generic::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
::rhododendron::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
 sender: vote.sender,
 signature: vote.signature.signature,
 vote: match vote.vote {
bft::generic::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
bft::generic::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
bft::generic::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
::rhododendron::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
::rhododendron::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
::rhododendron::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
 }
 }),
 }),
 bft::generic::Communication::Auxiliary(justification) => msg::BftMessage::Auxiliary(justification.uncheck().into()),
 ::rhododendron::Communication::Auxiliary(justification) => {
 let unchecked: bft::UncheckedJustification<_> = justification.uncheck().into();
 msg::BftMessage::Auxiliary(unchecked.into())
 }
 },
 parent_hash: self.parent_hash,
 };
Expand All@@ -90,10 +93,10 @@ impl<E> Sink for BftSink<E> {
// check signature and authority validity of message.
fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &SessionKey, authorities: &[SessionKey]) -> Result<Option<bft::Communication<Block>>, bft::Error> {
	Ok(Some(match msg.message {
 msg::BftMessage::Consensus(c) => bft::generic::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => bft::generic::LocalizedMessage::Propose({
 msg::BftMessage::Consensus(c) => ::rhododendron::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => ::rhododendron::LocalizedMessage::Propose({
 if &proposal.sender == local_id { return Ok(None) }
 let proposal = bft::generic::LocalizedProposal {
 let proposal = ::rhododendron::LocalizedProposal {
 round_number: proposal.round_number as usize,
 proposal: proposal.proposal,
 digest: proposal.digest,
Expand All@@ -112,18 +115,18 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 trace!(target: "bft", "importing proposal message for round {} from {}", proposal.round_number, Hash::from(proposal.sender.0));
 proposal
 }),
 msg::SignedConsensusMessage::Vote(vote) => bft::generic::LocalizedMessage::Vote({
 msg::SignedConsensusMessage::Vote(vote) => ::rhododendron::LocalizedMessage::Vote({
 if &vote.sender == local_id { return Ok(None) }
 let vote = bft::generic::LocalizedVote {
 let vote = ::rhododendron::LocalizedVote {
 sender: vote.sender,
 signature: ed25519::LocalizedSignature {
 signature: vote.signature,
 signer: ed25519::Public(vote.sender.0),
 },
 vote: match vote.vote {
 msg::ConsensusVote::Prepare(r, h) => bft::generic::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => bft::generic::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => bft::generic::Vote::AdvanceRound(r as usize),
 msg::ConsensusVote::Prepare(r, h) => ::rhododendron::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => ::rhododendron::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => ::rhododendron::Vote::AdvanceRound(r as usize),
 }
 };
 bft::check_vote::<Block>(authorities, &msg.parent_hash, &vote)?;
Expand All@@ -137,7 +140,7 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 // TODO: get proper error
 let justification: Result<_, bft::Error> = bft::check_prepare_justification::<Block>(authorities, msg.parent_hash, justification)
 .map_err(|_| bft::ErrorKind::InvalidJustification.into());
bft::generic::Communication::Auxiliary(justification?)
::rhododendron::Communication::Auxiliary(justification?)
 },
	}))
}
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ extern crate ed25519;
extern crate futures;
extern crate parking_lot;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate log;
Expand Down

1 change: 1 addition & 0 deletions
substrate/bft/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ tokio = "0.1.7"
parking_lot = "0.4"
error-chain = "0.12"
log = "0.3"
rhododendron = "0.2"

[dev-dependencies]
substrate-keyring = { path = "../keyring" }
Expand Down

4 changes: 2 additions & 2 deletions
substrate/bft/src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ error_chain! {
	}
}

impl From<::generic::InputStreamConcluded> for Error {
	fn from(_: ::generic::InputStreamConcluded) -> Error {
impl From<::rhododendron::InputStreamConcluded> for Error {
	fn from(_: ::rhododendron::InputStreamConcluded) -> Error {
 ErrorKind::IoTerminated.into()
	}
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
PoC-1 consensus extracted to "rhododendron" by rphmeier · Pull Request #284 · paritytech/substrate · GitHub
Skip to content

This repository was archived by the owner on Nov 15, 2023. It is now read-only.

PoC-1 consensus extracted to "rhododendron"#284
 Merged

gavofyork
merged 2 commits into

from

Jul 9, 2018
 Merged


PoC-1 consensus extracted to "rhododendron"
#284
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
ed835ff

PoC-1 consensus extracted to "rhododendron"


rphmeier Jul 6, 2018
a568b75

Merge branch 'master' into rh-extract-poc1-consensus


rphmeier Jul 6, 2018

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


18 changes: 17 additions & 1 deletion
Cargo.lock

View file


Open in desktop


Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.


1 change: 1 addition & 0 deletions
polkadot/consensus/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ ed25519 = { path = "../../substrate/ed25519" }
error-chain = "0.12"
log = "0.3"
exit-future = "0.1"
rhododendron = "0.2"
polkadot-api = { path = "../api" }
polkadot-collator = { path = "../collator" }
polkadot-parachain = { path = "../parachain" }
Expand Down

3 changes: 2 additions & 1 deletion
polkadot/consensus/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,6 +48,7 @@ extern crate substrate_client as client;

extern crate exit_future;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate error_chain;
Expand DownExpand Up@@ -531,7 +532,7 @@ impl<C> bft::Proposer<Block> for Proposer<C>
	}

	fn import_misbehavior(&self, misbehavior: Vec<(AuthorityId, bft::Misbehavior<Hash>)>) {
 use bft::generic::Misbehavior as GenericMisbehavior;
 use rhododendron::Misbehavior as GenericMisbehavior;
 use runtime_primitives::bft::{MisbehaviorKind, MisbehaviorReport};
 use runtime_primitives::MaybeUnsigned;
 use polkadot_runtime::{Call, Extrinsic, BareExtrinsic, UncheckedExtrinsic, ConsensusCall};
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -20,3 +20,4 @@ ed25519 = { path = "../../substrate/ed25519" }
futures = "0.1"
tokio = "0.1.7"
log = "0.4"
rhododendron = "0.2"

35 changes: 19 additions & 16 deletions
polkadot/network/src/consensus.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -53,26 +53,29 @@ impl<E> Sink for BftSink<E> {
	fn start_send(&mut self, message: bft::Communication<Block>) -> ::futures::StartSend<bft::Communication<Block>, E> {
 let network_message = net::LocalizedBftMessage {
 message: match message {
bft::generic::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
bft::generic::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
::rhododendron::Communication::Consensus(c) => msg::BftMessage::Consensus(match c {
::rhododendron::LocalizedMessage::Propose(proposal) => msg::SignedConsensusMessage::Propose(msg::SignedConsensusProposal {
 round_number: proposal.round_number as u32,
 proposal: proposal.proposal,
 digest: proposal.digest,
 sender: proposal.sender,
 digest_signature: proposal.digest_signature.signature,
 full_signature: proposal.full_signature.signature,
 }),
bft::generic::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
::rhododendron::LocalizedMessage::Vote(vote) => msg::SignedConsensusMessage::Vote(msg::SignedConsensusVote {
 sender: vote.sender,
 signature: vote.signature.signature,
 vote: match vote.vote {
bft::generic::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
bft::generic::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
bft::generic::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
::rhododendron::Vote::Prepare(r, h) => msg::ConsensusVote::Prepare(r as u32, h),
::rhododendron::Vote::Commit(r, h) => msg::ConsensusVote::Commit(r as u32, h),
::rhododendron::Vote::AdvanceRound(r) => msg::ConsensusVote::AdvanceRound(r as u32),
 }
 }),
 }),
 bft::generic::Communication::Auxiliary(justification) => msg::BftMessage::Auxiliary(justification.uncheck().into()),
 ::rhododendron::Communication::Auxiliary(justification) => {
 let unchecked: bft::UncheckedJustification<_> = justification.uncheck().into();
 msg::BftMessage::Auxiliary(unchecked.into())
 }
 },
 parent_hash: self.parent_hash,
 };
Expand All@@ -90,10 +93,10 @@ impl<E> Sink for BftSink<E> {
// check signature and authority validity of message.
fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &SessionKey, authorities: &[SessionKey]) -> Result<Option<bft::Communication<Block>>, bft::Error> {
	Ok(Some(match msg.message {
 msg::BftMessage::Consensus(c) => bft::generic::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => bft::generic::LocalizedMessage::Propose({
 msg::BftMessage::Consensus(c) => ::rhododendron::Communication::Consensus(match c {
 msg::SignedConsensusMessage::Propose(proposal) => ::rhododendron::LocalizedMessage::Propose({
 if &proposal.sender == local_id { return Ok(None) }
 let proposal = bft::generic::LocalizedProposal {
 let proposal = ::rhododendron::LocalizedProposal {
 round_number: proposal.round_number as usize,
 proposal: proposal.proposal,
 digest: proposal.digest,
Expand All@@ -112,18 +115,18 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 trace!(target: "bft", "importing proposal message for round {} from {}", proposal.round_number, Hash::from(proposal.sender.0));
 proposal
 }),
 msg::SignedConsensusMessage::Vote(vote) => bft::generic::LocalizedMessage::Vote({
 msg::SignedConsensusMessage::Vote(vote) => ::rhododendron::LocalizedMessage::Vote({
 if &vote.sender == local_id { return Ok(None) }
 let vote = bft::generic::LocalizedVote {
 let vote = ::rhododendron::LocalizedVote {
 sender: vote.sender,
 signature: ed25519::LocalizedSignature {
 signature: vote.signature,
 signer: ed25519::Public(vote.sender.0),
 },
 vote: match vote.vote {
 msg::ConsensusVote::Prepare(r, h) => bft::generic::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => bft::generic::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => bft::generic::Vote::AdvanceRound(r as usize),
 msg::ConsensusVote::Prepare(r, h) => ::rhododendron::Vote::Prepare(r as usize, h),
 msg::ConsensusVote::Commit(r, h) => ::rhododendron::Vote::Commit(r as usize, h),
 msg::ConsensusVote::AdvanceRound(r) => ::rhododendron::Vote::AdvanceRound(r as usize),
 }
 };
 bft::check_vote::<Block>(authorities, &msg.parent_hash, &vote)?;
Expand All@@ -137,7 +140,7 @@ fn process_bft_message(msg: msg::LocalizedBftMessage<Block, Hash>, local_id: &Se
 // TODO: get proper error
 let justification: Result<_, bft::Error> = bft::check_prepare_justification::<Block>(authorities, msg.parent_hash, justification)
 .map_err(|_| bft::ErrorKind::InvalidJustification.into());
bft::generic::Communication::Auxiliary(justification?)
::rhododendron::Communication::Auxiliary(justification?)
 },
	}))
}
Expand Down

1 change: 1 addition & 0 deletions
polkadot/network/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -38,6 +38,7 @@ extern crate ed25519;
extern crate futures;
extern crate parking_lot;
extern crate tokio;
extern crate rhododendron;

#[macro_use]
extern crate log;
Expand Down

1 change: 1 addition & 0 deletions
substrate/bft/Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -14,6 +14,7 @@ tokio = "0.1.7"
parking_lot = "0.4"
error-chain = "0.12"
log = "0.3"
rhododendron = "0.2"

[dev-dependencies]
substrate-keyring = { path = "../keyring" }
Expand Down

4 changes: 2 additions & 2 deletions
substrate/bft/src/error.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,8 +74,8 @@ error_chain! {
	}
}

impl From<::generic::InputStreamConcluded> for Error {
	fn from(_: ::generic::InputStreamConcluded) -> Error {
impl From<::rhododendron::InputStreamConcluded> for Error {
	fn from(_: ::rhododendron::InputStreamConcluded) -> Error {
 ErrorKind::IoTerminated.into()
	}
}
Loading