Merge pull request #1703 from opentensor/feat/uniswapv3-lp

Enable liquidity providers

Author: sam0x17

Cargo.lock

@@ -33,27 +33,35 @@ members = [
 ]
 resolver = "2"
 
+[workspace.package]
+edition = "2024"
+
 [workspace.lints.clippy]
-indexing-slicing = "deny"
 arithmetic-side-effects = "deny"
-type_complexity = "allow"
-unwrap-used = "deny"
+indexing-slicing = "deny"
 manual_inspect = "allow"
 result_large_err = "allow"
+type_complexity = "allow"
+unwrap-used = "deny"
 useless_conversion = "allow"     # until polkadot is patched
 
 [workspace.dependencies]
+node-subtensor-runtime = { default-features = false, path = "runtime" }
 pallet-admin-utils = { default-features = false, path = "pallets/admin-utils" }
 pallet-collective = { default-features = false, path = "pallets/collective" }
 pallet-commitments = { default-features = false, path = "pallets/commitments" }
 pallet-registry = { default-features = false, path = "pallets/registry" }
 pallet-crowdloan = { default-features = false, path = "pallets/crowdloan" }
 pallet-subtensor = { default-features = false, path = "pallets/subtensor" }
+pallet-subtensor-swap = { default-features = false, path = "pallets/swap" }
+pallet-subtensor-swap-runtime-api = { default-features = false, path = "pallets/swap/runtime-api" }
+pallet-subtensor-swap-rpc = { default-features = false, path = "pallets/swap/rpc" }
+safe-math = { default-features = false, path = "primitives/safe-math" }
 subtensor-custom-rpc = { default-features = false, path = "pallets/subtensor/rpc" }
 subtensor-custom-rpc-runtime-api = { default-features = false, path = "pallets/subtensor/runtime-api" }
 subtensor-precompiles = { default-features = false, path = "precompiles" }
 subtensor-runtime-common = { default-features = false, path = "common" }
-node-subtensor-runtime = { default-features = false, path = "runtime" }
+subtensor-swap-interface = { default-features = false, path = "pallets/swap-interface" }
 
 async-trait = "0.1"
 cargo-husky = { version = "1", default-features = false }
@@ -98,6 +106,7 @@ proc-macro2 = { version = "1", features = ["span-locations"] }
 thiserror = "1.0"
 walkdir = "2"
 approx = "0.5"
+alloy-primitives = { version = "0.8.23", default-features = false }
 
 subtensor-macros = { path = "support/macros" }
 
@@ -152,6 +161,7 @@ sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git",
 sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-6" }
 
 sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-6", default-features = false }
+sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-6", default-features = false }
 sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-6", default-features = false }
 sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-6", default-features = false }
 sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-6" }

Cargo.toml

@@ -13,7 +13,6 @@ targets = ["x86_64-unknown-linux-gnu"]
 [dependencies]
 codec = { workspace = true }
 frame-support = { workspace = true }
-precompile-utils = { workspace = true }
 scale-info = { workspace = true }
 serde = { workspace = true }
 sp-core = { workspace = true }
@@ -29,7 +28,6 @@ fast-blocks = []
 std = [
 	"codec/std",
 	"frame-support/std",
-	"precompile-utils/std",
 	"scale-info/std",
 	"serde/std",
 	"sp-core/std",

common/Cargo.toml

@@ -148,6 +148,37 @@ impl Default for ProxyType {
     }
 }
 
