WETH Oracle support (#429)

## What?
- Add price fetchers for ETH, used for WETH

## Why?
- Needed to support AssetHub WETH as a funding currency

## How?
- Do some changes to each fetcher logic like new serde macros, and adding the new API endpoint to WETH

## Testing?
- Added to the rest of the tests inside the oracle pallet

integration-tests/src/tests/oracle.rs

@@ -15,23 +15,27 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use crate::*;
+use pallet_funding::AcceptedFundingAsset;
 /// Tests for the oracle pallet integration.
 /// Alice, Bob, Charlie are members of the OracleProvidersMembers.
 /// Only members should be able to feed data into the oracle.
 use parity_scale_codec::alloc::collections::HashMap;
+use polimec_common::PLMC_FOREIGN_ID;
 use polimec_runtime::{Oracle, RuntimeOrigin};
 use sp_runtime::{bounded_vec, BoundedVec, FixedU128};
 use tests::defaults::*;
 
+use AcceptedFundingAsset::{DOT, USDC, USDT, WETH};
 fn values(
-	values: [f64; 4],
+	values: [f64; 5],
 ) -> BoundedVec<(u32, FixedU128), <polimec_runtime::Runtime as orml_oracle::Config<()>>::MaxFeedValues> {
-	let [dot, usdc, usdt, plmc] = values;
+	let [dot, usdc, usdt, weth, plmc] = values;
 	bounded_vec![
-		(10u32, FixedU128::from_float(dot)),
-		(1337u32, FixedU128::from_float(usdc)),
-		(1984u32, FixedU128::from_float(usdt)),
-		(3344u32, FixedU128::from_float(plmc))
+		(DOT.id(), FixedU128::from_float(dot)),
+		(USDC.id(), FixedU128::from_float(usdc)),
+		(USDT.id(), FixedU128::from_float(usdt)),
+		(WETH.id(), FixedU128::from_float(weth)),
+		(PLMC_FOREIGN_ID, FixedU128::from_float(plmc))
 	]
 }
 
@@ -43,19 +47,20 @@ fn members_can_feed_data() {
 		// pallet_funding genesis builder already inputs prices, so we need to advance one block to feed new values.
 		inst.advance_time(1u32);
 		let alice = PolimecNet::account_id_of(ALICE);
-		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(alice.clone()), values([4.84, 1.0, 1.0, 0.4])));
+		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(alice.clone()), values([4.84, 1.0, 1.0, 2500.0, 0.4])));
 
 		let bob = PolimecNet::account_id_of(BOB);
-		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(bob.clone()), values([4.84, 1.0, 1.0, 0.4])));
+		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(bob.clone()), values([4.84, 1.0, 1.0, 2500.0, 0.4])));
 
 		let charlie = PolimecNet::account_id_of(CHARLIE);
-		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(charlie.clone()), values([4.84, 1.0, 1.0, 0.4])));
+		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(charlie.clone()), values([4.84, 1.0, 1.0, 2500.0, 0.4])));
 
 		let expected_values = HashMap::from([
-			(10u32, FixedU128::from_float(4.84)),
-			(1337u32, FixedU128::from_float(1.0)),
-			(1984u32, FixedU128::from_float(1.0)),
-			(3344u32, FixedU128::from_float(0.4)),
+			(DOT.id(), FixedU128::from_float(4.84)),
+			(USDC.id(), FixedU128::from_float(1.0)),
+			(USDT.id(), FixedU128::from_float(1.0)),
+			(WETH.id(), FixedU128::from_float(2500.0)),
+			(PLMC_FOREIGN_ID, FixedU128::from_float(0.4)),
 		]);
 
 		for (key, value) in Oracle::get_all_values() {
@@ -70,7 +75,7 @@ fn non_members_cannot_feed_data() {
 	PolimecNet::execute_with(|| {
 		let dave = PolimecNet::account_id_of(DAVE);
 		assert_noop!(
-			Oracle::feed_values(RuntimeOrigin::signed(dave.clone()), values([4.84, 1.0, 1.0, 0.4])),
+			Oracle::feed_values(RuntimeOrigin::signed(dave.clone()), values([4.84, 1.0, 1.0, 2500.0, 0.4])),
 			orml_oracle::Error::<polimec_runtime::Runtime, ()>::NoPermission
 		);
 	});
@@ -84,20 +89,24 @@ fn data_is_correctly_combined() {
 		inst.advance_time(1u32);
 
 		let alice = PolimecNet::account_id_of(ALICE);
-		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(alice.clone()), values([1.0, 1.5, 1.1, 0.11111])));
+		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(alice.clone()), values([1.0, 1.5, 1.1, 2500.0, 0.11111])));
 
 		let bob = PolimecNet::account_id_of(BOB);
