Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion lib/rain.orderbook
Submodule rain.orderbook updated 70 files
+360 −6 Cargo.lock
+3 −0 Cargo.toml
+1 −1 crates/cli/src/commands/local_db/cli.rs
+1 −1 crates/cli/src/commands/local_db/pipeline/runner/environment.rs
+2 −2 crates/cli/src/commands/local_db/pipeline/runner/export.rs
+1 −1 crates/cli/src/commands/local_db/pipeline/runner/manifest.rs
+1 −1 crates/common/Cargo.toml
+72 −5 crates/common/src/local_db/fetch.rs
+1 −1 crates/common/src/local_db/pipeline/runner/environment.rs
+6 −2 crates/common/src/local_db/pipeline/runner/utils.rs
+3 −47 crates/common/src/local_db/query/fetch_orders/query.sql
+46 −0 crates/common/src/local_db/query/fetch_vaults/mod.rs
+37 −3 crates/common/src/local_db/query/fetch_vaults/query.sql
+4 −0 crates/common/src/local_db/token_fetch.rs
+1 −1 crates/common/src/raindex_client/local_db/pipeline/runner/environment.rs
+18 −0 crates/common/src/raindex_client/mod.rs
+361 −0 crates/common/src/raindex_client/orders.rs
+345 −0 crates/common/src/raindex_client/take_orders/approval.rs
+759 −265 crates/common/src/raindex_client/take_orders/e2e_tests.rs
+116 −54 crates/common/src/raindex_client/take_orders/mod.rs
+161 −100 crates/common/src/raindex_client/take_orders/request.rs
+421 −40 crates/common/src/raindex_client/take_orders/result.rs
+596 −0 crates/common/src/raindex_client/take_orders/single.rs
+1,870 −0 crates/common/src/raindex_client/take_orders/single_tests.rs
+134 −9 crates/common/src/retry.rs
+34 −0 crates/common/src/rpc_client.rs
+10 −10 crates/common/src/take_orders/config.rs
+6 −0 crates/common/src/take_orders/mod.rs
+562 −0 crates/common/src/take_orders/preflight.rs
+15 −11 crates/common/src/take_orders/simulation.rs
+56 −1 crates/common/src/test_helpers.rs
+29 −0 crates/rest_api/Cargo.toml
+225 −0 crates/rest_api/src/error.rs
+638 −0 crates/rest_api/src/main.rs
+1 −0 crates/rest_api/src/routes/mod.rs
+514 −0 crates/rest_api/src/routes/take_orders.rs
+3 −3 package-lock.json
+107 −1 packages/orderbook/README.md
+1 −1 packages/orderbook/package.json
+2 −2 packages/ui-components/package.json
+0 −51 packages/ui-components/src/__tests__/CheckboxMyItemsOnly.test.ts
+0 −106 packages/ui-components/src/__tests__/DropdownOrderListAccounts.test.ts
+5 −81 packages/ui-components/src/__tests__/ListViewOrderbookFilters.test.ts
+63 −0 packages/ui-components/src/__tests__/OrderDetail.test.ts
+90 −17 packages/ui-components/src/__tests__/OrdersListTable.test.ts
+144 −0 packages/ui-components/src/__tests__/TransactionManager.test.ts
+4 −6 packages/ui-components/src/__tests__/VaultsListTable.test.ts
+8 −15 packages/ui-components/src/lib/__mocks__/stores.ts
+0 −28 packages/ui-components/src/lib/components/CheckboxMyItemsOnly.svelte
+3 −19 packages/ui-components/src/lib/components/ListViewOrderbookFilters.svelte
+20 −8 packages/ui-components/src/lib/components/detail/OrderDetail.svelte
+0 −23 packages/ui-components/src/lib/components/dropdown/DropdownOrderListAccounts.svelte
+56 −0 packages/ui-components/src/lib/components/input/InputOwnerFilter.svelte
+103 −29 packages/ui-components/src/lib/components/tables/OrdersListTable.svelte
+6 −11 packages/ui-components/src/lib/components/tables/VaultsListTable.svelte
+1 −1 packages/ui-components/src/lib/index.ts
+54 −0 packages/ui-components/src/lib/providers/transactions/TransactionManager.ts
+3 −5 packages/ui-components/src/lib/types/appStores.ts
+2 −1 packages/ui-components/src/lib/types/transaction.ts
+737 −0 packages/webapp/src/__tests__/TakeOrderModal.test.ts
+410 −0 packages/webapp/src/__tests__/handleTakeOrder.test.ts
+479 −0 packages/webapp/src/lib/components/TakeOrderModal.svelte
+1 −1 packages/webapp/src/lib/constants.ts
+163 −0 packages/webapp/src/lib/services/handleTakeOrder.ts
+21 −0 packages/webapp/src/lib/services/modal.ts
+9 −15 packages/webapp/src/lib/stores/settings.ts
+4 −11 packages/webapp/src/routes/+layout.ts
+36 −11 packages/webapp/src/routes/orders/+page.svelte
+25 −4 packages/webapp/src/routes/orders/[chainId]-[orderbook]-[orderHash]/+page.svelte
+5 −6 packages/webapp/src/routes/vaults/+page.svelte
2 changes: 1 addition & 1 deletion src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub struct ApiErrorResponse {
pub error: ApiErrorDetail,
}

