Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Make Westmint Support Bridged Assets #1895

Closed
wants to merge 37 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
aa67a43
rustc grumbles
joepetrowski Nov 17, 2022
9ab1739
add second instance
joepetrowski Nov 17, 2022
df40d77
leave some todos
joepetrowski Nov 17, 2022
94717a4
fix AssetsToBlockAuthor
joepetrowski Nov 17, 2022
47d96e0
make it almost compile
joepetrowski Nov 18, 2022
1e0515e
make it actually compile
joepetrowski Nov 18, 2022
6de6313
fix logical error
joepetrowski Nov 18, 2022
35d1e57
cargo fmt to resolve duplicate imports on merge
joepetrowski Nov 18, 2022
362a907
fix deps to make compile
joepetrowski Nov 18, 2022
b8ed7e7
fmt
joepetrowski Nov 18, 2022
633366b
(pallet-assets/pallet-asset-tx-payment) pathched with `sv-locked-for-…
bkontur Nov 21, 2022
5f7f8c2
statemine progress
joepetrowski Nov 22, 2022
e8afde4
ForeignCreators :tada:
joepetrowski Nov 22, 2022
e569b68
fix AssetFeeAsExistentialDepositMultiplier
joepetrowski Nov 30, 2022
c487586
no default instance
joepetrowski Nov 30, 2022
4191a4d
instantiate statemint
joepetrowski Dec 1, 2022
d9d5a9d
compile tests
bkontur Dec 22, 2022
3353263
don't rename pallet in runtime
joepetrowski Jan 11, 2023
9e211b8
don't rename and fix tests
joepetrowski Jan 11, 2023
25c2fc5
fix benchmark helper
joepetrowski Jan 12, 2023
a4a581b
fix benchmark build
joepetrowski Jan 12, 2023
9cd2708
more benchmark fixes
joepetrowski Jan 12, 2023
81e9703
fix penpal and rococo
joepetrowski Jan 12, 2023
4365baa
Merge branch 'bridge-hub-base' into joe-bridge-hub-westmint-assets
bkontur Jan 15, 2023
3aae882
XCM v3 Companion (#697)
gavofyork Jan 17, 2023
0c3f3b7
update BenchmarkHelper interface
joepetrowski Jan 17, 2023
c3d2108
fmt
joepetrowski Jan 17, 2023
85de406
Instantiate All Assets Pallets (#1908)
joepetrowski Jan 18, 2023
e350102
Bump assert_cmd from 2.0.7 to 2.0.8 (#2074)
dependabot[bot] Jan 18, 2023
6d47326
adjust pallet_contracts config (#2108)
agryaznov Jan 19, 2023
b6b2c1c
Companion for paritytech/polkadot#6578 (#2112)
KiChjang Jan 19, 2023
df40e7e
[backport] version bumps from release 9370 (#2095)
EgorPopelyaev Jan 19, 2023
46d3091
Simplify the template (#2072)
bkchr Jan 19, 2023
2b9a640
Use correct runtime function name (#2116)
bkchr Jan 20, 2023
01c83d2
Bump clap from 4.0.32 to 4.1.1 (#2096)
dependabot[bot] Jan 20, 2023
b322482
Warn validators with slow hardware (#1863)
Szegoo Jan 21, 2023
0d75123
Merge remote-tracking branch 'origin/master' into joe-bridge-hub-west…
bkontur Jan 21, 2023
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
Prev Previous commit
Next Next commit
fix benchmark build
  • Loading branch information
joepetrowski committed Jan 12, 2023
commit a4a581b0e993c5cfc0be92fbd13fb99dbdac7605
3 changes: 2 additions & 1 deletion parachains/runtimes/assets/statemine/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -855,6 +855,7 @@ impl_runtime_apis! {
impl cumulus_pallet_session_benchmarking::Config for Runtime {}

use xcm::latest::prelude::*;
use xcm_builder::MintLocation;
use xcm_config::KsmLocation;
use pallet_xcm_benchmarks::asset_instance_from;

Expand Down Expand Up @@ -897,7 +898,7 @@ impl_runtime_apis! {
KsmLocation::get(),
MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(KsmLocation::get()) },
));
pub const CheckedAccount: Option<AccountId> = None;
pub const CheckedAccount: Option<(AccountId, MintLocation)> = None;

}

Expand Down
3 changes: 2 additions & 1 deletion parachains/runtimes/assets/statemint/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -882,6 +882,7 @@ impl_runtime_apis! {
impl cumulus_pallet_session_benchmarking::Config for Runtime {}

use xcm::latest::prelude::*;
use xcm_builder::MintLocation;
use xcm_config::DotLocation;
use pallet_xcm_benchmarks::asset_instance_from;

Expand Down Expand Up @@ -924,7 +925,7 @@ impl_runtime_apis! {
DotLocation::get(),
MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(DotLocation::get()) },
));
pub const CheckedAccount: Option<AccountId> = None;
pub const CheckedAccount: Option<(AccountId, MintLocation)> = None;
}

impl pallet_xcm_benchmarks::fungible::Config for Runtime {
Expand Down
3 changes: 2 additions & 1 deletion parachains/runtimes/assets/westmint/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -874,6 +874,7 @@ impl_runtime_apis! {
impl cumulus_pallet_session_benchmarking::Config for Runtime {}

use xcm::latest::prelude::*;
use xcm_builder::MintLocation;
use xcm_config::WestendLocation;
use pallet_xcm_benchmarks::asset_instance_from;

Expand Down Expand Up @@ -916,7 +917,7 @@ impl_runtime_apis! {
WestendLocation::get(),
MultiAsset { fun: Fungible(1 * UNITS), id: Concrete(WestendLocation::get()) },
));
pub const CheckedAccount: Option<AccountId> = None;
pub const CheckedAccount: Option<(AccountId, MintLocation)> = None;

}

Expand Down