Merge pull request #428 from Gearbox-protocol/llama

fix: v300 llama proportional

Author: essserrr

src/sdk/accounts/CreditAccountsServiceV300.ts

@@ -233,124 +233,26 @@ export class CreditAccountServiceV300
   }: PreviewWithdrawLlamathenaProportionallyProps): Promise<PreviewWithdrawLlamathenaProportionallyResult> {
     const LLAMATHENA_CURVE_POOL: Address =
       "0xd29f8980852c2c76fc3f6e96a7aa06e0bedcc1b1".toLowerCase() as Address;
-    const SCRVUSD: Address =
-      "0x0655977FEb2f289A4aB78af67BAB0d17aAb84367".toLowerCase() as Address;
-    const SUSDE: Address =
-      "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497".toLowerCase() as Address;
 
     const llamathenaBalance = llamathena.balance;
-    if (llamathenaBalance === 0n)
+    if (llamathenaBalance === 0n) {
       return {
-        scrvusdDelta: 0n,
-        scrvusdAddress: SCRVUSD,
-
-        susdeDelta: 0n,
-        susdeAddress: SUSDE,
-
-        llamathena: [llamathena],
-
-        assets: [
-          {
-            token: SCRVUSD,
-            balance: 0n,
-          },
-          {
-            token: SUSDE,
-            balance: 0n,
-          },
-        ],
-      };
-
-    const llamathenaAbi = [
-      {
-        type: "function",
-        inputs: [],
-        name: "get_balances",
-        outputs: [
-          {
-            name: "",
-            internalType: "uint256[]",
-            type: "uint256[]",
-          },
-        ],
-        stateMutability: "view",
-      },
-      {
-        type: "function",
-        inputs: [],
-        name: "totalSupply",
-        outputs: [
-          {
-            name: "",
-            internalType: "uint256",
-            type: "uint256",
-          },
-        ],
-        stateMutability: "view",
-      },
-    ] as const;
-
-    const [poolBalances, totalSupply] = await this.client.multicall({
-      batchSize: 0,
-      allowFailure: false,
-      contracts: [
-        {
-          address: LLAMATHENA_CURVE_POOL,
-          abi: llamathenaAbi,
-          functionName: "get_balances",
-        },
-        {
-          address: LLAMATHENA_CURVE_POOL,
-          abi: llamathenaAbi,
-          functionName: "totalSupply",
-        },
-      ],
-    });
-
-    if (totalSupply === 0n)
-      return {
-        scrvusdDelta: 0n,
-        scrvusdAddress: SCRVUSD,
-
-        susdeDelta: 0n,
-        susdeAddress: SUSDE,
-
-        llamathena: [llamathena],
-
+        stkLlamathena: [llamathena],
         assets: [
           {
-            token: SCRVUSD,
-            balance: 0n,
-          },
-          {
-            token: SUSDE,
+            token: LLAMATHENA_CURVE_POOL,
             balance: 0n,
           },
         ],
       };
-
-    const [scrvusdBalance = 0n, susdeBalance = 0n] = poolBalances;
-
-    const scrvusdDelta = (scrvusdBalance * llamathenaBalance) / totalSupply;
-    const susdeDelta = (susdeBalance * llamathenaBalance) / totalSupply;
+    }
 
     return {
-      scrvusdDelta,
-      scrvusdAddress: SCRVUSD,
-
-      susdeDelta,
-      susdeAddress: SUSDE,
-
-      llamathena: [llamathena],
-
+      stkLlamathena: [llamathena],
       assets: [
         {
-          token: SCRVUSD,
-          balance: scrvusdDelta,
-        },
-        {
-          token: SUSDE,
-          balance: susdeDelta,
+          token: LLAMATHENA_CURVE_POOL,
+          balance: llamathenaBalance,
         },
       ],
     };
@@ -363,8 +265,6 @@ export class CreditAccountServiceV300
   }: LlamathenaProportionalWithdrawProps) {
     const LLAMATHENA_BASE_REWARD_POOL: Address =
       "0x11fd8801a051b296e337a3e1168839fb346d5940";
-    const LLAMATHENA_POOL: Address =
-      "0xd29f8980852c2c76fc3f6e96a7aa06e0bedcc1b1";
 
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
@@ -380,20 +280,17 @@ export class CreditAccountServiceV300
       throw new Error("BaseRewardPool adapter for llamathena is missing");
     }
 
-    const curvePoolAdapter = cm.creditManager.adapters.get(LLAMATHENA_POOL);
-    if (!curvePoolAdapter) {
-      throw new Error("Curve pool adapter for llamathena is missing");
-    }
-
     const storeExpectedBalances: MultiCall = {
       target: cm.creditFacade.address,
       callData: encodeFunctionData({
         abi: cm.creditFacade.abi,
         functionName: "storeExpectedBalances",
         args: [
           [
-            { token: preview.scrvusdAddress, amount: preview.scrvusdDelta },
-            { token: preview.susdeAddress, amount: preview.susdeDelta },
+            {
+              token: preview.assets[0].token,
+              amount: preview.assets[0].balance,
+            },
           ],
         ],
       }),
@@ -404,16 +301,7 @@ export class CreditAccountServiceV300
       callData: encodeFunctionData({
         abi: iBaseRewardPoolAbi,
         functionName: "withdrawAndUnwrap",
-        args: [preview.llamathena[0].balance, false],
-      }),
-    };
-
-    const removeLiquidityCall: MultiCall = {
-      target: curvePoolAdapter.address,
-      callData: encodeFunctionData({
-        abi: iCurveV1_2AssetsAdapterAbi,
-        functionName: "remove_liquidity",
-        args: [preview.llamathena[0].balance, [0n, 0n]],
+        args: [preview.stkLlamathena[0].balance, false],
       }),
     };
 
@@ -429,7 +317,6 @@ export class CreditAccountServiceV300
     const swapCalls: Array<MultiCall> = [
       storeExpectedBalances,
       withdrawAndUnwrapCall,
-      removeLiquidityCall,
       compareBalances,
     ];
 

src/sdk/accounts/types.ts

@@ -505,27 +505,11 @@ export interface PreviewWithdrawLlamathenaProportionallyResult {
   /**
    * Assets to get
    */
-  assets: Array<Asset>;
-  /**
-   * Address of SCRVUSD token
-   */
-  scrvusdAddress: Address;
-  /**
-   * Address of SUSDE token
-   */
-  susdeAddress: Address;
+  assets: [Asset];
   /**
    * Llamathena asset
    */
-  llamathena: [Asset];
-  /**
-   * Amount of SCRVUSD to get
-   */
-  scrvusdDelta: bigint;
-  /**
-   * Amount of SUSDE to get
-   */
-  susdeDelta: bigint;
+  stkLlamathena: [Asset];
 }
 
 export interface LlamathenaProportionalWithdrawProps