Merge branch 'main-develop' into features/OndemandMode

Magport · Jul 8, 2024 · 10f63af · 10f63af
2 parents 4355574 + 62a6688
commit 10f63af
Show file tree

Hide file tree

Showing 8 changed files with 710 additions and 536 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -150,6 +150,9 @@ pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot
 pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false }
 pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false }
 pallet-whitelist = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false}
+pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false}
+pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0", default-features = false}
+
 # Substrate Utility
 substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0" }
 substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.0" }

diff --git a/node/src/chain_spec.rs b/node/src/chain_spec.rs
@@ -291,5 +291,14 @@ fn testnet_genesis(
 			"rpcUrl": b"ws://127.0.0.1:8855".to_vec(),
 			"genesisHash": U256::from_str("0x4ea18c8f295ba903acbbed39c70ea0569cf1705fa954a537ffa3b8b7125eaf58").expect("internal U256 is valid; qed")
 		},
+		"liquidation":{
+			"adminKey": Some(root.clone()),
+			"systemRatio": 20_000_0000,
+			"treasuryRatio": 33_000_0000,
+			"operationRatio": 25_000_0000,
+			"collatorRatio": 22_000_0000,
+			"minLiquidationThreshold": 20_000_000_000_000_000u128,
+			"profitDistributionCycle": 10,
+		}
 	})
 }