From 84053c7b1df624fb068b7718f3599a7b64c3122c Mon Sep 17 00:00:00 2001 From: David Racero Date: Mon, 16 Nov 2020 10:19:14 +0100 Subject: [PATCH] Added latest update from Tenderly --- deployed-contracts.json | 26 +++++++++++++------------- helpers/contracts-helpers.ts | 6 ++++++ package-lock.json | 6 +++--- package.json | 2 +- tasks/full/3_oracles.ts | 2 ++ tasks/migrations/aave.mainnet.fork.ts | 8 ++++++-- tasks/misc/set-bre.ts | 6 ------ 7 files changed, 31 insertions(+), 25 deletions(-) diff --git a/deployed-contracts.json b/deployed-contracts.json index 89cdaacb..a59c18ff 100644 --- a/deployed-contracts.json +++ b/deployed-contracts.json @@ -259,8 +259,8 @@ "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "tenderlyMain": { - "address": "0x011BA4E28C3448513D853599131AcB9A24Cb8E11", - "deployer": "0xb2E51BBCB2453701e5aB9bf95Ea9A4eb2D329090" + "address": "0x1F745ca41d9ab4ee3ecFc4DCF58cE39f65836e93", + "deployer": "0x754266980072c8B4d82Ea98D17fdE14610615dcE" } }, "LendingPoolAddressesProviderRegistry": { @@ -277,8 +277,8 @@ "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "tenderlyMain": { - "address": "0x239acf3cD92161Db147389A57cbFaeb0985d5e3A", - "deployer": "0xf2F8D0753A4E35B097c871D1ED488B7926D3097a" + "address": "0xEd633b18625ba55b920FEA46F1c5Bf2A32aDe90E", + "deployer": "0x1BCCABFDf302cbc1EEFEc8fe9725776a945E43bd" } }, "ReserveLogic": { @@ -295,8 +295,8 @@ "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "tenderlyMain": { - "address": "0xB7Ea702FC07e976b19ED67060099FdF8A34950e2", - "deployer": "0x859cFCC3ae5f43221eC254E70D13239046A170f3" + "address": "0xE677b199471D996eE40fB021b410cfceE1AFD7f6", + "deployer": "0xAb18a0386Cc7f5cDFC3e3405e87A5E7501a9BC43" } }, "GenericLogic": { @@ -313,8 +313,8 @@ "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "tenderlyMain": { - "address": "0xBECF925e9EB6C026635A2D9216d964D4E12070f7", - "deployer": "0x859cFCC3ae5f43221eC254E70D13239046A170f3" + "address": "0xa2797Cf072475E32dF77485D67f970B8B2E8D110", + "deployer": "0xE2314093F585aA3CfeeCA0184f1CB2EF3bc204dF" } }, "ValidationLogic": { @@ -331,8 +331,8 @@ "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "tenderlyMain": { - "address": "0x997502540DcB6F2fa31B79cda650bf7810AA53ce", - "deployer": "0x802750DB4D80361475353FC88F72F5ed8a86c71F" + "address": "0x0a95D394ab8e5996fE3A2a78deA1608FF0F301CC", + "deployer": "0xE2314093F585aA3CfeeCA0184f1CB2EF3bc204dF" } }, "LendingPool": { @@ -348,8 +348,8 @@ "deployer": "0xc783df8a850f42e7F7e57013759C285caa701eB6" }, "tenderlyMain": { - "address": "0x433Ce38A0154061684db57853f232beDfEC44ac2", - "deployer": "0xb2E51BBCB2453701e5aB9bf95Ea9A4eb2D329090" + "address": "0x816d614fC7553BFC2EcF80ef87995Ec9Ab4B84FC", + "deployer": "0x1BCCABFDf302cbc1EEFEc8fe9725776a945E43bd" } }, "LendingPoolConfigurator": { @@ -621,7 +621,7 @@ "address": "0xAa7BC1924711B77A0F3Aaebdd550BfeDDDbaf3cd" }, "tenderlyMain": { - "address": "0x433Ce38A0154061684db57853f232beDfEC44ac2" + "address": "0x816d614fC7553BFC2EcF80ef87995Ec9Ab4B84FC" } }, "LendingPoolConfiguratorImpl": { diff --git a/helpers/contracts-helpers.ts b/helpers/contracts-helpers.ts index 22c5dcd2..53860ea0 100644 --- a/helpers/contracts-helpers.ts +++ b/helpers/contracts-helpers.ts @@ -89,6 +89,12 @@ export const withSaveAndVerify = async ( ): Promise => { await waitForTx(instance.deployTransaction); await registerContractInJsonDb(id, instance); + if (DRE.network.name.includes('tenderly')) { + await (DRE as any).tenderlyRPC.verify({ + name: id, + address: instance.address, + }); + } if (verify) { await verifyContract(instance.address, args); } diff --git a/package-lock.json b/package-lock.json index 01a30009..4f75fca7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1331,9 +1331,9 @@ } }, "@tenderly/hardhat-tenderly": { - "version": "1.1.0-beta.2", - "resolved": "https://registry.npmjs.org/@tenderly/hardhat-tenderly/-/hardhat-tenderly-1.1.0-beta.2.tgz", - "integrity": "sha512-aXdVLCRbUT7gc+460kXXBO+MIKEcKjBsqomCrBbFVnicY8yDnBqxijmbC9Y6dP9yUlcZE6mO27S0ycPdwjfS6Q==", + "version": "1.1.0-beta.3", + "resolved": "https://registry.npmjs.org/@tenderly/hardhat-tenderly/-/hardhat-tenderly-1.1.0-beta.3.tgz", + "integrity": "sha512-CCiS3bBCc4MhOTI5oHRAuVy/Xan6/8oNnjiwbsRvG1hdUis+EL/UVwn5yrUM1qXQTPz/La3TvRkfEa/pq1gimw==", "dev": true, "requires": { "axios": "^0.20.0", diff --git a/package.json b/package.json index 92f442bf..a8086c28 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@nomiclabs/hardhat-ethers": "^2.0.0", "@nomiclabs/hardhat-waffle": "^2.0.0", "@openzeppelin/contracts": "3.1.0", - "@tenderly/hardhat-tenderly": "^1.1.0-beta.2", + "@tenderly/hardhat-tenderly": "^1.1.0-beta.3", "@typechain/ethers-v4": "1.0.0", "@typechain/ethers-v5": "^1.0.0", "@typechain/truffle-v4": "2.0.2", diff --git a/tasks/full/3_oracles.ts b/tasks/full/3_oracles.ts index e492724c..f578d58d 100644 --- a/tasks/full/3_oracles.ts +++ b/tasks/full/3_oracles.ts @@ -54,12 +54,14 @@ task('full:deploy-oracles', 'Deploy oracles for dev enviroment') }; const [tokens, aggregators] = getPairsTokenAggregator(tokensToWatch, chainlinkAggregators); + console.log('wha'); const chainlinkProviderPriceProvider = proxyPriceProviderAddress ? await getChainlinkPriceProvider(proxyPriceProviderAddress) : await deployChainlinkProxyPriceProvider( [tokens, aggregators, fallbackOracle, await getWethAddress(poolConfig)], verify ); + console.log('ppp'); const lendingRateOracle = lendingRateOracleAddress ? await getLendingRateOracle(lendingRateOracleAddress) diff --git a/tasks/migrations/aave.mainnet.fork.ts b/tasks/migrations/aave.mainnet.fork.ts index 0ad5de5a..94ef557a 100644 --- a/tasks/migrations/aave.mainnet.fork.ts +++ b/tasks/migrations/aave.mainnet.fork.ts @@ -19,9 +19,13 @@ task('aave:full:fork', 'Deploy development enviroment') if (verify) { checkVerification(); } - console.log('- Setting up Tenderly provider'); - //Set the ethers provider to the one we initialized so it targets the correct backend + // Set the ethers provider to the one we initialized so it targets the correct backend + console.log('- Setting up Tenderly provider'); + await DRE.tenderlyRPC.initializeFork(); + const provider = new DRE.ethers.providers.Web3Provider(DRE.tenderlyRPC as any); + DRE.ethers.provider = provider; + console.log('Migration started\n'); console.log('1. Deploy address provider'); diff --git a/tasks/misc/set-bre.ts b/tasks/misc/set-bre.ts index 14a645ed..0b1508ff 100644 --- a/tasks/misc/set-bre.ts +++ b/tasks/misc/set-bre.ts @@ -6,12 +6,6 @@ import {setDRE} from '../../helpers/misc-utils'; task(`set-DRE`, `Inits the DRE, to have access to all the plugins' objects`).setAction( async (_, _DRE) => { setDRE(_DRE); - const network = _DRE.network.name; - if (network.includes('tenderly')) { - const provider = new _DRE.ethers.providers.Web3Provider(_DRE.tenderlyRPC as any); - //Set the ethers provider to the one we initialized so it targets the correct backend - _DRE.ethers.provider = provider; - } return _DRE; } );