+pub trait SubnetInfo<AccountId> {
+    fn tao_reserve(netuid: NetUid) -> u64;
+    fn alpha_reserve(netuid: NetUid) -> u64;
+    fn exists(netuid: NetUid) -> bool;
+    fn mechanism(netuid: NetUid) -> u16;
+    fn is_owner(account_id: &AccountId, netuid: NetUid) -> bool;
+}
+
+pub trait BalanceOps<AccountId> {
+    fn tao_balance(account_id: &AccountId) -> u64;
+    fn alpha_balance(netuid: NetUid, coldkey: &AccountId, hotkey: &AccountId) -> u64;
+    fn increase_balance(coldkey: &AccountId, tao: u64);
+    fn decrease_balance(coldkey: &AccountId, tao: u64) -> Result<u64, DispatchError>;
+    fn increase_stake(
+        coldkey: &AccountId,
+        hotkey: &AccountId,
+        netuid: NetUid,
+        alpha: u64,
+    ) -> Result<(), DispatchError>;
+    fn decrease_stake(
+        coldkey: &AccountId,
+        hotkey: &AccountId,
+        netuid: NetUid,
+        alpha: u64,
+    ) -> Result<u64, DispatchError>;
+    fn increase_provided_tao_reserve(netuid: NetUid, tao: u64);
+    fn decrease_provided_tao_reserve(netuid: NetUid, tao: u64);
+    fn increase_provided_alpha_reserve(netuid: NetUid, alpha: u64);
+    fn decrease_provided_alpha_reserve(netuid: NetUid, alpha: u64);
+}
+
 pub mod time {
     use super::*;
 

common/src/lib.rs

@@ -111,6 +111,8 @@ node-subtensor-runtime = { workspace = true, features = ["std"] }
 subtensor-runtime-common = { workspace = true, features = ["std"] }
 subtensor-custom-rpc = { workspace = true, features = ["std"] }
 subtensor-custom-rpc-runtime-api = { workspace = true, features = ["std"] }
+pallet-subtensor-swap-rpc = { workspace = true, features = ["std"] }
+pallet-subtensor-swap-runtime-api = { workspace = true, features = ["std"] }
 
 [build-dependencies]
 substrate-build-script-utils = { workspace = true }

node/Cargo.toml

@@ -115,6 +115,7 @@ where
     CIDP: CreateInherentDataProviders<Block, ()> + Send + Clone + 'static,
     CT: fp_rpc::ConvertTransaction<<Block as BlockT>::Extrinsic> + Send + Sync + Clone + 'static,
 {
+    use pallet_subtensor_swap_rpc::{Swap, SwapRpcApiServer};
     use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
     use sc_consensus_manual_seal::rpc::{ManualSeal, ManualSealApiServer};
     use substrate_frame_rpc_system::{System, SystemApiServer};
@@ -131,6 +132,9 @@ where
     // Custom RPC methods for Paratensor
     module.merge(SubtensorCustom::new(client.clone()).into_rpc())?;
 
+    // Swap RPC
+    module.merge(Swap::new(client.clone()).into_rpc())?;
+
     module.merge(System::new(client.clone(), pool.clone()).into_rpc())?;
     module.merge(TransactionPayment::new(client).into_rpc())?;
 

node/src/rpc.rs

@@ -32,6 +32,7 @@ substrate-fixed = { workspace = true }
 pallet-evm-chain-id = { workspace = true }
 pallet-drand = { workspace = true, default-features = false }
 sp-consensus-grandpa = { workspace = true }
+subtensor-swap-interface = { workspace = true }
 subtensor-runtime-common = { workspace = true }
 
 [dev-dependencies]
@@ -43,6 +44,7 @@ pallet-balances = { workspace = true, features = ["std"] }
 pallet-scheduler = { workspace = true }
 pallet-grandpa = { workspace = true }
 sp-std = { workspace = true }
+pallet-subtensor-swap = { workspace = true }
 
 [features]
 default = ["std"]
@@ -57,6 +59,7 @@ std = [
 	"pallet-evm-chain-id/std",
 	"pallet-grandpa/std",
 	"pallet-scheduler/std",
+	"pallet-subtensor-swap/std",
 	"pallet-subtensor/std",
 	"scale-info/std",
 	"sp-consensus-aura/std",
@@ -68,6 +71,7 @@ std = [
 	"sp-tracing/std",
 	"sp-weights/std",
 	"substrate-fixed/std",
+	"subtensor-swap-interface/std",
 	"subtensor-runtime-common/std"
 ]
 runtime-benchmarks = [
@@ -79,6 +83,7 @@ runtime-benchmarks = [
 	"pallet-grandpa/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
 	"pallet-subtensor/runtime-benchmarks",
+	"pallet-subtensor-swap/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [

pallets/admin-utils/Cargo.toml

@@ -1088,7 +1088,7 @@ pub mod pallet {
             log::trace!("Setting minimum stake to: {}", min_stake);
             pallet_subtensor::Pallet::<T>::set_nominator_min_required_stake(min_stake);
             if min_stake > prev_min_stake {
-                log::trace!("Clearing small nominations");
+                log::trace!("Clearing small nominations if possible");
                 pallet_subtensor::Pallet::<T>::clear_small_nominations();
                 log::trace!("Small nominations cleared");
             }

pallets/admin-utils/src/lib.rs

@@ -1,7 +1,9 @@
 #![allow(clippy::arithmetic_side_effects, clippy::unwrap_used)]
 
+use core::num::NonZeroU64;
+
 use frame_support::{
-    assert_ok, derive_impl, parameter_types,
+    PalletId, assert_ok, derive_impl, parameter_types,
     traits::{Everything, Hooks, InherentBuilder, PrivilegeCmp},
 };
 use frame_system::{self as system, offchain::CreateTransactionBase};
@@ -32,6 +34,7 @@ frame_support::construct_runtime!(
         Drand: pallet_drand::{Pallet, Call, Storage, Event<T>} = 6,
         Grandpa: pallet_grandpa = 7,
         EVMChainId: pallet_evm_chain_id = 8,
+        Swap: pallet_subtensor_swap::{Pallet, Call, Storage, Event<T>} = 9,
     }
 );
 
@@ -213,6 +216,7 @@ impl pallet_subtensor::Config for Test {
     type InitialTaoWeight = InitialTaoWeight;
     type InitialEmaPriceHalvingPeriod = InitialEmaPriceHalvingPeriod;
     type DurationOfStartCall = DurationOfStartCall;
+    type SwapInterface = Swap;
     type KeySwapOnSubnetCost = InitialKeySwapOnSubnetCost;
     type HotkeySwapOnSubnetInterval = HotkeySwapOnSubnetInterval;
 }
@@ -273,6 +277,27 @@ impl pallet_balances::Config for Test {
     type RuntimeHoldReason = ();
 }
 
+// Swap-related parameter types
+parameter_types! {
+    pub const SwapProtocolId: PalletId = PalletId(*b"ten/swap");
+    pub const SwapMaxFeeRate: u16 = 10000; // 15.26%
+    pub const SwapMaxPositions: u32 = 100;
+    pub const SwapMinimumLiquidity: u64 = 1_000;
+    pub const SwapMinimumReserve: NonZeroU64 = NonZeroU64::new(1_000_000).unwrap();
+}
+
+impl pallet_subtensor_swap::Config for Test {
+    type RuntimeEvent = RuntimeEvent;
+    type SubnetInfo = SubtensorModule;
+    type BalanceOps = SubtensorModule;
+    type ProtocolId = SwapProtocolId;
+    type MaxFeeRate = SwapMaxFeeRate;
+    type MaxPositions = SwapMaxPositions;
+    type MinimumLiquidity = SwapMinimumLiquidity;
+    type MinimumReserve = SwapMinimumReserve;
+    type WeightInfo = ();
+}
+
 pub struct OriginPrivilegeCmp;
 
 impl PrivilegeCmp<OriginCaller> for OriginPrivilegeCmp {

pallets/admin-utils/src/tests/mock.rs

@@ -44,6 +44,8 @@ hex = { workspace = true }
 share-pool = { default-features = false, path = "../../primitives/share-pool" }
 safe-math = { default-features = false, path = "../../primitives/safe-math" }
 approx = { workspace = true }
+subtensor-swap-interface = { workspace = true }
+subtensor-runtime-common = { workspace = true }
 
 pallet-collective = { version = "4.0.0-dev", default-features = false, path = "../collective" }
 pallet-drand = { path = "../drand", default-features = false }
@@ -58,11 +60,11 @@ ark-serialize = { workspace = true, default-features = false }
 w3f-bls = { workspace = true, default-features = false }
 sha2 = { workspace = true }
 rand_chacha = { workspace = true }
-subtensor-runtime-common = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, features = ["std"] }
 pallet-scheduler = { workspace = true }
+pallet-subtensor-swap = { workspace = true }
 sp-version = { workspace = true }
 # Substrate
 sp-tracing = { workspace = true }
@@ -91,6 +93,7 @@ std = [
 	"pallet-membership/std",
 	"pallet-preimage/std",
 	"pallet-scheduler/std",
+	"pallet-subtensor-swap/std",
 	"pallet-transaction-payment/std",
 	"pallet-utility/std",
 	"rand_chacha/std",
@@ -111,6 +114,7 @@ std = [
 	"substrate-fixed/std",
 	"substrate-fixed/std",
 	"subtensor-runtime-common/std",
+	"subtensor-swap-interface/std",
 	"tle/std",
 	"w3f-bls/std",
 ]
@@ -120,14 +124,15 @@ runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-membership/runtime-benchmarks",
-	"pallet-utility/runtime-benchmarks",
-	"sp-runtime/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
+	"pallet-drand/runtime-benchmarks",
+	"pallet-membership/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
-	"pallet-drand/runtime-benchmarks",
+	"pallet-subtensor-swap/runtime-benchmarks",
 	"pallet-transaction-payment/runtime-benchmarks",
+	"pallet-utility/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
 ]
 try-runtime = [
 	"frame-support/try-runtime",