Bump Substrate/Polkadot/Cumulus refs (aka Weights v1.5) #1597

svyatonik · 2022-10-10T12:40:38Z

~~WIP, just to show some progress~~
I'm trying to use Weight::from_ref_time(), Weight::ref_time() everywhere instead of expressions like Weight::zero() to make it easier to upgrade to Weights v2 after they'll be available

For the future me (or whoever will be working on upgrading from weights 1.5 to 2.0):

grep for ref_time - all code needs to be double checked;
there's a lot of things happening with weights in messages pallet and in messages relay. There are couple of places where we need to div weights - this op is currently unavailable (?). So all these things need to be rechecked and fixed;
I guess there'll be a way to refund unused bandwidth component - we'll also need to do that in all our pallets

This reverts commit d1b6593.

svyatonik · 2022-10-19T08:23:40Z

@bkontur @serban300 Let me know if you want this to be merged without waiting for this damned clippy check (hope it'll be fixed tomorrow). I know both of you (more or less) need this branch for your work. Once it is approved, I can merge with failing clippy

bkontur · 2022-10-19T08:31:26Z

Cargo.toml

-substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
-substrate-wasm-builder = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
-try-runtime-cli = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges" }
+beefy-gadget = { git = "https://github.com/paritytech//substrate", branch = "sv-locked-for-gav-xcm-v3-and-bridges-2" }


@svyatonik
this will stay as sv-locked-for-gav-xcm-v3-and-bridges-2 or sv-locked-for-gav-xcm-v3-and-bridges,
no problem with both, just asking

This PR will be merged with -2, but in a follow up (quick) PR I'll change it back to our regular branches. An alternative would be me force-pushing to sv-locked-for-gav-xcm-v3-and-bridges and all our builds are failing until this PR will be merged.

(i.e. I want to minimize this all-builds-fail time by doing this)

ok, ok,
I am thinking, I am using sv-locked-for-gav-xcm-v3-and-bridges in Cumulus for patched dependencies also, so if sv-locked-for-gav-xcm-v3-and-bridges will move now, my unfinished Cumulus stuff wont compile :)
so I would like to leave sv-locked-for-gav-xcm-v3-and-bridges-2 in master for a while or till the time I will start update bko-origin/bridge-ro-wo and Cumulus, and once I am done, I can do that quick PR

and once I am done with Cumulus and updating

Ok. I think I'll leave this PR for tomorrow - it may happen that it'll break bridges-ci/production tonight (if merged) and then we'll need to revert it, wait for another night and then remerge.

bkontur

Slava, cool :),
I am ok with merge now or tomorrow,
I need to finish my stuff first, before I will start updating to this (probably tomorrow or friday),
so its up to you

serban300

Looks good ! I just left 1 nit.

Personally I'm ok with merging the PR now. However you prefer.

modules/messages/src/lib.rs

This reverts commit 33042f4.

This reverts commit 1d2204f.

This reverts commit 259d91b.

…ghts

* Prepare polkadot v0.9.30 for darwinia-2.0 (#226) * update substrate dep master > v0.9.30 * Companion for paritytech/parity-bridges-common#1589 * Companion for paritytech/parity-bridges-common#1593 * Companion for paritytech/parity-bridges-common#1478 * Companion for paritytech/parity-bridges-common#1596 * Companion for paritytech/parity-bridges-common#1600 * Companion for paritytech/parity-bridges-common#1603 * Companion for paritytech/parity-bridges-common#1604 * Companion for paritytech/parity-bridges-common#1597 part.1 * Companion for paritytech/parity-bridges-common#1597 part.2 update weights * Companion for paritytech/parity-bridges-common#1597 part.3 * Companion for paritytech/parity-bridges-common#1597 part.4 fix compile * clear unused imports * Companion for paritytech/parity-bridges-common#1613 part.1 undone * fix tests * 0930 > master * try fix CI * fix CI * Use `H160` as `AccountId` (#230) * Use H160 in darwinia-core * H256 > H160 * update moonbeam account * Fix tests * remove debug println * Fix review * Fix review * Compatible `derive_account_id` (#234) * new derive_account_id * adjust * add test * Keep compatible of the derive way * Fix test * Update converter * Self review Co-authored-by: Aki Wu <[email protected]> * update cargo * master -> polkadot-v0.9.30 Co-authored-by: bear <[email protected]> Co-authored-by: Aki Wu <[email protected]>

) * update Substrate + Polkadot + Cumulus refs * Origin -> RuntimeOrigin * weights v1.5 * update refs once again + `cargo test -p pallet-bridge-grandpa` works * started work on `cargo test -p pallet-bridge-messages` * cargo test -p pallet-bridge-relayers * cargo test -p pallet-bridge-parachains * cargo test -p millau-runtime * cargo test -p bridge-runtime-common * cargo test -p rialto-runtime * cargo test -p rialto-parachain-runtime * cargo test -p millau-bridge-node * cargo test -p rialto-bridge-node * cargo test -p rialto-parachain-collator * cargo test -p messages-relay * cargo test -p parachains-relay * cargo test -p substrate-relay * cargo test --all * cargo check -p millau-runtime --locked --features runtime-benchmarks * fix remaining test * fmt * try to allow clippy failure temporarily * Revert "try to allow clippy failure temporarily" This reverts commit d1b6593. * use min_by * Revert "use min_by" This reverts commit 33042f4. * Revert "Revert "use min_by"" This reverts commit 1d2204f. * trigger CI * Revert "trigger CI" This reverts commit 259d91b. * new day, new clippy warning * more clippy issues

