Skip to content
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.

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

Asset Hub: Asset Conversion and Swap Weight Trader #218

Merged
Merged
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
c4ccaa8
pool assets instance setup
muharem Feb 20, 2024
18f2cea
asset conversion setup for asset-hub-polkadot
muharem Feb 21, 2024
bd93eb0
asset conversion tx payment setup for asset-hub-polkadot
muharem Feb 21, 2024
4c7357d
swap trader setup for polkadot and kusama asset hubs
muharem Feb 21, 2024
2ef13fd
weight trader tests
muharem Feb 26, 2024
400546e
move weight trader tests into separate mod
muharem Mar 5, 2024
df78d6c
bridge fees from pool test
muharem Mar 5, 2024
d6d682b
emulated swap test
muharem Mar 5, 2024
206632c
more swap tests
muharem Mar 5, 2024
f3b78d1
bridge asset transfer tests
muharem Mar 5, 2024
20d9282
rustfmt
muharem Mar 6, 2024
fdad8b3
cargo lock and comment fix
muharem Mar 6, 2024
55c13d6
clippy fix
muharem Mar 6, 2024
593f969
rustfmt
muharem Mar 6, 2024
55614c3
changelog
muharem Mar 6, 2024
6144fbb
add TODO
muharem Mar 6, 2024
2c9ef46
Merge remote-tracking branch 'origin/main' into muharem-asset-convers…
muharem Mar 6, 2024
1397dc9
resolve pool setup fee to treasury account
muharem Mar 6, 2024
47873c8
Apply suggestions from code review
muharem Mar 11, 2024
2811e93
minor review fixes
muharem Mar 11, 2024
3b317dc
update deposits
muharem Mar 11, 2024
291139e
Merge remote-tracking branch 'origin/main' into muharem-asset-convers…
muharem Mar 12, 2024
28d1d73
review fixes
muharem Mar 13, 2024
f8d3e15
clippy fixes
muharem Mar 13, 2024
d2032c2
include assets storage deposit into pool setup fee
muharem Mar 13, 2024
74cb400
add pool assets and asset conversion calls to xcm safe calls filter
muharem Mar 13, 2024
43e0bdd
Merge branch 'main' into muharem-asset-conversion-and-weight-trader
joepetrowski Mar 15, 2024
fb6d298
Merge remote-tracking branch 'origin/main' into muharem-asset-convers…
muharem Mar 18, 2024
9d5af66
style fixes
muharem Mar 18, 2024
7a4e375
Merge branch 'main' into muharem-asset-conversion-and-weight-trader
muharem Mar 18, 2024
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
clippy fixes
muharem committed Mar 13, 2024
commit f8d3e15697f6fb3df40845ff69aa1e5fcb1093bf
Original file line number Diff line number Diff line change
@@ -59,8 +59,8 @@ fn swap_locally_on_chain_using_local_assets() {

assert_ok!(<AssetHubPolkadot as AssetHubPolkadotPallet>::AssetConversion::create_pool(
<AssetHubPolkadot as Chain>::RuntimeOrigin::signed(AssetHubPolkadotSender::get()),
bx!(asset_native.clone()),
bx!(asset_one.clone()),
bx!(asset_native),
bx!(asset_one),
));

assert_expected_events!(
@@ -72,8 +72,8 @@ fn swap_locally_on_chain_using_local_assets() {

assert_ok!(<AssetHubPolkadot as AssetHubPolkadotPallet>::AssetConversion::add_liquidity(
<AssetHubPolkadot as Chain>::RuntimeOrigin::signed(AssetHubPolkadotSender::get()),
bx!(asset_native.clone()),
bx!(asset_one.clone()),
bx!(asset_native),
bx!(asset_one),
1_000_000_000_000,
2_000_000_000_000,
0,
@@ -88,7 +88,7 @@ fn swap_locally_on_chain_using_local_assets() {
]
);

let path = vec![bx!(asset_native.clone()), bx!(asset_one.clone())];
let path = vec![bx!(asset_native), bx!(asset_one)];

assert_ok!(
<AssetHubPolkadot as AssetHubPolkadotPallet>::AssetConversion::swap_exact_tokens_for_tokens(