-		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(bob.clone()), values([2.0, 1.0, 1.2, 0.22222])));
+		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(bob.clone()), values([2.0, 1.0, 1.2, 2500.0, 0.22222])));
 
 		let charlie = PolimecNet::account_id_of(CHARLIE);
-		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(charlie.clone()), values([3.0, 0.8, 1.1, 0.33333])));
+		assert_ok!(Oracle::feed_values(
+			RuntimeOrigin::signed(charlie.clone()),
+			values([3.0, 0.8, 1.1, 2500.0, 0.33333])
+		));
 
 		// Default CombineData implementation is the median value
 		let expected_values = HashMap::from([
-			(10u32, FixedU128::from_float(2.0)),
-			(1337u32, FixedU128::from_float(1.0)),
-			(1984u32, FixedU128::from_float(1.1)),
-			(3344u32, FixedU128::from_float(0.22222)),
+			(DOT.id(), FixedU128::from_float(2.0)),
+			(USDC.id(), FixedU128::from_float(1.0)),
+			(USDT.id(), FixedU128::from_float(1.1)),
+			(WETH.id(), FixedU128::from_float(2500.0)),
+			(PLMC_FOREIGN_ID, FixedU128::from_float(0.22222)),
 		]);
 
 		for (key, value) in Oracle::get_all_values() {
@@ -116,13 +125,13 @@ fn pallet_funding_works() {
 		inst.advance_time(1u32);
 
 		let alice = PolimecNet::account_id_of(ALICE);
-		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(alice.clone()), values([4.84, 1.0, 1.0, 0.4])));
+		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(alice.clone()), values([4.84, 1.0, 1.0, 2500.0, 0.4])));
 
 		let bob = PolimecNet::account_id_of(BOB);
-		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(bob.clone()), values([4.84, 1.0, 1.0, 0.4])));
+		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(bob.clone()), values([4.84, 1.0, 1.0, 2500.0, 0.4])));
 
 		let charlie = PolimecNet::account_id_of(CHARLIE);
