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

Update to latest substrate-master and polkadot v0.3 #195

Merged
merged 53 commits into from
Mar 28, 2019
Merged

Conversation

bkchr
Copy link
Member

@bkchr bkchr commented Mar 27, 2019

This branch combines latest polkadot master, v0.3 and substrate master.

andresilva and others added 12 commits March 19, 2019 16:43
* update substrate v0.3 to latest master

* bump spec version

* update to latest master: remove fees module

* update runtime blobs

* bump version to 0.3.16
* call on_finalise after triggering curated_grandpa change

* make grandpa rounds shorter for faster finalization
* update to latest substrate master

* bump version to 0.3.18

* update to latest substrate master

* bump spec version

* update runtime wasm blobs

* remove current_offline_slash from chain spec
* update to substrate master: bump version to v0.3.19

libp2p network improvements

* network: replace NodeIndex with PeerId

* network: fix tests
* update to substrate master: bump version to 0.3.20

* runtime: add offchain worker trait

* runtime: rebuild wasm blobs
Copy link
Contributor

@andresilva andresilva left a comment

Choose a reason for hiding this comment

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

overall lgtm. but would like @rphmeier to sign-off on it.

@@ -1,6 +1,6 @@
[package]
name = "polkadot-service"
version = "0.3.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

we should probably use a different version for master branch (maybe 0.4?).

}

/// Receiver for block data.
pub struct BlockDataReceiver {
Copy link
Contributor

Choose a reason for hiding this comment

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

This doesn't seem to be used anymore.

Cargo.toml Outdated
@@ -4,7 +4,7 @@ path = "src/main.rs"

[package]
name = "polkadot"
version = "0.3.0"
version = "0.3.20"
Copy link
Contributor

Choose a reason for hiding this comment

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

Bump to 0.4?

@@ -254,15 +256,14 @@ construct_runtime!(
Staking: staking,
Democracy: democracy,
Grandpa: grandpa::{Module, Call, Storage, Config<T>, Log(), Event<T>},
CuratedGrandpa: curated_grandpa::{Module, Call, Config<T>, Storage},
Copy link
Contributor

Choose a reason for hiding this comment

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

If we are using curated_grandpa, we should remove grandpa::SyncedAuthorities from OnSessionChange.

Copy link
Contributor

@rphmeier rphmeier left a comment

Choose a reason for hiding this comment

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

just the one grumble, otherwise looks OK

@rphmeier rphmeier merged commit adba1d5 into master Mar 28, 2019
@rphmeier rphmeier deleted the update-substrate branch March 28, 2019 14:20
@bkchr bkchr mentioned this pull request Mar 28, 2019
imstar15 pushed a commit to imstar15/polkadot that referenced this pull request Aug 25, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants