@strkfarm/sdk 1.2.0 → 2.0.0-dev-strategy2.1

package/src/strategies/universal-adapters/vesu-adapter.ts

@@ -4,7 +4,7 @@ import { SIMPLE_SANITIZER, SIMPLE_SANITIZER_V2, SIMPLE_SANITIZER_VESU_V1_DELEGAT
 import { ContractAddr, Web3Number } from "@/dataTypes";
 import { AdapterLeafType, BaseAdapter, GenerateCallFn, LeafAdapterFn, ManageCall } from "./baseAdapter";
 import VesuSingletonAbi from '../../data/vesu-singleton.abi.json';
-import { getMainnetConfig, IConfig, TokenInfo, VaultPosition } from "@/interfaces";
+import { getMainnetConfig, IConfig, Protocols, TokenInfo, VaultPosition } from "@/interfaces";
 import { PricerBase } from "@/modules/pricerBase";
 import VesuPoolIDs from "@/data/vesu_pools.json";
 import { getAPIUsingHeadlessBrowser } from "@/node/headless";
@@ -15,6 +15,7 @@ import VesuMultiplyAbi from '@/data/vesu-multiple.abi.json';
 import { EkuboPoolKey } from "../ekubo-cl-vault";
 import VesuPoolV2Abi from '@/data/vesu-pool-v2.abi.json';
 import VesuExtensionAbi from '@/data/vesu-extension.abi.json';
+import { CacheClass } from "@/utils/cacheClass";
 
 interface VesuPoolsInfo { pools: any[]; isErrorPoolsAPI: boolean };
 
@@ -233,7 +234,8 @@ export const VesuPools = {
   Genesis: ContractAddr.from('0x4dc4f0ca6ea4961e4c8373265bfd5317678f4fe374d76f3fd7135f57763bf28'),
   Re7xSTRK: ContractAddr.from('0x052fb52363939c3aa848f8f4ac28f0a51379f8d1b971d8444de25fbd77d8f161'),
   Re7xBTC: ContractAddr.from('0x3a8416bf20d036df5b1cf3447630a2e1cb04685f6b0c3a70ed7fb1473548ecf'),
-  Prime: ContractAddr.from('0x451fe483d5921a2919ddd81d0de6696669bccdacd859f72a4fba7656b97c3b5'),
+  Re7USDCPrime: ContractAddr.from('0x02eef0c13b10b487ea5916b54c0a7f98ec43fb3048f60fdeedaf5b08f6f88aaf'),
+  Re7USDCCore: ContractAddr.from('0x03976cac265a12609934089004df458ea29c776d77da423c96dc761d09d24124'),
 }
 
 export const extensionMap: {[key: string]: ContractAddr} = {};
@@ -247,7 +249,7 @@ export function getVesuSingletonAddress(vesuPool: ContractAddr) {
   return {addr: vesuPool, isV2: true}; // Vesu v2
 }
 
-export class VesuAdapter extends BaseAdapter {
+export class VesuAdapter extends CacheClass {
   VESU_MULTIPLY_V1 = ContractAddr.from('0x3630f1f8e5b8f5c4c4ae9b6620f8a570ae55cddebc0276c37550e7c118edf67');
   VESU_MULTIPLY = ContractAddr.from('0x027fef272d0a9a3844767c851a64b36fe4f0115141d81134baade95d2b27b781');
   config: VesuAdapterConfig;
@@ -259,184 +261,184 @@ export class VesuAdapter extends BaseAdapter {
     this.config = config;
   }
 
-  getModifyPosition = (): AdapterLeafType<VesuModifyPositionCallParams> => {
-    const positionData: bigint[] = [0n];
-    const { addr, isV2 } = getVesuSingletonAddress(this.config.poolId);
-    const commonPackedData: bigint[] = [
-      toBigInt(this.config.collateral.address.toString()), // collateral
-      toBigInt(this.config.debt.address.toString()), // debt
-      toBigInt(this.config.vaultAllocator.toString()), // vault allocator
-    ];
-    const packedArguments: bigint[] = isV2 ? [
-      ...commonPackedData
-    ] : [
-      toBigInt(this.config.poolId.toString()), // pool id
-      ...commonPackedData,
-      toBigInt(positionData.length),
-      ...positionData
-    ];
-    const output = this.constructSimpleLeafData({
-      id: this.config.id,
-      target: addr,
-      method: 'modify_position',
-      packedArguments
-    }, isV2 ? VESU_V2_MODIFY_POSITION_SANITIZER : SIMPLE_SANITIZER);
-
-    return { leaf: output, callConstructor: this.getModifyPositionCall.bind(this) };
-  }
-
-  static getDefaultModifyPositionCallParams(params: {
-    collateralAmount: Web3Number,
-    isAddCollateral: boolean,
-    debtAmount: Web3Number,
-    isBorrow: boolean
-  }) {
-    return {
-        collateralAmount: {
-            amount_type: VesuAmountType.Delta,
-            denomination: VesuAmountDenomination.Assets,
-            value: {
-                abs: params.collateralAmount,
-                is_negative: !params.isAddCollateral
-            }
-        },
-        debtAmount: {
-            amount_type: VesuAmountType.Delta,
-            denomination: VesuAmountDenomination.Assets,
-            value: {
-                abs: params.debtAmount,
-                is_negative: !params.isBorrow
-            }
-        }
-    }
-  }
-
-  getModifyPositionCall = (params: VesuModifyPositionCallParams): ManageCall => {
-    // pub pool_id: felt252,
-    // pub collateral_asset: ContractAddress,
-    // pub debt_asset: ContractAddress,
-    // pub user: ContractAddress,
-    // pub collateral: Amount,
-    // pub debt: Amount,
-    // pub data: Span<felt252>,
-    const _collateral = {
-      amount_type: this.formatAmountTypeEnum(params.collateralAmount.amount_type),
-      denomination: this.formatAmountDenominationEnum(params.collateralAmount.denomination),
-      value: {
-        abs: uint256.bnToUint256(params.collateralAmount.value.abs.toWei()),
-        is_negative: params.collateralAmount.value.abs.isZero() ? false: params.collateralAmount.value.is_negative
-      }
-    };
-    logger.verbose(`VesuAdapter::ConstructingModify::Collateral::${JSON.stringify(_collateral)}`)
-    const _debt = {
-      amount_type: this.formatAmountTypeEnum(params.debtAmount.amount_type),
-      denomination: this.formatAmountDenominationEnum(params.debtAmount.denomination),
-      value: {
-        abs: uint256.bnToUint256(params.debtAmount.value.abs.toWei()),
-        is_negative: params.debtAmount.value.abs.isZero() ? false: params.debtAmount.value.is_negative
-      }
-    };
-    logger.verbose(`VesuAdapter::ConstructingModify::Debt::${JSON.stringify(_debt)}`)
-    const { contract, isV2 } = this.getVesuSingletonContract(getMainnetConfig(), this.config.poolId);
-    const call = contract.populate('modify_position', {
-      params: isV2 ? {
-        collateral_asset: this.config.collateral.address.toBigInt(),
-        debt_asset: this.config.debt.address.toBigInt(),
-        user: this.config.vaultAllocator.toBigInt(),
-        collateral: _collateral,
-        debt: _debt,
-      } : {
-        pool_id: this.config.poolId.toBigInt(),
-        collateral_asset: this.config.collateral.address.toBigInt(),
-        debt_asset: this.config.debt.address.toBigInt(),
-        user: this.config.vaultAllocator.toBigInt(),
-        collateral: _collateral,
-        debt: _debt,
-        data: [0]
-      }
-    });
-    return {
-      sanitizer: isV2 ? VESU_V2_MODIFY_POSITION_SANITIZER : SIMPLE_SANITIZER,
-      call: {
-        contractAddress: ContractAddr.from(contract.address),
-        selector: hash.getSelectorFromName('modify_position'),
-        calldata: [
-          ...call.calldata as bigint[]
-        ]
-      }
-    }
-  }
-
-  getMultiplyAdapter = (id: string): LeafAdapterFn<VesuMultiplyCallParams> => {
-    return () => {
-      const packedArguments: bigint[] = [
-        toBigInt(this.config.poolId.toString()), // pool id
-        toBigInt(this.config.collateral.address.toString()), // collateral
-        toBigInt(this.config.debt.address.toString()), // debt
-        toBigInt(this.config.vaultAllocator.toString()), // vault allocator
-      ];
-      const { isV2 } = getVesuSingletonAddress(this.config.poolId);
-      const output = this.constructSimpleLeafData({
-        id: id,
-        target: isV2 ? this.VESU_MULTIPLY : this.VESU_MULTIPLY_V1,
-        method: 'modify_lever',
-        packedArguments
-      }, SIMPLE_SANITIZER_V2);
-
-      return { leaf: output, callConstructor: this.getMultiplyCall.bind(this) };
-    }
-  }
-
-  getMultiplyCall = (params: VesuMultiplyCallParams): ManageCall => {
-    const isIncrease = params.isIncrease;
-    const multiplyParams = isIncrease ? params.increaseParams : params.decreaseParams;
-    if (!multiplyParams) {
-      throw new Error('Multiply params are not provided');
-    }
-    const { isV2 } = getVesuSingletonAddress(this.config.poolId);
-    const VESU_MULTIPLY = isV2 ? this.VESU_MULTIPLY : this.VESU_MULTIPLY_V1;
-    const multiplyContract = new Contract({abi: VesuMultiplyAbi, address: VESU_MULTIPLY.toString(), providerOrAccount: new RpcProvider({nodeUrl: ''})});
-    const call = multiplyContract.populate('modify_lever', {
-      modify_lever_params: getVesuMultiplyParams(isIncrease, {
-        ...multiplyParams,
-        user: this.config.vaultAllocator,
-        pool_id: this.config.poolId,
-        collateral_asset: this.config.collateral.address,
-        debt_asset: this.config.debt.address,
-        recipient: this.config.vaultAllocator
-      })
-    });
-    return {
-      sanitizer: SIMPLE_SANITIZER_V2,
-      call: {
-        contractAddress: VESU_MULTIPLY,
-        selector: hash.getSelectorFromName('modify_lever'),
-        calldata: [
-          ...call.calldata as bigint[]
-        ]
-      }
-    }
-  }
-
-  getVesuModifyDelegationAdapter = (id: string): LeafAdapterFn<VesuModifyDelegationCallParams> => {
-    return () => {
-      const { addr: VESU_SINGLETON, isV2 } = getVesuSingletonAddress(this.config.poolId);
-      const packedArguments: bigint[] = isV2 ? [
-        toBigInt(this.VESU_MULTIPLY.toString()), // v2
-      ] : [
-        this.config.poolId.toBigInt(),
-        toBigInt(this.VESU_MULTIPLY_V1.toString()), // v1
-      ];
-      const output = this.constructSimpleLeafData({
-        id: id,
-        target: VESU_SINGLETON,
-        method: 'modify_delegation',
-        packedArguments
-      }, isV2 ? SIMPLE_SANITIZER_V2 : SIMPLE_SANITIZER_VESU_V1_DELEGATIONS);
-
-      return { leaf: output, callConstructor: this.getVesuModifyDelegationCall.bind(this) };
-    }
-  }
+  // getModifyPosition = (): AdapterLeafType<VesuModifyPositionCallParams> => {
+  //   const positionData: bigint[] = [0n];
+  //   const { addr, isV2 } = getVesuSingletonAddress(this.config.poolId);
+  //   const commonPackedData: bigint[] = [
+  //     toBigInt(this.config.collateral.address.toString()), // collateral
+  //     toBigInt(this.config.debt.address.toString()), // debt
+  //     toBigInt(this.config.vaultAllocator.toString()), // vault allocator
+  //   ];
+  //   const packedArguments: bigint[] = isV2 ? [
+  //     ...commonPackedData
+  //   ] : [
+  //     toBigInt(this.config.poolId.toString()), // pool id
+  //     ...commonPackedData,
+  //     toBigInt(positionData.length),
+  //     ...positionData
+  //   ];
+  //   const output = this.constructSimpleLeafData({
+  //     id: this.config.id,
+  //     target: addr,
+  //     method: 'modify_position',
+  //     packedArguments
+  //   }, isV2 ? VESU_V2_MODIFY_POSITION_SANITIZER : SIMPLE_SANITIZER);
+
+  //   return { leaf: output, callConstructor: this.getModifyPositionCall.bind(this) };
+  // }
+
+  // static getDefaultModifyPositionCallParams(params: {
+  //   collateralAmount: Web3Number,
+  //   isAddCollateral: boolean,
+  //   debtAmount: Web3Number,
+  //   isBorrow: boolean
+  // }) {
+  //   return {
+  //       collateralAmount: {
+  //           amount_type: VesuAmountType.Delta,
+  //           denomination: VesuAmountDenomination.Assets,
+  //           value: {
+  //               abs: params.collateralAmount,
+  //               is_negative: !params.isAddCollateral
+  //           }
+  //       },
+  //       debtAmount: {
+  //           amount_type: VesuAmountType.Delta,
+  //           denomination: VesuAmountDenomination.Assets,
+  //           value: {
+  //               abs: params.debtAmount,
+  //               is_negative: !params.isBorrow
+  //           }
+  //       }
+  //   }
+  // }
+
+  // getModifyPositionCall = (params: VesuModifyPositionCallParams): ManageCall => {
+  //   // pub pool_id: felt252,
+  //   // pub collateral_asset: ContractAddress,
+  //   // pub debt_asset: ContractAddress,
+  //   // pub user: ContractAddress,
+  //   // pub collateral: Amount,
+  //   // pub debt: Amount,
+  //   // pub data: Span<felt252>,
+  //   const _collateral = {
+  //     amount_type: this.formatAmountTypeEnum(params.collateralAmount.amount_type),
+  //     denomination: this.formatAmountDenominationEnum(params.collateralAmount.denomination),
+  //     value: {
+  //       abs: uint256.bnToUint256(params.collateralAmount.value.abs.toWei()),
+  //       is_negative: params.collateralAmount.value.abs.isZero() ? false: params.collateralAmount.value.is_negative
+  //     }
+  //   };
+  //   logger.verbose(`VesuAdapter::ConstructingModify::Collateral::${JSON.stringify(_collateral)}`)
+  //   const _debt = {
+  //     amount_type: this.formatAmountTypeEnum(params.debtAmount.amount_type),
+  //     denomination: this.formatAmountDenominationEnum(params.debtAmount.denomination),
+  //     value: {
+  //       abs: uint256.bnToUint256(params.debtAmount.value.abs.toWei()),
+  //       is_negative: params.debtAmount.value.abs.isZero() ? false: params.debtAmount.value.is_negative
+  //     }
+  //   };
+  //   logger.verbose(`VesuAdapter::ConstructingModify::Debt::${JSON.stringify(_debt)}`)
+  //   const { contract, isV2 } = this.getVesuSingletonContract(getMainnetConfig(), this.config.poolId);
+  //   const call = contract.populate('modify_position', {
+  //     params: isV2 ? {
+  //       collateral_asset: this.config.collateral.address.toBigInt(),
+  //       debt_asset: this.config.debt.address.toBigInt(),
+  //       user: this.config.vaultAllocator.toBigInt(),
+  //       collateral: _collateral,
+  //       debt: _debt,
+  //     } : {
+  //       pool_id: this.config.poolId.toBigInt(),
+  //       collateral_asset: this.config.collateral.address.toBigInt(),
+  //       debt_asset: this.config.debt.address.toBigInt(),
+  //       user: this.config.vaultAllocator.toBigInt(),
+  //       collateral: _collateral,
+  //       debt: _debt,
+  //       data: [0]
+  //     }
+  //   });
+  //   return {
+  //     sanitizer: isV2 ? VESU_V2_MODIFY_POSITION_SANITIZER : SIMPLE_SANITIZER,
+  //     call: {
+  //       contractAddress: ContractAddr.from(contract.address),
+  //       selector: hash.getSelectorFromName('modify_position'),
+  //       calldata: [
+  //         ...call.calldata as bigint[]
+  //       ]
+  //     }
+  //   }
+  // }
+
+  // getMultiplyAdapter = (id: string): LeafAdapterFn<VesuMultiplyCallParams> => {
+  //   return () => {
+  //     const packedArguments: bigint[] = [
+  //       toBigInt(this.config.poolId.toString()), // pool id
+  //       toBigInt(this.config.collateral.address.toString()), // collateral
+  //       toBigInt(this.config.debt.address.toString()), // debt
+  //       toBigInt(this.config.vaultAllocator.toString()), // vault allocator
+  //     ];
+  //     const { isV2 } = getVesuSingletonAddress(this.config.poolId);
+  //     const output = this.constructSimpleLeafData({
+  //       id: id,
+  //       target: isV2 ? this.VESU_MULTIPLY : this.VESU_MULTIPLY_V1,
+  //       method: 'modify_lever',
+  //       packedArguments
+  //     }, SIMPLE_SANITIZER_V2);
+
+  //     return { leaf: output, callConstructor: this.getMultiplyCall.bind(this) };
+  //   }
+  // }
+
+  // getMultiplyCall = (params: VesuMultiplyCallParams): ManageCall => {
+  //   const isIncrease = params.isIncrease;
+  //   const multiplyParams = isIncrease ? params.increaseParams : params.decreaseParams;
+  //   if (!multiplyParams) {
+  //     throw new Error('Multiply params are not provided');
+  //   }
+  //   const { isV2 } = getVesuSingletonAddress(this.config.poolId);
+  //   const VESU_MULTIPLY = isV2 ? this.VESU_MULTIPLY : this.VESU_MULTIPLY_V1;
+  //   const multiplyContract = new Contract({abi: VesuMultiplyAbi, address: VESU_MULTIPLY.toString(), providerOrAccount: new RpcProvider({nodeUrl: ''})});
+  //   const call = multiplyContract.populate('modify_lever', {
+  //     modify_lever_params: getVesuMultiplyParams(isIncrease, {
+  //       ...multiplyParams,
+  //       user: this.config.vaultAllocator,
+  //       pool_id: this.config.poolId,
+  //       collateral_asset: this.config.collateral.address,
+  //       debt_asset: this.config.debt.address,
+  //       recipient: this.config.vaultAllocator
+  //     })
+  //   });
+  //   return {
+  //     sanitizer: SIMPLE_SANITIZER_V2,
+  //     call: {
+  //       contractAddress: VESU_MULTIPLY,
+  //       selector: hash.getSelectorFromName('modify_lever'),
+  //       calldata: [
+  //         ...call.calldata as bigint[]
+  //       ]
+  //     }
+  //   }
+  // }
+
+  // getVesuModifyDelegationAdapter = (id: string): LeafAdapterFn<VesuModifyDelegationCallParams> => {
+  //   return () => {
+  //     const { addr: VESU_SINGLETON, isV2 } = getVesuSingletonAddress(this.config.poolId);
+  //     const packedArguments: bigint[] = isV2 ? [
+  //       toBigInt(this.VESU_MULTIPLY.toString()), // v2
+  //     ] : [
+  //       this.config.poolId.toBigInt(),
+  //       toBigInt(this.VESU_MULTIPLY_V1.toString()), // v1
+  //     ];
+  //     const output = this.constructSimpleLeafData({
+  //       id: id,
+  //       target: VESU_SINGLETON,
+  //       method: 'modify_delegation',
+  //       packedArguments
+  //     }, isV2 ? SIMPLE_SANITIZER_V2 : SIMPLE_SANITIZER_VESU_V1_DELEGATIONS);
+
+  //     return { leaf: output, callConstructor: this.getVesuModifyDelegationCall.bind(this) };
+  //   }
+  // }
 
   getVesuModifyDelegationCall = (params: VesuModifyDelegationCallParams): ManageCall => {
     const VESU_SINGLETON = getVesuSingletonAddress(this.config.poolId).addr;
@@ -461,38 +463,38 @@ export class VesuAdapter extends BaseAdapter {
     }
   }
   
-  getDefispringRewardsAdapter = (id: string): () => AdapterLeafType<VesuDefiSpringRewardsCallParams> => {
-    return () => {
-      const packedArguments: bigint[] = [];
-      const output = {
-        id: BigInt(num.getDecimalString(shortString.encodeShortString(id))),
-        readableId: id,
-        data: [
-          SIMPLE_SANITIZER.toBigInt(), // sanitizer address
-          VESU_REWARDS_CONTRACT.toBigInt(), // contract
-          toBigInt(hash.getSelectorFromName("claim")), // method name
-          BigInt(packedArguments.length),
-          ...packedArguments
-        ]
-      };
-      return { leaf: output, callConstructor: this.getDefiSpringClaimCall().bind(this) };
-    }
-  }
-
-  getDefiSpringClaimCall = (): GenerateCallFn<VesuDefiSpringRewardsCallParams> => {
-    return (params: VesuDefiSpringRewardsCallParams) => ({
-      sanitizer: SIMPLE_SANITIZER,
-      call: {
-        contractAddress: VESU_REWARDS_CONTRACT,
-        selector: hash.getSelectorFromName('claim'),
-        calldata: [
-          BigInt(params.amount.toWei()),
-          BigInt(params.proofs.length),
-          ...params.proofs.map(proof => BigInt(num.hexToDecimalString(proof)))
-        ]
-      }
-    })
-  }
+  // getDefispringRewardsAdapter = (id: string): () => AdapterLeafType<VesuDefiSpringRewardsCallParams> => {
+  //   return () => {
+  //     const packedArguments: bigint[] = [];
+  //     const output = {
+  //       id: BigInt(num.getDecimalString(shortString.encodeShortString(id))),
+  //       readableId: id,
+  //       data: [
+  //         SIMPLE_SANITIZER.toBigInt(), // sanitizer address
+  //         VESU_REWARDS_CONTRACT.toBigInt(), // contract
+  //         toBigInt(hash.getSelectorFromName("claim")), // method name
+  //         BigInt(packedArguments.length),
+  //         ...packedArguments
+  //       ]
+  //     };
+  //     return { leaf: output, callConstructor: this.getDefiSpringClaimCall().bind(this) };
+  //   }
+  // }
+
+  // getDefiSpringClaimCall = (): GenerateCallFn<VesuDefiSpringRewardsCallParams> => {
+  //   return (params: VesuDefiSpringRewardsCallParams) => ({
+  //     sanitizer: SIMPLE_SANITIZER,
+  //     call: {
+  //       contractAddress: VESU_REWARDS_CONTRACT,
+  //       selector: hash.getSelectorFromName('claim'),
+  //       calldata: [
+  //         BigInt(params.amount.toWei()),
+  //         BigInt(params.proofs.length),
+  //         ...params.proofs.map(proof => BigInt(num.hexToDecimalString(proof)))
+  //       ]
+  //     }
+  //   })
+  // }
 
   formatAmountTypeEnum(amountType: VesuAmountType) {
     switch(amountType) {
@@ -588,8 +590,7 @@ export class VesuAdapter extends BaseAdapter {
     const assetConfig = isV2 ? _assetConfig : _assetConfig['0'];
     const timeDelta = assetConfig.last_updated;
     const lastFullUtilizationRate = assetConfig.last_full_utilization_rate;
-    const debtSharePrice = Web3Number.fromWei(assetConfig.last_rate_accumulator, 18);
-    const currentDebt = (new Web3Number((Number(assetConfig.total_nominal_debt) / 1e18).toFixed(9), asset.decimals)).multipliedBy(debtSharePrice);
+    const currentDebt = new Web3Number((Number(assetConfig.total_nominal_debt) / 1e18).toFixed(9), asset.decimals);
     const totalSupply = currentDebt.plus(Web3Number.fromWei(assetConfig.reserve, asset.decimals));
 
     const ratePerSecond = BigInt(Math.round(maxBorrowAPY / 365 / 24 / 60 / 60 * Number(SCALE)));
@@ -598,11 +599,11 @@ export class VesuAdapter extends BaseAdapter {
    
     const maxDebtToHave = totalSupply.multipliedBy(Number(maxUtilisation) / 1e18);
     logger.verbose(`${asset.symbol}::VesuAdapter::getMaxBorrowableByInterestRate currentDebt: ${currentDebt.toString()}, maxDebtToHave: ${maxDebtToHave.toString()}`);
-    return {maxDebtToHave: maxDebtToHave.minus(currentDebt), currentDebt: currentDebt, totalSupply: totalSupply};
+    return maxDebtToHave.minus(currentDebt);
   }
 
   async getLTVConfig(config: IConfig, blockNumber: BlockIdentifier = 'latest') {
-    const CACHE_KEY = `ltv_config_${blockNumber}`;
+    const CACHE_KEY = `ltv_config_${blockNumber}_${this.config.poolId.shortString()}_${this.config.collateral.symbol}_${this.config.debt.symbol}`;
     const cacheData = this.getCache<number>(CACHE_KEY);
     if (cacheData) {
       return cacheData as number;
@@ -628,11 +629,11 @@ export class VesuAdapter extends BaseAdapter {
       throw new Error('Pricer is not initialized');
     }
     //  { '0': { collateral_shares: 0n, nominal_debt: 0n }, '1': 0n, '2': 0n }
-    const CACHE_KEY = `positions_${blockNumber}`;
-    const cacheData = this.getCache<VaultPosition[]>(CACHE_KEY);
-    if (cacheData) {
-      return cacheData;
-    }
+    // const CACHE_KEY = `positions_${blockNumber}_${this.config.poolId.shortString()}_${this.config.collateral.symbol}_${this.config.debt.symbol}`;
+    // const cacheData = this.getCache<VaultPosition[]>(CACHE_KEY);
+    // if (cacheData) {
+    //   return cacheData;
+    // }
 
     const { contract, isV2} = this.getVesuSingletonContract(config, this.config.poolId);
     const output: any = await contract
@@ -642,8 +643,7 @@ export class VesuAdapter extends BaseAdapter {
         this.config.debt.address.address,
         this.config.vaultAllocator.address
       ], { blockIdentifier: blockNumber });
-
-      console.log(output)
+      
     const token1Price = await this.pricer.getPrice(this.config.collateral.symbol);
     const token2Price = await this.pricer.getPrice(this.config.debt.symbol);
     logger.verbose(`VesuAdapter::getPositions token1Price: ${token1Price.price}, token2Price: ${token2Price.price}`);
@@ -661,8 +661,8 @@ export class VesuAdapter extends BaseAdapter {
       usdValue: debtAmount.multipliedBy(token2Price.price).toNumber(),
       remarks: "Debt"
     }];
-    this.setCache(CACHE_KEY, value, 60000); // ttl: 1min
-    return value;
+    //this.setCache(CACHE_KEY, value, 60000); // ttl: 1min
+    return value.map(v => ({ ...v, protocol: Protocols.VESU }));
   }
 
   async getCollateralization(config: IConfig, blockNumber: BlockIdentifier = 'latest'): Promise<Omit<VaultPosition, 'amount'>[]> {
@@ -670,7 +670,7 @@ export class VesuAdapter extends BaseAdapter {
       throw new Error('Pricer is not initialized');
     }
     //  { '0': bool, '1': 0n, '2': 0n }
-    const CACHE_KEY = `collateralization_${blockNumber}`;
+    const CACHE_KEY = `collateralization_${blockNumber}_${this.config.poolId.shortString()}_${this.config.collateral.symbol}_${this.config.debt.symbol}`;
     const cacheData = this.getCache<Omit<VaultPosition, 'amount'>[]>(CACHE_KEY);
     if (cacheData) {
       return cacheData;
@@ -698,7 +698,7 @@ export class VesuAdapter extends BaseAdapter {
       remarks: "Debt"
     }];
     this.setCache(CACHE_KEY, value, 60000); // ttl: 1min
-    return value;
+    return value.map(v => ({ ...v, protocol: Protocols.VESU }));
   }
 
   async getAssetPrices() {
@@ -711,11 +711,11 @@ export class VesuAdapter extends BaseAdapter {
 
     const collateralTokenAmount = positions[0].amount;
     const collateralUSDAmount = collateralization[0].usdValue;
-    const collateralPrice = collateralUSDAmount / collateralTokenAmount.toNumber();
+    const collateralPrice = await this.pricer?.getPrice(this.config.collateral.symbol);
 
     const debtTokenAmount = positions[1].amount;
     const debtUSDAmount = collateralization[1].usdValue;
-    const debtPrice = debtUSDAmount / debtTokenAmount.toNumber();
+    const debtPrice = await this.pricer?.getPrice(this.config.debt.symbol);
     
     return {
       collateralTokenAmount,