update: remove chainlink

node/src/chain_spec/dev.rs

@@ -113,12 +113,8 @@ fn pint_testnet_genesis(
 		balances: BalancesConfig { balances: vec![(root_key.clone(), 1 << 60)] },
 		treasury: Default::default(),
 		committee: CommitteeConfig { council_members: council_members.clone(), ..Default::default() },
-		chainlink_feed: ChainlinkFeedConfig {
-			feeds: Default::default(),
-			pallet_admin: Some(root_key.clone()),
-			feed_creators: council_members,
-		},
 		sudo: SudoConfig { key: Some(root_key) },
+		general_council: Default::default(),
 		parachain_info: ParachainInfoConfig { parachain_id: id },
 		collator_selection: CollatorSelectionConfig {
 			invulnerables: initial_authorities.iter().cloned().map(|(acc, _)| acc).collect(),

node/src/chain_spec/pint.rs

@@ -112,12 +112,8 @@ fn pint_testnet_genesis(
 		balances: BalancesConfig { balances: vec![(root_key.clone(), 1 << 60)] },
 		treasury: Default::default(),
 		committee: CommitteeConfig { council_members: council_members.clone(), ..Default::default() },
-		chainlink_feed: ChainlinkFeedConfig {
-			feeds: Default::default(),
-			pallet_admin: Some(root_key.clone()),
-			feed_creators: council_members,
-		},
 		sudo: SudoConfig { key: Some(root_key) },
+		general_council: Default::default(),
 		parachain_info: ParachainInfoConfig { parachain_id: id },
 		collator_selection: CollatorSelectionConfig {
 			invulnerables: initial_authorities.iter().cloned().map(|(acc, _)| acc).collect(),

node/src/chain_spec/shot.rs

@@ -111,12 +111,8 @@ fn pint_testnet_genesis(
 		balances: BalancesConfig { balances: vec![(root_key.clone(), 1 << 60)] },
 		treasury: Default::default(),
 		committee: CommitteeConfig { council_members: council_members.clone(), ..Default::default() },
-		chainlink_feed: ChainlinkFeedConfig {
-			feeds: Default::default(),
-			pallet_admin: Some(root_key.clone()),
-			feed_creators: council_members,
-		},
 		sudo: SudoConfig { key: Some(root_key) },
+		general_council: Default::default(),
 		parachain_info: ParachainInfoConfig { parachain_id: id },
 		collator_selection: CollatorSelectionConfig {
 			invulnerables: initial_authorities.iter().cloned().map(|(acc, _)| acc).collect(),

pallets/asset-index/Cargo.toml

@@ -25,7 +25,6 @@ xcm = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.2
 xcm-executor = { git = 'https://github.com/paritytech/polkadot', branch = 'release-v0.9.24', default-features = false }
 
 # PINT dependencies
-pallet-chainlink-feed = { git = 'https://github.com/Sotatek-BaoHoang2/chainlink-polkadot', branch = 'polkadot-v0.9.24', default-features = false }
 pallet-price-feed = { path = "../price-feed", default-features = false }
 primitives = { path = "../../primitives/primitives", default-features = false }
 
@@ -64,13 +63,11 @@ std = [
 
     'orml-traits/std',
     'orml-tokens/std',
-    'pallet-chainlink-feed/std'
 ]
 runtime-benchmarks = [
     'frame-benchmarking',
     'frame-support/runtime-benchmarks',
     'pallet-price-feed/runtime-benchmarks',
-#    'pallet-chainlink-feed/runtime-benchmarks',
     'primitives/runtime-benchmarks',
 ]
 

pallets/price-feed/Cargo.toml

@@ -20,7 +20,6 @@ frame-system = { git = 'https://github.com/paritytech/substrate', branch = 'polk
 frame-benchmarking = { git = 'https://github.com/paritytech/substrate', branch = 'polkadot-v0.9.24', default-features = false, optional = true }
 
 # PINT dependencies
-pallet-chainlink-feed = { git = 'https://github.com/Sotatek-BaoHoang2/chainlink-polkadot', branch = 'polkadot-v0.9.24', default-features = false }
 primitives = { path = "../../primitives/primitives", default-features = false }
 orml-oracle = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.24', default-features = false }
 orml-traits = { git = 'https://github.com/open-web3-stack/open-runtime-module-library', branch = 'polkadot-v0.9.24', default-features = false }
@@ -42,7 +41,6 @@ std = [
     'scale-info/std',
     'frame-support/std',
     'frame-system/std',
-    'pallet-chainlink-feed/std',
     'primitives/std',
     'sp-core/std',
     'sp-io/std',
@@ -52,7 +50,6 @@ std = [
 runtime-benchmarks = [
     'frame-benchmarking',
     'frame-support/runtime-benchmarks',
-    'pallet-chainlink-feed/runtime-benchmarks',
     'primitives/runtime-benchmarks',
 ]
 

pallets/price-feed/src/lib.rs

@@ -53,15 +53,11 @@ pub mod pallet {
 		traits::{Get, Time},
 	};
 	use frame_system::pallet_prelude::*;
-	use pallet_chainlink_feed::{FeedInterface, FeedOracle, RoundData};
-	use orml_oracle::{DataProvider};
-	use primitives::traits::MaybeAssetIdConvert;
+	use orml_traits::{DataProvider};
 	pub use primitives::{AssetPricePair, Price};
+	pub use primitives::traits::{MaybeAssetIdConvert};
 
-	pub type FeedIdFor<T> = <T as pallet_chainlink_feed::Config>::FeedId;
 	pub type MomentOf<T> = <<T as Config>::Time as Time>::Moment;
-	pub type FeedValueFor<T> = <T as pallet_chainlink_feed::Config>::Value;
-	pub type TimestampedFeedValue<T> = TimestampedValue<(FeedValueFor<T>, u8), MomentOf<T>>;
 
 	/// Provides access to all the price feeds
 	/// This is used to determine the equivalent amount of PINT for assets
@@ -75,7 +71,7 @@ pub mod pallet {
 	/// means of the asset pair `(base / quote)`. (e.g. DOT/PINT)
 	#[pallet::config]
 	pub trait Config:
-		frame_system::Config + pallet_chainlink_feed::Config + MaybeAssetIdConvert<u8, Self::AssetId>
+		frame_system::Config + MaybeAssetIdConvert<u8, Self::AssetId>
 	{
 		/// The origin that is allowed to insert asset -> feed mappings
 		type AdminOrigin: EnsureOrigin<Self::Origin>;
@@ -94,116 +90,44 @@ pub mod pallet {
 
 		/// The weight for this pallet's extrinsics.
 		type WeightInfo: WeightInfo;
+
+		type DataProvider: DataProvider<Self::AssetId, Price>;
 	}
 
 	#[pallet::pallet]
 	#[pallet::without_storage_info]
 	#[pallet::generate_store(pub(super) trait Store)]
 	pub struct Pallet<T>(_);
 
-	/// Store a mapping (AssetId) -> FeedId for all active assets
-	#[pallet::storage]
-	#[pallet::getter(fn asset_feed)]
-	pub type AssetFeeds<T: Config> = StorageMap<_, Blake2_128Concat, T::AssetId, FeedIdFor<T>, OptionQuery>;
-
-	#[pallet::storage]
-	#[pallet::getter(fn latest_answer_timestamp)]
-	/// Stores the timestamp of the latest answer of each feed (feed) ->
-	/// Timestamp
-	pub type LatestAnswerTimestamp<T: Config> = StorageMap<_, Twox64Concat, FeedIdFor<T>, MomentOf<T>, ValueQuery>;
-
-	#[pallet::genesis_config]
-	pub struct GenesisConfig<T: Config>
-	where
-		<T as pallet_chainlink_feed::Config>::FeedId: MaybeSerializeDeserialize,
-	{
-		/// The mappings to insert at genesis
-		pub asset_feeds: Vec<(T::AssetId, FeedIdFor<T>)>,
-	}
-
-	#[cfg(feature = "std")]
-	impl<T: Config> Default for GenesisConfig<T>
-	where
-		<T as pallet_chainlink_feed::Config>::FeedId: MaybeSerializeDeserialize,
-	{
-		fn default() -> Self {
-			Self { asset_feeds: Default::default() }
-		}
-	}
-
-	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T>
-	where
-		<T as pallet_chainlink_feed::Config>::FeedId: MaybeSerializeDeserialize,
-	{
-		fn build(&self) {
-			for (asset, feed) in &self.asset_feeds {
-				AssetFeeds::<T>::insert(asset.clone(), *feed)
-			}
-		}
-	}
 
-	#[cfg(feature = "std")]
-	impl<T: Config> GenesisConfig<T>
-	where
-		<T as pallet_chainlink_feed::Config>::FeedId: MaybeSerializeDeserialize,
-	{
-		/// Direct implementation of `GenesisBuild::build_storage`.
-		///
-		/// Kept in order not to break dependency.
-		pub fn build_storage(&self) -> Result<frame_support::sp_runtime::Storage, String> {
-			<Self as GenesisBuild<T>>::build_storage(self)
-		}
-
-		/// Direct implementation of `GenesisBuild::assimilate_storage`.
-		///
-		/// Kept in order not to break dependency.
-		pub fn assimilate_storage(&self, storage: &mut frame_support::sp_runtime::Storage) -> Result<(), String> {
-			<Self as GenesisBuild<T>>::assimilate_storage(self, storage)
-		}
-	}
+	// #[cfg(feature = "std")]
+	// impl<T: Config> GenesisConfig<T>
+	// where
+	// 	<T as pallet_chainlink_feed::Config>::FeedId: MaybeSerializeDeserialize,
+	// {
+	// 	/// Direct implementation of `GenesisBuild::build_storage`.
+	// 	///
+	// 	/// Kept in order not to break dependency.
+	// 	pub fn build_storage(&self) -> Result<frame_support::sp_runtime::Storage, String> {
+	// 		<Self as GenesisBuild<T>>::build_storage(self)
+	// 	}
+
+	// 	/// Direct implementation of `GenesisBuild::assimilate_storage`.
+	// 	///
+	// 	/// Kept in order not to break dependency.
+	// 	pub fn assimilate_storage(&self, storage: &mut frame_support::sp_runtime::Storage) -> Result<(), String> {
+	// 		<Self as GenesisBuild<T>>::assimilate_storage(self, storage)
+	// 	}
+	// }
 
 	#[pallet::event]
 	#[pallet::generate_deposit(pub(super) fn deposit_event)]
 	pub enum Event<T: Config> {
-		/// A new assetId -> feedId mapping was inserted
-		/// \[AssetId, NewFeedId, OldFeedId\]
-		UpdateAssetPriceFeed(T::AssetId, FeedIdFor<T>, Option<FeedIdFor<T>>),
-		/// An assetId -> feedId was removed
-		/// \[AssetId, FeedId\]
-		RemoveAssetPriceFeed(T::AssetId, FeedIdFor<T>),
 	}
 
 	#[pallet::call]
 	impl<T: Config> Pallet<T> {
-		/// Maps the given asset to an existing price feed.
-		/// If the asset was already mapped to a price feed this will update the mapping
-		///
-		/// Callable by the governance committee.
-		#[pallet::weight(<T as Config>::WeightInfo::map_asset_price_feed())]
-		pub fn map_asset_price_feed(
-			origin: OriginFor<T>,
-			asset_id: T::AssetId,
-			feed_id: FeedIdFor<T>,
-		) -> DispatchResult {
-			T::AdminOrigin::ensure_origin(origin)?;
-			let old_feed_id = AssetFeeds::<T>::mutate(&asset_id, |maybe_feed_id| maybe_feed_id.replace(feed_id));
-			Self::deposit_event(Event::UpdateAssetPriceFeed(asset_id, feed_id, old_feed_id));
-			Ok(())
-		}
-
-		/// Removes the the `asset` -> `feed` mapping if it exists.
-		/// This is a noop if the asset is not tracked.
-		///
-		/// Callable by the governance committee.
-		#[pallet::weight(<T as Config>::WeightInfo::unmap_asset_price_feed())]
-		pub fn unmap_asset_price_feed(origin: OriginFor<T>, asset_id: T::AssetId) -> DispatchResult {
-			T::AdminOrigin::ensure_origin(origin)?;
-			if let Some(feed_id) = AssetFeeds::<T>::take(&asset_id) {
-				Self::deposit_event(Event::RemoveAssetPriceFeed(asset_id, feed_id));
-			}
-			Ok(())
-		}
+		// 
 	}
 
 	#[pallet::error]
@@ -218,45 +142,15 @@ pub mod pallet {
 		ExceededAccuracy,
 	}
 
-	#[pallet::hooks]
-	impl<T: Config> Hooks<BlockNumberFor<T>> for Pallet<T> {}
-
-	impl<T: Config> Pallet<T> {
-		/// Returns the corresponding identifier for the asset's price feed
-		/// according to the internal mapping
-		pub fn asset_feed_id(asset_id: &T::AssetId) -> Option<FeedIdFor<T>> {
-			AssetFeeds::<T>::get(asset_id)
-		}
-
-		/// Returns the latest value in the feed together with the feed's
-		/// decimals (the feed's precision) or an error if no feed was found for the given
-		/// or the feed doesn't contain any valid round yet.
-		pub fn latest_valid_value(feed_id: FeedIdFor<T>) -> Result<(FeedValueFor<T>, u8), DispatchError> {
-			let feed = pallet_chainlink_feed::Pallet::<T>::feed(feed_id).ok_or(Error::<T>::AssetPriceFeedNotFound)?;
-			ensure!(feed.first_valid_round().is_some(), Error::<T>::InvalidFeedValue);
-			Ok((feed.latest_data().answer, feed.decimals()))
-		}
-
-		/// Same as `latest_value` but with the time the answer was emitted
-		pub fn latest_timestamped_value(feed_id: FeedIdFor<T>) -> Result<TimestampedFeedValue<T>, DispatchError> {
-			let moment = LatestAnswerTimestamp::<T>::get(&feed_id);
-			let value = Self::latest_valid_value(feed_id)?;
-			Ok(TimestampedValue { value, moment })
-		}
-	}
-
-	impl<T: Config> PriceFeed<T::AssetId> for Pallet<T>
-	where
-		FeedValueFor<T>: FixedPointOperand,
-	{
+	impl<T: Config> PriceFeed<T::AssetId> for Pallet<T> {
 		fn get_price(base: T::AssetId) -> Result<Price, DispatchError> {
 			// let feed = Self::asset_feed_id(&base).ok_or(Error::<T>::AssetPriceFeedNotFound)?;
 
 			// let (value, precision) = Self::latest_valid_value(feed)?;
 			// let multiplier = 10u128.checked_pow(precision.into()).ok_or(Error::<T>::ExceededAccuracy)?;
 
 			// Price::checked_from_rational(value, multiplier).ok_or_else(|| Error::<T>::ExceededAccuracy.into())
-			DataProvider::<T::AssetId, Price>::get(&base).ok_or_else(|| Error::<T>::ExceededAccuracy.into())
+			T::DataProvider::get(&base).ok_or_else(|| Error::<T>::ExceededAccuracy.into())
 		}
 
 		fn get_relative_price_pair(
@@ -270,52 +164,6 @@ pub mod pallet {
 		}
 	}
 
-	#[cfg(feature = "runtime-benchmarks")]
-	impl<T: Config> PriceFeedBenchmarks<T::AccountId, T::AssetId> for Pallet<T> {
-		fn create_feed(
-			caller: <T as frame_system::Config>::AccountId,
-			asset_id: T::AssetId,
-		) -> DispatchResultWithPostInfo {
-			use frame_benchmarking::vec;
-
-			pallet_chainlink_feed::Pallet::<T>::set_feed_creator(
-				<frame_system::Origin<T>>::Signed(pallet_chainlink_feed::Pallet::<T>::pallet_admin()).into(),
-				caller.clone(),
-			)?;
-
-			pallet_chainlink_feed::Pallet::<T>::create_feed(
-				<frame_system::Origin<T>>::Signed(caller.clone()).into(),
-				100u32.into(),
-				Zero::zero(),
-				(1u8.into(), 100u8.into()),
-				1u8.into(),
-				0u8,
-				vec![1; T::StringLimit::get() as usize],
-				Zero::zero(),
-				vec![(caller.clone(), caller.clone())],
-				None,
-				None,
-			)?;
-
-			let feed_id = <pallet_chainlink_feed::FeedCounter<T>>::get() - 1.into();
-			AssetFeeds::<T>::insert(&asset_id, feed_id);
-			pallet_chainlink_feed::Pallet::<T>::submit(
-				<frame_system::Origin<T>>::Signed(caller.clone()).into(),
-				feed_id,
-				1_u32.into(),
-				1.into(),
-			)?;
-
-			Ok(().into())
-		}
-	}
-
-	impl<T: Config> pallet_chainlink_feed::traits::OnAnswerHandler<T> for Pallet<T> {
-		fn on_answer(feed_id: FeedIdFor<T>, _: RoundData<T::BlockNumber, FeedValueFor<T>>) {
-			LatestAnswerTimestamp::<T>::insert(feed_id, T::Time::now());
-		}
-	}
-
 	/// Trait for the asset-index pallet extrinsic weights.
 	pub trait WeightInfo {
 		fn map_asset_price_feed() -> Weight;