Merge pull request #1443 from galacticcouncil/fix/stableswap-asset-tradability

Author: enthusiastmartin

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pallet-stableswap"
-version = "7.4.0"
+version = "7.4.1"
 description = "AMM for correlated assets"
 authors = ["GalacticCouncil"]
 edition = "2021"

pallets/stableswap/Cargo.toml

@@ -945,9 +945,12 @@ pub mod pallet {
 			let pool = Pools::<T>::get(pool_id).ok_or(Error::<T>::PoolNotFound)?;
 			let _ = pool.find_asset(asset_id).ok_or(Error::<T>::AssetNotInPool)?;
 
-			AssetTradability::<T>::mutate(pool_id, asset_id, |current_state| {
-				*current_state = state;
-			});
+			// If the state is the default, we remove the entry to save storage.
+			if state == Tradability::default() {
+				AssetTradability::<T>::remove(pool_id, asset_id);
+			} else {
+				AssetTradability::<T>::insert(pool_id, asset_id, state);
+			}
 
 			Self::deposit_event(Event::TradableStateUpdated {
 				pool_id,

pallets/stableswap/src/lib.rs

@@ -180,3 +180,178 @@ fn set_tradable_state_should_fail_when_pool_does_not_exist() {
 			);
 		});
 }
+
+#[test]
+fn set_tradable_state_should_remove_storage_when_state_is_default() {
+	let asset_a: AssetId = 1;
+	let asset_b: AssetId = 2;
+	let pool_id: AssetId = 100;
+
+	ExtBuilder::default()
+		.with_endowed_accounts(vec![(ALICE, asset_a, 200 * ONE), (ALICE, asset_b, 200 * ONE)])
+		.with_registered_asset("pool".as_bytes().to_vec(), pool_id, 12)
+		.with_registered_asset("one".as_bytes().to_vec(), asset_a, 12)
+		.with_registered_asset("two".as_bytes().to_vec(), asset_b, 12)
+		.build()
+		.execute_with(|| {
+			assert_ok!(Stableswap::create_pool(
+				RuntimeOrigin::root(),
+				pool_id,
+				to_bounded_asset_vec(vec![asset_a, asset_b]),
+				100,
+				Permill::from_percent(0),
+			));
+
+			assert_ok!(Stableswap::set_asset_tradable_state(
+				RuntimeOrigin::root(),
+				pool_id,
+				asset_a,
+				Tradability::FROZEN,
+			));
+			assert!(<AssetTradability<Test>>::contains_key(pool_id, asset_a));
+
+			assert_ok!(Stableswap::set_asset_tradable_state(
+				RuntimeOrigin::root(),
+				pool_id,
+				asset_a,
+				Tradability::default(),
+			));
+
+			assert!(!<AssetTradability<Test>>::contains_key(pool_id, asset_a));
+		});
+}
+
+#[test]
+fn set_tradable_state_should_allow_all_operations_when_reset_to_default() {
+	let asset_a: AssetId = 1;
+	let asset_b: AssetId = 2;
+	let pool_id: AssetId = 100;
+
+	ExtBuilder::default()
+		.with_endowed_accounts(vec![(ALICE, asset_a, 200 * ONE), (ALICE, asset_b, 200 * ONE)])
+		.with_registered_asset("pool".as_bytes().to_vec(), pool_id, 12)
+		.with_registered_asset("one".as_bytes().to_vec(), asset_a, 12)
+		.with_registered_asset("two".as_bytes().to_vec(), asset_b, 12)
+		.build()
+		.execute_with(|| {
+			assert_ok!(Stableswap::create_pool(
+				RuntimeOrigin::root(),
+				pool_id,
+				to_bounded_asset_vec(vec![asset_a, asset_b]),
+				100,
+				Permill::from_percent(0),
+			));
+
+			assert_ok!(Stableswap::set_asset_tradable_state(
+				RuntimeOrigin::root(),
+				pool_id,
+				asset_a,
+				Tradability::FROZEN,
+			));
+
+			assert_ok!(Stableswap::set_asset_tradable_state(
+				RuntimeOrigin::root(),
+				pool_id,
+				asset_a,
+				Tradability::default(),
+			));
+
+			let stored = <AssetTradability<Test>>::get(pool_id, asset_a);
+			assert_eq!(stored, Tradability::default());
+			assert!(stored.contains(Tradability::SELL));
+			assert!(stored.contains(Tradability::BUY));
+			assert!(stored.contains(Tradability::ADD_LIQUIDITY));
+			assert!(stored.contains(Tradability::REMOVE_LIQUIDITY));
+		});
+}
+
+#[test]
+fn set_tradable_state_should_handle_full_toggle_through_default_and_partial_flags() {
+	let asset_a: AssetId = 1;
+	let asset_b: AssetId = 2;
+	let pool_id: AssetId = 100;
+
+	ExtBuilder::default()
+		.with_endowed_accounts(vec![(ALICE, asset_a, 200 * ONE), (ALICE, asset_b, 200 * ONE)])
+		.with_registered_asset("pool".as_bytes().to_vec(), pool_id, 12)
+		.with_registered_asset("one".as_bytes().to_vec(), asset_a, 12)
+		.with_registered_asset("two".as_bytes().to_vec(), asset_b, 12)
+		.build()
+		.execute_with(|| {
+			assert_ok!(Stableswap::create_pool(
+				RuntimeOrigin::root(),
+				pool_id,
+				to_bounded_asset_vec(vec![asset_a, asset_b]),
+				100,
+				Permill::from_percent(0),
+			));
+
+			assert_ok!(Stableswap::set_asset_tradable_state(
+				RuntimeOrigin::root(),
+				pool_id,
+				asset_a,
+				Tradability::FROZEN,
+			));
+			assert_eq!(<AssetTradability<Test>>::get(pool_id, asset_a), Tradability::FROZEN);
+
+			assert_ok!(Stableswap::set_asset_tradable_state(
+				RuntimeOrigin::root(),
+				pool_id,
+				asset_a,
+				Tradability::default(),
+			));
+			assert!(!<AssetTradability<Test>>::contains_key(pool_id, asset_a));
+
+			let partial = Tradability::SELL | Tradability::BUY;
+			assert_ok!(Stableswap::set_asset_tradable_state(
+				RuntimeOrigin::root(),
+				pool_id,
+				asset_a,
+				partial,
+			));
+			assert!(<AssetTradability<Test>>::contains_key(pool_id, asset_a));
+			assert_eq!(<AssetTradability<Test>>::get(pool_id, asset_a), partial);
+
+			assert_ok!(Stableswap::set_asset_tradable_state(
+				RuntimeOrigin::root(),
+				pool_id,
+				asset_a,
+				Tradability::default(),
+			));
+			assert!(!<AssetTradability<Test>>::contains_key(pool_id, asset_a));
+		});
+}
+
+#[test]
+fn set_tradable_state_should_not_create_storage_entry_when_initial_state_is_default() {
+	let asset_a: AssetId = 1;
+	let asset_b: AssetId = 2;
+	let pool_id: AssetId = 100;
+
+	ExtBuilder::default()
+		.with_endowed_accounts(vec![(ALICE, asset_a, 200 * ONE), (ALICE, asset_b, 200 * ONE)])
+		.with_registered_asset("pool".as_bytes().to_vec(), pool_id, 12)
+		.with_registered_asset("one".as_bytes().to_vec(), asset_a, 12)
+		.with_registered_asset("two".as_bytes().to_vec(), asset_b, 12)
+		.build()
+		.execute_with(|| {
+			assert_ok!(Stableswap::create_pool(
+				RuntimeOrigin::root(),
+				pool_id,
+				to_bounded_asset_vec(vec![asset_a, asset_b]),
+				100,
+				Permill::from_percent(0),
+			));
+
+			assert!(!<AssetTradability<Test>>::contains_key(pool_id, asset_a));
+
+			assert_ok!(Stableswap::set_asset_tradable_state(
+				RuntimeOrigin::root(),
+				pool_id,
+				asset_a,
+				Tradability::default(),
+			));
+
+			assert!(!<AssetTradability<Test>>::contains_key(pool_id, asset_a));
+		});
+}