-
Notifications
You must be signed in to change notification settings - Fork 131
Bump Substrate to RC5 #243
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
There was a bug in v.1.6.0 which kept us locked to v1.5 releases. I think that's fixed now so I'm bumping this.
bin/node/node/src/service.rs
Outdated
| use grandpa::{self, FinalityProofProvider as GrandpaFinalityProofProvider, SharedVoterState, StorageAndProofProvider}; | ||
| use sc_client_api::ExecutorProvider; | ||
| use sc_consensus::LongestChain; | ||
| use bridge_node_runtime::{self, Block, RuntimeApi}; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it necessary for us to have that file at all? Isn't it possible to reference the service builder from substrate somehow?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No, I don't think so
This comes from Substrate, so I'd rather just keep the code as is
|
Ah, I forgot about the benchmark changes. I'll fix those tomorrow-ish |
tomusdrw
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lgtm!
| let (grandpa_block_import, grandpa_link) = | ||
| sc_finality_grandpa::block_import(client.clone(), &(client.clone() as Arc<_>), select_chain.clone())?; | ||
|
|
||
| let aura_block_import = |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I didn't notice that earlier, but we run with AuRa + Grandpa? That's pretty cool and hopefully works :)
* Bump Substrate to rc5 * Bump async-std to v1.6.2 There was a bug in v.1.6.0 which kept us locked to v1.5 releases. I think that's fixed now so I'm bumping this. * Update bridge node runtime * Update node service * Update CLI * Add SystemWeightInfo type to test runtimes * Add RPC extension builder to service * Directly return rpc_extensions_builder * Allow complex types in service This comes from Substrate, so I'd rather just keep the code as is * Update benchmarking code for new CLI
* Bump Substrate to rc5 * Bump async-std to v1.6.2 There was a bug in v.1.6.0 which kept us locked to v1.5 releases. I think that's fixed now so I'm bumping this. * Update bridge node runtime * Update node service * Update CLI * Add SystemWeightInfo type to test runtimes * Add RPC extension builder to service * Directly return rpc_extensions_builder * Allow complex types in service This comes from Substrate, so I'd rather just keep the code as is * Update benchmarking code for new CLI
I figured I'd end my day with something easy, but turns out that the changes in
service.rswere a bit hairy (introduced in paritytech/substrate#6557). I ended up copying the updatednode-templateinstead of digging through everything.Keeping it as a draft because I need to fix the RPC extensions in the service, and I want to double check I haven't accidentally screwed the node up.