-		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(charlie.clone()), values([4.84, 1.0, 1.0, 0.4])));
+		assert_ok!(Oracle::feed_values(RuntimeOrigin::signed(charlie.clone()), values([4.84, 1.0, 1.0, 2500.0, 0.4])));
 
 		let _project_id = inst.create_finished_project(
 			default_project_metadata(ISSUER.into()),

nodes/parachain/src/chain_spec/common.rs

@@ -12,7 +12,10 @@ use polimec_runtime::{
 	AccountId, AuraId as AuthorityId, Balance, BlockchainOperationTreasury, ContributionTreasuryAccount,
 	ExistentialDeposit, FeeRecipient, OracleProvidersMembershipConfig, Runtime, TreasuryAccount, PLMC,
 };
-use sp_core::{crypto::UncheckedInto, sr25519};
+use sp_core::{
+	crypto::{Ss58AddressFormat, UncheckedInto},
+	sr25519,
+};
 use sp_runtime::{traits::AccountIdConversion, Perbill, Percent};
 
 pub type ChainSpec = sc_service::GenericChainSpec<Extensions>;
@@ -65,6 +68,11 @@ pub fn eve() -> polimec_runtime::AccountId {
 	get_account_id_from_seed::<sr25519::Public>("Eve")
 }
 
+pub fn acc_from_ss58(string: &str) -> polimec_runtime::AccountId {
+	use sp_core::crypto::Ss58Codec;
+	sp_core::sr25519::Public::from_ss58check(string).unwrap().into()
+}
+
 pub struct GenesisConfigParams {
 	pub stakers: Vec<AccountId>,
 	pub council_members: Vec<AccountId>,

nodes/parachain/src/chain_spec/polimec_paseo.rs

@@ -21,20 +21,32 @@
 use sc_service::ChainType;
 
 use crate::chain_spec::{
-	common::{alice, bob, charlie, dave, eve, genesis_config, GenesisConfigParams},
+	common::{acc_from_ss58, alice, bob, charlie, dave, eve, genesis_config, GenesisConfigParams},
 	get_properties, Extensions, GenericChainSpec, DEFAULT_PARA_ID,
 };
 use polimec_runtime::{AccountId, MinCandidateStk};
 
 pub fn get_local_chain_spec() -> GenericChainSpec {
-	let endowed_accounts = vec![alice(), bob(), charlie(), dave()];
+	let endowed_accounts = vec![
+		alice(),
+		bob(),
+		charlie(),
+		dave(),
+		acc_from_ss58("5Do5UoayFvDrHroGS1YMqxTVUysSkrhNwVMzmj1foVb3vzzb"),
+		acc_from_ss58("5E5E37FNZD9KVHyGgSHt8pc2kq8e3VUS5rf8GmrxCa7ySs8s"),
+		acc_from_ss58("5ELLzYckeuomgTnv4Pf1aT4itxu35cn1KWNCGcftzv5N2x7o"),
+	];
 	let endowed_accounts =
 		endowed_accounts.iter().map(|x| (x.clone(), MinCandidateStk::get() * 20)).collect::<Vec<_>>();
 	let genesis_config_params = GenesisConfigParams {
 		stakers: vec![alice(), bob()],
 		council_members: vec![alice()],
 		technical_committee_members: vec![alice()],
-		oracle_members: vec![alice(), bob(), charlie()],
+		oracle_members: vec![
+			acc_from_ss58("5Do5UoayFvDrHroGS1YMqxTVUysSkrhNwVMzmj1foVb3vzzb"),
+			acc_from_ss58("5E5E37FNZD9KVHyGgSHt8pc2kq8e3VUS5rf8GmrxCa7ySs8s"),
+			acc_from_ss58("5ELLzYckeuomgTnv4Pf1aT4itxu35cn1KWNCGcftzv5N2x7o"),
+		],
 		endowed_accounts,
 		funding_assets_owner: eve(),
 		id: DEFAULT_PARA_ID,

pallets/oracle-ocw/src/lib.rs

@@ -125,13 +125,16 @@ pub mod pallet {
 				let account = public.clone().into_account();
 				if <T as pallet::Config>::Members::contains(&account) {
 					if let Ok(generic_public) = TryInto::<GenericPublicOf<T>>::try_into(public) {
+						log::trace!(target: LOG_TARGET, "OCW is a member!");
+
 						return Some(generic_public.into());
 					}
 				}
 				None
 			});
 
 			if let Some(_authority_key) = maybe_key {
+				log::trace!(target: LOG_TARGET, "Executing Logic...");
 				let mut lock = StorageLock::<Time>::with_deadline(
 					b"oracle_ocw::lock",
 					Duration::from_millis(LOCK_TIMEOUT_EXPIRATION),
@@ -140,6 +143,8 @@ pub mod pallet {
 				// We try to acquire the lock here. If failed, we know another ocw
 				// is executing at the moment and exit this ocw.
 				if let Ok(_guard) = lock.try_lock() {
+					log::trace!(target: LOG_TARGET, "Acquired Lock");
+
 					let val = StorageValueRef::persistent(b"oracle_ocw::last_send");
 					let last_send_for_assets_result: Result<
 						Option<BTreeMap<AssetName, BlockNumberFor<T>>>,
@@ -152,27 +157,42 @@ pub mod pallet {
 							(AssetName::USDC, Zero::zero()),
 							(AssetName::DOT, Zero::zero()),
 							(AssetName::PLMC, Zero::zero()),
+							(AssetName::WETH, Zero::zero()),
 						]),
 					};
+					log::trace!(target: LOG_TARGET, "Last send for assets: {:?}", last_send_for_assets);
 
 					// Fix for missing PLMC in last_send_for_assets for old nodes, that did not have PLMC in the list.
 					last_send_for_assets.entry(AssetName::PLMC).or_insert_with(Zero::zero);
+					// Fix for missing WETH in last_send_for_assets for old nodes, that did not have PLMC in the list.
+					last_send_for_assets.entry(AssetName::WETH).or_insert_with(Zero::zero);
 
 					let assets = last_send_for_assets
 						.iter()
 						.filter_map(|(asset_name, last_send)| {
+							// The interval's window where we can submit new prices
 							let window = T::FetchWindow::get();
+
+							// Position of the current block inside the fetch interval
 							let remainder = block_number.rem(T::FetchInterval::get());
-							if remainder >= BlockNumberFor::<T>::zero() &&
-								remainder < window && last_send < &block_number.saturating_sub(window)
-							{
-								return Some(*asset_name);
+
+							// Condition 1: Is the current block inside the submission window?
+							let is_in_window = remainder < window;
+
+							// Condition 2: Has enough time passed since the asset's last send?
+							let is_outside_last_window = last_send <= &block_number.saturating_sub(window);
+
+							// Include the asset if both conditions are met
+							if is_in_window && is_outside_last_window {
+								Some(*asset_name)
+							} else {
+								None
 							}
-							None
 						})
-						.collect::<Vec<AssetName>>();
+							.collect::<Vec<AssetName>>();
 
 					if assets.is_empty() {
+						log::trace!(target: LOG_TARGET, "Assets to fetch list is empty :c");
 						return;
 					}