Skip to content

Commit

Permalink
Merge pull request #700 from gregdhill/chore/harmonize-chain-specs
Browse files Browse the repository at this point in the history 
chore: harmonize chain specs with live networks
  • Loading branch information
@sander2
sander2 committed Aug 18, 2022
2 parents dbc4954 + 9cd6b2d commit 7e66c0a
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 100 deletions.
19 changes: 10 additions & 9 deletions parachain/src/chain_spec/interlay.rs
View file
Expand Up @@ -177,35 +177,36 @@ fn interlay_mainnet_genesis(
},
redeem: interlay_runtime::RedeemConfig {
redeem_transaction_size: expected_transaction_size(),
redeem_period: interlay_runtime::DAYS,
redeem_period: interlay_runtime::DAYS * 2,
redeem_btc_dust_value: DEFAULT_DUST_VALUE,
},
replace: interlay_runtime::ReplaceConfig {
replace_period: interlay_runtime::DAYS,
replace_period: interlay_runtime::DAYS * 2,
replace_btc_dust_value: DEFAULT_DUST_VALUE,
},
vault_registry: interlay_runtime::VaultRegistryConfig {
minimum_collateral_vault: vec![(Token(DOT), 30 * DOT.one())],
punishment_delay: interlay_runtime::DAYS,
system_collateral_ceiling: vec![(default_pair_interlay(Token(DOT)), 3333 * DOT.one())], /* 3333 DOT, about 100k
* USD at
* time of writing */
system_collateral_ceiling: vec![(default_pair_interlay(Token(DOT)), 2_450_000 * DOT.one())],
secure_collateral_threshold: vec![(
default_pair_interlay(Token(DOT)),
/* 260% */
FixedU128::checked_from_rational(260, 100).unwrap(),
)], /* 260% */
)],
premium_redeem_threshold: vec![(
default_pair_interlay(Token(DOT)),
/* 200% */
FixedU128::checked_from_rational(200, 100).unwrap(),
)], /* 200% */
)],
liquidation_collateral_threshold: vec![(
default_pair_interlay(Token(DOT)),
/* 150% */
FixedU128::checked_from_rational(150, 100).unwrap(),
)], /* 150% */
)],
},
fee: interlay_runtime::FeeConfig {
issue_fee: FixedU128::checked_from_rational(15, 10000).unwrap(), // 0.15%
issue_griefing_collateral: FixedU128::checked_from_rational(5, 100000).unwrap(), // 0.005%
issue_griefing_collateral: FixedU128::checked_from_rational(5, 1000).unwrap(), // 0.5%
refund_fee: FixedU128::checked_from_rational(5, 1000).unwrap(), // 0.5%
redeem_fee: FixedU128::checked_from_rational(5, 1000).unwrap(), // 0.5%
premium_redeem_fee: FixedU128::checked_from_rational(5, 100).unwrap(), // 5%
Expand Down
66 changes: 45 additions & 21 deletions parachain/src/chain_spec/kintsugi.rs
View file
Expand Up @@ -176,41 +176,65 @@ fn kintsugi_mainnet_genesis(
disable_inclusion_check: false,
},
issue: kintsugi_runtime::IssueConfig {
issue_period: kintsugi_runtime::DAYS,
issue_period: kintsugi_runtime::DAYS * 2,
issue_btc_dust_value: DEFAULT_DUST_VALUE,
},
redeem: kintsugi_runtime::RedeemConfig {
redeem_transaction_size: expected_transaction_size(),
redeem_period: kintsugi_runtime::DAYS,
redeem_period: kintsugi_runtime::DAYS * 2,
redeem_btc_dust_value: DEFAULT_DUST_VALUE,
},
replace: kintsugi_runtime::ReplaceConfig {
replace_period: kintsugi_runtime::DAYS,
replace_period: kintsugi_runtime::DAYS * 2,
replace_btc_dust_value: DEFAULT_DUST_VALUE,
},
vault_registry: kintsugi_runtime::VaultRegistryConfig {
minimum_collateral_vault: vec![(Token(KSM), 3 * KSM.one())],
minimum_collateral_vault: vec![(Token(KINT), 55 * KINT.one()), (Token(KSM), 3 * KSM.one())],
punishment_delay: kintsugi_runtime::DAYS,
system_collateral_ceiling: vec![(default_pair_kintsugi(Token(KSM)), 317 * KSM.one())], /* 317 ksm, about
* 100k
* USD at
* time of writing */
secure_collateral_threshold: vec![(
default_pair_kintsugi(Token(KSM)),
FixedU128::checked_from_rational(260, 100).unwrap(),
)], /* 260% */
premium_redeem_threshold: vec![(
default_pair_kintsugi(Token(KSM)),
FixedU128::checked_from_rational(200, 100).unwrap(),
)], /* 200% */
liquidation_collateral_threshold: vec![(
default_pair_kintsugi(Token(KSM)),
FixedU128::checked_from_rational(150, 100).unwrap(),
)], /* 150% */
system_collateral_ceiling: vec![
(default_pair_kintsugi(Token(KINT)), 26_200 * KINT.one()),
(default_pair_kintsugi(Token(KSM)), 60_000 * KSM.one()),
],
secure_collateral_threshold: vec![
(
default_pair_kintsugi(Token(KINT)),
/* 900% */
FixedU128::checked_from_rational(900, 100).unwrap(),
),
(
default_pair_kintsugi(Token(KSM)),
/* 260% */
FixedU128::checked_from_rational(260, 100).unwrap(),
),
],
premium_redeem_threshold: vec![
(
default_pair_kintsugi(Token(KINT)),
/* 650% */
FixedU128::checked_from_rational(650, 100).unwrap(),
),
(
default_pair_kintsugi(Token(KSM)),
/* 200% */
FixedU128::checked_from_rational(200, 100).unwrap(),
),
],
liquidation_collateral_threshold: vec![
(
default_pair_kintsugi(Token(KINT)),
/* 500% */
FixedU128::checked_from_rational(500, 100).unwrap(),
),
(
default_pair_kintsugi(Token(KSM)),
/* 150% */
FixedU128::checked_from_rational(150, 100).unwrap(),
),
],
},
fee: kintsugi_runtime::FeeConfig {
issue_fee: FixedU128::checked_from_rational(15, 10000).unwrap(), // 0.15%
issue_griefing_collateral: FixedU128::checked_from_rational(5, 100000).unwrap(), // 0.005%
issue_griefing_collateral: FixedU128::checked_from_rational(5, 1000).unwrap(), // 0.5%
refund_fee: FixedU128::checked_from_rational(5, 1000).unwrap(), // 0.5%
redeem_fee: FixedU128::checked_from_rational(5, 1000).unwrap(), // 0.5%
premium_redeem_fee: FixedU128::checked_from_rational(5, 100).unwrap(), // 5%
Expand Down
66 changes: 21 additions & 45 deletions parachain/src/chain_spec/testnet_interlay.rs
View file
Expand Up @@ -216,60 +216,36 @@ fn testnet_genesis(
},
redeem: testnet_interlay_runtime::RedeemConfig {
redeem_transaction_size: expected_transaction_size(),
redeem_period: testnet_interlay_runtime::DAYS,
redeem_period: testnet_interlay_runtime::DAYS * 2,
redeem_btc_dust_value: DEFAULT_DUST_VALUE,
},
replace: testnet_interlay_runtime::ReplaceConfig {
replace_period: testnet_interlay_runtime::DAYS,
replace_period: testnet_interlay_runtime::DAYS * 2,
replace_btc_dust_value: DEFAULT_DUST_VALUE,
},
vault_registry: testnet_interlay_runtime::VaultRegistryConfig {
minimum_collateral_vault: vec![(Token(DOT), 0)],
punishment_delay: testnet_interlay_runtime::DAYS,
system_collateral_ceiling: vec![
(default_pair_testnet(Token(DOT)), 1_000_000_000 * DOT.one()),
(default_pair_testnet(Token(INTR)), 1_000_000_000 * INTR.one()),
],
secure_collateral_threshold: vec![
(
// 150%
default_pair_testnet(Token(DOT)),
FixedU128::checked_from_rational(150, 100).unwrap(),
),
(
// 400%
default_pair_testnet(Token(INTR)),
FixedU128::checked_from_rational(400, 100).unwrap(),
),
],
premium_redeem_threshold: vec![
(
// 135%
default_pair_testnet(Token(DOT)),
FixedU128::checked_from_rational(135, 100).unwrap(),
),
(
// 300%
default_pair_testnet(Token(INTR)),
FixedU128::checked_from_rational(300, 100).unwrap(),
),
],
liquidation_collateral_threshold: vec![
(
// 110%
default_pair_testnet(Token(DOT)),
FixedU128::checked_from_rational(110, 100).unwrap(),
),
(
// 200%
default_pair_testnet(Token(INTR)),
FixedU128::checked_from_rational(200, 100).unwrap(),
),
],
minimum_collateral_vault: vec![(Token(DOT), 30 * DOT.one())],
punishment_delay: interlay_runtime::DAYS,
system_collateral_ceiling: vec![(default_pair_testnet(Token(DOT)), 2_450_000 * DOT.one())],
secure_collateral_threshold: vec![(
default_pair_testnet(Token(DOT)),
/* 260% */
FixedU128::checked_from_rational(260, 100).unwrap(),
)],
premium_redeem_threshold: vec![(
default_pair_testnet(Token(DOT)),
/* 200% */
FixedU128::checked_from_rational(200, 100).unwrap(),
)],
liquidation_collateral_threshold: vec![(
default_pair_testnet(Token(DOT)),
/* 150% */
FixedU128::checked_from_rational(150, 100).unwrap(),
)],
},
fee: testnet_interlay_runtime::FeeConfig {
issue_fee: FixedU128::checked_from_rational(15, 10000).unwrap(), // 0.15%
issue_griefing_collateral: FixedU128::checked_from_rational(5, 100000).unwrap(), // 0.005%
issue_griefing_collateral: FixedU128::checked_from_rational(5, 1000).unwrap(), // 0.5%
refund_fee: FixedU128::checked_from_rational(5, 1000).unwrap(), // 0.5%
redeem_fee: FixedU128::checked_from_rational(5, 1000).unwrap(), // 0.5%
premium_redeem_fee: FixedU128::checked_from_rational(5, 100).unwrap(), // 5%
Expand Down
50 changes: 25 additions & 25 deletions parachain/src/chain_spec/testnet_kintsugi.rs
View file
Expand Up @@ -384,59 +384,59 @@ fn testnet_genesis(
disable_inclusion_check: false,
},
issue: testnet_kintsugi_runtime::IssueConfig {
issue_period: testnet_kintsugi_runtime::DAYS,
issue_period: testnet_kintsugi_runtime::DAYS * 2,
issue_btc_dust_value: DEFAULT_DUST_VALUE,
},
redeem: testnet_kintsugi_runtime::RedeemConfig {
redeem_transaction_size: expected_transaction_size(),
redeem_period: testnet_kintsugi_runtime::DAYS,
redeem_period: testnet_kintsugi_runtime::DAYS * 2,
redeem_btc_dust_value: DEFAULT_DUST_VALUE,
},
replace: testnet_kintsugi_runtime::ReplaceConfig {
replace_period: testnet_kintsugi_runtime::DAYS,
replace_period: testnet_kintsugi_runtime::DAYS * 2,
replace_btc_dust_value: DEFAULT_DUST_VALUE,
},
vault_registry: testnet_kintsugi_runtime::VaultRegistryConfig {
minimum_collateral_vault: vec![(Token(KSM), 0)],
punishment_delay: testnet_kintsugi_runtime::DAYS,
minimum_collateral_vault: vec![(Token(KINT), 55 * KINT.one()), (Token(KSM), 3 * KSM.one())],
punishment_delay: kintsugi_runtime::DAYS,
system_collateral_ceiling: vec![
(default_pair_testnet(Token(KSM)), 1_000_000_000 * KSM.one()),
(default_pair_testnet(Token(KINT)), 1_000_000_000 * KINT.one()),
(default_pair_testnet(Token(KINT)), 26_200 * KINT.one()),
(default_pair_testnet(Token(KSM)), 60_000 * KSM.one()),
],
secure_collateral_threshold: vec![
(
// 150%
default_pair_testnet(Token(KSM)),
FixedU128::checked_from_rational(150, 100).unwrap(),
default_pair_testnet(Token(KINT)),
/* 900% */
FixedU128::checked_from_rational(900, 100).unwrap(),
),
(
// 400%
default_pair_testnet(Token(KINT)),
FixedU128::checked_from_rational(400, 100).unwrap(),
default_pair_testnet(Token(KSM)),
/* 260% */
FixedU128::checked_from_rational(260, 100).unwrap(),
),
],
premium_redeem_threshold: vec![
(
// 135%
default_pair_testnet(Token(KSM)),
FixedU128::checked_from_rational(135, 100).unwrap(),
default_pair_testnet(Token(KINT)),
/* 650% */
FixedU128::checked_from_rational(650, 100).unwrap(),
),
(
// 300%
default_pair_testnet(Token(KINT)),
FixedU128::checked_from_rational(300, 100).unwrap(),
default_pair_testnet(Token(KSM)),
/* 200% */
FixedU128::checked_from_rational(200, 100).unwrap(),
),
],
liquidation_collateral_threshold: vec![
(
// 110%
default_pair_testnet(Token(KSM)),
FixedU128::checked_from_rational(110, 100).unwrap(),
default_pair_testnet(Token(KINT)),
/* 500% */
FixedU128::checked_from_rational(500, 100).unwrap(),
),
(
// 200%
default_pair_testnet(Token(KINT)),
FixedU128::checked_from_rational(200, 100).unwrap(),
default_pair_testnet(Token(KSM)),
/* 150% */
FixedU128::checked_from_rational(150, 100).unwrap(),
),
],
},
Expand Down

0 comments on commit 7e66c0a

Please sign in to comment.