-
Notifications
You must be signed in to change notification settings - Fork 47
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 7406442bea0194ffcafc4e8d48d895d4d8d11346 #540
Conversation
Please don't merge for now. |
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, only one minor comment, otherwise we can merge. Thanks for your hard work on this one!
loop { | ||
let ret: ProcessedParentchainBlockArgs = _chain_api | ||
.wait_for_event::<ProcessedParentchainBlockArgs>( | ||
TEEREX, | ||
"ProcessedParentchainBlock", | ||
Some(decoder.clone()), | ||
None, |
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.
Good point, this is obsolete in the api-client. I need to remove that arg.
pub fn grandpa_log<Block: BlockT>( | ||
digest: &DigestG<HashFor<Block>>, | ||
) -> Option<ConsensusLog<NumberFor<Block>>> { | ||
pub fn grandpa_log<Block: BlockT>(digest: &DigestG) -> Option<ConsensusLog<NumberFor<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.
Please rename the import to just Digest
. The G
stands for generic, which is not the case anymore.
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. Few minor comments.
let id = OpaqueDigestItemId::Consensus(&GRANDPA_ENGINE_ID); | ||
digest.convert_first(|l| l.try_to::<ConsensusLog<NumberFor<Block>>>(id)) | ||
} | ||
|
||
pub fn pending_change<Block: BlockT>( | ||
digest: &DigestG<HashFor<Block>>, | ||
digest: &DigestG, |
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.
Same as clangenbs comment above: Remove G
Compile with error duplicate lang item in crate `sgx_tstd` Sgx runtime upgraded to new substrate, but has extrinsics-factory errors. Upgrade works, problem in substrate-api-client fixed in version #a4d931c85f30ba22ff1f982c47caf57fe43ebc90 Rebase to master and update changes to new substrate cargo clippy Remove patch to local dependencies Remove comments Update spec version to 4 Changes from review
4c2cbec
to
820d72d
Compare
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. Thanks :)
For compatibility reason, the node requiring V14 metadata integritee-network/integritee-node#83
merge upgraded node first upgrade substrate dep to > v14 metadata integritee-node#85 and update worker CI to use this node.
merge upgraded sgx-runtime Upgrade to substrate 7406442bea0194ffcafc4e8d48d895d4d8d11346 sgx-runtime#39