chore: add new banana gun + sol trading bot fee wallets [easy] (#5761)

* chore: add new banana gun fee wallets * chore: add new sol trading bot fee wallets
duneanalytics · Apr 11, 2024 · 6e1588a · 6e1588a
1 parent 38ca728
commit 6e1588a
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/models/banana_gun/solana/banana_gun_solana_bot_trades.sql b/models/banana_gun/solana/banana_gun_solana_bot_trades.sql
@@ -15,6 +15,8 @@
 {% set fee_receiver_3 = 'HKMh8nV3ysSofRi23LsfVGLGQKB415QAEfZT96kCcVj4' %}
 {% set fee_receiver_4 = '7tQiiBdKoScWQkB1RmVuML7DBGnR31cuKPEtMM7Vy5SA' %}
 {% set fee_receiver_5 = '4BBNEVRgrxVKv9f7pMNE788XM1tt379X9vNjpDH2KCL7' %}
+{% set fee_receiver_6 = '47hEzz83VFR23rLTEeVm9A7eFzjJwjvdupPPmX3cePqF' %}
+{% set fee_receiver_7 = 'EMbqD9Y9jLXEa3RbCR8AsEW1kVa3EiJgDLVgvKh4qNFP' %}
 {% set wsol_token = 'So11111111111111111111111111111111111111112' %}
 
 WITH
@@ -40,6 +42,8 @@ WITH
         OR address = '{{fee_receiver_3}}'
         OR address = '{{fee_receiver_4}}'
         OR address = '{{fee_receiver_5}}'
+        OR address = '{{fee_receiver_6}}'
+        OR address = '{{fee_receiver_7}}'
       )
       AND tx_id != 'AT915GhHaLdGsdFkywx2uE6jqSXeyTauveYH2BQqWMyptGhUtjE6dcdr74ErELg79VY9apZ9Egiyc1VtA6Ddykb' -- Edge case that sent fees to multiple fee wallets
   ),
@@ -101,11 +105,15 @@ WITH
       AND trades.trader_id != '{{fee_receiver_3}}' -- Exclude trades signed by FeeWallet
       AND trades.trader_id != '{{fee_receiver_4}}' -- Exclude trades signed by FeeWallet
       AND trades.trader_id != '{{fee_receiver_5}}' -- Exclude trades signed by FeeWallet
+      AND trades.trader_id != '{{fee_receiver_6}}' -- Exclude trades signed by FeeWallet
+      AND trades.trader_id != '{{fee_receiver_7}}' -- Exclude trades signed by FeeWallet
       AND transactions.signer != '{{fee_receiver_1}}' -- Exclude trades signed by FeeWallet
       AND transactions.signer != '{{fee_receiver_2}}' -- Exclude trades signed by FeeWallet
       AND transactions.signer != '{{fee_receiver_3}}' -- Exclude trades signed by FeeWallet
       AND transactions.signer != '{{fee_receiver_4}}' -- Exclude trades signed by FeeWallet
       AND transactions.signer != '{{fee_receiver_5}}' -- Exclude trades signed by FeeWallet
+      AND transactions.signer != '{{fee_receiver_6}}' -- Exclude trades signed by FeeWallet
+      AND transactions.signer != '{{fee_receiver_7}}' -- Exclude trades signed by FeeWallet
       {% if is_incremental() %}
       AND {{ incremental_predicate('trades.block_time') }}
       {% else %}

diff --git a/models/sol_trading_bot/solana/sol_trading_bot_solana_bot_trades.sql b/models/sol_trading_bot/solana/sol_trading_bot_solana_bot_trades.sql
@@ -10,8 +10,10 @@
 }}
 
 {% set project_start_date = '2023-11-10' %}
-{% set buy_fee_receiver = 'HEPL5rTb6n1Ax6jt9z2XMPFJcDe9bSWvWQpsK7AMcbZg' %}
-{% set sell_fee_receiver = 'K1LRSA1DSoKBtC5DkcvnermRQ62YxogWSCZZPWQrdG5' %}
+{% set buy_fee_receiver_1 = 'HEPL5rTb6n1Ax6jt9z2XMPFJcDe9bSWvWQpsK7AMcbZg' %}
+{% set sell_fee_receiver_1 = 'K1LRSA1DSoKBtC5DkcvnermRQ62YxogWSCZZPWQrdG5' %}
+{% set buy_fee_receiver_2 = 'F34kcgMgCF7mYWkwLN3WN7KrFprr2NbwxuLvXx4fbztj' %}
+{% set sell_fee_receiver_2 = '96aFQc9qyqpjMfqdUeurZVYRrrwPJG2uPV6pceu4B1yb' %}
 {% set wsol_token = 'So11111111111111111111111111111111111111112' %}
 
 WITH
@@ -32,8 +34,10 @@ WITH
       AND tx_success
       AND balance_change > 0
       AND (
-        address = '{{buy_fee_receiver}}'
-        OR address = '{{sell_fee_receiver}}'
+        address = '{{buy_fee_receiver_1}}'
+        OR address = '{{sell_fee_receiver_1}}'
+        OR address = '{{buy_fee_receiver_2}}'
+        OR address = '{{sell_fee_receiver_2}}'
       )
   ),
   botTrades AS (
@@ -89,10 +93,14 @@ WITH
         {% endif %}
       )
     WHERE
-      trades.trader_id != '{{buy_fee_receiver}}' -- Exclude trades signed by FeeWallet
-      AND trades.trader_id != '{{sell_fee_receiver}}' -- Exclude trades signed by FeeWallet
-      AND transactions.signer != '{{buy_fee_receiver}}' -- Exclude trades signed by FeeWallet
-      AND transactions.signer != '{{sell_fee_receiver}}' -- Exclude trades signed by FeeWallet
+      trades.trader_id != '{{buy_fee_receiver_1}}' -- Exclude trades signed by FeeWallet
+      AND trades.trader_id != '{{sell_fee_receiver_1}}' -- Exclude trades signed by FeeWallet
+      AND trades.trader_id != '{{buy_fee_receiver_2}}' -- Exclude trades signed by FeeWallet
+      AND trades.trader_id != '{{sell_fee_receiver_2}}' -- Exclude trades signed by FeeWallet
+      AND transactions.signer != '{{buy_fee_receiver_1}}' -- Exclude trades signed by FeeWallet
+      AND transactions.signer != '{{sell_fee_receiver_1}}' -- Exclude trades signed by FeeWallet
+      AND transactions.signer != '{{buy_fee_receiver_2}}' -- Exclude trades signed by FeeWallet
+      AND transactions.signer != '{{sell_fee_receiver_2}}' -- Exclude trades signed by FeeWallet
       {% if is_incremental() %}
       AND {{ incremental_predicate('trades.block_time') }}
       {% else %}