Skip to content

Commit

Permalink
Allow deny listing balancer pools
Browse files Browse the repository at this point in the history
  • Loading branch information
vkgnosis committed Jun 2, 2022
1 parent c025880 commit 8a8eda3
Show file tree
Hide file tree
Showing 5 changed files with 74 additions and 4 deletions.
1 change: 1 addition & 0 deletions crates/orderbook/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -502,6 +502,7 @@ async fn main() {
metrics.clone(),
client.clone(),
&contracts,
args.shared.balancer_pool_deny_list,
)
.await
.expect("failed to create Balancer pool fetcher"),
Expand Down
6 changes: 5 additions & 1 deletion crates/shared/src/arguments.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
sources::{balancer_v2::BalancerFactoryKind, BaselineSource},
};
use anyhow::{ensure, Context, Result};
use ethcontract::{H160, U256};
use ethcontract::{H160, U256, H256};
use std::{
num::{NonZeroU64, ParseFloatError},
str::FromStr,
Expand Down Expand Up @@ -140,6 +140,10 @@ pub struct Arguments {
/// The 1Inch REST API URL to use.
#[structopt(long, env, default_value = "https://api.1inch.exchange/")]
pub one_inch_url: Url,

/// Deny list of balancer pool ids.
#[clap(long, env, use_value_delimiter = true)]
pub balancer_pool_deny_list: Vec<H256>
}

pub fn parse_unbounded_factor(s: &str) -> Result<f64> {
Expand Down
1 change: 1 addition & 0 deletions crates/shared/src/price_estimation/quasimodo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -419,6 +419,7 @@ mod tests {
Arc::new(crate::sources::balancer_v2::pool_fetching::NoopBalancerPoolCacheMetrics),
client.clone(),
&contracts,
Default::default(),
)
.await
.expect("failed to create Balancer pool fetcher"),
Expand Down
69 changes: 66 additions & 3 deletions crates/shared/src/sources/balancer_v2/pool_fetching.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,11 @@ pub trait BalancerPoolFetching: Send + Sync {

pub struct BalancerPoolFetcher {
fetcher: Arc<dyn InternalPoolFetching>,
// We observed some balancer pools like https://app.balancer.fi/#/pool/0x072f14b85add63488ddad88f855fda4a99d6ac9b000200000000000000000027
// being problematic because their token balance becomes out of sync leading to simulation
// failures.
// https://forum.balancer.fi/t/medium-severity-bug-found/3161
pool_id_deny_list: Vec<H256>,
}

/// An enum containing all supported Balancer factory types.
Expand Down Expand Up @@ -185,6 +190,7 @@ impl BalancerPoolFetcher {
metrics: Arc<dyn BalancerPoolCacheMetrics>,
client: Client,
contracts: &BalancerContracts,
deny_listed_pool_ids: Vec<H256>,
) -> Result<Self> {
let pool_initializer = BalancerSubgraphClient::for_chain(chain_id, client)?;
let fetcher = Arc::new(Cache::new(
Expand All @@ -195,15 +201,21 @@ impl BalancerPoolFetcher {
metrics,
)?);

Ok(Self { fetcher })
Ok(Self {
fetcher,
pool_id_deny_list: deny_listed_pool_ids,
})
}

async fn fetch_pools(
&self,
token_pairs: HashSet<TokenPair>,
at_block: Block,
) -> Result<Vec<Pool>> {
let pool_ids = self.fetcher.pool_ids_for_token_pairs(token_pairs).await;
let mut pool_ids = self.fetcher.pool_ids_for_token_pairs(token_pairs).await;
for id in &self.pool_id_deny_list {
pool_ids.remove(id);
}
let pools = self.fetcher.pools_by_id(pool_ids, at_block).await?;

Ok(pools)
Expand Down Expand Up @@ -349,13 +361,15 @@ fn pool_address_from_id(pool_id: H256) -> H160 {

#[cfg(test)]
mod tests {
use std::time::Duration;

use super::*;
use crate::{
sources::balancer_v2::{
graph_api::{BalancerSubgraphClient, PoolData, PoolType},
pool_init::EmptyPoolInitializer,
},
token_info::TokenInfoFetcher,
token_info::{CachedTokenInfoFetcher, TokenInfoFetcher},
transport,
};
use hex_literal::hex;
Expand All @@ -370,6 +384,54 @@ mod tests {
);
}

#[tokio::test]
#[ignore]
async fn balancer_pool_fetcher_print() {
let transport = transport::create_env_test_transport();
let web3 = Web3::new(transport);
let chain_id = web3.eth().chain_id().await.unwrap().as_u64();
let contracts = BalancerContracts::new(&web3).await.unwrap();
let token_info_fetcher =
Arc::new(CachedTokenInfoFetcher::new(Box::new(TokenInfoFetcher {
web3: web3.clone(),
})));
let block_stream =
crate::current_block::current_block_stream(web3.clone(), Duration::from_secs(1000))
.await
.unwrap();
let deny_list = vec![H256(hex_literal::hex!(
"072f14b85add63488ddad88f855fda4a99d6ac9b000200000000000000000027"
))];
// let deny_list = vec![];
let pool_fetcher = BalancerPoolFetcher::new(
chain_id,
token_info_fetcher,
BalancerFactoryKind::value_variants(),
Default::default(),
block_stream,
Arc::new(NoopBalancerPoolCacheMetrics),
Default::default(),
&contracts,
deny_list,
)
.await
.unwrap();
pool_fetcher.run_maintenance().await.unwrap();
let pair = TokenPair::new(
addr!("C02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"),
addr!("C011a73ee8576Fb46F5E1c5751cA3B9Fe0af2a6F"),
)
.unwrap();
let fetched_pools_by_id = pool_fetcher
.fetch_pools([pair].into_iter().collect(), Block::Recent)
.await
.unwrap()
.into_iter()
.map(|pool| (pool.id, pool))
.collect::<HashMap<_, _>>();
dbg!(fetched_pools_by_id.len());
}

#[tokio::test]
#[ignore]
async fn balancer_fetched_pools_match_subgraph() {
Expand All @@ -394,6 +456,7 @@ mod tests {
.await
.unwrap(),
),
pool_id_deny_list: Default::default(),
};

// index all the pools.
Expand Down
1 change: 1 addition & 0 deletions crates/solver/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,7 @@ async fn main() {
metrics.clone(),
client.clone(),
&contracts,
args.shared.balancer_pool_deny_list,
)
.await
.expect("failed to create Balancer pool fetcher"),
Expand Down

0 comments on commit 8a8eda3

Please sign in to comment.