Skip to content

Commit

Permalink
Add hold traits to pallet assets
Browse files Browse the repository at this point in the history
  • Loading branch information
@darkforest0202 @olanod
darkforest0202 authored and olanod committed Nov 21, 2023
1 parent b35300c commit 640ce7c
Show file tree
Hide file tree
Showing 19 changed files with 450 additions and 69 deletions.
58 changes: 20 additions & 38 deletions Cargo.lock
View file

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

6 changes: 6 additions & 0 deletions cumulus/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,8 @@ impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
type CallbackHandle = ();
type AssetAccountDeposit = AssetAccountDeposit;
type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down Expand Up @@ -324,6 +326,8 @@ impl pallet_assets::Config<PoolAssetsInstance> for Runtime {
type Extra = ();
type WeightInfo = weights::pallet_assets_pool::WeightInfo<Runtime>;
type CallbackHandle = ();
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down Expand Up @@ -398,6 +402,8 @@ impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
type CallbackHandle = ();
type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = xcm_config::XcmBenchmarkHelper;
}
Expand Down
4 changes: 4 additions & 0 deletions cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
type CallbackHandle = ();
type AssetAccountDeposit = AssetAccountDeposit;
type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down Expand Up @@ -336,6 +338,8 @@ impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
type CallbackHandle = ();
type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = xcm_config::XcmBenchmarkHelper;
}
Expand Down
6 changes: 6 additions & 0 deletions cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,8 @@ impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
type CallbackHandle = ();
type AssetAccountDeposit = AssetAccountDeposit;
type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down Expand Up @@ -321,6 +323,8 @@ impl pallet_assets::Config<PoolAssetsInstance> for Runtime {
type Extra = ();
type WeightInfo = weights::pallet_assets_pool::WeightInfo<Runtime>;
type CallbackHandle = ();
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down Expand Up @@ -395,6 +399,8 @@ impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
type CallbackHandle = ();
type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = xcm_config::XcmBenchmarkHelper;
}
Expand Down
8 changes: 7 additions & 1 deletion cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@ impl pallet_assets::Config<TrustBackedAssetsInstance> for Runtime {
type CallbackHandle = ();
type AssetAccountDeposit = AssetAccountDeposit;
type RemoveItemsLimit = ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down Expand Up @@ -303,6 +305,8 @@ impl pallet_assets::Config<PoolAssetsInstance> for Runtime {
type Extra = ();
type WeightInfo = weights::pallet_assets_pool::WeightInfo<Runtime>;
type CallbackHandle = ();
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down Expand Up @@ -376,6 +380,8 @@ impl pallet_assets::Config<ForeignAssetsInstance> for Runtime {
type CallbackHandle = ();
type AssetAccountDeposit = ForeignAssetsAssetAccountDeposit;
type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = xcm_config::XcmBenchmarkHelper;
}
Expand Down Expand Up @@ -1692,7 +1698,7 @@ pub mod migrations {
let pool_asset_id = pool_info.lp_token.clone();
if old_pool_id.0.as_ref() != &invalid_native_asset {
// skip, if ok
continue
continue;
}

// fix new account
Expand Down
2 changes: 2 additions & 0 deletions cumulus/parachains/runtimes/testing/penpal/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,8 @@ impl pallet_assets::Config<pallet_assets::Instance1> for Runtime {
type CallbackHandle = ();
type AssetAccountDeposit = AssetAccountDeposit;
type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down
2 changes: 2 additions & 0 deletions cumulus/parachains/runtimes/testing/rococo-parachain/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,6 +576,8 @@ impl pallet_assets::Config for Runtime {
type CallbackHandle = ();
type AssetAccountDeposit = AssetAccountDeposit;
type RemoveItemsLimit = frame_support::traits::ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down
2 changes: 2 additions & 0 deletions polkadot/xcm/xcm-builder/src/tests/pay/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ impl pallet_assets::Config for Test {
type RemoveItemsLimit = RemoveItemsLimit;
type AssetIdParameter = AssetIdForAssets;
type CallbackHandle = ();
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down
4 changes: 4 additions & 0 deletions substrate/bin/node/runtime/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1613,6 +1613,8 @@ impl pallet_assets::Config<Instance1> for Runtime {
type CallbackHandle = ();
type WeightInfo = pallet_assets::weights::SubstrateWeight<Runtime>;
type RemoveItemsLimit = ConstU32<1000>;
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down Expand Up @@ -1640,6 +1642,8 @@ impl pallet_assets::Config<Instance2> for Runtime {
type WeightInfo = pallet_assets::weights::SubstrateWeight<Runtime>;
type RemoveItemsLimit = ConstU32<1000>;
type CallbackHandle = ();
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
#[cfg(feature = "runtime-benchmarks")]
type BenchmarkHelper = ();
}
Expand Down
4 changes: 4 additions & 0 deletions substrate/frame/asset-conversion/src/mock.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,8 @@ impl pallet_assets::Config<Instance1> for Test {
type Extra = ();
type WeightInfo = ();
type CallbackHandle = ();
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
pallet_assets::runtime_benchmarks_enabled! {
type BenchmarkHelper = ();
}
Expand All @@ -135,6 +137,8 @@ impl pallet_assets::Config<Instance2> for Test {
type Extra = ();
type WeightInfo = ();
type CallbackHandle = ();
type MaxHolds = ConstU32<50>;
type RuntimeHoldReason = RuntimeHoldReason;
pallet_assets::runtime_benchmarks_enabled! {
type BenchmarkHelper = ();
}
Expand Down
Loading

0 comments on commit 640ce7c

Please sign in to comment.