#[derive(Debug, thiserror::Error)]
#[derive(Debug, Clone, thiserror::Error)]
pub enum ApiError {
#[error("Bad request: {0}")]
BadRequest(String),
Expand Down
2 changes: 2 additions & 0 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ mod routes;
mod telemetry;
mod types;

pub(crate) const CHAIN_ID: u32 = 8453;

#[cfg(test)]
mod test_helpers;

Expand Down
193 changes: 190 additions & 3 deletions src/routes/swap/calldata.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
use super::{RaindexSwapDataSource, SwapDataSource};
use crate::auth::AuthenticatedKey;
use crate::error::{ApiError, ApiErrorResponse};
use crate::fairings::{GlobalRateLimit, TracingSpan};
use crate::types::swap::{SwapCalldataRequest, SwapCalldataResponse};
use rain_orderbook_common::raindex_client::take_orders::TakeOrdersRequest;
use rain_orderbook_common::take_orders::TakeOrdersMode;
use rocket::serde::json::Json;
use rocket::State;
use tracing::Instrument;
Expand All @@ -16,6 +19,7 @@ use tracing::Instrument;
(status = 200, description = "Swap calldata", body = SwapCalldataResponse),
(status = 400, description = "Bad request", body = ApiErrorResponse),
(status = 401, description = "Unauthorized", body = ApiErrorResponse),
(status = 404, description = "No liquidity found", body = ApiErrorResponse),
(status = 429, description = "Rate limited", body = ApiErrorResponse),
(status = 500, description = "Internal server error", body = ApiErrorResponse),
)
Expand All @@ -32,11 +36,194 @@ pub async fn post_swap_calldata(
async move {
tracing::info!(body = ?req, "request received");
let raindex = shared_raindex.read().await;
raindex
.run_with_client(move |_client| async move { todo!() })
let response = raindex
.run_with_client(move |client| async move {
let ds = RaindexSwapDataSource { client: &client };
process_swap_calldata(&ds, req).await
})
.await
.map_err(ApiError::from)?
.map_err(ApiError::from)??;
Ok(Json(response))
}
.instrument(span.0)
.await
}

async fn process_swap_calldata(
ds: &dyn SwapDataSource,
req: SwapCalldataRequest,
) -> Result<SwapCalldataResponse, ApiError> {
let take_req = TakeOrdersRequest {
taker: req.taker.to_string(),
chain_id: crate::CHAIN_ID,
sell_token: req.input_token.to_string(),
buy_token: req.output_token.to_string(),
mode: TakeOrdersMode::BuyUpTo,
amount: req.output_amount,
price_cap: req.maximum_io_ratio,
};

ds.get_calldata(take_req).await
}

