@gearbox-protocol/sdk 12.6.4 → 12.6.6

package/dist/cjs/sdk/accounts/CreditAccountsServiceV300.js

@@ -21,7 +21,6 @@ __export(CreditAccountsServiceV300_exports, {
   CreditAccountServiceV300: () => CreditAccountServiceV300
 });
 module.exports = __toCommonJS(CreditAccountsServiceV300_exports);
-var import_integrations_v3 = require("@gearbox-protocol/integrations-v3");
 var import_abitype = require("abitype");
 var import_viem = require("viem");
 var import_iBaseRewardPool = require("../../abi/iBaseRewardPool.js");
@@ -185,106 +184,24 @@ class CreditAccountServiceV300 extends import_AbstractCreditAccountsService.Abst
     llamathena
   }) {
     const LLAMATHENA_CURVE_POOL = "0xd29f8980852c2c76fc3f6e96a7aa06e0bedcc1b1".toLowerCase();
-    const SCRVUSD = "0x0655977FEb2f289A4aB78af67BAB0d17aAb84367".toLowerCase();
-    const SUSDE = "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497".toLowerCase();
     const llamathenaBalance = llamathena.balance;
-    if (llamathenaBalance === 0n)
+    if (llamathenaBalance === 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 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"
-      }
-    ];
-    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],
-        assets: [
-          {
-            token: SCRVUSD,
-            balance: 0n
-          },
-          {
-            token: SUSDE,
-            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
         }
       ]
     };
@@ -296,7 +213,6 @@ class CreditAccountServiceV300 extends import_AbstractCreditAccountsService.Abst
     averageQuota
   }) {
     const LLAMATHENA_BASE_REWARD_POOL = "0x11fd8801a051b296e337a3e1168839fb346d5940";
-    const LLAMATHENA_POOL = "0xd29f8980852c2c76fc3f6e96a7aa06e0bedcc1b1";
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
       creditManager: ca.creditManager,
@@ -309,10 +225,6 @@ class CreditAccountServiceV300 extends import_AbstractCreditAccountsService.Abst
     if (!baseRewardPoolAdapter) {
       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 = {
       target: cm.creditFacade.address,
       callData: (0, import_viem.encodeFunctionData)({
@@ -320,8 +232,10 @@ class CreditAccountServiceV300 extends import_AbstractCreditAccountsService.Abst
         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
+            }
           ]
         ]
       })
