diff --git a/models/timeswap/arbitrum/timeswap_arbitrum_borrow.sql b/models/timeswap/arbitrum/timeswap_arbitrum_borrow.sql index ddb79b42867..3c12f2aa01c 100644 --- a/models/timeswap/arbitrum/timeswap_arbitrum_borrow.sql +++ b/models/timeswap/arbitrum/timeswap_arbitrum_borrow.sql @@ -1,10 +1,11 @@ {{ config( - alias = alias('borrow'), - materialized = 'incremental', - file_format = 'delta', - incremental_strategy = 'merge', - unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'], - post_hook='{{ expose_spells(\'["arbitrum"]\', + tags = ['dunesql'] + ,alias = alias('borrow') + ,materialized = 'incremental' + ,file_format = 'delta' + ,incremental_strategy = 'merge' + ,unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'] + ,post_hook='{{ expose_spells(\'["arbitrum"]\', "project", "timeswap", \'["raveena15, varunhawk19"]\') }}' @@ -23,27 +24,27 @@ SELECT b.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_arbitrum', 'TimeswapV2PeripheryUniswapV3BorrowGivenPrincipal_evt_BorrowGivenPrincipal') }} b JOIN {{ ref('timeswap_arbitrum_pools') }} i - ON CAST(b.maturity as VARCHAR(100)) = i.maturity - AND cast(b.strike as VARCHAR(100)) = i.strike + ON CAST(b.maturity as UINT256) = i.maturity + AND cast(b.strike as UINT256) = i.strike JOIN {{ source('arbitrum', 'transactions') }} tx on b.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol @@ -51,8 +52,8 @@ JOIN {{ source('prices', 'usd') }} p AND b.isToken0 = true AND p.minute = date_trunc('minute',b.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE b.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE b.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -67,27 +68,27 @@ SELECT b.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_arbitrum', 'TimeswapV2PeripheryUniswapV3BorrowGivenPrincipal_evt_BorrowGivenPrincipal') }} b JOIN {{ ref('timeswap_arbitrum_pools') }} i - ON CAST(b.maturity as VARCHAR(100)) = i.maturity - AND cast(b.strike as VARCHAR(100)) = i.strike + ON CAST(b.maturity as UINT256) = i.maturity + AND cast(b.strike as UINT256) = i.strike JOIN {{ source('arbitrum', 'transactions') }} tx on b.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol @@ -95,8 +96,8 @@ JOIN {{ source('prices', 'usd') }} p AND b.isToken0 = false AND p.minute = date_trunc('minute',b.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE b.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE b.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -114,27 +115,27 @@ SELECT b.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_arbitrum', 'TimeswapV2PeripheryNoDexBorrowGivenPrincipal_evt_BorrowGivenPrincipal') }} b JOIN {{ ref('timeswap_arbitrum_pools') }} i - ON CAST(b.maturity as VARCHAR(100)) = i.maturity - AND cast(b.strike as VARCHAR(100)) = i.strike + ON CAST(b.maturity as UINT256) = i.maturity + AND cast(b.strike as UINT256) = i.strike JOIN {{ source('arbitrum', 'transactions') }} tx on b.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol @@ -142,8 +143,8 @@ JOIN {{ source('prices', 'usd') }} p AND b.isToken0 = true AND p.minute = date_trunc('minute',b.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE b.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE b.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -158,27 +159,27 @@ SELECT b.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_arbitrum', 'TimeswapV2PeripheryNoDexBorrowGivenPrincipal_evt_BorrowGivenPrincipal') }} b JOIN {{ ref('timeswap_arbitrum_pools') }} i - ON CAST(b.maturity as VARCHAR(100)) = i.maturity - AND cast(b.strike as VARCHAR(100)) = i.strike + ON CAST(b.maturity as UINT256) = i.maturity + AND cast(b.strike as UINT256) = i.strike JOIN {{ source('arbitrum', 'transactions') }} tx on b.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol @@ -186,8 +187,8 @@ JOIN {{ source('prices', 'usd') }} p AND b.isToken0 = false AND p.minute = date_trunc('minute',b.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE b.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE b.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} diff --git a/models/timeswap/arbitrum/timeswap_arbitrum_lend.sql b/models/timeswap/arbitrum/timeswap_arbitrum_lend.sql index 389e6fcc3f7..c13b53e767b 100644 --- a/models/timeswap/arbitrum/timeswap_arbitrum_lend.sql +++ b/models/timeswap/arbitrum/timeswap_arbitrum_lend.sql @@ -1,10 +1,11 @@ {{ config( - alias = alias('lend'), - materialized = 'incremental', - file_format = 'delta', - incremental_strategy = 'merge', - unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'], - post_hook='{{ expose_spells(\'["arbitrum"]\', + tags = ['dunesql'] + ,alias = alias('lend') + ,materialized = 'incremental' + ,file_format = 'delta' + ,incremental_strategy = 'merge' + ,unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'] + ,post_hook='{{ expose_spells(\'["arbitrum"]\', "project", "timeswap", \'["raveena15, varunhawk19"]\') }}' @@ -21,27 +22,27 @@ SELECT l.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_arbitrum', 'TimeswapV2PeripheryUniswapV3LendGivenPrincipal_evt_LendGivenPrincipal') }} l JOIN {{ ref('timeswap_arbitrum_pools') }} i - ON CAST(l.maturity as VARCHAR(100)) = i.maturity - AND cast(l.strike as VARCHAR(100)) = i.strike + ON CAST(l.maturity as UINT256) = i.maturity + AND CAST(l.strike as UINT256) = i.strike JOIN {{ source('arbitrum', 'transactions') }} tx on l.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol @@ -49,8 +50,8 @@ JOIN {{ source('prices', 'usd') }} p AND l.isToken0 = true AND p.minute = date_trunc('minute',l.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE l.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE l.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -66,27 +67,27 @@ SELECT l.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_arbitrum', 'TimeswapV2PeripheryUniswapV3LendGivenPrincipal_evt_LendGivenPrincipal') }} l JOIN {{ ref('timeswap_arbitrum_pools') }} i - ON CAST(l.maturity as VARCHAR(100)) = i.maturity - AND cast(l.strike as VARCHAR(100)) = i.strike + ON CAST(l.maturity as UINT256) = i.maturity + AND CAST(l.strike as UINT256) = i.strike JOIN {{ source('arbitrum', 'transactions') }} tx on l.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol @@ -94,8 +95,8 @@ JOIN {{ source('prices', 'usd') }} p AND l.isToken0 = false AND p.minute = date_trunc('minute',l.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE l.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE l.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -111,27 +112,27 @@ SELECT l.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_arbitrum', 'TimeswapV2PeripheryNoDexLendGivenPrincipal_evt_LendGivenPrincipal') }} l JOIN {{ ref('timeswap_arbitrum_pools') }} i - ON CAST(l.maturity as VARCHAR(100)) = i.maturity - AND cast(l.strike as VARCHAR(100)) = i.strike + ON CAST(l.maturity as UINT256) = i.maturity + AND CAST(l.strike as UINT256) = i.strike JOIN {{ source('arbitrum', 'transactions') }} tx on l.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol @@ -139,8 +140,8 @@ JOIN {{ source('prices', 'usd') }} p AND l.isToken0 = true AND p.minute = date_trunc('minute',l.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE l.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE l.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -156,27 +157,27 @@ SELECT l.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_arbitrum', 'TimeswapV2PeripheryNoDexLendGivenPrincipal_evt_LendGivenPrincipal') }} l JOIN {{ ref('timeswap_arbitrum_pools') }} i - ON CAST(l.maturity as VARCHAR(100)) = i.maturity - AND cast(l.strike as VARCHAR(100)) = i.strike + ON CAST(l.maturity as UINT256) = i.maturity + AND CAST(l.strike as UINT256) = i.strike JOIN {{ source('arbitrum', 'transactions') }} tx on l.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol @@ -184,8 +185,8 @@ JOIN {{ source('prices', 'usd') }} p AND l.isToken0 = false AND p.minute = date_trunc('minute',l.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE l.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE l.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} diff --git a/models/timeswap/arbitrum/timeswap_arbitrum_pools.sql b/models/timeswap/arbitrum/timeswap_arbitrum_pools.sql index ac30943f42b..69096a705a1 100644 --- a/models/timeswap/arbitrum/timeswap_arbitrum_pools.sql +++ b/models/timeswap/arbitrum/timeswap_arbitrum_pools.sql @@ -1,351 +1,353 @@ {{ config( - alias = alias('pools'), - post_hook='{{ expose_spells(\'["arbitrum"]\', + tags = ['dunesql'] + ,schema = 'timeswap_arbitrum' + ,alias = alias('pools') + ,unique_key = ['pool_pair', 'maturity', 'strike'] + ,post_hook='{{ expose_spells(\'["arbitrum"]\', "project", "timeswap", - \'["raveena15, varunhawk19"]\') }}', - unique_key = ['pool_pair', 'maturity', 'strike'] + \'["raveena15, varunhawk19"]\') }}' ) }} SELECT token0_symbol, token1_symbol, - lower(token0_address) as token0_address, - lower(token1_address) as token1_address, + token0_address, + token1_address, token0_decimals, token1_decimals, strike, maturity, pool_pair, chain, - lower(borrow_contract_address) as borrow_contract_address, - lower(lend_contract_address) as lend_contract_address + borrow_contract_address, + lend_contract_address FROM ( VALUES ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '272225893536750770770699685', - '1679918400', + CAST('272225893536750770770699685' AS UINT256), + CAST('1679918400' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0x275695f56e609cAD02C9898351386B4B0c1CFB3e', - '0x8C76Cbb88f5974A457a2258AA91B4d494735E021' + 0x275695f56e609cAD02C9898351386B4B0c1CFB3e, + 0x8C76Cbb88f5974A457a2258AA91B4d494735E021 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '680564733841876926926749214', - '1679918400', + CAST('680564733841876926926749214' AS UINT256), + CAST('1679918400' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0x275695f56e609cAD02C9898351386B4B0c1CFB3e', - '0x8C76Cbb88f5974A457a2258AA91B4d494735E021' + 0x275695f56e609cAD02C9898351386B4B0c1CFB3e, + 0x8C76Cbb88f5974A457a2258AA91B4d494735E021 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '272225893536750770770699685', - '1680523200', + CAST('272225893536750770770699685' AS UINT256), + CAST('1680523200' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0x275695f56e609cAD02C9898351386B4B0c1CFB3e', - '0x8C76Cbb88f5974A457a2258AA91B4d494735E021' + 0x275695f56e609cAD02C9898351386B4B0c1CFB3e, + 0x8C76Cbb88f5974A457a2258AA91B4d494735E021 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '680564733841876926926749214', - '1680523200', + CAST('680564733841876926926749214' AS UINT256), + CAST('1680523200' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0x275695f56e609cAD02C9898351386B4B0c1CFB3e', - '0x8C76Cbb88f5974A457a2258AA91B4d494735E021' + 0x275695f56e609cAD02C9898351386B4B0c1CFB3e, + 0x8C76Cbb88f5974A457a2258AA91B4d494735E021 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '272225893536750770770699685', - '1681732800', + CAST('272225893536750770770699685' AS UINT256), + CAST('1681732800' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0x275695f56e609cAD02C9898351386B4B0c1CFB3e', - '0x8C76Cbb88f5974A457a2258AA91B4d494735E021' + 0x275695f56e609cAD02C9898351386B4B0c1CFB3e, + 0x8C76Cbb88f5974A457a2258AA91B4d494735E021 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '595494142111642311060905563', - '1681732800', + CAST('595494142111642311060905563' AS UINT256), + CAST('1681732800' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0x275695f56e609cAD02C9898351386B4B0c1CFB3e', - '0x8C76Cbb88f5974A457a2258AA91B4d494735E021' + 0x275695f56e609cAD02C9898351386B4B0c1CFB3e, + 0x8C76Cbb88f5974A457a2258AA91B4d494735E021 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '340282366920938463463374607', - '1684152000', + CAST('340282366920938463463374607' AS UINT256), + CAST('1684152000' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0x275695f56e609cAD02C9898351386B4B0c1CFB3e', - '0x8C76Cbb88f5974A457a2258AA91B4d494735E021' + 0x275695f56e609cAD02C9898351386B4B0c1CFB3e, + 0x8C76Cbb88f5974A457a2258AA91B4d494735E021 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '782649443918158465965761597', - '1684152000', + CAST('782649443918158465965761597' AS UINT256), + CAST('1684152000' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0x275695f56e609cAD02C9898351386B4B0c1CFB3e', - '0x8C76Cbb88f5974A457a2258AA91B4d494735E021' + 0x275695f56e609cAD02C9898351386B4B0c1CFB3e, + 0x8C76Cbb88f5974A457a2258AA91B4d494735E021 ), ( 'plsARB', 'USDC', - '0x7a5D193fE4ED9098F7EAdC99797087C96b002907', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x7a5D193fE4ED9098F7EAdC99797087C96b002907, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '238197656844656924424362225', - '1683892800', + CAST('238197656844656924424362225' AS UINT256), + CAST('1683892800' AS UINT256), 'plsARB-USDC', 'Arbitrum', - '0xEbaDA7aA52C68Bdb6a2744F40AA2f3da76D469dc', - '0xE1cd819b5a2C8FC65D3D77BFE0D0A0FF5Bb54326' + 0xEbaDA7aA52C68Bdb6a2744F40AA2f3da76D469dc, + 0xE1cd819b5a2C8FC65D3D77BFE0D0A0FF5Bb54326 ), ( 'gDAI', 'DAI', - '0xd85E038593d7A098614721EaE955EC2022B9B91B', - '0xda10009cbd5d07dd0cecc66161fc93d7c9000da1', + 0xd85E038593d7A098614721EaE955EC2022B9B91B, + 0xda10009cbd5d07dd0cecc66161fc93d7c9000da1, 18, 18, - '343685190590147848098008353506085893570', - '1685534400', + CAST('343685190590147848098008353506085893570' AS UINT256), + CAST('1685534400' AS UINT256), 'gDAI-DAI', 'Arbitrum', - '0xEbaDA7aA52C68Bdb6a2744F40AA2f3da76D469dc', - '0xE1cd819b5a2C8FC65D3D77BFE0D0A0FF5Bb54326' + 0xEbaDA7aA52C68Bdb6a2744F40AA2f3da76D469dc, + 0xE1cd819b5a2C8FC65D3D77BFE0D0A0FF5Bb54326 ), ( 'plsARB', 'USDC', - '0x7a5D193fE4ED9098F7EAdC99797087C96b002907', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x7a5D193fE4ED9098F7EAdC99797087C96b002907, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '204169420152563078078024764', - '1686830400', + CAST('204169420152563078078024764' AS UINT256), + CAST('1686830400' AS UINT256), 'plsARB-USDC', 'Arbitrum', - '0xEbaDA7aA52C68Bdb6a2744F40AA2f3da76D469dc', - '0xE1cd819b5a2C8FC65D3D77BFE0D0A0FF5Bb54326' + 0xEbaDA7aA52C68Bdb6a2744F40AA2f3da76D469dc, + 0xE1cd819b5a2C8FC65D3D77BFE0D0A0FF5Bb54326 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '272225893536750770770699685', - '1686830400', + CAST('272225893536750770770699685' AS UINT256), + CAST('1686830400' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0x275695f56e609cAD02C9898351386B4B0c1CFB3e', - '0x8C76Cbb88f5974A457a2258AA91B4d494735E021' + 0x275695f56e609cAD02C9898351386B4B0c1CFB3e, + 0x8C76Cbb88f5974A457a2258AA91B4d494735E021 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '578480023765595387887736832', - '1686830400', + CAST('578480023765595387887736832' AS UINT256), + CAST('1686830400' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0x275695f56e609cAD02C9898351386B4B0c1CFB3e', - '0x8C76Cbb88f5974A457a2258AA91B4d494735E021' + 0x275695f56e609cAD02C9898351386B4B0c1CFB3e, + 0x8C76Cbb88f5974A457a2258AA91B4d494735E021 ), ( 'wstETH', 'USDC', - '0x5979D7b546E38E414F7E9822514be443A4800529', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x5979D7b546E38E414F7E9822514be443A4800529, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '527437668727454618368230641519', - '1686398400', + CAST('527437668727454618368230641519' AS UINT256), + CAST('1686398400' AS UINT256), 'wstETH-USDC', 'Arbitrum', - '0xEbaDA7aA52C68Bdb6a2744F40AA2f3da76D469dc', - '0xE1cd819b5a2C8FC65D3D77BFE0D0A0FF5Bb54326' + 0xEbaDA7aA52C68Bdb6a2744F40AA2f3da76D469dc, + 0xE1cd819b5a2C8FC65D3D77BFE0D0A0FF5Bb54326 ), ( 'unshETH', 'USDC', - '0x0ae38f7e10a43b5b2fb064b42a2f4514cba909ef', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x0ae38f7e10a43b5b2fb064b42a2f4514cba909ef, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '561465905419548464714568102262', - '1687179600', + CAST('561465905419548464714568102262' AS UINT256), + CAST('1687179600' AS UINT256), 'unshETH-USDC', 'Arbitrum', - '0xEbaDA7aA52C68Bdb6a2744F40AA2f3da76D469dc', - '0xE1cd819b5a2C8FC65D3D77BFE0D0A0FF5Bb54326' + 0xEbaDA7aA52C68Bdb6a2744F40AA2f3da76D469dc, + 0xE1cd819b5a2C8FC65D3D77BFE0D0A0FF5Bb54326 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '204169420152563078078024764', - '1689422400', + CAST('204169420152563078078024764' AS UINT256), + CAST('1689422400' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0xFb466FBC00617C89E5865f4ef0bc6D48Ea150AC5', - '0x8DC92083F5C4813c02b502ce1ea61f0a48A36A88' + 0xFb466FBC00617C89E5865f4ef0bc6D48Ea150AC5, + 0x8DC92083F5C4813c02b502ce1ea61f0a48A36A88 ), ( 'ARB', 'USDC', - '0x912ce59144191c1204e64559fe8253a0e49e6548', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x912ce59144191c1204e64559fe8253a0e49e6548, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '442367076997220002502386989', - '1689422400', + CAST('442367076997220002502386989' AS UINT256), + CAST('1689422400' AS UINT256), 'ARB-USDC', 'Arbitrum', - '0xFb466FBC00617C89E5865f4ef0bc6D48Ea150AC5', - '0x8DC92083F5C4813c02b502ce1ea61f0a48A36A88' + 0xFb466FBC00617C89E5865f4ef0bc6D48Ea150AC5, + 0x8DC92083F5C4813c02b502ce1ea61f0a48A36A88 ), ( 'APT', 'USDC', - '0xfd421d60905d2f7cabd49e6a5703a3499367b8f4', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0xfd421d60905d2f7cabd49e6a5703a3499367b8f4, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 12, 6, - '272225893536750770770699685945414', - '1689249600', + CAST('272225893536750770770699685945414' AS UINT256), + CAST('1689249600' AS UINT256), 'APT-USDC', 'Arbitrum', - '0xFb466FBC00617C89E5865f4ef0bc6D48Ea150AC5', - '0x8DC92083F5C4813c02b502ce1ea61f0a48A36A88' + 0xFb466FBC00617C89E5865f4ef0bc6D48Ea150AC5, + 0x8DC92083F5C4813c02b502ce1ea61f0a48A36A88 ), ( 'plsARB', 'ARB', - '0x7a5D193fE4ED9098F7EAdC99797087C96b002907', - '0x912CE59144191C1204E64559FE8253a0e49E6548', + 0x7a5D193fE4ED9098F7EAdC99797087C96b002907, + 0x912CE59144191C1204E64559FE8253a0e49E6548, 18, 18, - '136112946768375385385349842972707284582', - '1693137600', + CAST('136112946768375385385349842972707284582' AS UINT256), + CAST('1693137600' AS UINT256), 'plsARB-ARB', 'Arbitrum', - '0xFb466FBC00617C89E5865f4ef0bc6D48Ea150AC5', - '0x8DC92083F5C4813c02b502ce1ea61f0a48A36A88' + 0xFb466FBC00617C89E5865f4ef0bc6D48Ea150AC5, + 0x8DC92083F5C4813c02b502ce1ea61f0a48A36A88 ), ( 'unshETH', 'USDC', - '0x0ae38f7e10a43b5b2fb064b42a2f4514cba909ef', - '0xff970a61a04b1ca14834a43f5de4533ebddb5cc8', + 0x0ae38f7e10a43b5b2fb064b42a2f4514cba909ef, + 0xff970a61a04b1ca14834a43f5de4533ebddb5cc8, 18, 6, - '510423550381407695195061911147', - '1690545600', + CAST('510423550381407695195061911147' AS UINT256), + CAST('1690545600' AS UINT256), 'unshETH-USDC', 'Arbitrum', - '0xFb466FBC00617C89E5865f4ef0bc6D48Ea150AC5', - '0x8DC92083F5C4813c02b502ce1ea61f0a48A36A88' + 0xFb466FBC00617C89E5865f4ef0bc6D48Ea150AC5, + 0x8DC92083F5C4813c02b502ce1ea61f0a48A36A88 ), ( 'AuraRDNTWETH', 'USDC', - '0xa17492d89cB2D0bE1dDbd0008F8585EDc5B0ACf3', - '0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8', + 0xa17492d89cB2D0bE1dDbd0008F8585EDc5B0ACf3, + 0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8, 18, 6, - '340282366920938463463374607', - '1689336000', + CAST('340282366920938463463374607' AS UINT256), + CAST('1689336000' AS UINT256), 'AuraRDNTWETH-USDC', 'Arbitrum', - '0x61EDF35c6C6557010A7649c7fC9EFC75B9fEb2E1', - '0xea45312c915adc912e681728A5Bf55441c08Fcd7' + 0x61EDF35c6C6557010A7649c7fC9EFC75B9fEb2E1, + 0xea45312c915adc912e681728A5Bf55441c08Fcd7 ), ( 'AuraWBTCTBTC', 'USDC', - '0xFCC94454061b7fDF0B03b0D2107Ecd9c6c74ddfd', - '0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8', + 0xFCC94454061b7fDF0B03b0D2107Ecd9c6c74ddfd, + 0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8, 18, 6, - '8507059173023461586584365185794', - '1689336000', + CAST('8507059173023461586584365185794' AS UINT256), + CAST('1689336000' AS UINT256), 'AuraWBTCTBTC-USDC', 'Arbitrum', - '0x61EDF35c6C6557010A7649c7fC9EFC75B9fEb2E1', - '0xea45312c915adc912e681728A5Bf55441c08Fcd7' + 0x61EDF35c6C6557010A7649c7fC9EFC75B9fEb2E1, + 0xea45312c915adc912e681728A5Bf55441c08Fcd7 ), ( 'PTwstETH26JUN25', 'USDC', - '0x1255638EFeca62e12E344E0b6B22ea853eC6e2c7', - '0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8', + 0x1255638EFeca62e12E344E0b6B22ea853eC6e2c7, + 0xFF970A61A04b1cA14834A43f5dE4533eBDDB5CC8, 18, 6, - '476395313689313848848724450405', - '1691409600', + CAST('476395313689313848848724450405' AS UINT256), + CAST('1691409600' AS UINT256), 'PTwstETH26JUN25-USDC', 'Arbitrum', - '0x61EDF35c6C6557010A7649c7fC9EFC75B9fEb2E1', - '0xea45312c915adc912e681728A5Bf55441c08Fcd7' + 0x61EDF35c6C6557010A7649c7fC9EFC75B9fEb2E1, + 0xea45312c915adc912e681728A5Bf55441c08Fcd7 ) ) AS temp_table ( token0_symbol, diff --git a/models/timeswap/ethereum/timeswap_ethereum_borrow.sql b/models/timeswap/ethereum/timeswap_ethereum_borrow.sql index 1d0318d799f..b6c260b5a09 100644 --- a/models/timeswap/ethereum/timeswap_ethereum_borrow.sql +++ b/models/timeswap/ethereum/timeswap_ethereum_borrow.sql @@ -1,10 +1,11 @@ {{ config( - alias = alias('borrow'), - materialized = 'incremental', - file_format = 'delta', - incremental_strategy = 'merge', - unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'], - post_hook='{{ expose_spells(\'["ethereum"]\', + tags = ['dunesql'] + ,alias = alias('borrow') + ,materialized = 'incremental' + ,file_format = 'delta' + ,incremental_strategy = 'merge' + ,unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'] + ,post_hook='{{ expose_spells(\'["ethereum"]\', "project", "timeswap", \'["raveena15, varunhawk19"]\') }}' @@ -21,27 +22,27 @@ SELECT b.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_ethereum', 'TimeswapV2PeripheryUniswapV3BorrowGivenPrincipal_evt_BorrowGivenPrincipal') }} b JOIN {{ ref('timeswap_ethereum_pools') }} i - ON CAST(b.maturity as VARCHAR(100)) = i.maturity - and cast(b.strike as VARCHAR(100)) = i.strike + ON CAST(b.maturity as UINT256) = i.maturity + and cast(b.strike as UINT256) = i.strike JOIN {{ source('ethereum', 'transactions') }} tx on b.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol @@ -49,8 +50,8 @@ JOIN {{ source('prices', 'usd') }} p and b.isToken0 = true AND p.minute = date_trunc('minute',b.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE b.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE b.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -65,27 +66,27 @@ SELECT b.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_ethereum', 'TimeswapV2PeripheryUniswapV3BorrowGivenPrincipal_evt_BorrowGivenPrincipal') }} b JOIN {{ ref('timeswap_ethereum_pools') }} i - ON CAST(b.maturity as VARCHAR(100)) = i.maturity - and cast(b.strike as VARCHAR(100)) = i.strike + ON CAST(b.maturity as UINT256) = i.maturity + and cast(b.strike as UINT256) = i.strike JOIN {{ source('ethereum', 'transactions') }} tx on b.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol @@ -93,6 +94,6 @@ JOIN {{ source('prices', 'usd') }} p and b.isToken0 = false AND p.minute = date_trunc('minute',b.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE b.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE b.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} diff --git a/models/timeswap/ethereum/timeswap_ethereum_lend.sql b/models/timeswap/ethereum/timeswap_ethereum_lend.sql index 9e311a08881..9c1dfcee9da 100644 --- a/models/timeswap/ethereum/timeswap_ethereum_lend.sql +++ b/models/timeswap/ethereum/timeswap_ethereum_lend.sql @@ -1,10 +1,11 @@ {{ config( - alias = alias('lend'), - materialized = 'incremental', - file_format = 'delta', - incremental_strategy = 'merge', - unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'], - post_hook='{{ expose_spells(\'["ethereum"]\', + tags = ['dunesql'] + ,alias = alias('lend') + ,materialized = 'incremental' + ,file_format = 'delta' + ,incremental_strategy = 'merge' + ,unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'] + ,post_hook='{{ expose_spells(\'["ethereum"]\', "project", "timeswap", \'["raveena15, varunhawk19"]\') }}' @@ -21,31 +22,31 @@ SELECT l.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_ethereum', 'TimeswapV2PeripheryUniswapV3LendGivenPrincipal_evt_LendGivenPrincipal') }} l - JOIN {{ ref('timeswap_ethereum_pools') }} i ON CAST(l.maturity as VARCHAR(100)) = i.maturity and cast(l.strike as VARCHAR(100)) = i.strike + JOIN {{ ref('timeswap_ethereum_pools') }} i ON CAST(l.maturity as UINT256) = i.maturity and CAST(l.strike as UINT256) = i.strike JOIN {{ source('ethereum', 'transactions') }} tx on l.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol and p.blockchain = 'ethereum' and l.isToken0 = true AND p.minute = date_trunc('minute',l.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE l.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE l.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -60,27 +61,27 @@ SELECT l.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_ethereum', 'TimeswapV2PeripheryUniswapV3LendGivenPrincipal_evt_LendGivenPrincipal') }} l JOIN {{ ref('timeswap_ethereum_pools') }} i - ON CAST(l.maturity as VARCHAR(100)) = i.maturity - and cast(l.strike as VARCHAR(100)) = i.strike + ON CAST(l.maturity as UINT256) = i.maturity + and CAST(l.strike as UINT256) = i.strike JOIN {{ source('ethereum', 'transactions') }} tx on l.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol @@ -88,6 +89,6 @@ JOIN {{ source('prices', 'usd') }} p and l.isToken0 = false AND p.minute = date_trunc('minute',l.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE l.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE l.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} diff --git a/models/timeswap/ethereum/timeswap_ethereum_pools.sql b/models/timeswap/ethereum/timeswap_ethereum_pools.sql index aa9844995a5..cdd683d85bb 100644 --- a/models/timeswap/ethereum/timeswap_ethereum_pools.sql +++ b/models/timeswap/ethereum/timeswap_ethereum_pools.sql @@ -1,42 +1,44 @@ {{ config( - alias = alias('pools'), - post_hook='{{ expose_spells(\'["ethereum"]\', + tags = ['dunesql'] + ,schema = 'timeswap_ethereum' + ,alias = alias('pools') + ,unique_key = ['pool_pair', 'maturity', 'strike'] + ,post_hook='{{ expose_spells(\'["ethereum"]\', "project", "timeswap", - \'["raveena15, varunhawk19"]\') }}', - unique_key = ['pool_pair', 'maturity', 'strike'] + \'["raveena15, varunhawk19"]\') }}' ) }} SELECT token0_symbol, token1_symbol, - lower(token0_address) as token0_address, - lower(token1_address) as token1_address, + token0_address, + token1_address, token0_decimals, token1_decimals, strike, maturity, pool_pair, chain, - lower(borrow_contract_address) as borrow_contract_address, - lower(lend_contract_address) as lend_contract_address + borrow_contract_address, + lend_contract_address FROM ( VALUES ( 'BLUR', 'USDC', - '0x5283D291DBCF85356A21bA090E6db59121208b44', - '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', + 0x5283D291DBCF85356A21bA090E6db59121208b44, + 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48, 18, 6, - '102084710076281539039012382', - '1679659200', + CAST('102084710076281539039012382' AS UINT256), + CAST('1679659200' AS UINT256), 'BLUR-USDC', 'Ethereum', - '0x28D0591275863d5d8ED33Ea30a8Ab58C351155A9', - '0x5073657C5459a6BcB66a769Ad9687D2576630f53' + 0x28D0591275863d5d8ED33Ea30a8Ab58C351155A9, + 0x5073657C5459a6BcB66a769Ad9687D2576630f53 ) ) AS temp_table ( token0_symbol, diff --git a/models/timeswap/polygon/timeswap_polygon_borrow.sql b/models/timeswap/polygon/timeswap_polygon_borrow.sql index 74774ba577b..3c791f86a14 100644 --- a/models/timeswap/polygon/timeswap_polygon_borrow.sql +++ b/models/timeswap/polygon/timeswap_polygon_borrow.sql @@ -1,10 +1,11 @@ {{ config( - alias = alias('borrow'), - materialized = 'incremental', - file_format = 'delta', - incremental_strategy = 'merge', - unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'], - post_hook='{{ expose_spells(\'["polygon"]\', + tags = ['dunesql'] + ,alias = alias('borrow') + ,materialized = 'incremental' + ,file_format = 'delta' + ,incremental_strategy = 'merge' + ,unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'] + ,post_hook='{{ expose_spells(\'["polygon"]\', "project", "timeswap", \'["raveena15, varunhawk19"]\') }}' @@ -17,43 +18,43 @@ SELECT b.call_tx_hash as transaction_hash, b.call_block_time as time, - CAST(get_json_object(b.param, '$.isToken') AS BOOLEAN) AS token_0, + CAST(JSON_EXTRACT_SCALAR(b.param, '$.isToken') AS BOOLEAN) AS token_0, 'borrow' as transaction_type, - get_json_object(b.param, '$.maturity') AS maturity, - get_json_object(b.param, '$.strike') AS strike, + CAST(JSON_EXTRACT_SCALAR(b.param, '$.maturity') AS UINT256) AS maturity, + CAST(JSON_EXTRACT_SCALAR(b.param, '$.strike') AS UINT256) AS strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(get_json_object(b.param, '$.isToken') AS BOOLEAN) = true - THEN CAST(get_json_object(b.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(get_json_object(b.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(JSON_EXTRACT_SCALAR(b.param, '$.isToken') AS BOOLEAN) = true + THEN CAST(JSON_EXTRACT_SCALAR(b.param, '$.tokenAmount') AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(JSON_EXTRACT_SCALAR(b.param, '$.tokenAmount') AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(get_json_object(b.param, '$.isToken') AS BOOLEAN) = true - THEN CAST(get_json_object(b.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(get_json_object(b.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(JSON_EXTRACT_SCALAR(b.param, '$.isToken') AS BOOLEAN) = true + THEN CAST(JSON_EXTRACT_SCALAR(b.param, '$.tokenAmount') AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(JSON_EXTRACT_SCALAR(b.param, '$.tokenAmount') AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryUniswapV3BorrowGivenPrincipal_call_borrowGivenPrincipal') }} b - JOIN {{ ref('timeswap_polygon_pools') }} i ON CAST(maturity as VARCHAR(100)) = i.maturity and cast(strike as VARCHAR(100)) = i.strike + JOIN {{ ref('timeswap_polygon_pools') }} i ON CAST(maturity as UINT256) = i.maturity and cast(strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on b.call_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol and p.blockchain = 'polygon' and b.call_success = true - and CAST(get_json_object(b.param, '$.isToken') AS BOOLEAN) = true + and CAST(JSON_EXTRACT_SCALAR(b.param, '$.isToken') AS BOOLEAN) = true AND p.minute = date_trunc('minute',b.call_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') - WHERE b.call_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) + WHERE b.call_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -63,43 +64,43 @@ UNION SELECT b.call_tx_hash as transaction_hash, b.call_block_time as time, - CAST(get_json_object(b.param, '$.isToken') AS BOOLEAN) AS token_0, + CAST(JSON_EXTRACT_SCALAR(b.param, '$.isToken') AS BOOLEAN) AS token_0, 'borrow' as transaction_type, - get_json_object(b.param, '$.maturity') AS maturity, - get_json_object(b.param, '$.strike') AS strike, + CAST(JSON_EXTRACT_SCALAR(b.param, '$.maturity') AS UINT256) AS maturity, + CAST(JSON_EXTRACT_SCALAR(b.param, '$.strike') AS UINT256) AS strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(get_json_object(b.param, '$.isToken') AS BOOLEAN) = true - THEN CAST(get_json_object(b.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(get_json_object(b.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(JSON_EXTRACT_SCALAR(b.param, '$.isToken') AS BOOLEAN) = true + THEN CAST(JSON_EXTRACT_SCALAR(b.param, '$.tokenAmount') AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(JSON_EXTRACT_SCALAR(b.param, '$.tokenAmount') AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(get_json_object(b.param, '$.isToken') AS BOOLEAN) = true - THEN CAST(get_json_object(b.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(get_json_object(b.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(JSON_EXTRACT_SCALAR(b.param, '$.isToken') AS BOOLEAN) = true + THEN CAST(JSON_EXTRACT_SCALAR(b.param, '$.tokenAmount') AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(JSON_EXTRACT_SCALAR(b.param, '$.tokenAmount') AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryUniswapV3BorrowGivenPrincipal_call_borrowGivenPrincipal') }} b - JOIN {{ ref('timeswap_polygon_pools') }} i ON CAST(maturity as VARCHAR(100)) = i.maturity and cast(strike as VARCHAR(100)) = i.strike + JOIN {{ ref('timeswap_polygon_pools') }} i ON CAST(maturity as UINT256) = i.maturity and cast(strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on b.call_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol and p.blockchain = 'polygon' and b.call_success = true - and CAST(get_json_object(b.param, '$.isToken') AS BOOLEAN) = false + and CAST(JSON_EXTRACT_SCALAR(b.param, '$.isToken') AS BOOLEAN) = false AND p.minute = date_trunc('minute',b.call_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') - WHERE b.call_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) + WHERE b.call_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -115,27 +116,27 @@ SELECT b.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryUniswapV3BorrowGivenPrincipal_evt_BorrowGivenPrincipal') }} b JOIN {{ ref('timeswap_polygon_pools') }} i - ON CAST(b.maturity as VARCHAR(100)) = i.maturity - and cast(b.strike as VARCHAR(100)) = i.strike + ON CAST(b.maturity as UINT256) = i.maturity + and cast(b.strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on b.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol @@ -143,8 +144,8 @@ JOIN {{ source('prices', 'usd') }} p and b.isToken0 = true AND p.minute = date_trunc('minute',b.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE b.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE b.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -159,27 +160,27 @@ SELECT b.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_Amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryUniswapV3BorrowGivenPrincipal_evt_BorrowGivenPrincipal') }} b JOIN {{ ref('timeswap_polygon_pools') }} i - ON CAST(b.maturity as VARCHAR(100)) = i.maturity - and cast(b.strike as VARCHAR(100)) = i.strike + ON CAST(b.maturity as UINT256) = i.maturity + and cast(b.strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on b.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol @@ -187,8 +188,8 @@ JOIN {{ source('prices', 'usd') }} p and b.isToken0 = false AND p.minute = date_trunc('minute',b.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE b.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE b.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -206,27 +207,27 @@ SELECT b.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryNoDexBorrowGivenPrincipal_evt_BorrowGivenPrincipal') }} b JOIN {{ ref('timeswap_polygon_pools') }} i - ON CAST(b.maturity as VARCHAR(100)) = i.maturity - and cast(b.strike as VARCHAR(100)) = i.strike + ON CAST(b.maturity as UINT256) = i.maturity + and cast(b.strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on b.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol @@ -234,8 +235,8 @@ JOIN {{ source('prices', 'usd') }} p and b.isToken0 = true AND p.minute = date_trunc('minute',b.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE b.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE b.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -250,27 +251,27 @@ SELECT b.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(b.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(b.isToken0 AS BOOLEAN) = true THEN CAST(b.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(b.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryNoDexBorrowGivenPrincipal_evt_BorrowGivenPrincipal') }} b JOIN {{ ref('timeswap_polygon_pools') }} i - ON CAST(b.maturity as VARCHAR(100)) = i.maturity - and cast(b.strike as VARCHAR(100)) = i.strike + ON CAST(b.maturity as UINT256) = i.maturity + and cast(b.strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on b.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol @@ -278,6 +279,6 @@ JOIN {{ source('prices', 'usd') }} p and b.isToken0 = false AND p.minute = date_trunc('minute',b.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE b.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE b.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} diff --git a/models/timeswap/polygon/timeswap_polygon_lend.sql b/models/timeswap/polygon/timeswap_polygon_lend.sql index 0debe341381..8d6796a5470 100644 --- a/models/timeswap/polygon/timeswap_polygon_lend.sql +++ b/models/timeswap/polygon/timeswap_polygon_lend.sql @@ -1,10 +1,11 @@ {{ config( - alias = alias('lend'), - materialized = 'incremental', - file_format = 'delta', - incremental_strategy = 'merge', - unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'], - post_hook='{{ expose_spells(\'["polygon"]\', + tags = ['dunesql'] + ,alias = alias('lend') + ,materialized = 'incremental' + ,file_format = 'delta' + ,incremental_strategy = 'merge' + ,unique_key = ['transaction_hash', 'pool_pair', 'maturity', 'strike'] + ,post_hook='{{ expose_spells(\'["polygon"]\', "project", "timeswap", \'["raveena15, varunhawk19"]\') }}' @@ -17,43 +18,43 @@ SELECT l.call_tx_hash as transaction_hash, l.call_block_time as time, - CAST(get_json_object(l.param, '$.isToken') AS BOOLEAN) AS token_0, + CAST(JSON_EXTRACT_SCALAR(l.param, '$.isToken') AS BOOLEAN) AS token_0, 'lend' as transaction_type, - get_json_object(l.param, '$.maturity') AS maturity, - get_json_object(l.param, '$.strike') AS strike, + CAST(JSON_EXTRACT_SCALAR(l.param, '$.maturity') AS UINT256) AS maturity, + CAST(JSON_EXTRACT_SCALAR(l.param, '$.strike') AS UINT256) AS strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(get_json_object(l.param, '$.isToken') AS BOOLEAN) = true - THEN CAST(get_json_object(l.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(get_json_object(l.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(JSON_EXTRACT_SCALAR(l.param, '$.isToken') AS BOOLEAN) = true + THEN CAST(JSON_EXTRACT_SCALAR(l.param, '$.tokenAmount') AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(JSON_EXTRACT_SCALAR(l.param, '$.tokenAmount') AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(get_json_object(l.param, '$.isToken') AS BOOLEAN) = true - THEN CAST(get_json_object(l.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(get_json_object(l.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(JSON_EXTRACT_SCALAR(l.param, '$.isToken') AS BOOLEAN) = true + THEN CAST(JSON_EXTRACT_SCALAR(l.param, '$.tokenAmount') AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(JSON_EXTRACT_SCALAR(l.param, '$.tokenAmount') AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryUniswapV3LendGivenPrincipal_call_lendGivenPrincipal') }} l - JOIN {{ ref('timeswap_polygon_pools') }} i ON CAST(maturity as VARCHAR(100)) = i.maturity and cast(strike as VARCHAR(100)) = i.strike + JOIN {{ ref('timeswap_polygon_pools') }} i ON CAST(maturity as UINT256) = i.maturity and cast(strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on l.call_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol and p.blockchain = 'polygon' and l.call_success = true - and CAST(get_json_object(l.param, '$.isToken') AS BOOLEAN) = true + and CAST(JSON_EXTRACT_SCALAR(l.param, '$.isToken') AS BOOLEAN) = true AND p.minute = date_trunc('minute',l.call_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') - WHERE l.call_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) + WHERE l.call_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -63,43 +64,43 @@ UNION SELECT l.call_tx_hash as transaction_hash, l.call_block_time as time, - CAST(get_json_object(l.param, '$.isToken') AS BOOLEAN) AS token_0, + CAST(JSON_EXTRACT_SCALAR(l.param, '$.isToken') AS BOOLEAN) AS token_0, 'lend' as transaction_type, - get_json_object(l.param, '$.maturity') AS maturity, - get_json_object(l.param, '$.strike') AS strike, + CAST(JSON_EXTRACT_SCALAR(l.param, '$.maturity') AS UINT256) AS maturity, + CAST(JSON_EXTRACT_SCALAR(l.param, '$.strike') AS UINT256) AS strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(get_json_object(l.param, '$.isToken') AS BOOLEAN) = true - THEN CAST(get_json_object(l.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(get_json_object(l.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(JSON_EXTRACT_SCALAR(l.param, '$.isToken') AS BOOLEAN) = true + THEN CAST(JSON_EXTRACT_SCALAR(l.param, '$.tokenAmount') AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(JSON_EXTRACT_SCALAR(l.param, '$.tokenAmount') AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(get_json_object(l.param, '$.isToken') AS BOOLEAN) = true - THEN CAST(get_json_object(l.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(get_json_object(l.param, '$.tokenAmount') AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(JSON_EXTRACT_SCALAR(l.param, '$.isToken') AS BOOLEAN) = true + THEN CAST(JSON_EXTRACT_SCALAR(l.param, '$.tokenAmount') AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(JSON_EXTRACT_SCALAR(l.param, '$.tokenAmount') AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryUniswapV3LendGivenPrincipal_call_lendGivenPrincipal') }} l - JOIN {{ ref('timeswap_polygon_pools') }} i ON CAST(maturity as VARCHAR(100)) = i.maturity and cast(strike as VARCHAR(100)) = i.strike + JOIN {{ ref('timeswap_polygon_pools') }} i ON CAST(maturity as UINT256) = i.maturity and cast(strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on l.call_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol and p.blockchain = 'polygon' and l.call_success = true - and CAST(get_json_object(l.param, '$.isToken') AS BOOLEAN) = false + and CAST(JSON_EXTRACT_SCALAR(l.param, '$.isToken') AS BOOLEAN) = false AND p.minute = date_trunc('minute',l.call_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') - WHERE l.call_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) + WHERE l.call_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -115,27 +116,27 @@ SELECT l.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryUniswapV3LendGivenPrincipal_evt_LendGivenPrincipal') }} l JOIN {{ ref('timeswap_polygon_pools') }} i - ON CAST(l.maturity as VARCHAR(100)) = i.maturity - and cast(l.strike as VARCHAR(100)) = i.strike + ON CAST(l.maturity as UINT256) = i.maturity + and CAST(l.strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on l.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol @@ -143,8 +144,8 @@ JOIN {{ source('prices', 'usd') }} p and l.isToken0 = true AND p.minute = date_trunc('minute',l.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE l.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE l.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -159,27 +160,27 @@ SELECT l.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryUniswapV3LendGivenPrincipal_evt_LendGivenPrincipal') }} l JOIN {{ ref('timeswap_polygon_pools') }} i - ON CAST(l.maturity as VARCHAR(100)) = i.maturity - and cast(l.strike as VARCHAR(100)) = i.strike + ON CAST(l.maturity as UINT256) = i.maturity + and CAST(l.strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on l.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol @@ -187,8 +188,8 @@ JOIN {{ source('prices', 'usd') }} p and l.isToken0 = false AND p.minute = date_trunc('minute',l.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE l.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE l.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -206,27 +207,27 @@ SELECT l.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryNoDexLendGivenPrincipal_evt_LendGivenPrincipal') }} l JOIN {{ ref('timeswap_polygon_pools') }} i - ON CAST(l.maturity as VARCHAR(100)) = i.maturity - and cast(l.strike as VARCHAR(100)) = i.strike + ON CAST(l.maturity as UINT256) = i.maturity + and CAST(l.strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on l.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token0_symbol @@ -234,8 +235,8 @@ JOIN {{ source('prices', 'usd') }} p and l.isToken0 = true AND p.minute = date_trunc('minute',l.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE l.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE l.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} @@ -250,27 +251,27 @@ SELECT l.strike as strike, i.pool_pair as pool_pair, i.chain as chain, - tx.from as user, + tx."from" as user, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) + END as UINT256 ) as token_amount, CAST( CASE - WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS DOUBLE) / power(10,i.token0_decimals) * p.price - ELSE CAST(l.tokenAmount AS DOUBLE) / power(10,i.token1_decimals) * p.price - END as DOUBLE + WHEN CAST(l.isToken0 AS BOOLEAN) = true THEN CAST(l.tokenAmount AS UINT256) / power(10,i.token0_decimals) * p.price + ELSE CAST(l.tokenAmount AS UINT256) / power(10,i.token1_decimals) * p.price + END as UINT256 ) as usd_amount FROM {{ source('timeswap_polygon', 'TimeswapV2PeripheryNoDexLendGivenPrincipal_evt_LendGivenPrincipal') }} l JOIN {{ ref('timeswap_polygon_pools') }} i - ON CAST(l.maturity as VARCHAR(100)) = i.maturity - and cast(l.strike as VARCHAR(100)) = i.strike + ON CAST(l.maturity as UINT256) = i.maturity + and CAST(l.strike as UINT256) = i.strike JOIN {{ source('polygon', 'transactions') }} tx on l.evt_tx_hash = tx.hash {% if is_incremental() %} - and tx.block_time >= date_trunc("day", now() - interval '1 week') + and tx.block_time >= date_trunc('day', now() - interval '7' day) {% endif %} JOIN {{ source('prices', 'usd') }} p ON p.symbol=i.token1_symbol @@ -278,6 +279,6 @@ JOIN {{ source('prices', 'usd') }} p and l.isToken0 = false AND p.minute = date_trunc('minute',l.evt_block_time) {% if is_incremental() %} - AND p.minute >= date_trunc("day", now() - interval '1 week') -WHERE l.evt_block_time >= date_trunc("day", now() - interval '1 week') + AND p.minute >= date_trunc('day', now() - interval '7' day) +WHERE l.evt_block_time >= date_trunc('day', now() - interval '7' day) {% endif %} diff --git a/models/timeswap/polygon/timeswap_polygon_pools.sql b/models/timeswap/polygon/timeswap_polygon_pools.sql index 44c031f6e14..c4238762ed1 100644 --- a/models/timeswap/polygon/timeswap_polygon_pools.sql +++ b/models/timeswap/polygon/timeswap_polygon_pools.sql @@ -1,140 +1,142 @@ {{ config( - alias = alias('pools'), - post_hook='{{ expose_spells(\'["polygon"]\', + tags = ['dunesql'] + ,schema = 'timeswap_polygon' + ,alias = alias('pools') + ,unique_key = ['pool_pair', 'maturity', 'strike'] + ,post_hook='{{ expose_spells(\'["polygon"]\', "project", "timeswap", - \'["raveena15, varunhawk19"]\') }}', - unique_key = ['pool_pair', 'maturity', 'strike'] + \'["raveena15, varunhawk19"]\') }}' ) }} SELECT token0_symbol, token1_symbol, - lower(token0_address) as token0_address, - lower(token1_address) as token1_address, + token0_address, + token1_address, token0_decimals, token1_decimals, strike, maturity, pool_pair, chain, - lower(borrow_contract_address) as borrow_contract_address, - lower(lend_contract_address) as lend_contract_address + borrow_contract_address, + lend_contract_address FROM ( VALUES ( 'USDC', 'WETH', - '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', - '0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619', + 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174, + 0x7ceB23fD6bC0adD59E62ac25578270cFf1b9f619, 6, 18, - '237490072735998707284173473430675352952919527482', - '1677513600', + CAST('237490072735998707284173473430675352952919527482' AS UINT256), + CAST('1677513600' AS UINT256), 'USDC-WETH', 'Polygon', - '0x7f7B71d60027aEE523FFfac9cC17ebF7915f1d02', - '0xb0EB735B0246bB11Fb57DB28DF5370D72C153314' + 0x7f7B71d60027aEE523FFfac9cC17ebF7915f1d02, + 0xb0EB735B0246bB11Fb57DB28DF5370D72C153314 ), ( 'stMATIC', 'MIMATIC', - '0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4', - '0xa3Fa99A148fA48D14Ed51d610c367C61876997F1', + 0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4, + 0xa3Fa99A148fA48D14Ed51d610c367C61876997F1, 18, 18, - '340282366920938463463374607431768211456', - '1679918400', + CAST('340282366920938463463374607431768211456' AS UINT256), + CAST('1679918400' AS UINT256), 'stMATIC-MIMATIC', 'Polygon', - '0x477C3AB5c9811e87dEE1fBd43D5357427B749b21', - '0x1a3a964BBa5e918f9630C26D1f772021B0e03CAc' + 0x477C3AB5c9811e87dEE1fBd43D5357427B749b21, + 0x1a3a964BBa5e918f9630C26D1f772021B0e03CAc ), ( 'USDC', 'USDT', - '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', - '0xc2132D05D31c914a87C6611C10748AEb04B58e8F', + 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174, + 0xc2132D05D31c914a87C6611C10748AEb04B58e8F, 6, 6, - '279031540875169540039967178094049933393', - '1678795200', + CAST('279031540875169540039967178094049933393' AS UINT256), + CAST('1678795200' AS UINT256), 'USDC-USDT', 'Polygon', - '0xe14f43397584d138315C113eF6A82010ab84B701', - '0xAb30A405C28fb1c1466f5BFa03BdBa63e1b36584' + 0xe14f43397584d138315C113eF6A82010ab84B701, + 0xAb30A405C28fb1c1466f5BFa03BdBa63e1b36584 ), ( 'USDC', 'stMATIC', - '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', - '0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4', + 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174, + 0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4, 6, 18, - '170141183460469231731687303715884105728000000000000', - '1682337600', + CAST('170141183460469231731687303715884105728000000000000' AS UINT256), + CAST('1682337600' AS UINT256), 'USDC-stMATIC', 'Polygon', - '0x990A70F9a33d748C90Dd05c302dAFfd3FFFAA2a7', - '0x36b34aB7538061089700Ba976BA7e88d7ad500e9' + 0x990A70F9a33d748C90Dd05c302dAFfd3FFFAA2a7, + 0x36b34aB7538061089700Ba976BA7e88d7ad500e9 ), ( 'USDC', 'QUICK', - '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', - '0xB5C064F955D8e7F38fE0460C556a72987494eE17', + 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174, + 0xB5C064F955D8e7F38fE0460C556a72987494eE17, 6, 18, - '2617556668622603565102881595628986241969230769230769', - '1684929600', + CAST('2617556668622603565102881595628986241969230769230769' AS UINT256), + CAST('1684929600' AS UINT256), 'USDC-QUICK', 'Polygon', - '0xb9385AfC6Ddf565C0256116Aa3415EfdFca1E872', - '0x880D3fc39683Ecbfd7636cc48D5FCc34508ca7c3' + 0xb9385AfC6Ddf565C0256116Aa3415EfdFca1E872, + 0x880D3fc39683Ecbfd7636cc48D5FCc34508ca7c3 ), ( 'USDC', 'dQUICK', - '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', - '0x958d208Cdf087843e9AD98d23823d32E17d723A1', + 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174, + 0x958d208Cdf087843e9AD98d23823d32E17d723A1, 6, 18, - '3402823669209384634633746074317682114560000000000000', - '1687521600', + CAST('3402823669209384634633746074317682114560000000000000' AS UINT256), + CAST('1687521600' AS UINT256), 'USDC-dQUICK', 'Polygon', - '0xb9385AfC6Ddf565C0256116Aa3415EfdFca1E872', - '0x880D3fc39683Ecbfd7636cc48D5FCc34508ca7c3' + 0xb9385AfC6Ddf565C0256116Aa3415EfdFca1E872, + 0x880D3fc39683Ecbfd7636cc48D5FCc34508ca7c3 ), ( 'USDC', 'stMATIC', - '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', - '0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4', + 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174, + 0x3A58a54C066FdC0f2D55FC9C89F0415C92eBf3C4, 6, 18, - '261755666862260356510288159562898624196923076923076', - '1688126400', + CAST('261755666862260356510288159562898624196923076923076' AS UINT256), + CAST('1688126400' AS UINT256), 'USDC-stMATIC', 'Polygon', - '0xb9385AfC6Ddf565C0256116Aa3415EfdFca1E872', - '0x880D3fc39683Ecbfd7636cc48D5FCc34508ca7c3' + 0xb9385AfC6Ddf565C0256116Aa3415EfdFca1E872, + 0x880D3fc39683Ecbfd7636cc48D5FCc34508ca7c3 ), ( 'USDC', 'QUICK', - '0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174', - '0xB5C064F955D8e7F38fE0460C556a72987494eE17', + 0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174, + 0xB5C064F955D8e7F38fE0460C556a72987494eE17, 6, 18, - '4253529586511730793292182592897102643200000000000000', - '1690113600', + CAST('4253529586511730793292182592897102643200000000000000' AS UINT256), + CAST('1690113600' AS UINT256), 'USDC-QUICK', 'Polygon', - '0x9f024e0c98b598421c1f3170c94254c266870340', - '0xa68636df3019e56857ad5a1759d130b17746820f' + 0x9f024e0c98b598421c1f3170c94254c266870340, + 0xa68636df3019e56857ad5a1759d130b17746820f ) ) AS temp_table (