bridges: fix across macros

dbt_subprojects/hourly_spellbook/macros/sector/bridges/across_v2_deposits.sql

@@ -1,32 +1,5 @@
 {% macro across_v2_deposits(blockchain, events) %}
 
-
-WITH across_id_mapping AS (
-    SELECT id, blockchain
-    FROM (VALUES
-    (1, 'ethereum')
-    , (10, 'optimism')
-    , (137, 'polygon')
-    , (42161, 'arbitrum')
-    , (56, 'bnb')
-    , (324, 'zksync')
-    , (59144, 'linea')
-    , (8453, 'base')
-    , (7777777, 'zora')
-    , (81457, 'blast')
-    , (34443, 'mode')
-    , (232, 'lens')
-    , (57073, 'ink')
-    , (1135, 'list')
-    , (41455, 'aleph_zero')
-    , (690, 'redstone')
-    , (534352, 'scroll')
-    , (1868, 'soneium')
-    , (480, 'worldchain')
-    , (130, 'unichain')
-    ) AS x (id, blockchain)
-    )
-
 SELECT '{{blockchain}}' AS deposit_chain
 , m.blockchain AS withdrawal_chain
 , 'Across' AS bridge_name
@@ -46,6 +19,6 @@ SELECT '{{blockchain}}' AS deposit_chain
 , contract_address
 , CAST(depositId_uint256 AS varchar) AS bridge_transfer_id
 FROM ({{ events }}) d
-LEFT JOIN across_id_mapping m ON d.destinationChainId=m.id
+LEFT JOIN {{ ref('bridges_across_chain_indexes') }} m ON d.destinationChainId=m.id
 
 {% endmacro %}

dbt_subprojects/hourly_spellbook/macros/sector/bridges/across_v2_withdrawals.sql

@@ -1,50 +1,48 @@
 {% macro across_v2_withdrawals(blockchain, events) %}
 
