Chore/merge 3.0 into develop (#211)

* Use a StoredMap to indicate the existence of generic asset accounts to other pallets through frame_system::Module (#182)

* Add asset info extra field for existential_deposit (#184)

* Add asset info extra field for existential_deposit

* create asset with zero existential deposit should fail

* Implement existential deposit for generic asset (#186)

* Keep trace of assets' significance for account ids and do purge accounts if the policy says so

* Purge assets individually as soon as they become insignificant

* Move imbalance handling of dust cleaning out of generic asset.

* By querying the system module itself, Test the accounts are actually added to the system module

* Add a flag to accounts that separates the existence of an account from its set of existing assets

* Add Generic Asset migration logic and test it

* Prevent an account to be reaped from the system module at this stage

* Feature/185 ga locks (#192)

* Key locks by asset id

* Improve the test for locked assets

* Add storage migration logic and test it

* Fix and improve ensure_can_withdraw and add a test for it

* Fix minimum_balance of MultiCurrencyAccounting and Currency for GA (#197)

Fix minimum_balance of MultiCurrencyAccounting and Currency for GA to return the existential deposit of the relevant asset

* Add use for Vec (#198)

It turns out when using prml-generic-asset in cennznet, the vec that is used in the migration logic should be specified explicitly.

* For a plug node, replace pallet_balances with generic_asset. (#205)

* For a plug node, replace pallet_balances with generic_asset.

* Update benchmarked weights

* Fix benchmark tests according to the recent change in setting total_issuance

Author: aliX

Cargo.lock

@@ -82,13 +82,13 @@ pallet-indices = { version = "3.0.0", path = "../../../frame/indices" }
 pallet-timestamp = { version = "3.0.0", default-features = false, path = "../../../frame/timestamp" }
 pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
 frame-system = { version = "3.0.0", path = "../../../frame/system" }
-pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
 pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
 frame-support = { version = "3.0.0", default-features = false, path = "../../../frame/support" }
 pallet-im-online = { version = "3.0.0", default-features = false, path = "../../../frame/im-online" }
 pallet-authority-discovery = { version = "3.0.0", path = "../../../frame/authority-discovery" }
 pallet-staking = { version = "3.0.0", path = "../../../frame/staking" }
 pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
+prml-generic-asset = { version = "3.0.0", path = "../../../prml/generic-asset" }
 
 # node-specific dependencies
 node-runtime = { version = "2.0.0", path = "../runtime" }

bin/node/cli/Cargo.toml

@@ -22,19 +22,20 @@ use sc_chain_spec::ChainSpecExtension;
 use sp_core::{Pair, Public, crypto::UncheckedInto, sr25519};
 use serde::{Serialize, Deserialize};
 use node_runtime::{
-	AuthorityDiscoveryConfig, BabeConfig, BalancesConfig, ContractsConfig, CouncilConfig,
+	AuthorityDiscoveryConfig, BabeConfig, GenericAssetConfig, ContractsConfig, CouncilConfig,
 	DemocracyConfig,GrandpaConfig, ImOnlineConfig, SessionConfig, SessionKeys, StakerStatus,
 	StakingConfig, ElectionsConfig, IndicesConfig, SocietyConfig, SudoConfig, SystemConfig,
 	TechnicalCommitteeConfig, wasm_binary_unwrap,
 };
 use node_runtime::Block;
-use node_runtime::constants::currency::*;
+use node_runtime::constants::{asset::*, currency::*};
 use sc_service::ChainType;
 use hex_literal::hex;
 use sc_telemetry::TelemetryEndpoints;
 use grandpa_primitives::{AuthorityId as GrandpaId};
 use sp_consensus_babe::{AuthorityId as BabeId};
 use pallet_im_online::sr25519::{AuthorityId as ImOnlineId};
+use prml_generic_asset::AssetInfo;
 use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 use sp_runtime::{Perbill, traits::{Verify, IdentifyAccount}};
 
@@ -250,14 +251,24 @@ pub fn testnet_genesis(
 			code: wasm_binary_unwrap().to_vec(),
 			changes_trie_config: Default::default(),
 		}),
-		pallet_balances: Some(BalancesConfig {
-			balances: endowed_accounts.iter().cloned()
-				.map(|x| (x, ENDOWMENT))
-				.collect()
-		}),
 		pallet_indices: Some(IndicesConfig {
 			indices: vec![],
 		}),
+		prml_generic_asset: Some(GenericAssetConfig {
+			assets: vec![PLUG_ASSET_ID,],
+			// Grant root key full permissions (mint,burn,update) on the following assets
+			permissions: vec![
+				(PLUG_ASSET_ID, endowed_accounts[0].clone()),
+			],
+			initial_balance: ENDOWMENT,
+			endowed_accounts: endowed_accounts.clone(),
+			next_asset_id: NEXT_ASSET_ID,
+			staking_asset_id: STAKING_ASSET_ID,
+			spending_asset_id: SPENDING_ASSET_ID,
+			asset_meta: vec![
+				(PLUG_ASSET_ID, AssetInfo::new(b"PLUG".to_vec(), 4, 1)),
+			],
+		}),
 		pallet_session: Some(SessionConfig {
 			keys: initial_authorities.iter().map(|x| {
 				(x.0.clone(), x.0.clone(), session_keys(

bin/node/cli/src/chain_spec.rs

@@ -487,7 +487,7 @@ mod tests {
 		Environment, Proposer, BlockImportParams, BlockOrigin, ForkChoiceStrategy, BlockImport,
 	};
 	use node_primitives::{Block, DigestItem, Signature};
-	use node_runtime::{BalancesCall, Call, UncheckedExtrinsic, Address};
+	use node_runtime::{Call, GenericAsset, GenericAssetCall, UncheckedExtrinsic, Address};
 	use node_runtime::constants::{currency::CENTS, time::SLOT_DURATION};
 	use codec::Encode;
 	use sp_core::{
@@ -650,7 +650,7 @@ mod tests {
 			},
 			|service, _| {
 				let amount = 5 * CENTS;
-				let to: Address = AccountPublic::from(bob.public()).into_account().into();
+				let to = AccountPublic::from(bob.public()).into_account();
 				let from: Address = AccountPublic::from(charlie.public()).into_account().into();
 				let genesis_hash = service.client().block_hash(0).unwrap().unwrap();
 				let best_block_id = BlockId::number(service.client().chain_info().best_number);
@@ -660,7 +660,11 @@ mod tests {
 				};
 				let signer = charlie.clone();
 
-				let function = Call::Balances(BalancesCall::transfer(to.into(), amount));
+				let function = Call::GenericAsset(GenericAssetCall::transfer(
+					GenericAsset::spending_asset_id(),
+					to,
+					amount,
+				));
 
 				let check_spec_version = frame_system::CheckSpecVersion::new();
 				let check_tx_version = frame_system::CheckTxVersion::new();

bin/node/cli/src/service.rs

@@ -29,7 +29,6 @@ criterion = "0.3.0"
 frame-support = { version = "3.0.0", path = "../../../frame/support" }
 frame-system = { version = "3.0.0", path = "../../../frame/system" }
 node-testing = { version = "2.0.0", path = "../testing" }
-pallet-balances = { version = "3.0.0", path = "../../../frame/balances" }
 pallet-contracts = { version = "3.0.0", path = "../../../frame/contracts" }
 pallet-grandpa = { version = "3.0.0", path = "../../../frame/grandpa" }
 pallet-im-online = { version = "3.0.0", path = "../../../frame/im-online" }
@@ -38,6 +37,7 @@ pallet-session = { version = "3.0.0", path = "../../../frame/session" }
 pallet-timestamp = { version = "3.0.0", path = "../../../frame/timestamp" }
 pallet-transaction-payment = { version = "3.0.0", path = "../../../frame/transaction-payment" }
 pallet-treasury = { version = "3.0.0", path = "../../../frame/treasury" }
+prml-generic-asset = { version = "3.0.0", path = "../../../prml/generic-asset" }
 sp-application-crypto = { version = "3.0.0", path = "../../../primitives/application-crypto" }
 sp-consensus-babe = { version = "0.9.0", path = "../../../primitives/consensus/babe" }
 sp-runtime = { version = "3.0.0", path = "../../../primitives/runtime" }

bin/node/executor/Cargo.toml

@@ -20,7 +20,8 @@ use criterion::{BatchSize, Criterion, criterion_group, criterion_main};
 use node_executor::Executor;
 use node_primitives::{BlockNumber, Hash};
 use node_runtime::{
-	Block, BuildStorage, Call, CheckedExtrinsic, GenesisConfig, Header, UncheckedExtrinsic,
+	Block, BuildStorage, Call, CheckedExtrinsic, GenericAsset, GenericAssetCall, GenesisConfig,
+	Header, UncheckedExtrinsic,
 };
 use node_runtime::constants::currency::*;
 use node_testing::keyring::*;
@@ -153,7 +154,11 @@ fn test_blocks(genesis_config: &GenesisConfig, executor: &NativeExecutor<Executo
 	block1_extrinsics.extend((0..20).map(|i| {
 		CheckedExtrinsic {
 			signed: Some((alice(), signed_extra(i, 0))),
-			function: Call::Balances(pallet_balances::Call::transfer(bob().into(), 1 * DOLLARS)),
+			function: Call::GenericAsset(GenericAssetCall::transfer(
+				GenericAsset::spending_asset_id(),
+				bob(),
+				1 * DOLLARS,
+			)),
 		}
 	}));
 	let block1 = construct_block(