Loans: Add oracles to development runtime (#1377)

* add needed utilities to work with oracles

* added to oracle and data-collector to development runtime

* get compile it with tuples-96 feature

* add pallet-membershipt for oracle prices·

* workaround for initializing oracles

* new CombineData, fix warnings, minor PR comments

* fix taplo fmt

* fix oracle benchmarking

* simplify benchmarks

* mocking members trait

* finally benchmarks fixed

* Adapt pool number

* reduce benchmarking time

* add OracleKey type

* correct benchmarking

* fix cargo versions

* taplo fmt

* minor constant reorganization

* fix minor issue

* fix benchmarks

* simplify benchmark configuration

* minor change

* add minor comment

libs/mocks/Cargo.toml

@@ -23,6 +23,8 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f
 cfg-primitives = { path = "../primitives", default-features = false }
 cfg-traits = { path = "../traits", default-features = false }
 cfg-types = { path = "../types", default-features = false }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.38" }
+
 mock-builder = { path = "../../libs/mock-builder" }
 
 [features]
@@ -39,6 +41,7 @@ std = [
   "sp-core/std",
   "sp-io/std",
   "sp-runtime/std",
+  "orml-traits/std",
 ]
 runtime-benchmarks = [
   "frame-support/runtime-benchmarks",

libs/mocks/src/data.rs

@@ -3,13 +3,15 @@ pub mod pallet {
 	use cfg_traits::data::{DataCollection, DataRegistry};
 	use frame_support::pallet_prelude::*;
 	use mock_builder::{execute_call, register_call};
+	use orml_traits::{DataFeeder, DataProvider};
 
 	#[pallet::config]
 	pub trait Config: frame_system::Config {
 		type DataId;
 		type CollectionId;
 		type Collection: DataCollection<Self::DataId>;
 		type Data;
+		type DataElem;
 		#[cfg(feature = "runtime-benchmarks")]
 		type MaxCollectionSize: Get<u32>;
 	}
@@ -46,6 +48,12 @@ pub mod pallet {
 		) {
 			register_call!(move |(a, b)| f(a, b));
 		}
+
+		pub fn mock_feed_value(
+			f: impl Fn(T::AccountId, T::DataId, T::DataElem) -> DispatchResult + 'static,
+		) {
+			register_call!(move |(a, b, c)| f(a, b, c));
+		}
 	}
 
 	impl<T: Config> DataRegistry<T::DataId, T::CollectionId> for Pallet<T> {
@@ -71,6 +79,18 @@ pub mod pallet {
 		}
 	}
 
+	impl<T: Config> DataProvider<T::DataId, T::DataElem> for Pallet<T> {
+		fn get(a: &T::DataId) -> Option<T::DataElem> {
+			execute_call!(a)
+		}
+	}
+
+	impl<T: Config> DataFeeder<T::DataId, T::DataElem, T::AccountId> for Pallet<T> {
+		fn feed_value(a: T::AccountId, b: T::DataId, c: T::DataElem) -> DispatchResult {
+			execute_call!((a, b, c))
+		}
+	}
+
 	#[cfg(feature = "std")]
 	pub mod util {
 		use super::*;

libs/primitives/src/lib.rs

@@ -175,9 +175,6 @@ pub mod types {
 
 	/// A representation of a loan identifier
 	pub type LoanId = u64;
-
-	/// A representation of a price identifier
-	pub type PriceId = u64;
 }
 
 /// Common constants for all runtimes

libs/traits/src/lib.rs

@@ -41,6 +41,7 @@ pub mod ops;
 /// Traits related to rewards.
 pub mod rewards;
 
+/// Traits related to data registry & collections.
 pub mod data;
 
 /// A trait used for loosely coupling the claim pallet with a reward mechanism.

libs/types/src/ids.rs

@@ -24,7 +24,6 @@ impl<InvestmentId> TypeId for InvestmentAccount<InvestmentId> {
 
 // Pallet-Ids that define pallets accounts
 pub const POOLS_PALLET_ID: PalletId = PalletId(*b"roc/pool");
-pub const LOANS_PALLET_ID: PalletId = PalletId(*b"roc/loan");
 pub const CHAIN_BRIDGE_PALLET_ID: PalletId = PalletId(*b"chnbrdge");
 pub const CLAIMS_PALLET_ID: PalletId = PalletId(*b"p/claims");
 pub const CROWDLOAN_REWARD_PALLET_ID: PalletId = PalletId(*b"cc/rewrd");
@@ -33,6 +32,7 @@ pub const TREASURY_PALLET_ID: PalletId = PalletId(*b"py/trsry");
 pub const NFT_SALES_PALLET_ID: PalletId = PalletId(*b"pal/nfts");
 pub const STAKE_POT_PALLET_ID: PalletId = PalletId(*b"PotStake");
 pub const BLOCK_REWARDS_PALLET_ID: PalletId = PalletId(*b"cfg/blrw");
+pub const PRICE_ORACLE_PALLET_ID: PalletId = PalletId(*b"or/price");
 
 // Other ids
 pub const CHAIN_BRIDGE_HASH_ID: [u8; 13] = *b"cent_nft_hash";

libs/types/src/lib.rs

@@ -24,6 +24,7 @@ pub mod fixed_point;
 pub mod ids;
 pub mod investments;
 pub mod locations;
+pub mod oracles;
 pub mod orders;
 pub mod permissions;
 pub mod time;

libs/types/src/oracles.rs

@@ -0,0 +1,36 @@
+use codec::{Decode, Encode, MaxEncodedLen};
+use frame_support::RuntimeDebug;
+use scale_info::TypeInfo;
+#[cfg(feature = "std")]
+use serde::{Deserialize, Serialize};
+
+/// [ISIN](https://en.wikipedia.org/wiki/International_Securities_Identification_Number) format.
+pub type Isin = [u8; 12];
+
+/// A representation of an oracle price identifier
+#[derive(
+	Encode,
+	Decode,
+	Clone,
+	Copy,
+	PartialOrd,
+	Ord,
+	PartialEq,
+	Eq,
+	TypeInfo,
+	RuntimeDebug,
+	MaxEncodedLen,
+)]
+#[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
+pub enum OracleKey {
+	Isin(Isin),
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+impl From<u32> for OracleKey {
+	fn from(value: u32) -> Self {
+		// Any u32 value always fits into 12 bytes
+		let isin = Isin::try_from(&(value as u128).to_be_bytes()[0..12]).unwrap();
+		OracleKey::Isin(isin)
+	}
+}

pallets/data-collector/Cargo.toml

@@ -24,6 +24,9 @@ orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-li
 
 cfg-traits = { path = "../../libs/traits", default-features = false }
 
+# Optionals for benchmarking
+frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.38" }
+
 [dev-dependencies]
 sp-core = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
 sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.38" }
@@ -43,7 +46,18 @@ std = [
   "sp-std/std",
   "cfg-traits/std",
   "orml-traits/std",
+  "frame-benchmarking/std",
 ]
 runtime-benchmarks = [
+  "frame-benchmarking",
   "cfg-traits/runtime-benchmarks",
+  "frame-support/runtime-benchmarks",
+  "frame-system/runtime-benchmarks",
+  "sp-runtime/runtime-benchmarks",
+]
+try-runtime = [
+  "frame-support/try-runtime",
+  "frame-system/try-runtime",
+  "sp-runtime/try-runtime",
+  "cfg-traits/try-runtime",
 ]

pallets/data-collector/src/lib.rs

@@ -28,10 +28,10 @@ mod tests;
 pub mod pallet {
 	use cfg_traits::data::{DataCollection, DataRegistry};
 	use frame_support::{pallet_prelude::*, storage::bounded_btree_map::BoundedBTreeMap};
-	use orml_traits::{DataProviderExtended, OnNewData};
+	use orml_traits::{DataFeeder, DataProvider, DataProviderExtended, OnNewData};
 	use sp_runtime::{
 		traits::{EnsureAddAssign, EnsureSubAssign},
-		DispatchError,
+		DispatchError, DispatchResult,
 	};
 
 	type DataValueOf<T, I> = (<T as Config<I>>::Data, <T as Config<I>>::Moment);
@@ -130,8 +130,10 @@ pub mod pallet {
 							.map_err(|_| Error::<T, I>::MaxCollectionNumber)?;
 
 						Collection::<T, I>::try_mutate(collection_id, |collection| {
+							let data =
+								<Self as DataRegistry<T::DataId, T::CollectionId>>::get(data_id)?;
 							collection
-								.try_insert(data_id.clone(), Self::get(data_id)?)
+								.try_insert(data_id.clone(), data)
 								.map(|_| ())
 								.map_err(|_| Error::<T, I>::MaxCollectionSize.into())
 						})
@@ -166,16 +168,40 @@ pub mod pallet {
 			// for Data values.
 			for collection_id in Listening::<T, I>::get(data_id).keys() {
 				Collection::<T, I>::mutate(collection_id, |collection| {
-					if let (Some(value), Ok(new_value)) =
-						(collection.get_mut(data_id), Self::get(data_id))
-					{
+					let data = <Self as DataRegistry<T::DataId, T::CollectionId>>::get(data_id);
+					if let (Some(value), Ok(new_value)) = (collection.get_mut(data_id), data) {
 						*value = new_value;
 					}
 				});
 			}
 		}
 	}
 
+	// This implementation can be removed once:
+	// <https://github.com/open-web3-stack/open-runtime-module-library/pull/920> be merged,
+	// and consecuently, get() call methods simplified.
+	impl<T: Config<I>, I: 'static> DataProvider<T::DataId, T::Data> for Pallet<T, I>
+	where
+		T::DataProvider: DataProvider<T::DataId, T::Data>,
+	{
+		fn get(key: &T::DataId) -> Option<T::Data> {
+			T::DataProvider::get(key)
+		}
+	}
+
+	impl<T: Config<I>, I: 'static> DataFeeder<T::DataId, T::Data, T::AccountId> for Pallet<T, I>
+	where
+		T::DataProvider: DataFeeder<T::DataId, T::Data, T::AccountId>,
+	{
+		fn feed_value(
+			account_id: T::AccountId,
+			data_id: T::DataId,
+			data: T::Data,
+		) -> DispatchResult {
+			T::DataProvider::feed_value(account_id, data_id, data)
+		}
+	}
+
 	/// A collection cached in memory
 	pub struct CachedCollection<T: Config<I>, I: 'static = ()>(
 		BoundedBTreeMap<T::DataId, DataValueOf<T, I>, T::MaxCollectionSize>,

pallets/loans-ref/Cargo.toml

@@ -23,10 +23,11 @@ sp-std = { git = "https://github.com/paritytech/substrate", default-features = f
 cfg-primitives = { path = "../../libs/primitives", default-features = false }
 cfg-traits = { path = "../../libs/traits", default-features = false }
 cfg-types = { path = "../../libs/types", default-features = false }
+orml-traits = { git = "https://github.com/open-web3-stack/open-runtime-module-library", default-features = false, branch = "polkadot-v0.9.38" }
 
 strum = { version = "0.24", default-features = false, features = ["derive"] }
 
-# Optionals for benchamarking
+# Optionals for benchmarking
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", default-features = false, optional = true, branch = "polkadot-v0.9.38" }
 
 # Used for migrations (no longer needed once migratios is done)
@@ -61,6 +62,7 @@ std = [
   "frame-benchmarking/std",
   "sp-io/std",
   "strum/std",
+  "orml-traits/std",
 ]
 runtime-benchmarks = [
   "frame-benchmarking",
@@ -76,6 +78,7 @@ runtime-benchmarks = [
 try-runtime = [
   "frame-support/try-runtime",
   "frame-system/try-runtime",
+  "sp-runtime/try-runtime",
   "cfg-primitives/try-runtime",
   "cfg-traits/try-runtime",
   "cfg-types/try-runtime",