-WITH across_id_mapping AS (
-    SELECT id, blockchain
-    FROM (VALUES
-    (1, 'ethereum')
-    , (10, 'optimism')
-    , (137, 'polygon')
-    , (42161, 'arbitrum')
-    , (56, 'bnb')
-    , (324, 'zksync')
-    , (59144, 'linea')
-    , (8453, 'base')
-    , (7777777, 'zora')
-    , (81457, 'blast')
-    , (34443, 'mode')
-    , (232, 'lens')
-    , (57073, 'ink')
-    , (1135, 'list')
-    , (41455, 'aleph_zero')
-    , (690, 'redstone')
-    , (534352, 'scroll')
-    , (1868, 'soneium')
-    , (480, 'worldchain')
-    , (130, 'unichain')
-    ) AS x (id, blockchain)
+WITH ranked AS (
+    SELECT m.blockchain AS deposit_chain
+    , '{{blockchain}}' AS withdrawal_chain
+    , 'Across' AS bridge_name
+    , '2' AS bridge_version
+    , evt_block_date AS block_date
+    , evt_block_time AS block_time
+    , evt_block_number AS block_number
+    , outputAmount AS withdrawal_amount_raw
+    , CASE WHEN varbinary_substring(depositor,1, 12) = 0x000000000000000000000000 THEN varbinary_substring(depositor,13) ELSE depositor END AS sender
+    , CASE WHEN varbinary_substring(recipient,1, 12) = 0x000000000000000000000000 THEN varbinary_substring(recipient,13) ELSE recipient END AS recipient
+    , CASE WHEN varbinary_substring(outputToken,1, 12) = 0x000000000000000000000000 THEN varbinary_substring(outputToken,13) ELSE outputToken END AS withdrawal_token_address
+    , 'erc20' AS deposit_token_standard
+    , 'erc20' AS withdrawal_token_standard
+    , evt_tx_from AS tx_from
+    , evt_tx_hash AS tx_hash
+    , evt_index
+    , contract_address
+    , CAST(depositId_uint256 AS varchar) AS bridge_transfer_id
+    , ROW_NUMBER() OVER (PARTITION BY d.originChainId, d.evt_block_number, d.evt_tx_hash, d.depositId_uint256 ORDER BY d.evt_index DESC) AS rn
+    FROM ({{ events }}) d
+    LEFT JOIN {{ ref('bridges_across_chain_indexes') }} m ON d.originChainId=m.id
     )
-    
-SELECT m.blockchain AS deposit_chain
-, 'arbitrum' AS withdrawal_chain
-, 'Across' AS bridge_name
-, '2' AS bridge_version
-, evt_block_date AS block_date
-, evt_block_time AS block_time
-, evt_block_number AS block_number
-, outputAmount AS withdrawal_amount_raw
-, CASE WHEN varbinary_substring(depositor,1, 12) = 0x000000000000000000000000 THEN varbinary_substring(depositor,13) ELSE depositor END AS sender
-, CASE WHEN varbinary_substring(recipient,1, 12) = 0x000000000000000000000000 THEN varbinary_substring(recipient,13) ELSE recipient END AS recipient
-, CASE WHEN varbinary_substring(outputToken,1, 12) = 0x000000000000000000000000 THEN varbinary_substring(outputToken,13) ELSE outputToken END AS withdrawal_token_address
-, 'erc20' AS deposit_token_standard
-, 'erc20' AS withdrawal_token_standard
-, evt_tx_from AS tx_from
-, evt_tx_hash AS tx_hash
+
+SELECT deposit_chain
+, withdrawal_chain
+, bridge_name
+, bridge_version
+, block_date
+, block_time
+, block_number
+, withdrawal_amount_raw
+, sender
+, recipient
+, withdrawal_token_address
+, deposit_token_standard
+, withdrawal_token_standard
+, tx_from
+, tx_hash
 , evt_index
 , contract_address
-, CAST(depositId_uint256 AS varchar) AS bridge_transfer_id
-FROM ({{ events }}) d
-LEFT JOIN across_id_mapping m ON d.originChainId=m.id
+, bridge_transfer_id
+FROM ranked
+WHERE rn = 1
 
 {% endmacro %}

dbt_subprojects/hourly_spellbook/macros/sector/bridges/across_v3_deposits.sql

@@ -1,32 +1,6 @@
 {% macro across_v3_deposits(blockchain, events) %}
 
-WITH across_id_mapping AS (
-    SELECT id, blockchain
-    FROM (VALUES
-    (1, 'ethereum')
-    , (10, 'optimism')
-    , (137, 'polygon')
-    , (42161, 'arbitrum')
-    , (56, 'bnb')
-    , (324, 'zksync')
-    , (59144, 'linea')
-    , (8453, 'base')
-    , (7777777, 'zora')
-    , (81457, 'blast')
-    , (34443, 'mode')
-    , (232, 'lens')
-    , (57073, 'ink')
-    , (1135, 'list')
-    , (41455, 'aleph_zero')
-    , (690, 'redstone')
-    , (534352, 'scroll')
-    , (1868, 'soneium')
-    , (480, 'worldchain')
-    , (130, 'unichain')
-    ) AS x (id, blockchain)
-    )
-
-SELECT 'arbitrum' AS deposit_chain
+SELECT '{{blockchain}}' AS deposit_chain
 , m.blockchain AS withdrawal_chain
 , 'Across' AS bridge_name
 , '3' AS bridge_version
@@ -45,6 +19,6 @@ SELECT 'arbitrum' AS deposit_chain
 , contract_address
 , CAST(depositId AS varchar) AS bridge_transfer_id
 FROM ({{ events }}) d
-LEFT JOIN across_id_mapping m ON d.destinationChainId=m.id
+LEFT JOIN {{ ref('bridges_across_chain_indexes') }} m ON d.destinationChainId=m.id
 
 {% endmacro %}

dbt_subprojects/hourly_spellbook/macros/sector/bridges/across_v3_withdrawals.sql

@@ -1,33 +1,7 @@
 {% macro across_v3_withdrawals(blockchain, events) %}
 
-WITH across_id_mapping AS (
-    SELECT id, blockchain
-    FROM (VALUES
-    (1, 'ethereum')
-    , (10, 'optimism')
-    , (137, 'polygon')
-    , (42161, 'arbitrum')
-    , (56, 'bnb')
-    , (324, 'zksync')
-    , (59144, 'linea')
-    , (8453, 'base')
-    , (7777777, 'zora')
-    , (81457, 'blast')
-    , (34443, 'mode')
-    , (232, 'lens')
-    , (57073, 'ink')
-    , (1135, 'list')
-    , (41455, 'aleph_zero')
-    , (690, 'redstone')
-    , (534352, 'scroll')
-    , (1868, 'soneium')
-    , (480, 'worldchain')
-    , (130, 'unichain')
-    ) AS x (id, blockchain)
-    )
-
 SELECT m.blockchain AS deposit_chain
-, 'arbitrum' AS withdrawal_chain
+, '{{blockchain}}' AS withdrawal_chain
 , 'Across' AS bridge_name
 , '3' AS bridge_version
 , evt_block_date AS block_date
@@ -45,6 +19,6 @@ SELECT m.blockchain AS deposit_chain
 , contract_address
 , CAST(depositId AS varchar) AS bridge_transfer_id
 FROM ({{ events }}) d
-LEFT JOIN across_id_mapping m ON d.originChainId=m.id
+LEFT JOIN {{ ref('bridges_across_chain_indexes') }} m ON d.originChainId=m.id
 
 {% endmacro %}

dbt_subprojects/hourly_spellbook/models/_sector/bridges/chain_indexes/_schema.yml

@@ -16,4 +16,16 @@ models:
         description: "Blockchain id"
       - &blockchain
         name: blockchain
-        description: "Blockchain name"
+        description: "Blockchain name"
+  - name: bridges_across_chain_indexes
+    meta:
+      blockchain: ethereum
+      sector: bridges
+      project: across
+      contributors: [ 'hildobby']
+    config:
+      tags: [ 'bridges', 'chain_indexes' ]
+    description: "Across's blockchains indexes"
+    columns:
+      - *id
+      - *blockchain

dbt_subprojects/hourly_spellbook/models/_sector/bridges/chain_indexes/bridges_across_chain_indexes.sql

@@ -0,0 +1,34 @@
+{{ config(
+    schema = 'bridges',
+    alias = 'across_chain_indexes',
+    materialized = 'view',
+    )
+}}
+
+-- source: https://docs.across.to/reference/supported-chains
+
+SELECT id, blockchain
+    FROM (VALUES
+    (1, 'ethereum')
+    , (10, 'optimism')
+    , (137, 'polygon')
+    , (42161, 'arbitrum')
+    , (56, 'bnb')
+    , (324, 'zksync')
+    , (59144, 'linea')
+    , (8453, 'base')
+    , (7777777, 'zora')
+    , (81457, 'blast')
+    , (34443, 'mode')
+    , (232, 'lens')
+    , (57073, 'ink')
+    , (1135, 'lisk')
+    , (41455, 'aleph_zero')
+    , (690, 'redstone')
+    , (534352, 'scroll')
+    , (1868, 'soneium')
+    , (480, 'worldchain')
+    , (130, 'unichain')
+    , (999, 'hyperevm')
+    , (34268394551451, 'solana')
+    ) AS x (id, blockchain)