diff --git a/dex/models/trades/base/_schema.yml b/dex/models/trades/base/_schema.yml index d4f9a7483eb..5c8979de934 100644 --- a/dex/models/trades/base/_schema.yml +++ b/dex/models/trades/base/_schema.yml @@ -30,7 +30,7 @@ models: blockchain: base sector: dex project: aerodrome - contributors: msilb7, tomfutago + contributors: msilb7, tomfutago, Henrystats config: tags: [ 'base', 'dex', 'trades', 'aerodrome' ] description: aerodrome base trades diff --git a/dex/models/trades/base/platforms/aerodrome_base_base_trades.sql b/dex/models/trades/base/platforms/aerodrome_base_base_trades.sql index ace7300a2ee..7a184db1dca 100644 --- a/dex/models/trades/base/platforms/aerodrome_base_base_trades.sql +++ b/dex/models/trades/base/platforms/aerodrome_base_base_trades.sql @@ -10,13 +10,69 @@ ) }} -{{ - uniswap_compatible_v2_trades( - blockchain = 'base', - project = 'aerodrome', - version = '1', - Pair_evt_Swap = source('aerodrome_base', 'Pool_evt_Swap'), - Factory_evt_PairCreated = source('aerodrome_base', 'PoolFactory_evt_PoolCreated'), - pair_column_name = 'pool' +WITH + +dexs_v1 AS ( + {{ + uniswap_compatible_v2_trades( + blockchain = 'base', + project = 'aerodrome', + version = '1', + Pair_evt_Swap = source('aerodrome_base', 'Pool_evt_Swap'), + Factory_evt_PairCreated = source('aerodrome_base', 'PoolFactory_evt_PoolCreated'), + pair_column_name = 'pool' ) -}} + }} +), + +dexs_v2 AS ( + {{ + uniswap_compatible_v3_trades( + blockchain = 'base', + project = 'aerodrome', + version = 'slipstream', + Pair_evt_Swap = source('aerodrome_base', 'CLPool_evt_Swap'), + Factory_evt_PoolCreated = source('aerodrome_base', 'CLFactory_evt_PoolCreated'), + optional_columns = null + ) + }} +) + +SELECT + dexs_v1.blockchain, + dexs_v1.project, + dexs_v1.version, + dexs_v1.block_month, + dexs_v1.block_date, + dexs_v1.block_time, + dexs_v1.block_number, + dexs_v1.token_bought_amount_raw, + dexs_v1.token_sold_amount_raw, + dexs_v1.token_bought_address, + dexs_v1.token_sold_address, + dexs_v1.taker, + dexs_v1.maker, + dexs_v1.project_contract_address, + dexs_v1.tx_hash, + dexs_v1.evt_index +FROM dexs_v1 +UNION ALL +SELECT + dexs_v2.blockchain, + dexs_v2.project, + dexs_v2.version, + dexs_v2.block_month, + dexs_v2.block_date, + dexs_v2.block_time, + dexs_v2.block_number, + dexs_v2.token_bought_amount_raw, + dexs_v2.token_sold_amount_raw, + dexs_v2.token_bought_address, + dexs_v2.token_sold_address, + dexs_v2.taker, + dexs_v2.maker, + dexs_v2.project_contract_address, + dexs_v2.tx_hash, + dexs_v2.evt_index +FROM dexs_v2 + diff --git a/dex/seeds/trades/aerodrome_base_base_trades_seed.csv b/dex/seeds/trades/aerodrome_base_base_trades_seed.csv index 20c008ebad8..081126dee5f 100644 --- a/dex/seeds/trades/aerodrome_base_base_trades_seed.csv +++ b/dex/seeds/trades/aerodrome_base_base_trades_seed.csv @@ -4,3 +4,5 @@ base,aerodrome,1,2023-08-29,0x7d759da49295695ec7cade65a7f8abbdf83d6f639efa03ad73 base,aerodrome,1,2023-08-29,0x3c00dfe0b735b6c7f3dd302e41cdb5bc32fa64ce98b958ea2a99e9b868f24976,8,0xd9aaec86b65d86f6a7b5b1b0c42ffa531710b6ca,0x4200000000000000000000000000000000000006,3242321,16521567,10000000000000000 base,aerodrome,1,2023-08-29,0x644579f1f66b20b7aacddc4300ea746963ef3c68c37b32d14c7a9f59a92d2151,17,0x9e53e88dcff56d3062510a745952dec4cefdff9e,0x4200000000000000000000000000000000000006,3241443,1588864691284781064569017,300000000000000000 base,aerodrome,1,2023-08-29,0x552ae20fd4164aa9ef2a37616510c7dd54333733578a4af20074e81dc14af8ce,143,0x4200000000000000000000000000000000000006,0xd9aaec86b65d86f6a7b5b1b0c42ffa531710b6ca,3244933,60625419898954064,100000000 +base,aerodrome,slipstream,2024-06-16,0x2bff240977f1e646d573a2fd7f95c2584fcb996739b8c150afbe82c1c453200e,329,0xb79dd08ea68a908a97220c76d19a6aa9cbde4376,0xe4796ccb6bb5de2290c417ac337f2b66ca2e770e,15877323,56289745,53454210540060595144 +base,aerodrome,slipstream,2024-06-16,0xd9e3de3e1554daa8bc52c80cb9f2197e949d06f1b7734eb7e75ee52bc153b589,159,0x532f27101965dd16442e59d40670faf5ebb142e4,0x4200000000000000000000000000000000000006,15879372,6208881609743124843349,277382734258193000