diff --git a/markets/usd-amm/index.ts b/markets/usd-amm/index.ts index 6ea99bcf..464f9b6d 100644 --- a/markets/usd-amm/index.ts +++ b/markets/usd-amm/index.ts @@ -152,7 +152,7 @@ export const AmmConfig: IUsdAmmConfiguration = { [eEthereumNetwork.kovan]: '0x8fb777d67e9945e2c01936e319057f9d41d559e6', // Need to re-deploy because of onlyOwner [eEthereumNetwork.ropsten]: ZERO_ADDRESS, [eEthereumNetwork.main]: ZERO_ADDRESS, - [eEthereumNetwork.tenderlyMain]: ZERO_ADDRESS, + [eEthereumNetwork.tenderlyMain]: '0x3a463fFE9b69364B51113352a17839e36268e657', }, FallbackOracle: { [eEthereumNetwork.coverage]: '', @@ -174,16 +174,16 @@ export const AmmConfig: IUsdAmmConfiguration = { SUSD: '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94', USDC: '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6', USDT: '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D', - a3CRVGauge: '0x602df949e38335714E135ce94180255Dae79a659', // Oracle deployed at fork - saCRVGauge: '0x61B9302Ad4534D44D993764CB569a56A6d8dE25f', // Oracle deployed at fork + a3CRVGauge: '0xe19781CB322ff0Bd31ad4D8C01e91A67e', // Oracle deployed at fork + saCRVGauge: '0x602df949e38335714E135ce94180255Dae79a659', // Oracle deployed at fork }, [eEthereumNetwork.tenderlyMain]: { DAI: '0xAed0c38402a5d19df6E4c03F4E2DceD6e29c1ee9', SUSD: '0xad35Bd71b9aFE6e4bDc266B345c198eaDEf9Ad94', USDC: '0x8fFfFfd4AfB6115b954Bd326cbe7B4BA576818f6', USDT: '0x3E7d1eAB13ad0104d2750B8863b489D65364e32D', - a3CRVGauge: '0x602df949e38335714E135ce94180255Dae79a659', // Oracle deployed at fork - saCRVGauge: '0x61B9302Ad4534D44D993764CB569a56A6d8dE25f', // Oracle deployed at fork + a3CRVGauge: '0xe19781CB322ff0Bd31ad4D8C01e91A67e', // Oracle deployed at fork + saCRVGauge: '0x602df949e38335714E135ce94180255Dae79a659', // Oracle deployed at fork }, }, ATokenDomainSeparator: { diff --git a/tasks/deployments/deploy-UiPoolDataProvider.ts b/tasks/deployments/deploy-UiPoolDataProvider.ts index 7696ddb9..a4eed652 100644 --- a/tasks/deployments/deploy-UiPoolDataProvider.ts +++ b/tasks/deployments/deploy-UiPoolDataProvider.ts @@ -2,6 +2,8 @@ import { task } from 'hardhat/config'; import { eContractid, eEthereumNetwork, eNetwork, ePolygonNetwork } from '../../helpers/types'; import { deployUiPoolDataProvider } from '../../helpers/contracts-deployments'; import { exit } from 'process'; +import { usingTenderly } from '../../helpers/tenderly-utils'; +import { ZERO_ADDRESS } from '../../helpers/constants'; task(`deploy-${eContractid.UiPoolDataProvider}`, `Deploys the UiPoolDataProvider contract`) .addFlag('verify', 'Verify UiPoolDataProvider contract via Etherscan API.') @@ -31,6 +33,10 @@ task(`deploy-${eContractid.UiPoolDataProvider}`, `Deploys the UiPoolDataProvider incentivesController: '0xd41aE58e803Edf4304334acCE4DC4Ec34a63C644', aaveOracle: '0xC365C653f7229894F93994CD0b30947Ab69Ff1D5', }, + [eEthereumNetwork.tenderlyMain]: { + incentivesController: '0xd784927Ff2f95ba542BfC824c8a8a98F3495f6b5', + aaveOracle: '0x3a463fFE9b69364B51113352a17839e36268e657', + }, }; const supportedNetworks = Object.keys(addressesByNetwork); @@ -42,10 +48,12 @@ task(`deploy-${eContractid.UiPoolDataProvider}`, `Deploys the UiPoolDataProvider } const oracle = addressesByNetwork[network].aaveOracle; - const incentivesController = addressesByNetwork[network].aaveOracle; + const incentivesController = addressesByNetwork[network].incentivesController; console.log(`\n- UiPoolDataProvider deployment`); - + console.log('- Params'); + console.log('- IncentivesController', incentivesController); + console.log('- AaveOracle', oracle); const uiPoolDataProvider = await deployUiPoolDataProvider( [incentivesController, oracle], verify @@ -53,4 +61,11 @@ task(`deploy-${eContractid.UiPoolDataProvider}`, `Deploys the UiPoolDataProvider console.log('UiPoolDataProvider deployed at:', uiPoolDataProvider.address); console.log(`\tFinished UiPoolDataProvider deployment`); + if (usingTenderly()) { + const postDeployHead = localBRE.tenderlyRPC.getHead(); + const postDeployFork = localBRE.tenderlyRPC.getFork(); + console.log('Tenderly Info'); + console.log('- Head', postDeployHead); + console.log('- Fork', postDeployFork); + } });