Marko/1.2.0 release (capsule-corp-ternoa#276)

* Added assets pallet * Added build_wasm script. * Addes assets to Mainnet benchmark list * Updated some of weights
omahs · Sep 23, 2022 · 99c3f44 · 99c3f44
1 parent dd0cf27
commit 99c3f44
Show file tree

Hide file tree

Showing 32 changed files with 2,170 additions and 1,938 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/service/src/chain_spec/mainnet.rs b/node/service/src/chain_spec/mainnet.rs
@@ -170,5 +170,6 @@ pub fn genesis(input: GenesisInput) -> GenesisConfig {
 		council: CouncilConfig { members: vec![], ..Default::default() },
 		democracy: Default::default(),
 		phragmen_election: Default::default(),
+		assets: Default::default(),
 	}
 }
diff --git a/runtime/alphanet/Cargo.toml b/runtime/alphanet/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "alphanet-runtime"
 authors = [ "Ternoa" ]
-version = "1.2.0"
+version = "1.2.1"
 edition = "2021"
 build = "build.rs"
 

diff --git a/runtime/alphanet/src/pallets.rs b/runtime/alphanet/src/pallets.rs
@@ -16,7 +16,6 @@
 
 use super::weights;
 use common::{
-	constants::currency::CAPS,
 	election_provider_multi_phase::BetterUnsignedThreshold,
 	staking::{BondingDuration, SessionsPerEra},
 	transaction_payment::TransactionByteFee,
@@ -677,27 +676,18 @@ impl ternoa_marketplace::Config for Runtime {
 	type AccountSizeLimit = AccountSizeLimit;
 }
 
-parameter_types! {
-	pub const AssetDeposit: u128 = 10_000 * CAPS;
-	pub const AssetAccountDeposit: u128 = 10 * CAPS;
-	pub const ApprovalDeposit: u128 = 100 * CAPS;
-	pub const StringLimit: u32 = 50;
-	pub const MetadataDepositBase: u128 = 100 * CAPS;
-	pub const MetadataDepositPerByte: u128 = 10 * CAPS;
-}
-
 impl pallet_assets::Config for Runtime {
 	type Event = Event;
 	type Balance = Balance;
 	type Currency = Balances;
 	type ForceOrigin = RootOrAtLeastHalfOfCommittee;
 	type AssetId = u32;
-	type AssetDeposit = AssetDeposit;
-	type AssetAccountDeposit = AssetAccountDeposit;
-	type MetadataDepositBase = MetadataDepositBase;
-	type MetadataDepositPerByte = MetadataDepositPerByte;
-	type ApprovalDeposit = ApprovalDeposit;
-	type StringLimit = StringLimit;
+	type AssetDeposit = common::assets::AssetDeposit;
+	type AssetAccountDeposit = common::assets::AssetAccountDeposit;
+	type MetadataDepositBase = common::assets::MetadataDepositBase;
+	type MetadataDepositPerByte = common::assets::MetadataDepositPerByte;
+	type ApprovalDeposit = common::assets::ApprovalDeposit;
+	type StringLimit = common::assets::StringLimit;
 	type Freezer = ();
 	type Extra = ();
 	type WeightInfo = weights::pallet_assets::WeightInfo<Runtime>;