diff --git a/data/testing__swaps_intermediate_jupiterv6.csv b/data/testing__swaps_intermediate_jupiterv6.csv index 59a08947..3fe95953 100644 --- a/data/testing__swaps_intermediate_jupiterv6.csv +++ b/data/testing__swaps_intermediate_jupiterv6.csv @@ -7,7 +7,9 @@ tx_id,swapper,from_amt,from_mint,to_amt,to_mint,swap_index 5YrfH1RDhZkhh98eikYFcuqRxHY8K87A7hBBFAasaJyCeMW1dr1nG5xNDps3e3GaHnt2cp1tssZJQS2eFaUwcPz9,S5ARSDD3ddZqqqqqb2EUE2h2F1XQHBk7bErRW1WPGe4,0.00097,So11111111111111111111111111111111111111112,0.018899,EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v,4 GD7mFaoiFFxRKEi4EfYbRHmCRN1Q7hCwrQaZbiRq998vXU7bwY22ET1SwXcgDYKSbVLVTmkbM7HgE7G1HSJDT4T,8wHvL3R61pqVxi3TLmsB9pXYGnJB1saR9rFyfpbk18sN,4908.088807,iotEVVZLEywoTn1QdwNPddxPWszn3zFhEot3MfL9fns,0.115696271,So11111111111111111111111111111111111111112,2 JLHisghyiom2v1fY4z2tntjQYz7Fupe679pTJSuWaPvymEwEau9WvFbxGEyvvM1SPZqZPHKroLWqZkrrXtH9WkP,AHH4fRDrZv49kWmBqLonvVJbcDNs3J4faXCEWRH584v8,0.197252365,So11111111111111111111111111111111111111112,0.00247394,7vfCXTUXx5WJV5JADk17DUJ4ksgau7utNKj4b963voxs,6 -LVwfUycnkCw93ywALBfm1zvBcx7sDT9HdTo8wYQooan9CsKTU7BmZLhwQ3mpRSMFCRhDm5Q5GFASAGUmjQTQrJj,6Yfb8TxztNEJxj6pMtF24gPYAaFF9wioZxVRdzvbbJcE,iotEVVZLEywoTn1QdwNPddxPWszn3zFhEot3MfL9fns,144923.75,hntyVP6YFm1Hg25TN9WGLqM12b8TQmcknKrdu1oxWux,35.41,2 -2HDxbrNSMrbGGu1xKKGNm3EbNmqaYxq2Dqpwe6tpKeLXevV2zCdA1feq61kfEVmDvu7mn9cwV9AbQWRE4VQbLkTY,43qeP7zawwuzqDD18erxtAK4C2siTnvuumEGmaD65t1h,2BKiPi4sxd5bq7FZ93Y8hh7pndpU1d7tF49P3vvQg7qu,417575.29,So11111111111111111111111111111111111111112,0.97847569,3 -sbMujMpco3YpH1DSpBnU2gXU2xEbCkWcsg95HCHBXe3SsiEsEKYv4TAZjaSEGYKSCmp1hRBdoWxXWvDZbWPXoXD,momXXbanL1qHS4q1RPSSv8jam59j1MM2vx1TfQf3e49,So11111111111111111111111111111111111111112,1.1,So11111111111111111111111111111111111111112,1.1008,2 -51zH6E9Q3KknnUwPpJeV9Au6zSzxT6ZmGbEW3v8Lk3GLjcUBosChbyWBWf7NTZEpBiqameEwRPCqio1XdsXPnC4k,GPmE7JCdW1WB9P1ZbAwHrPfHFr5D2nio4hsjCkwoxoKk,27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4,226.84,EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v,397.690319,2 \ No newline at end of file +LVwfUycnkCw93ywALBfm1zvBcx7sDT9HdTo8wYQooan9CsKTU7BmZLhwQ3mpRSMFCRhDm5Q5GFASAGUmjQTQrJj,6Yfb8TxztNEJxj6pMtF24gPYAaFF9wioZxVRdzvbbJcE,144923.75,iotEVVZLEywoTn1QdwNPddxPWszn3zFhEot3MfL9fns,35.42,hntyVP6YFm1Hg25TN9WGLqM12b8TQmcknKrdu1oxWux,2 +2HDxbrNSMrbGGu1xKKGNm3EbNmqaYxq2Dqpwe6tpKeLXevV2zCdA1feq61kfEVmDvu7mn9cwV9AbQWRE4VQbLkTY,43qeP7zawwuzqDD18erxtAK4C2siTnvuumEGmaD65t1h,417575.29457,2BKiPi4sxd5bq7FZ93Y8hh7pndpU1d7tF49P3vvQg7qu,0.97847569,So11111111111111111111111111111111111111112,3 +sbMujMpco3YpH1DSpBnU2gXU2xEbCkWcsg95HCHBXe3SsiEsEKYv4TAZjaSEGYKSCmp1hRBdoWxXWvDZbWPXoXD,momXXbanL1qHS4q1RPSSv8jam59j1MM2vx1TfQf3e49,1.1,So11111111111111111111111111111111111111112,1.1008,So11111111111111111111111111111111111111112,2 +51zH6E9Q3KknnUwPpJeV9Au6zSzxT6ZmGbEW3v8Lk3GLjcUBosChbyWBWf7NTZEpBiqameEwRPCqio1XdsXPnC4k,GPmE7JCdW1WB9P1ZbAwHrPfHFr5D2nio4hsjCkwoxoKk,226.84,27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4,397.690319,EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v,2 +5vdYEWuHxJAwENhZdUAqsAaV7mxRVcxPQkS5V4m5yCroSpox1LG1LNLmQnpyfEBbQkikLhxWVYbBkTc9f3BGi5ZU,6vGhnoZZXwjsAv1jRw3UDECzGAqHnFZVMLcsinurAjbR,61.72,jucy5XJ76pHVvtPZb5TKRcGQExkwit2P5s4vY8UzmpC,55.669332093,bSo13r4TkiE4KumL71LsHTPpL2euBYLFx6h9HP3piy1,2 +3ysjbsjuwREA7QNvm8SmFv5fjkTzZysPn3D5SZWibKoiXPRgniqmV9e5tqz1BZBqmHkbdUQb6tQpoCk9yJcayQDk,3rUVCyDNs5G4zF4PNrXHGvRx6TURTm36YAiAcD53NmrU,23.368842039,LSTxxxnJzKDFSLr4dUkPcmCf5VyryEqzPLz5j4bpxFp,30.016173133,So11111111111111111111111111111111111111112,3 \ No newline at end of file diff --git a/models/silver/swaps/silver__swaps_intermediate_jupiterv6.sql b/models/silver/swaps/silver__swaps_intermediate_jupiterv6.sql index fa8afd1e..45aee242 100644 --- a/models/silver/swaps/silver__swaps_intermediate_jupiterv6.sql +++ b/models/silver/swaps/silver__swaps_intermediate_jupiterv6.sql @@ -77,6 +77,8 @@ pre_final as ( iff(OBJECT_KEYS(decoded_instruction:args:routePlan:"0":swap)[0]::string = 'perpsRemoveLiquidity', true, false)as is_perps_remove_liquidity, iff(OBJECT_KEYS(decoded_instruction:args:routePlan:"0":swap)[0]::string = 'saberAddDecimalsWithdraw', true, false)as is_saber_withdraw, iff(OBJECT_KEYS(decoded_instruction:args:routePlan:"0":swap)[0]::string = 'phoenix', true, false)as is_phoenix_swap, + iff(OBJECT_KEYS(decoded_instruction:args:routePlan:"0":swap)[0]::string = 'stakeDexPrefundWithdrawStakeAndDepositStake', true, false) as is_sanctum_burn_route, + iff(is_sanctum_burn_route, decoded_instruction:accounts[13]:pubkey::string, NULL) as sanctum_burn_mint, decoded_instruction:args:inAmount::number as args_in_amount, _inserted_timestamp from silver.swaps_intermediate_jupiterv6__intermediate_tmp d @@ -91,12 +93,16 @@ swaps_using_burns as ( case when is_helium_redeem then 'iotEVVZLEywoTn1QdwNPddxPWszn3zFhEot3MfL9fns' when is_perps_remove_liquidity then '27G8MtK7VtTcCHkpASjSDdkWWYfoqT6ggEuKidVJidD4' + when is_sanctum_burn_route then sanctum_burn_mint else '7dHbWXmci3dT8UFYWYZweBLXgycu7Y3iL6trKn1Y7ARj' end as mint, - args_in_amount * pow(10,iff(is_helium_redeem,-6,-9)) as amount + case + when is_helium_redeem or is_perps_remove_liquidity then args_in_amount * pow(10,-6) + else args_in_amount * pow(10,-9) + end as amount from pre_final where - (is_helium_redeem or is_stake_dex_swap or is_perps_remove_liquidity) + (is_helium_redeem or is_stake_dex_swap or is_perps_remove_liquidity or is_sanctum_burn_route) ), source_transfers as ( select diff --git a/models/silver/swaps/silver__swaps_intermediate_jupiterv6.yml b/models/silver/swaps/silver__swaps_intermediate_jupiterv6.yml index 8b9e201f..1e8af5e2 100644 --- a/models/silver/swaps/silver__swaps_intermediate_jupiterv6.yml +++ b/models/silver/swaps/silver__swaps_intermediate_jupiterv6.yml @@ -14,9 +14,9 @@ models: compare_columns: - tx_id - swapper - - round(from_amt,8) + - round(from_amt,2) - from_mint - - round(to_amt,8) + - round(to_amt,2) - to_mint - swap_index model_condition: "where tx_id in ('33NLhAHDz2dAVRCqfgankDS2CAr78J1Q7LorotWhTaqcT2EDAVzPaWDK2sQsw4zSJM1KVXWzxvx6mDpvzAmNkzN1', @@ -26,7 +26,13 @@ models: '5nhXU7f282fFdi3FynukwNLiybV5NYqptUNU6BJH7RpYRPe4mcporxadKmhC9ioxx3vJp9uVmMbXz35QffHTxrFz', '5YrfH1RDhZkhh98eikYFcuqRxHY8K87A7hBBFAasaJyCeMW1dr1nG5xNDps3e3GaHnt2cp1tssZJQS2eFaUwcPz9', 'GD7mFaoiFFxRKEi4EfYbRHmCRN1Q7hCwrQaZbiRq998vXU7bwY22ET1SwXcgDYKSbVLVTmkbM7HgE7G1HSJDT4T', - 'JLHisghyiom2v1fY4z2tntjQYz7Fupe679pTJSuWaPvymEwEau9WvFbxGEyvvM1SPZqZPHKroLWqZkrrXtH9WkP')" + 'JLHisghyiom2v1fY4z2tntjQYz7Fupe679pTJSuWaPvymEwEau9WvFbxGEyvvM1SPZqZPHKroLWqZkrrXtH9WkP', + 'LVwfUycnkCw93ywALBfm1zvBcx7sDT9HdTo8wYQooan9CsKTU7BmZLhwQ3mpRSMFCRhDm5Q5GFASAGUmjQTQrJj', + '2HDxbrNSMrbGGu1xKKGNm3EbNmqaYxq2Dqpwe6tpKeLXevV2zCdA1feq61kfEVmDvu7mn9cwV9AbQWRE4VQbLkTY', + 'sbMujMpco3YpH1DSpBnU2gXU2xEbCkWcsg95HCHBXe3SsiEsEKYv4TAZjaSEGYKSCmp1hRBdoWxXWvDZbWPXoXD', + '51zH6E9Q3KknnUwPpJeV9Au6zSzxT6ZmGbEW3v8Lk3GLjcUBosChbyWBWf7NTZEpBiqameEwRPCqio1XdsXPnC4k', + '5vdYEWuHxJAwENhZdUAqsAaV7mxRVcxPQkS5V4m5yCroSpox1LG1LNLmQnpyfEBbQkikLhxWVYbBkTc9f3BGi5ZU', + '3ysjbsjuwREA7QNvm8SmFv5fjkTzZysPn3D5SZWibKoiXPRgniqmV9e5tqz1BZBqmHkbdUQb6tQpoCk9yJcayQDk')" - tx_excluded: name: silver__swaps_intermediate_jupiterv6_tx_excluded_test excluded_tx_ids: