Asset registry

Cargo.toml

@@ -5,6 +5,7 @@ members = [
 	"node/primitives",
 	"node/rpc",
 	"node/service",
+	"pallets/asset-registry",
 	"pallets/flexible-fee",
 	"pallets/lightening-redeem",
 	"pallets/liquidity-mining",

Makefile

@@ -98,7 +98,7 @@ build-bifrost-polkadot-wasm:
 
 .PHONY: build-bifrost-rococo-fast-wasm
 build-bifrost-rococo-fast-wasm:
-	.maintain/build-wasm.sh bifrost-kusama fast	
+	.maintain/build-wasm.sh bifrost-kusama fast
 
 .PHONY: check-try-runtime
 check-try-runtime:
@@ -124,7 +124,7 @@ insert-session-key:
 
 .PHONY: generate-node-key
 generate-node-key:
-	subkey generate-node-key --file ./resources/node-key	
+	subkey generate-node-key --file ./resources/node-key
 
 .PHONY: view-key
 view-key:

README.md

@@ -83,7 +83,7 @@ cd -
 ```bash
 git clone -n https://github.com/paritytech/polkadot.git /tmp/polkadot
 cd /tmp/polkadot
-git checkout release-v0.9.16
+git checkout release-v0.9.17
 cargo build --release
 cd -
 ```

integration-tests/src/integration_tests.rs

@@ -181,6 +181,8 @@ fn parachain_subaccounts_are_unique() {
 			hex_literal::hex!["70617261d1070000000000000000000000000000000000000000000000000000"]
 				.into()
 		);
+
+		assert_eq!(RelaychainSovereignSubAccount::get(), create_x2_multilocation(0));
 	});
 }
 

integration-tests/src/statemine.rs

