Skip to content

Add trade counterparty info and event type to order trades #2484

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
findolor wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Add trade counterparty info and event type to order trades #2484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
89699dc
Add __typename and sibling trades fields to SgTradeEvent
findolor Feb 27, 2026
2ceccd7
Add RaindexCounterparty and trade event type to RaindexTrade
findolor Feb 27, 2026
de0be6a
Update test fixtures for new SgTradeEvent fields
findolor Feb 27, 2026
c796ecf
Add counterparty column and trade type badge to OrderTradesListTable
findolor Feb 27, 2026
196a019
Address review feedback on OrderTradesListTable
findolor Feb 27, 2026
73e1753
Refactor RaindexCounterparty to use Tsify + impl_wasm_traits macro
findolor Feb 27, 2026
75405d6
Apply cargo fmt formatting
findolor Feb 27, 2026
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
4 changes: 3 additions & 1 deletion crates/cli/src/commands/trade/detail.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,13 +164,15 @@ mod tests {
},
"timestamp": "0",
"tradeEvent": {
"__typename": "TakeOrder",
"sender": encode_prefixed(Address::random()),
"transaction": {
"id": encode_prefixed(B256::random()),
"blockNumber": "0",
"timestamp": "0",
"from": encode_prefixed(Address::random())
}
},
"trades": []
},
"orderbook": {
"id": encode_prefixed(B256::random()),
Expand Down
4 changes: 3 additions & 1 deletion crates/cli/src/commands/trade/list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,13 +260,15 @@ mod tests {
},
"timestamp": "0",
"tradeEvent": {
"__typename": "TakeOrder",
"sender": encode_prefixed(Address::random()),
"transaction": {
"id": encode_prefixed(B256::random()),
"blockNumber": "0",
"timestamp": "0",
"from": encode_prefixed(Address::random())
}
},
"trades": []
},
"orderbook": {
"id": encode_prefixed(B256::random()),
Expand Down
2 changes: 2 additions & 0 deletions crates/common/src/local_db/query/fetch_order_trades/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ pub struct LocalDbOrderTrade {
pub output_delta: String,
pub output_running_balance: Option<String>,
pub trade_id: String,
pub counterparty_order_hash: Option<String>,
pub counterparty_owner: Option<String>,
}

/// Builds the SQL statement for retrieving order trades within the specified window.
Expand Down
20 changes: 15 additions & 5 deletions crates/common/src/local_db/query/fetch_order_trades/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ take_trades AS (
t.taker_output AS input_delta,
io_out.vault_id AS output_vault_id,
io_out.token AS output_token,
FLOAT_NEGATE(t.taker_input) AS output_delta
FLOAT_NEGATE(t.taker_input) AS output_delta,
NULL AS counterparty_order_hash,
t.sender AS counterparty_owner
FROM take_orders t
JOIN params p
ON t.chain_id = p.chain_id
Expand Down Expand Up @@ -104,7 +106,9 @@ clear_alice AS (
a.alice_input AS input_delta,
c.alice_output_vault_id AS output_vault_id,
io_out.token AS output_token,
FLOAT_NEGATE(a.alice_output) AS output_delta
FLOAT_NEGATE(a.alice_output) AS output_delta,
c.bob_order_hash AS counterparty_order_hash,
c.bob_order_owner AS counterparty_owner
FROM clear_v3_events c
JOIN params p
ON c.chain_id = p.chain_id
Expand Down Expand Up @@ -178,7 +182,9 @@ clear_bob AS (
a.bob_input AS input_delta,
c.bob_output_vault_id AS output_vault_id,
io_out.token AS output_token,
FLOAT_NEGATE(a.bob_output) AS output_delta
FLOAT_NEGATE(a.bob_output) AS output_delta,
c.alice_order_hash AS counterparty_order_hash,
c.alice_order_owner AS counterparty_owner
FROM clear_v3_events c
JOIN params p
ON c.chain_id = p.chain_id
Expand Down Expand Up @@ -262,7 +268,9 @@ trade_rows AS (
ut.input_delta,
ut.output_vault_id,
ut.output_token,
ut.output_delta
ut.output_delta,
ut.counterparty_order_hash,
ut.counterparty_owner
FROM unioned_trades ut
),
trade_with_snapshots AS (
Expand Down Expand Up @@ -317,7 +325,9 @@ SELECT
'0x' ||
lower(replace(tws.transaction_hash, '0x', '')) ||
printf('%016x', tws.log_index)
) AS trade_id
) AS trade_id,
tws.counterparty_order_hash,
tws.counterparty_owner
FROM trade_with_snapshots tws
LEFT JOIN vault_balance_changes vbc_input
ON vbc_input.chain_id = tws.chain_id
Expand Down
4 changes: 3 additions & 1 deletion crates/common/src/raindex_client/orders.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2825,13 +2825,15 @@ mod tests {
"id": "0x1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
"timestamp": "1632000000",
"tradeEvent": {
"__typename": "TakeOrder",
"sender": "0x0000000000000000000000000000000000000000",
"transaction": {
"id": "0x0000000000000000000000000000000000000000000000000000000000000000",
"from": "0x0000000000000000000000000000000000000000",
"timestamp": "1632000000",
"blockNumber": "0"
}
},
"trades": []
},
"order": {
"id": "0x557147dd0daa80d5beff0023fe6a3505469b2b8c4406ce1ab873e1a652572dd4",
Expand Down
Loading