Allow reserve asset transfer of relaychain token to parachain and back

Cargo.toml

@@ -19,7 +19,7 @@ futures = "0.3.25"
 hex-literal = "0.4.1"
 log = { version = "0.4.20", default-features = false }
 scale-info = { version = "2.10.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", features = ["derive"] }
+serde = { version = "1.0.188", default-features = false, features = ["derive"] }
 serde_json = "1.0"
 smallvec = "1.11.0"
 
@@ -48,7 +48,9 @@ frame-system = { version = "25.0.0", default-features = false }
 frame-system-benchmarking = { version = "25.0.0", default-features = false }
 frame-system-rpc-runtime-api = { version = "23.0.0", default-features = false }
 frame-try-runtime = { version = "0.31.0", default-features = false }
+orml-currencies = { version = "0.6.7", default-features = false }
 orml-traits = { version = "0.6.7", default-features = false }
+orml-tokens = { version = "0.6.7", default-features = false }
 orml-xcm = { version = "0.6.7", default-features = false }
 orml-xcm-support = { version = "0.6.7", default-features = false }
 orml-xtokens = { version = "0.6.7", default-features = false }

README.md

@@ -20,7 +20,7 @@ diener update --polkadot --branch release-v0.9.xx
 2. Copy it to `~/.local/bin/`
 3. Launch it in your terminal
 ```
-zombienet-linux-x64 spawn --provider native zombienet/rococo-local-with-integritee-and-shell.toml
+zombienet-linux-x64 spawn --provider native zombienet/rococo-local-with-integritee.toml
 ```
 
 **Note:** You can also set a chain-spec path to the zombienet config, but the config param is named `chain_spec_path`.

polkadot-parachains/Cargo.toml

@@ -2,7 +2,7 @@
 name = "integritee-collator"
 description = "The Integritee parachain collator binary"
 # align major.minor revision with the runtimes. bump patch revision ad lib. make this the github release tag
-version = "1.8.1"
+version = "1.8.2"
 authors = ["Integritee AG <[email protected]>"]
 homepage = "https://integritee.network/"
 repository = "https://github.com/integritee-network/parachain"
@@ -20,7 +20,7 @@ futures = { workspace = true, features = ["std"] }
 hex-literal = { workspace = true }
 log = { workspace = true, features = ["std"] }
 parity-scale-codec = { workspace = true, features = ["std"] }
-serde = { workspace = true }
+serde = { workspace = true, features = ["std"] }
 serde_json = { workspace = true }
 
 # Parachain runtimes

polkadot-parachains/common/src/lib.rs