@@ -331,15 +245,7 @@ class CreditAccountServiceV300 extends import_AbstractCreditAccountsService.Abst
       callData: (0, import_viem.encodeFunctionData)({
         abi: import_iBaseRewardPool.iBaseRewardPoolAbi,
         functionName: "withdrawAndUnwrap",
-        args: [preview.llamathena[0].balance, false]
-      })
-    };
-    const removeLiquidityCall = {
-      target: curvePoolAdapter.address,
-      callData: (0, import_viem.encodeFunctionData)({
-        abi: import_integrations_v3.iCurveV1_2AssetsAdapterAbi,
-        functionName: "remove_liquidity",
-        args: [preview.llamathena[0].balance, [0n, 0n]]
+        args: [preview.stkLlamathena[0].balance, false]
       })
     };
     const compareBalances = {
@@ -353,7 +259,6 @@ class CreditAccountServiceV300 extends import_AbstractCreditAccountsService.Abst
     const swapCalls = [
       storeExpectedBalances,
       withdrawAndUnwrapCall,
-      removeLiquidityCall,
       compareBalances
     ];
     const calls = [

package/dist/cjs/sdk/sdk-legacy/core/transactions.js

@@ -124,11 +124,13 @@ class TxAddLiquidity extends import_eventOrTx.EVMTx {
   amount;
   token;
   poolName;
+  address;
   constructor(opts) {
     super(opts);
     this.amount = opts.amount;
     this.token = opts.tokensList[opts.token];
     this.poolName = opts.poolName;
+    this.address = opts.address;
   }
   _toString() {
     const { title, decimals = 18 } = this.token;
@@ -148,11 +150,13 @@ class TxRemoveLiquidity extends import_eventOrTx.EVMTx {
   amount;
   token;
   poolName;
+  address;
   constructor(opts) {
     super(opts);
     this.amount = opts.amount;
     this.token = opts.tokensList[opts.token];
     this.poolName = opts.poolName;
+    this.address = opts.address;
   }
   _toString() {
     const { title, decimals = 18 } = this.token;

package/dist/esm/sdk/accounts/CreditAccountsServiceV300.js

@@ -1,4 +1,3 @@
-import { iCurveV1_2AssetsAdapterAbi } from "@gearbox-protocol/integrations-v3";
 import { parseAbi } from "abitype";
 import { encodeFunctionData } from "viem";
 import { iBaseRewardPoolAbi } from "../../abi/iBaseRewardPool.js";
@@ -174,106 +173,24 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
     llamathena
   }) {
     const LLAMATHENA_CURVE_POOL = "0xd29f8980852c2c76fc3f6e96a7aa06e0bedcc1b1".toLowerCase();
-    const SCRVUSD = "0x0655977FEb2f289A4aB78af67BAB0d17aAb84367".toLowerCase();
-    const SUSDE = "0x9D39A5DE30e57443BfF2A8307A4256c8797A3497".toLowerCase();
     const llamathenaBalance = llamathena.balance;
-    if (llamathenaBalance === 0n)
+    if (llamathenaBalance === 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 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"
-      }
-    ];
-    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],
-        assets: [
-          {
-            token: SCRVUSD,
-            balance: 0n
-          },
-          {
-            token: SUSDE,
-            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
         }
       ]
     };
@@ -285,7 +202,6 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
     averageQuota
   }) {
     const LLAMATHENA_BASE_REWARD_POOL = "0x11fd8801a051b296e337a3e1168839fb346d5940";
-    const LLAMATHENA_POOL = "0xd29f8980852c2c76fc3f6e96a7aa06e0bedcc1b1";
     const cm = this.sdk.marketRegister.findCreditManager(ca.creditManager);
     const priceUpdatesCalls = await this.getPriceUpdatesForFacade({
       creditManager: ca.creditManager,
@@ -298,10 +214,6 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
     if (!baseRewardPoolAdapter) {
       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 = {
       target: cm.creditFacade.address,
       callData: encodeFunctionData({
@@ -309,8 +221,10 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
         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
+            }
           ]
         ]
       })
@@ -320,15 +234,7 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
       callData: encodeFunctionData({
         abi: iBaseRewardPoolAbi,
         functionName: "withdrawAndUnwrap",
-        args: [preview.llamathena[0].balance, false]
-      })
-    };
-    const removeLiquidityCall = {
-      target: curvePoolAdapter.address,
-      callData: encodeFunctionData({
-        abi: iCurveV1_2AssetsAdapterAbi,
-        functionName: "remove_liquidity",
-        args: [preview.llamathena[0].balance, [0n, 0n]]
+        args: [preview.stkLlamathena[0].balance, false]
       })
     };
     const compareBalances = {
@@ -342,7 +248,6 @@ class CreditAccountServiceV300 extends AbstractCreditAccountService {
     const swapCalls = [
       storeExpectedBalances,
       withdrawAndUnwrapCall,
-      removeLiquidityCall,
       compareBalances
     ];
     const calls = [

package/dist/esm/sdk/sdk-legacy/core/transactions.js

@@ -74,11 +74,13 @@ class TxAddLiquidity extends EVMTx {
   amount;
   token;
   poolName;
+  address;
   constructor(opts) {
     super(opts);
     this.amount = opts.amount;
     this.token = opts.tokensList[opts.token];
     this.poolName = opts.poolName;
+    this.address = opts.address;
   }
   _toString() {
     const { title, decimals = 18 } = this.token;
@@ -98,11 +100,13 @@ class TxRemoveLiquidity extends EVMTx {
   amount;
   token;
   poolName;
+  address;
   constructor(opts) {
     super(opts);
     this.amount = opts.amount;
     this.token = opts.tokensList[opts.token];
     this.poolName = opts.poolName;
+    this.address = opts.address;
   }
   _toString() {
     const { title, decimals = 18 } = this.token;

package/dist/types/sdk/accounts/types.d.ts

@@ -418,27 +418,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 extends PrepareUpdateQuotasProps {
     /**

package/dist/types/sdk/sdk-legacy/core/transactions.d.ts

@@ -16,12 +16,14 @@ interface AddLiquidityProps extends EVMTxProps {
     amount: bigint;
     token: Address;
     poolName: string;
+    address: Address;
     tokensList: Record<Address, TokenData>;
 }
 export declare class TxAddLiquidity extends EVMTx {
     readonly amount: bigint;
     readonly token: TokenData;
     readonly poolName: string;
+    readonly address: Address;
     constructor(opts: AddLiquidityProps);
     _toString(): string;
     serialize(): TxSerialized;
@@ -30,12 +32,14 @@ interface RemoveLiquidityProps extends EVMTxProps {
     amount: bigint;
     token: Address;
     poolName: string;
+    address: Address;
     tokensList: Record<Address, TokenData>;
 }
 export declare class TxRemoveLiquidity extends EVMTx {
     readonly amount: bigint;
     readonly token: TokenData;
     readonly poolName: string;
+    readonly address: Address;
     constructor(opts: RemoveLiquidityProps);
     _toString(): string;
     serialize(): TxSerialized;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gearbox-protocol/sdk",
-  "version": "12.6.4",
+  "version": "12.6.6",
   "description": "Gearbox SDK",
   "license": "MIT",
   "main": "./dist/cjs/sdk/index.js",