Update xtokens & tarpaulin (#2934)

* update xtokens

* update tarpaulin

Author: zjb0807

.github/workflows/coverage.yml

@@ -18,7 +18,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  TARPAULIN_VERSION: 0.32.7
+  TARPAULIN_VERSION: 0.33.0
   CARGO_INCREMENTAL: 0
 jobs:
   test:
@@ -45,7 +45,7 @@ jobs:
         run: |
           wget https://github.com/xd009642/tarpaulin/releases/download/${{ env.TARPAULIN_VERSION }}/cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz
           tar -zxvf cargo-tarpaulin-x86_64-unknown-linux-musl.tar.gz -C $HOME/.cargo/bin
-          cargo tarpaulin -v --workspace \
+          cargo tarpaulin --engine llvm --workspace \
             -e \
             acala acala-cli acala-service \
             acala-primitives \

Cargo.lock

@@ -80,6 +80,7 @@ crc32fast = { opt-level = 3 }
 crossbeam-deque = { opt-level = 3 }
 crypto-mac = { opt-level = 3 }
 curve25519-dalek = { opt-level = 3 }
+ed25519-dalek = { opt-level = 3 }
 ed25519-zebra = { opt-level = 3 }
 futures-channel = { opt-level = 3 }
 hash-db = { opt-level = 3 }
@@ -105,7 +106,6 @@ similar = { opt-level = 3 }
 smallvec = { opt-level = 3 }
 twox-hash = { opt-level = 3 }
 uint = { opt-level = 3 }
-x25519-dalek = { opt-level = 3 }
 zeroize = { opt-level = 3 }
 
 [workspace.dependencies]

Cargo.toml

@@ -1997,8 +1997,13 @@ pub type Executive = frame_executive::Executive<
 	Migrations,
 >;
 
+parameter_types! {
+	pub const XTokensPallet: &'static str = "XTokens";
+	pub const MigrationStatus: &'static str = "MigrationStatus";
+}
+
 #[allow(unused_parens)]
-type Migrations = (pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,);
+type Migrations = (frame_support::migrations::RemoveStorage<XTokensPallet, MigrationStatus, RocksDbWeight>,);
 
 #[cfg(feature = "runtime-benchmarks")]
 #[macro_use]

orml

@@ -35,7 +35,7 @@ use module_support::HomaSubAccountXcm;
 use module_transaction_payment::BuyWeightRateOfTransactionFeePool;
 use orml_traits::parameter_type_with_key;
 use orml_xcm_support::{DepositToAlternative, IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset};
-use orml_xtokens::AbsoluteReserveProviderMigrationPhase;
+use orml_xtokens::AbsoluteReserveProvider;
 use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
 use parity_scale_codec::{Decode, Encode};
 use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
@@ -111,7 +111,7 @@ type Reserves = (
 	// Relaychain (DOT) from Asset Hub
 	Case<RelayChainNativeAssetFromAssetHub>,
 	// Assets which the reserve is the same as the origin.
-	MultiNativeAsset<AbsoluteReserveProviderMigrationPhase<Runtime>>,
+	MultiNativeAsset<AbsoluteReserveProvider>,
 );
 
 pub type Trader = (
@@ -379,8 +379,7 @@ impl orml_xtokens::Config for Runtime {
 	type MaxAssetsForTransfer = MaxAssetsForTransfer;
 	type MinXcmFee = ParachainMinFee;
 	type LocationsFilter = Everything;
-	type ReserveProvider = AbsoluteReserveProviderMigrationPhase<Runtime>;
+	type ReserveProvider = AbsoluteReserveProvider;
 	type RateLimiter = ();
 	type RateLimiterId = ();
-	type MigrationPhaseUpdateOrigin = EnsureRootOrHalfGeneralCouncil;
 }

runtime/acala/src/lib.rs

@@ -39,7 +39,7 @@ use module_support::{
 	SpecificJointsSwap,
 };
 use orml_traits::{parameter_type_with_key, MultiCurrency, MultiReservableCurrency};
-use orml_xtokens::AbsoluteReserveProviderMigrationPhase;
+use orml_xtokens::AbsoluteReserveProvider;
 use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 pub use primitives::{
 	define_combined_task,
@@ -926,10 +926,9 @@ impl orml_xtokens::Config for Test {
 	type MaxAssetsForTransfer = MaxAssetsForTransfer;
 	type MinXcmFee = ParachainMinFee;
 	type LocationsFilter = Everything;
-	type ReserveProvider = AbsoluteReserveProviderMigrationPhase<Test>;
+	type ReserveProvider = AbsoluteReserveProvider;
 	type RateLimiter = ();
 	type RateLimiterId = ();
-	type MigrationPhaseUpdateOrigin = EnsureRoot<AccountId>;
 }
 
 parameter_types!(

runtime/acala/src/xcm_config.rs

@@ -29,7 +29,7 @@ fn treasury_should_take_xcm_execution_revenue() {
 		let shallow_weight = 600_000_000;
 		#[cfg(feature = "with-acala-runtime")]
 		let shallow_weight = 600_000_000;
-		let origin = Location::parent();
+		let origin = AssetHubLocation::get();
 
 		// receive relay chain token
 		let asset: Asset = (Location::parent(), dot_amount).into();

runtime/common/src/precompile/mock.rs

@@ -2004,8 +2004,13 @@ pub type Executive = frame_executive::Executive<
 	Migrations,
 >;
 
+parameter_types! {
+	pub const XTokensPallet: &'static str = "XTokens";
+	pub const MigrationStatus: &'static str = "MigrationStatus";
+}
+
 #[allow(unused_parens)]
-type Migrations = (pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,);
+type Migrations = (frame_support::migrations::RemoveStorage<XTokensPallet, MigrationStatus, RocksDbWeight>,);
 
 #[cfg(feature = "runtime-benchmarks")]
 #[macro_use]

runtime/integration-tests/src/treasury.rs

@@ -33,7 +33,7 @@ use module_support::HomaSubAccountXcm;
 use module_transaction_payment::BuyWeightRateOfTransactionFeePool;
 use orml_traits::parameter_type_with_key;
 use orml_xcm_support::{DepositToAlternative, IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset};
-use orml_xtokens::AbsoluteReserveProviderMigrationPhase;
+use orml_xtokens::AbsoluteReserveProvider;
 use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
 use parity_scale_codec::{Decode, Encode};
 use polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery;
@@ -153,7 +153,7 @@ type Reserves = (
 	// Relaychain (KSM) from Asset Hub
 	Case<RelayChainNativeAssetFromAssetHub>,
 	// Assets which the reserve is the same as the origin.
-	MultiNativeAsset<AbsoluteReserveProviderMigrationPhase<Runtime>>,
+	MultiNativeAsset<AbsoluteReserveProvider>,
 );
 
 pub type Trader = (
@@ -337,10 +337,9 @@ impl orml_xtokens::Config for Runtime {
 	type MaxAssetsForTransfer = MaxAssetsForTransfer;
 	type MinXcmFee = ParachainMinFee;
 	type LocationsFilter = Everything;
-	type ReserveProvider = AbsoluteReserveProviderMigrationPhase<Runtime>;
+	type ReserveProvider = AbsoluteReserveProvider;
 	type RateLimiter = ();
 	type RateLimiterId = ();
-	type MigrationPhaseUpdateOrigin = EnsureRootOrHalfGeneralCouncil;
 }
 
 pub type LocalAssetTransactor = (