chore: Polkadot v1.1.0 #627

Ad96el · 2024-04-17T06:55:56Z

Fixes https://github.com/KILTprotocol/ticket/issues/2946

Updates the Polkadot dependencies to version 1.1.0 from the mono repository.

I could not use the PSVM tool due to encountering two issues:

Installing the newest version 0.2.2 results in an error:

error: failed to compile `psvm v0.2.2`, intermediate artifacts can be found at `/tmp/cargo-installtsUfAO`

Caused by:
  failed to select a version for `env_logger`.
      ... required by package `psvm v0.2.2`
  versions that meet the requirements `^0.11.3` are: 0.11.3

  the package `psvm` depends on `env_logger`, with features: `anstream` but `env_logger` does not have these features.
   It has an optional dependency with that name, but that dependency uses the "dep:" syntax in the features table, so it does not have an implicit feature with that name.

I was able to install version 0.1.0, but only versions from 1.3.0 to 1.8.0 are provided there.

An async backing configuration is implemented, preserving the current parachain behavior.

Peregrine Diff

!!! THE SUBWASM REDUCED DIFFER IS EXPERIMENTAL, DOUBLE CHECK THE RESULTS !!!
[≠] pallet 0: System -> 1 change(s)
  - constants changes:
    [≠] Version: [ 48, 109, 97, 115, 104, 110, 101, 116, 45, 110, 111, 100, 101, 48, 109, 97, 115, 104, 110, 101, 116, 45, 110, 111, 100, 101, 4, 0, 0, 0, 136, 44, ... ]
        [Value([Changed(38, U8Change(60, 64)), Changed(159, U8Change(234, 215)), Changed(160, U8Change(147, 189)), Changed(161, U8Change(227, 216)), Changed(162, U8Change(241, 162)), Changed(163, U8Change(111, 114)), Changed(164, U8Change(61, 202)), Changed(165, U8Change(105, 13)), Changed(166, U8Change(98, 101)), Changed(167, U8Change(2, 1)), Changed(171, U8Change(38, 234)), Changed(172, U8Change(96, 147)), Changed(173, U8Change(149, 227)), Changed(174, U8Change(85, 241)), Changed(175, U8Change(192, 111)), Changed(176, U8Change(101, 61)), Changed(177, U8Change(102, 105)), Changed(178, U8Change(3, 98)), Changed(183, U8Change(164, 38)), Changed(184, U8Change(123, 96)), Changed(185, U8Change(125, 149)), Changed(186, U8Change(84, 85)), Changed(187, U8Change(73, 192)), Changed(188, U8Change(148, 101)), Changed(189, U8Change(201, 102)), Changed(190, U8Change(155, 3)), Changed(191, U8Change(1, 2)), Changed(195, U8Change(69, 164)), Changed(196, U8Change(191, 123)), Changed(197, U8Change(186, 125)), Changed(198, U8Change(81, 84)), Changed(199, U8Change(163, 73)), Changed(200, U8Change(16, 148)), Changed(201, U8Change(178, 201)), Changed(202, U8Change(35, 155)), Changed(207, U8Change(195, 69)), Changed(208, U8Change(179, 191)), Changed(209, U8Change(232, 186)), Changed(210, U8Change(211, 81)), Changed(211, U8Change(50, 163)), Changed(212, U8Change(115, 16)), Changed(213, U8Change(153, 178)), Changed(214, U8Change(13, 35)), Changed(219, U8Change(8, 195)), Changed(220, U8Change(0, 179)), Changed(221, U8Change(0, 232)), Changed(222, U8Change(0, 211)), Changed(223, U8Change(0, 50)), Added(224, 115), Added(225, 153), Added(226, 13), Added(227, 1), Added(228, 0), Added(229, 0), Added(230, 0), Added(231, 8), Added(232, 0), Added(233, 0), Added(234, 0), Added(235, 0)])]

[≠] pallet 24: AuraExt -> 1 change(s)
  - storages changes:
    [+] StorageDesc { name: "SlotInfo", modifier: "Optional", default_value: [0] }

[≠] pallet 31: Council -> 1 change(s)
  - errors changes:
    [+] ErrorDesc { index: 10, name: "PrimeAccountNotMember" }

[≠] pallet 32: TechnicalCommittee -> 1 change(s)
  - errors changes:
    [+] ErrorDesc { index: 10, name: "PrimeAccountNotMember" }

[≠] pallet 80: ParachainSystem -> 3 change(s)
  - storages changes:
    [+] StorageDesc { name: "AggregatedUnincludedSegment", modifier: "Optional", default_value: [0] }
    [+] StorageDesc { name: "UnincludedSegment", modifier: "Default", default_value: [0] }
    [+] StorageDesc { name: "UpgradeGoAhead", modifier: "Default", default_value: [0] }

[-] pallet 9: Configuration
SUMMARY:
- Compatible.......................: false
- Require transaction_version bump.: false

!!! THE SUBWASM REDUCED DIFFER IS EXPERIMENTAL, DOUBLE CHECK THE RESULTS !!!

Spiritnet Diff

