feat: Opengov

Cargo.toml

@@ -41,6 +41,7 @@ members = [
   'pallets/evm-accounts',
   'pallets/dynamic-evm-fee',
   'pallets/xyk-liquidity-mining',
+  'pallets/conviction-voting',
   'precompiles/call-permit',
   'runtime-mock'
 ]
@@ -100,6 +101,7 @@ warehouse-liquidity-mining = { package = "pallet-liquidity-mining", path = "pall
 pallet-bonds = { path = "pallets/bonds", default-features = false}
 pallet-lbp = { path = "pallets/lbp", default-features = false}
 pallet-xyk = { path = "pallets/xyk", default-features = false}
+pallet-conviction-voting = { path = "pallets/conviction-voting", default-features = false}
 pallet-xyk-liquidity-mining = { path = "pallets/xyk-liquidity-mining", default-features = false}
 pallet-referrals = { path = "pallets/referrals", default-features = false}
 pallet-evm-accounts = { path = "pallets/evm-accounts", default-features = false}
@@ -203,6 +205,7 @@ pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch =
 pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-referenda = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
@@ -217,6 +220,7 @@ pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch =
 pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-state-trie-migration = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-whitelist = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 
 substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }

integration-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.23.2"
+version = "1.23.3"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -48,6 +48,8 @@ pallet-elections-phragmen = { workspace = true }
 pallet-tips = { workspace = true }
 pallet-xyk-liquidity-mining = { workspace = true }
 pallet-transaction-pause = { workspace = true }
+pallet-referenda = { workspace = true }
+pallet-conviction-voting= { workspace = true }
 
 # collator support
 pallet-collator-selection = { workspace = true }

integration-tests/src/asset_registry.rs

@@ -2,9 +2,9 @@
 
 use crate::asset_registry::Junction::GeneralIndex;
 use crate::polkadot_test_net::*;
-use frame_support::{assert_noop, assert_ok};
+use frame_support::assert_ok;
 use frame_system::RawOrigin;
-use hydradx_runtime::{AssetRegistry as Registry, TechnicalCollective};
+use hydradx_runtime::AssetRegistry as Registry;
 use polkadot_xcm::v3::{
 	Junction::{self, Parachain},
 	Junctions::X2,
@@ -38,88 +38,6 @@ fn root_should_update_decimals_when_it_was_already_set() {
 	});
 }
 
-#[test]
-fn tech_comm_should_not_update_decimals_when_it_was_aleady_set() {
-	TestNet::reset();
-	Hydra::execute_with(|| {
-		let tech_comm = pallet_collective::RawOrigin::<AccountId, TechnicalCollective>::Members(1, 1);
-		let new_decimals = 53_u8;
-
-		assert_ne!(Registry::assets(HDX).unwrap().decimals.unwrap(), new_decimals);
-
-		assert_noop!(
-			Registry::update(
-				tech_comm.into(),
-				HDX,
-				None,
-				None,
-				None,
-				None,
-				None,
-				None,
-				Some(new_decimals),
-				None
-			),
-			pallet_asset_registry::Error::<hydradx_runtime::Runtime>::Forbidden
-		);
-	});
-}
-
-#[test]
-fn tech_comm_should_update_decimals_when_it_wasnt_set_yet() {
-	TestNet::reset();
-	Hydra::execute_with(|| {
-		let tech_comm = pallet_collective::RawOrigin::<AccountId, TechnicalCollective>::Members(1, 1);
-		let new_decimals = 12_u8;
-
-		assert!(Registry::assets(LRNA).unwrap().decimals.is_none());
-
-		assert_ok!(Registry::update(
-			tech_comm.into(),
-			LRNA,
-			None,
-			None,
-			None,
-			None,
-			None,
-			None,
-			Some(new_decimals),
-			None
-		));
-
-		assert_eq!(Registry::assets(LRNA).unwrap().decimals.unwrap(), new_decimals);
-	});
-}
-
-#[test]
-fn tech_comm_should_not_update_location_when_asset_exists() {
-	TestNet::reset();
-	Hydra::execute_with(|| {
-		let tech_comm = pallet_collective::RawOrigin::<AccountId, TechnicalCollective>::Members(1, 1);
-
-		assert!(Registry::locations(LRNA).is_none());
-
-		assert_noop!(
-			Registry::update(
-				tech_comm.into(),
-				LRNA,
-				None,
-				None,
-				None,
-				None,
-				None,
-				None,
-				None,
-				Some(hydradx_runtime::AssetLocation(MultiLocation::new(
-					1,
-					X2(Parachain(MOONBEAM_PARA_ID), GeneralIndex(0))
-				))),
-			),
-			pallet_asset_registry::Error::<hydradx_runtime::Runtime>::Forbidden
-		);
-	});
-}
-
 #[test]
 fn root_should_update_location_when_asset_exists() {
 	TestNet::reset();

integration-tests/src/call_filter.rs

@@ -4,11 +4,13 @@ use crate::polkadot_test_net::*;
 use frame_support::{
 	assert_ok,
 	sp_runtime::{FixedU128, Permill},
-	traits::Contains,
+	traits::{Contains, StorePreimage},
 	weights::Weight,
 };
+use hydradx_runtime::{origins, Preimage};
 use polkadot_xcm::v3::prelude::*;
 use polkadot_xcm::VersionedXcm;
+use primitives::constants::currency::UNITS;
 use xcm_emulator::TestExt;
 
 #[test]
@@ -305,3 +307,34 @@ fn create_contract_from_evm_pallet_should_be_filtered_by_call_filter() {
 		assert!(!hydradx_runtime::CallFilter::contains(&call));
 	});
 }
