Skip to content
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

update to upstream and polkadot v0.9.42 #2173

Merged
merged 126 commits into from
Nov 3, 2023
Merged

Conversation

BillyWooo
Copy link
Collaborator

@BillyWooo BillyWooo commented Oct 1, 2023

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

BillyWooo and others added 30 commits September 15, 2023 09:41
* 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
Copy link
Collaborator Author

BillyWooo commented Oct 31, 2023

... 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
Copy link
Collaborator Author

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.

Copy link
Member

@wangminqi wangminqi left a comment

Choose a reason for hiding this comment

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

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

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

@Kailai-Wang Kailai-Wang left a comment

Choose a reason for hiding this comment

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

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
Copy link
Member

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.

Copy link
Member

@kziemianek kziemianek left a comment

Choose a reason for hiding this comment

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

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.

@Kailai-Wang Kailai-Wang merged commit e5cc1b3 into dev Nov 3, 2023
27 checks passed
@Kailai-Wang Kailai-Wang deleted the yang-polkadot-v0.9.42 branch November 3, 2023 13:15
Copy link

linear bot commented Nov 3, 2023

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C0-breaking Breaking change that will cause existing client to break
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update upstream dependency to polkadot-v0.9.42
5 participants