#[cfg(test)]
mod tests {
use super::*;
use crate::routes::swap::test_fixtures::MockSwapDataSource;
use crate::test_helpers::{
basic_auth_header, mock_invalid_raindex_config, seed_api_key, TestClientBuilder,
};
use crate::types::common::Approval;
use alloy::primitives::{address, Address, Bytes, U256};
use rocket::http::{ContentType, Header, Status};

const USDC: Address = address!("833589fCD6eDb6E08f4c7C32D4f71b54bdA02913");
const WETH: Address = address!("4200000000000000000000000000000000000006");
const TAKER: Address = address!("1111111111111111111111111111111111111111");
const ORDERBOOK: Address = address!("d2938e7c9fe3597f78832ce780feb61945c377d7");

fn calldata_request(output_amount: &str, max_ratio: &str) -> SwapCalldataRequest {
SwapCalldataRequest {
taker: TAKER,
input_token: USDC,
output_token: WETH,
output_amount: output_amount.to_string(),
maximum_io_ratio: max_ratio.to_string(),
}
}

fn ready_response() -> SwapCalldataResponse {
SwapCalldataResponse {
to: ORDERBOOK,
data: Bytes::from(vec![0xab, 0xcd, 0xef]),
value: U256::ZERO,
estimated_input: "150".to_string(),
approvals: vec![],
}
}

fn approval_response() -> SwapCalldataResponse {
SwapCalldataResponse {
to: ORDERBOOK,
data: Bytes::new(),
value: U256::ZERO,
estimated_input: "1000".to_string(),
approvals: vec![Approval {
token: USDC,
spender: ORDERBOOK,
amount: "1000".to_string(),
symbol: String::new(),
approval_data: Bytes::from(vec![0x09, 0x5e, 0xa7, 0xb3]),
}],
}
}

#[rocket::async_test]
async fn test_process_swap_calldata_ready() {
let ds = MockSwapDataSource {
orders: Ok(vec![]),
candidates: vec![],
calldata_result: Ok(ready_response()),
};
let result = process_swap_calldata(&ds, calldata_request("100", "2.5"))
.await
.unwrap();

assert_eq!(result.to, ORDERBOOK);
assert!(!result.data.is_empty());
assert_eq!(result.value, U256::ZERO);
assert_eq!(result.estimated_input, "150");
assert!(result.approvals.is_empty());
}

#[rocket::async_test]
async fn test_process_swap_calldata_needs_approval() {
let ds = MockSwapDataSource {
orders: Ok(vec![]),
candidates: vec![],
calldata_result: Ok(approval_response()),
};
let result = process_swap_calldata(&ds, calldata_request("100", "2.5"))
.await
.unwrap();

assert_eq!(result.to, ORDERBOOK);
assert!(result.data.is_empty());
assert_eq!(result.approvals.len(), 1);
assert_eq!(result.approvals[0].token, USDC);
assert_eq!(result.approvals[0].spender, ORDERBOOK);
}

#[rocket::async_test]
async fn test_process_swap_calldata_not_found() {
let ds = MockSwapDataSource {
orders: Ok(vec![]),
candidates: vec![],
calldata_result: Err(ApiError::NotFound(
"no liquidity found for this pair".into(),
)),
};
let result = process_swap_calldata(&ds, calldata_request("100", "2.5")).await;
assert!(matches!(result, Err(ApiError::NotFound(msg)) if msg.contains("no liquidity")));
}

#[rocket::async_test]
async fn test_process_swap_calldata_bad_request() {
let ds = MockSwapDataSource {
orders: Ok(vec![]),
candidates: vec![],
calldata_result: Err(ApiError::BadRequest("invalid parameters".into())),
};
let result = process_swap_calldata(&ds, calldata_request("not-a-number", "2.5")).await;
assert!(matches!(result, Err(ApiError::BadRequest(_))));
}

#[rocket::async_test]
async fn test_process_swap_calldata_internal_error() {
let ds = MockSwapDataSource {
orders: Ok(vec![]),
candidates: vec![],
calldata_result: Err(ApiError::Internal("failed to generate calldata".into())),
};
let result = process_swap_calldata(&ds, calldata_request("100", "2.5")).await;
assert!(matches!(result, Err(ApiError::Internal(_))));
}

#[rocket::async_test]
async fn test_swap_calldata_401_without_auth() {
let client = TestClientBuilder::new().build().await;
let response = client
.post("/v1/swap/calldata")
.header(ContentType::JSON)
.body(r#"{"taker":"0x1111111111111111111111111111111111111111","inputToken":"0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913","outputToken":"0x4200000000000000000000000000000000000006","outputAmount":"100","maximumIoRatio":"2.5"}"#)
.dispatch()
.await;
assert_eq!(response.status(), Status::Unauthorized);
}

#[rocket::async_test]
async fn test_swap_calldata_500_when_client_init_fails() {
let config = mock_invalid_raindex_config().await;
let client = TestClientBuilder::new()
.raindex_config(config)
.build()
.await;
let (key_id, secret) = seed_api_key(&client).await;
let header = basic_auth_header(&key_id, &secret);
let response = client
.post("/v1/swap/calldata")
.header(Header::new("Authorization", header))
.header(ContentType::JSON)
.body(r#"{"taker":"0x1111111111111111111111111111111111111111","inputToken":"0x833589fCD6eDb6E08f4c7C32D4f71b54bdA02913","outputToken":"0x4200000000000000000000000000000000000006","outputAmount":"100","maximumIoRatio":"2.5"}"#)
.dispatch()
.await;
assert_eq!(response.status(), Status::InternalServerError);
let body: serde_json::Value =
serde_json::from_str(&response.into_string().await.unwrap()).unwrap();
assert_eq!(body["error"]["code"], "INTERNAL_ERROR");
assert_eq!(
body["error"]["message"],
"failed to initialize orderbook client"
);
}
}
Loading