Merge pull request #129 from shuhuiluo/transport

refactor(ext): update dependencies and refactor `Transport` to `Network`

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "uniswap-v3-sdk"
-version = "3.4.0"
+version = "3.5.0"
 edition = "2021"
 authors = ["Shuhui Luo <twitter.com/aureliano_law>"]
 description = "Uniswap V3 SDK for Rust"
@@ -15,7 +15,7 @@ exclude = [".github", ".gitignore", "rustfmt.toml"]
 all-features = true
 
 [dependencies]
-alloy = { version = "0.9", optional = true, features = ["contract"] }
+alloy = { version = "0.11", optional = true, features = ["contract"] }
 alloy-primitives = "0.8"
 alloy-sol-types = "0.8"
 anyhow = { version = "1.0", optional = true }
@@ -29,7 +29,7 @@ once_cell = "1.20"
 regex = { version = "1.11", optional = true }
 serde_json = { version = "1.0", optional = true }
 thiserror = { version = "2", default-features = false }
-uniswap-lens = { version = "0.10", optional = true }
+uniswap-lens = { version = "0.11", optional = true }
 uniswap-sdk-core = "3.4.0"
 
 [features]
@@ -38,11 +38,11 @@ extensions = ["alloy", "anyhow", "base64", "regex", "serde_json", "uniswap-lens"
 std = ["alloy?/std", "thiserror/std", "uniswap-sdk-core/std", "uniswap-lens?/std"]
 
 [dev-dependencies]
-alloy = { version = "0.9", features = ["provider-anvil-node", "signer-local"] }
+alloy = { version = "0.11", features = ["provider-anvil-node", "signer-local"] }
 criterion = "0.5.1"
 dotenv = "0.15.0"
-tokio = { version = "1.40", features = ["full"] }
-uniswap_v3_math = "0.5.2"
+tokio = { version = "1.43", features = ["full"] }
+uniswap_v3_math = "0.5.3"
 
 [[bench]]
 name = "bit_math"

examples/nonfungible_position_manager.rs

@@ -1,14 +1,14 @@
 use alloy::{
     eips::BlockId,
+    network::{Network, TransactionBuilder},
     node_bindings::WEI_IN_ETHER,
     providers::{ext::AnvilApi, Provider, ProviderBuilder},
-    rpc::types::TransactionRequest,
     signers::{
         k256::ecdsa::SigningKey,
         local::{LocalSigner, PrivateKeySigner},
         SignerSync,
     },
-    transports::{http::reqwest::Url, Transport},
+    transports::http::reqwest::Url,
 };
 use alloy_primitives::{address, Address, U256};
 use uniswap_lens::bindings::ierc721enumerable::IERC721Enumerable;
@@ -30,13 +30,11 @@ async fn main() {
     let npm = *NONFUNGIBLE_POSITION_MANAGER_ADDRESSES.get(&1).unwrap();
 
     // Create an Anvil fork
-    let provider = ProviderBuilder::new()
-        .with_recommended_fillers()
-        .on_anvil_with_config(|anvil| {
-            anvil
-                .fork(rpc_url)
-                .fork_block_number(block_id.as_u64().unwrap())
-        });
+    let provider = ProviderBuilder::new().on_anvil_with_config(|anvil| {
+        anvil
+            .fork(rpc_url)
+            .fork_block_number(block_id.as_u64().unwrap())
+    });
     provider.anvil_auto_impersonate_account(true).await.unwrap();
     let account: LocalSigner<SigningKey> = PrivateKeySigner::random();
     provider
@@ -120,10 +118,10 @@ async fn main() {
 }
 
 /// Mint a position
-async fn mint_liquidity<T, P>(position: &mut Position, from: Address, provider: &P) -> U256
+async fn mint_liquidity<N, P>(position: &mut Position, from: Address, provider: &P) -> U256
 where
-    T: Transport + Clone,
-    P: Provider<T>,
+    N: Network,
+    P: Provider<N>,
 {
     let npm = *NONFUNGIBLE_POSITION_MANAGER_ADDRESSES.get(&1).unwrap();
 
@@ -139,10 +137,10 @@ where
         }),
     };
     let params = add_call_parameters(position, options).unwrap();
-    let tx = TransactionRequest::default()
-        .from(from)
-        .to(npm)
-        .input(params.calldata.into());
+    let tx = N::TransactionRequest::default()
+        .with_from(from)
+        .with_to(npm)
+        .with_input(params.calldata);
     provider
         .send_transaction(tx)
         .await
@@ -160,15 +158,15 @@ where
 }
 
 /// Burn a position with a permit
