Update polkadot-v0.9.29 #1053

OverOrion · 2022-10-07T12:41:03Z

OverOrion · 2022-10-12T14:08:25Z

Currently this is blocked, because a toolchain update is needed for the stabilised then_some used in substrate.
However the toolchain can not be updated as mentioned in #1000.

I have checked whether sgx_tstd would have worked with a more recent toolchain version (2022-06-30), but it did not 😞.


error: duplicate diagnostic item found: `CStr`.
   --> incubator-teaclave-sgx-sdk/sgx_trts/src/c_str.rs:206:1
    |
206 | / pub struct CStr {
207 | |     // FIXME: this should not be represented with a DST slice but rather with
208 | |     //        just a raw `c_char` along with some form of marker to make
209 | |     //        this an unsized type. Essentially `sizeof(&CStr)` should be the
210 | |     //        same as `sizeof(&c_char)` but `CStr` should be an unsized type.
211 | |     inner: [c_char],
212 | | }
    | |_^
    |
    = note: the diagnostic item is first defined in crate `core`.

error: duplicate diagnostic item found: `cstring_type`.
   --> incubator-teaclave-sgx-sdk/sgx_trts/src/c_str.rs:124:1
    |
124 | / pub struct CString {
125 | |     // Invariant 1: the slice ends with a zero byte and has a length of at least one.
126 | |     // Invariant 2: the slice contains only one zero byte.
127 | |     // Improper usage of unsafe function can break Invariant 2, but not Invariant 1.
128 | |     inner: Box<[u8]>,
129 | | }
    | |_^
    |
    = note: the diagnostic item is first defined in crate `alloc`.

OverOrion · 2022-11-11T07:17:17Z

app-libs/stf/src/lib.rs

@@ -81,11 +81,10 @@ pub enum StfError {
 	StorageHashMismatch,
 	InvalidStorageDiff,
 }
-#[allow(clippy::large_enum_variant)]


If the clippy lint large_enum_variant should be suppressed let me know and I will drop the patch for it.

clangenb

One remark, otherwise it looks good!

clangenb · 2022-11-11T11:20:43Z

cli/Cargo.toml

