Use repatriate_reserved instead of unreserve + transfer (paritytech#195)

* Use repatriate_reserved instead of unreserve + transfer

* Remove deprecated stuffs

* Split out xp-assets-registrar

Use impl-trait-for-tuples crate

* Add some docs

* .

* Avoid allocation

* Add some docs

* Fix the vesting offset FIXME

* Add a test for vesting migration offset

* .

* Remove currently unused files in rpc

* Fix a bunch of clippy warnings

* Nits

Author: liuchengxu

Cargo.lock

@@ -21,6 +21,7 @@ members = [
     "primitives/runtime",
     "primitives/mining/common",
     "primitives/mining/staking",
+    "primitives/assets-registrar",
     "rpc",
 
     "frame/balances",

Cargo.toml

@@ -48,10 +48,3 @@ format: pre-format
 
 clean:
 	@cargo clean
-
-upgrade:
-	@echo "Upgrading substrate under native..."
-	cargo update -p srml-system
-	@echo
-	@echo "Upgrading substrate under wasm..."
-	cd runtime/wasm && cargo update -p srml-system

Makefile

@@ -358,7 +358,7 @@ fn testnet_genesis(
 
     // PCX only reserves the native asset id in assets module,
     // the actual native fund management is handled by pallet_balances.
-    let mut assets_endowed = endowed.clone();
+    let mut assets_endowed = endowed;
     assets_endowed.remove(&xpallet_protocol::PCX);
 
     let validators = initial_authorities
@@ -471,7 +471,6 @@ fn testnet_genesis(
                 100000,
                 true,
             )],
-            ..Default::default()
         }),
         xpallet_contracts: Some(XContractsConfig {
             current_schedule: ContractsSchedule {

cli/src/chain_spec.rs

@@ -8,10 +8,12 @@ fn read_config_file(path: &Path) -> Result<HashMap<String, Value>, Box<dyn std::
     let mut bytes = Vec::new();
     File::open(path)?.read_to_end(&mut bytes)?;
 
-    Ok(serde_json::from_slice(&bytes).expect(&format!(
-        "JSON was not well-formatted, please ensure {} is a valid JSON file.",
-        path.display()
-    )))
+    Ok(serde_json::from_slice(&bytes).unwrap_or_else(|_| {
+        panic!(
+            "JSON was not well-formatted, please ensure {} is a valid JSON file.",
+            path.display()
+        )
+    }))
 }
 
 /// Extends the origin cli arg list with the options from the config file.
@@ -83,7 +85,7 @@ pub fn preprocess_cli_args(cli_args: Vec<String>) -> Vec<String> {
                 .expect("The argument '--config <PATH>' requires a value but none was supplied");
             config_path = Some(path.to_string());
         } else if arg.starts_with("--config=") {
-            config_path = arg.split('=').skip(1).next().map(|s| s.to_string());
+            config_path = arg.split('=').nth(1).map(|s| s.to_string());
             assert!(config_path.is_some(), "missing PATH in --config=<PATH>");
         }
     }

cli/src/config.rs

@@ -42,7 +42,7 @@ fn parse_log_filters(log_filters: &str) -> (Vec<Directive>, Option<LevelFilter>)
         return (directives, None);
     }
 
-    mods.map(|m| {
+    if let Some(m) = mods {
         let print_warning =
             |v: &str| eprintln!("warning: invalid log_filters value '{}', ignoring it", v);
 
@@ -79,7 +79,7 @@ fn parse_log_filters(log_filters: &str) -> (Vec<Directive>, Option<LevelFilter>)
                 level: log_level,
             });
         }
-    });
+    }
 
     let mut filter_level = LevelFilter::Off;
     for d in directives.iter() {

cli/src/logger.rs

@@ -0,0 +1,19 @@
+[package]
+name = "xp-assets-registrar"
+version = "0.1.0"
+authors = ["ChainX community <https://www.chainx.org>"]
+edition = "2018"
+
+[dependencies]
+impl-trait-for-tuples = "0.1.3"
+
+frame-support = { version = "2.0.0-rc5", default-features = false }
+
+chainx-primitives = { path = "../../primitives", default-features = false }
+
+[features]
+default = ["std"]
+std = [
+    "frame-support/std",
+    "chainx-primitives/std",
+]

polkadotjs.md

@@ -0,0 +1,30 @@
+#![cfg_attr(not(feature = "std"), no_std)]
+
+use chainx_primitives::AssetId;
+use frame_support::dispatch::DispatchResult;
+
+/// Trait for doing some stuff on the registration/deregistration of a foreign asset.
+pub trait RegistrarHandler {
+    /// Called when a new asset is added or a deregistered asset is recovered.
+    fn on_register(_asset_id: &AssetId, _has_mining_rights: bool) -> DispatchResult {
+        Ok(())
+    }
+
+    /// Called when an asset is deregistered.
+    fn on_deregister(_asset_id: &AssetId) -> DispatchResult {
+        Ok(())
+    }
+}
+
+#[impl_trait_for_tuples::impl_for_tuples(30)]
+impl RegistrarHandler for Tuple {
+    fn on_register(asset_id: &AssetId, has_mining_rights: bool) -> DispatchResult {
+        for_tuples!( #( Tuple::on_register(asset_id, has_mining_rights)?; )* );
+        Ok(())
+    }
+
+    fn on_deregister(asset_id: &AssetId) -> DispatchResult {
+        for_tuples!( #( Tuple::on_deregister(asset_id)?; )* );
+        Ok(())
+    }
+}