-async fn burn_liquidity<T, P>(
+async fn burn_liquidity<N, P>(
     token_id: U256,
     position: &Position,
     owner: &LocalSigner<SigningKey>,
     sender: Address,
     provider: &P,
 ) where
-    T: Transport + Clone,
-    P: Provider<T>,
+    N: Network,
+    P: Provider<N>,
 {
     let npm = *NONFUNGIBLE_POSITION_MANAGER_ADDRESSES.get(&1).unwrap();
 
@@ -213,10 +211,10 @@ async fn burn_liquidity<T, P>(
         },
     };
     let params = remove_call_parameters(position, options).unwrap();
-    let tx = TransactionRequest::default()
-        .from(sender)
-        .to(npm)
-        .input(params.calldata.into());
+    let tx = N::TransactionRequest::default()
+        .with_from(sender)
+        .with_to(npm)
+        .with_input(params.calldata);
     provider
         .send_transaction(tx)
         .await

examples/self_permit.rs

@@ -38,13 +38,11 @@ async fn main() {
     let block_id = BlockId::from(17000000);
 
     // Create an Anvil fork
-    let provider = ProviderBuilder::new()
-        .with_recommended_fillers()
-        .on_anvil_with_config(|anvil| {
-            anvil
-                .fork(rpc_url)
-                .fork_block_number(block_id.as_u64().unwrap())
-        });
+    let provider = ProviderBuilder::new().on_anvil_with_config(|anvil| {
+        anvil
+            .fork(rpc_url)
+            .fork_block_number(block_id.as_u64().unwrap())
+    });
     provider.anvil_auto_impersonate_account(true).await.unwrap();
 
     let usdc = token!(1, "A0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48", 6);

examples/swap_router.rs

@@ -65,13 +65,11 @@ async fn main() {
     println!("Quoter amount out: {}", amount_out);
 
     // Create an Anvil fork
-    let provider = ProviderBuilder::new()
-        .with_recommended_fillers()
-        .on_anvil_with_config(|anvil| {
-            anvil
-                .fork(rpc_url)
-                .fork_block_number(block_id.as_u64().unwrap())
-        });
+    let provider = ProviderBuilder::new().on_anvil_with_config(|anvil| {
+        anvil
+            .fork(rpc_url)
+            .fork_block_number(block_id.as_u64().unwrap())
+    });
     let account = provider.get_accounts().await.unwrap()[0];
 
     // Build the swap transaction

src/entities/trade.rs

@@ -114,14 +114,14 @@ where
 
     /// Returns the input currency of the swap
     #[inline]
-    pub fn input_currency(&self) -> &TInput {
-        &self.input_amount.currency
+    pub const fn input_currency(&self) -> &TInput {
+        &self.input_amount.meta.currency
     }
 
     /// Returns the output currency of the swap
     #[inline]
-    pub fn output_currency(&self) -> &TOutput {
-        &self.output_amount.currency
+    pub const fn output_currency(&self) -> &TOutput {
+        &self.output_amount.meta.currency
     }
 }
 

src/extensions/ephemeral_tick_data_provider.rs

@@ -2,7 +2,7 @@
 //! A data provider that fetches ticks using an [ephemeral contract](https://github.com/Aperture-Finance/Aperture-Lens/blob/904101e4daed59e02fd4b758b98b0749e70b583b/contracts/EphemeralGetPopulatedTicksInRange.sol) in a single `eth_call`.
 
 use crate::prelude::*;
-use alloy::{eips::BlockId, providers::Provider, transports::Transport};
+use alloy::{eips::BlockId, network::Network, providers::Provider};
 use alloy_primitives::{aliases::I24, Address};
 use derive_more::Deref;
 use uniswap_lens::pool_lens;
@@ -21,16 +21,16 @@ pub struct EphemeralTickDataProvider<I = I24> {
 
 impl<I: TickIndex> EphemeralTickDataProvider<I> {
     #[inline]
-    pub async fn new<T, P>(
+    pub async fn new<N, P>(
         pool: Address,
         provider: P,
         tick_lower: Option<I>,
         tick_upper: Option<I>,
         block_id: Option<BlockId>,
     ) -> Result<Self, Error>
     where
-        T: Transport + Clone,
-        P: Provider<T>,
+        N: Network,
+        P: Provider<N>,
     {
         let tick_lower = tick_lower.map_or(MIN_TICK, I::to_i24);
         let tick_upper = tick_upper.map_or(MAX_TICK, I::to_i24);

src/extensions/ephemeral_tick_map_data_provider.rs

@@ -2,7 +2,7 @@
 //! A data provider that fetches ticks using an [ephemeral contract](https://github.com/Aperture-Finance/Aperture-Lens/blob/904101e4daed59e02fd4b758b98b0749e70b583b/contracts/EphemeralGetPopulatedTicksInRange.sol) in a single `eth_call`.
 
 use crate::prelude::*;
-use alloy::{eips::BlockId, providers::Provider, transports::Transport};
+use alloy::{eips::BlockId, network::Network, providers::Provider};
 use alloy_primitives::{aliases::I24, Address};
 use derive_more::Deref;
 
@@ -20,16 +20,16 @@ pub struct EphemeralTickMapDataProvider<I = I24> {
 
 impl<I: TickIndex> EphemeralTickMapDataProvider<I> {
     #[inline]
-    pub async fn new<T, P>(
+    pub async fn new<N, P>(
         pool: Address,
         provider: P,
         tick_lower: Option<I>,
         tick_upper: Option<I>,
         block_id: Option<BlockId>,
     ) -> Result<Self, Error>
     where
-        T: Transport + Clone,
-        P: Provider<T>,
+        N: Network,
+        P: Provider<N>,
     {
         let provider =
             EphemeralTickDataProvider::new(pool, provider, tick_lower, tick_upper, block_id)

src/extensions/pool.rs

@@ -6,8 +6,8 @@
 use crate::prelude::*;
 use alloy::{
     eips::{BlockId, BlockNumberOrTag},
+    network::Network,
     providers::Provider,
-    transports::Transport,
 };
 use alloy_primitives::{Address, ChainId, B256};
 use uniswap_lens::{
@@ -19,16 +19,16 @@ use uniswap_lens::{
 use uniswap_sdk_core::{prelude::Token, token};
 
 #[inline]
-pub fn get_pool_contract<T, P>(
+pub fn get_pool_contract<N, P>(
     factory: Address,
     token_a: Address,
     token_b: Address,
     fee: FeeAmount,
     provider: P,
-) -> IUniswapV3PoolInstance<T, P>
+) -> IUniswapV3PoolInstance<(), P, N>
 where
-    T: Transport + Clone,
-    P: Provider<T>,
+    N: Network,
+    P: Provider<N>,
 {
     IUniswapV3PoolInstance::new(
         compute_pool_address(factory, token_a, token_b, fee, None, None),
@@ -49,7 +49,7 @@ impl Pool {
     /// * `provider`: The alloy provider
     /// * `block_id`: Optional block number to query.
     #[inline]
-    pub async fn from_pool_key<T, P>(
+    pub async fn from_pool_key<N, P>(
         chain_id: ChainId,
         factory: Address,
         token_a: Address,
@@ -59,13 +59,13 @@ impl Pool {
         block_id: Option<BlockId>,
     ) -> Result<Self, Error>
     where
-        T: Transport + Clone,
-        P: Provider<T> + Clone,
+        N: Network,
+        P: Provider<N>,
     {
         let block_id = block_id.unwrap_or(BlockId::Number(BlockNumberOrTag::Latest));
-        let pool_contract = get_pool_contract(factory, token_a, token_b, fee, provider.clone());
-        let token_a_contract = IERC20Metadata::new(token_a, provider.clone());
-        let token_b_contract = IERC20Metadata::new(token_b, provider);
+        let pool_contract = get_pool_contract(factory, token_a, token_b, fee, provider.root());
+        let token_a_contract = IERC20Metadata::new(token_a, provider.root());
+        let token_b_contract = IERC20Metadata::new(token_b, provider.root());
         // TODO: use multicall
         let slot_0 = pool_contract.slot0().block(block_id).call().await?;
         let liquidity = pool_contract.liquidity().block(block_id).call().await?._0;
@@ -146,7 +146,7 @@ impl<I: TickIndex> Pool<EphemeralTickMapDataProvider<I>> {
     /// }
     /// ```
     #[inline]
-    pub async fn from_pool_key_with_tick_data_provider<T, P>(
+    pub async fn from_pool_key_with_tick_data_provider<N, P>(
         chain_id: ChainId,
         factory: Address,
         token_a: Address,
@@ -156,16 +156,16 @@ impl<I: TickIndex> Pool<EphemeralTickMapDataProvider<I>> {
         block_id: Option<BlockId>,
     ) -> Result<Self, Error>
     where
-        T: Transport + Clone,
-        P: Provider<T> + Clone,
+        N: Network,
+        P: Provider<N>,
     {
         let pool = Pool::from_pool_key(
             chain_id,
             factory,
             token_a,
             token_b,
             fee,
-            provider.clone(),
+            provider.root(),
             block_id,
         )
         .await?;
@@ -265,7 +265,7 @@ pub fn reconstruct_liquidity_array<I: TickIndex>(
 ///
 /// An array of ticks and corresponding cumulative liquidity.
 #[inline]
-pub async fn get_liquidity_array_for_pool<TP, T, P>(
+pub async fn get_liquidity_array_for_pool<TP, N, P>(
     pool: Pool<TP>,
     tick_lower: TP::Index,
     tick_upper: TP::Index,
@@ -276,8 +276,8 @@ pub async fn get_liquidity_array_for_pool<TP, T, P>(
 ) -> Result<Vec<(TP::Index, u128)>, Error>
 where
     TP: TickDataProvider,
-    T: Transport + Clone,
-    P: Provider<T>,
+    N: Network,
+    P: Provider<N>,
 {
     let (tick_current_aligned, tick_lower, tick_upper) = normalize_ticks(
         pool.tick_current,