Merge pull request #84 from 0xwml/thala-adapter

[Thala] update adapter to include xLPT

Author: FJ-Riveros

constants/example_integrations.py

@@ -17,7 +17,7 @@
 
 KAMINO_SUSDE_COLLATERAL_START_BLOCK_EXAMPLE = 20471904
 
-THALA_SUSDE_START_BLOCK = 2393932881
+THALA_SUSDE_START_BLOCK = 2641895151
 
 ECHELON_SUSDE_COLLATERAL_START_BLOCK = 2379805052
 

constants/thala.py

@@ -9,3 +9,7 @@
 THALASWAP_V2_ADDRESS = "0x7730cd28ee1cdc9e999336cbc430f99e7c44397c0aa77516f6f23a78559bb5"
 
 SUSDE_LPT_ADDRESS = "0xce9e3b2437fd2cddc5c14f6c4259fc7d3cef160b820837591aa48170bb509368"
+
+THALA_STAKED_LPT_ADDRESS = "0xbab780b31d9cb1d61a47d3a09854c765e6b04e493f112c63294fabf8376d86a1"
+
+SUSDE_XLPT_ADDRESS = "0x35c3e420fa4fd925628366f1977865d62432c8856a2db147a1cb13f7207f6a79"

integrations/thala_integration.py

@@ -12,9 +12,11 @@
 from constants.thala import (
     ETHENA_ADDRESS_API_URL,
     SUSDE_LPT_ADDRESS,
+    SUSDE_XLPT_ADDRESS,
     SUSDE_LPT_COIN,
     SUSDE_LPT_PID,
     THALA_FARMING_V1_ADDRESS,
+    THALA_STAKED_LPT_ADDRESS,
     THALASWAP_V2_ADDRESS,
 )
 from constants.chains import Chain
@@ -98,9 +100,11 @@ def get_thala_block_data(
                     "ts-node",
                     self.thala_ts_location,
                     THALA_FARMING_V1_ADDRESS,
+                    THALA_STAKED_LPT_ADDRESS,
                     THALASWAP_V2_ADDRESS,
                     str(SUSDE_LPT_PID),
                     str(SUSDE_LPT_ADDRESS),
+                    str(SUSDE_XLPT_ADDRESS),
                     str(self.decimals),
                     str(block),
                     json.dumps(user_addresses),
@@ -139,7 +143,7 @@ def get_thala_block_data(
 
     example_integration_output = example_integration.get_l2_block_balances(
         cached_data={},
-        blocks=list(range(THALA_SUSDE_START_BLOCK, THALA_SUSDE_START_BLOCK + 25306000, 1500000)),
+        blocks=list(range(THALA_SUSDE_START_BLOCK, THALA_SUSDE_START_BLOCK + 15306000, 1500000)),
     )
 
     print("=" * 120)

ts/thala_balances.ts

@@ -9,26 +9,48 @@ const client = new Aptos(config);
 
 const args = process.argv.slice(2);
 const THALA_V1_FARMING_ADDRESS = args[0];
-const THALASWAP_V2_ADDRESS = args[1];
-const SUSDE_LPT_PID = args[2];
-const SUSDE_LPT_ADDRESS = args[3];
-const decimals = Number(args[4]);
-const block = Number(args[5]);
-const user_addresses: Array<string> = JSON.parse(args[6]);
+const THALA_STAKED_LPT_ADDRESS = args[1];
+const THALASWAP_V2_ADDRESS = args[2];
+const SUSDE_LPT_PID = args[3];
+const SUSDE_LPT_ADDRESS = args[4];
+const SUSDE_XLPT_ADDRESS = args[5];
+const decimals = Number(args[6]);
+const block = Number(args[7]);
+const user_addresses: Array<string> = JSON.parse(args[8]);
 
 async function getStrategy() {
     // iterate over all users and get their susde balance
     const user_balances: Record<string, number> = {};
     for (const address of user_addresses) {
-        const [stake_amount, _boosted_stake_amount, _boost_multiplier] = await client.view<string[]>({
+        // 1. Fetch thala_v1_farming stake amount
+        const [stake_amount_lpt, _boosted_stake_amount_lpt, _boost_multiplier_lpt] = await client.view<string[]>({
             payload: {
                 function: `${THALA_V1_FARMING_ADDRESS}::farming::stake_amount`,
                 functionArguments: [address, Number(SUSDE_LPT_PID)],
             },
             options: { ledgerVersion: block },
         });
 
-        // 1. preview how much sUSDE/USDC is returned when 1 LPT is removed (the pool LPT distribution)
+        // 2. Fetch thala_staked_lpt stake amount
+        let stake_amount_xlpt = "0"; // default to 0 if the view fails
+
+        try {
+            const [_boosted_stake_amount_xlpt, stakeResult] = await client.view<string[]>({
+                payload: {
+                    function: `${THALA_STAKED_LPT_ADDRESS}::staked_lpt::user_stake_amount`,
+                    functionArguments: [address, `${SUSDE_XLPT_ADDRESS}`],
+                },
+                options: { ledgerVersion: block },
+            });
+
+            stake_amount_xlpt = stakeResult;
+        } catch (e) {
+        }
+
+        // 3. Sum respective farming amounts
+        let stake_amount = Number(stake_amount_lpt) + Number(stake_amount_xlpt);
+
+        // 4. preview how much sUSDE/USDC is returned when 1 LPT is removed (the pool LPT distribution)
         let [lptPreview] = await client.view<any[]>({
             payload: {
                 function: `${THALASWAP_V2_ADDRESS}::pool::preview_remove_liquidity`,
@@ -37,7 +59,7 @@ async function getStrategy() {
             options: { ledgerVersion: block },
         });
 
-        // 2. preview the sUSDE/USDC exchange rate of 1 sUSDE
+        // 5. preview the sUSDE/USDC exchange rate of 1 sUSDE
         let [swapPreview] = await client.view<any[]>({
             payload: {
                 function: `${THALASWAP_V2_ADDRESS}::pool::preview_swap_exact_in_metastable`,
@@ -50,7 +72,7 @@ async function getStrategy() {
         let lptPrice = ((lptPreview.withdrawn_amounts[0] / 100000000 * swapPreview.amount_out / 100000000) + (lptPreview.withdrawn_amounts[1] / 100000000)) * 100;
 
         user_balances[address] = scaleDownByDecimals(
-            Number(stake_amount),
+            stake_amount,
             decimals
         ) * lptPrice;
     }