-
Notifications
You must be signed in to change notification settings - Fork 246
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
Upgrade Substrate to stable2409
#3078
Conversation
7c229ad
to
2f9bad9
Compare
Removed custom |
2f9bad9
to
f5e261a
Compare
This seems odd and likely not related to this PR?
Both macOS jobs are impacted: |
@DaMandal0rian I think this is something for you to fix |
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.
Looks good to me, but I don’t have the background to review some of it in detail.
I had one question about task handling, but it’s not a blocker.
Interesting, other PRs passed when I re-ran the tests, maybe it was a temporary issue, or fixed by #3079: |
# Conflicts: # crates/pallet-offences-subspace/Cargo.toml # crates/pallet-subspace/Cargo.toml # crates/sc-consensus-subspace/src/verifier.rs # crates/subspace-runtime/Cargo.toml # test/subspace-test-runtime/Cargo.toml
Merge only had minor |
tx_handler_controller, | ||
network_starter, | ||
sync_service, | ||
_block_downloader, |
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.
Block downloader will be required in the domain snap-sync.
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.
It is still there, just inside build_network
. I have no idea why it was surfaced here, it is actually build_network
's argument 😕
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 meant - domain snap sync requires that variable.
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.
This is how we request last confirmed domain block.
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.
Then you'll simply have to construct default block downloader explicitly hand it over as an argument here. There is a public function in sc-service
now that makes it more convenient to do.
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.
Can you give me more hints or show me the correct function?
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.
build_default_block_downloader
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.
Merge looks good, even if large
This upgrades Substrate to
stable2409
upstream release.A lot of changes are caused by my refactoring of syncing implementation. I didn't take advantage of it yet to reduce the diff.
I have rebased most of the patches we had that are not yet upstreamed, notable exception is Ved's early runtime patch for state version and some of Shamil's patches for Snap sync that are no longer needed (and I have simplified the remaining since they re-exported more than needed with latest upstream refactoring).
On top of stable release I have also backported following PRs that were already merged into
master
or remain open, but have a good chance of getting in soon-ish:RuntimeVerison
type and usesystem_version
to derive extrinsics rootStateVersion
instead ofV0
paritytech/polkadot-sdk#4257sp_runtime::RuntimeString
and replace withCow<'static, str>
orString
depending on use case paritytech/polkadot-sdk#5693 allowed to get rid ofpatch_domain_runtime_version
All of this is in https://github.com/autonomys/polkadot-sdk/tree/subspace-v8, top commit of which is used in this PR.
Frontier has unmerged polkadot-evm/frontier#1504, which I cloned into https://github.com/autonomys/frontier/tree/subspace-v9 and used here.
I recommend ignoring
.toml
files during review due to trivial changes (mostly just hash updates and minor dependency changes where necessary).Code contributor checklist: