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

Substrate Updates #513

Merged
merged 51 commits into from
Mar 22, 2021
Merged

Substrate Updates #513

merged 51 commits into from
Mar 22, 2021

Conversation

aurexav
Copy link
Member

@aurexav aurexav commented Mar 9, 2021 •
edited
Loading

@aurexav aurexav marked this pull request as draft March 9, 2021 07:40
@aurexav aurexav assigned aurexav and unassigned aurexav Mar 9, 2021
aurexav and others added 10 commits March 12, 2021 14:12
@aurexav
Merge remote-tracking branch 'origin/master' into rococo-v1
47bb3f0
@aurexav
Merge commit '0abe99cd2a9fecea7783bfa82a049931c5af9fcd' into rococo-v1
0770a6f
@aurexav
update dependencies
55e6c6f
@aurexav
Merge remote-tracking branch 'origin/master' into rococo-v1
015053c
@boundless-forest
EVM Deps Updates (#536)
da00f57
@aurexav
Update Parity Common (#532)
753a53b 
* try update deps - part 1

* try update deps - part 2

* update codec version

* add missing feature

* add missing feature

* update dependencies

* try update deps - part 3 & migrate mock to `construct_runtime`

* update format

* companion for #substrate-8128 - part 1

* companion for #substrate-8128 - part 2

* migrate mock to `construct_runtime`

* try update deps - part 4

* companion for #substrate-8128  - part 3

* migrate mock to `construct_runtime`

* migrate mock to `construct_runtime`

* update format

* resolve conflicts

* remove test env
@aurexav
companion for #substrate-8128
5ca81ba
@aurexav
update dvm deps
14d1752
@aurexav
companion for #substrate-7127
7ee8ca2
@aurexav
fix compile
0e29fd7
@aurexav aurexav marked this pull request as ready for review March 16, 2021 11:54
@aurexav
Copy link
Member Author

aurexav commented Mar 16, 2021

Ready for review.

But DO NOT merge into master.

This was linked to issues Mar 16, 2021
Merge from Branch rococo-v1 #506
Closed
Frontier with Codec 2.0.0 #511
Closed
hackfisher
hackfisher reviewed Mar 17, 2021
View reviewed changes
Copy link
Contributor

@hackfisher hackfisher left a comment

Choose a reason for hiding this comment

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

What would be the dep problems since
{ git = "https://github.com/darwinia-network/substrate.git", tag = "rococo-v1.1" }
and
{ git = "https://github.com/paritytech/substrate.git", branch = "rococo-v1" }

are pointing to the same commit 645299e ?

@aurexav
Copy link
Member Author

aurexav commented Mar 17, 2021

What would be the dep problems since
{ git = "https://github.com/darwinia-network/substrate.git", tag = "rococo-v1.1" }
and
{ git = "https://github.com/paritytech/substrate.git", branch = "rococo-v1" }

are pointing to the same commit 645299e ?

Yes

@hackfisher
Copy link
Contributor

The changes from polkadot-v0.8.29 to rococo v1 branch

paritytech/substrate@polkadot-v0.8.29...rococo-v1

@aurexav aurexav marked this pull request as draft March 17, 2021 09:13
@aurexav
Copy link
Member Author

aurexav commented Mar 17, 2021

Before merge, switch the deps back to darwinia-network/substrate

@hackfisher
Copy link
Contributor

My question is for the darwinia-common used by next runtime, which substrate commit should we use.

To safely follow best upgrade practice, it seems better to first upgrade substrate dep used by polkadot-v0.8.29.

But this might need to create a separate branch for merging, and which may share early changes, or we need to carefully check the changes from polkadot-v0.8.29 branch to rococo v1 branch

@aurexav
Copy link
Member Author

aurexav commented Mar 17, 2021

My question is for the darwinia-common used by next runtime, which substrate commit should we use.

To safely follow best upgrade practice, it seems better to first upgrade substrate dep used by polkadot-v0.8.29.

But this might need to create a separate branch for merging, and which may share early changes, or we need to carefully check the changes from polkadot-v0.8.29 branch to rococo v1 branch

We should apply the tag 2.0.0 upgrade first.

And for this one.

  1. Revert some changes before next runtime upgrade
  2. Upgrade to rococo-v1 state
  3. Maybe 0.8.30 is coming soon, check the migrations if there's not some big changes then skip 0.8.29

@aurexav aurexav linked an issue Mar 19, 2021 that may be closed by this pull request
Move Ropsten Bridge from Crab to Pangolin #522
Closed
@aurexav aurexav added C-Substrate [Component] Something about Substrate P-High [Priority] High labels Mar 19, 2021
@aurexav aurexav marked this pull request as ready for review March 19, 2021 19:25
@aurexav aurexav added P9 High and removed P-High [Priority] High labels Mar 19, 2021
@hackfisher hackfisher merged commit 235e3cb into master Mar 22, 2021
@hackfisher hackfisher deleted the rococo-v1 branch March 22, 2021 05:40
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@hackfisher hackfisher hackfisher approved these changes

@boundless-forest boundless-forest Awaiting requested review from boundless-forest

@clearloop clearloop Awaiting requested review from clearloop

@yanganto yanganto Awaiting requested review from yanganto

Assignees
No one assigned
Labels
C-Substrate [Component] Something about Substrate
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Move Ropsten Bridge from Crab to Pangolin Frontier with Codec 2.0.0 Merge from Branch rococo-v1
3 participants
@aurexav @hackfisher @boundless-forest