add/bridge-updates-eth (#791)

* updates for native * symbol for axelar * dst chain seed * dst chain seed * rename
FlipsideCrypto · Jan 4, 2024 · 5f24b03 · 5f24b03
1 parent 86268ab
commit 5f24b03
Show file tree

Hide file tree

Showing 11 changed files with 153 additions and 41 deletions.
diff --git a/data/silver_bridge__meson_chain_id_seed.csv b/data/silver_bridge__meson_chain_id_seed.csv
@@ -35,4 +35,5 @@ Sui,0x0310
 Terra,0x014a
 Thorchain,0x03a3
 Tron,0x00c3
-zkSync Era,0x0324
+zkSync Era,0x0324
+zkFair,0xa70e
diff --git a/data/silver_bridge__standard_dst_chain_seed.csv b/data/silver_bridge__standard_dst_chain_seed.csv
@@ -0,0 +1,98 @@
+destination_chain,standard_destination_chain
+acala,acala
+algorand,algorand
+aptos,aptos
+arbitrum,arbitrum
+arbitrum nova,arbitrum nova
+arbitrum one,arbitrum
+archway,archway
+astar,astar
+aurora,aurora
+aurora mainnet,aurora
+avalanche,avalanche
+avalanche c-chain,avalanche
+base,base
+bnb,bsc
+bnb chain,bsc
+bnb smart chain mainnet,bsc
+boba bnb mainnet,boba
+boba network,boba
+bsc,bsc
+canto,canto
+carbon,carbon
+celo,celo
+celo mainnet,celo
+coinweb,coinweb
+conflux,conflux
+conflux espace,conflux
+crab network,crab
+crescent,crescent
+cronos mainnet,cronos
+crypto chain,crypto
+dfk chain,dfk
+dogechain mainnet,dogechain
+eos,eos
+ethereum,ethereum
+ethereum mainnet,ethereum
+evmos,evmos
+fantom,fantom
+fantom opera,fantom
+filecoin,filecoin
+fuse,fuse
+gnosis,gnosis
+harmony mainnet shard 0,harmony
+huobi eco chain mainnet,huobi eco
+injective,injective
+juno,juno
+karura,karura
+kava,kava
+klaytn,klaytn
+klaytn mainnet cypress,klaytn
+kujira,kujira
+linea,linea
+manta,manta
+mantle,mantle
+metis,metis
+metis andromeda mainnet,metis
+moonbeam,moonbeam
+moonriver,moonriver
+nautilus,nautilus
+near,near
+neutron,neutron
+oasis,oasis
+okxchain mainnet,okxchain
+ontology mainnet,ontology
+op mainnet,optimism
+opbnb,opbnb
+optimism,optimism
+osmosis,osmosis
+polygon,polygon
+polygon mainnet,polygon
+polygon pos,polygon
+polygon zkevm,polygon zkevm
+ronin,ronin
+scroll,scroll
+secret-snip,secret
+sei,sei
+skale europa,skale europa
+skale nebula,skale nebula
+solana,solana
+stargaze,stargaze
+starknet,starknet
+sui,sui
+telos evm mainnet,telos
+terra,terra
+terra-2,terra2
+terra2,terra2
+tezos,tezos
+tron,tron
+umee,umee
+waves,waves
+xpla,xpla
+xrpl,xrpl
+zkfair,zkfair
+zksync era,zksync era
+zksync era mainnet,zksync era
+zksync lite,zksync lite
+zora,zora
+zzz,zzz
diff --git a/models/gold/defi/defi__ez_bridge_activity.sql b/models/gold/defi/defi__ez_bridge_activity.sql
@@ -2,12 +2,8 @@
     materialized = 'view',
     persist_docs ={ "relation": true,
     "columns": true },
-    meta ={ 
-        'database_tags':{
-            'table':{
-                'PROTOCOL': 'ACROSS, ALLBRIDGE, AXELAR, CELER, CBRIDGE, HOP, MESON, MULTICHAIN, NATIVE, STARGATE, SYMBIOSIS, SYNAPSE, WORMHOLE',
-                'PURPOSE': 'BRIDGE'
-        } } }
+    meta ={ 'database_tags':{ 'table':{ 'PROTOCOL': 'ACROSS, ALLBRIDGE, AXELAR, CELER, CBRIDGE, HOP, MESON, MULTICHAIN, NATIVE, STARGATE, SYMBIOSIS, SYNAPSE, WORMHOLE',
+    'PURPOSE': 'BRIDGE' } } }
 ) }}
 
 SELECT
@@ -24,7 +20,10 @@ SELECT
     sender,
     receiver,
     destination_chain_receiver,
