Instadapp/aave-protocol-v2
1
0
Fork 0
mirror of https://github.com/Instadapp/aave-protocol-v2.git synced 2024-07-29 21:47:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added Balancer WBTCWETH. Renamed tokens to show underlying AMM.

Browse Source
This commit is contained in:
Zer0dot 2021-02-15 22:50:16 -05:00
parent e72c07ae6d
commit f196a3be7a
9 changed files with 247 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
helpers/types.ts
View File

@ -210,20 +210,21 @@ export interface iAssetBase<T> {
LpDAI: T; LpDAI: T;
LpUSDC: T; LpUSDC: T;
LpUSDT: T; LpUSDT: T;
LpDAIWETH: T; LpUniDAIWETH: T;
LpWBTCWETH: T; LpUniWBTCWETH: T;
LpAAVEWETH: T; LpUniAAVEWETH: T;
LpBATWETH: T; LpUniBATWETH: T;
LpUSDCDAI: T; LpUniUSDCDAI: T;
LpCRVWETH: T; LpUniCRVWETH: T;
LpLINKWETH: T; LpUniLINKWETH: T;
LpMKRWETH: T; LpUniMKRWETH: T;
LpRENWETH: T; LpUniRENWETH: T;
LpSNXWETH: T; LpUniSNXWETH: T;
LpUNIWETH: T; LpUniUNIWETH: T;
LpUSDCWETH: T; LpUniUSDCWETH: T;
LpWBTCUSDC: T; LpUniWBTCUSDC: T;
LpYFIWETH: T; LpUniYFIWETH: T;
LpBalWBTCWETH: T;
} }
export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>; export type iAssetsWithoutETH<T> = Omit<iAssetBase<T>, 'ETH'>;
@ -261,20 +262,21 @@ export type iLpPoolAssets<T> = Pick<
| 'LpUSDT' | 'LpUSDT'
| 'LpWBTC' | 'LpWBTC'
| 'LpWETH' | 'LpWETH'
| 'LpDAIWETH' | 'LpUniDAIWETH'
| 'LpWBTCWETH' | 'LpUniWBTCWETH'
| 'LpAAVEWETH' | 'LpUniAAVEWETH'
| 'LpBATWETH' | 'LpUniBATWETH'
| 'LpUSDCDAI' | 'LpUniUSDCDAI'
| 'LpCRVWETH' | 'LpUniCRVWETH'
| 'LpLINKWETH' | 'LpUniLINKWETH'
| 'LpMKRWETH' | 'LpUniMKRWETH'
| 'LpRENWETH' | 'LpUniRENWETH'
| 'LpSNXWETH' | 'LpUniSNXWETH'
| 'LpUNIWETH' | 'LpUniUNIWETH'
| 'LpUSDCWETH' | 'LpUniUSDCWETH'
| 'LpWBTCUSDC' | 'LpUniWBTCUSDC'
| 'LpYFIWETH' | 'LpUniYFIWETH'
| 'LpBalWBTCWETH'
>; >;
export type iMultiPoolsAssets<T> = iAssetCommon<T> | iAavePoolAssets<T>; export type iMultiPoolsAssets<T> = iAssetCommon<T> | iAavePoolAssets<T>;
@ -310,20 +312,21 @@ export enum TokenContractId {
LpDAI = 'LpDAI', LpDAI = 'LpDAI',
LpUSDC = 'LpUSDC', LpUSDC = 'LpUSDC',
LpUSDT = 'LpUSDT', LpUSDT = 'LpUSDT',
LpDAIWETH = 'LpDAIWETH', LpUniDAIWETH = 'LpUniDAIWETH',
LpWBTCWETH = 'LpWBTCWETH', LpUniWBTCWETH = 'LpUniWBTCWETH',
LpAAVEWETH = 'LpAAVEWETH', LpUniAAVEWETH = 'LpUniAAVEWETH',
LpBATWETH = 'LpBATWETH', LpUniBATWETH = 'LpUniBATWETH',
LpUSDCDAI = 'LpUSDCDAI', LpUniUSDCDAI = 'LpUniUSDCDAI',
LpCRVWETH = 'LpCRVWETH', LpUniCRVWETH = 'LpUniCRVWETH',
LpLINKWETH = 'LpLINKWETH', LpUniLINKWETH = 'LpUniLINKWETH',
LpMKRWETH = 'LpMKRWETH', LpUniMKRWETH = 'LpUniMKRWETH',
LpRENWETH = 'LpRENWETH', LpUniRENWETH = 'LpUniRENWETH',
LpSNXWETH = 'LpSNXWETH', LpUniSNXWETH = 'LpUniSNXWETH',
LpUNIWETH = 'LpUNIWETH', LpUniUNIWETH = 'LpUniUNIWETH',
LpUSDCWETH = 'LpUSDCWETH', LpUniUSDCWETH = 'LpUniUSDCWETH',
LpWBTCUSDC = 'LpWBTCUSDC', LpUniWBTCUSDC = 'LpUniWBTCUSDC',
LpYFIWETH = 'LpYFIWETH', LpUniYFIWETH = 'LpUniYFIWETH',
LpBalWBTCWETH = 'LpBalWBTCWETH',
} }
export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams { export interface IReserveParams extends IReserveBorrowParams, IReserveCollateralParams {

29
markets/aave/commons.ts
View File

@ -28,20 +28,21 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
LpUSDT: oneEther.multipliedBy('0.00369068412860').toFixed(), LpUSDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
LpWBTC: oneEther.multipliedBy('47.332685').toFixed(), LpWBTC: oneEther.multipliedBy('47.332685').toFixed(),
LpWETH: oneEther.toFixed(), LpWETH: oneEther.toFixed(),
LpDAIWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniDAIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpAAVEWETH: oneEther.multipliedBy('0.003620948469').toFixed(), LpUniAAVEWETH: oneEther.multipliedBy('0.003620948469').toFixed(),
LpBATWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniBATWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUSDCDAI: oneEther.multipliedBy('22.407436').toFixed(), LpUniUSDCDAI: oneEther.multipliedBy('22.407436').toFixed(),
LpCRVWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniCRVWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpLINKWETH: oneEther.multipliedBy('0.009955').toFixed(), LpUniLINKWETH: oneEther.multipliedBy('0.009955').toFixed(),
LpMKRWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniMKRWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpRENWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniRENWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpSNXWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniSNXWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUNIWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniUNIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUSDCWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniUSDCWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(), LpUniWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(),
LpYFIWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniYFIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpBalWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
USD: '5848466240000000', USD: '5848466240000000',
}; };

