Skip to content

Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 - #540

Merged
haerdib merged 2 commits into
masterfrom
ec_upgrade_substrate_v14metadata
Dec 6, 2021
Merged

Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 #540
haerdib merged 2 commits into
masterfrom
ec_upgrade_substrate_v14metadata

Conversation

@echevrier

@echevrierechevrier commented Nov 30, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

For compatibility reason, the node requiring V14 metadata integritee-network/integritee-node#83

@echevrierechevrier linked an issue Nov 30, 2021 that may be closed by this pull request
upgrade substrate dep #484
Closed
@echevrier

echevrier commented Dec 2, 2021•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Please don't merge for now.
I've tested it locally and it seems to work with node branch 83/upgrade_substrate_dep_v14 and sgx_runtime branch ec_upgrade_substrate_7406442bea0194ffcafc4e8d48d895d4d8d11346
It also needs theses branched to compile.

clangenb
clangenb approved these changes Dec 2, 2021
View reviewed changes

@clangenbclangenb left a comment

Copy link
Copy Markdown
Contributor

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!

Comment threadcli/src/main.rs
TEEREX,
"ProcessedParentchainBlock",
Some(decoder.clone()),
None,

@clangenbclangenbDec 2, 2021•
edited
Loading

Copy link
Copy Markdown
Contributor

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.

