Skip to content

Commit 409ef45

Browse files
A0-4020: Pallet operations. (#1637)
# Description An account can have an underflow of a `consumers` counter. Account categories that are impacted by this issue depend on a chain runtime, but specifically for AlephNode runtime are as follows: * `consumers` == 0, `reserved` > 0 * `consumers` == 1, `balances.Locks` contain an entry with `id` == `vesting` * `consumers` == 2, `balances.Locks` contain an entry with `id` == `staking` * `consumers` == 3, `balances.Locks` contain entries with `id` == `staking` and account id is in `session.nextKeys` This PR adds `pallet-operations` with a single extrinsic `fix_accounts_consumers_underflow` that checks if the account falls into one of the above categories, and increases its `consumers` counter in such scenario. ## Type of change Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) ## Testing There are 4 cases to test, and all of them are tested in the unit tests. 3 out of 4 cases were also tested on local chain with cloned state, except 4th scenario (validator). ## Companion PRs #1638 # TODO * weights adjustment for `fix_accounts_consumers_underflow`
1 parent c18b02b commit 409ef45

15 files changed

Lines changed: 1210 additions & 6 deletions

File tree

Cargo.lock

Lines changed: 22 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ members = [
99
"pallets/aleph",
1010
"pallets/elections",
1111
"pallets/committee-management",
12+
"pallets/operations",
1213
"pallets/support",
1314
"primitives",
1415
"rate-limiter",
@@ -175,6 +176,7 @@ rate-limiter = { path = "rate-limiter" }
175176
pallet-aleph = { path = "pallets/aleph", default-features = false }
176177
pallet-committee-management = { path = "pallets/committee-management", default-features = false }
177178
pallet-elections = { path = "pallets/elections", default-features = false }
179+
pallet-operations = { path = "pallets/operations", default-features = false }
178180
pallets-support = { path = "pallets/support", default-features = false }
179181
primitives = { path = "primitives", default-features = false }
180182

bin/node/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "aleph-node"
3-
version = "0.13.0"
3+
version = "0.13.1"
44
description = "Aleph node binary"
55
build = "build.rs"
66
license = "GPL-3.0-or-later"

bin/runtime/Cargo.toml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "aleph-runtime"
3-
version = "0.13.0"
3+
version = "0.13.1"
44
license = "GPL-3.0-or-later"
55
authors.workspace = true
66
edition.workspace = true
@@ -63,6 +63,7 @@ frame-benchmarking = { workspace = true, optional = true }
6363
pallet-aleph = { workspace = true }
6464
pallet-committee-management= { workspace = true }
6565
pallet-elections = { workspace = true }
66+
pallet-operations = { workspace = true }
6667
primitives = { workspace = true }
6768
pallet-proxy = { workspace = true }
6869

@@ -88,6 +89,7 @@ std = [
8889
"pallet-authorship/std",
8990
"pallet-balances/std",
9091
"pallet-elections/std",
92+
"pallet-operations/std",
9193
"pallet-identity/std",
9294
"pallet-insecure-randomness-collective-flip/std",
9395
"pallet-session/std",

bin/runtime/src/lib.rs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
9797
spec_name: create_runtime_str!("aleph-node"),
9898
impl_name: create_runtime_str!("aleph-node"),
9999
authoring_version: 1,
100-
spec_version: 69,
100+
spec_version: 70,
101101
impl_version: 1,
102102
apis: RUNTIME_API_VERSIONS,
103103
transaction_version: 18,
@@ -376,6 +376,13 @@ impl pallet_elections::Config for Runtime {
376376
type BannedValidators = CommitteeManagement;
377377
}
378378

379+
impl pallet_operations::Config for Runtime {
380+
type RuntimeEvent = RuntimeEvent;
381+
type AccountInfoProvider = System;
382+
type BalancesProvider = Balances;
383+
type NextKeysSessionProvider = Session;
384+
}
385+
379386
impl pallet_committee_management::Config for Runtime {
380387
type RuntimeEvent = RuntimeEvent;
381388
type BanHandler = Elections;
@@ -912,6 +919,7 @@ construct_runtime!(
912919
Identity: pallet_identity = 20,
913920
CommitteeManagement: pallet_committee_management = 21,
914921
Proxy: pallet_proxy = 22,
922+
Operations: pallet_operations = 255,
915923
}
916924
);
917925

pallets/operations/Cargo.toml

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
[package]
2+
name = "pallet-operations"
3+
version = "0.1.0"
4+
authors.workspace = true
5+
edition.workspace = true
6+
homepage.workspace = true
7+
repository.workspace = true
8+
9+
[dependencies]
10+
parity-scale-codec = { workspace = true, features = ["derive"] }
11+
scale-info = { workspace = true, features = ["derive"] }
12+
log = { workspace = true }
13+
14+
frame-support = { workspace = true }
15+
frame-system = { workspace = true }
16+
pallet-session = { workspace = true }
17+
pallet-balances = { workspace = true }
18+
sp-runtime = { workspace = true }
19+
sp-core = { workspace = true }
20+
21+
[dev-dependencies]
22+
sp-io = { workspace = true }
23+
pallet-staking = { workspace = true }
24+
pallet-timestamp = { workspace = true }
25+
frame-election-provider-support = { workspace = true }
26+
27+
[features]
28+
default = ["std"]
29+
std = [
30+
"parity-scale-codec/std",
31+
"scale-info/std",
32+
"log/std",
33+
34+
"frame-support/std",
35+
"frame-system/std",
36+
"pallet-session/std",
37+
"pallet-balances/std",
38+
"pallet-staking/std",
39+
"pallet-timestamp/std",
40+
"frame-election-provider-support/std",
41+
"sp-runtime/std",
42+
"sp-core/std",
43+
44+
]
45+
46+
try-runtime = [
47+
"frame-support/try-runtime",
48+
]

pallets/operations/LICENSE

Lines changed: 201 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,201 @@
1+
Apache License
2+
Version 2.0, January 2004
3+
http://www.apache.org/licenses/
4+
5+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
6+
7+
1. Definitions.
8+
9+
"License" shall mean the terms and conditions for use, reproduction,
10+
and distribution as defined by Sections 1 through 9 of this document.
11+
12+
"Licensor" shall mean the copyright owner or entity authorized by
13+
the copyright owner that is granting the License.
14+
15+
"Legal Entity" shall mean the union of the acting entity and all
16+
other entities that control, are controlled by, or are under common
17+
control with that entity. For the purposes of this definition,
18+
"control" means (i) the power, direct or indirect, to cause the
19+
direction or management of such entity, whether by contract or
20+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
21+
outstanding shares, or (iii) beneficial ownership of such entity.
22+
23+
"You" (or "Your") shall mean an individual or Legal Entity
24+
exercising permissions granted by this License.
25+
26+
"Source" form shall mean the preferred form for making modifications,
27+
including but not limited to software source code, documentation
28+
source, and configuration files.
29+
30+
"Object" form shall mean any form resulting from mechanical
31+
transformation or translation of a Source form, including but
32+
not limited to compiled object code, generated documentation,
33+
and conversions to other media types.
34+
35+
"Work" shall mean the work of authorship, whether in Source or
36+
Object form, made available under the License, as indicated by a
37+
copyright notice that is included in or attached to the work
38+
(an example is provided in the Appendix below).
39+
40+
"Derivative Works" shall mean any work, whether in Source or Object
41+
form, that is based on (or derived from) the Work and for which the
42+
editorial revisions, annotations, elaborations, or other modifications
43+
represent, as a whole, an original work of authorship. For the purposes
44+
of this License, Derivative Works shall not include works that remain
45+
separable from, or merely link (or bind by name) to the interfaces of,
46+
the Work and Derivative Works thereof.
47+
48+
"Contribution" shall mean any work of authorship, including
49+
the original version of the Work and any modifications or additions
50+
to that Work or Derivative Works thereof, that is intentionally
51+
submitted to Licensor for inclusion in the Work by the copyright owner
52+
or by an individual or Legal Entity authorized to submit on behalf of
53+
the copyright owner. For the purposes of this definition, "submitted"
54+
means any form of electronic, verbal, or written communication sent
55+
to the Licensor or its representatives, including but not limited to
56+
communication on electronic mailing lists, source code control systems,
57+
and issue tracking systems that are managed by, or on behalf of, the
58+
Licensor for the purpose of discussing and improving the Work, but
59+
excluding communication that is conspicuously marked or otherwise
60+
designated in writing by the copyright owner as "Not a Contribution."
61+
62+
"Contributor" shall mean Licensor and any individual or Legal Entity
63+
on behalf of whom a Contribution has been received by Licensor and
64+
subsequently incorporated within the Work.
65+
66+
2. Grant of Copyright License. Subject to the terms and conditions of
67+
this License, each Contributor hereby grants to You a perpetual,
68+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
69+
copyright license to reproduce, prepare Derivative Works of,
70+
publicly display, publicly perform, sublicense, and distribute the
71+
Work and such Derivative Works in Source or Object form.
72+
73+
3. Grant of Patent License. Subject to the terms and conditions of
74+
this License, each Contributor hereby grants to You a perpetual,
75+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
76+
(except as stated in this section) patent license to make, have made,
77+
use, offer to sell, sell, import, and otherwise transfer the Work,
78+
where such license applies only to those patent claims licensable
79+
by such Contributor that are necessarily infringed by their
80+
Contribution(s) alone or by combination of their Contribution(s)
81+
with the Work to which such Contribution(s) was submitted. If You
82+
institute patent litigation against any entity (including a
83+
cross-claim or counterclaim in a lawsuit) alleging that the Work
84+
or a Contribution incorporated within the Work constitutes direct
85+
or contributory patent infringement, then any patent licenses
86+
granted to You under this License for that Work shall terminate
87+
as of the date such litigation is filed.
88+
89+
4. Redistribution. You may reproduce and distribute copies of the
90+
Work or Derivative Works thereof in any medium, with or without
91+
modifications, and in Source or Object form, provided that You
92+
meet the following conditions:
93+
94+
(a) You must give any other recipients of the Work or
95+
Derivative Works a copy of this License; and
96+
97+
(b) You must cause any modified files to carry prominent notices
98+
stating that You changed the files; and
99+
100+
(c) You must retain, in the Source form of any Derivative Works
101+
that You distribute, all copyright, patent, trademark, and
102+
attribution notices from the Source form of the Work,
103+
excluding those notices that do not pertain to any part of
104+
the Derivative Works; and
105+
106+
(d) If the Work includes a "NOTICE" text file as part of its
107+
distribution, then any Derivative Works that You distribute must
108+
include a readable copy of the attribution notices contained
109+
within such NOTICE file, excluding those notices that do not
110+
pertain to any part of the Derivative Works, in at least one
111+
of the following places: within a NOTICE text file distributed
112+
as part of the Derivative Works; within the Source form or
113+
documentation, if provided along with the Derivative Works; or,
114+
within a display generated by the Derivative Works, if and
115+
wherever such third-party notices normally appear. The contents
116+
of the NOTICE file are for informational purposes only and
117+
do not modify the License. You may add Your own attribution
118+
notices within Derivative Works that You distribute, alongside
119+
or as an addendum to the NOTICE text from the Work, provided
120+
that such additional attribution notices cannot be construed
121+
as modifying the License.
122+
123+
You may add Your own copyright statement to Your modifications and
124+
may provide additional or different license terms and conditions
125+
for use, reproduction, or distribution of Your modifications, or
126+
for any such Derivative Works as a whole, provided Your use,
127+
reproduction, and distribution of the Work otherwise complies with
128+
the conditions stated in this License.
129+
130+
5. Submission of Contributions. Unless You explicitly state otherwise,
131+
any Contribution intentionally submitted for inclusion in the Work
132+
by You to the Licensor shall be under the terms and conditions of
133+
this License, without any additional terms or conditions.
134+
Notwithstanding the above, nothing herein shall supersede or modify
135+
the terms of any separate license agreement you may have executed
136+
with Licensor regarding such Contributions.
137+
138+
6. Trademarks. This License does not grant permission to use the trade
139+
names, trademarks, service marks, or product names of the Licensor,
140+
except as required for reasonable and customary use in describing the
141+
origin of the Work and reproducing the content of the NOTICE file.
142+
143+
7. Disclaimer of Warranty. Unless required by applicable law or
144+
agreed to in writing, Licensor provides the Work (and each
145+
Contributor provides its Contributions) on an "AS IS" BASIS,
146+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
147+
implied, including, without limitation, any warranties or conditions
148+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
149+
PARTICULAR PURPOSE. You are solely responsible for determining the
150+
appropriateness of using or redistributing the Work and assume any
151+
risks associated with Your exercise of permissions under this License.
152+
153+
8. Limitation of Liability. In no event and under no legal theory,
154+
whether in tort (including negligence), contract, or otherwise,
155+
unless required by applicable law (such as deliberate and grossly
156+
negligent acts) or agreed to in writing, shall any Contributor be
157+
liable to You for damages, including any direct, indirect, special,
158+
incidental, or consequential damages of any character arising as a
159+
result of this License or out of the use or inability to use the
160+
Work (including but not limited to damages for loss of goodwill,
161+
work stoppage, computer failure or malfunction, or any and all
162+
other commercial damages or losses), even if such Contributor
163+
has been advised of the possibility of such damages.
164+
165+
9. Accepting Warranty or Additional Liability. While redistributing
166+
the Work or Derivative Works thereof, You may choose to offer,
167+
and charge a fee for, acceptance of support, warranty, indemnity,
168+
or other liability obligations and/or rights consistent with this
169+
License. However, in accepting such obligations, You may act only
170+
on Your own behalf and on Your sole responsibility, not on behalf
171+
of any other Contributor, and only if You agree to indemnify,
172+
defend, and hold each Contributor harmless for any liability
173+
incurred by, or claims asserted against, such Contributor by reason
174+
of your accepting any such warranty or additional liability.
175+
176+
END OF TERMS AND CONDITIONS
177+
178+
APPENDIX: How to apply the Apache License to your work.
179+
180+
To apply the Apache License to your work, attach the following
181+
boilerplate notice, with the fields enclosed by brackets "[]"
182+
replaced with your own identifying information. (Don't include
183+
the brackets!) The text should be enclosed in the appropriate
184+
comment syntax for the file format. We also recommend that a
185+
file or class name and description of purpose be included on the
186+
same "printed page" as the copyright notice for easier
187+
identification within third-party archives.
188+
189+
Copyright [yyyy] [name of copyright owner]
190+
191+
Licensed under the Apache License, Version 2.0 (the "License");
192+
you may not use this file except in compliance with the License.
193+
You may obtain a copy of the License at
194+
195+
http://www.apache.org/licenses/LICENSE-2.0
196+
197+
Unless required by applicable law or agreed to in writing, software
198+
distributed under the License is distributed on an "AS IS" BASIS,
199+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
200+
See the License for the specific language governing permissions and
201+
limitations under the License.

0 commit comments

Comments
 (0)