cleanup taker param, move column alias

dbt_subprojects/dex/macros/models/_project/uniswap_compatible_trades.sql

@@ -126,7 +126,7 @@ FROM
     , version = '4'
     , PoolManager_evt_Swap = null
     , PoolManager_evt_Initialize = null
-    , taker_column_name = 't.evt_tx_from'
+    , taker_column_name = 'evt_tx_from'
     , maker_column_name = null
     , swap_optional_columns = ['fee']
     , initialize_optional_columns = ['hooks']
@@ -138,8 +138,8 @@ WITH dexs AS
     SELECT
         t.evt_block_number AS block_number
         , t.evt_block_time AS block_time
-        , {{ taker_column_name }} as taker
-        , {% if maker_column_name -%} {{ maker_column_name }} {% else -%} cast(null as varbinary) {% endif -%} as maker      
+        , t.{{ taker_column_name }} as taker
+        , {% if maker_column_name -%} t.{{ maker_column_name }} {% else -%} cast(null as varbinary) {% endif -%} as maker      
         -- in v4, when amount is negative, then user are selling the token (so things are done from the perspective of the user instead of the pool)
         , CASE WHEN t.amount0 < INT256 '0' THEN abs(t.amount1) ELSE abs(t.amount0) END AS token_bought_amount_raw 
         , CASE WHEN t.amount0 < INT256 '0' THEN abs(t.amount0) ELSE abs(t.amount1) END AS token_sold_amount_raw