Comment threadcore/parentchain/light-client/src/lib.rs Outdated
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>>> {

@clangenbclangenbDec 2, 2021

Copy link
Copy Markdown
Contributor

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.

@clangenb
clangenb self-requested a review December 2, 2021 13:40
haerdib
haerdib approved these changes Dec 2, 2021
View reviewed changes

@haerdibhaerdib left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. Few minor comments.

Comment threadcore/parentchain/light-client/src/lib.rs Outdated

pub fn pending_change<Block: BlockT>(
digest: &DigestG<HashFor<Block>>,
digest: &DigestG,

@haerdibhaerdibDec 2, 2021

Copy link
Copy Markdown
Contributor

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

Comment threadenclave-runtime/Cargo.toml
Comment threadenclave-runtime/Cargo.toml
echevrier added 2 commits December 6, 2021 11:34
echevrier
Upgrade worker to substrate for V14 Metadata :
238ca87
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
echevrier
Rebase and update CI to use new upgraded node
820d72d
@echevrier
echevrierforce-pushed the ec_upgrade_substrate_v14metadata branch from 4c2cbec to 820d72dCompareDecember 6, 2021 13:35
haerdib
haerdib approved these changes Dec 6, 2021
View reviewed changes

@haerdibhaerdib left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM. Thanks :)

@haerdib
haerdib merged commit 5149f05 into masterDec 6, 2021
@echevrier
echevrier deleted the ec_upgrade_substrate_v14metadata branch December 6, 2021 15:13
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@haerdibhaerdibhaerdib approved these changes
@murerfelmurerfelAwaiting requested review from murerfel
@clangenbclangenbAwaiting requested review from clangenb

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

upgrade substrate dep

3 participants

@echevrier@clangenb@haerdib
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 by echevrier · Pull Request #540 · integritee-network/worker · GitHub
Skip to content
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346  - #540
Merged
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Dec 6, 2021
Merged
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 #540
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Conversation
@echevrier
@echevrierechevrier
commented
Nov 30, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
For compatibility reason, the node requiring V14 metadata integritee-network/integritee-node#83
@echevrierechevrier
linked an issue
Nov 30, 2021
that may be
closed
by this pull request


upgrade substrate dep
#484

Closed

@echevrier
echevrier
commented
Dec 2, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Please don't merge for now.

I've tested it locally and it seems to work with node branch 83/upgrade_substrate_dep_v14 and sgx_runtime branch ec_upgrade_substrate_7406442bea0194ffcafc4e8d48d895d4d8d11346

It also needs theses branched to compile.
clangenb
clangenb
approved these changes
Dec 2, 2021
View reviewed changes
@clangenbclangenb
left a comment


Copy link


Copy Markdown

Contributor
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!
Comment threadcli/src/main.rs
 TEEREX,
 "ProcessedParentchainBlock",
Some(decoder.clone()),
None,
@clangenbclangenbDec 2, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
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.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated

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>>> {
@clangenbclangenbDec 2, 2021

Copy link


Copy Markdown

Contributor
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.
@clangenb
clangenb
self-requested a review
December 2, 2021 13:40
haerdib
haerdib
approved these changes
Dec 2, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Few minor comments.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated


pub fn pending_change<Block: BlockT>(
	digest: &DigestG<HashFor<Block>>,
	digest: &DigestG,
@haerdibhaerdibDec 2, 2021

Copy link


Copy Markdown

Contributor
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
Comment threadenclave-runtime/Cargo.toml
Comment threadenclave-runtime/Cargo.toml
echevrier
added 2 commits
December 6, 2021 11:34
echevrier
Upgrade worker to substrate for V14 Metadata :
238ca87
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
echevrier
Rebase and update CI to use new upgraded node
820d72d
@echevrier
echevrierforce-pushed
the
ec_upgrade_substrate_v14metadata
branch
from
4c2cbec to
820d72dCompareDecember 6, 2021 13:35
haerdib
haerdib
approved these changes
Dec 6, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Thanks :)
@haerdib
haerdib
merged commit 5149f05
into
masterDec 6, 2021
@echevrier
echevrier
deleted the

ec_upgrade_substrate_v14metadata

branch
December 6, 2021 15:13
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@haerdibhaerdibhaerdib approved these changes
@murerfelmurerfelAwaiting requested review from murerfel
@clangenbclangenbAwaiting requested review from clangenb

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

upgrade substrate dep


3 participants

@echevrier@clangenb@haerdib

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 by echevrier · Pull Request #540 · integritee-network/worker · GitHub
Skip to content
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346  - #540
Merged
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Dec 6, 2021
Merged
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 #540
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Conversation
@echevrier
@echevrierechevrier
commented
Nov 30, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
For compatibility reason, the node requiring V14 metadata integritee-network/integritee-node#83
@echevrierechevrier
linked an issue
Nov 30, 2021
that may be
closed
by this pull request


upgrade substrate dep
#484

Closed

@echevrier
echevrier
commented
Dec 2, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Please don't merge for now.

I've tested it locally and it seems to work with node branch 83/upgrade_substrate_dep_v14 and sgx_runtime branch ec_upgrade_substrate_7406442bea0194ffcafc4e8d48d895d4d8d11346

It also needs theses branched to compile.
clangenb
clangenb
approved these changes
Dec 2, 2021
View reviewed changes
@clangenbclangenb
left a comment


Copy link


Copy Markdown

Contributor
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!
Comment threadcli/src/main.rs
 TEEREX,
 "ProcessedParentchainBlock",
Some(decoder.clone()),
None,
@clangenbclangenbDec 2, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
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.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated

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>>> {
@clangenbclangenbDec 2, 2021

Copy link


Copy Markdown

Contributor
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.
@clangenb
clangenb
self-requested a review
December 2, 2021 13:40
haerdib
haerdib
approved these changes
Dec 2, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Few minor comments.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated


pub fn pending_change<Block: BlockT>(
	digest: &DigestG<HashFor<Block>>,
	digest: &DigestG,
@haerdibhaerdibDec 2, 2021

Copy link


Copy Markdown

Contributor
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
Comment threadenclave-runtime/Cargo.toml
Comment threadenclave-runtime/Cargo.toml
echevrier
added 2 commits
December 6, 2021 11:34
echevrier
Upgrade worker to substrate for V14 Metadata :
238ca87
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
echevrier
Rebase and update CI to use new upgraded node
820d72d
@echevrier
echevrierforce-pushed
the
ec_upgrade_substrate_v14metadata
branch
from
4c2cbec to
820d72dCompareDecember 6, 2021 13:35
haerdib
haerdib
approved these changes
Dec 6, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Thanks :)
@haerdib
haerdib
merged commit 5149f05
into
masterDec 6, 2021
@echevrier
echevrier
deleted the

ec_upgrade_substrate_v14metadata

branch
December 6, 2021 15:13
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@haerdibhaerdibhaerdib approved these changes
@murerfelmurerfelAwaiting requested review from murerfel
@clangenbclangenbAwaiting requested review from clangenb

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

upgrade substrate dep


3 participants

@echevrier@clangenb@haerdib

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 by echevrier · Pull Request #540 · integritee-network/worker · GitHub
Skip to content
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346  - #540
Merged
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Dec 6, 2021
Merged
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 #540
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Conversation
@echevrier
@echevrierechevrier
commented
Nov 30, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
For compatibility reason, the node requiring V14 metadata integritee-network/integritee-node#83
@echevrierechevrier
linked an issue
Nov 30, 2021
that may be
closed
by this pull request


upgrade substrate dep
#484

Closed

@echevrier
echevrier
commented
Dec 2, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Please don't merge for now.

I've tested it locally and it seems to work with node branch 83/upgrade_substrate_dep_v14 and sgx_runtime branch ec_upgrade_substrate_7406442bea0194ffcafc4e8d48d895d4d8d11346

It also needs theses branched to compile.
clangenb
clangenb
approved these changes
Dec 2, 2021
View reviewed changes
@clangenbclangenb
left a comment


Copy link


Copy Markdown

Contributor
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!
Comment threadcli/src/main.rs
 TEEREX,
 "ProcessedParentchainBlock",
Some(decoder.clone()),
None,
@clangenbclangenbDec 2, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
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.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated

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>>> {
@clangenbclangenbDec 2, 2021

Copy link


Copy Markdown

Contributor
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.
@clangenb
clangenb
self-requested a review
December 2, 2021 13:40
haerdib
haerdib
approved these changes
Dec 2, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Few minor comments.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated


pub fn pending_change<Block: BlockT>(
	digest: &DigestG<HashFor<Block>>,
	digest: &DigestG,
@haerdibhaerdibDec 2, 2021

Copy link


Copy Markdown

Contributor
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
Comment threadenclave-runtime/Cargo.toml
Comment threadenclave-runtime/Cargo.toml
echevrier
added 2 commits
December 6, 2021 11:34
echevrier
Upgrade worker to substrate for V14 Metadata :
238ca87
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
echevrier
Rebase and update CI to use new upgraded node
820d72d
@echevrier
echevrierforce-pushed
the
ec_upgrade_substrate_v14metadata
branch
from
4c2cbec to
820d72dCompareDecember 6, 2021 13:35
haerdib
haerdib
approved these changes
Dec 6, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Thanks :)
@haerdib
haerdib
merged commit 5149f05
into
masterDec 6, 2021
@echevrier
echevrier
deleted the

ec_upgrade_substrate_v14metadata

branch
December 6, 2021 15:13
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@haerdibhaerdibhaerdib approved these changes
@murerfelmurerfelAwaiting requested review from murerfel
@clangenbclangenbAwaiting requested review from clangenb

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

upgrade substrate dep


3 participants

@echevrier@clangenb@haerdib

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 by echevrier · Pull Request #540 · integritee-network/worker · GitHub
Skip to content
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346  - #540
Merged
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Dec 6, 2021
Merged
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 #540
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Conversation
@echevrier
@echevrierechevrier
commented
Nov 30, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
For compatibility reason, the node requiring V14 metadata integritee-network/integritee-node#83
@echevrierechevrier
linked an issue
Nov 30, 2021
that may be
closed
by this pull request


upgrade substrate dep
#484

Closed

@echevrier
echevrier
commented
Dec 2, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Please don't merge for now.

I've tested it locally and it seems to work with node branch 83/upgrade_substrate_dep_v14 and sgx_runtime branch ec_upgrade_substrate_7406442bea0194ffcafc4e8d48d895d4d8d11346

It also needs theses branched to compile.
clangenb
clangenb
approved these changes
Dec 2, 2021
View reviewed changes
@clangenbclangenb
left a comment


Copy link


Copy Markdown

Contributor
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!
Comment threadcli/src/main.rs
 TEEREX,
 "ProcessedParentchainBlock",
Some(decoder.clone()),
None,
@clangenbclangenbDec 2, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
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.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated

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>>> {
@clangenbclangenbDec 2, 2021

Copy link


Copy Markdown

Contributor
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.
@clangenb
clangenb
self-requested a review
December 2, 2021 13:40
haerdib
haerdib
approved these changes
Dec 2, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Few minor comments.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated


pub fn pending_change<Block: BlockT>(
	digest: &DigestG<HashFor<Block>>,
	digest: &DigestG,
@haerdibhaerdibDec 2, 2021

Copy link


Copy Markdown

Contributor
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
Comment threadenclave-runtime/Cargo.toml
Comment threadenclave-runtime/Cargo.toml
echevrier
added 2 commits
December 6, 2021 11:34
echevrier
Upgrade worker to substrate for V14 Metadata :
238ca87
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
echevrier
Rebase and update CI to use new upgraded node
820d72d
@echevrier
echevrierforce-pushed
the
ec_upgrade_substrate_v14metadata
branch
from
4c2cbec to
820d72dCompareDecember 6, 2021 13:35
haerdib
haerdib
approved these changes
Dec 6, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Thanks :)
@haerdib
haerdib
merged commit 5149f05
into
masterDec 6, 2021
@echevrier
echevrier
deleted the

ec_upgrade_substrate_v14metadata

branch
December 6, 2021 15:13
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@haerdibhaerdibhaerdib approved these changes
@murerfelmurerfelAwaiting requested review from murerfel
@clangenbclangenbAwaiting requested review from clangenb

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

upgrade substrate dep


3 participants

@echevrier@clangenb@haerdib

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 by echevrier · Pull Request #540 · integritee-network/worker · GitHub
Skip to content
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346  - #540
Merged
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Dec 6, 2021
Merged
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 #540
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Conversation
@echevrier
@echevrierechevrier
commented
Nov 30, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
For compatibility reason, the node requiring V14 metadata integritee-network/integritee-node#83
@echevrierechevrier
linked an issue
Nov 30, 2021
that may be
closed
by this pull request


upgrade substrate dep
#484

Closed

@echevrier
echevrier
commented
Dec 2, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Please don't merge for now.

I've tested it locally and it seems to work with node branch 83/upgrade_substrate_dep_v14 and sgx_runtime branch ec_upgrade_substrate_7406442bea0194ffcafc4e8d48d895d4d8d11346

It also needs theses branched to compile.
clangenb
clangenb
approved these changes
Dec 2, 2021
View reviewed changes
@clangenbclangenb
left a comment


Copy link


Copy Markdown

Contributor
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!
Comment threadcli/src/main.rs
 TEEREX,
 "ProcessedParentchainBlock",
Some(decoder.clone()),
None,
@clangenbclangenbDec 2, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
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.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated

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>>> {
@clangenbclangenbDec 2, 2021

Copy link


Copy Markdown

Contributor
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.
@clangenb
clangenb
self-requested a review
December 2, 2021 13:40
haerdib
haerdib
approved these changes
Dec 2, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Few minor comments.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated


pub fn pending_change<Block: BlockT>(
	digest: &DigestG<HashFor<Block>>,
	digest: &DigestG,
@haerdibhaerdibDec 2, 2021

Copy link


Copy Markdown

Contributor
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
Comment threadenclave-runtime/Cargo.toml
Comment threadenclave-runtime/Cargo.toml
echevrier
added 2 commits
December 6, 2021 11:34
echevrier
Upgrade worker to substrate for V14 Metadata :
238ca87
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
echevrier
Rebase and update CI to use new upgraded node
820d72d
@echevrier
echevrierforce-pushed
the
ec_upgrade_substrate_v14metadata
branch
from
4c2cbec to
820d72dCompareDecember 6, 2021 13:35
haerdib
haerdib
approved these changes
Dec 6, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Thanks :)
@haerdib
haerdib
merged commit 5149f05
into
masterDec 6, 2021
@echevrier
echevrier
deleted the

ec_upgrade_substrate_v14metadata

branch
December 6, 2021 15:13
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@haerdibhaerdibhaerdib approved these changes
@murerfelmurerfelAwaiting requested review from murerfel
@clangenbclangenbAwaiting requested review from clangenb

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

upgrade substrate dep


3 participants

@echevrier@clangenb@haerdib

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 by echevrier · Pull Request #540 · integritee-network/worker · GitHub
Skip to content
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346  - #540
Merged
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Dec 6, 2021
Merged
Upgrade substrate to 7406442bea0194ffcafc4e8d48d895d4d8d11346 #540
haerdib merged 2 commits into
masterfrom 
ec_upgrade_substrate_v14metadata
Conversation
@echevrier
@echevrierechevrier
commented
Nov 30, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
For compatibility reason, the node requiring V14 metadata integritee-network/integritee-node#83
@echevrierechevrier
linked an issue
Nov 30, 2021
that may be
closed
by this pull request


upgrade substrate dep
#484

Closed

@echevrier
echevrier
commented
Dec 2, 2021•

edited

Loading

Copy link


Copy Markdown

ContributorAuthor
Please don't merge for now.

I've tested it locally and it seems to work with node branch 83/upgrade_substrate_dep_v14 and sgx_runtime branch ec_upgrade_substrate_7406442bea0194ffcafc4e8d48d895d4d8d11346

It also needs theses branched to compile.
clangenb
clangenb
approved these changes
Dec 2, 2021
View reviewed changes
@clangenbclangenb
left a comment


Copy link


Copy Markdown

Contributor
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!
Comment threadcli/src/main.rs
 TEEREX,
 "ProcessedParentchainBlock",
Some(decoder.clone()),
None,
@clangenbclangenbDec 2, 2021•

edited

Loading

Copy link


Copy Markdown

Contributor
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.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated

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>>> {
@clangenbclangenbDec 2, 2021

Copy link


Copy Markdown

Contributor
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.
@clangenb
clangenb
self-requested a review
December 2, 2021 13:40
haerdib
haerdib
approved these changes
Dec 2, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Few minor comments.
Comment threadcore/parentchain/light-client/src/lib.rs
Outdated


pub fn pending_change<Block: BlockT>(
	digest: &DigestG<HashFor<Block>>,
	digest: &DigestG,
@haerdibhaerdibDec 2, 2021

Copy link


Copy Markdown

Contributor
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
Comment threadenclave-runtime/Cargo.toml
Comment threadenclave-runtime/Cargo.toml
echevrier
added 2 commits
December 6, 2021 11:34
echevrier
Upgrade worker to substrate for V14 Metadata :
238ca87
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
echevrier
Rebase and update CI to use new upgraded node
820d72d
@echevrier
echevrierforce-pushed
the
ec_upgrade_substrate_v14metadata
branch
from
4c2cbec to
820d72dCompareDecember 6, 2021 13:35
haerdib
haerdib
approved these changes
Dec 6, 2021
View reviewed changes
@haerdibhaerdib
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

LGTM. Thanks :)
@haerdib
haerdib
merged commit 5149f05
into
masterDec 6, 2021
@echevrier
echevrier
deleted the

ec_upgrade_substrate_v14metadata

branch
December 6, 2021 15:13
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@haerdibhaerdibhaerdib approved these changes
@murerfelmurerfelAwaiting requested review from murerfel
@clangenbclangenbAwaiting requested review from clangenb

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

upgrade substrate dep


3 participants

@echevrier@clangenb@haerdib