Asset Hub: Asset Conversion and Swap Weight Trader #218

muharem · 2024-03-05T17:46:20Z

Asset Conversion instance for Polkadot Asset Hub and XCM Swap Weight Trader for both Asset Hubs.

TODO:

update treasury account when this PR merged - Treasury Pallet Account as destination for XCM fees on System Parachains #191
define account deposit for pool assets, liquidity withdrawal fee, pool setup fee;

muharem · 2024-03-06T11:54:23Z

@joepetrowski need your help to set there parameters:

account deposit for pool assets
pool setup fee
liquidity withdrawal fee

I think we can have 0 for 1. if 2. is not 0. In Kusama both set as 0.

…ion-and-weight-trader

joepetrowski · 2024-03-07T14:41:07Z

We decided to set both as 0 because all pairs must be against DOT, so the number of pools is limited by the number of assets linearly (one asset, one pool) as opposed to quadratically (any-to-any pools, N^2). Since asset creation requires a deposit, we decided that it would reasonably include having a pool fot it.

Liquidity withdrawal fee can also be 0, that only needs to be nonzero if any-to-any pools are allowed.

joepetrowski

Some minor nits but looking good. One question, XCM V3 is used throughout, but since SDK v1.7.0 we are on XCM v4. Do these types need to be updated here?

I didn't look too closely at the bridge test cases. Would be good if @acatangiu can check those.

system-parachains/asset-hubs/asset-hub-kusama/src/xcm_config.rs

joepetrowski · 2024-03-07T14:45:05Z

system-parachains/asset-hubs/asset-hub-polkadot/src/impls.rs

+// TODO: the types in the module copied from the PR: https://github.com/paritytech/polkadot-sdk/pull/3250
+// and should be removed when changes from the PR will get released.


Link an issue?

I am also collecting similar TODOs here: #186

system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs

system-parachains/asset-hubs/asset-hub-polkadot/src/xcm_config.rs

integration-tests/emulated/tests/assets/asset-hub-kusama/src/tests/swap.rs

acatangiu · 2024-03-07T15:56:17Z

Some minor nits but looking good. One question, XCM V3 is used throughout, but since SDK v1.7.0 we are on XCM v4. Do these types need to be updated here?

I didn't look too closely at the bridge test cases. Would be good if @acatangiu can check those.

Reviewed tests and all of them look good! Before finishing full review, I had an early question: are we adding the DEX/pools on both Kusama and Polkadot at the same time? I was under the impression Polkadot was to get it one release later than Kusama..

joepetrowski · 2024-03-07T16:15:56Z

Reviewed tests and all of them look good! Before finishing full review, I had an early question: are we adding the DEX/pools on both Kusama and Polkadot at the same time? I was under the impression Polkadot was to get it one release later than Kusama..

This has been on Kusama for like 6 months :)

acatangiu · 2024-03-07T18:39:11Z

This has been on Kusama for like 6 months :)

Ok, sorry, I posted the early question too early (before even looking at the runtimes code) :))

georgepisaltu

LGTM

integration-tests/emulated/tests/bridges/bridge-hub-kusama/src/tests/asset_transfers.rs

integration-tests/emulated/tests/assets/asset-hub-kusama/src/tests/swap.rs

Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> Co-authored-by: Sergej Sakac <73715684+Szegoo@users.noreply.github.com>

muharem · 2024-03-11T17:27:46Z

@joepetrowski I have updated the deposits/fees. Plus for PoolAssets in Kusama Asset Hub, AssetAccountDeposit is updated from 0 to the same amount as in other Assets instances

…ion-and-weight-trader

bkontur

lgmt, just left a few nits to check

integration-tests/emulated/tests/assets/asset-hub-kusama/src/tests/swap.rs

bkontur · 2024-03-12T13:26:55Z

system-parachains/asset-hubs/asset-hub-kusama/tests/tests.rs

@@ -721,6 +425,77 @@ fn limited_reserve_transfer_assets_for_native_asset_to_asset_hub_polkadot_works(
 	)
 }