@@ -25,6 +25,7 @@ use xcm_emulator::TestExt;
 use crate::{integration_tests::*, kusama_test_net::*};
 #[test]
 fn statemine() {
+	env_logger::init();
 	Statemine::execute_with(|| {
 		use frame_support::traits::Currency;
 		use westmint_runtime::*;

node/primitives/src/currency.rs

@@ -156,6 +156,7 @@ macro_rules! create_currency_id {
 					| Self::Stable(ts)
 					| Self::VSToken(ts)
 					| Self::VSBond(ts, ..) => ts as u8,
+					Self::ForeignAsset(..) => 0u8,
 					Self::LPToken(..) => 0u8
 				} as u64;
 
@@ -188,52 +189,56 @@ macro_rules! create_currency_id {
 					Self::LPToken(token_symbol_1, token_type_1, token_symbol_2, token_type_2) => {
 						(((*token_symbol_1 as u64) << 16) & 0x0000_0000_00ff_0000) + (((*token_type_1 as u64) << 24) & 0x0000_0000_ff00_0000) +
 						(((*token_symbol_2 as u64) << 32) & 0x0000_00ff_0000_0000) + (((*token_type_2 as u64) << 40) & 0x0000_ff00_0000_0000) + discr
+					},
+					Self::ForeignAsset(asset_token_id) => {
+						(((*asset_token_id as u64) << 16) & 0x0000_ffff_ffff_0000) + discr
 					}
 				}
 			}
 
-			fn name(&self) -> &str {
+			fn name(&self) -> Option<&str> {
 				match self {
-					$(CurrencyId::Native(TokenSymbol::$symbol) => $name,)*
-					$(CurrencyId::Stable(TokenSymbol::$symbol) => $name,)*
-					$(CurrencyId::Token(TokenSymbol::$symbol) => $name,)*
-					$(CurrencyId::VToken(TokenSymbol::$symbol) => $name,)*
-					$(CurrencyId::VSToken(TokenSymbol::$symbol) => $name,)*
-					$(CurrencyId::VSBond(TokenSymbol::$symbol, ..) => $name,)*
+					$(CurrencyId::Native(TokenSymbol::$symbol) => Some($name),)*
+					$(CurrencyId::Stable(TokenSymbol::$symbol) => Some($name),)*
+					$(CurrencyId::Token(TokenSymbol::$symbol) => Some($name),)*
+					$(CurrencyId::VToken(TokenSymbol::$symbol) => Some($name),)*
+					$(CurrencyId::VSToken(TokenSymbol::$symbol) => Some($name),)*
+					$(CurrencyId::VSBond(TokenSymbol::$symbol, ..) => Some($name),)*
 					CurrencyId::LPToken(ts1, type1, ts2, type2) => {
 						let c1_u64: u64 = (((*type1 as u64) << 8) & 0x0000_0000_0000_ff00) + ((*ts1 as u64) & 0x0000_0000_0000_00ff);
 						let c2_u64: u64 = (((*type2 as u64) << 8) & 0x0000_0000_0000_ff00) + ((*ts2 as u64) & 0x0000_0000_0000_00ff);
 
 						let _c1: CurrencyId = c1_u64.try_into().unwrap_or_default();
 						let _c2: CurrencyId = c2_u64.try_into().unwrap_or_default();
-						stringify!(_c1.name(), ",", _c2.name())
-					}
+						Some(stringify!(_c1.name(), ",", _c2.name()))
+					},
+					_ => None
 				}
 			}
 
-			fn symbol(&self) -> &str {
+			fn symbol(&self) -> Option<&str> {
 				match self {
-					$(CurrencyId::Native(TokenSymbol::$symbol) => stringify!($symbol),)*
-					$(CurrencyId::Stable(TokenSymbol::$symbol) => stringify!($symbol),)*
-					$(CurrencyId::Token(TokenSymbol::$symbol) => stringify!($symbol),)*
-					$(CurrencyId::VToken(TokenSymbol::$symbol) => stringify!($symbol),)*
-					$(CurrencyId::VSToken(TokenSymbol::$symbol) => stringify!($symbol),)*
-					$(CurrencyId::VSBond(TokenSymbol::$symbol, ..) => stringify!($symbol),)*
-					CurrencyId::LPToken(_ts1, _, _ts2, _) => {
-						stringify!(_ts1, ",", _ts2)
-					}
+					$(CurrencyId::Native(TokenSymbol::$symbol) => Some(stringify!($symbol)),)*
+					$(CurrencyId::Stable(TokenSymbol::$symbol) => Some(stringify!($symbol)),)*
+					$(CurrencyId::Token(TokenSymbol::$symbol) => Some(stringify!($symbol)),)*
+					$(CurrencyId::VToken(TokenSymbol::$symbol) => Some(stringify!($symbol)),)*
+					$(CurrencyId::VSToken(TokenSymbol::$symbol) => Some(stringify!($symbol)),)*
+					$(CurrencyId::VSBond(TokenSymbol::$symbol, ..) => Some(stringify!($symbol)),)*
+					CurrencyId::LPToken(_ts1, _, _ts2, _) => Some(stringify!(_ts1, ",", _ts2)),
+					_ => None
 				}
 			}
 
-			fn decimals(&self) -> u8 {
+			fn decimals(&self) -> Option<u8> {
 				match self {
-					$(CurrencyId::Native(TokenSymbol::$symbol) => $deci,)*
-					$(CurrencyId::Stable(TokenSymbol::$symbol) => $deci,)*
-					$(CurrencyId::Token(TokenSymbol::$symbol) => $deci,)*
-					$(CurrencyId::VToken(TokenSymbol::$symbol) => $deci,)*
-					$(CurrencyId::VSToken(TokenSymbol::$symbol) => $deci,)*
-					$(CurrencyId::VSBond(TokenSymbol::$symbol, ..) => $deci,)*
-					CurrencyId::LPToken(..) => 1u8
+					$(CurrencyId::Native(TokenSymbol::$symbol) => Some($deci),)*
+					$(CurrencyId::Stable(TokenSymbol::$symbol) => Some($deci),)*
+					$(CurrencyId::Token(TokenSymbol::$symbol) => Some($deci),)*
+					$(CurrencyId::VToken(TokenSymbol::$symbol) => Some($deci),)*
+					$(CurrencyId::VSToken(TokenSymbol::$symbol) => Some($deci),)*
+					$(CurrencyId::VSBond(TokenSymbol::$symbol, ..) => Some($deci),)*
+					CurrencyId::LPToken(..) => Some(1u8),
+					_ => None
 				}
 			}
 		}
@@ -280,6 +285,8 @@ impl Default for TokenSymbol {
 	}
 }
 
+pub type ForeignAssetId = u32;
+
 /// Currency ID, it might be extended with more variants in the future.
 #[derive(
 	Encode,
@@ -305,6 +312,7 @@ pub enum CurrencyId {
 	VSBond(TokenSymbol, ParaId, LeasePeriod, LeasePeriod),
 	// [currency1 Tokensymbol, currency1 TokenType, currency2 TokenSymbol, currency2 TokenType]
 	LPToken(TokenSymbol, u8, TokenSymbol, u8),
+	ForeignAsset(ForeignAssetId),
 }
 
 impl Default for CurrencyId {
@@ -368,6 +376,7 @@ impl CurrencyId {
 			Self::VSToken(..) => 4,
 			Self::VSBond(..) => 5,
 			Self::LPToken(..) => 6,
+			Self::ForeignAsset(..) => 7,
 		}
 	}
 }
@@ -403,6 +412,10 @@ impl CurrencyIdExt for CurrencyId {
 		matches!(self, CurrencyId::LPToken(..))
 	}
 
+	fn is_foreign_asset(&self) -> bool {
+		matches!(self, CurrencyId::ForeignAsset(..))
+	}
+
 	fn into(symbol: Self::TokenSymbol) -> Self {
 		CurrencyId::Token(symbol)
 	}
@@ -440,6 +453,10 @@ impl TryFrom<u64> for CurrencyId {
 
 				Ok(Self::LPToken(token_symbol_1, token_type_1, token_symbol_2, token_type_2))
 			},
+			7 => {
+				let foreign_asset_id = ((id & 0x0000_ffff_ffff_0000) >> 16) as ForeignAssetId;
+				Ok(Self::ForeignAsset(foreign_asset_id))
+			},
 			_ => Err(()),
 		}
 	}