@@ -51,6 +51,9 @@ mod types {
 	/// Balance of an account.
 	pub type Balance = u128;
 
+	/// Amount is signed version of Balance
+	pub type Amount = i128;
+
 	/// Nonce of a transaction in the chain.
 	pub type Nonce = u32;
 

polkadot-parachains/integritee-runtime/Cargo.toml

@@ -2,7 +2,7 @@
 name = "integritee-runtime"
 description = "The Integritee parachain runtime"
 # patch revision must match runtime spec_version
-version = "1.8.46"
+version = "1.8.47"
 authors = ["Integritee AG <[email protected]>"]
 homepage = "https://integritee.network/"
 repository = "https://github.com/integritee-network/parachain"
@@ -12,6 +12,7 @@ edition = "2021"
 log = { workspace = true }
 parity-scale-codec = { workspace = true }
 scale-info = { workspace = true }
+serde = { workspace = true }
 
 parachains-common = { path = "../common", default-features = false }
 
@@ -31,6 +32,8 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { workspace = true, optional = true }
+orml-currencies = { workspace = true }
+orml-tokens = { workspace = true }
 orml-traits = { workspace = true }
 orml-xcm = { workspace = true }
 orml-xcm-support = { workspace = true }
@@ -114,7 +117,9 @@ std = [
     "frame-system/std",
     "frame-try-runtime?/std",
     "log/std",
+    "orml-currencies/std",
     "orml-traits/std",
+    "orml-tokens/std",
     "orml-xcm-support/std",
     "orml-xcm/std",
     "orml-xtokens/std",
@@ -146,6 +151,7 @@ std = [
     "polkadot-parachain-primitives/std",
     "polkadot-runtime-common/std",
     "scale-info/std",
+    "serde/std",
     "sp-api/std",
     "sp-block-builder/std",
     "sp-consensus-aura/std",
@@ -176,6 +182,7 @@ runtime-benchmarks = [
     "frame-system-benchmarking/runtime-benchmarks",
     "frame-system/runtime-benchmarks",
     "hex-literal",
+    "orml-tokens/runtime-benchmarks",
     "orml-xtokens/runtime-benchmarks",
     "pallet-balances/runtime-benchmarks",
     "pallet-bounties/runtime-benchmarks",
@@ -213,6 +220,8 @@ try-runtime = [
     "frame-executive/try-runtime",
     "frame-system/try-runtime",
     "frame-try-runtime/try-runtime",
+    "orml-currencies/try-runtime",
+    "orml-tokens/try-runtime",
     "orml-xcm/try-runtime",
     "orml-xtokens/try-runtime",
     "pallet-aura/try-runtime",

polkadot-parachains/integritee-runtime/src/lib.rs

@@ -43,6 +43,7 @@ use sp_std::prelude::*;
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 // A few exports that help ease life for downstream crates.
+use core::marker::PhantomData;
 pub use frame_support::{
 	construct_runtime,
 	dispatch::DispatchClass,
@@ -67,6 +68,7 @@ use frame_system::{
 	limits::{BlockLength, BlockWeights},
 	EnsureRoot, EnsureWithSuccess,
 };
+use orml_traits::{currency::MutationHooks, parameter_type_with_key};
 pub use pallet_balances::Call as BalancesCall;
 pub use pallet_timestamp::Call as TimestampCall;
 use parachains_common::{
@@ -75,7 +77,8 @@ use parachains_common::{
 	NORMAL_DISPATCH_RATIO, SLOT_DURATION,
 };
 pub use parachains_common::{
-	AccountId, Address, Balance, BlockNumber, Hash, Header, Nonce, Signature, MILLISECS_PER_BLOCK,
+	AccountId, Address, Amount, Balance, BlockNumber, Hash, Header, Nonce, Signature,
+	MILLISECS_PER_BLOCK,
 };
 use scale_info::TypeInfo;
 #[cfg(any(feature = "std", test))]
@@ -95,6 +98,8 @@ mod weights;
 
 pub mod xcm_config;
 
+use xcm_config::CurrencyId;
+
 pub type SessionHandlers = ();
 
 /// Opaque types. These are used by the CLI to instantiate machinery that don't need to know
@@ -116,7 +121,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("integritee-parachain"),
 	impl_name: create_runtime_str!("integritee-full"),
 	authoring_version: 2,
-	spec_version: 46,
+	spec_version: 47,
 	impl_version: 1,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 6,
@@ -135,6 +140,8 @@ pub const fn deposit(items: u32, bytes: u32) -> Balance {
 /// A timestamp: milliseconds since the unix epoch.
 pub type Moment = u64;
 
+pub type ReserveIdentifier = [u8; 8];
+
 /// The version information used to identify this runtime when compiled natively.
 #[cfg(feature = "std")]
 pub fn native_version() -> NativeVersion {
@@ -249,7 +256,7 @@ impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
 	type WeightInfo = weights::pallet_balances::WeightInfo<Runtime>;
 	type MaxReserves = MaxReserves;
-	type ReserveIdentifier = [u8; 8];
+	type ReserveIdentifier = ReserveIdentifier;
 	type RuntimeHoldReason = RuntimeHoldReason;
 	type RuntimeFreezeReason = ();
 	type FreezeIdentifier = ();
@@ -761,6 +768,58 @@ impl orml_xcm::Config for Runtime {
 	type SovereignOrigin = EnsureRoot<AccountId>;
 }
 
+parameter_type_with_key! {
+	pub ExistentialDeposits: |currency_id: CurrencyId| -> Balance {
+		match currency_id {
+			CurrencyId::TEER => MILLITEER,
+			CurrencyId::RelayNative => 3_333_333u128.into() // keep this with asset hub ED
+		}
+	};
+}
+
+pub struct CurrencyHooks<T, DustAccount>(PhantomData<T>, DustAccount);
+impl<T, DustAccount> MutationHooks<T::AccountId, T::CurrencyId, T::Balance>
+	for CurrencyHooks<T, DustAccount>
+where
+	T: orml_tokens::Config,
+	DustAccount: Get<<T as frame_system::Config>::AccountId>,
+{
+	type OnDust = orml_tokens::TransferDust<T, DustAccount>;
+	type OnSlash = ();
+	type PreDeposit = ();
+	type PostDeposit = ();
+	type PreTransfer = ();
+	type PostTransfer = ();
+	type OnNewTokenAccount = ();
+	type OnKilledTokenAccount = ();
+}
+
+impl orml_tokens::Config for Runtime {
+	type RuntimeEvent = RuntimeEvent;
+	type Balance = Balance;
+	type Amount = Amount;
+	type CurrencyId = CurrencyId;
+	type WeightInfo = weights::orml_tokens::WeightInfo<Runtime>;
+	type ExistentialDeposits = ExistentialDeposits;
+	type CurrencyHooks = CurrencyHooks<Runtime, TreasuryAccount>;
+	type MaxLocks = MaxLocks;
+	type MaxReserves = MaxReserves;
+	type ReserveIdentifier = ReserveIdentifier;
+	type DustRemovalWhitelist = Nothing;
+}
+
+parameter_types! {
+	pub const GetNativeCurrencyId: CurrencyId = CurrencyId::TEER;
+}
+
+impl orml_currencies::Config for Runtime {
+	type MultiCurrency = Tokens;
+	type NativeCurrency =
+		orml_currencies::BasicCurrencyAdapter<Runtime, Balances, Amount, BlockNumber>;
+	type GetNativeCurrencyId = GetNativeCurrencyId;
+	type WeightInfo = ();
+}
+
 construct_runtime!(
 	pub enum Runtime
 	{
@@ -802,6 +861,8 @@ construct_runtime!(
 		XTokens: orml_xtokens = 34,
 		OrmlXcm: orml_xcm = 35,
 		XcmTransactor: pallet_xcm_transactor = 36,
+		Tokens: orml_tokens exclude_parts { Call } = 41,
+		Currencies: orml_currencies = 42,
 
 		// Integritee pallets.
 		Teerex: pallet_teerex = 50,
@@ -861,10 +922,6 @@ mod benches {
 		[pallet_child_bounties, ChildBounties]
 		[pallet_claims, Claims]
 		[pallet_collective, Council]
-		// Fixme #177: For some reason the benchmarks write both to the same pallet_collective weight
-		// file. No reason to run both before we fix that, as the pallet_collective benchmark
-		// takes the longest.
-		// [pallet_collective, TechnicalCommittee]
 		[pallet_democracy, Democracy]
 		[pallet_multisig, Multisig]
 		[pallet_preimage, Preimage]
@@ -880,6 +937,8 @@ mod benches {
 		[pallet_xcm, PolkadotXcm]
 		[cumulus_pallet_xcmp_queue, XcmpQueue]
 		[pallet_utility, Utility]
+		// fixme https://github.com/integritee-network/parachain/issues/261
+		//[orml_tokens, benchmarking::tokens]
 	);
 }
 

polkadot-parachains/integritee-runtime/src/weights/mod.rs

@@ -23,3 +23,5 @@ pub mod pallet_treasury;
 pub mod pallet_utility;
 pub mod pallet_vesting;
 pub mod pallet_xcm;
+
+pub mod orml_tokens;