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

Rename assigner_on_demand to on_demand #4706

Merged
merged 85 commits into from
Jul 22, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
85 commits
Select commit Hold shift + click to select a range
aabcb4b
Start implementing request revenue info
antonva Mar 20, 2024
d8df101
Add revenue tracking to on demand pallet
antonva Mar 20, 2024
8f7c179
Add revenue call to broker pallet
antonva Apr 2, 2024
54e0326
Partial impl of revenue from relay chain
antonva Apr 2, 2024
d8bfb72
Move xcm sending from ondemand to coretime pallet
antonva Apr 4, 2024
f3dfe44
Move ondemand types into separate module
antonva Apr 4, 2024
4f1a44d
Add pallet id to on demand
antonva Apr 4, 2024
ef1174b
Fix tests for on demand
antonva Apr 4, 2024
21f9657
Rework get_revenue
antonva Apr 4, 2024
4d00c85
Add empty weight implementations
antonva Apr 4, 2024
8251ede
Add revenueinbox for broker pallet
antonva Apr 4, 2024
af93286
Merge branch 'master' into ava-request-revenue-info
antonva Apr 5, 2024
7dd6a34
Add log target to coretime pallet
antonva Apr 17, 2024
d5d84e3
Fix coretime benchmarking
antonva Apr 17, 2024
aecc034
Remove check notify revenue info
antonva Apr 19, 2024
1f9a4de
Update broker pallet for revenue info
antonva Apr 19, 2024
6879dd7
Remove negative imbalance shorthand
antonva Apr 19, 2024
7a1f198
Update revenue info calls
antonva Apr 19, 2024
c7d586d
Remove unused imports
antonva Apr 19, 2024
74c88b1
Fix benchmarks
antonva Apr 19, 2024
ff69a3d
Merge branch 'master' into ava-request-revenue-info
antonva Apr 19, 2024
aa137da
Fix tests
antonva Apr 19, 2024
f255e47
Update revenue_until fn
antonva Apr 23, 2024
a6be112
Remove unused imports
antonva Apr 26, 2024
f8da2cd
Adress minor discussions
s0me0ne-unkn0wn May 25, 2024
0e99692
Merge remote-tracking branch 'origin/master' into ava-request-revenue…
s0me0ne-unkn0wn May 25, 2024
2e0e3ef
Fix revenue calculation
s0me0ne-unkn0wn May 25, 2024
0f6a2ba
Propose different implementation of revenue reporting
s0me0ne-unkn0wn May 26, 2024
af899e2
Minor fix
s0me0ne-unkn0wn May 26, 2024
f1b9000
Rename call
s0me0ne-unkn0wn May 26, 2024
dd8ed91
Merge remote-tracking branch 'origin/master' into ava-request-revenue…
s0me0ne-unkn0wn May 29, 2024
65af55c
Fix weights
s0me0ne-unkn0wn May 29, 2024
84151b1
Move constants
s0me0ne-unkn0wn May 29, 2024
6df281b
Improve error handling
s0me0ne-unkn0wn May 29, 2024
8f482fe
Fix and improve test
s0me0ne-unkn0wn May 29, 2024
724b7a5
Fix benchmarking code
s0me0ne-unkn0wn May 30, 2024
00fd411
Add benchmark
s0me0ne-unkn0wn May 30, 2024
d5d668b
Minor fixes
s0me0ne-unkn0wn May 30, 2024
36d9cef
Fix clippy
s0me0ne-unkn0wn May 30, 2024
cd559af
Merge remote-tracking branch 'origin/master' into ava-request-revenue…
s0me0ne-unkn0wn May 30, 2024
fac55b0
Fix broker benchmark
s0me0ne-unkn0wn May 30, 2024
3f8482a
Fix mock impl
s0me0ne-unkn0wn May 31, 2024
338316e
Fix tests
s0me0ne-unkn0wn May 31, 2024
bf4ed2e
Improve revenue collection implementation
s0me0ne-unkn0wn May 31, 2024
d8b4ad1
Merge branch 'master' of https://github.com/paritytech/polkadot-sdk i…
May 31, 2024
14e4bc2
".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime…
May 31, 2024
3130df8
".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime…
May 31, 2024
d90b4cb
Accumulate overdue revenue instead of burning it
s0me0ne-unkn0wn May 31, 2024
93f98d6
Merge remote-tracking branch 'origin/ava-request-revenue-info' into a…
s0me0ne-unkn0wn May 31, 2024
f52bf9b
Merge branch 'master' into ava-request-revenue-info
s0me0ne-unkn0wn May 31, 2024
8744d5d
".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime…
May 31, 2024
884c077
".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime…
May 31, 2024
db2bb27
Add missing benchmark
s0me0ne-unkn0wn May 31, 2024
42914c5
Merge remote-tracking branch 'origin/ava-request-revenue-info' into a…
s0me0ne-unkn0wn May 31, 2024
7dd59f6
Add stub weights
s0me0ne-unkn0wn May 31, 2024
b794eec
".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime…
May 31, 2024
3d67f5d
Sort out weights mess
s0me0ne-unkn0wn Jun 1, 2024
f6c23cc
".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime…
Jun 1, 2024
c3468bb
Add prdoc
s0me0ne-unkn0wn Jun 1, 2024
1b60cbf
Fix prdoc
s0me0ne-unkn0wn Jun 1, 2024
832ee90
Add constant docs
s0me0ne-unkn0wn Jun 1, 2024
ddd9f1e
Properly propagate `fast-runtime` feature
s0me0ne-unkn0wn Jun 4, 2024
d59f8ec
Implement parachain-side end of revenue teleport
s0me0ne-unkn0wn Jun 4, 2024
3fb3f6a
Fix test values and add explanation
s0me0ne-unkn0wn Jun 4, 2024
4be7536
Address discussions
s0me0ne-unkn0wn Jun 5, 2024
250e480
Merge branch 'master' into ava-request-revenue-info
s0me0ne-unkn0wn Jun 5, 2024
4e30a57
Rename `assigner_on_demand` to `on_demand`
s0me0ne-unkn0wn Jun 5, 2024
7eca0a0
".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime…
Jun 5, 2024
50916c9
Merge branch 'master' of https://github.com/paritytech/polkadot-sdk i…
Jun 5, 2024
7de6355
".git/.scripts/commands/bench/bench.sh" --subcommand=pallet --runtime…
Jun 5, 2024
bcfcf64
Add logs and simplify tests
s0me0ne-unkn0wn Jun 5, 2024
cd3b769
Merge remote-tracking branch 'origin/master' into ava-request-revenue…
s0me0ne-unkn0wn Jun 5, 2024
29d723a
Merge branch 'ava-request-revenue-info' into s0me0ne/rename-assigner-…
s0me0ne-unkn0wn Jun 5, 2024
70e511f
Add comments addressing commented out code
s0me0ne-unkn0wn Jun 6, 2024
76cff00
Merge branch 'master' into ava-request-revenue-info
s0me0ne-unkn0wn Jun 8, 2024
1f319d1
Merge branch 'ava-request-revenue-info' into s0me0ne/rename-assigner-…
s0me0ne-unkn0wn Jun 8, 2024
d1d199b
Update Cargo.lock
s0me0ne-unkn0wn Jun 8, 2024
bf45699
Merge remote-tracking branch 'origin/master' into s0me0ne/rename-assi…
s0me0ne-unkn0wn Jul 18, 2024
b25396e
Add prdoc
s0me0ne-unkn0wn Jul 18, 2024
a142540
Fix merge
s0me0ne-unkn0wn Jul 18, 2024
6250b8b
Merge remote-tracking branch 'origin/master' into s0me0ne/rename-assi…
s0me0ne-unkn0wn Jul 18, 2024
2c5bc98
A bunch of minor fixes
s0me0ne-unkn0wn Jul 18, 2024
db8f23d
Update prdoc
s0me0ne-unkn0wn Jul 19, 2024
d5fb704
Merge branch 'master' into s0me0ne/rename-assigner-on-demand
s0me0ne-unkn0wn Jul 19, 2024
2ffd833
Fix semver in prdoc
s0me0ne-unkn0wn Jul 22, 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
Prev Previous commit
Next Next commit
Sort out weights mess
  • Loading branch information
