Merge pull request #639 from galacticcouncil/feat/staking

feat: staking
galacticcouncil · Aug 11, 2023 · aecefb9 · aecefb9
2 parents 07f3d0f + 77f5c95
commit aecefb9
Show file tree

Hide file tree

Showing 64 changed files with 12,705 additions and 117 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -31,6 +31,8 @@ members = [
   'pallets/duster',
   'pallets/otc',
   'math',
+  'pallets/staking',
+  'pallets/democracy',
 ]
 
 [workspace.dependencies]
@@ -62,6 +64,8 @@ pallet-route-executor = { path = "pallets/route-executor", default-features = fa
 pallet-stableswap = { path = "pallets/stableswap", default-features = false }
 pallet-transaction-multi-payment = { path = "pallets/transaction-multi-payment", default-features = false }
 pallet-transaction-pause = { path = "pallets/transaction-pause", default-features = false }
+pallet-staking = { path = "pallets/staking", default-features = false }
+pallet-democracy= { path = "pallets/democracy", default-features = false }
 pallet-xcm-rate-limiter = { path = "pallets/xcm-rate-limiter", default-features = false }
 warehouse-liquidity-mining = { package = "pallet-liquidity-mining", path = "pallets/liquidity-mining", default-features = false }
 
@@ -137,7 +141,6 @@ pallet-aura = { git = "https://github.com/paritytech/substrate", branch = "polka
 pallet-authorship = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
 pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
 pallet-collective = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
-pallet-democracy = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
 pallet-elections-phragmen = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
 pallet-identity = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }
 pallet-multisig = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38", default-features = false }

diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.8.2"
+version = "1.9.0"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -32,6 +32,7 @@ pallet-relaychain-info = { workspace = true }
 pallet-route-executor = { workspace = true}
 pallet-dca = { workspace = true}
 pallet-dynamic-fees = { workspace = true }
+pallet-staking = { workspace = true}
 
 pallet-treasury = { workspace = true }
 pallet-democracy = { workspace = true }
@@ -178,4 +179,5 @@ std = [
     "pallet-relaychain-info/std",
     "polkadot-runtime/std",
     "hydradx-runtime/std",
+    "pallet-staking/std",
 ]
diff --git a/integration-tests/src/lib.rs b/integration-tests/src/lib.rs
@@ -13,6 +13,7 @@ mod omnipool_price_provider;
 mod oracle;
 mod otc;
 mod polkadot_test_net;
+mod staking;
 mod transact_call_filter;
 mod vesting;
 

diff --git a/integration-tests/src/polkadot_test_net.rs b/integration-tests/src/polkadot_test_net.rs
@@ -194,6 +194,7 @@ pub fn hydra_ext() -> sp_io::TestExternalities {
 	let eth_amount = 63_750_000_000_000_000_000u128;
 	let btc_amount = 1_000_000_000u128;
 	let omnipool_account = hydradx_runtime::Omnipool::protocol_account();
+	let staking_account = pallet_staking::Pallet::<hydradx_runtime::Runtime>::pot_account_id();
 
 	let existential_deposit = NativeExistentialDeposit::get();
 
@@ -209,6 +210,7 @@ pub fn hydra_ext() -> sp_io::TestExternalities {
 			(AccountId::from(DAVE), 1_000 * UNITS),
 			(omnipool_account.clone(), native_amount),
 			(vesting_account(), 10_000 * UNITS),
+			(staking_account, UNITS),
 		],
 	}
 	.assimilate_storage(&mut t)