Skip to content

feat: add launch pallet removal migration #359

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.

Sign up for GitHub

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

Merged
wischli merged 5 commits into from
May 31, 2022
Merged

feat: add launch pallet removal migration #359

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
338011c
feat: add launch pallet removal migration
wischli Apr 27, 2022
76456e2
chore: rm launch pallet code
wischli Apr 27, 2022
c45dba4
fix: migration
wischli May 2, 2022
08f8e37
Merge remote-tracking branch 'origin/develop into wf-1951-rm-launch-p…
wischli May 31, 2022
a4c3a5e
fix: clippy + suggestion
wischli May 31, 2022
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: 0 additions & 1 deletion .maintain/reset-spec/peregrine_dev_kilt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ def update_spec(input: typing.Dict):
input["properties"]["tokenSymbol"] = "PILT"
input["genesis"]["runtime"]["parachainInfo"]["parachainId"] = para_id
input["genesis"]["runtime"]["sudo"]["key"] = "5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY"
input["genesis"]["runtime"]["kiltLaunch"]["transferAccount"] = "5FHneW46xGXgs5mUiveU4sbTyGBzmstUspZC92UhjJM694ty"
input["genesis"]["runtime"]["parachainStaking"]["stakers"] = [
[
"5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY",
Expand Down
1 change: 0 additions & 1 deletion .maintain/reset-spec/peregrine_kilt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ def update_spec(input: typing.Dict):
input["properties"]["tokenSymbol"] = "PILT"
input["genesis"]["runtime"]["parachainInfo"]["parachainId"] = para_id
input["genesis"]["runtime"]["sudo"]["key"] = acc_col_1
input["genesis"]["runtime"]["kiltLaunch"]["transferAccount"] = acc_col_2
input["genesis"]["runtime"]["parachainStaking"]["stakers"] = [
[
acc_col_1,
Expand Down
1 change: 0 additions & 1 deletion .maintain/reset-spec/peregrine_stg_kilt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ def update_spec(input: typing.Dict):
input["properties"]["tokenSymbol"] = "PILT"
input["genesis"]["runtime"]["parachainInfo"]["parachainId"] = para_id
input["genesis"]["runtime"]["sudo"]["key"] = acc_col_1
input["genesis"]["runtime"]["kiltLaunch"]["transferAccount"] = acc_col_2
input["genesis"]["runtime"]["parachainStaking"]["stakers"] = [
[
acc_col_1,
Expand Down
25 changes: 3 additions & 22 deletions Cargo.lock
View file
Open in desktop

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

20 changes: 2 additions & 18 deletions nodes/parachain/src/chain_spec/peregrine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,8 @@
use cumulus_primitives_core::ParaId;
use hex_literal::hex;
use peregrine_runtime::{
BalancesConfig, CouncilConfig, GenesisConfig, InflationInfo, KiltLaunchConfig, ParachainInfoConfig,
ParachainStakingConfig, SessionConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig, VestingConfig,
WASM_BINARY,
BalancesConfig, CouncilConfig, GenesisConfig, InflationInfo, ParachainInfoConfig, ParachainStakingConfig,
SessionConfig, SudoConfig, SystemConfig, TechnicalCommitteeConfig, VestingConfig, WASM_BINARY,
};
use runtime_common::{
constants::{kilt_inflation_config, staking::MinCollatorStake, MAX_COLLATOR_STAKE},
Expand All @@ -38,8 +37,6 @@ use crate::chain_spec::{get_account_id_from_seed, get_from_seed, get_properties,
/// Specialized `ChainSpec` for the normal parachain runtime.
pub type ChainSpec = sc_service::GenericChainSpec<GenesisConfig, Extensions>;

const TRANSFER_ACCOUNT: [u8; 32] = hex!["6a3c793cec9dbe330b349dc4eea6801090f5e71f53b1b41ad11afb4a313a282c"];

pub fn make_dev_spec() -> Result<ChainSpec, String> {
let properties = get_properties("PILT", 15, 38);
let wasm = WASM_BINARY.ok_or("No WASM")?;
Expand Down Expand Up @@ -177,19 +174,6 @@ fn testnet_genesis(
},
sudo: SudoConfig { key: Some(root_key) },
parachain_info: ParachainInfoConfig { parachain_id: id },
kilt_launch: KiltLaunchConfig {
vesting: airdrop_accounts
.iter()
.cloned()
.map(|(who, amount, vesting_length, _)| (who, vesting_length, amount))
.collect(),
balance_locks: airdrop_accounts
.iter()
.cloned()
.map(|(who, amount, _, locking_length)| (who, locking_length, amount))
.collect(),
transfer_account: TRANSFER_ACCOUNT.into(),
},
vesting: VestingConfig {
vesting: botlabs_accounts
.iter()
Expand Down
25 changes: 2 additions & 23 deletions nodes/parachain/src/chain_spec/spiritnet.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ use sc_telemetry::TelemetryEndpoints;
use sp_core::{crypto::UncheckedInto, sr25519};
use sp_runtime::traits::Zero;
use spiritnet_runtime::{
BalancesConfig, CouncilConfig, GenesisConfig, InflationInfo, KiltLaunchConfig, ParachainInfoConfig,
ParachainStakingConfig, SessionConfig, SystemConfig, TechnicalCommitteeConfig, VestingConfig, WASM_BINARY,
BalancesConfig, CouncilConfig, GenesisConfig, InflationInfo, ParachainInfoConfig, ParachainStakingConfig,
SessionConfig, SystemConfig, TechnicalCommitteeConfig, VestingConfig, WASM_BINARY,
};

use crate::chain_spec::{get_account_id_from_seed, get_from_seed, DEFAULT_PARA_ID, TELEMETRY_URL};
Expand Down Expand Up @@ -107,7 +107,6 @@ pub fn get_chain_spec_dev() -> Result<ChainSpec, String> {
10000000 * KILT,
),
],
hex!["6a3c793cec9dbe330b349dc4eea6801090f5e71f53b1b41ad11afb4a313a282c"].into(),
DEFAULT_PARA_ID,
)
},
Expand All @@ -127,7 +126,6 @@ const WILT_COL_ACC_1: [u8; 32] = hex!["e6cf13c86a5f174acba79ca361dc429d89eb704c6
const WILT_COL_SESSION_1: [u8; 32] = hex!["e29df39b74777495ca00cd7a316ce98c5225d7088ae924b122fe0e2e6a4b5569"];
const WILT_COL_ACC_2: [u8; 32] = hex!["e8ed0c2a40fb5a0bbb24c38f5c8cd83d79498ac029ac9f87497677f5701e3d2c"];
const WILT_COL_SESSION_2: [u8; 32] = hex!["7cacfbce640321ba84a85f41dfb43c2a2ea14ed789c096ad62ee0491599b0f44"];
const WILT_TRANS_ACC: [u8; 32] = hex!["aaf5308b81f962ffdaccaa22352cc95b7bef70033d9d0d5a7023ec5681f05954"];

pub fn get_chain_spec_wilt() -> Result<ChainSpec, String> {
let properties = get_properties("WILT", 15, 38);
Expand All @@ -154,9 +152,7 @@ pub fn get_chain_spec_wilt() -> Result<ChainSpec, String> {
vec![
(WILT_COL_ACC_1.into(), 40000 * KILT),
(WILT_COL_ACC_2.into(), 40000 * KILT),
(WILT_TRANS_ACC.into(), 10000 * KILT),
],
WILT_TRANS_ACC.into(),
id,
)
},
Expand All @@ -183,7 +179,6 @@ const RILT_COL_ACC_1: [u8; 32] = hex!["6a5c355bca369a54c334542fd91cf70822be92f21
const RILT_COL_SESSION_1: [u8; 32] = hex!["66c4ca0710c2c8a92504f281d992000508ce255543016545014cf0bfbbe71429"];
const RILT_COL_ACC_2: [u8; 32] = hex!["768538a941d1e4730c31830ab85a54ff34aaaad1f81bdd246db11802a57a5412"];
const RILT_COL_SESSION_2: [u8; 32] = hex!["7cff6c7a53c4630a0a35f8793a04b663681575bbfa43dbe5848b220bc4bd1963"];
const RILT_TRANS_ACC: [u8; 32] = hex!["6e016ca65cd213156c075da95c132bd1917762de0026ee539c720999aded3216"];

pub fn get_chain_spec_rilt() -> Result<ChainSpec, String> {
let properties = get_properties("RILT", 15, 38);
Expand All @@ -210,9 +205,7 @@ pub fn get_chain_spec_rilt() -> Result<ChainSpec, String> {
vec![
(RILT_COL_ACC_1.into(), 1_000_000 * KILT),
(RILT_COL_ACC_2.into(), 1_000_000 * KILT),
(RILT_TRANS_ACC.into(), 10_000 * KILT),
],
RILT_TRANS_ACC.into(),
id,
)
},
Expand Down Expand Up @@ -251,7 +244,6 @@ fn testnet_genesis(
max_candidate_stake: Balance,
initial_authorities: Vec<(AccountId, AuthorityId)>,
endowed_accounts: Vec<(AccountId, Balance)>,
transfer_account: AccountId,
id: ParaId,
) -> GenesisConfig {
type VestingPeriod = BlockNumber;
Expand Down Expand Up @@ -286,19 +278,6 @@ fn testnet_genesis(
.collect(),
},
parachain_info: ParachainInfoConfig { parachain_id: id },
kilt_launch: KiltLaunchConfig {
vesting: claimable_accounts
.iter()
.cloned()
.map(|(who, amount, vesting_length, _)| (who, vesting_length, amount))
.collect(),
balance_locks: claimable_accounts
.iter()
.cloned()
.map(|(who, amount, _, locking_length)| (who, locking_length, amount))
.collect(),
transfer_account,
},
vesting: VestingConfig {
vesting: owned_accounts
.iter()
Expand Down
19 changes: 2 additions & 17 deletions nodes/standalone/src/chain_spec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,9 @@
//! KILT chain specification

use mashnet_node_runtime::{
BalancesConfig, GenesisConfig, IndicesConfig, KiltLaunchConfig, SessionConfig, SudoConfig, SystemConfig,
VestingConfig, WASM_BINARY,
BalancesConfig, GenesisConfig, IndicesConfig, SessionConfig, SudoConfig, SystemConfig, VestingConfig, WASM_BINARY,
};
use runtime_common::{constants::BLOCKS_PER_YEAR, AccountId, AccountPublic, Balance, BlockNumber};
use runtime_common::{AccountId, AccountPublic, Balance, BlockNumber};

use hex_literal::hex;

Expand Down Expand Up @@ -82,7 +81,6 @@ const TELEMETRY_URL: &str = "wss://telemetry-backend.kilt.io:8080/submit";
const SPORRAN_AUTHORITY_ACC: [u8; 32] = hex!("0621f3a33afc66ab7973e3d2cdf86d30ab89aa3e717e8bb1db23a9cb1736061b");
const SPORRAN_AUTHORITY_SESSION: [u8; 32] = hex!("3bbaa842650064362767a1d9dd8899f531c80dc42eafb9599f4df0965e4a5299");
const SPORRAN_FAUCET: [u8; 32] = hex!("2c9e9c40e15a2767e2d04dc1f05d824dd76d1d37bada3d7bb1d40eca29f3a4ff");
const TRANSFER_ACCOUNT: [u8; 32] = hex!("6a3c793cec9dbe330b349dc4eea6801090f5e71f53b1b41ad11afb4a313a282c");

impl Alternative {
/// Get an actual chain config from one of the alternatives.
Expand Down Expand Up @@ -215,19 +213,6 @@ fn testnet_genesis(
aura: Default::default(),
grandpa: Default::default(),
sudo: SudoConfig { key: Some(root_key) },
kilt_launch: KiltLaunchConfig {
balance_locks: airdrop_accounts
.iter()
.cloned()
.map(|(who, amount, _, locking_length)| (who, locking_length * BLOCKS_PER_YEAR / 12, amount))
.collect(),
vesting: airdrop_accounts
.iter()
.cloned()
.map(|(who, amount, vesting_length, _)| (who, vesting_length * BLOCKS_PER_YEAR / 12, amount))
.collect(),
transfer_account: TRANSFER_ACCOUNT.into(),
},
vesting: VestingConfig { vesting: vec![] },
}
}
Expand Down
53 changes: 0 additions & 53 deletions pallets/kilt-launch/Cargo.toml
View file
Open in desktop

This file was deleted.

Loading