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

Kusama: Make the current inflation formula adjustable. #364

Merged
merged 57 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
8ab7024
Blueprint of how to fix inflation
kianenigma Jun 27, 2024
6fa5130
Update to 1.14
ggwpez Jul 14, 2024
d99131f
Update Collectives
ggwpez Jul 14, 2024
ec4914b
Disable Encointer runtime
ggwpez Jul 14, 2024
4143885
Update Kusama coretime
ggwpez Jul 14, 2024
1c0af2d
Update Treasury
ggwpez Jul 14, 2024
7fed1b4
Update collectives
ggwpez Jul 14, 2024
0265664
Mock weights
ggwpez Jul 14, 2024
36c9a7f
Kusama coretime revenue integration (#384)
s0me0ne-unkn0wn Jul 17, 2024
6ca6fcb
re-enable & bump encointer to polkadot-v1.14.0 (#385)
clangenb Jul 17, 2024
0be46e0
Clippy
ggwpez Jul 17, 2024
af19be5
Merge remote-tracking branch 'origin/main' into oty-update-1-14
ggwpez Jul 17, 2024
b0b1a81
Update CHANGELOG
ggwpez Jul 17, 2024
4104b17
Clippy
ggwpez Jul 17, 2024
235d14e
Clippy
ggwpez Jul 17, 2024
129d1f7
Master.into()
kianenigma Jul 17, 2024
522b881
update kusama
kianenigma Jul 17, 2024
b2be560
Fixes
ggwpez Jul 17, 2024
30d1345
Fix changelog
ggwpez Jul 17, 2024
e3fca1e
Re-enable `request_revenue_info_at` in CoretimeInterface (#393)
seadanda Jul 18, 2024
9740965
Merge remote-tracking branch 'origin/main' into oty-update-1-14
ggwpez Jul 18, 2024
4882727
add TODO
kianenigma Jul 19, 2024
324ff5a
Merge remote-tracking branch 'upstream/main' into kiz-inflation
kianenigma Jul 19, 2024
d60bfae
fix some params
kianenigma Jul 19, 2024
bd87a03
merged
kianenigma Jul 19, 2024
4089a71
add tests
kianenigma Jul 19, 2024
6eb9e73
update
kianenigma Aug 1, 2024
a9ab9ca
merged
kianenigma Aug 1, 2024
28adc6b
fmt
kianenigma Aug 1, 2024
70743e9
fix
kianenigma Aug 1, 2024
a31186b
fix
kianenigma Aug 1, 2024
175020f
fix lock file
kianenigma Aug 1, 2024
f6d2aae
fmt and more test
kianenigma Aug 1, 2024
93479de
add runtime api
kianenigma Aug 1, 2024
c65d843
fmt
kianenigma Aug 1, 2024
ce1ae0f
changelog
kianenigma Aug 1, 2024
532f71d
Update relay/kusama/src/lib.rs
kianenigma Aug 6, 2024
1e019dd
Update relay/kusama/src/lib.rs
kianenigma Aug 13, 2024
0ea2ec3
Update relay/kusama/src/lib.rs
kianenigma Aug 13, 2024
18629c0
Master.into()
kianenigma Aug 15, 2024
2ad531a
fix a few things
kianenigma Aug 15, 2024
432cf2f
Merge branch 'kiz-inflation' of github.com:kianenigma/runtimes into k…
kianenigma Aug 15, 2024
db131fa
move to shared crate for relay common
kianenigma Aug 15, 2024
01fb284
fmt
kianenigma Aug 15, 2024
d695ad6
remove unused dep
kianenigma Aug 15, 2024
91195e9
clippy
kianenigma Aug 15, 2024
c1c31b2
zepter
kianenigma Aug 15, 2024
5d63355
Merge branch 'main' into kiz-inflation
kianenigma Aug 15, 2024
978da88
fix build
kianenigma Aug 15, 2024
31d667e
Merge branch 'main' into kiz-inflation
kianenigma Aug 16, 2024
0d52761
Master.into()
kianenigma Aug 16, 2024
758e76c
fmt
kianenigma Aug 16, 2024
c0432c5
Merge branch 'kiz-inflation' of github.com:kianenigma/runtimes into k…
kianenigma Aug 16, 2024
79ca6cf
fmt again
kianenigma Aug 16, 2024
95367f2
Doc nits
joepetrowski Aug 20, 2024
e657bda
Merge branch 'main' into kiz-inflation
joepetrowski Aug 20, 2024
d581b9c
Merge branch 'main' into kiz-inflation
fellowship-merge-bot[bot] Aug 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Core-Fellowship: new `promote_fast` call ([runtimes#381](https://github.com/polkadot-fellows/runtimes/pull/381), [SDK v1.14 #4877](https://github.com/paritytech/polkadot-sdk/pull/4877)).
- Pallet ranked collective: max member count per rank ([runtimes#381](https://github.com/polkadot-fellows/runtimes/pull/381), [SDK v1.14 #4807](https://github.com/paritytech/polkadot-sdk/pull/4807)).
- All runtimes: XcmPaymentApi and DryRunApi ([polkadot-fellows/runtimes#380](https://github.com/polkadot-fellows/runtimes/pull/380))
- Kusama: Make the current inflation formula adjustable ([polkadot-fellows/runtimes#364](https://github.com/polkadot-fellows/runtimes/pull/364))

#### From [#322](https://github.com/polkadot-fellows/runtimes/pull/322):

Expand Down
26 changes: 24 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ pallet-nomination-pools-benchmarking = { version = "34.0.0", default-features =
pallet-nomination-pools-runtime-api = { version = "31.0.0", default-features = false }
pallet-offences = { version = "35.0.0", default-features = false }
pallet-offences-benchmarking = { version = "36.0.0", default-features = false }
pallet-parameters = { version = "0.7.0", default-features = false }
pallet-preimage = { version = "36.0.0", default-features = false }
pallet-proxy = { version = "36.0.0", default-features = false }
pallet-ranked-collective = { version = "36.0.0", default-features = false }
Expand Down
7 changes: 7 additions & 0 deletions relay/kusama/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ pallet-session = { workspace = true }
pallet-society = { workspace = true }
frame-support = { features = ["tuples-96"], workspace = true }
pallet-staking = { workspace = true }
pallet-staking-reward-fn = { workspace = true }
pallet-staking-runtime-api = { workspace = true }
frame-system = { workspace = true }
frame-system-rpc-runtime-api = { workspace = true }
Expand All @@ -85,6 +86,7 @@ pallet-whitelist = { workspace = true }
pallet-xcm = { workspace = true }
pallet-xcm-benchmarks = { optional = true, workspace = true }
frame-election-provider-support = { workspace = true }
pallet-parameters = { workspace = true }

frame-benchmarking = { optional = true, workspace = true }
frame-try-runtime = { optional = true, workspace = true }
Expand Down Expand Up @@ -113,6 +115,7 @@ separator = { workspace = true }
remote-externalities = { workspace = true }
tokio = { features = ["macros"], workspace = true }
sp-tracing = { workspace = true }
ss58-registry = "1.47.0"
Copy link
Member

Choose a reason for hiding this comment

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

Zepter not happy here since all deps need to be declared in the workspace.


[build-dependencies]
substrate-wasm-builder = { workspace = true, optional = true }
Expand Down Expand Up @@ -166,6 +169,7 @@ std = [
"pallet-offences/std",
"pallet-preimage/std",
"pallet-proxy/std",
"pallet-parameters/std",
"pallet-ranked-collective/std",
"pallet-recovery/std",
"pallet-referenda/std",
Expand All @@ -174,6 +178,7 @@ std = [
"pallet-session/std",
"pallet-society/std",
"pallet-staking-runtime-api/std",
"pallet-staking-reward-fn/std",
"pallet-staking/std",
"pallet-timestamp/std",
"pallet-transaction-payment-rpc-runtime-api/std",
Expand Down Expand Up @@ -241,6 +246,7 @@ runtime-benchmarks = [
"pallet-nomination-pools/runtime-benchmarks",
"pallet-offences-benchmarking/runtime-benchmarks",
"pallet-offences/runtime-benchmarks",
"pallet-parameters/runtime-benchmarks",
"pallet-preimage/runtime-benchmarks",
"pallet-proxy/runtime-benchmarks",
"pallet-ranked-collective/runtime-benchmarks",
Expand Down Expand Up @@ -314,6 +320,7 @@ try-runtime = [
"polkadot-runtime-common/try-runtime",
"runtime-parachains/try-runtime",
"sp-runtime/try-runtime",
"pallet-parameters/try-runtime",
]

# Enable metadata hash generation at compile time for the `CheckMetadataHash` extension.
Expand Down
Loading
Loading