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

Companion PR for #6215 #1654

Merged
merged 8 commits into from
Sep 18, 2020
Merged

Companion PR for #6215 #1654

merged 8 commits into from
Sep 18, 2020

Conversation

octol
Copy link
Contributor

@octol octol commented Aug 28, 2020

Add an on-demand API that clients can call to catch up on the stream of proofs if they need to fill in missing proofs. For example after a period of being offline.

companion PR for: paritytech/substrate#6215

@octol octol added A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels Aug 28, 2020
Copy link
Contributor

@tomusdrw tomusdrw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm!

rpc/src/lib.rs Outdated
Comment on lines 102 to 103
B: Send + Sync + 'static + sc_client_api::Backend<Block>,
<B as sc_client_api::Backend<Block>>::State: sp_state_machine::Backend<BlakeTwo256>,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
B: Send + Sync + 'static + sc_client_api::Backend<Block>,
<B as sc_client_api::Backend<Block>>::State: sp_state_machine::Backend<BlakeTwo256>,
B: sc_client_api::Backend<Block> + Send + Sync + 'static,
B::State: sp_state_machine::Backend<sp_runtime::traits::HashFor<Block>>,

rpc/src/lib.rs Outdated
use sp_blockchain::{HeaderBackend, HeaderMetadata, Error as BlockChainError};
use sp_consensus::SelectChain;
use sp_consensus_babe::BabeApi;
use sp_runtime::traits::BlakeTwo256;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
use sp_runtime::traits::BlakeTwo256;

rpc/Cargo.toml Outdated
@@ -13,6 +13,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-consensus-babe = { git = "https://github.com/paritytech/substrate", branch = "master" }
sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master"}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it can be removed with the edits below.

@ghost
Copy link

ghost commented Sep 18, 2020

Waiting for commit status.

@andresilva
Copy link
Contributor

Blocked by #1734. Should be good to go after that.

@ghost
Copy link

ghost commented Sep 18, 2020

Head SHA changed; merge aborted.

@andresilva
Copy link
Contributor

bot merge

@ghost
Copy link

ghost commented Sep 18, 2020

Waiting for commit status.

@ghost
Copy link

ghost commented Sep 18, 2020

Merge failed: "At least 3 approving reviews are required by reviewers with write access."

@bkchr
Copy link
Member

bkchr commented Sep 18, 2020

(The pr also needs to update node/service/src/lib.rs)

@bkchr
Copy link
Member

bkchr commented Sep 18, 2020

(The pr also needs to update node/service/src/lib.rs)

Thank you @octol, I realized I was stupid.

@bkchr bkchr merged commit e9a004b into master Sep 18, 2020
@bkchr bkchr deleted the jon/on-demand-grandpa-finality-api branch September 18, 2020 20:09
ordian added a commit that referenced this pull request Sep 21, 2020
* master:
  Bump jsonrpc-core to v15 (#1737)
  Companion PR for #6215 (#1654)
  Companion PR for #7138 (WeightInfo for Scheduler) (#1734)
  Companion PR for Bounties #5715 (#1336)
ordian added a commit that referenced this pull request Sep 22, 2020
* master:
  Companion for 7155 (WeightInfo for Babe and Grandpa) (#1736)
  Companion PR for #7136 (WeightInfo for Session / Offences) (#1735)
  Bump jsonrpc-core to v15 (#1737)
  Companion PR for #6215 (#1654)
  Companion PR for #7138 (WeightInfo for Scheduler) (#1734)
  Companion PR for Bounties #5715 (#1336)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-please_review Pull request needs code review. B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants