Increase min contribution ticket

Cargo.toml

@@ -158,7 +158,6 @@ pallet-assets = { version = "36.0.0", default-features = false }
 pallet-authorship = { version = "35.0.0", default-features = false }
 pallet-session = { version = "35.0.0", default-features = false }
 pallet-timestamp = { version = "34.0.0", default-features = false }
-pallet-asset-tx-payment = { version = "35.0.0", default-features = false }
 pallet-collective = { version = "35.0.0", default-features = false }
 pallet-scheduler = { version = "36.0.0", default-features = false }
 pallet-sudo = { version = "35.0.0", default-features = false }
@@ -175,6 +174,7 @@ pallet-vesting = { version = "35.0.0", default-features = false }
 pallet-staking = { version = "35.0.0", default-features = false }
 pallet-proxy = { version = "35.0.0", default-features = false }
 pallet-identity = { version = "35.0.0", default-features = false }
+pallet-asset-tx-payment = { version = "35.0.0", default-features = false }
 
 # Polkadot (with default disabled)
 pallet-xcm = { version = "14.0.0", default-features = false }

bacon.toml

@@ -0,0 +1,101 @@
+# This is a configuration file for the bacon tool
+#
+# Bacon repository: https://github.com/Canop/bacon
+# Complete help on configuration: https://dystroy.org/bacon/config/
+# You can also check bacon's own bacon.toml file
+#  as an example: https://github.com/Canop/bacon/blob/main/bacon.toml
+
+default_job = "check"
+
+[jobs.check]
+command = ["cargo", "check", "--profile=test", "--workspace", "--color", "always"]
+need_stdout = false
+
+[jobs.check-all]
+command = ["cargo", "check", "--all-targets", "--color", "always"]
+need_stdout = false
+
+# Run clippy on the default target
+[jobs.clippy]
+command = [
+    "cargo", "clippy",
+    "--color", "always",
+]
+need_stdout = false
+
+# Run clippy on all targets
+# To disable some lints, you may change the job this way:
+#    [jobs.clippy-all]
+#    command = [
+#        "cargo", "clippy",
+#        "--all-targets",
+#        "--color", "always",
+#    	 "--",
+#    	 "-A", "clippy::bool_to_int_with_if",
+#    	 "-A", "clippy::collapsible_if",
+#    	 "-A", "clippy::derive_partial_eq_without_eq",
+#    ]
+# need_stdout = false
+[jobs.clippy-all]
+command = [
+    "cargo", "clippy",
+    "--all-targets",
+    "--color", "always",
+]
+need_stdout = false
+
+# This job lets you run
+# - all tests: bacon test
+# - a specific test: bacon test -- config::test_default_files
+# - the tests of a package: bacon test -- -- -p config
+[jobs.test]
+command = [
+    "cargo", "test", "--color", "always",
+    "--", "--color", "always", # see https://github.com/Canop/bacon/issues/124
+]
+need_stdout = true
+
+[jobs.doc]
+command = ["cargo", "doc", "--color", "always", "--no-deps"]
+need_stdout = false
+
+# If the doc compiles, then it opens in your browser and bacon switches
+# to the previous job
+[jobs.doc-open]
+command = ["cargo", "doc", "--color", "always", "--no-deps", "--open"]
+need_stdout = false
+on_success = "back" # so that we don't open the browser at each change
+
+# You can run your application and have the result displayed in bacon,
+# *if* it makes sense for this crate.
+# Don't forget the `--color always` part or the errors won't be
+# properly parsed.
+# If your program never stops (eg a server), you may set `background`
+# to false to have the cargo run output immediately displayed instead
+# of waiting for program's end.
+[jobs.run]
+command = [
+    "cargo", "run",
+    "--color", "always",
+    # put launch parameters for your program behind a `--` separator
+]
+need_stdout = true
+allow_warnings = true
+background = true
+
+# This parameterized job runs the example of your choice, as soon
+# as the code compiles.
+# Call it as
+#    bacon ex -- my-example
+[jobs.ex]
+command = ["cargo", "run", "--color", "always", "--example"]
+need_stdout = true
+allow_warnings = true
+
+# You may define here keybindings that would be specific to
+# a project, for example a shortcut to launch a specific job.
+# Shortcuts to internal functions (scrolling, toggling, etc.)
+# should go in your personal global prefs.toml file instead.
+[keybindings]
+# alt-m = "job:my-job"
+c = "job:clippy-all" # comment this to have 'c' run clippy on only the default target

integration-tests/Cargo.toml

@@ -75,13 +75,19 @@ pallet-democracy.workspace = true
 pallet-scheduler.workspace = true
 pallet-treasury.workspace = true
 frame-metadata-hash-extension.workspace = true
+pallet-asset-tx-payment.workspace = true
+sp-consensus-aura.workspace = true
+pallet-aura.workspace = true
+pallet-session.workspace = true
+pallet-proxy-bonding.workspace = true
 
 # Runtimes
 polkadot-runtime.workspace = true
 asset-hub-polkadot-runtime.workspace = true
 polimec-runtime.workspace = true
 penpal-runtime = { path = "penpal", default-features = false }
 
+
 [features]
 default = [ "development-settings", "instant-mode", "std" ]
 instant-mode = [ "polimec-runtime/instant-mode" ]
@@ -140,6 +146,10 @@ std = [
 	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
+	"pallet-asset-tx-payment/std",
+	"pallet-aura/std",
+	"pallet-session/std",
+	"sp-consensus-aura/std"
 ]
 development-settings = [ "polimec-runtime/development-settings" ]
 runtime-benchmarks = [
@@ -179,5 +189,6 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	"xcm-builder/runtime-benchmarks",
 	"xcm-executor/runtime-benchmarks",
+	"pallet-asset-tx-payment/runtime-benchmarks"
 ]
 

integration-tests/src/constants.rs

