mirror of
				https://github.com/Instadapp/aave-protocol-v2.git
				synced 2024-07-29 21:47:30 +00:00 
			
		
		
		
	Changed USDCDAI to DAIUSDC to fit pair order
This commit is contained in:
		
							parent
							
								
									735fc5c6c7
								
							
						
					
					
						commit
						b2d344e189
					
				| 
						 | 
				
			
			@ -54,7 +54,7 @@ export const MOCK_CHAINLINK_AGGREGATORS_PRICES = {
 | 
			
		|||
  UniWBTCWETH: oneEther.multipliedBy('22.407436').toFixed(),
 | 
			
		||||
  UniAAVEWETH: oneEther.multipliedBy('0.003620948469').toFixed(),
 | 
			
		||||
  UniBATWETH: oneEther.multipliedBy('22.407436').toFixed(),
 | 
			
		||||
  UniUSDCDAI: oneEther.multipliedBy('22.407436').toFixed(),
 | 
			
		||||
  UniDAIUSDC: oneEther.multipliedBy('22.407436').toFixed(),
 | 
			
		||||
  UniCRVWETH: oneEther.multipliedBy('22.407436').toFixed(),
 | 
			
		||||
  UniLINKWETH: oneEther.multipliedBy('0.009955').toFixed(),
 | 
			
		||||
  UniMKRWETH: oneEther.multipliedBy('22.407436').toFixed(),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -224,7 +224,7 @@ export interface iAssetBase<T> {
 | 
			
		|||
  UniWBTCWETH: T;
 | 
			
		||||
  UniAAVEWETH: T;
 | 
			
		||||
  UniBATWETH: T;
 | 
			
		||||
  UniUSDCDAI: T;
 | 
			
		||||
  UniDAIUSDC: T;
 | 
			
		||||
  UniCRVWETH: T;
 | 
			
		||||
  UniLINKWETH: T;
 | 
			
		||||
  UniMKRWETH: T;
 | 
			
		||||
| 
						 | 
				
			
			@ -278,7 +278,7 @@ export type iLpPoolAssets<T> = Pick<
 | 
			
		|||
  | 'UniWBTCWETH'
 | 
			
		||||
  | 'UniAAVEWETH'
 | 
			
		||||
  | 'UniBATWETH'
 | 
			
		||||
  | 'UniUSDCDAI'
 | 
			
		||||
  | 'UniDAIUSDC'
 | 
			
		||||
  | 'UniCRVWETH'
 | 
			
		||||
  | 'UniLINKWETH'
 | 
			
		||||
  | 'UniMKRWETH'
 | 
			
		||||
| 
						 | 
				
			
			@ -333,7 +333,7 @@ export enum TokenContractId {
 | 
			
		|||
  UniWBTCWETH = 'UniWBTCWETH',
 | 
			
		||||
  UniAAVEWETH = 'UniAAVEWETH',
 | 
			
		||||
  UniBATWETH = 'UniBATWETH',
 | 
			
		||||
  UniUSDCDAI = 'UniUSDCDAI',
 | 
			
		||||
  UniDAIUSDC = 'UniDAIUSDC',
 | 
			
		||||
  UniCRVWETH = 'UniCRVWETH',
 | 
			
		||||
  UniLINKWETH = 'UniLINKWETH',
 | 
			
		||||
  UniMKRWETH = 'UniMKRWETH',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -60,7 +60,7 @@ export const CommonsConfig: ICommonConfiguration = {
 | 
			
		|||
    UniBATWETH: {
 | 
			
		||||
      borrowRate: oneRay.multipliedBy(0.05).toFixed(),
 | 
			
		||||
    },
 | 
			
		||||
    UniUSDCDAI: {
 | 
			
		||||
    UniDAIUSDC: {
 | 
			
		||||
      borrowRate: oneRay.multipliedBy(0.05).toFixed(),
 | 
			
		||||
    },
 | 
			
		||||
    UniCRVWETH: {
 | 
			
		||||
| 
						 | 
				
			
			@ -223,7 +223,7 @@ export const CommonsConfig: ICommonConfiguration = {
 | 
			
		|||
      UniWBTCWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',  
 | 
			
		||||
      UniAAVEWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
 | 
			
		||||
      UniBATWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
 | 
			
		||||
      UniUSDCDAI: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
 | 
			
		||||
      UniDAIUSDC: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
 | 
			
		||||
      UniCRVWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
 | 
			
		||||
      UniLINKWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
 | 
			
		||||
      UniMKRWETH: '0x5699302154A020FB1DE2B1d39f4c73785A235d8F',
 | 
			
		||||
| 
						 | 
				
			
			@ -247,7 +247,7 @@ export const CommonsConfig: ICommonConfiguration = {
 | 
			
		|||
      UniWBTCWETH: ZERO_ADDRESS,
 | 
			
		||||
      UniAAVEWETH: ZERO_ADDRESS,
 | 
			
		||||
      UniBATWETH: ZERO_ADDRESS,
 | 
			
		||||
      UniUSDCDAI: ZERO_ADDRESS,
 | 
			
		||||
      UniDAIUSDC: ZERO_ADDRESS,
 | 
			
		||||
      UniCRVWETH: ZERO_ADDRESS,
 | 
			
		||||
      UniLINKWETH: ZERO_ADDRESS,
 | 
			
		||||
      UniMKRWETH: ZERO_ADDRESS,
 | 
			
		||||
| 
						 | 
				
			
			@ -269,7 +269,7 @@ export const CommonsConfig: ICommonConfiguration = {
 | 
			
		|||
      UniWBTCWETH: ZERO_ADDRESS,
 | 
			
		||||
      UniAAVEWETH: ZERO_ADDRESS,
 | 
			
		||||
      UniBATWETH: ZERO_ADDRESS,
 | 
			
		||||
      UniUSDCDAI: ZERO_ADDRESS,
 | 
			
		||||
      UniDAIUSDC: ZERO_ADDRESS,
 | 
			
		||||
      UniCRVWETH: ZERO_ADDRESS,
 | 
			
		||||
      UniLINKWETH: ZERO_ADDRESS,
 | 
			
		||||
      UniMKRWETH: ZERO_ADDRESS,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -12,7 +12,7 @@ import {
 | 
			
		|||
  strategyDAIWETH,
 | 
			
		||||
  strategyAAVEWETH,
 | 
			
		||||
  strategyBATWETH,
 | 
			
		||||
  strategyUSDCDAI,
 | 
			
		||||
  strategyDAIUSDC,
 | 
			
		||||
  strategyCRVWETH,
 | 
			
		||||
  strategyLINKWETH,
 | 
			
		||||
  strategyMKRWETH,
 | 
			
		||||
| 
						 | 
				
			
			@ -42,7 +42,7 @@ export const AmmConfig: IAmmConfiguration = {
 | 
			
		|||
    UniWBTCWETH: strategyWBTCWETH,
 | 
			
		||||
    UniAAVEWETH: strategyAAVEWETH,
 | 
			
		||||
    UniBATWETH: strategyBATWETH,
 | 
			
		||||
    UniUSDCDAI: strategyUSDCDAI,
 | 
			
		||||
    UniDAIUSDC: strategyDAIUSDC,
 | 
			
		||||
    UniCRVWETH: strategyCRVWETH,
 | 
			
		||||
    UniLINKWETH: strategyLINKWETH,
 | 
			
		||||
    UniMKRWETH: strategyMKRWETH,
 | 
			
		||||
| 
						 | 
				
			
			@ -68,7 +68,7 @@ export const AmmConfig: IAmmConfiguration = {
 | 
			
		|||
      UniWBTCWETH: '0x796d562B1dF5b9dc85A4612187B6f29Ed213d960',
 | 
			
		||||
      UniAAVEWETH: '0x657A7B8b46F35C5C6583AEF43824744B236EF826',
 | 
			
		||||
      UniBATWETH: '0xf8CEBA8b16579956B3aE4B5D09002a30f873F783',
 | 
			
		||||
      UniUSDCDAI: '0x8e80b7a7531c276dD1dBEC2f1Cc281c11c859e62',
 | 
			
		||||
      UniDAIUSDC: '0x8e80b7a7531c276dD1dBEC2f1Cc281c11c859e62',
 | 
			
		||||
      UniCRVWETH: '0x9c31b7538467bF0b01e6d5fA789e66Ce540a521e',
 | 
			
		||||
      UniLINKWETH: '0x5Acab7f8B79620ec7127A96E5D8837d2124D5D7c',
 | 
			
		||||
      UniMKRWETH: '0xB0C6EC5d58ddbF4cd1e419A56a19924E9904e4Dd',
 | 
			
		||||
| 
						 | 
				
			
			@ -92,7 +92,7 @@ export const AmmConfig: IAmmConfiguration = {
 | 
			
		|||
      UniWBTCWETH: '0xBb2b8038a1640196FbE3e38816F3e67Cba72D940',
 | 
			
		||||
      UniAAVEWETH: '0xDFC14d2Af169B0D36C4EFF567Ada9b2E0CAE044f',
 | 
			
		||||
      UniBATWETH: '0xB6909B960DbbE7392D405429eB2b3649752b4838',
 | 
			
		||||
      UniUSDCDAI: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5',
 | 
			
		||||
      UniDAIUSDC: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5',
 | 
			
		||||
      UniCRVWETH: '0x3dA1313aE46132A397D90d95B1424A9A7e3e0fCE',
 | 
			
		||||
      UniLINKWETH: '0xa2107FA5B38d9bbd2C461D6EDf11B11A50F6b974',
 | 
			
		||||
      UniMKRWETH: '0xC2aDdA861F89bBB333c90c492cB837741916A225',
 | 
			
		||||
| 
						 | 
				
			
			@ -114,7 +114,7 @@ export const AmmConfig: IAmmConfiguration = {
 | 
			
		|||
      UniWBTCWETH: '0xBb2b8038a1640196FbE3e38816F3e67Cba72D940',
 | 
			
		||||
      UniAAVEWETH: '0xDFC14d2Af169B0D36C4EFF567Ada9b2E0CAE044f',
 | 
			
		||||
      UniBATWETH: '0xB6909B960DbbE7392D405429eB2b3649752b4838',
 | 
			
		||||
      UniUSDCDAI: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5',
 | 
			
		||||
      UniDAIUSDC: '0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5',
 | 
			
		||||
      UniCRVWETH: '0x3dA1313aE46132A397D90d95B1424A9A7e3e0fCE',
 | 
			
		||||
      UniLINKWETH: '0xa2107FA5B38d9bbd2C461D6EDf11B11A50F6b974',
 | 
			
		||||
      UniMKRWETH: '0xC2aDdA861F89bBB333c90c492cB837741916A225',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,7 +2,7 @@ import BigNumber from 'bignumber.js';
 | 
			
		|||
import { oneRay } from '../../helpers/constants';
 | 
			
		||||
import { IInterestRateStrategyParams } from '../../helpers/types';
 | 
			
		||||
 | 
			
		||||
// DAIWETH WBTCWETH AAVEWETH BATWETH USDCDAI CRVWETH LINKWETH MKRWETH RENWETH SNXWETH UNIWETH USDCWETH WBTCUSDC YFIWETH
 | 
			
		||||
// DAIWETH WBTCWETH AAVEWETH BATWETH DAIUSDC CRVWETH LINKWETH MKRWETH RENWETH SNXWETH UNIWETH USDCWETH WBTCUSDC YFIWETH
 | 
			
		||||
export const rateStrategyAmmBase: IInterestRateStrategyParams = {
 | 
			
		||||
    name: "rateStrategyAmmBase",
 | 
			
		||||
    optimalUtilizationRate: new BigNumber(0.45).multipliedBy(oneRay).toFixed(),
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -114,7 +114,7 @@ export const strategyBATWETH: IReserveParams = {
 | 
			
		|||
  reserveFactor: '1500'
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
export const strategyUSDCDAI: IReserveParams = {
 | 
			
		||||
export const strategyDAIUSDC: IReserveParams = {
 | 
			
		||||
  strategy: rateStrategyAmmBase,
 | 
			
		||||
  baseLTVAsCollateral: '6000',
 | 
			
		||||
  liquidationThreshold: '7000',
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -176,7 +176,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
 | 
			
		|||
      UniWBTCWETH: mockTokens.UniWBTCWETH.address,
 | 
			
		||||
      UniAAVEWETH: mockTokens.UniAAVEWETH.address,
 | 
			
		||||
      UniBATWETH: mockTokens.UniBATWETH.address,
 | 
			
		||||
      UniUSDCDAI: mockTokens.UniUSDCDAI.address,
 | 
			
		||||
      UniDAIUSDC: mockTokens.UniDAIUSDC.address,
 | 
			
		||||
      UniCRVWETH: mockTokens.UniCRVWETH.address,
 | 
			
		||||
      UniLINKWETH: mockTokens.UniLINKWETH.address,
 | 
			
		||||
      UniMKRWETH: mockTokens.UniMKRWETH.address,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -175,7 +175,7 @@ const buildTestEnv = async (deployer: Signer, secondaryWallet: Signer) => {
 | 
			
		|||
      UniWBTCWETH: mockTokens.UniWBTCWETH.address,
 | 
			
		||||
      UniAAVEWETH: mockTokens.UniAAVEWETH.address,
 | 
			
		||||
      UniBATWETH: mockTokens.UniBATWETH.address,
 | 
			
		||||
      UniUSDCDAI: mockTokens.UniUSDCDAI.address,
 | 
			
		||||
      UniDAIUSDC: mockTokens.UniDAIUSDC.address,
 | 
			
		||||
      UniCRVWETH: mockTokens.UniCRVWETH.address,
 | 
			
		||||
      UniLINKWETH: mockTokens.UniLINKWETH.address,
 | 
			
		||||
      UniMKRWETH: mockTokens.UniMKRWETH.address,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue
	
	Block a user