!!! THE SUBWASM REDUCED DIFFER IS EXPERIMENTAL, DOUBLE CHECK THE RESULTS !!!
[≠] pallet 0: System -> 1 change(s)
  - constants changes:
    [≠] Version: [ 56, 107, 105, 108, 116, 45, 115, 112, 105, 114, 105, 116, 110, 101, 116, 56, 107, 105, 108, 116, 45, 115, 112, 105, 114, 105, 116, 110, 101, 116, 1, 0, ... ]
        [Value([Changed(42, U8Change(60, 64)), Changed(163, U8Change(234, 215)), Changed(164, U8Change(147, 189)), Changed(165, U8Change(227, 216)), Changed(166, U8Change(241, 162)), Changed(167, U8Change(111, 114)), Changed(168, U8Change(61, 202)), Changed(169, U8Change(105, 13)), Changed(170, U8Change(98, 101)), Changed(171, U8Change(2, 1)), Changed(175, U8Change(38, 234)), Changed(176, U8Change(96, 147)), Changed(177, U8Change(149, 227)), Changed(178, U8Change(85, 241)), Changed(179, U8Change(192, 111)), Changed(180, U8Change(101, 61)), Changed(181, U8Change(102, 105)), Changed(182, U8Change(3, 98)), Changed(187, U8Change(164, 38)), Changed(188, U8Change(123, 96)), Changed(189, U8Change(125, 149)), Changed(190, U8Change(84, 85)), Changed(191, U8Change(73, 192)), Changed(192, U8Change(148, 101)), Changed(193, U8Change(201, 102)), Changed(194, U8Change(155, 3)), Changed(195, U8Change(1, 2)), Changed(199, U8Change(69, 164)), Changed(200, U8Change(191, 123)), Changed(201, U8Change(186, 125)), Changed(202, U8Change(81, 84)), Changed(203, U8Change(163, 73)), Changed(204, U8Change(16, 148)), Changed(205, U8Change(178, 201)), Changed(206, U8Change(35, 155)), Changed(211, U8Change(195, 69)), Changed(212, U8Change(179, 191)), Changed(213, U8Change(232, 186)), Changed(214, U8Change(211, 81)), Changed(215, U8Change(50, 163)), Changed(216, U8Change(115, 16)), Changed(217, U8Change(153, 178)), Changed(218, U8Change(13, 35)), Changed(223, U8Change(8, 195)), Changed(224, U8Change(0, 179)), Changed(225, U8Change(0, 232)), Changed(226, U8Change(0, 211)), Changed(227, U8Change(0, 50)), Added(228, 115), Added(229, 153), Added(230, 13), Added(231, 1), Added(232, 0), Added(233, 0), Added(234, 0), Added(235, 8), Added(236, 0), Added(237, 0), Added(238, 0), Added(239, 0)])]

[≠] pallet 24: AuraExt -> 1 change(s)
  - storages changes:
    [+] StorageDesc { name: "SlotInfo", modifier: "Optional", default_value: [0] }

[≠] pallet 31: Council -> 1 change(s)
  - errors changes:
    [+] ErrorDesc { index: 10, name: "PrimeAccountNotMember" }

[≠] pallet 32: TechnicalCommittee -> 1 change(s)
  - errors changes:
    [+] ErrorDesc { index: 10, name: "PrimeAccountNotMember" }

[≠] pallet 80: ParachainSystem -> 3 change(s)
  - storages changes:
    [+] StorageDesc { name: "AggregatedUnincludedSegment", modifier: "Optional", default_value: [0] }
    [+] StorageDesc { name: "UnincludedSegment", modifier: "Default", default_value: [0] }
    [+] StorageDesc { name: "UpgradeGoAhead", modifier: "Default", default_value: [0] }

SUMMARY:
- Compatible.......................: true
- Require transaction_version bump.: false

!!! THE SUBWASM REDUCED DIFFER IS EXPERIMENTAL, DOUBLE CHECK THE RESULTS !!!

Checklist:

I have verified that the code works
- No panics! (checked arithmetic ops, no indexing array[3] use get(3), ...)
I have verified that the code is easy to understand
- If not, I have left a well-balanced amount of inline comments
I have left the code in a better state
I have documented the changes (where applicable)
- Either PR or Ticket to update the Docs
- Link the PR/Ticket here

ntn-x2

Mostly minor stuff. I'd like few more comments to be included whenever we have taken "inspiration" from upstream. Please also run Clippy to catch all the redundant calls and the warnings.

runtimes/spiritnet/Cargo.toml

runtimes/peregrine/Cargo.toml

runtimes/common/Cargo.toml

runtimes/common/src/constants.rs

runtimes/common/src/dip/merkle/mod.rs

integration-tests/emulated/Cargo.toml

integration-tests/emulated/src/mock/para_chains.rs

.taplo.toml

…e into ag_polkadot_v1.1.0

ntn-x2

Minor things, then we're good to go!

ntn-x2 · 2024-05-28T12:23:03Z

.taplo.toml

@@ -5,3 +5,9 @@ align_entries       = true
 allowed_blank_lines = 1
 reorder_arrays      = true
 reorder_keys        = true
