Ethereum compatibility

Cargo.toml

@@ -92,6 +92,7 @@ scale-info = { version = "2.11.3", default-features = false, features = [
 ] }
 jsonrpsee = { version = "0.22.5", features = ["server"] }
 hex-literal = "0.4.1"
+hex = { version = "0.4.3", default-features = false, features = ["alloc"] }
 serde = { version = "1.0.204", default-features = false }
 serde_json = "1.0.120"
 smallvec = "1.13.2"
@@ -103,6 +104,7 @@ array-bytes = { version = "6.2.3", default-features = false }
 serde-json-core = { version = '0.5.1', default-features = false }
 heapless = { version = "0.8", default-features = false }
 color-print = "0.3.6"
+k256 = { version = "0.13.4", default-features = false, features = ["ecdsa"] }
 
 # Emulations
 xcm-emulator = { version = "0.12.0", default-features = false }
@@ -125,7 +127,7 @@ sp-staking = { version = "33.0.0", default-features = false }
 # sp-runtime v38.0.1 takes out sp_std from runtime_string file and calls "alloc" directly which errors out
 sp-runtime = { version = "=38.0.0", default-features = false }
 sp-arithmetic = { version = "26.0.0", default-features = false }
-sp-core = { version = "34.0.0", default-features = false }
+sp-core = { version = "34.0.0", default-features = false, features = ["serde"] }
 sp-io = { version = "37.0.0", default-features = false }
 sp-blockchain = { version = "35.0.0", default-features = false }
 sp-consensus-aura = { version = "0.39.0", default-features = false }

integration-tests/Cargo.toml

@@ -82,6 +82,8 @@ pallet-session.workspace = true
 pallet-proxy-bonding.workspace = true
 pallet-skip-feeless-payment.workspace = true
 xcm-fee-payment-runtime-api.workspace = true
+hex-literal.workspace = true
+hex.workspace = true
 
 # Runtimes
 polkadot-runtime.workspace = true

integration-tests/src/lib.rs

@@ -15,12 +15,12 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 pub mod constants;
-
 #[cfg(test)]
 mod tests;
 
 pub use constants::{accounts::*, asset_hub, penpal, polimec, polkadot};
 pub use frame_support::{assert_noop, assert_ok, pallet_prelude::Weight, parameter_types, traits::Hooks};
+use macros::generate_accounts;
 pub use parachains_common::{AccountId, AssetHubPolkadotAuraId, AuraId, Balance, BlockNumber};
 pub use sp_core::{sr25519, storage::Storage, Encode, Get};
 pub use xcm::prelude::*;

integration-tests/src/tests/credentials.rs

@@ -16,7 +16,6 @@
 
 use crate::*;
 use frame_support::{assert_ok, dispatch::GetDispatchInfo, traits::tokens::currency::VestingSchedule};
-use macros::generate_accounts;
 use polimec_common::credentials::{Did, InvestorType};
 use polimec_common_test_utils::{get_fake_jwt, get_mock_jwt_with_cid, get_test_jwt};
 use polimec_runtime::PLMC;

integration-tests/src/tests/defaults.rs

@@ -17,8 +17,8 @@ use crate::PolimecRuntime;
 use frame_support::BoundedVec;
 pub use pallet_funding::instantiator::{BidParams, ContributionParams, UserToUSDBalance};
 use pallet_funding::{
-	AcceptedFundingAsset, BiddingTicketSizes, ContributingTicketSizes, CurrencyMetadata, ParticipationMode,
-	PriceProviderOf, ProjectMetadata, ProjectMetadataOf, TicketSize,
+	AcceptedFundingAsset, BiddingTicketSizes, ContributingTicketSizes, CurrencyMetadata, ParticipantsAccountType,
+	ParticipationMode, PriceProviderOf, ProjectMetadata, ProjectMetadataOf, TicketSize,
 };
 use sp_arithmetic::{FixedPointNumber, Percent};
 