node/primitives/src/lib.rs

@@ -38,7 +38,7 @@ mod tests;
 
 pub use crate::{
 	bridge::*,
-	currency::{CurrencyId, TokenSymbol},
+	currency::{CurrencyId, ForeignAssetId, TokenSymbol},
 	traits::*,
 };
 

node/primitives/src/tests.rs

@@ -135,6 +135,18 @@ fn currency_id_to_u64_should_work() {
 	assert_eq!(0x0000_0103_0002_0600, e61.currency_id());
 	assert_eq!(0x0000_0205_0104_0600, e62.currency_id());
 	assert_eq!(0x0000_0406_0300_0600, e63.currency_id());
+
+	let e70 = CurrencyId::ForeignAsset(0);
+	let e71 = CurrencyId::ForeignAsset(1);
+	let e72 = CurrencyId::ForeignAsset(255);
+	let e73 = CurrencyId::ForeignAsset(256);
+	let e74 = CurrencyId::ForeignAsset(ForeignAssetId::MAX);
+
+	assert_eq!(0x0000_0000_0000_0700, e70.currency_id());
+	assert_eq!(0x0000_0000_0001_0700, e71.currency_id());
+	assert_eq!(0x0000_0000_00ff_0700, e72.currency_id());
+	assert_eq!(0x0000_0000_0100_0700, e73.currency_id());
+	assert_eq!(0x0000_ffff_ffff_0700, e74.currency_id());
 }
 
 #[test]
@@ -245,4 +257,16 @@ fn u64_to_currency_id_should_work() {
 	assert_eq!(e61, CurrencyId::try_from(0x0000_0103_0002_0600).unwrap());
 	assert_eq!(e62, CurrencyId::try_from(0x0000_0205_0104_0600).unwrap());
 	assert_eq!(e63, CurrencyId::try_from(0x0000_0406_0300_0600).unwrap());
+
+	let e70 = CurrencyId::ForeignAsset(0);
+	let e71 = CurrencyId::ForeignAsset(1);
+	let e72 = CurrencyId::ForeignAsset(255);
+	let e73 = CurrencyId::ForeignAsset(256);
+	let e74 = CurrencyId::ForeignAsset(ForeignAssetId::MAX);
+
+	assert_eq!(e70, CurrencyId::try_from(0x0000_0000_0000_0700).unwrap());
+	assert_eq!(e71, CurrencyId::try_from(0x0000_0000_0001_0700).unwrap());
+	assert_eq!(e72, CurrencyId::try_from(0x0000_0000_00ff_0700).unwrap());
+	assert_eq!(e73, CurrencyId::try_from(0x0000_0000_0100_0700).unwrap());
+	assert_eq!(e74, CurrencyId::try_from(0x0000_ffff_ffff_0700).unwrap());
 }

node/primitives/src/traits.rs

