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.

Sign up for GitHub

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

Jump to bottom

Transfomer - Fix JOIN in core vault views #97

Merged
merged 4 commits into from
Aug 13, 2024
Merged

Transfomer - Fix JOIN in core vault views #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2ceebe
Fix join
marcus-snx Aug 12, 2024
60962f9
lint models
marcus-snx Aug 12, 2024
c8fffe9
Merge branch 'main' into transformers/fix-blocks-join
marcus-snx Aug 13, 2024
fc962f4
Fix joins for eth_mainnet
marcus-snx Aug 13, 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
2 changes: 1 addition & 1 deletion transformers/synthetix/.sqlfluff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[sqlfluff]
dialect = postgres
templater = jinja
ignore = templating
runaway_limit = 10
max_line_length = 80
indent_unit = space
Expand Down
59 changes: 28 additions & 31 deletions ...ers/synthetix/models/raw/arbitrum/mainnet/core/core_vault_collateral_arbitrum_mainnet.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,40 @@
{{
config(
materialized='table'
)
}}

WITH base AS (
SELECT
with base as (
select
block_number,
contract_address,
chain_id,
pool_id,
collateral_type,
CAST(
amount AS numeric
) AS amount,
CAST(
"value" AS numeric
) AS collateral_value
FROM
cast(
amount as numeric
) as amount,
cast(
value as numeric
) as collateral_value
from
{{ source(
'raw_arbitrum_mainnet',
"core_get_vault_collateral"
) }}
WHERE
amount IS NOT NULL
where
amount is not null
)
SELECT
blocks.ts,
base.block_number,

select
to_timestamp(blocks.timestamp) as ts,
cast(
blocks.block_number as integer
) as block_number,
base.contract_address,
CAST(
base.pool_id AS INTEGER
) AS pool_id,
CAST(
base.collateral_type AS VARCHAR
) AS collateral_type,
{{ convert_wei('base.amount') }} AS amount,
{{ convert_wei('base.collateral_value') }} AS collateral_value
FROM
cast(
base.pool_id as integer
) as pool_id,
cast(
base.collateral_type as varchar
) as collateral_type,
{{ convert_wei('base.amount') }} as amount,
{{ convert_wei('base.collateral_value') }} as collateral_value
from
base
JOIN {{ ref('blocks_arbitrum_mainnet') }} AS blocks
ON base.block_number = blocks.block_number
inner join {{ source('raw_arbitrum_mainnet', 'blocks_parquet') }} as blocks
on base.block_number = blocks.block_number
51 changes: 24 additions & 27 deletions transformers/synthetix/models/raw/arbitrum/mainnet/core/core_vault_debt_arbitrum_mainnet.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,36 @@
{{
config(
materialized='table'
)
}}

WITH base AS (
SELECT
with base as (
select
block_number,
contract_address,
chain_id,
pool_id,
collateral_type,
CAST(
value_1 AS numeric
) AS debt
FROM
cast(
value_1 as numeric
) as debt
from
{{ source(
'raw_arbitrum_mainnet',
"core_get_vault_debt"
) }}
WHERE
value_1 IS NOT NULL
where
value_1 is not null
)
SELECT
blocks.ts,
base.block_number,

select
to_timestamp(blocks.timestamp) as ts,
cast(
blocks.block_number as integer
) as block_number,
base.contract_address,
CAST(
base.pool_id AS INTEGER
) AS pool_id,
CAST(
base.collateral_type AS VARCHAR
) AS collateral_type,
{{ convert_wei('base.debt') }} AS debt
FROM
cast(
base.pool_id as integer
) as pool_id,
cast(
base.collateral_type as varchar
) as collateral_type,
{{ convert_wei('base.debt') }} as debt
from
base
JOIN {{ ref('blocks_arbitrum_mainnet') }} AS blocks
ON base.block_number = blocks.block_number
inner join {{ source('raw_arbitrum_mainnet', 'blocks_parquet') }} as blocks
on base.block_number = blocks.block_number
59 changes: 28 additions & 31 deletions ...ers/synthetix/models/raw/arbitrum/sepolia/core/core_vault_collateral_arbitrum_sepolia.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,43 +1,40 @@
{{
config(
materialized='table'
)
}}

WITH base AS (
SELECT
with base as (
select
block_number,
contract_address,
chain_id,
pool_id,
collateral_type,
CAST(
amount AS numeric
) AS amount,
CAST(
"value" AS numeric
) AS collateral_value
FROM
cast(
amount as numeric
) as amount,
cast(
value as numeric
) as collateral_value
from
{{ source(
'raw_arbitrum_sepolia',
"core_get_vault_collateral"
) }}
WHERE
amount IS NOT NULL
where
amount is not null
)
SELECT
blocks.ts,
base.block_number,

select
to_timestamp(blocks.timestamp) as ts,
cast(
blocks.block_number as integer
) as block_number,
base.contract_address,
CAST(
base.pool_id AS INTEGER
) AS pool_id,
CAST(
base.collateral_type AS VARCHAR
) AS collateral_type,
{{ convert_wei('base.amount') }} AS amount,
{{ convert_wei('base.collateral_value') }} AS collateral_value
FROM
cast(
base.pool_id as integer
) as pool_id,
cast(
base.collateral_type as varchar
) as collateral_type,
{{ convert_wei('base.amount') }} as amount,
{{ convert_wei('base.collateral_value') }} as collateral_value
from
base
JOIN {{ ref('blocks_arbitrum_sepolia') }} AS blocks
ON base.block_number = blocks.block_number
inner join {{ source('raw_arbitrum_sepolia', 'blocks_parquet') }} as blocks
on base.block_number = blocks.block_number
51 changes: 24 additions & 27 deletions transformers/synthetix/models/raw/arbitrum/sepolia/core/core_vault_debt_arbitrum_sepolia.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,36 @@
{{
config(
materialized='table'
)
}}

WITH base AS (
SELECT
with base as (
select
block_number,
contract_address,
chain_id,
pool_id,
collateral_type,
CAST(
value_1 AS numeric
) AS debt
FROM
cast(
value_1 as numeric
) as debt
from
{{ source(
'raw_arbitrum_sepolia',
"core_get_vault_debt"
) }}
WHERE
value_1 IS NOT NULL
where
value_1 is not null
)
SELECT
blocks.ts,
base.block_number,

select
to_timestamp(blocks.timestamp) as ts,
cast(
blocks.block_number as integer
) as block_number,
base.contract_address,
CAST(
base.pool_id AS INTEGER
) AS pool_id,
CAST(
base.collateral_type AS VARCHAR
) AS collateral_type,
{{ convert_wei('base.debt') }} AS debt
FROM
cast(
base.pool_id as integer
) as pool_id,
cast(
base.collateral_type as varchar
) as collateral_type,
{{ convert_wei('base.debt') }} as debt
from
base
JOIN {{ ref('blocks_arbitrum_sepolia') }} AS blocks
ON base.block_number = blocks.block_number
inner join {{ source('raw_arbitrum_sepolia', 'blocks_parquet') }} as blocks
on base.block_number = blocks.block_number
60 changes: 28 additions & 32 deletions transformers/synthetix/models/raw/base/mainnet/core/core_vault_collateral_base_mainnet.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,40 @@
{{
config(
materialized='table'
)
}}


WITH base AS (
SELECT
with base as (
select
block_number,
contract_address,
chain_id,
pool_id,
collateral_type,
CAST(
amount AS numeric
) AS amount,
CAST(
"value" AS numeric
) AS collateral_value
FROM
cast(
amount as numeric
) as amount,
cast(
value as numeric
) as collateral_value
from
{{ source(
'raw_base_mainnet',
"core_get_vault_collateral"
) }}
WHERE
amount IS NOT NULL
where
amount is not null
)
SELECT
blocks.ts,
base.block_number,

select
to_timestamp(blocks.timestamp) as ts,
cast(
blocks.block_number as integer
) as block_number,
base.contract_address,
CAST(
base.pool_id AS INTEGER
) AS pool_id,
CAST(
base.collateral_type AS VARCHAR
) AS collateral_type,
{{ convert_wei('base.amount') }} AS amount,
{{ convert_wei('base.collateral_value') }} AS collateral_value
FROM
cast(
base.pool_id as integer
) as pool_id,
cast(
base.collateral_type as varchar
) as collateral_type,
{{ convert_wei('base.amount') }} as amount,
{{ convert_wei('base.collateral_value') }} as collateral_value
from
base
JOIN {{ ref('blocks_base_mainnet') }} AS blocks
ON base.block_number = blocks.block_number
inner join {{ source('raw_base_mainnet', 'blocks_parquet') }} as blocks
on base.block_number = blocks.block_number
Loading
Loading