@@ -88,6 +88,7 @@ pub fn default_project_metadata(issuer: AccountId) -> ProjectMetadataOf<polimec_
 		participation_currencies: vec![AcceptedFundingAsset::USDT].try_into().unwrap(),
 		funding_destination_account: issuer,
 		policy_ipfs_cid: Some(ipfs_hash()),
+		participants_account_type: ParticipantsAccountType::Polkadot,
 	}
 }
 pub fn default_evaluations() -> Vec<UserToUSDBalance<PolimecRuntime>> {

integration-tests/src/tests/e2e.rs

@@ -96,6 +96,7 @@ pub fn project_metadata() -> ProjectMetadataOf<PolimecRuntime> {
 		.unwrap(),
 		funding_destination_account: ISSUER.into(),
 		policy_ipfs_cid: Some(metadata_hash),
+		participants_account_type: ParticipantsAccountType::Polkadot,
 	}
 }
 

integration-tests/src/tests/ethereum_support.rs

@@ -0,0 +1 @@
+

integration-tests/src/tests/mod.rs

@@ -18,6 +18,7 @@ mod credentials;
 mod ct_migration;
 mod defaults;
 mod e2e;
+mod ethereum_support;
 mod evaluator_slash_sideffects;
 mod governance;
 mod oracle;

pallets/funding/Cargo.toml

@@ -45,6 +45,9 @@ polkadot-parachain-primitives.workspace = true
 sp-api.workspace = true
 polimec-common-test-utils = { workspace = true, optional = true }
 frame-benchmarking = { workspace = true, optional = true }
+hex-literal.workspace = true
+k256.workspace = true
+hex.workspace = true
 
 # Used in the instantiator.
 itertools.workspace = true
@@ -59,7 +62,7 @@ xcm-builder.workspace = true
 xcm-executor.workspace = true
 
 [features]
-default = [ "std" ]
+default = [ "std", "sp-core/serde" ]
 std = [
 	"frame-benchmarking?/std",
 	"frame-support/std",
@@ -90,6 +93,8 @@ std = [
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
+	"k256/std",
+	"hex/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",

pallets/funding/src/benchmarking.rs

@@ -81,6 +81,7 @@ where
 		participation_currencies: vec![AcceptedFundingAsset::USDT].try_into().unwrap(),
 		funding_destination_account: issuer,
 		policy_ipfs_cid: Some(metadata_hash.into()),
+		participants_account_type: ParticipantsAccountType::Polkadot,
 	}
 }
 
