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.

Sign up for GitHub

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

Jump to bottom

polkadot v0.9.18 #1988

Merged
merged 29 commits into from
Apr 6, 2022
Merged

polkadot v0.9.18 #1988

merged 29 commits into from
Apr 6, 2022

Conversation

zqhxuyuan
Copy link
Contributor

@zqhxuyuan zqhxuyuan commented Mar 23, 2022 •
edited
Loading

companion:

dep upgrade:

  • scale-info to 2.0.1
  • codec to 3.0.0
  • primitive-types to 0.11
  • upgrade evm related: ethereum-types,evm,ethereum, current use our own fork: Update codec scale info evm#2

changes:

issues:

@codecov
Copy link

codecov bot commented Apr 2, 2022 •
edited
Loading

Codecov Report

Merging #1988 (2fe33e3) into master (f4b80d7) will increase coverage by 0.59%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #1988      +/-   ##
==========================================
+ Coverage   85.95%   86.55%   +0.59%     
==========================================
  Files          97      100       +3     
  Lines       19361    20714    +1353     
==========================================
+ Hits        16641    17928    +1287     
- Misses       2720     2786      +66
Impacted Files Coverage Δ
ecosystem-modules/ren/renvm-bridge/src/tests.rs 98.96% <100.00%> (ø)
primitives/src/currency.rs
modules/currencies/src/tests.rs 100.00% <0.00%> (ø)
modules/nft/src/tests.rs 99.75% <0.00%> (ø)
modules/currencies/src/lib.rs 80.10% <0.00%> (ø)
modules/nft/src/lib.rs 74.85% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f4b80d7...2fe33e3. Read the comment docs.

@zqhxuyuan
Copy link
Contributor Author

@ermalkaleci can you check why make test-eth failed? I run it on local is succeeded.

@ermalkaleci
Copy link
Contributor

@zqhxuyuan failing after this merge commit
run cargo clean first to reproduce

@ermalkaleci
Copy link
Contributor

@zqhxuyuan failing after this merge commit
run cargo clean first to reproduce

I think it's cargo cache issue. will clean and try again

@zjb0807
Copy link
Member

zjb0807 commented Apr 5, 2022

I removed the /home/acala/acala/actions-runner/_work/Acala/Acala/evm-tests/Cargo.lock on the gh-runner-1. It shoud work now.

@zqhxuyuan zqhxuyuan marked this pull request as ready for review April 5, 2022 05:30
@zqhxuyuan zqhxuyuan requested review from xlc, zjb0807 and ermalkaleci April 5, 2022 05:30
xlc
xlc previously approved these changes Apr 5, 2022
View reviewed changes
zjb0807
zjb0807 previously approved these changes Apr 5, 2022
View reviewed changes
Copy link
Member

@zjb0807 zjb0807 left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM

node/service/src/chain_spec/mandala.rs Show resolved Hide resolved
ermalkaleci
ermalkaleci previously approved these changes Apr 5, 2022
View reviewed changes
@ermalkaleci ermalkaleci dismissed stale reviews from zjb0807, xlc, and themself via 2fe33e3 April 5, 2022 13:08
@ermalkaleci ermalkaleci self-requested a review April 5, 2022 21:36
@xlc xlc merged commit e9a0f70 into master Apr 6, 2022
@xlc xlc deleted the polkadot-v0.9.18 branch April 6, 2022 00:53
syan095 pushed a commit that referenced this pull request Apr 6, 2022
Merge remote-tracking branch 'origin/master' into refactor/parameter-…
500cf8b 
…types

* origin/master:
  polkadot v0.9.18 (#1988)

# Conflicts:
#	orml
#	runtime/integration-tests/src/xcm_interface.rs
syan095 pushed a commit that referenced this pull request Apr 8, 2022
Merge remote-tracking branch 'origin/master' into impl-fungibles-trai…
1558334 
…ts-for-currencies

* origin/master: (362 commits)
  Skip idle_scheduler Calls When Not Producing blocks  (#1721)
  config more homa subaccounts for Karura (#2004)
  rm wt storage (#1984)
  Update construct_runtime's syntax (#2000)
  polkadot v0.9.18 (#1988)
  be srtool compatible (#2021)
  Update README.md (#2022)
  update precompile weights (#2020)
  Mandala supports PricingPegged for taiKSM (#2015)
  remove unneeded param (#2014)
  fix srtool (#2013)
  update precompile gas_limit (#2007)
  fix verify bootnodes script
  Bump minimist from 1.2.5 to 1.2.6 in /ts-tests (#2008)
  Bump (#2005)
  add NativeAssetId to asset registry (#1993)
  connect earning and incentives (#1995)
  Liquidation (#1955)
  Improvement/orml oracle (#1998)
  Mock xcm (#1977)
  ...

# Conflicts:
#	modules/currencies/src/lib.rs
#	predeploy-contracts
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ermalkaleci ermalkaleci ermalkaleci approved these changes

@zjb0807 zjb0807 zjb0807 left review comments

@xlc xlc xlc left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

switch to wasm only Fix try-runtime
4 participants
@zqhxuyuan @ermalkaleci @zjb0807 @xlc