+
+[[rule]]
+keys = ["build-dependencies", "dependencies", "dev-dependencies"]


We usually have dev-dependencies before dependencies. Why have those not been changed here? I don't see any shuffling around. But I would say dev-dependencies should come first, since they don't have any feature nor optional ones?

Unless it only specifies what sections to look at, and not in what order they must appear.

It is not reordering the keys, only applying the rules to the sections

ntn-x2 · 2024-05-28T12:25:40Z

pallets/pallet-dip-consumer/src/origin.rs

@@ -16,7 +16,7 @@

 // If you feel like getting in touch with us, you can do so at info@botlabs.org

-use frame_support::{traits::EnsureOrigin, RuntimeDebug};
+use frame_support::{sp_runtime::RuntimeDebug, traits::EnsureOrigin};


Yes, since it's pulled in anyway.

ntn-x2 · 2024-05-28T12:25:54Z

pallets/pallet-dip-consumer/src/lib.rs

 		pallet_prelude::*,
+		sp_runtime::traits::Dispatchable,


dip-template/nodes/dip-consumer/src/service.rs

nodes/standalone/src/command.rs

integration-tests/emulated/src/mock/para_chains.rs

Ad96el added 8 commits April 16, 2024 14:26

fix: weights

698a495

update git repo to polkadot-sdk

b6a76df

intermediate

18b46df

compiling

32dbe7b

emulator

d570456

intermediate

c24121a

intermediate

b5cde60

intermediate

44788d3

KILTprotocol deleted a comment from kilt-command-bot bot Apr 22, 2024

ntn-x2 added 2 commits May 7, 2024 11:20

Merge branch 'develop' into ag_polkadot_v1.1.0

3e8d1df

XCM emulator compiles

b8c59e4

KILTprotocol deleted a comment from kilt-command-bot bot May 16, 2024

KILTprotocol deleted a comment from ggera May 16, 2024

Ad96el added 15 commits May 22, 2024 17:11

revert to blocknumber u64

a581252

update Cargo.toml

a2fd83b

compiling

4898033

tests running

2e3c5bc

compiling parachain node

d588de7

make consumer template compile

db17c2c

remove try runtime command

40cce9a

make provider compile

b66496b

remove try runtime

272b1c2

compiling no errors no warnings

3ba31de

async backing spiritnet

28ba15d

async backing peregrine

37152f8

Merge branch 'develop' into ag_polkadot_v1.1.0

04788c7

merge

d249671

compiling

439af36

Ad96el added 2 commits May 27, 2024 13:01

default features

d0732ad

remove feature

a96da0d

ntn-x2 requested changes May 27, 2024

View reviewed changes

Ad96el added 19 commits May 27, 2024 15:25

fmt

dcffc05

remove duplicates

ba7b5e4

MAX_NOMINATORS

a26607f

runtime debug

d7dc75a

runtime debug

47d07ff

remove experimental

952013d

add register

3bc284a

add clippy complexity

a618f41

reorder constants

9d7ccf2

add whitespace

db61039

reorder register

4e6c5e7

update error message

e50e5d2

grandpa

ba967f1

remove comment

abec9c1

clippy

ee0155c

Runtime Debug

5f2ea38

clippy

583cb49

clippy

36d49ad

clippy

c2990e7

Ad96el commented May 28, 2024

View reviewed changes

.taplo.toml Show resolved Hide resolved

Ad96el added 3 commits May 28, 2024 13:23

add constants

a4804c0

validate block

91c576d

Merge branch 'ag_polkadot_v1.1.0' of github.com:KILTprotocol/kilt-nod…

4c12f62

…e into ag_polkadot_v1.1.0

Ad96el requested a review from ntn-x2 May 28, 2024 11:53

change import

6e8b844

ntn-x2 reviewed May 28, 2024

View reviewed changes

add sp runtime

ca08bca

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: Polkadot v1.1.0 #627

chore: Polkadot v1.1.0 #627

Ad96el commented Apr 17, 2024 •

edited

ntn-x2 left a comment

ntn-x2 left a comment

ntn-x2 May 28, 2024

ntn-x2 May 28, 2024

Ad96el May 28, 2024 •

edited

ntn-x2 May 28, 2024

ntn-x2 May 28, 2024

chore: Polkadot v1.1.0 #627

Are you sure you want to change the base?

chore: Polkadot v1.1.0 #627

Conversation

Ad96el commented Apr 17, 2024 • edited

Fixes https://github.com/KILTprotocol/ticket/issues/2946

Checklist:

ntn-x2 left a comment

Choose a reason for hiding this comment

ntn-x2 left a comment

Choose a reason for hiding this comment

ntn-x2 May 28, 2024

Choose a reason for hiding this comment

ntn-x2 May 28, 2024

Choose a reason for hiding this comment

Ad96el May 28, 2024 • edited

Choose a reason for hiding this comment

ntn-x2 May 28, 2024

Choose a reason for hiding this comment

ntn-x2 May 28, 2024

Choose a reason for hiding this comment

Ad96el commented Apr 17, 2024 •

edited

Ad96el May 28, 2024 •

edited