update to upstream and polkadot v0.9.42 #2173

BillyWooo · 2023-10-01T20:45:49Z

As title, this is an upstream code update, as well as pumping up polkadot to v0.9.42. Major changes:

pumping up polkadot to v0.9.42: parachain + worker
update upstream worker code to commit b9c80164
Don't update any upstream pallets (which have license changes. Not yet addressing that topic, so still use the old code.)

There might be still some parachain test errors and worker clippy error. First create the PR, then might also ask other team member to help.

Fixes #1553
Fixes P-43

* 1847 evm support (#2016) * feat: initial commit * feat: Runtime EVM Support (test TODO) * feat: add evm test scripts * debug: add evm parameter for test * debug: quick format fix * debug: * debug: taplo * debbug: taplo * debug: try_runtime add * debug: try default feature * debug: test mode compile add runtime benchmarks * debug: modify in non-dev * debug: update yarn.lock file * debug: remove all docker yarn changes * debug: recover yarn.lock * debug: using yarn instead of yarn install * debug: corepack yarn install to generate yarn.lock * debug: add extra test * debug: fix test bug * debug: ts debug * debug: fix bug * debug: ts * debug: ts * debug: modify workflow for better log * debug: change node impl and ts * debug: change gas price impl * debug: using string addres directly * debug: adjust paramter for test.ts * debug: add extra ts for monitor the error * debug: add filter concerns * debug: add back monitor * debug: more monitor logic * debug: add more monitor * debug: switch proper order * debug: add double check method * debug: change slice range * debug: revert * debug: using pubkey instead of addres * debug: clean code * debug: add time sleep due to evm mechnism * debug: no wget log * debug: Improve test and script * debug: ubuntu version for correct GLIBCXX_ version * debug: increase time out * debug: #2086 change entity name * debug: a series of minor change * debug: remove overlapping code from dev * debug: clippy * debug: comment regarding Cargo * update cargo.lock * increase the max header size --------- Co-authored-by: Kai <7630809+Kailai-Wang@users.noreply.github.com> Co-authored-by: Kailai Wang <Kailai.Wang@hotmail.com> * Update Oneblock assertion type&description (#2123) * update type&description * using [] in outstanding description * update supported networks * fmt * update Assertion Breakdown * using outstanding_student * Make tee-prod build less resource intensive (#2133) * use thin lto * force to build tee-prod too * avoid tests * revert ci * Update README.md (#2023) * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md * Update README.md --------- Co-authored-by: Kai <7630809+Kailai-Wang@users.noreply.github.com> Co-authored-by: WMQ <46511820+wangminqi@users.noreply.github.com> Co-authored-by: Faisal Ahmed <42486737+felixfaisal@users.noreply.github.com> Co-authored-by: BillyWooo <thedreamofbilly@gmail.com> * fix vc di test (#2128) * fix vc di test * fmt --------- Co-authored-by: Kai <7630809+Kailai-Wang@users.noreply.github.com> * Bump serde_json from 1.0.105 to 1.0.107 (#2137) Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.105 to 1.0.107. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](serde-rs/json@v1.0.105...v1.0.107) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Kasper Ziemianek <kasper.ziemianek@gmail.com> * feat: 0.9.42 without TEE, clippy pass * debug: fix template --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: Kai <7630809+Kailai-Wang@users.noreply.github.com> Co-authored-by: Kailai Wang <Kailai.Wang@hotmail.com> Co-authored-by: Zhouhui Tian <125243011+zhouhuitian@users.noreply.github.com> Co-authored-by: Adegoke Yusuff <88367184+cryptoade1@users.noreply.github.com> Co-authored-by: Faisal Ahmed <42486737+felixfaisal@users.noreply.github.com> Co-authored-by: BillyWooo <thedreamofbilly@gmail.com> Co-authored-by: Kasper Ziemianek <kasper.ziemianek@gmail.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Test, then decide to remove the comment out code or not in worker_on_chain_ocall.rs

BillyWooo · 2023-10-31T07:32:56Z

... Since we spent quite some time on this update, I'm wondering have I missed anything?

Actually much time spent on debugging. There were couple of places introduced by auto-merge, which created bugs. 😢

BillyWooo · 2023-10-31T17:31:41Z

Can we get rid of TargetA and TargetB because in our setup we will be targeting only single parachain ?

I would suggest we keep it for the moment. After we have a concrete decision about how to collaborate with upstream, we can make a movement to remove/keep.

wangminqi

Files not under "tee-worker" are checked. LGTM

Kailai-Wang

Thanks! I can run the worker locally without problems.

A small thing, I see such log:

[2023-11-02T22:37:06Z WARN  itc_parentchain_indirect_calls_executor::event_filter] Transfer event does not exist in parentchain metadata

Please double-check why 🙌

kziemianek · 2023-11-03T08:36:32Z

Can we get rid of TargetA and TargetB because in our setup we will be targeting only single parachain ?

I would suggest we keep it for the moment. After we have a concrete decision about how to collaborate with upstream, we can make a movement to remove/keep.

Then we should keep ParentchainId::Integritee because in one scenario Litentry becomes TargetA and in another Litentry becomes Integritee and there are not target chains.

kziemianek

Tried again after last merge commit and the problem with stackoverflow is gone - but I don't know the reason why it happened before.

I have one concern about parent and target chains - I raised it in my last reveiw.
The rest looks ok.

linear · 2023-11-03T13:20:13Z

P-43 Update upstream dependency to polkadot-v0.9.42

This is an issue to track the update of the upstream dependency.

parachain dependency

Update local polkadot/substrate dependencies (helper script: ./scripts/bump-code-versions.sh)
Fix any compilation/test issues
Optionally roll out the client/runtime update

tee-worker dependency

Upstream PR: update integritee-pallets dependency
Upstream PR: update integritee-node dependency
Upstream PR: update integritee-worker dependency
Ask integritee to update frontier and substrate-api-client dependency
Merge upstream changes to tee-worker/

BillyWooo and others added 30 commits September 15, 2023 09:41

only update worker; not build

9335655

bump version from 0.9.39 -> 0.9.42

dcd0d2f

continue trying

20f7d99

direct compare worker code

c3be777

one step further

987d594

debug: TEE parachain

75890cd

debug: Cargo lock

db0463f

move forward

c8d6d17

worker and cli pass, enclave to go

e9f4c08

update worker to master (b9c80164)

7be431c

update substrate-api-client to polkadot-v0.9.42-tag-v0.14.0

d6fa4ce

align with upstream worker

0292f7b

make fmt

76f8f8a

something more for comparing

95e1b05

another two for enclave

97be626

direct compare with upstream worker again

b5ad10a

cargo fmt

417ab07

something more

f78e968

missing type define

6f10931

build worker and client

86f6cf4

first success build

4fda1e1

clean up some warnings

940f1f7

bring back comment out code

882b573

fix header compile error

5a27c06

all build pass for the moment.

6357985

Test, then decide to remove the comment out code or not in worker_on_chain_ocall.rs

Merge remote-tracking branch 'origin/dev' into yang-polkadot-v0.9.42

34fe289

debug: fix new weight test set for xcm

13a4b0e

debug: fix xcm test parameter

ddc8f5b

debug: xcm weight parameter

5971f51

BillyWooo added 7 commits October 30, 2023 23:54

missing comment revert

14d7c55

revert changes from upstream. Because pallet extrinsic stay unchanged.

9fa701e

revert back print info

df6a2d6

Merge remote-tracking branch 'origin/dev' into yang-polkadot-v0.9.42

b3b8270

add missing variable

ce8dbcc

fmt

dea7f01

missing one rename

d8f1b1c

BillyWooo added 4 commits October 31, 2023 07:53

change attribute name

4710b2d

Merge remote-tracking branch 'origin/dev' into yang-polkadot-v0.9.42

de8a010

Merge remote-tracking branch 'origin/dev' into yang-polkadot-v0.9.42

f68af15

Merge remote-tracking branch 'origin/dev' into yang-polkadot-v0.9.42

9b20157

BillyWooo added 5 commits October 31, 2023 18:29

rename extrinsic (missed one)

989f230

revert nonce field back

53c7f4f

update api

b68a5b9

revert missing nonce field

99f6138

update client api

436422b

wangminqi reviewed Nov 1, 2023

View reviewed changes

wangminqi requested a review from kziemianek November 2, 2023 07:50

Kailai-Wang added the C0-breaking Breaking change that will cause existing client to break label Nov 2, 2023

Merge branch 'dev' into yang-polkadot-v0.9.42

9ada3e8

Kailai-Wang approved these changes Nov 2, 2023

View reviewed changes

kziemianek approved these changes Nov 3, 2023

View reviewed changes

Merge branch 'dev' into yang-polkadot-v0.9.42

23854bc

Kailai-Wang merged commit e5cc1b3 into dev Nov 3, 2023
27 checks passed

Kailai-Wang deleted the yang-polkadot-v0.9.42 branch November 3, 2023 13:15

Kailai-Wang mentioned this pull request Nov 3, 2023

Update upstream dependency to polkadot-v0.9.42 #1553

Closed

8 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

update to upstream and polkadot v0.9.42 #2173

update to upstream and polkadot v0.9.42 #2173

BillyWooo commented Oct 1, 2023 •

edited by Kailai-Wang

Loading

BillyWooo commented Oct 31, 2023 •

edited

Loading

BillyWooo commented Oct 31, 2023

wangminqi left a comment

Kailai-Wang left a comment

kziemianek commented Nov 3, 2023

kziemianek left a comment

linear bot commented Nov 3, 2023

parachain dependency

tee-worker dependency

update to upstream and polkadot v0.9.42 #2173

update to upstream and polkadot v0.9.42 #2173

Conversation

BillyWooo commented Oct 1, 2023 • edited by Kailai-Wang Loading

BillyWooo commented Oct 31, 2023 • edited Loading

BillyWooo commented Oct 31, 2023

wangminqi left a comment

Choose a reason for hiding this comment

Kailai-Wang left a comment

Choose a reason for hiding this comment

kziemianek commented Nov 3, 2023

kziemianek left a comment

Choose a reason for hiding this comment

linear bot commented Nov 3, 2023

parachain dependency

tee-worker dependency

BillyWooo commented Oct 1, 2023 •

edited by Kailai-Wang

Loading

BillyWooo commented Oct 31, 2023 •

edited

Loading