+my-node-runtime = { package = "integritee-node-runtime", git = "https://github.com/integritee-network/integritee-node.git", branch = "szp/polkadot-v0.9.29" }
+pallet-evm = { optional = true, git = "https://github.com/integritee-network/frontier.git", branch = "polkadot-v0.9.29" }
+substrate-api-client = { features = ["ws-client"], git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.29" }
+substrate-client-keystore = { git = "https://github.com/scs/substrate-api-client.git", branch = "polkadot-v0.9.29" }
+teerex-primitives = { git = "https://github.com/integritee-network/pallets.git", branch = "szp/polkadot-v0.9.29" }


here, we still need to update the branch afterwards

… function

clangenb

Nice, looks good to me. I have only one remark!

clangenb · 2022-11-15T09:51:22Z

core/tls-websocket-server/src/certificate_generation.rs

@@ -67,7 +67,7 @@ pub fn ed25519_self_signed_certificate(
 ) -> WebSocketResult<Certificate> {
 	let mut params = CertificateParams::new(vec![common_name.to_string()]);
 	let now = SystemTime::now().duration_since(UNIX_EPOCH).expect("Error: UNIX_EPOCH");
-	let issue_ts = TzUtc.timestamp(now.as_secs() as i64, 0);
+	let issue_ts = TzUtc.timestamp_opt(now.as_secs() as i64, 0).unwrap();


If you know some context about the None here, I would prefer an expect. If it is something that never fails in our case, it is even better, and you can write like: expect("fails never because of ....; qed).

If it can fail, I would prefer to actually return a result here.

This should not fail as long as now.as_secs() (aka secs) fit into i64. The as keyword will silently convert it into -1 (e.g. when secs == u64::MAX) and that's when it would fail.

Revised in 89e7ac2.

…tamp()` function

… `timestamp()` function

clangenb

The great merge has arrived!

OverOrion force-pushed the szp/polkadot-v0.9.29 branch 3 times, most recently from 3841550 to 8782941 Compare October 12, 2022 10:39

OverOrion mentioned this pull request Oct 24, 2022

bump teaclave-sdk to v1.1.6-testing #1074 #1076

Merged

OverOrion force-pushed the szp/polkadot-v0.9.29 branch 3 times, most recently from efbe9b7 to 1bc262b Compare November 8, 2022 17:17

Kailai-Wang mentioned this pull request Nov 8, 2022

Bump teaclave-sdk to v1.1.6-testing litentry/tee-worker#138

Closed

OverOrion force-pushed the szp/polkadot-v0.9.29 branch from 1bc262b to 00f9b03 Compare November 9, 2022 08:51

OverOrion self-assigned this Nov 11, 2022

OverOrion added A0-core Affects a core part B1-releasenotes C1-low 📌 Does not elevate a release containing this beyond "low priority" E0-breaksnothing labels Nov 11, 2022

OverOrion marked this pull request as ready for review November 11, 2022 06:07

OverOrion commented Nov 11, 2022

View reviewed changes

OverOrion requested a review from clangenb November 11, 2022 07:17

clangenb reviewed Nov 11, 2022

View reviewed changes

clangenb mentioned this pull request Nov 15, 2022

bump integritee pallets; reintroduce sending only every nth block to parentchain feature integritee-network/integritee-node#149

Merged

OverOrion added 10 commits November 15, 2022 09:46

Update polkadot version (Auto generated commit)

5130d1a

Update versions for internal dependencies (Auto generated commit)

f75aece

polkadot followup

dbcba52

update *.toml files to polkadot-v0.9.29

6840596

fix clippy

c9db0b9

weight related followups

cfb2d29

revert branches

7c38e42

docker: update integritee-node-dev image to 1.0.22

780e4df

chrono: use timestamp_opt() instead of the deprecated timestamp()…

6857b3b

… function

fixup! revert branches

d6d6697

OverOrion force-pushed the szp/polkadot-v0.9.29 branch from 47a270f to d6d6697 Compare November 15, 2022 09:20

clangenb reviewed Nov 15, 2022

View reviewed changes

fixup! chrono: use timestamp_opt() instead of the deprecated `times…

89e7ac2

…tamp()` function

OverOrion requested a review from clangenb November 15, 2022 12:07

OverOrion added 2 commits November 15, 2022 13:07

fixup! fixup! chrono: use timestamp_opt() instead of the deprecated…

451e49f

… `timestamp()` function

fixup! fixup! chrono: use timestamp_opt() instead of the deprecated…

9dd89e9

… `timestamp()` function

clangenb approved these changes Nov 16, 2022

View reviewed changes

clangenb merged commit ab83912 into master Nov 16, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update polkadot-v0.9.29 #1053

Update polkadot-v0.9.29 #1053

OverOrion commented Oct 7, 2022 •

edited

Loading

OverOrion commented Oct 12, 2022

OverOrion Nov 11, 2022

clangenb left a comment

clangenb Nov 11, 2022

clangenb left a comment

clangenb Nov 15, 2022 •

edited

Loading

OverOrion Nov 15, 2022

clangenb left a comment

Update polkadot-v0.9.29 #1053

Update polkadot-v0.9.29 #1053

Conversation

OverOrion commented Oct 7, 2022 • edited Loading

OverOrion commented Oct 12, 2022

OverOrion Nov 11, 2022

Choose a reason for hiding this comment

clangenb left a comment

Choose a reason for hiding this comment

clangenb Nov 11, 2022

Choose a reason for hiding this comment

clangenb left a comment

Choose a reason for hiding this comment

clangenb Nov 15, 2022 • edited Loading

Choose a reason for hiding this comment

OverOrion Nov 15, 2022

Choose a reason for hiding this comment

clangenb left a comment

Choose a reason for hiding this comment

OverOrion commented Oct 7, 2022 •

edited

Loading

clangenb Nov 15, 2022 •

edited

Loading