Skip to content

Update xtokens & tarpaulin #2934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zjb0807 merged 2 commits into from
Oct 23, 2025
Merged

Update xtokens & tarpaulin #2934

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79214fd
update xtokens
zjb0807 Oct 23, 2025
be62e8d
update tarpaulin
zjb0807 Oct 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/coverage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand All @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion orml
Open in desktop
Submodule orml updated 12 files
+1 −0 Cargo.dev.toml
+3 −4 asset-registry/src/mock/para.rs
+1 −0 xtokens/Cargo.toml
+1 −1 xtokens/README.md
+45 −79 xtokens/src/lib.rs
+189 −0 xtokens/src/mock/asset_hub.rs
+39 −1 xtokens/src/mock/mod.rs
+13 −8 xtokens/src/mock/para.rs
+10 −7 xtokens/src/mock/para_relative_view.rs
+9 −8 xtokens/src/mock/para_teleport.rs
+5 −5 xtokens/src/mock/relay.rs
+121 −172 xtokens/src/tests.rs
7 changes: 6 additions & 1 deletion runtime/acala/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
7 changes: 3 additions & 4 deletions runtime/acala/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 = (
Expand Down Expand Up @@ -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;
}
5 changes: 2 additions & 3 deletions runtime/common/src/precompile/mock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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!(
Expand Down
2 changes: 1 addition & 1 deletion runtime/integration-tests/src/treasury.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
7 changes: 6 additions & 1 deletion runtime/karura/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
7 changes: 3 additions & 4 deletions runtime/karura/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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 = (
Expand Down Expand Up @@ -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 = (
Expand Down
7 changes: 3 additions & 4 deletions runtime/mandala/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use module_asset_registry::{BuyWeightRateOfErc20, BuyWeightRateOfForeignAsset, B
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};
Expand Down Expand Up @@ -105,7 +105,7 @@ impl xcm_executor::Config for XcmConfig {
// How to withdraw and deposit an asset.
type AssetTransactor = LocalAssetTransactor;
type OriginConverter = XcmOriginToCallOrigin;
type IsReserve = MultiNativeAsset<AbsoluteReserveProviderMigrationPhase<Runtime>>;
type IsReserve = MultiNativeAsset<AbsoluteReserveProvider>;
type IsTeleporter = runtime_common::xcm_config::TrustedTeleporters;
type UniversalLocation = UniversalLocation;
type Barrier = Barrier;
Expand Down Expand Up @@ -358,8 +358,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;
}