+#[test]
+fn receive_reserve_asset_deposited_dot_from_asset_hub_polkadot_fees_paid_by_pool_swap_works() {


bkontur · 2024-03-12T13:34:03Z

system-parachains/asset-hubs/asset-hub-polkadot/src/impls.rs

+	///
+	/// The `PoolId` is represented as a tuple of `AssetKind`s with `FirstAsset` always positioned
+	/// as the first element.
+	pub struct WithFirstAsset<FirstAsset, AccountId, AssetKind, AccountIdConverter>(


what about the AssetHubKusama? It uses pallet_asset_conversion::WithFirstAsset, should we change it there also?

only possible with migration, which will be available for the next release

bkontur · 2024-03-12T13:38:51Z

system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs

+parameter_types! {
+	pub const AssetConversionPalletId: PalletId = PalletId(*b"py/ascon");
+	pub const LiquidityWithdrawalFee: Permill = Permill::from_percent(0);
+	pub const PoolSetupFee: Balance = system_para_deposit(1, 4);


what about AssetHubKusama? There is still:

type PoolSetupFee = ConstU128<0>; // Asset class deposit fees are sufficient to prevent spam

shouldn't we change AHK also?

set it as in polkadot

bkontur · 2024-03-12T13:39:49Z

system-parachains/asset-hubs/asset-hub-polkadot/src/impls.rs

+// TODO: the types in the module copied from the PR: https://github.com/paritytech/polkadot-sdk/pull/3250
+// and should be removed when changes from the PR will get released.


I am also collecting similar TODOs here: #186

bkontur · 2024-03-12T13:41:37Z

system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_assets_pool.rs

+// --extrinsic=*
+// --wasm-execution=compiled
+// --heap-pages=4096
+// --output=./asset-hub-kusama-weights


when merged, I will regenerate weights as a part of #223

muharem · 2024-03-13T09:59:15Z

@acatangiu can you please help with review

…ion-and-weight-trader

integration-tests/emulated/tests/assets/asset-hub-kusama/src/tests/swap.rs

system-parachains/asset-hubs/asset-hub-polkadot/src/impls.rs

ggwpez · 2024-03-18T11:55:17Z

system-parachains/asset-hubs/asset-hub-polkadot/src/lib.rs

+	type AssetDeposit = ConstU128<0>;
+	type AssetAccountDeposit = AssetAccountDeposit;
+	type MetadataDepositBase = ConstU128<0>;
+	type MetadataDepositPerByte = ConstU128<0>;


DQ but why are they zero?

Only the system (the AC pallet) can actually create assets within this instance of Assets, so only the system itself could actually create any assets and add any metadata.

bkchr · 2024-03-18T15:34:30Z

@muharem is this ready to be merged?

muharem · 2024-03-18T15:37:45Z

@muharem is this ready to be merged?

yes

muharem · 2024-03-18T16:19:06Z

/merge

fellowship-merge-bot · 2024-03-18T16:43:12Z

There was a problem running the action.

❌😵❌

Please find more information in the logs.

bkchr · 2024-03-18T20:06:16Z

/merge

fellowship-merge-bot · 2024-03-18T20:06:54Z

There was a problem running the action.

❌😵❌

Please find more information in the logs.

muharem added 10 commits March 5, 2024 14:31

pool assets instance setup

c4ccaa8

asset conversion setup for asset-hub-polkadot

18f2cea

asset conversion tx payment setup for asset-hub-polkadot

bd93eb0

swap trader setup for polkadot and kusama asset hubs

4c7357d

weight trader tests

2ef13fd

move weight trader tests into separate mod

400546e

bridge fees from pool test

df78d6c

emulated swap test

d6d682b

more swap tests

206632c

bridge asset transfer tests

f3b78d1

muharem marked this pull request as draft March 5, 2024 17:46

muharem added 6 commits March 6, 2024 10:55

rustfmt

20d9282

cargo lock and comment fix

fdad8b3

clippy fix

55c13d6

rustfmt

593f969

changelog

55614c3

add TODO

6144fbb

muharem marked this pull request as ready for review March 6, 2024 11:48

muharem added 2 commits March 6, 2024 14:10

Merge remote-tracking branch 'origin/main' into muharem-asset-convers…

2c9ef46

…ion-and-weight-trader

resolve pool setup fee to treasury account

1397dc9

joepetrowski reviewed Mar 7, 2024

View reviewed changes

georgepisaltu approved these changes Mar 8, 2024

View reviewed changes

Szegoo reviewed Mar 9, 2024

View reviewed changes

muharem and others added 2 commits March 11, 2024 11:33

Apply suggestions from code review

47873c8

Co-authored-by: joe petrowski <25483142+joepetrowski@users.noreply.github.com> Co-authored-by: Sergej Sakac <73715684+Szegoo@users.noreply.github.com>

minor review fixes

2811e93

muharem requested a review from joepetrowski March 11, 2024 10:56

update deposits

3b317dc

joepetrowski approved these changes Mar 11, 2024

View reviewed changes

Merge remote-tracking branch 'origin/main' into muharem-asset-convers…

291139e

…ion-and-weight-trader

bkontur approved these changes Mar 12, 2024

View reviewed changes

muharem added 2 commits March 13, 2024 10:27

review fixes

28d1d73

clippy fixes

f8d3e15

muharem added 2 commits March 13, 2024 13:14

include assets storage deposit into pool setup fee

d2032c2

add pool assets and asset conversion calls to xcm safe calls filter

74cb400

joepetrowski mentioned this pull request Mar 15, 2024

1.2.0 Release #140

Closed

19 tasks

joepetrowski and others added 2 commits March 15, 2024 12:35

Merge branch 'main' into muharem-asset-conversion-and-weight-trader

43e0bdd

Merge remote-tracking branch 'origin/main' into muharem-asset-convers…

fb6d298

…ion-and-weight-trader

ggwpez reviewed Mar 18, 2024

View reviewed changes

integration-tests/emulated/tests/assets/asset-hub-kusama/src/tests/swap.rs Outdated Show resolved Hide resolved

ggwpez reviewed Mar 18, 2024

View reviewed changes

system-parachains/asset-hubs/asset-hub-polkadot/src/impls.rs Outdated Show resolved Hide resolved

ggwpez reviewed Mar 18, 2024

View reviewed changes

system-parachains/asset-hubs/asset-hub-polkadot/src/impls.rs Outdated Show resolved Hide resolved

ggwpez reviewed Mar 18, 2024

View reviewed changes

ggwpez approved these changes Mar 18, 2024

View reviewed changes

acatangiu approved these changes Mar 18, 2024

View reviewed changes

muharem added 2 commits March 18, 2024 14:58

style fixes

9d5af66

Merge branch 'main' into muharem-asset-conversion-and-weight-trader

7a4e375

acatangiu approved these changes Mar 18, 2024

View reviewed changes

bkchr merged commit 49c6d6d into polkadot-fellows:main Mar 18, 2024
31 of 32 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Asset Hub: Asset Conversion and Swap Weight Trader #218

Asset Hub: Asset Conversion and Swap Weight Trader #218

muharem commented Mar 5, 2024 •

edited

Loading

muharem commented Mar 6, 2024

joepetrowski commented Mar 7, 2024

joepetrowski left a comment

joepetrowski Mar 7, 2024

bkontur Mar 12, 2024

acatangiu commented Mar 7, 2024

joepetrowski commented Mar 7, 2024

acatangiu commented Mar 7, 2024

georgepisaltu left a comment

muharem commented Mar 11, 2024

bkontur left a comment

bkontur Mar 12, 2024

bkontur Mar 12, 2024

muharem Mar 12, 2024

bkontur Mar 12, 2024

muharem Mar 12, 2024

bkontur Mar 12, 2024

bkontur Mar 12, 2024

muharem commented Mar 13, 2024

ggwpez Mar 18, 2024

joepetrowski Mar 18, 2024

bkchr commented Mar 18, 2024

muharem commented Mar 18, 2024

muharem commented Mar 18, 2024

fellowship-merge-bot bot commented Mar 18, 2024

bkchr commented Mar 18, 2024

fellowship-merge-bot bot commented Mar 18, 2024

		// TODO: the types in the module copied from the PR: https://github.com/paritytech/polkadot-sdk/pull/3250
		// and should be removed when changes from the PR will get released.

Asset Hub: Asset Conversion and Swap Weight Trader #218

Asset Hub: Asset Conversion and Swap Weight Trader #218

Conversation

muharem commented Mar 5, 2024 • edited Loading

muharem commented Mar 6, 2024

joepetrowski commented Mar 7, 2024

joepetrowski left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

acatangiu commented Mar 7, 2024

joepetrowski commented Mar 7, 2024

acatangiu commented Mar 7, 2024

georgepisaltu left a comment

Choose a reason for hiding this comment

muharem commented Mar 11, 2024

bkontur left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

muharem commented Mar 13, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bkchr commented Mar 18, 2024

muharem commented Mar 18, 2024

muharem commented Mar 18, 2024

fellowship-merge-bot bot commented Mar 18, 2024

There was a problem running the action.

bkchr commented Mar 18, 2024

fellowship-merge-bot bot commented Mar 18, 2024

There was a problem running the action.

muharem commented Mar 5, 2024 •

edited

Loading