s0me0ne-unkn0wn committed Jun 1, 2024
commit 3d67f5de26782807e7a7dbfa5dc03527a71dde87
2 changes: 1 addition & 1 deletion polkadot/runtime/parachains/src/coretime/benchmarking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.

//! On demand assigner pallet benchmarking.
//! Coretime pallet benchmarking.

#![cfg(feature = "runtime-benchmarks")]

Expand Down
2 changes: 1 addition & 1 deletion polkadot/runtime/rococo/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1708,13 +1708,13 @@ mod benches {
// the that path resolves correctly in the generated file.
[runtime_common::assigned_slots, AssignedSlots]
[runtime_common::auctions, Auctions]
[runtime_common::coretime, Coretime]
[runtime_common::crowdloan, Crowdloan]
[runtime_common::claims, Claims]
[runtime_common::identity_migrator, IdentityMigrator]
[runtime_common::slots, Slots]
[runtime_common::paras_registrar, Registrar]
[runtime_parachains::configuration, Configuration]
[runtime_parachains::coretime, Coretime]
[runtime_parachains::hrmp, Hrmp]
[runtime_parachains::disputes, ParasDisputes]
[runtime_parachains::inclusion, ParaInclusion]
Expand Down
106 changes: 0 additions & 106 deletions polkadot/runtime/rococo/src/weights/runtime_common_coretime.rs

This file was deleted.

75 changes: 52 additions & 23 deletions polkadot/runtime/rococo/src/weights/runtime_parachains_coretime.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
// You should have received a copy of the GNU General Public License
// along with Polkadot. If not, see <http://www.gnu.org/licenses/>.

//! Autogenerated weights for `runtime_parachains::coretime`
//! Autogenerated weights for `runtime_common::coretime`
//!
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
//! DATE: 2023-12-01, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
//! DATE: 2024-05-31, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
//! WORST CASE MAP SIZE: `1000000`
//! HOSTNAME: `runner-r43aesjn-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! HOSTNAME: `runner-1pho9goo-project-674-concurrent-0`, CPU: `Intel(R) Xeon(R) CPU @ 2.60GHz`
//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("rococo-dev")`, DB CACHE: 1024

// Executed Command:
Expand All @@ -45,33 +45,62 @@
use frame_support::{traits::Get, weights::Weight};
use core::marker::PhantomData;

use runtime_parachains::configuration::{self, WeightInfo as ConfigWeightInfo};

/// Weight functions for `runtime_common::coretime`.
pub struct WeightInfo<T>(PhantomData<T>);
impl<T: frame_system::Config + configuration::Config> runtime_parachains::coretime::WeightInfo for WeightInfo<T> {
impl<T: frame_system::Config> runtime_parachains::coretime::WeightInfo for WeightInfo<T> {
/// Storage: `OnDemandAssignmentProvider::Revenue` (r:1 w:1)
/// Proof: `OnDemandAssignmentProvider::Revenue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `System::Account` (r:1 w:0)
/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
/// Storage: `Dmp::DeliveryFeeFactor` (r:1 w:0)
/// Proof: `Dmp::DeliveryFeeFactor` (`max_values`: None, `max_size`: None, mode: `Measured`)
/// Storage: `XcmPallet::SupportedVersion` (r:1 w:0)
/// Proof: `XcmPallet::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
/// Storage: `Dmp::DownwardMessageQueues` (r:1 w:1)
/// Proof: `Dmp::DownwardMessageQueues` (`max_values`: None, `max_size`: None, mode: `Measured`)
/// Storage: `Dmp::DownwardMessageQueueHeads` (r:1 w:1)
/// Proof: `Dmp::DownwardMessageQueueHeads` (`max_values`: None, `max_size`: None, mode: `Measured`)
fn request_revenue_at() -> Weight {
// Proof Size summary in bytes:
// Measured: `2963`
// Estimated: `6428`
// Minimum execution time: 36_613_000 picoseconds.
Weight::from_parts(37_637_000, 0)
.saturating_add(Weight::from_parts(0, 6428))
.saturating_add(T::DbWeight::get().reads(6))
.saturating_add(T::DbWeight::get().writes(3))
}
/// Storage: `Configuration::PendingConfigs` (r:1 w:1)
/// Proof: `Configuration::PendingConfigs` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `Configuration::BypassConsistencyCheck` (r:1 w:0)
/// Proof: `Configuration::BypassConsistencyCheck` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
/// Storage: `ParasShared::CurrentSessionIndex` (r:1 w:0)
/// Proof: `ParasShared::CurrentSessionIndex` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
fn request_core_count() -> Weight {
<T as configuration::Config>::WeightInfo::set_config_with_u32()
// Proof Size summary in bytes:
// Measured: `151`
// Estimated: `1636`
// Minimum execution time: 7_527_000 picoseconds.
Weight::from_parts(7_784_000, 0)
.saturating_add(Weight::from_parts(0, 1636))
.saturating_add(T::DbWeight::get().reads(3))
.saturating_add(T::DbWeight::get().writes(1))
}
/// Storage: `CoreTimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
/// Proof: `CoreTimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
/// Storage: `CoreTimeAssignmentProvider::CoreSchedules` (r:0 w:1)
/// Proof: `CoreTimeAssignmentProvider::CoreSchedules` (`max_values`: None, `max_size`: None, mode: `Measured`)
/// Storage: `CoretimeAssignmentProvider::CoreDescriptors` (r:1 w:1)
/// Proof: `CoretimeAssignmentProvider::CoreDescriptors` (`max_values`: None, `max_size`: None, mode: `Measured`)
/// Storage: `CoretimeAssignmentProvider::CoreSchedules` (r:0 w:1)
/// Proof: `CoretimeAssignmentProvider::CoreSchedules` (`max_values`: None, `max_size`: None, mode: `Measured`)
/// The range of component `s` is `[1, 100]`.
fn assign_core(s: u32, ) -> Weight {
// Proof Size summary in bytes:
// Measured: `76`
// Estimated: `3541`
// Minimum execution time: 6_275_000 picoseconds.
Weight::from_parts(6_883_543, 0)
.saturating_add(Weight::from_parts(0, 3541))
// Standard Error: 202
.saturating_add(Weight::from_parts(15_028, 0).saturating_mul(s.into()))
// Measured: `180`
// Estimated: `3645`
// Minimum execution time: 9_220_000 picoseconds.
Weight::from_parts(9_905_773, 0)
.saturating_add(Weight::from_parts(0, 3645))
// Standard Error: 257
.saturating_add(Weight::from_parts(12_400, 0).saturating_mul(s.into()))
.saturating_add(T::DbWeight::get().reads(1))
.saturating_add(T::DbWeight::get().writes(2))
}
fn request_revenue_at() -> frame_support::weights::Weight {
<T as configuration::Config>::WeightInfo::set_config_with_u32()
}

}
Loading