+
+#[test]
+fn referenda_can_not_be_filtered() {
+	TestNet::reset();
+
+	Hydra::execute_with(|| {
+		// Arrange
+		// Try to pause transactions for Referenda/submit
+		assert_ok!(hydradx_runtime::TransactionPause::pause_transaction(
+			hydradx_runtime::RuntimeOrigin::root(),
+			b"Referenda".to_vec(),
+			b"submit".to_vec()
+		));
+
+		// Prepare a Referenda/submit call
+		let spend_call = hydradx_runtime::RuntimeCall::Treasury(pallet_treasury::Call::spend_local {
+			amount: 100 * UNITS,
+			beneficiary: ALICE.into(),
+		});
+		let preimage = <Preimage as StorePreimage>::bound(spend_call).unwrap();
+
+		// Act & Assert
+		let successful_call = hydradx_runtime::RuntimeCall::Referenda(pallet_referenda::Call::submit {
+			proposal_origin: Box::new(hydradx_runtime::OriginCaller::Origins(origins::Origin::Tipper)),
+			proposal: preimage,
+			enactment_moment: frame_support::traits::schedule::DispatchTime::After(100),
+		});
+
+		assert!(hydradx_runtime::CallFilter::contains(&successful_call));
+	});
+}

integration-tests/src/insufficient_assets_ed.rs

@@ -7,8 +7,8 @@ use frame_support::{assert_noop, assert_ok, traits::Contains};
 use frame_system::RawOrigin;
 use hydradx_runtime::RuntimeOrigin as hydra_origin;
 use hydradx_runtime::{
-	AssetRegistry as Registry, Currencies, DustRemovalWhitelist, InsufficientEDinHDX, MultiTransactionPayment,
-	NativeExistentialDeposit, RuntimeEvent, TechnicalCollective, Tokens, TreasuryAccount, SUFFICIENCY_LOCK,
+	origins::Origin, AssetRegistry as Registry, Currencies, DustRemovalWhitelist, InsufficientEDinHDX,
+	MultiTransactionPayment, NativeExistentialDeposit, RuntimeEvent, Tokens, TreasuryAccount, SUFFICIENCY_LOCK,
 };
 use hydradx_traits::NativePriceOracle;
 use orml_traits::MultiCurrency;
@@ -1343,7 +1343,7 @@ fn tx_should_fail_with_unsupported_currency_error_when_fee_asset_price_was_not_p
 fn banned_asset_should_not_create_new_account() {
 	TestNet::reset();
 	Hydra::execute_with(|| {
-		let tech_comm = pallet_collective::RawOrigin::<AccountId, TechnicalCollective>::Members(1, 1);
+		let update_origin = hydradx_runtime::OriginCaller::Origins(Origin::GeneralAdmin);
 		//Arrange
 		let sht1: AssetId = register_external_asset(0_u128);
 		assert_ok!(Tokens::set_balance(
@@ -1354,7 +1354,7 @@ fn banned_asset_should_not_create_new_account() {
 			0,
 		));
 
-		assert_ok!(Registry::ban_asset(tech_comm.into(), sht1));
+		assert_ok!(Registry::ban_asset(update_origin.into(), sht1));
 
 		assert_eq!(Currencies::free_balance(sht1, &ALICE.into()), 0);
 		assert_eq!(treasury_sufficiency_lock(), 0);
@@ -1371,7 +1371,7 @@ fn banned_asset_should_not_create_new_account() {
 fn banned_asset_should_not_be_transferable_to_existing_account() {
 	TestNet::reset();
 	Hydra::execute_with(|| {
-		let tech_comm = pallet_collective::RawOrigin::<AccountId, TechnicalCollective>::Members(1, 1);
+		let update_origin = hydradx_runtime::OriginCaller::Origins(Origin::GeneralAdmin);
 		//Arrange
 		let sht1: AssetId = register_external_asset(0_u128);
 		assert_ok!(Tokens::set_balance(
@@ -1390,7 +1390,7 @@ fn banned_asset_should_not_be_transferable_to_existing_account() {
 			0,
 		));
 
-		assert_ok!(Registry::ban_asset(tech_comm.into(), sht1));
+		assert_ok!(Registry::ban_asset(update_origin.into(), sht1));
 
 		//Act & assert
 		assert_noop!(

integration-tests/src/router.rs

@@ -1352,7 +1352,6 @@ mod omnipool_router_tests {
 				let extra_ed_charge = UNITS / 10;
 				assert_balance!(ALICE.into(), HDX, 1000 * UNITS - ed);
 
-				let amount_to_sell = amount_to_sell;
 				assert_ok!(Router::sell(
 					hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 					insufficient_asset_1,