@@ -31,13 +31,13 @@ use sp_runtime::{
 };
 use sp_std::{fmt::Debug, vec::Vec};
 
-use crate::BridgeAssetBalance;
+use crate::{BridgeAssetBalance, CurrencyId};
 
 pub trait TokenInfo {
 	fn currency_id(&self) -> u64;
-	fn name(&self) -> &str;
-	fn symbol(&self) -> &str;
-	fn decimals(&self) -> u8;
+	fn name(&self) -> Option<&str>;
+	fn symbol(&self) -> Option<&str>;
+	fn decimals(&self) -> Option<u8>;
 }
 
 /// Extension trait for CurrencyId
@@ -50,6 +50,7 @@ pub trait CurrencyIdExt {
 	fn is_native(&self) -> bool;
 	fn is_stable(&self) -> bool;
 	fn is_lptoken(&self) -> bool;
+	fn is_foreign_asset(&self) -> bool;
 	fn into(symbol: Self::TokenSymbol) -> Self;
 }
 
@@ -195,3 +196,13 @@ where
 		}
 	}
 }
+
+/// A mapping between AssetId and AssetMetadata.
+pub trait AssetIdMapping<ForeignAssetId, MultiLocation, AssetMetadata> {
+	/// Returns the AssetMetadata associated with a given ForeignAssetId.
+	fn get_foreign_asset_metadata(foreign_asset_id: ForeignAssetId) -> Option<AssetMetadata>;
+	/// Returns the MultiLocation associated with a given ForeignAssetId.
+	fn get_multi_location(foreign_asset_id: ForeignAssetId) -> Option<MultiLocation>;
+	/// Returns the CurrencyId associated with a given MultiLocation.
+	fn get_currency_id(multi_location: MultiLocation) -> Option<CurrencyId>;
+}

node/service/src/chain_spec/bifrost_kusama.rs

@@ -105,8 +105,8 @@ fn bifrost_kusama_properties() -> Properties {
 	]
 	.iter()
 	.for_each(|token| {
-		token_symbol.push(token.symbol().to_string());
-		token_decimals.push(token.decimals() as u32);
+		token_symbol.push(token.symbol().expect("Token symbol expected").to_string());
+		token_decimals.push(token.decimals().expect("Token decimals expected") as u32);
 	});
 
 	properties.insert("tokenSymbol".into(), token_symbol.into());

node/service/src/chain_spec/bifrost_polkadot.rs

@@ -57,8 +57,8 @@ fn bifrost_polkadot_properties() -> Properties {
 	]
 	.iter()
 	.for_each(|token| {
-		token_symbol.push(token.symbol().to_string());
-		token_decimals.push(token.decimals() as u32);
+		token_symbol.push(token.symbol().expect("Token symbol expected").to_string());
+		token_decimals.push(token.decimals().expect("Token decimals expected") as u32);
 	});
 
 	properties.insert("tokenSymbol".into(), token_symbol.into());

pallets/asset-registry/Cargo.toml

@@ -0,0 +1,42 @@
+[package]
+name = "bifrost-asset-registry"
+version = "0.8.0"
+authors = ["Edwin Wang <lark930@gmail.com>"]
+edition = "2021"
+
+[dependencies]
+log = { version = "0.4.14", default-features = false }
+serde = { version = "1.0.124", optional = true }
+scale-info = { version = "1.0", default-features = false, features = ["derive"] }
+codec = { package = "parity-scale-codec", version = "2.3.1", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false }
+sp-std = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false  }
+frame-support = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false }
+frame-system = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17", default-features = false }
+primitives = { package = "node-primitives", path = "../../node/primitives", default-features = false }
+
+xcm = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false }
+xcm-builder = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false }
+xcm-executor = { git = "https://github.com/paritytech/polkadot", branch = "release-v0.9.17", default-features = false }
+
+[dev-dependencies]
+sp-io = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+pallet-balances = { git = "https://github.com/paritytech/substrate", branch = "polkadot-v0.9.17" }
+
+[features]
+default = ["std"]
+std = [
+	"serde",
+	"log/std",
+	"codec/std",
+	"scale-info/std",
+	"sp-runtime/std",
+	"sp-std/std",
+	"frame-support/std",
+	"frame-system/std",
+	"primitives/std",
+	"xcm/std",
+	"xcm-builder/std",
+	"xcm-executor/std",
+]
+try-runtime = ["frame-support/try-runtime"]