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.

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

zeroex - update eth native taker #6256

Merged
merged 119 commits into from
Jul 12, 2024
Merged
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
f6d21d9
initial Socialtokens view
RantumBits Jun 1, 2021
e7ace1e
Rename socialTokens to socialtokens.sql
RantumBits Jun 1, 2021
1499c7f
Addded new tokens to list
RantumBits Jun 1, 2021
f578d63
Update socialtokens.sql
RantumBits Sep 22, 2021
2e74db3
Merge pull request #1 from ecomloop/rantum-social-token-addition
RantumBits Sep 22, 2021
b73611c
Merge branch 'duneanalytics:main' into master
RantumBits Nov 22, 2022
02edefc
Merge branch 'duneanalytics:main' into master
RantumBits Nov 29, 2022
319661c
Merge branch 'duneanalytics:main' into master
RantumBits Dec 12, 2022
b20259e
Merge branch 'duneanalytics:main' into master
RantumBits Dec 20, 2022
e52edc0
Merge branch 'duneanalytics:main' into master
RantumBits Jan 4, 2023
e211b4e
Merge branch 'duneanalytics:main' into master
RantumBits Jan 5, 2023
684abb9
Merge branch 'duneanalytics:main' into master
RantumBits Jan 6, 2023
09a63ef
Merge branch 'duneanalytics:main' into master
RantumBits Jan 9, 2023
9a68b84
rmv social tokens file
RantumBits Jan 9, 2023
a3d3cb7
Merge branch 'duneanalytics:main' into master
RantumBits Jan 18, 2023
505053b
Merge branch 'duneanalytics:main' into master
RantumBits Jan 23, 2023
518c5fe
Merge branch 'duneanalytics:main' into master
RantumBits Jan 26, 2023
7cee9b8
Merge branch 'duneanalytics:main' into master
RantumBits Feb 1, 2023
93917aa
Merge branch 'duneanalytics:main' into master
RantumBits Feb 8, 2023
d4d9963
Merge branch 'duneanalytics:main' into master
RantumBits Feb 15, 2023
7c49746
Merge branch 'duneanalytics:main' into master
RantumBits Feb 23, 2023
914cd71
Merge branch 'duneanalytics:main' into master
RantumBits Feb 27, 2023
5d1f667
Merge branch 'duneanalytics:main' into master
RantumBits Mar 6, 2023
b955bfd
Merge branch 'duneanalytics:main' into master
RantumBits Mar 9, 2023
7cba158
Merge branch 'duneanalytics:main' into master
RantumBits Mar 14, 2023
c6b3b71
Merge branch 'duneanalytics:main' into master
RantumBits Mar 21, 2023
33d71d5
Merge branch 'duneanalytics:main' into master
RantumBits Mar 25, 2023
5f42cb4
Merge branch 'duneanalytics:main' into master
RantumBits Mar 27, 2023
9dae894
Merge branch 'duneanalytics:main' into master
RantumBits Apr 3, 2023
e1dd83c
Merge branch 'duneanalytics:main' into master
RantumBits Apr 19, 2023
613d3d8
add zeroex to dex_aggregator.trades
RantumBits Apr 19, 2023
70c5620
Merge branch 'duneanalytics:main' into master
RantumBits Apr 20, 2023
8a046ab
Merge branch 'duneanalytics:main' into master
RantumBits Apr 24, 2023
7b98c75
Merge branch 'duneanalytics:main' into master
RantumBits Apr 27, 2023
8353a98
Merge branch 'duneanalytics:main' into master
RantumBits Apr 27, 2023
7a5b7e5
Merge branch 'duneanalytics:main' into master
RantumBits May 1, 2023
eac7e52
Merge branch 'duneanalytics:main' into master
RantumBits May 2, 2023
4cbab47
Merge branch 'duneanalytics:main' into master
RantumBits May 4, 2023
ca05b6f
Merge branch 'duneanalytics:main' into master
RantumBits May 12, 2023
570b785
Merge branch 'duneanalytics:main' into master
RantumBits May 16, 2023
f7f2d50
Merge branch 'duneanalytics:main' into master
RantumBits May 18, 2023
7c7dd0e
Merge branch 'duneanalytics:main' into master
RantumBits May 22, 2023
de3bd56
Merge branch 'duneanalytics:main' into master
RantumBits Jun 7, 2023
6933edd
Merge branch 'duneanalytics:main' into master
RantumBits Jun 15, 2023
2d9f122
Merge branch 'duneanalytics:main' into master
RantumBits Jul 13, 2023
6327876
Merge branch 'duneanalytics:main' into master
RantumBits Jul 18, 2023
cd14b48
Merge branch 'duneanalytics:main' into master
RantumBits Aug 10, 2023
db59657
Merge branch 'duneanalytics:main' into master
RantumBits Aug 14, 2023
66d2759
remove old branches
RantumBits Aug 14, 2023
449c32f
Merge branch 'duneanalytics:main' into master
RantumBits Aug 23, 2023
9056b46
Merge branch 'duneanalytics:main' into master
RantumBits Sep 6, 2023
c6e4fd5
reset profiles.yml
RantumBits Sep 6, 2023
c77ca06
Merge branch 'duneanalytics:main' into master
RantumBits Sep 7, 2023
0e05458
Merge branch 'duneanalytics:main' into master
RantumBits Sep 27, 2023
2825b3f
Merge branch 'duneanalytics:main' into master
RantumBits Oct 2, 2023
89fdd0c
Merge branch 'duneanalytics:main' into master
RantumBits Oct 3, 2023
a9f6c9e
Merge branch 'duneanalytics:main' into master
RantumBits Oct 24, 2023
dcc3591
Merge branch 'duneanalytics:main' into master
RantumBits Oct 25, 2023
c3b7815
Merge branch 'duneanalytics:main' into master
RantumBits Nov 7, 2023
337489a
Merge branch 'duneanalytics:main' into master
RantumBits Nov 8, 2023
361cdfd
Merge branch 'duneanalytics:main' into master
RantumBits Nov 9, 2023
620d344
Merge branch 'duneanalytics:main' into master
RantumBits Nov 13, 2023
4d3cdd8
Merge branch 'duneanalytics:main' into master
RantumBits Nov 16, 2023
3945166
Merge branch 'duneanalytics:main' into master
RantumBits Nov 17, 2023
0620638
Merge branch 'duneanalytics:main' into master
RantumBits Nov 20, 2023
8cc1585
Merge branch 'duneanalytics:main' into master
RantumBits Nov 21, 2023
7c14c8e
Merge branch 'duneanalytics:main' into master
RantumBits Nov 27, 2023
e3cb3da
remove
RantumBits Nov 28, 2023
a19c399
Merge branch 'duneanalytics:main' into master
RantumBits Nov 28, 2023
e8f368a
save
RantumBits Nov 28, 2023
a0aea37
Merge branch 'master' of https://github.com/RantumBits/dune-spellbook
RantumBits Nov 28, 2023
e7a5239
Merge branch 'duneanalytics:main' into master
RantumBits Nov 29, 2023
1bbb769
Merge branch 'master' of https://github.com/RantumBits/dune-spellbook
RantumBits Nov 29, 2023
9c99977
Merge branch 'duneanalytics:main' into master
RantumBits Nov 29, 2023
50f23a3
schema
RantumBits Nov 29, 2023
2224548
update to latest
RantumBits Mar 7, 2024
8061651
Merge branch 'duneanalytics:main' into master
RantumBits Mar 11, 2024
dadcabf
undo trnsfesr changes
RantumBits Mar 11, 2024
cd36999
Merge branch 'duneanalytics:main' into master
RantumBits Mar 11, 2024
6d0ef5b
Merge branch 'duneanalytics:main' into master
RantumBits Mar 12, 2024
1fd8527
Merge branch 'duneanalytics:main' into master
RantumBits Apr 1, 2024
97c70bf
Merge branch 'duneanalytics:main' into master
RantumBits Apr 30, 2024
7d521c4
Merge branch 'duneanalytics:main' into master
RantumBits May 13, 2024
43c0efd
Merge branch 'duneanalytics:main' into master
RantumBits May 31, 2024
f51afae
Merge branch 'duneanalytics:main' into master
RantumBits Jun 4, 2024
623e691
Merge branch 'duneanalytics:main' into master
RantumBits Jun 11, 2024
6b6acda
revise taker on gasless
RantumBits Jun 14, 2024
72bc7d8
change to block_time
RantumBits Jun 14, 2024
f96017b
block_time
RantumBits Jun 14, 2024
b88f7de
is_gaslesss
RantumBits Jun 14, 2024
8447a30
block_time
RantumBits Jun 14, 2024
20ca6e9
block_time
RantumBits Jun 14, 2024
3b66154
block_time
RantumBits Jun 14, 2024
c9f9315
Merge branch 'main' into eth-auto
RantumBits Jun 15, 2024
9612c17
block_time join
RantumBits Jun 17, 2024
b53916a
Merge branch 'eth-auto' of https://github.com/RantumBits/dune-spellbo…
RantumBits Jun 17, 2024
7cdb577
Merge branch 'eth-auto' of https://github.com/RantumBits/dune-spellbo…
RantumBits Jun 17, 2024
197c925
updates to model in new directory
RantumBits Jun 17, 2024
50859f6
schema
RantumBits Jun 17, 2024
8deafb9
Merge branch 'main' into eth-auto2
jeff-dude Jun 19, 2024
1488057
Merge branch 'main' into eth-auto2
jeff-dude Jun 19, 2024
e10c4eb
single gasless value
RantumBits Jun 21, 2024
3fdee00
Merge branch 'eth-auto2' of https://github.com/RantumBits/dune-spellb…
RantumBits Jun 21, 2024
475771f
gasless tx
RantumBits Jun 21, 2024
70fd27a
gasless tx
RantumBits Jun 21, 2024
63bf387
is_gasless
RantumBits Jun 21, 2024
6efebf3
Merge branch 'main' into eth-auto2
RantumBits Jun 21, 2024
a75feda
Merge branch 'main' into eth-auto2
jeff-dude Jun 24, 2024
d702894
udpate taker on uni direct swaps
RantumBits Jun 25, 2024
8f4fab3
Merge branch 'eth-auto2' of https://github.com/RantumBits/dune-spellb…
RantumBits Jun 25, 2024
7824b6e
update rfq taker on native fills
RantumBits Jun 25, 2024
2a343f9
revise seed taker
RantumBits Jun 25, 2024
a41c427
undo
RantumBits Jun 25, 2024
c28222d
tx.from
RantumBits Jun 25, 2024
868e3bd
restore api fills
RantumBits Jun 25, 2024
058ecd5
restore api fills
RantumBits Jun 25, 2024
e97491f
restore api fills
RantumBits Jun 25, 2024
f8be265
Merge branch 'main' into eth-native-taker
Hosuke Jul 6, 2024
6c2c3fe
inremental
RantumBits Jul 10, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ WITH
, fills.evt_tx_hash AS transaction_hash
, fills.evt_index
, fills.maker AS maker_address
, fills.taker AS taker_address
, 0xdef1c0ded9bec7f1a1670819833240f027b25eff AS taker_address
, fills.makerToken AS maker_token
, mt.symbol AS maker_symbol
, CASE WHEN lower(tt.symbol) > lower(mt.symbol) THEN concat(mt.symbol, '-', tt.symbol) ELSE concat(tt.symbol, '-', mt.symbol) END AS token_pair
Expand Down Expand Up @@ -254,8 +254,7 @@ WITH
fills.contract_address
, 'rfq' as native_order_type
FROM {{ source('zeroex_ethereum', 'ExchangeProxy_evt_RfqOrderFilled') }} fills
LEFT JOIN {{ source('prices', 'usd') }} tp ON
date_trunc('minute', evt_block_time) = tp.minute
LEFT JOIN {{ source('prices', 'usd') }} tp ON date_trunc('minute', evt_block_time) = tp.minute
{% if is_incremental() %}
jeff-dude marked this conversation as resolved.
Show resolved Hide resolved
AND {{ incremental_predicate('tp.minute') }}
{% endif %}
Expand All @@ -269,12 +268,6 @@ WITH
END = tp.contract_address
LEFT JOIN {{ source('prices', 'usd') }} mp ON
DATE_TRUNC('minute', evt_block_time) = mp.minute
{% if is_incremental() %}
AND {{ incremental_predicate('mp.minute') }}
{% endif %}
{% if not is_incremental() %}
AND evt_block_time >= TIMESTAMP '{{zeroex_v3_start_date}}'
{% endif %}
AND CASE
-- Set Deversifi ETHWrapper to WETH
WHEN fills.makerToken IN (0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee) THEN 0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2
Expand Down Expand Up @@ -398,7 +391,7 @@ SELECT distinct all_fills.block_time AS block
transaction_hash as tx_hash,
evt_index,
maker_address as maker,
taker_address as taker,
case when taker_address = 0xdef1c0ded9bec7f1a1670819833240f027b25eff then tx."from" else taker_address end as taker,
maker_token,
maker_token_filled_amount_raw as maker_token_amount_raw,
taker_token_filled_amount_raw as taker_token_amount_raw,
Expand Down
Loading