zeitgeistpm · sea212 · Nov 25, 2022 · Jun 4, 2022 · Jun 4, 2022 · Jun 5, 2022
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -48,3 +48,6 @@ resolver = "2"
 [patch."https://github.com/purestake/moonbeam"]
 pallet-author-mapping = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "downgrade-staking-and-mapping" }
 parachain-staking = { git = "https://github.com/zeitgeistpm/moonbeam", branch = "downgrade-staking-and-mapping" }
+
+[patch."https://github.com/shaunxw/xcm-simulator"]
+xcm-emulator = { git = "https://github.com/sea212/xcm-simulator", branch = "polkadot-v0.9.19-moonbeam" }
diff --git a/docs/changelog_for_devs.md b/docs/changelog_for_devs.md
@@ -1,3 +1,8 @@
+# v0.3.7
+- Added xTokens pallet to transfer tokens accross chains
+- Added AssetRegistry pallet to register foreign asset
+- Asset UnknownTokens pallet to handle unknown foreign assets
+
 # v0.3.5
 
 - Added `Initialized` status for pools. A pool now starts in `Initialized`

diff --git a/misc/types.json b/misc/types.json
@@ -19,7 +19,7 @@
       "ScalarOutcome": "(MarketId, ScalarPosition)",
       "CombinatorialOutcome": null,
       "PoolShare": "u128",
-      "Ztg": null
+      "ZTG": null
     }
   },
   "AuthorId": "AccountId",

diff --git a/node/src/chain_spec/battery_station.rs b/node/src/chain_spec/battery_station.rs
@@ -28,7 +28,7 @@ use zeitgeist_primitives::{
         ztg::{LIQUIDITY_MINING, LIQUIDITY_MINING_PTD},
         BASE,
     },
-    types::AccountId,
+    types::{AccountId, Asset::ForeignAsset},
 };
 
 #[cfg(feature = "parachain")]
@@ -115,7 +115,13 @@ pub(super) fn get_wasm() -> Result<&'static [u8], String> {
 
 generate_generic_genesis_function!(
     battery_station_runtime,
-    sudo: battery_station_runtime::SudoConfig { key: Some(root_key_staging_battery_station()) },
+    asset_registry: battery_station_runtime::AssetRegistryConfig {
+        assets: vec![],
+        last_asset_id: ForeignAsset(0),
+    },
+    sudo: battery_station_runtime::SudoConfig {
+        key: Some(root_key_staging_battery_station()),
+    },
 );
 
 pub fn battery_station_staging_config(

diff --git a/node/src/chain_spec/dev.rs b/node/src/chain_spec/dev.rs
@@ -29,7 +29,7 @@ use sc_service::ChainType;
 use sp_core::sr25519;
 use zeitgeist_primitives::{
     constants::ztg::{LIQUIDITY_MINING, LIQUIDITY_MINING_PTD},
-    types::Balance,
+    types::{Asset::ForeignAsset, Balance},
 };
 
 const INITIAL_BALANCE: Balance = Balance::MAX >> 4;
@@ -44,8 +44,15 @@ fn authority_keys_from_seed(
     )
 }
 
-generate_generic_genesis_function! {battery_station_runtime,
-    sudo: battery_station_runtime::SudoConfig { key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")) },
+generate_generic_genesis_function! {
+    battery_station_runtime,
+    asset_registry: battery_station_runtime::AssetRegistryConfig {
+        assets: vec![],
+        last_asset_id: ForeignAsset(0),
+    },
+    sudo: battery_station_runtime::SudoConfig {
+        key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
+    },
 }
 
 // Dev currently uses battery station runtime for the following reasons:

diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
@@ -1,10 +1,11 @@
 [dependencies]
 arbitrary = { default-features = false, optional = true, version = "1.0" }
+bstringify = "0.1.2"
 frame-support = { branch = "moonbeam-polkadot-v0.9.19", default-features = false, git = "https://github.com/purestake/substrate" }
 frame-system = { branch = "moonbeam-polkadot-v0.9.19", default-features = false, git = "https://github.com/purestake/substrate" }
-orml-currencies = { branch = "2022-06-v0.9.19", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
-orml-tokens = { branch = "2022-06-v0.9.19", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
-orml-traits = { branch = "2022-06-v0.9.19", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-currencies = { branch = "7e1123e-v0.9.19", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-tokens = { branch = "7e1123e-v0.9.19", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
+orml-traits = { branch = "7e1123e-v0.9.19", default-features = false, git = "https://github.com/zeitgeistpm/open-runtime-module-library" }
 parity-scale-codec = { default-features = false, features = ["derive", "max-encoded-len"], version = "3.0.0" }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 serde = { default-features = false, features = ["derive"], optional = true, version = "1.0.136" }

diff --git a/primitives/src/asset.rs b/primitives/src/asset.rs
@@ -28,14 +28,27 @@ use scale_info::TypeInfo;
 #[cfg_attr(feature = "std", derive(serde::Deserialize, serde::Serialize))]
 #[cfg_attr(feature = "std", serde(rename_all = "camelCase"))]
 #[derive(
-    Clone, Copy, Debug, Decode, Eq, Encode, MaxEncodedLen, Ord, PartialEq, PartialOrd, TypeInfo,
+    Clone,
+    Copy,
+    Debug,
+    Decode,
+    Default,
+    Eq,
+    Encode,
+    MaxEncodedLen,
+    Ord,
+    PartialEq,
+    PartialOrd,
+    TypeInfo,
 )]
 pub enum Asset<MI: MaxEncodedLen> {
     CategoricalOutcome(MI, CategoryIndex),
     ScalarOutcome(MI, ScalarPosition),
     CombinatorialOutcome,
     PoolShare(SerdeWrapper<PoolId>),
+    #[default]
     Ztg,
+    ForeignAsset(u32),
 }
 
 /// In a scalar market, users can either choose a `Long` position,

diff --git a/primitives/src/constants.rs b/primitives/src/constants.rs
@@ -85,3 +85,7 @@ pub const SD_PALLET_ID: PalletId = PalletId(*b"zge/sedp");
 pub const MAX_ASSETS: u16 = MAX_CATEGORIES + 1;
 /// Pallet identifier, mainly used for named balance reserves.
 pub const SWAPS_PALLET_ID: PalletId = PalletId(*b"zge/swap");
+
+// Treasury
+/// Pallet identifier, used to derive treasury account
+pub const TREASURY_PALLET_ID: PalletId = PalletId(*b"zge/tsry");
diff --git a/primitives/src/types.rs b/primitives/src/types.rs
@@ -21,7 +21,8 @@ pub use crate::{
 };
 #[cfg(feature = "arbitrary")]
 use arbitrary::{Arbitrary, Result, Unstructured};
-use frame_support::dispatch::{Decode, Encode, Weight};
+use frame_support::dispatch::Weight;
+use parity_scale_codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_runtime::{
     generic,