@@ -445,7 +445,7 @@ pub mod polimec {
 			let dot = (AcceptedFundingAsset::DOT.id(), prices.dot);
 			let usdc = (AcceptedFundingAsset::USDC.id(), prices.usdc);
 			let usdt = (AcceptedFundingAsset::USDT.id(), prices.usdt);
-			let plmc = (pallet_funding::PLMC_FOREIGN_ID, prices.plmc);
+			let plmc = (polimec_common::PLMC_FOREIGN_ID, prices.plmc);
 
 			let values: BoundedVec<(u32, FixedU128), <PolimecRuntime as orml_oracle::Config>::MaxFeedValues> =
 				vec![dot, usdc, usdt, plmc].try_into().expect("benchmarks can panic");
@@ -501,28 +501,30 @@ pub mod polimec {
 
 		funded_accounts.extend(accounts::init_balances().iter().cloned().map(|k| (k, INITIAL_DEPOSIT)));
 		funded_accounts.extend(collators::initial_authorities().iter().cloned().map(|(acc, _)| (acc, 20_005 * PLMC)));
-		funded_accounts.push((TreasuryAccount::get(), 20_005 * PLMC));
+		funded_accounts.push((TreasuryAccount::get(), 20_000_000 * PLMC));
 		funded_accounts.push((BlockchainOperationTreasury::get(), 20_005 * PLMC));
+		// Treasury account needs PLMC for the One Token Model participations
+		funded_accounts.push((polimec_runtime::FeeRecipient::get(), INITIAL_DEPOSIT));
 
 		let genesis_config = polimec_runtime::RuntimeGenesisConfig {
 			system: Default::default(),
 			balances: polimec_runtime::BalancesConfig { balances: funded_accounts },
 			contribution_tokens: Default::default(),
 			foreign_assets: polimec_runtime::ForeignAssetsConfig {
 				assets: vec![
-					(dot_asset_id, alice_account.clone(), true, 0_0_010_000_000u128),
-					(usdt_asset_id, alice_account.clone(), true, 0_0_010_000_000u128),
-					(usdc_asset_id, alice_account.clone(), true, 0_0_010_000_000u128),
+					(dot_asset_id, alice_account.clone(), true, 100_000_000),
+					(usdt_asset_id, alice_account.clone(), true, 70_000),
+					(usdc_asset_id, alice_account.clone(), true, 70_000),
 				],
 				metadata: vec![
 					(dot_asset_id, "Local DOT".as_bytes().to_vec(), "DOT".as_bytes().to_vec(), 10),
 					(usdt_asset_id, "Local USDT".as_bytes().to_vec(), "USDT".as_bytes().to_vec(), 6),
 					(usdc_asset_id, "Local USDC".as_bytes().to_vec(), "USDC".as_bytes().to_vec(), 6),
 				],
 				accounts: vec![
-					(dot_asset_id, TreasuryAccount::get(), 0_0_010_000_000u128),
-					(usdt_asset_id, TreasuryAccount::get(), 0_0_010_000_000u128),
-					(usdc_asset_id, TreasuryAccount::get(), 0_0_010_000_000u128),
+					// (dot_asset_id, TreasuryAccount::get(), 100_000_000),
+					// (usdt_asset_id, TreasuryAccount::get(), 70_000),
+					// (usdc_asset_id, TreasuryAccount::get(), 70_000),
 				],
 			},
 			parachain_info: polimec_runtime::ParachainInfoConfig { parachain_id: PARA_ID.into(), ..Default::default() },

integration-tests/src/tests/credentials.rs

@@ -15,17 +15,13 @@
 // along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 use crate::*;
-use frame_support::{assert_err, assert_ok, dispatch::GetDispatchInfo, traits::tokens::currency::VestingSchedule};
+use frame_support::{assert_ok, dispatch::GetDispatchInfo, traits::tokens::currency::VestingSchedule};
 use macros::generate_accounts;
+use pallet_funding::ParticipationMode::{Classic, OTM};
 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;
-use sp_runtime::{
-	generic::Era,
-	traits::SignedExtension,
-	transaction_validity::{InvalidTransaction::Payment, TransactionValidityError},
-	AccountId32, DispatchError,
-};
+use sp_runtime::{generic::Era, traits::SignedExtension, AccountId32, DispatchError};
 use tests::defaults::*;
 
 #[test]
@@ -78,20 +74,16 @@ fn dispenser_signed_extensions_pass_for_new_account() {
 			frame_system::CheckEra::<PolimecRuntime>::from(Era::mortal(0u64, 0u64)),
 			pallet_dispenser::extensions::CheckNonce::<PolimecRuntime>::from(0u32),
 			frame_system::CheckWeight::<PolimecRuntime>::new(),
-			pallet_transaction_payment::ChargeTransactionPayment::<PolimecRuntime>::from(0u64.into()).into(),
+			pallet_asset_tx_payment::ChargeAssetTxPayment::<PolimecRuntime>::from(0u64.into(), None).into(),
 			frame_metadata_hash_extension::CheckMetadataHash::<PolimecRuntime>::new(true),
 		);
-		assert_err!(
-			extra.validate(&who, &paid_call, &paid_call.get_dispatch_info(), 0),
-			TransactionValidityError::Invalid(Payment)
-		);
-		assert_err!(
-			extra.clone().pre_dispatch(&who, &paid_call, &paid_call.get_dispatch_info(), 0),
-			TransactionValidityError::Invalid(Payment)
-		);
 
-		assert_ok!(extra.validate(&who, &free_call, &free_call.get_dispatch_info(), 0));
-		assert_ok!(extra.pre_dispatch(&who, &free_call, &free_call.get_dispatch_info(), 0));
+		// `InitialPayment` struct from pallet_asset_tx_payment doesn't implement Debug and PartialEq to compare to a specific Error or use assert_ok!
+		assert!(extra.validate(&who, &paid_call, &paid_call.get_dispatch_info(), 0).is_err());
+		assert!(extra.clone().pre_dispatch(&who, &paid_call, &paid_call.get_dispatch_info(), 0).is_err());
+
+		assert!(extra.validate(&who, &free_call, &free_call.get_dispatch_info(), 0).is_ok());
+		assert!(extra.pre_dispatch(&who, &free_call, &free_call.get_dispatch_info(), 0).is_ok());
 	});
 }
 

integration-tests/src/tests/defaults.rs

