Rename to asset-conversion

Cargo.toml

@@ -73,6 +73,7 @@ members = [
 	"client/transaction-pool/api",
 	"client/utils",
 	"frame/alliance",
+	"frame/asset-conversion",
 	"frame/assets",
 	"frame/atomic-swap",
 	"frame/aura",
@@ -96,7 +97,6 @@ members = [
 	"frame/conviction-voting",
 	"frame/core-fellowship",
 	"frame/democracy",
-	"frame/dex",
 	"frame/fast-unstake",
 	"frame/try-runtime",
 	"frame/elections-phragmen",

bin/node/cli/Cargo.toml

@@ -86,8 +86,8 @@ sc-storage-monitor = { version = "0.1.0", path = "../../../client/storage-monito
 frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
 frame-system-rpc-runtime-api = { version = "4.0.0-dev", path = "../../../frame/system/rpc/runtime-api" }
 pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
+pallet-asset-conversion = { version = "4.0.0-dev", path = "../../../frame/asset-conversion" }
 pallet-assets = { version = "4.0.0-dev", path = "../../../frame/assets/" }
-pallet-dex = { version = "4.0.0-dev", path = "../../../frame/dex" }
 pallet-asset-tx-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/asset-tx-payment/" }
 pallet-im-online = { version = "4.0.0-dev", default-features = false, path = "../../../frame/im-online" }
 

bin/node/runtime/Cargo.toml

@@ -24,7 +24,7 @@ scale-info = { version = "2.1.1", default-features = false, features = ["derive"
 static_assertions = "1.1.0"
 log = { version = "0.4.17", default-features = false }
 
-# pallet-dex: turn on "num-traits" feature
+# pallet-asset-conversion: turn on "num-traits" feature
 primitive-types = { version = "0.12.0", default-features = false, features = ["codec", "scale-info", "num-traits"] }
 
 # primitives
@@ -56,6 +56,7 @@ frame-election-provider-support = { version = "4.0.0-dev", default-features = fa
 frame-system-rpc-runtime-api = { version = "4.0.0-dev", default-features = false, path = "../../../frame/system/rpc/runtime-api/" }
 frame-try-runtime = { version = "0.10.0-dev", default-features = false, path = "../../../frame/try-runtime", optional = true }
 pallet-alliance = { version = "4.0.0-dev", default-features = false, path = "../../../frame/alliance" }
+pallet-asset-conversion = { version = "4.0.0-dev", default-features = false, path = "../../../frame/asset-conversion" }
 pallet-assets = { version = "4.0.0-dev", default-features = false, path = "../../../frame/assets" }
 pallet-authority-discovery = { version = "4.0.0-dev", default-features = false, path = "../../../frame/authority-discovery" }
 pallet-authorship = { version = "4.0.0-dev", default-features = false, path = "../../../frame/authorship" }
@@ -121,7 +122,6 @@ pallet-transaction-storage = { version = "4.0.0-dev", default-features = false,
 pallet-uniques = { version = "4.0.0-dev", default-features = false, path = "../../../frame/uniques" }
 pallet-vesting = { version = "4.0.0-dev", default-features = false, path = "../../../frame/vesting" }
 pallet-whitelist = { version = "4.0.0-dev", default-features = false, path = "../../../frame/whitelist" }
-pallet-dex = { version = "4.0.0-dev", default-features = false, path = "../../../frame/dex" }
 
 [build-dependencies]
 substrate-wasm-builder = { version = "5.0.0-dev", path = "../../../utils/wasm-builder", optional = true }
@@ -137,6 +137,7 @@ std = [
 	"frame-system-benchmarking?/std",
 	"frame-election-provider-support/std",
 	"sp-authority-discovery/std",
+	"pallet-asset-conversion/std",
 	"pallet-assets/std",
 	"pallet-authority-discovery/std",
 	"pallet-authorship/std",
@@ -223,7 +224,6 @@ std = [
 	"sp-io/std",
 	"pallet-child-bounties/std",
 	"pallet-alliance/std",
-	"pallet-dex/std",
 	"substrate-wasm-builder",
 ]
 runtime-benchmarks = [
@@ -233,6 +233,7 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	"pallet-alliance/runtime-benchmarks",
+	"pallet-asset-conversion/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-babe/runtime-benchmarks",
 	"pallet-bags-list/runtime-benchmarks",
@@ -244,7 +245,6 @@ runtime-benchmarks = [
 	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-core-fellowship/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
-	"pallet-dex/runtime-benchmarks",
 	"pallet-election-provider-multi-phase/runtime-benchmarks",
 	"pallet-election-provider-support-benchmarking/runtime-benchmarks",
 	"pallet-elections-phragmen/runtime-benchmarks",
@@ -292,6 +292,7 @@ try-runtime = [
 	"frame-system/try-runtime",
 	"frame-support/try-runtime",
 	"pallet-alliance/try-runtime",
+	"pallet-asset-conversion/try-runtime",
 	"pallet-assets/try-runtime",
 	"pallet-authority-discovery/try-runtime",
 	"pallet-authorship/try-runtime",
@@ -347,5 +348,4 @@ try-runtime = [
 	"pallet-nfts/try-runtime",
 	"pallet-vesting/try-runtime",
 	"pallet-whitelist/try-runtime",
-	"pallet-dex/try-runtime",
 ]

bin/node/runtime/src/lib.rs

@@ -54,7 +54,7 @@ use frame_system::{
 };
 pub use node_primitives::{AccountId, Signature};
 use node_primitives::{AccountIndex, Balance, BlockNumber, Hash, Index, Moment};
-use pallet_dex::{NativeOrAssetId, NativeOrAssetIdConverter};
+use pallet_asset_conversion::{NativeOrAssetId, NativeOrAssetIdConverter};
 use pallet_election_provider_multi_phase::SolutionAccuracyOf;
 use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
 use pallet_nfts::PalletFeatures;
@@ -1525,13 +1525,13 @@ impl pallet_assets::Config<Instance2> for Runtime {
 }
 
 parameter_types! {
-	pub const DexPalletId: PalletId = PalletId(*b"py/dexer");
+	pub const AssetConversionPalletId: PalletId = PalletId(*b"py/ascon");
 	pub AllowMultiAssetPools: bool = true;
 	pub const PoolSetupFee: Balance = 1 * DOLLARS; // should be more or equal to the existential deposit
 	pub const MintMinLiquidity: Balance = 100;  // 100 is good enough when the main currency has 10-12 decimals.
 }
 
-impl pallet_dex::Config for Runtime {
+impl pallet_asset_conversion::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type AssetBalance = <Self as pallet_balances::Config>::Balance;
@@ -1542,11 +1542,11 @@ impl pallet_dex::Config for Runtime {
 	type AssetId = <Self as pallet_assets::Config<Instance1>>::AssetId;
 	type MultiAssetId = NativeOrAssetId<u32>;
 	type PoolAssetId = <Self as pallet_assets::Config<Instance2>>::AssetId;
-	type PalletId = DexPalletId;
+	type PalletId = AssetConversionPalletId;
 	type LPFee = ConstU32<3>; // means 0.3%
 	type PoolSetupFee = PoolSetupFee;
-	type PoolSetupFeeReceiver = DexOrigin;
-	type WeightInfo = pallet_dex::weights::SubstrateWeight<Runtime>;
+	type PoolSetupFeeReceiver = AssetConversionOrigin;
+	type WeightInfo = pallet_asset_conversion::weights::SubstrateWeight<Runtime>;
 	type AllowMultiAssetPools = AllowMultiAssetPools;
 	type MaxSwapPathLength = ConstU32<4>;
 	type MintMinLiquidity = MintMinLiquidity;
@@ -1871,7 +1871,7 @@ construct_runtime!(
 		NominationPools: pallet_nomination_pools,
 		RankedPolls: pallet_referenda::<Instance2>,
 		RankedCollective: pallet_ranked_collective,
-		Dex: pallet_dex,
+		AssetConversion: pallet_asset_conversion,
 		FastUnstake: pallet_fast_unstake,
 		MessageQueue: pallet_message_queue,
 		Pov: frame_benchmarking_pallet_pov,
@@ -1956,7 +1956,7 @@ mod benches {
 		[pallet_contracts, Contracts]
 		[pallet_core_fellowship, CoreFellowship]
 		[pallet_democracy, Democracy]
-		[pallet_dex, Dex]
+		[pallet_asset_conversion, AssetConversion]
 		[pallet_election_provider_multi_phase, ElectionProviderMultiPhase]
 		[pallet_election_provider_support_benchmarking, EPSBench::<Runtime>]
 		[pallet_elections_phragmen, Elections]
@@ -2280,23 +2280,23 @@ impl_runtime_apis! {
 		}
 	}
 
-	impl pallet_dex::DexApi<
+	impl pallet_asset_conversion::AssetConversionApi<
 		Block,
 		Balance,
 		u128,
 		NativeOrAssetId<u32>
 	> for Runtime
 	{
 		fn quote_price_exact_tokens_for_tokens(asset1: NativeOrAssetId<u32>, asset2: NativeOrAssetId<u32>, amount: u128, include_fee: bool) -> Option<Balance> {
-			Dex::quote_price_exact_tokens_for_tokens(asset1, asset2, amount, include_fee)
+			AssetConversion::quote_price_exact_tokens_for_tokens(asset1, asset2, amount, include_fee)
 		}
 
 		fn quote_price_tokens_for_exact_tokens(asset1: NativeOrAssetId<u32>, asset2: NativeOrAssetId<u32>, amount: u128, include_fee: bool) -> Option<Balance> {
-			Dex::quote_price_tokens_for_exact_tokens(asset1, asset2, amount, include_fee)
+			AssetConversion::quote_price_tokens_for_exact_tokens(asset1, asset2, amount, include_fee)
 		}
 
 		fn get_reserves(asset1: NativeOrAssetId<u32>, asset2: NativeOrAssetId<u32>) -> Option<(Balance, Balance)> {
-			Dex::get_reserves(asset1, asset2).ok()
+			AssetConversion::get_reserves(asset1, asset2).ok()
 		}
 	}
 

bin/node/testing/Cargo.toml

@@ -22,10 +22,10 @@ frame-system = { version = "4.0.0-dev", path = "../../../frame/system" }
 node-executor = { version = "3.0.0-dev", path = "../executor" }
 node-primitives = { version = "2.0.0", path = "../primitives" }
 kitchensink-runtime = { version = "3.0.0-dev", path = "../runtime" }
+pallet-asset-conversion = { version = "4.0.0-dev", path = "../../../frame/asset-conversion" }
 pallet-assets = { version = "4.0.0-dev", path = "../../../frame/assets" }
 pallet-asset-tx-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment/asset-tx-payment" }
 pallet-transaction-payment = { version = "4.0.0-dev", path = "../../../frame/transaction-payment" }
-pallet-dex = { version = "4.0.0-dev", path = "../../../frame/dex" }
 sc-block-builder = { version = "0.10.0-dev", path = "../../../client/block-builder" }
 sc-client-api = { version = "4.0.0-dev", path = "../../../client/api" }
 sc-client-db = { version = "0.10.0-dev", features = ["rocksdb"], path = "../../../client/db" }

frame/dex/Cargo.toml → frame/asset-conversion/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-name = "pallet-dex"
+name = "pallet-asset-conversion"
 version = "4.0.0-dev"
 authors = ["Parity Technologies <[email protected]>"]
 edition = "2021"
 license = "Apache-2.0"
 homepage = "https://substrate.io"
 repository = "https://github.com/paritytech/substrate/"
-description = "FRAME DEX AMM pallet"
+description = "FRAME asset conversion pallet"
 readme = "README.md"
 
 [package.metadata.docs.rs]

frame/dex/README.md → frame/asset-conversion/README.md

@@ -1,4 +1,4 @@
-# pallet-dex
+# asset-conversion
 
 ## A swap pallet
 
@@ -15,7 +15,7 @@ asset. This amount of asset will then be swapped to native by the implementation
 
 
 
-# pallet-dex
+# asset-conversion
 
 ## A swap pallet
 
@@ -35,7 +35,7 @@ Here is an example `state_call` that asks for a quote of a pool of native versus
 
 ```text
 curl -sS -H "Content-Type: application/json" -d \
-'{"id":1, "jsonrpc":"2.0", "method": "state_call", "params": ["DexApi_quote_price", "0x0101000000000000000000000011"]}' \
+'{"id":1, "jsonrpc":"2.0", "method": "state_call", "params": ["AssetConversionApi_quote_price", "0x0101000000000000000000000011"]}' \
 http://localhost:9933/
 ```