@@ -410,6 +411,7 @@ mod benchmarks {
 			participation_currencies: vec![AcceptedFundingAsset::USDT, AcceptedFundingAsset::USDC].try_into().unwrap(),
 			funding_destination_account: issuer_funding.clone().clone(),
 			policy_ipfs_cid: Some(BoundedVec::try_from(IPFS_CID.as_bytes().to_vec()).unwrap()),
+			participants_account_type: ParticipantsAccountType::Ethereum,
 		};
 
 		let jwt = get_mock_jwt_with_cid(

pallets/funding/src/functions/2_evaluation.rs

@@ -73,6 +73,7 @@ impl<T: Config> Pallet<T> {
 		usd_amount: Balance,
 		did: Did,
 		whitelisted_policy: Cid,
+		receiving_account: Junction,
 	) -> DispatchResultWithPostInfo {
 		// * Get variables *
 		let project_metadata = ProjectsMetadata::<T>::get(project_id).ok_or(Error::<T>::ProjectMetadataNotFound)?;
@@ -88,6 +89,7 @@ impl<T: Config> Pallet<T> {
 		let total_evaluations_count = EvaluationCounts::<T>::get(project_id);
 		let user_evaluations_count = Evaluations::<T>::iter_prefix((project_id, evaluator)).count() as u32;
 		let project_policy = project_metadata.policy_ipfs_cid.ok_or(Error::<T>::ImpossibleState)?;
+		let project_metadata = ProjectsMetadata::<T>::get(project_id).ok_or(Error::<T>::ProjectDetailsNotFound)?;
 
 		// * Validity Checks *
 		ensure!(project_policy == whitelisted_policy, Error::<T>::PolicyMismatch);
@@ -100,6 +102,10 @@ impl<T: Config> Pallet<T> {
 		);
 		ensure!(total_evaluations_count < T::MaxEvaluationsPerProject::get(), Error::<T>::TooManyProjectParticipations);
 		ensure!(user_evaluations_count < T::MaxEvaluationsPerUser::get(), Error::<T>::TooManyUserParticipations);
+		ensure!(
+			project_metadata.participants_account_type.junction_is_supported(&receiving_account),
+			Error::<T>::UnsupportedReceiverAccountJunction
+		);
 
 		let plmc_bond = plmc_usd_price
 			.reciprocal()
@@ -129,6 +135,7 @@ impl<T: Config> Pallet<T> {
 			early_usd_amount,
 			late_usd_amount,
 			when: now,
+			receiving_account,
 		};
 
 		T::NativeCurrency::hold(&HoldReason::Evaluation.into(), evaluator, plmc_bond)?;

pallets/funding/src/functions/3_auction.rs

@@ -46,8 +46,17 @@ impl<T: Config> Pallet<T> {
 	#[transactional]
 	pub fn do_bid(params: DoBidParams<T>) -> DispatchResultWithPostInfo {
 		// * Get variables *
-		let DoBidParams { bidder, project_id, ct_amount, mode, funding_asset, investor_type, did, whitelisted_policy } =
-			params;
+		let DoBidParams {
+			bidder,
+			project_id,
+			ct_amount,
+			mode,
+			funding_asset,
+			investor_type,
+			did,
+			whitelisted_policy,
+			receiving_account,
+		} = params;
 		let project_metadata = ProjectsMetadata::<T>::get(project_id).ok_or(Error::<T>::ProjectMetadataNotFound)?;
 		let project_details = ProjectsDetails::<T>::get(project_id).ok_or(Error::<T>::ProjectDetailsNotFound)?;
 
@@ -110,6 +119,10 @@ impl<T: Config> Pallet<T> {
 			Error::<T>::TooHigh
 		);
 		ensure!(existing_bids.len() < T::MaxBidsPerUser::get() as usize, Error::<T>::TooManyUserParticipations);
+		ensure!(
+			project_metadata.participants_account_type.junction_is_supported(&receiving_account),
+			Error::<T>::UnsupportedReceiverAccountJunction
+		);
 
 		// While there's a remaining amount to bid for
 		while !amount_to_bid.is_zero() {
@@ -135,6 +148,7 @@ impl<T: Config> Pallet<T> {
 				metadata_ticket_size_bounds,
 				total_bids_by_bidder: existing_bids_amount.saturating_add(perform_bid_calls),
 				total_bids_for_project: total_bids_for_project.saturating_add(perform_bid_calls),
+				receiving_account,
 			};
 			Self::do_perform_bid(perform_params)?;
 
@@ -169,6 +183,7 @@ impl<T: Config> Pallet<T> {
 			metadata_ticket_size_bounds,
 			total_bids_by_bidder,
 			total_bids_for_project,
+			receiving_account,
 		} = do_perform_bid_params;
 
 		let ticket_size = ct_usd_price.checked_mul_int(ct_amount).ok_or(Error::<T>::BadMath)?;
@@ -200,6 +215,7 @@ impl<T: Config> Pallet<T> {
 			mode,
 			plmc_bond,
 			when: now,
+			receiving_account,
 		};
 
 		Self::bond_plmc_with_mode(&bidder, project_id, plmc_bond, mode, funding_asset)?;

pallets/funding/src/functions/4_contribution.rs

@@ -13,6 +13,7 @@ impl<T: Config> Pallet<T> {
 			investor_type,
 			did,
 			whitelisted_policy,
+			receiving_account,
 		} = params;
 		let mut project_details = ProjectsDetails::<T>::get(project_id).ok_or(Error::<T>::ProjectDetailsNotFound)?;
 		let did_has_winning_bid = DidWithWinningBids::<T>::get(project_id, did.clone());
@@ -46,6 +47,7 @@ impl<T: Config> Pallet<T> {
 			investor_type,
 			did,
 			whitelisted_policy,
+			receiving_account,
 		};
 
 		Self::do_perform_contribution(perform_params)
@@ -63,6 +65,7 @@ impl<T: Config> Pallet<T> {
 			investor_type,
 			did,
 			whitelisted_policy,
+			receiving_account,
 		} = params;
 
 		let project_metadata = ProjectsMetadata::<T>::get(project_id).ok_or(Error::<T>::ProjectMetadataNotFound)?;
@@ -107,6 +110,10 @@ impl<T: Config> Pallet<T> {
 			contributor_ticket_size.usd_ticket_below_maximum_per_did(total_usd_bought_by_did + ticket_size),
 			Error::<T>::TooHigh
 		);
+		ensure!(
+			project_metadata.participants_account_type.junction_is_supported(&receiving_account),
+			Error::<T>::UnsupportedReceiverAccountJunction
+		);
 
 		let plmc_bond = Self::calculate_plmc_bond(ticket_size, multiplier)?;
 		let funding_asset_amount = Self::calculate_funding_asset_amount(ticket_size, funding_asset)?;
@@ -124,6 +131,7 @@ impl<T: Config> Pallet<T> {
 			funding_asset_amount,
 			plmc_bond,
 			when: now,
+			receiving_account,
 		};
 
 		// Try adding the new contribution to the system

pallets/funding/src/functions/6_settlement.rs

@@ -17,10 +17,7 @@ use polimec_common::{
 	migration_types::{MigrationInfo, MigrationOrigin, MigrationStatus, ParticipationType},
 	ReleaseSchedule,
 };
-use sp_runtime::{
-	traits::{Convert, Zero},
-	Perquintill,
-};
+use sp_runtime::{traits::Zero, Perquintill};
 
 impl<T: Config> Pallet<T> {
 	#[transactional]
@@ -140,6 +137,7 @@ impl<T: Config> Pallet<T> {
 				ParticipationType::Evaluation,
 				ct_rewarded,
 				duration,
+				evaluation.receiving_account,
 			)?;
 		}
 		Evaluations::<T>::remove((project_id, evaluation.evaluator.clone(), evaluation.id));
@@ -204,6 +202,7 @@ impl<T: Config> Pallet<T> {
 				ParticipationType::Bid,
 				final_ct_amount,
 				ct_vesting_duration,
+				bid.receiving_account,
 			)?;
 
 			Self::release_funding_asset(
@@ -310,6 +309,7 @@ impl<T: Config> Pallet<T> {
 				ParticipationType::Contribution,
 				contribution.ct_amount,
 				ct_vesting_duration,
+				contribution.receiving_account,
 			)?;
 
 			final_ct_amount = contribution.ct_amount;
@@ -484,10 +484,10 @@ impl<T: Config> Pallet<T> {
 		participation_type: ParticipationType,
 		ct_amount: Balance,
 		vesting_time: BlockNumberFor<T>,
+		receiving_account: Junction,
 	) -> DispatchResult {
 		UserMigrations::<T>::try_mutate((project_id, origin), |maybe_migrations| -> DispatchResult {
-			let location_user =
-				Location::new(0, AccountId32 { network: None, id: T::AccountId32Conversion::convert(origin.clone()) });
+			let location_user = Location::new(0, receiving_account);
 			let migration_origin = MigrationOrigin { user: location_user, id, participation_type };
 			let vesting_time: u64 = vesting_time.try_into().map_err(|_| Error::<T>::BadMath)?;
 			let migration_info: MigrationInfo = (ct_amount, vesting_time).into();