147
markets/lp/commons.ts
View File

@ -28,20 +28,21 @@ const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
LpUSDT: oneEther.multipliedBy('0.00369068412860').toFixed(), LpUSDT: oneEther.multipliedBy('0.00369068412860').toFixed(),
LpWBTC: oneEther.multipliedBy('47.332685').toFixed(), LpWBTC: oneEther.multipliedBy('47.332685').toFixed(),
LpWETH: oneEther.toFixed(), LpWETH: oneEther.toFixed(),
LpDAIWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniDAIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpAAVEWETH: oneEther.multipliedBy('0.003620948469').toFixed(), LpUniAAVEWETH: oneEther.multipliedBy('0.003620948469').toFixed(),
LpBATWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniBATWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUSDCDAI: oneEther.multipliedBy('22.407436').toFixed(), LpUniUSDCDAI: oneEther.multipliedBy('22.407436').toFixed(),
LpCRVWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniCRVWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpLINKWETH: oneEther.multipliedBy('0.009955').toFixed(), LpUniLINKWETH: oneEther.multipliedBy('0.009955').toFixed(),
LpMKRWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniMKRWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpRENWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniRENWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpSNXWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniSNXWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUNIWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniUNIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpUSDCWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniUSDCWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(), LpUniWBTCUSDC: oneEther.multipliedBy('22.407436').toFixed(),
LpYFIWETH: oneEther.multipliedBy('22.407436').toFixed(), LpUniYFIWETH: oneEther.multipliedBy('22.407436').toFixed(),
LpBalWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
USD: '5848466240000000', USD: '5848466240000000',
}; };
// ---------------- // ----------------
@ -86,46 +87,49 @@ export const CommonsConfig: ICommonConfiguration = {
LpWBTC: { LpWBTC: {
borrowRate: oneRay.multipliedBy(0.03).toFixed(), borrowRate: oneRay.multipliedBy(0.03).toFixed(),
}, },
LpDAIWETH: { LpUniDAIWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpWBTCWETH: { LpUniWBTCWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpAAVEWETH:{ LpUniAAVEWETH:{
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpBATWETH: { LpUniBATWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUSDCDAI: { LpUniUSDCDAI: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpCRVWETH: { LpUniCRVWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpLINKWETH: { LpUniLINKWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpMKRWETH: { LpUniMKRWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpRENWETH: { LpUniRENWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpSNXWETH: { LpUniSNXWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUNIWETH: { LpUniUNIWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpUSDCWETH: { LpUniUSDCWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpWBTCUSDC: { LpUniWBTCUSDC: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
LpYFIWETH: { LpUniYFIWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(),
},
LpBalWBTCWETH: {
borrowRate: oneRay.multipliedBy(0.05).toFixed(), borrowRate: oneRay.multipliedBy(0.05).toFixed(),
}, },
}, },
@ -227,20 +231,21 @@ export const CommonsConfig: ICommonConfiguration = {
LpWBTC: '0xF7904a295A029a3aBDFFB6F12755974a958C7C25', LpWBTC: '0xF7904a295A029a3aBDFFB6F12755974a958C7C25',
LpUSDC: '0x64EaC61A2DFda2c3Fa04eED49AA33D021AeC8838', LpUSDC: '0x64EaC61A2DFda2c3Fa04eED49AA33D021AeC8838',
LpDAI:'0x22B58f1EbEDfCA50feF632bD73368b2FdA96D541', LpDAI:'0x22B58f1EbEDfCA50feF632bD73368b2FdA96D541',
LpDAIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', // Mock oracles LpUniDAIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', // Mock oracles
LpWBTCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniWBTCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpAAVEWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniAAVEWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpBATWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniBATWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUSDCDAI: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniUSDCDAI: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpCRVWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniCRVWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpLINKWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniLINKWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpMKRWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniMKRWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpRENWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniRENWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpSNXWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniSNXWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUNIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniUNIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpUSDCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniUSDCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpWBTCUSDC: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniWBTCUSDC: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpYFIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F', LpUniYFIWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
LpBalWBTCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
USD: '0x9326BFA02ADD2366b30bacB125260Af641031331', USD: '0x9326BFA02ADD2366b30bacB125260Af641031331',
}, },
[EthereumNetwork.ropsten]: { [EthereumNetwork.ropsten]: {
@ -250,20 +255,21 @@ export const CommonsConfig: ICommonConfiguration = {
LpWBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8', LpWBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8',
LpUSDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4', LpUSDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4',
LpDAI:'0x773616E4d11A78F511299002da57A0a94577F1f4', LpDAI:'0x773616E4d11A78F511299002da57A0a94577F1f4',
LpDAIWETH: '0xf4071801C4421Db7e63DaC15B9432e50C44a7F42', LpUniDAIWETH: '0xf4071801C4421Db7e63DaC15B9432e50C44a7F42',
LpWBTCWETH: ZERO_ADDRESS, LpUniWBTCWETH: ZERO_ADDRESS,
LpAAVEWETH: ZERO_ADDRESS, LpUniAAVEWETH: ZERO_ADDRESS,
LpBATWETH: ZERO_ADDRESS, LpUniBATWETH: ZERO_ADDRESS,
LpUSDCDAI: ZERO_ADDRESS, LpUniUSDCDAI: ZERO_ADDRESS,
LpCRVWETH: ZERO_ADDRESS, LpUniCRVWETH: ZERO_ADDRESS,
LpLINKWETH: ZERO_ADDRESS, LpUniLINKWETH: ZERO_ADDRESS,
LpMKRWETH: ZERO_ADDRESS, LpUniMKRWETH: ZERO_ADDRESS,
LpRENWETH: ZERO_ADDRESS, LpUniRENWETH: ZERO_ADDRESS,
LpSNXWETH: ZERO_ADDRESS, LpUniSNXWETH: ZERO_ADDRESS,
LpUNIWETH: ZERO_ADDRESS, LpUniUNIWETH: ZERO_ADDRESS,
LpUSDCWETH: ZERO_ADDRESS, LpUniUSDCWETH: ZERO_ADDRESS,
LpWBTCUSDC: ZERO_ADDRESS, LpUniWBTCUSDC: ZERO_ADDRESS,
LpYFIWETH: ZERO_ADDRESS, LpUniYFIWETH: ZERO_ADDRESS,
LpBalWBTCWETH: ZERO_ADDRESS,
USD: '0x9326BFA02ADD2366b30bacB125260Af641031331', USD: '0x9326BFA02ADD2366b30bacB125260Af641031331',
}, },
[EthereumNetwork.tenderlyMain]: { [EthereumNetwork.tenderlyMain]: {
@ -271,20 +277,21 @@ export const CommonsConfig: ICommonConfiguration = {
LpWBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8', LpWBTC: '0xdeb288F737066589598e9214E782fa5A8eD689e8',
LpUSDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4', LpUSDC: '0x986b5E1e1755e3C2440e960477f25201B0a8bbD4',
LpDAI:'0x773616E4d11A78F511299002da57A0a94577F1f4', LpDAI:'0x773616E4d11A78F511299002da57A0a94577F1f4',
LpDAIWETH: ZERO_ADDRESS, LpUniDAIWETH: ZERO_ADDRESS,
LpWBTCWETH: ZERO_ADDRESS, LpUniWBTCWETH: ZERO_ADDRESS,
LpAAVEWETH: ZERO_ADDRESS, LpUniAAVEWETH: ZERO_ADDRESS,
LpBATWETH: ZERO_ADDRESS, LpUniBATWETH: ZERO_ADDRESS,
LpUSDCDAI: ZERO_ADDRESS, LpUniUSDCDAI: ZERO_ADDRESS,
LpCRVWETH: ZERO_ADDRESS, LpUniCRVWETH: ZERO_ADDRESS,
LpLINKWETH: ZERO_ADDRESS, LpUniLINKWETH: ZERO_ADDRESS,
LpMKRWETH: ZERO_ADDRESS, LpUniMKRWETH: ZERO_ADDRESS,
LpRENWETH: ZERO_ADDRESS, LpUniRENWETH: ZERO_ADDRESS,
LpSNXWETH: ZERO_ADDRESS, LpUniSNXWETH: ZERO_ADDRESS,
LpUNIWETH: ZERO_ADDRESS, LpUniUNIWETH: ZERO_ADDRESS,
LpUSDCWETH: ZERO_ADDRESS, LpUniUSDCWETH: ZERO_ADDRESS,
LpWBTCUSDC: ZERO_ADDRESS, LpUniWBTCUSDC: ZERO_ADDRESS,
LpYFIWETH: ZERO_ADDRESS, LpUniYFIWETH: ZERO_ADDRESS,
LpBalWBTCWETH: ZERO_ADDRESS,
USD: '0x9326BFA02ADD2366b30bacB125260Af641031331', USD: '0x9326BFA02ADD2366b30bacB125260Af641031331',
}, },
}, },

112
markets/lp/index.ts
View File

@ -38,20 +38,21 @@ export const lpConfig: ILpConfiguration = {
LpUSDC: strategyUSDC, LpUSDC: strategyUSDC,
LpUSDT: strategyUSDT, LpUSDT: strategyUSDT,
LpWBTC: strategyWBTC, LpWBTC: strategyWBTC,
LpDAIWETH: strategyDAIWETH, LpUniDAIWETH: strategyDAIWETH,
LpWBTCWETH: strategyWBTCWETH, LpUniWBTCWETH: strategyWBTCWETH,
LpAAVEWETH: strategyAAVEWETH, LpUniAAVEWETH: strategyAAVEWETH,
LpBATWETH: strategyBATWETH, LpUniBATWETH: strategyBATWETH,
LpUSDCDAI: strategyUSDCDAI, LpUniUSDCDAI: strategyUSDCDAI,
LpCRVWETH: strategyCRVWETH, LpUniCRVWETH: strategyCRVWETH,
LpLINKWETH: strategyLINKWETH, LpUniLINKWETH: strategyLINKWETH,
LpMKRWETH: strategyMKRWETH, LpUniMKRWETH: strategyMKRWETH,
LpRENWETH: strategyRENWETH, LpUniRENWETH: strategyRENWETH,
LpSNXWETH: strategySNXWETH, LpUniSNXWETH: strategySNXWETH,
LpUNIWETH: strategyUNIWETH, LpUniUNIWETH: strategyUNIWETH,
LpUSDCWETH: strategyUSDCWETH, LpUniUSDCWETH: strategyUSDCWETH,
LpWBTCUSDC: strategyWBTCUSDC, LpUniWBTCUSDC: strategyWBTCUSDC,
LpYFIWETH: strategyYFIWETH, LpUniYFIWETH: strategyYFIWETH,
LpBalWBTCWETH: strategyWBTCWETH,
}, },
ReserveAssets: { ReserveAssets: {
[eEthereumNetwork.buidlerevm]: {}, [eEthereumNetwork.buidlerevm]: {},
@ -63,20 +64,21 @@ export const lpConfig: ILpConfiguration = {
LpUSDT: '0x13512979ADE267AB5100878E2e0f485B568328a4', LpUSDT: '0x13512979ADE267AB5100878E2e0f485B568328a4',
LpWBTC: '0xD1B98B6607330172f1D991521145A22BCe793277', LpWBTC: '0xD1B98B6607330172f1D991521145A22BCe793277',
LpWETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c', LpWETH: '0xd0a1e359811322d97991e03f863a0c30c2cf029c',
LpDAIWETH: '0x7e48b02B21D784e79E17b06988fc150c8b5945df', LpUniDAIWETH: '0x7e48b02B21D784e79E17b06988fc150c8b5945df',
LpWBTCWETH: '0x4Fd18882730dc5f945d5049C3f99Ee43CCA1F3d9', LpUniWBTCWETH: '0x4Fd18882730dc5f945d5049C3f99Ee43CCA1F3d9',
LpAAVEWETH: '0xC173038224d47e11962bb0Bd10e036c573C57dF0', LpUniAAVEWETH: '0xC173038224d47e11962bb0Bd10e036c573C57dF0',
LpBATWETH: '0xfC482c56A91Cc92019FF6522B2FB76F41B7e2535', LpUniBATWETH: '0xfC482c56A91Cc92019FF6522B2FB76F41B7e2535',
LpUSDCDAI: '0xFD0795980D4c37Fd867228C86A1f7693C9219142', LpUniUSDCDAI: '0xFD0795980D4c37Fd867228C86A1f7693C9219142',
LpCRVWETH: '0xC7f1899F8B5861d8A3Ce1385194bc130A15C8a74', LpUniCRVWETH: '0xC7f1899F8B5861d8A3Ce1385194bc130A15C8a74',
LpLINKWETH: '0xCe2355F9249ced9E51ecc35AbB749352C2557D0d', LpUniLINKWETH: '0xCe2355F9249ced9E51ecc35AbB749352C2557D0d',
LpMKRWETH: '0xDCf7A28f4102B7f5813148cCEFb02134648E6F0C', LpUniMKRWETH: '0xDCf7A28f4102B7f5813148cCEFb02134648E6F0C',
LpRENWETH: '0xe46C9459833bBa061471DF2a383D27a20FE97E23', LpUniRENWETH: '0xe46C9459833bBa061471DF2a383D27a20FE97E23',
LpSNXWETH: '0xAa5826dea7cfEc02AcB644b24387bE2648feAbB9', LpUniSNXWETH: '0xAa5826dea7cfEc02AcB644b24387bE2648feAbB9',
LpUNIWETH: '0xD4C255B5500cFB262EB5F9105Ea546Aa0610A0d3', LpUniUNIWETH: '0xD4C255B5500cFB262EB5F9105Ea546Aa0610A0d3',
LpUSDCWETH: '0x509f6ce2F9718E3dd854cCE1857FabCc59C6dd5e', LpUniUSDCWETH: '0x509f6ce2F9718E3dd854cCE1857FabCc59C6dd5e',
LpWBTCUSDC: '0x9D15e3A14926A16C9B285A5c6bd6c9e82d5F8031', LpUniWBTCUSDC: '0x9D15e3A14926A16C9B285A5c6bd6c9e82d5F8031',
LpYFIWETH: '0xC6Dc783B3C2E2Cbf71791d253f8b4993D40DBf98', LpUniYFIWETH: '0xC6Dc783B3C2E2Cbf71791d253f8b4993D40DBf98',
LpBalWBTCWETH: '0x930087451C5940B28bE556d32a4CF22D5d9754A1',
}, },
[EthereumNetwork.ropsten]: { [EthereumNetwork.ropsten]: {
}, },
@ -86,27 +88,43 @@ export const lpConfig: ILpConfiguration = {
LpUSDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', LpUSDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
LpWBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', LpWBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
LpWETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', LpWETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
LpDAIWETH: '0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11', LpUniDAIWETH: '0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11',
LpWBTCWETH: '0xBb2b8038a1640196FbE3e38816F3e67Cba72D940', LpUniWBTCWETH: '0xBb2b8038a1640196FbE3e38816F3e67Cba72D940',
LpAAVEWETH: '0xDFC14d2Af169B0D36C4EFF567Ada9b2E0CAE044f', LpUniAAVEWETH: '0xDFC14d2Af169B0D36C4EFF567Ada9b2E0CAE044f',
LpBATWETH: '0xB6909B960DbbE7392D405429eB2b3649752b4838', LpUniBATWETH: '0xB6909B960DbbE7392D405429eB2b3649752b4838',
LpUSDCDAI: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5', LpUniUSDCDAI: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5',
LpCRVWETH: '0x3dA1313aE46132A397D90d95B1424A9A7e3e0fCE', LpUniCRVWETH: '0x3dA1313aE46132A397D90d95B1424A9A7e3e0fCE',
LpLINKWETH: '0xa2107FA5B38d9bbd2C461D6EDf11B11A50F6b974', LpUniLINKWETH: '0xa2107FA5B38d9bbd2C461D6EDf11B11A50F6b974',
LpMKRWETH: '0xC2aDdA861F89bBB333c90c492cB837741916A225', LpUniMKRWETH: '0xC2aDdA861F89bBB333c90c492cB837741916A225',
LpRENWETH: '0x8Bd1661Da98EBDd3BD080F0bE4e6d9bE8cE9858c', LpUniRENWETH: '0x8Bd1661Da98EBDd3BD080F0bE4e6d9bE8cE9858c',
LpSNXWETH: '0x43AE24960e5534731Fc831386c07755A2dc33D47', LpUniSNXWETH: '0x43AE24960e5534731Fc831386c07755A2dc33D47',
LpUNIWETH: '0xd3d2E2692501A5c9Ca623199D38826e513033a17', LpUniUNIWETH: '0xd3d2E2692501A5c9Ca623199D38826e513033a17',
LpUSDCWETH: '0xB4e16d0168e52d35CaCD2c6185b44281Ec28C9Dc', LpUniUSDCWETH: '0xB4e16d0168e52d35CaCD2c6185b44281Ec28C9Dc',
LpWBTCUSDC: '0x004375Dff511095CC5A197A54140a24eFEF3A416', LpUniWBTCUSDC: '0x004375Dff511095CC5A197A54140a24eFEF3A416',
LpYFIWETH: '0x2fDbAdf3C4D5A8666Bc06645B8358ab803996E28', LpUniYFIWETH: '0x2fDbAdf3C4D5A8666Bc06645B8358ab803996E28',
LpBalWBTCWETH: '0x1efF8aF5D577060BA4ac8A29A13525bb0Ee2A3D5',
}, },
[EthereumNetwork.tenderlyMain]: { [EthereumNetwork.tenderlyMain]: {
DAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F', LpDAI: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
USDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48', LpUSDC: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
USDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7', LpUSDT: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
WBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599', LpWBTC: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
WETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2', LpWETH: '0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2',
LpUniDAIWETH: '0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11',
LpUniWBTCWETH: '0xBb2b8038a1640196FbE3e38816F3e67Cba72D940',
LpUniAAVEWETH: '0xDFC14d2Af169B0D36C4EFF567Ada9b2E0CAE044f',
LpUniBATWETH: '0xB6909B960DbbE7392D405429eB2b3649752b4838',
LpUniUSDCDAI: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5',
LpUniCRVWETH: '0x3dA1313aE46132A397D90d95B1424A9A7e3e0fCE',
LpUniLINKWETH: '0xa2107FA5B38d9bbd2C461D6EDf11B11A50F6b974',
LpUniMKRWETH: '0xC2aDdA861F89bBB333c90c492cB837741916A225',
LpUniRENWETH: '0x8Bd1661Da98EBDd3BD080F0bE4e6d9bE8cE9858c',
LpUniSNXWETH: '0x43AE24960e5534731Fc831386c07755A2dc33D47',
LpUniUNIWETH: '0xd3d2E2692501A5c9Ca623199D38826e513033a17',
LpUniUSDCWETH: '0xB4e16d0168e52d35CaCD2c6185b44281Ec28C9Dc',
LpUniWBTCUSDC: '0x004375Dff511095CC5A197A54140a24eFEF3A416',
LpUniYFIWETH: '0x2fDbAdf3C4D5A8666Bc06645B8358ab803996E28',
LpBalWBTCWETH: '0x1efF8aF5D577060BA4ac8A29A13525bb0Ee2A3D5',
}, },
}, },
}; };

29
test-suites/test-aave/__setup.spec.ts
View File

@ -170,20 +170,21 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
LpUSDT: mockTokens.LpUSDT.address, LpUSDT: mockTokens.LpUSDT.address,
LpWBTC: mockTokens.LpWBTC.address, LpWBTC: mockTokens.LpWBTC.address,
LpWETH: mockTokens.LpWETH.address, LpWETH: mockTokens.LpWETH.address,
LpDAIWETH: mockTokens.LpDAIWETH.address, LpUniDAIWETH: mockTokens.LpUniDAIWETH.address,
LpWBTCWETH: mockTokens.LpWBTCWETH.address, LpUniWBTCWETH: mockTokens.LpUniWBTCWETH.address,
LpAAVEWETH: mockTokens.LpAAVEWETH.address, LpUniAAVEWETH: mockTokens.LpUniAAVEWETH.address,
LpBATWETH: mockTokens.LpBATWETH.address, LpUniBATWETH: mockTokens.LpUniBATWETH.address,
LpUSDCDAI: mockTokens.LpUSDCDAI.address, LpUniUSDCDAI: mockTokens.LpUniUSDCDAI.address,
LpCRVWETH: mockTokens.LpCRVWETH.address, LpUniCRVWETH: mockTokens.LpUniCRVWETH.address,
LpLINKWETH: mockTokens.LpLINKWETH.address, LpUniLINKWETH: mockTokens.LpUniLINKWETH.address,
LpMKRWETH: mockTokens.LpMKRWETH.address, LpUniMKRWETH: mockTokens.LpUniMKRWETH.address,
LpRENWETH: mockTokens.LpRENWETH.address, LpUniRENWETH: mockTokens.LpUniRENWETH.address,
LpSNXWETH: mockTokens.LpSNXWETH.address, LpUniSNXWETH: mockTokens.LpUniSNXWETH.address,
LpUNIWETH: mockTokens.LpUNIWETH.address, LpUniUNIWETH: mockTokens.LpUniUNIWETH.address,
LpUSDCWETH: mockTokens.LpUSDCWETH.address, LpUniUSDCWETH: mockTokens.LpUniUSDCWETH.address,
LpWBTCUSDC: mockTokens.LpWBTCUSDC.address, LpUniWBTCUSDC: mockTokens.LpUniWBTCUSDC.address,
LpYFIWETH: mockTokens.LpYFIWETH.address, LpUniYFIWETH: mockTokens.LpUniYFIWETH.address,
LpBalWBTCWETH: mockTokens.LpBalWBTCWETH.address,
USD: USD_ADDRESS, USD: USD_ADDRESS,
}, },
fallbackOracle fallbackOracle

29
test-suites/test-lp/__setup.spec.ts
View File

@ -170,20 +170,21 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
LpUSDT: mockTokens.LpUSDT.address, LpUSDT: mockTokens.LpUSDT.address,
LpWBTC: mockTokens.LpWBTC.address, LpWBTC: mockTokens.LpWBTC.address,
LpWETH: mockTokens.LpWETH.address, LpWETH: mockTokens.LpWETH.address,
LpDAIWETH: mockTokens.LpDAIWETH.address, LpUniDAIWETH: mockTokens.LpUniDAIWETH.address,
LpWBTCWETH: mockTokens.LpWBTCWETH.address, LpUniWBTCWETH: mockTokens.LpUniWBTCWETH.address,
LpAAVEWETH: mockTokens.LpAAVEWETH.address, LpUniAAVEWETH: mockTokens.LpUniAAVEWETH.address,
LpBATWETH: mockTokens.LpBATWETH.address, LpUniBATWETH: mockTokens.LpUniBATWETH.address,
LpUSDCDAI: mockTokens.LpUSDCDAI.address, LpUniUSDCDAI: mockTokens.LpUniUSDCDAI.address,
LpCRVWETH: mockTokens.LpCRVWETH.address, LpUniCRVWETH: mockTokens.LpUniCRVWETH.address,
LpLINKWETH: mockTokens.LpLINKWETH.address, LpUniLINKWETH: mockTokens.LpUniLINKWETH.address,
LpMKRWETH: mockTokens.LpMKRWETH.address, LpUniMKRWETH: mockTokens.LpUniMKRWETH.address,
LpRENWETH: mockTokens.LpRENWETH.address, LpUniRENWETH: mockTokens.LpUniRENWETH.address,
LpSNXWETH: mockTokens.LpSNXWETH.address, LpUniSNXWETH: mockTokens.LpUniSNXWETH.address,
LpUNIWETH: mockTokens.LpUNIWETH.address, LpUniUNIWETH: mockTokens.LpUniUNIWETH.address,
LpUSDCWETH: mockTokens.LpUSDCWETH.address, LpUniUSDCWETH: mockTokens.LpUniUSDCWETH.address,
LpWBTCUSDC: mockTokens.LpWBTCUSDC.address, LpUniWBTCUSDC: mockTokens.LpUniWBTCUSDC.address,
LpYFIWETH: mockTokens.LpYFIWETH.address, LpUniYFIWETH: mockTokens.LpUniYFIWETH.address,
LpBalWBTCWETH: mockTokens.LpBalWBTCWETH.address,
USD: USD_ADDRESS, USD: USD_ADDRESS,
}, },
fallbackOracle fallbackOracle

2
test-suites/test-lp/helpers/make-suite.ts
View File

@ -136,7 +136,7 @@ export async function initializeMakeSuite() {
const daiAddress = reservesTokens.find((token) => token.symbol === 'LpDAI')?.tokenAddress; const daiAddress = reservesTokens.find((token) => token.symbol === 'LpDAI')?.tokenAddress;
const usdcAddress = reservesTokens.find((token) => token.symbol === 'LpUSDC')?.tokenAddress; const usdcAddress = reservesTokens.find((token) => token.symbol === 'LpUSDC')?.tokenAddress;
const aaveAddress = reservesTokens.find((token) => token.symbol === 'LpAAVEWETH')?.tokenAddress; const aaveAddress = reservesTokens.find((token) => token.symbol === 'LpUniAAVEWETH')?.tokenAddress;
const wethAddress = reservesTokens.find((token) => token.symbol === 'WETH')?.tokenAddress; const wethAddress = reservesTokens.find((token) => token.symbol === 'WETH')?.tokenAddress;
if (!aDaiAddress || !aWEthAddress) { if (!aDaiAddress || !aWEthAddress) {

10
test-suites/test-lp/helpers/scenarios/borrow-repay-variable.json
View File

@ -243,7 +243,7 @@
] ]
}, },
{ {
"description": "User 0 deposits 1 WETH, user 1 deposits 100 LPLINKWETH as collateral and borrows 0.5 WETH at variable rate", "description": "User 0 deposits 1 WETH, user 1 deposits 100 LPUNILINKWETH as collateral and borrows 0.5 WETH at variable rate",
"actions": [ "actions": [
{ {
"name": "mint", "name": "mint",
@ -274,7 +274,7 @@
{ {
"name": "mint", "name": "mint",
"args": { "args": {
"reserve": "LPLINKWETH", "reserve": "LPUNILINKWETH",
"amount": "100", "amount": "100",
"user": "1" "user": "1"
}, },
@ -283,7 +283,7 @@
{ {
"name": "approve", "name": "approve",
"args": { "args": {
"reserve": "LPLINKWETH", "reserve": "LPUNILINKWETH",
"user": "1" "user": "1"
}, },
"expected": "success" "expected": "success"
@ -292,7 +292,7 @@
{ {
"name": "deposit", "name": "deposit",
"args": { "args": {
"reserve": "LPLINKWETH", "reserve": "LPUNILINKWETH",
"amount": "100", "amount": "100",
"user": "1" "user": "1"
}, },
@ -431,7 +431,7 @@
{ {
"name": "withdraw", "name": "withdraw",
"args": { "args": {
"reserve": "LPLINKWETH", "reserve": "LPUNILINKWETH",
"amount": "-1", "amount": "-1",
"user": "1" "user": "1"
}, },

18
test-suites/test-lp/helpers/scenarios/set-use-as-collateral.json
View File

@ -133,12 +133,12 @@
] ]
}, },
{ {
"description": "User 1 Deposits 10 LPLINKWETH, disables WETH as collateral. Should revert as 10 LPLINKWETH are not enough to cover the debt (revert expected)", "description": "User 1 Deposits 10 LPUNILINKWETH, disables WETH as collateral. Should revert as 10 LPUNILINKWETH are not enough to cover the debt (revert expected)",
"actions": [ "actions": [
{ {
"name": "mint", "name": "mint",
"args": { "args": {
"reserve": "LPLINKWETH", "reserve": "LPUNILINKWETH",
"amount": "10", "amount": "10",
"user": "1" "user": "1"
}, },
@ -147,7 +147,7 @@
{ {
"name": "approve", "name": "approve",
"args": { "args": {
"reserve": "LPLINKWETH", "reserve": "LPUNILINKWETH",
"user": "1" "user": "1"
}, },
"expected": "success" "expected": "success"
@ -155,7 +155,7 @@
{ {
"name": "deposit", "name": "deposit",
"args": { "args": {
"reserve": "LPLINKWETH", "reserve": "LPUNILINKWETH",
"amount": "10", "amount": "10",
"user": "1" "user": "1"
}, },
@ -173,12 +173,12 @@
] ]
}, },
{ {
"description": "User 1 Deposits 640 more LPLINKWETH (enough to cover the LPDAI debt), disables WETH as collateral", "description": "User 1 Deposits 640 more LPUNILINKWETH (enough to cover the LPDAI debt), disables WETH as collateral",
"actions": [ "actions": [
{ {
"name": "mint", "name": "mint",
"args": { "args": {
"reserve": "LPLINKWETH", "reserve": "LPUNILINKWETH",
"amount": "640", "amount": "640",
"user": "1" "user": "1"
}, },
@ -187,7 +187,7 @@
{ {
"name": "deposit", "name": "deposit",
"args": { "args": {
"reserve": "LPLINKWETH", "reserve": "LPUNILINKWETH",
"amount": "640", "amount": "640",
"user": "1" "user": "1"
}, },
@ -205,12 +205,12 @@
] ]
}, },
{ {
"description": "User 1 disables LPLINKWETH as collateral (revert expected)", "description": "User 1 disables LPUNILINKWETH as collateral (revert expected)",
"actions": [ "actions": [
{ {
"name": "setUseAsCollateral", "name": "setUseAsCollateral",
"args": { "args": {
"reserve": "LPLINKWETH", "reserve": "LPUNILINKWETH",
"user": "1", "user": "1",
"useAsCollateral": "false" "useAsCollateral": "false"
}, },