Skip to content

Commit 435e950

Browse files
committed
chore/mainnet
* chore: updated VoteLockingPeriod config * chore: updated referenda config * chore: removed sudo config from mainnet genesis * chore: removed sudo pallet from mainnet and configured inflation
1 parent 4c07ec0 commit 435e950

File tree

10 files changed

+29
-49
lines changed

10 files changed

+29
-49
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ members = [
1515
[workspace.package]
1616
authors = ["Papers AG"]
1717
repository = "https://github.com/acurast"
18-
version = "0.23.10"
18+
version = "0.23.11"
1919
edition = "2021"
2020

2121
[workspace.dependencies]

node/src/chain_spec/mainnet.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ pub fn acurast_config() -> ChainSpec {
8080
endowed_accounts(),
8181
vesting(),
8282
MAINNET_PARACHAIN_ID.into(),
83-
Some(acurast_sudo_account()),
8483
))
8584
.build()
8685
}
@@ -90,7 +89,6 @@ fn genesis_config(
9089
endowed_accounts: Vec<(AccountId, Balance)>,
9190
vesting: Vec<(AccountId, BlockNumber, BlockNumber, Balance)>,
9291
id: ParaId,
93-
sudo_account: Option<AccountId>,
9492
) -> serde_json::Value {
9593
serde_json::json!({
9694
"balances": {
@@ -132,9 +130,6 @@ fn genesis_config(
132130
"funds_account": onboarding_funds_account(),
133131
}
134132
},
135-
"sudo": {
136-
"key": sudo_account
137-
},
138133
"councilMembership": {
139134
"members": council_members()
140135
}

runtime/acurast-mainnet/src/constants.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
2121
spec_name: sp_std::borrow::Cow::Borrowed("acurast-parachain"),
2222
impl_name: sp_std::borrow::Cow::Borrowed("acurast-parachain"),
2323
authoring_version: 1,
24-
spec_version: 7,
24+
spec_version: 8,
2525
impl_version: 1,
2626
apis: RUNTIME_API_VERSIONS,
2727
transaction_version: 1,

runtime/acurast-mainnet/src/lib.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mod constants;
1515
mod pallets;
1616
mod types;
1717
mod utils;
18-
mod vesting_migration;
18+
//mod vesting_migration;
1919
mod weights;
2020
pub mod xcm_config;
2121

@@ -51,8 +51,6 @@ mod runtime {
5151
pub type Timestamp = pallet_timestamp;
5252
#[runtime::pallet_index(3)]
5353
pub type ParachainInfo = parachain_info;
54-
#[runtime::pallet_index(4)]
55-
pub type Sudo = pallet_sudo;
5654
#[runtime::pallet_index(5)]
5755
pub type Scheduler = pallet_scheduler;
5856
#[runtime::pallet_index(6)]

runtime/acurast-mainnet/src/pallets.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ mod pallet_proxy_config;
2121
mod pallet_referenda_config;
2222
mod pallet_scheduler_config;
2323
mod pallet_session_config;
24-
mod pallet_sudo_config;
2524
mod pallet_timestamp_config;
2625
mod pallet_transaction_payment_config;
2726
mod pallet_treasury_config;

runtime/acurast-mainnet/src/pallets/pallet_acurast_compute_config.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ parameter_types! {
4444
pub const CooldownRewardRatio: Perquintill = Perquintill::from_percent(50);
4545
pub const RedelegationBlockingPeriod: BlockNumber = 112; // can redelegate once per 7*16=112 epochs ~= 1 week
4646
pub const ComputeStakingLockId: LockIdentifier = *b"compstak";
47-
pub const InflationPerEpoch: Balance = 0;//8_561_643_835_616_439; // ~ 5% a year for a total supply of 1B: ((1000000000 * 10^12 * 0.05) / 365 / 24) * 1.5
47+
pub const InflationPerEpoch: Balance = 8_561_643_835_616_439; // ~ 5% a year for a total supply of 1B: ((1000000000 * 10^12 * 0.05) / 365 / 24) * 1.5
4848
pub const InflationStakedComputeRatio: Perquintill = Perquintill::from_percent(70);
4949
pub const InflationMetricsRatio: Perquintill = Perquintill::from_percent(10);
5050
pub const InflationCollatorsRatio: Perquintill = Perquintill::from_percent(5);

runtime/acurast-mainnet/src/pallets/pallet_referenda_config.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ const fn percent(x: i32) -> sp_arithmetic::FixedI64 {
1818
sp_arithmetic::FixedI64::from_rational(x as u128, 100)
1919
}
2020

21-
const APP_ROOT: Curve = Curve::make_reciprocal(4, 20, percent(80), percent(50), percent(100));
22-
const SUP_ROOT: Curve = Curve::make_linear(20, 20, percent(0), percent(25));
21+
const APP_ROOT: Curve = Curve::make_reciprocal(4, 48, percent(80), percent(50), percent(100));
22+
const SUP_ROOT: Curve = Curve::make_linear(48, 48, percent(0), percent(50));
2323

2424
parameter_types! {
2525
pub const AlarmInterval: BlockNumber = 1;
@@ -31,15 +31,15 @@ parameter_types! {
3131
name: s("root"),
3232
max_deciding: 1,
3333
decision_deposit: UNIT,
34-
prepare_period: 2 * HOURS,
35-
decision_period: 20 * HOURS,
36-
confirm_period: 2 * HOURS,
34+
prepare_period: 12 * HOURS,
35+
decision_period: 48 * HOURS,
36+
confirm_period: 6 * HOURS,
3737
min_enactment_period: 2 * HOURS,
3838
min_approval: APP_ROOT,
3939
min_support: SUP_ROOT,
4040
},
4141
}];
42-
pub const VoteLockingPeriod: BlockNumber = 2 * HOURS;
42+
pub const VoteLockingPeriod: BlockNumber = 7 * DAYS;
4343
}
4444

4545
impl pallet_referenda::Config for Runtime {

runtime/acurast-mainnet/src/pallets/pallet_sudo_config.rs

Lines changed: 0 additions & 8 deletions
This file was deleted.

runtime/acurast-mainnet/src/types.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,7 @@ use acurast_runtime_common::{
2020
weight::ExtrinsicBaseWeight,
2121
};
2222

23-
use crate::{
24-
vesting_migration::VestingMigration, AcurastProcessorManager, AllPalletsWithSystem, Aura,
25-
Balances, Runtime, RuntimeCall,
26-
};
23+
use crate::{AcurastProcessorManager, AllPalletsWithSystem, Aura, Balances, Runtime, RuntimeCall};
2724

2825
/// Wrapper around [`AccountId32`] to allow the implementation of [`TryFrom<Vec<u8>>`].
2926
#[derive(Debug, From, Into, Clone, Eq, PartialEq)]
@@ -75,7 +72,6 @@ pub type Executive = frame_executive::Executive<
7572
frame_system::ChainContext<Runtime>,
7673
Runtime,
7774
AllPalletsWithSystem,
78-
VestingMigration,
7975
>;
8076

8177
/// Handles converting a weight scalar to a fee value, based on the scale and granularity of the

0 commit comments

Comments
 (0)