-    destination_chain,
+    COALESCE(
+        standard_destination_chain,
+        b.destination_chain
+    ) AS destination_chain,
     destination_chain_id,
     token_address,
     token_symbol,
@@ -47,3 +46,6 @@ SELECT
     ) AS modified_timestamp
 FROM
     {{ ref('silver_bridge__complete_bridge_activity') }}
+    b
+    LEFT JOIN {{ ref('silver_bridge__standard_dst_chain_seed') }} C
+    ON b.destination_chain = C.destination_chain
diff --git a/models/silver/defi/bridge/meson/silver_bridge__meson_transfers.sql b/models/silver/defi/bridge/meson/silver_bridge__meson_transfers.sql
@@ -47,13 +47,12 @@ native_transfers AS (
         tx.origin_function_signature,
         et.from_address,
         et.to_address,
-        eth_value,
+        amount_precise_raw,
         identifier,
-        input,
         _call_id,
         et._inserted_timestamp
     FROM
-        {{ ref('silver__eth_transfers') }}
+        {{ ref('silver__native_transfers') }}
         et
         INNER JOIN {{ ref('silver__transactions') }}
         tx
@@ -105,10 +104,7 @@ all_transfers AS (
         to_address AS bridge_address,
         from_address AS sender,
         to_address AS receiver,
-        eth_value * pow(
-            10,
-            18
-        ) AS amount_unadj,
+        amount_precise_raw AS amount_unadj,
         '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2' AS token_address,
         {{ dbt_utils.generate_surrogate_key(
             ['_call_id']

diff --git a/models/silver/defi/bridge/native_bridges/silver_bridge__native_bridges_transfers_out.sql b/models/silver/defi/bridge/native_bridges/silver_bridge__native_bridges_transfers_out.sql
@@ -63,13 +63,12 @@ native_transfers AS (
         bridge_address,
         bridge_name,
         blockchain,
-        eth_value,
+        amount_precise_raw,
         identifier,
-        input,
         _call_id,
         et._inserted_timestamp
     FROM
-        {{ ref('silver__eth_transfers') }}
+        {{ ref('silver__native_transfers') }}
         et
         INNER JOIN bridges b
         ON et.to_address = b.bridge_address
@@ -140,10 +139,7 @@ FINAL AS (
             WHEN origin_from_address = '0x0000000000000000000000000000000000000000' THEN from_address
             ELSE origin_from_address
         END AS destination_chain_receiver,
-        eth_value * pow(
-            10,
-            18
-        ) AS amount_unadj,
+        amount_precise_raw AS amount_unadj,
         blockchain AS destination_chain,
         '0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2' AS token_address,
         {{ dbt_utils.generate_surrogate_key(

diff --git a/models/silver/defi/bridge/silver_bridge__complete_bridge_activity.sql b/models/silver/defi/bridge/silver_bridge__complete_bridge_activity.sql
@@ -26,6 +26,7 @@ WITH across AS (
         destination_chain_id :: STRING AS destination_chain_id,
         NULL AS destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount AS amount_unadj,
         _log_id AS _id,
         _inserted_timestamp
@@ -61,6 +62,7 @@ allbridge AS (
         NULL AS destination_chain_id,
         destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount AS amount_unadj,
         _log_id AS _id,
         _inserted_timestamp
@@ -96,6 +98,7 @@ axelar AS (
         NULL AS destination_chain_id,
         destination_chain,
         token_address,
+        token_symbol,
         amount AS amount_unadj,
         _log_id AS _id,
         _inserted_timestamp
@@ -131,6 +134,7 @@ celer_cbridge AS (
         destination_chain_id :: STRING AS destination_chain_id,
         NULL AS destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount AS amount_unadj,
         _log_id AS _id,
         _inserted_timestamp
@@ -166,6 +170,7 @@ hop AS (
         destination_chain_id :: STRING AS destination_chain_id,
         NULL AS destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount AS amount_unadj,
         _log_id AS _id,
         _inserted_timestamp
@@ -201,6 +206,7 @@ meson AS (
         destination_chain_id :: STRING AS destination_chain_id,
         destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount_unadj,
         _id,
         _inserted_timestamp
@@ -236,6 +242,7 @@ multichain AS (
         destination_chain_id :: STRING AS destination_chain_id,
         NULL AS destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount AS amount_unadj,
         _log_id AS _id,
         _inserted_timestamp
@@ -271,6 +278,7 @@ stargate AS (
         destination_chain_id :: STRING AS destination_chain_id,
         destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount_unadj,
         _log_id AS _id,
         _inserted_timestamp
@@ -306,6 +314,7 @@ symbiosis AS (
         destination_chain_id :: STRING AS destination_chain_id,
         NULL AS destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount AS amount_unadj,
         _log_id AS _id,
         _inserted_timestamp
@@ -322,7 +331,7 @@ WHERE
     )
 {% endif %}
 ),
-synapse_td AS (
+synapse_tb AS (
     SELECT
         block_number,
         block_timestamp,
@@ -334,18 +343,19 @@ synapse_td AS (
         bridge_address,
         event_name,
         platform,
-        'v1-td' AS version,
+        'v1-tb' AS version,
         sender,
         receiver,
         destination_chain_receiver,
         destination_chain_id :: STRING AS destination_chain_id,
         NULL AS destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount AS amount_unadj,
         _log_id AS _id,
         _inserted_timestamp
     FROM
-        {{ ref('silver_bridge__synapse_tokendeposit') }}
+        {{ ref('silver_bridge__synapse_token_bridge') }}
 
 {% if is_incremental() %}
 WHERE
@@ -357,7 +367,7 @@ WHERE
     )
 {% endif %}
 ),
-synapse_tds AS (
+synapse_tbs AS (
     SELECT
         block_number,
         block_timestamp,
@@ -369,18 +379,19 @@ synapse_tds AS (
         bridge_address,
         event_name,
         platform,
-        'v1-tds' AS version,
+        'v1-tbs' AS version,
         sender,
         receiver,
         destination_chain_receiver,
         destination_chain_id :: STRING AS destination_chain_id,
         NULL AS destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount AS amount_unadj,
         _log_id AS _id,
         _inserted_timestamp
     FROM
-        {{ ref('silver_bridge__synapse_tokendepositandswap') }}
+        {{ ref('silver_bridge__synapse_tokenbridgeandswap') }}
 
 {% if is_incremental() %}
 WHERE
@@ -411,6 +422,7 @@ wormhole AS (
         destination_chain_id :: STRING AS destination_chain_id,
         destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount_unadj,
         _id,
         _inserted_timestamp
@@ -476,12 +488,12 @@ all_protocols AS (
     SELECT
         *
     FROM
-        synapse_td
+        synapse_tb
     UNION ALL
     SELECT
         *
     FROM
-        synapse_tds
+        synapse_tbs
     UNION ALL
     SELECT
         *
@@ -507,6 +519,7 @@ native_bridges AS (
         NULL AS destination_chain_id,
         destination_chain,
         token_address,
+        NULL AS token_symbol,
         amount_unadj,
         _id,
         _inserted_timestamp
@@ -577,7 +590,13 @@ FINAL AS (
             )
         END AS destination_chain,
         b.token_address,
-        C.symbol AS token_symbol,
+        CASE
+            WHEN platform = 'axelar' THEN COALESCE(
+                C.symbol,
+                b.token_symbol
+            )
+            ELSE C.symbol
+        END AS token_symbol,
         C.decimals AS token_decimals,
         amount_unadj,
         CASE

diff --git a/...e/silver_bridge__synapse_tokendeposit.sql → ...e/silver_bridge__synapse_token_bridge.sql b/...e/silver_bridge__synapse_tokendeposit.sql → ...e/silver_bridge__synapse_token_bridge.sql
@@ -36,7 +36,11 @@ WITH base_evt AS (
     FROM
         {{ ref('silver__decoded_logs') }}
     WHERE
-        topics [0] :: STRING = '0xda5273705dbef4bf1b902a131c2eac086b7e1476a8ab0cb4da08af1fe1bd8e3b'
+        topics [0] :: STRING IN (
+            '0xdc5bad4651c5fbe9977a696aadc65996c468cde1448dd468ec0d83bf61c4b57c',
+            --redeem
+            '0xda5273705dbef4bf1b902a131c2eac086b7e1476a8ab0cb4da08af1fe1bd8e3b' --deposit
+        )
         AND contract_address = '0x2796317b0ff8538f253012862c06787adfb8ceb6'
         AND origin_to_address IS NOT NULL
 

diff --git a/...e/silver_bridge__synapse_tokendeposit.yml → ...e/silver_bridge__synapse_token_bridge.yml b/...e/silver_bridge__synapse_tokendeposit.yml → ...e/silver_bridge__synapse_token_bridge.yml
@@ -1,6 +1,6 @@
 version: 2
 models:
-  - name: silver_bridge__synapse_tokendeposit
+  - name: silver_bridge__synapse_token_bridge
     tests:
       - dbt_utils.unique_combination_of_columns:
           combination_of_columns:

diff --git a/...r_bridge__synapse_tokendepositandswap.sql → ...er_bridge__synapse_tokenbridgeandswap.sql b/...r_bridge__synapse_tokendepositandswap.sql → ...er_bridge__synapse_tokenbridgeandswap.sql