@@ -17,15 +17,16 @@ use crate::PolimecRuntime;
 use frame_support::BoundedVec;
 pub use pallet_funding::instantiator::{BidParams, ContributionParams, UserToUSDBalance};
 use pallet_funding::{
-	AcceptedFundingAsset, BiddingTicketSizes, ContributingTicketSizes, CurrencyMetadata, PriceProviderOf,
-	ProjectMetadata, ProjectMetadataOf, TicketSize,
+	AcceptedFundingAsset, BiddingTicketSizes, ContributingTicketSizes, CurrencyMetadata, ParticipationMode,
+	PriceProviderOf, ProjectMetadata, ProjectMetadataOf, TicketSize,
 };
 use sp_arithmetic::{FixedPointNumber, Percent};
 
 use macros::generate_accounts;
 use polimec_common::{ProvideAssetPrice, USD_DECIMALS, USD_UNIT};
 use polimec_runtime::{AccountId, PLMC};
 use sp_runtime::{traits::ConstU32, Perquintill};
+use ParticipationMode::{Classic, OTM};
 
 pub const IPFS_CID: &str = "QmeuJ24ffwLAZppQcgcggJs3n689bewednYkuc8Bx5Gngz";
 pub const CT_DECIMALS: u8 = 18;
@@ -54,11 +55,11 @@ pub fn ipfs_hash() -> BoundedVec<u8, ConstU32<96>> {
 pub fn default_weights() -> Vec<u8> {
 	vec![20u8, 15u8, 10u8, 25u8, 30u8]
 }
-pub fn default_bidder_multipliers() -> Vec<u8> {
-	vec![1u8, 6u8, 10u8, 8u8, 3u8]
+pub fn default_bidder_modes() -> Vec<ParticipationMode> {
+	vec![Classic(1u8), Classic(6u8), OTM, OTM, Classic(3u8)]
 }
-pub fn default_contributor_multipliers() -> Vec<u8> {
-	vec![1u8, 1u8, 1u8, 1u8, 1u8]
+pub fn default_contributor_modes() -> Vec<ParticipationMode> {
+	vec![Classic(1u8), Classic(1u8), OTM, OTM, Classic(3u8)]
 }
 
 pub fn default_project_metadata(issuer: AccountId) -> ProjectMetadataOf<polimec_runtime::Runtime> {
@@ -79,9 +80,9 @@ pub fn default_project_metadata(issuer: AccountId) -> ProjectMetadataOf<polimec_
 			phantom: Default::default(),
 		},
 		contributing_ticket_sizes: ContributingTicketSizes {
-			retail: TicketSize::new(USD_UNIT, None),
-			professional: TicketSize::new(USD_UNIT, None),
-			institutional: TicketSize::new(USD_UNIT, None),
+			retail: TicketSize::new(10 * USD_UNIT, None),
+			professional: TicketSize::new(10 * USD_UNIT, None),
+			institutional: TicketSize::new(10 * USD_UNIT, None),
 			phantom: Default::default(),
 		},
 		participation_currencies: vec![AcceptedFundingAsset::USDT].try_into().unwrap(),
@@ -113,7 +114,7 @@ pub fn default_bids() -> Vec<BidParams<PolimecRuntime>> {
 		default_metadata.minimum_price,
 		default_weights(),
 		default_bidders(),
-		default_bidder_multipliers(),
+		default_bidder_modes(),
 	)
 }
 
@@ -134,7 +135,7 @@ pub fn default_community_contributions() -> Vec<ContributionParams<PolimecRuntim
 		default_metadata.minimum_price,
 		default_weights(),
 		default_community_contributors(),
-		default_contributor_multipliers(),
+		default_contributor_modes(),
 	)
 }
 
@@ -157,7 +158,7 @@ pub fn default_remainder_contributions() -> Vec<ContributionParams<PolimecRuntim
 		default_metadata.minimum_price,
 		vec![20u8, 15u8, 10u8, 25u8, 23u8, 7u8],
 		default_remainder_contributors(),
-		vec![1u8, 1u8, 1u8, 1u8, 1u8, 1u8],
+		default_contributor_modes(),
 	)
 }
 pub fn default_community_contributors() -> Vec<AccountId> {