Skip to content
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

Jump to bottom

Add eth prices for dodo and mooniswap on dex trades #556

Merged
merged 2 commits into from
Nov 26, 2021
Merged

Add eth prices for dodo and mooniswap on dex trades #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dd20e9
Add ETH prices for mooniswap
masquot Nov 25, 2021
bb0a7c8
Update DODO
masquot Nov 25, 2021
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
15 changes: 10 additions & 5 deletions ethereum/dex/trades/insert_dodo.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ WITH rows AS (
token_b_amount_raw,
coalesce(
usd_amount,
token_a_amount_raw / 10 ^ pa.decimals * pa.price,
token_b_amount_raw / 10 ^ pb.decimals * pb.price
token_a_amount_raw / 10 ^ (CASE token_a_address WHEN '\xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' THEN 18 ELSE pa.decimals END) * (CASE token_a_address WHEN '\xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' THEN pe.price ELSE pa.price END),
token_b_amount_raw / 10 ^ (CASE token_b_address WHEN '\xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' THEN 18 ELSE pb.decimals END) * (CASE token_b_address WHEN '\xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' THEN pe.price ELSE pb.price END)
) as usd_amount,
token_a_address,
token_b_address,
Expand Down Expand Up @@ -109,7 +109,7 @@ WITH rows AS (
evt_block_time AS block_time,
'DODO' AS project,
'1' AS version,
'DEX' AS category,
'Aggregator' AS category,
sender AS trader_a,
NULL::bytea AS trader_b,
"fromAmount" token_a_amount_raw,
Expand All @@ -131,7 +131,7 @@ WITH rows AS (
evt_block_time AS block_time,
'DODO' AS project,
'1' AS version,
'DEX' AS category,
'Aggregator' AS category,
sender AS trader_a,
NULL::bytea AS trader_b,
"fromAmount" token_a_amount_raw,
Expand All @@ -153,7 +153,7 @@ WITH rows AS (
evt_block_time AS block_time,
'DODO' AS project,
'2' AS version,
'DEX' AS category,
'Aggregator' AS category,
sender AS trader_a,
NULL::bytea AS trader_b,
"fromAmount" token_a_amount_raw,
Expand Down Expand Up @@ -253,8 +253,13 @@ WITH rows AS (
AND pb.contract_address = dexs.token_b_address
AND pb.minute >= start_ts
AND pb.minute < end_ts
LEFT JOIN prices.layer1_usd pe ON pe.minute = date_trunc('minute', dexs.block_time)
AND pe.symbol = 'ETH'
AND pe.minute >= start_ts
AND pe.minute < end_ts
WHERE dexs.block_time >= start_ts
AND dexs.block_time < end_ts
AND dexs.token_a_address <> dexs.token_b_address

ON CONFLICT DO NOTHING
RETURNING 1
Expand Down
8 changes: 6 additions & 2 deletions ethereum/dex/trades/insert_mooniswap.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ WITH rows AS (
token_b_amount_raw,
coalesce(
usd_amount,
token_a_amount_raw / 10 ^ pa.decimals * pa.price,
token_b_amount_raw / 10 ^ pb.decimals * pb.price
token_a_amount_raw / 10 ^ (CASE token_a_address WHEN '\xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' THEN 18 ELSE pa.decimals END) * (CASE token_a_address WHEN '\xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' THEN pe.price ELSE pa.price END),
token_b_amount_raw / 10 ^ (CASE token_b_address WHEN '\xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' THEN 18 ELSE pb.decimals END) * (CASE token_b_address WHEN '\xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee' THEN pe.price ELSE pb.price END)
) as usd_amount,
token_a_address,
token_b_address,
Expand Down Expand Up @@ -94,6 +94,10 @@ WITH rows AS (
AND pb.contract_address = dexs.token_b_address
AND pb.minute >= start_ts
AND pb.minute < end_ts
LEFT JOIN prices.layer1_usd pe ON pe.minute = date_trunc('minute', dexs.block_time)
AND pe.symbol = 'ETH'
AND pe.minute >= start_ts
AND pe.minute < end_ts
WHERE dexs.block_time >= start_ts
AND dexs.block_time < end_ts
ON CONFLICT DO NOTHING
Expand Down