svyatonik added 3 commits October 10, 2022 14:39

update Substrate + Polkadot + Cumulus refs

2c97cc0

Origin -> RuntimeOrigin

b7ee784

weights v1.5

76920a9

svyatonik added the dependencies Pull requests that update a dependency file label Oct 10, 2022

svyatonik added 21 commits October 14, 2022 13:36

update refs once again + cargo test -p pallet-bridge-grandpa works

3a59d81

started work on cargo test -p pallet-bridge-messages

1afeb6a

cargo test -p pallet-bridge-relayers

45785b1

cargo test -p pallet-bridge-parachains

b5bb55d

cargo test -p millau-runtime

cc4823f

cargo test -p bridge-runtime-common

6fadc77

cargo test -p rialto-runtime

f20117d

cargo test -p rialto-parachain-runtime

f1a5bbb

cargo test -p millau-bridge-node

b1242ee

cargo test -p rialto-bridge-node

daf6dda

cargo test -p rialto-parachain-collator

553168c

cargo test -p messages-relay

5e14bc7

cargo test -p parachains-relay

e3b2cfb

cargo test -p substrate-relay

8065e73

cargo test --all

c876186

cargo check -p millau-runtime --locked --features runtime-benchmarks

f5d64dd

fix remaining test

8d22a33

Merge branch 'master' into bump-refs

2953ef7

fmt

1e6ad55

try to allow clippy failure temporarily

d1b6593

Revert "try to allow clippy failure temporarily"

4d3d0be

This reverts commit d1b6593.

This was referenced Oct 17, 2022

Unblocking CI #1601

Merged

Fix new nightly clippy issues #1604

Merged

Merge branch 'master' into bump-refs

7091291

svyatonik mentioned this pull request Oct 18, 2022

Script to build all docker containers #1605

Merged

serban300 mentioned this pull request Oct 18, 2022

Add BEEFY finality pallet with basic functionality #1606

Merged

svyatonik marked this pull request as ready for review October 19, 2022 07:59

svyatonik requested a review from serban300 October 19, 2022 07:59

bkontur reviewed Oct 19, 2022

View reviewed changes

bkontur approved these changes Oct 19, 2022

View reviewed changes

serban300 approved these changes Oct 19, 2022

View reviewed changes

modules/messages/src/lib.rs Outdated Show resolved Hide resolved

svyatonik added 7 commits October 19, 2022 12:41

use min_by

33042f4

Revert "use min_by"

1d2204f

This reverts commit 33042f4.

Revert "Revert "use min_by""

d84dd6e

This reverts commit 1d2204f.

trigger CI

259d91b

Revert "trigger CI"

b058ce1

This reverts commit 259d91b.

new day, new clippy warning

f066349

more clippy issues

0cabac6

svyatonik enabled auto-merge (squash) October 20, 2022 07:26

svyatonik merged commit 789f185 into master Oct 20, 2022

svyatonik deleted the bump-refs branch October 20, 2022 07:27

jiguantong mentioned this pull request Oct 27, 2022

LCMP support XCM darwinia-network/darwinia-messages-substrate#218

Closed

10 tasks

jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Oct 27, 2022

Companion for paritytech/parity-bridges-common#1597

0dca40a

jiguantong added a commit to darwinia-network/darwinia-parachain that referenced this pull request Nov 1, 2022

Companion for paritytech/parity-bridges-common#1597 Part 1

51ce7ff

jiguantong added a commit to darwinia-network/darwinia-parachain that referenced this pull request Nov 1, 2022

Companion for paritytech/parity-bridges-common#1597 Part 2

b1df990

jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Nov 17, 2022

Companion for paritytech/parity-bridges-common#1597 part.1

72e86d8

jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Nov 17, 2022

Companion for paritytech/parity-bridges-common#1597 part.2 update wei…

952cd78

…ghts

jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Nov 17, 2022

Companion for paritytech/parity-bridges-common#1597 part.3

498a00e

jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Nov 17, 2022

Companion for paritytech/parity-bridges-common#1597 part.4 fix compile

ccbe15f

svyatonik pushed a commit that referenced this pull request Jul 17, 2023

fix release report generation script (#1597)

c2d9753

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump Substrate/Polkadot/Cumulus refs (aka Weights v1.5) #1597

Bump Substrate/Polkadot/Cumulus refs (aka Weights v1.5) #1597

svyatonik commented Oct 10, 2022 •

edited

Loading

svyatonik commented Oct 19, 2022

bkontur Oct 19, 2022

svyatonik Oct 19, 2022

svyatonik Oct 19, 2022

bkontur Oct 19, 2022

svyatonik Oct 19, 2022

bkontur left a comment

serban300 left a comment

Bump Substrate/Polkadot/Cumulus refs (aka Weights v1.5) #1597

Bump Substrate/Polkadot/Cumulus refs (aka Weights v1.5) #1597

Conversation

svyatonik commented Oct 10, 2022 • edited Loading

svyatonik commented Oct 19, 2022

bkontur Oct 19, 2022

Choose a reason for hiding this comment

svyatonik Oct 19, 2022

Choose a reason for hiding this comment

svyatonik Oct 19, 2022

Choose a reason for hiding this comment

bkontur Oct 19, 2022

Choose a reason for hiding this comment

svyatonik Oct 19, 2022

Choose a reason for hiding this comment

bkontur left a comment

Choose a reason for hiding this comment

serban300 left a comment

Choose a reason for hiding this comment

svyatonik commented Oct 10, 2022 •

edited

Loading