Merge pull request #627 from galacticcouncil/asset_registry_bounded_s…

…torage fix: asset registry bounded storage
galacticcouncil · Jul 6, 2023 · 27b0a27 · 27b0a27
2 parents 91ea9db + ac1bb3e
commit 27b0a27
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-asset-registry"
-version = "2.2.1"
+version = "2.2.2"
 description = "Pallet for asset registry management"
 authors = ["GalacticCouncil"]
 edition = "2021"

diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs
@@ -75,10 +75,16 @@ pub mod pallet {
 			+ TypeInfo;
 
 		/// Balance type
-		type Balance: Parameter + Member + AtLeast32BitUnsigned + Default + Copy + MaybeSerializeDeserialize;
+		type Balance: Parameter
+			+ Member
+			+ AtLeast32BitUnsigned
+			+ Default
+			+ Copy
+			+ MaybeSerializeDeserialize
+			+ MaxEncodedLen;
 
 		/// Asset location type
-		type AssetNativeLocation: Parameter + Member + Default;
+		type AssetNativeLocation: Parameter + Member + Default + MaxEncodedLen;
 
 		/// The maximum length of a name or symbol stored on-chain.
 		type StringLimit: Get<u32>;
@@ -95,7 +101,6 @@ pub mod pallet {
 	}
 
 	#[pallet::pallet]
-	#[pallet::without_storage_info]
 	pub struct Pallet<T>(_);
 
 	#[pallet::hooks]

diff --git a/pallets/asset-registry/src/mock.rs b/pallets/asset-registry/src/mock.rs
@@ -86,10 +86,10 @@ impl system::Config for Test {
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
-use codec::{Decode, Encode};
+use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 
-#[derive(Debug, Default, Encode, Decode, Clone, PartialEq, Eq, TypeInfo)]
+#[derive(Debug, Default, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
 pub struct AssetLocation(pub MultiLocation);
 
 impl Config for Test {

diff --git a/pallets/asset-registry/src/types.rs b/pallets/asset-registry/src/types.rs
@@ -22,14 +22,14 @@ use sp_std::vec::Vec;
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
-#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, TypeInfo)]
+#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub enum AssetType<AssetId> {
 	Token,
 	PoolShare(AssetId, AssetId),
 }
 
-#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, TypeInfo)]
+#[derive(Encode, Decode, Eq, PartialEq, Copy, Clone, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct AssetDetails<AssetId, Balance, BoundedString> {
 	/// The name of this asset. Limited in length by `StringLimit`.
@@ -42,7 +42,7 @@ pub struct AssetDetails<AssetId, Balance, BoundedString> {
 	pub(super) xcm_rate_limit: Option<Balance>,
 }
 
-#[derive(Clone, Encode, Decode, Eq, PartialEq, Default, RuntimeDebug, TypeInfo)]
+#[derive(Clone, Encode, Decode, Eq, PartialEq, Default, RuntimeDebug, TypeInfo, MaxEncodedLen)]
 pub struct AssetMetadata<BoundedString> {
 	/// The ticker symbol for this asset. Limited in length by `StringLimit`.
 	pub(super) symbol: BoundedString,

diff --git a/runtime/hydradx/Cargo.toml b/runtime/hydradx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-runtime"
-version = "165.0.0"
+version = "166.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 license = "Apache 2.0"

diff --git a/runtime/hydradx/src/lib.rs b/runtime/hydradx/src/lib.rs
@@ -96,7 +96,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("hydradx"),
 	impl_name: create_runtime_str!("hydradx"),
 	authoring_version: 1,
-	spec_version: 165,
+	spec_version: 166,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,

diff --git a/runtime/hydradx/src/xcm.rs b/runtime/hydradx/src/xcm.rs
@@ -1,5 +1,6 @@
 use super::*;
 
+use codec::MaxEncodedLen;
 use hydradx_adapters::{MultiCurrencyTrader, ReroutingMultiCurrencyAdapter, ToFeeReceiver};
 use pallet_transaction_multi_payment::DepositAll;
 use primitives::AssetId; // shadow glob import of polkadot_xcm::v3::prelude::AssetId
@@ -26,7 +27,7 @@ use xcm_builder::{
 };
 use xcm_executor::{Config, XcmExecutor};
 
-#[derive(Debug, Default, Encode, Decode, Clone, PartialEq, Eq, TypeInfo)]
+#[derive(Debug, Default, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
 pub struct AssetLocation(pub polkadot_xcm::v3::MultiLocation);
 
 pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;