Merge pull request #694 from aave/fix/deploy-v3-upgrade

Upgrade periphery and deploy library to latest version
aave · Jul 27, 2022 · 5097bc5 · 5097bc5
2 parents d1876f3 + f844a45
commit 5097bc5
Show file tree

Hide file tree

Showing 12 changed files with 3,558 additions and 5,965 deletions.
diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -12,7 +12,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [16.x]
 
     steps:
       - uses: actions/checkout@v2

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -30,43 +30,43 @@
     "prepublish": "npm run compile"
   },
   "devDependencies": {
-    "@aave/deploy-v3": "^1.21.1-beta.4",
-    "@aave/periphery-v3": "^1.13.1-beta.1",
+    "@aave/deploy-v3": "1.27.0",
+    "@aave/periphery-v3": "1.18.0",
     "@nomiclabs/hardhat-ethers": "npm:hardhat-deploy-ethers@^0.3.0-beta.13",
-    "@tenderly/hardhat-tenderly": "^1.1.0-beta.5",
-    "@typechain/ethers-v5": "^7.2.0",
-    "@typechain/hardhat": "^2.3.1",
-    "@types/chai": "^4.2.11",
+    "@tenderly/hardhat-tenderly": "1.1.0-beta.5",
+    "@typechain/ethers-v5": "7.2.0",
+    "@typechain/hardhat": "2.3.1",
+    "@types/chai": "4.2.11",
     "@types/lowdb": "1.0.9",
     "@types/mocha": "7.0.2",
     "@types/node": "14.0.5",
-    "chai": "^4.3.4",
+    "chai": "4.3.4",
     "chai-bignumber": "3.0.0",
-    "defender-relay-client": "^1.7.0",
-    "dotenv": "^8.2.0",
+    "defender-relay-client": "1.7.0",
+    "dotenv": "8.2.0",
     "eth-sig-util": "2.5.3",
-    "ethereum-waffle": "3.0.2",
+    "ethereum-waffle": "3.2.0",
     "ethereumjs-util": "7.0.2",
     "ethers": "^5.4.7",
-    "globby": "^11.0.1",
-    "hardhat": "^2.6.8",
-    "hardhat-contract-sizer": "^2.0.3",
-    "hardhat-dependency-compiler": "^1.1.2",
-    "hardhat-deploy": "^0.9.4",
-    "hardhat-gas-reporter": "^1.0.0",
-    "husky": "^4.2.5",
+    "globby": "11.0.1",
+    "hardhat": "2.6.8",
+    "hardhat-contract-sizer": "2.0.3",
+    "hardhat-dependency-compiler": "1.1.2",
+    "hardhat-deploy": "0.9.4",
+    "hardhat-gas-reporter": "1.0.0",
+    "husky": "4.2.5",
     "lowdb": "1.0.0",
-    "prettier": "^2.4.1",
-    "prettier-plugin-solidity": "^1.0.0-alpha.53",
-    "pretty-quick": "^3.1.1",
-    "solidity-coverage": "^0.7.17",
-    "ts-generator": "^0.1.1",
-    "ts-node": "^8.10.2",
-    "tslint": "^6.1.2",
-    "tslint-config-prettier": "^1.18.0",
-    "tslint-plugin-prettier": "^2.3.0",
-    "typechain": "^5.2.0",
-    "typescript": "^4.4.4"
+    "prettier": "2.4.1",
+    "prettier-plugin-solidity": "1.0.0-alpha.53",
+    "pretty-quick": "3.1.1",
+    "solidity-coverage": "0.7.17",
+    "ts-generator": "0.1.1",
+    "ts-node": "8.10.2",
+    "tslint": "6.1.2",
+    "tslint-config-prettier": "1.18.0",
+    "tslint-plugin-prettier": "2.3.0",
+    "typechain": "5.2.0",
+    "typescript": "4.4.4"
   },
   "husky": {
     "hooks": {

diff --git a/test-suites/atoken-transfer.spec.ts b/test-suites/atoken-transfer.spec.ts
@@ -42,7 +42,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
 
     const name = await aDai.name();
 
-    expect(name).to.be.equal('Aave Testnet interest bearing DAI');
+    expect(name).to.be.equal('Aave Testnet DAI');
 
     const fromBalance = await aDai.balanceOf(users[0].address);
     const toBalance = await aDai.balanceOf(users[0].address);
@@ -77,7 +77,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
 
     const name = await aDai.name();
 
-    expect(name).to.be.equal('Aave Testnet interest bearing DAI');
+    expect(name).to.be.equal('Aave Testnet DAI');
 
     const fromBalance = await aDai.balanceOf(users[0].address);
     const toBalance = await aDai.balanceOf(users[1].address);
@@ -174,7 +174,7 @@ makeSuite('AToken: Transfer', (testEnv: TestEnv) => {
 
     const name = await aDai.name();
 
-    expect(name).to.be.equal('Aave Testnet interest bearing DAI');
+    expect(name).to.be.equal('Aave Testnet DAI');
 
     const fromBalance = await aDai.balanceOf(users[0].address);
     const toBalance = await aDai.balanceOf(users[1].address);

diff --git a/test-suites/bridge-logic.spec.ts b/test-suites/bridge-logic.spec.ts
@@ -1,6 +1,6 @@
 const { expect } = require('chai');
 import { BigNumber, Event, utils } from 'ethers';
-import AaveConfig from '@aave/deploy-v3/dist/markets/aave';
+import AaveConfig from '@aave/deploy-v3/dist/markets/test';
 import { waitForTx, advanceTimeAndBlock } from '@aave/deploy-v3';
 import { getACLManager } from '@aave/deploy-v3/dist/helpers/contract-getters';
 import { ReserveData, UserReserveData } from './helpers/utils/interfaces';

diff --git a/test-suites/configurator.spec.ts b/test-suites/configurator.spec.ts
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { utils, BigNumber, BigNumberish } from 'ethers';
-import { strategyWETH } from '@aave/deploy-v3/dist/markets/aave/reservesConfigs';
+import { strategyWETH } from '@aave/deploy-v3/dist/markets/test/reservesConfigs';
 import { getFirstSigner } from '@aave/deploy-v3/dist/helpers/utilities/signer';
 import { MAX_UINT_AMOUNT, ONE_ADDRESS, RAY, ZERO_ADDRESS } from '../helpers/constants';
 import { ProtocolErrors } from '../helpers/types';

diff --git a/test-suites/helpers/make-suite.ts b/test-suites/helpers/make-suite.ts
@@ -130,10 +130,10 @@ export async function initializeMakeSuite() {
   testEnv.helpersContract = await getAaveProtocolDataProvider();
 
   const allTokens = await testEnv.helpersContract.getAllATokens();
-  const aDaiAddress = allTokens.find((aToken) => aToken.symbol === 'aDAI')?.tokenAddress;
-  const aUsdcAddress = allTokens.find((aToken) => aToken.symbol === 'aUSDC')?.tokenAddress;
-  const aWEthAddress = allTokens.find((aToken) => aToken.symbol === 'aWETH')?.tokenAddress;
-  const aAaveAddress = allTokens.find((aToken) => aToken.symbol === 'aAAVE')?.tokenAddress;
+  const aDaiAddress = allTokens.find((aToken) => aToken.symbol.includes('DAI'))?.tokenAddress;
+  const aUsdcAddress = allTokens.find((aToken) => aToken.symbol.includes('USDC'))?.tokenAddress;
+  const aWEthAddress = allTokens.find((aToken) => aToken.symbol.includes('WETH'))?.tokenAddress;
+  const aAaveAddress = allTokens.find((aToken) => aToken.symbol.includes('AAVE'))?.tokenAddress;
 
   const reservesTokens = await testEnv.helpersContract.getAllReservesTokens();
 

diff --git a/test-suites/isolation-mode.spec.ts b/test-suites/isolation-mode.spec.ts
@@ -15,7 +15,7 @@ import {
 } from '@aave/deploy-v3';
 import { getReserveData, getUserData } from './helpers/utils/helpers';
 import { getTxCostAndTimestamp } from './helpers/actions';
-import AaveConfig from '@aave/deploy-v3/dist/markets/aave';
+import AaveConfig from '@aave/deploy-v3/dist/markets/test';
 import { getACLManager } from '@aave/deploy-v3/dist/helpers/contract-getters';
 import {
   calcExpectedReserveDataAfterMintUnbacked,

diff --git a/test-suites/rate-strategy.spec.ts b/test-suites/rate-strategy.spec.ts
@@ -3,8 +3,8 @@ import { BigNumber, BigNumberish, utils } from 'ethers';
 import { deployDefaultReserveInterestRateStrategy } from '@aave/deploy-v3/dist/helpers/contract-deployments';
 import { PERCENTAGE_FACTOR } from '../helpers/constants';
 import { AToken, DefaultReserveInterestRateStrategy, MintableERC20 } from '../types';
-import { strategyDAI } from '@aave/deploy-v3/dist/markets/aave/reservesConfigs';
-import { rateStrategyStableTwo } from '@aave/deploy-v3/dist/markets/aave/rateStrategies';
+import { strategyDAI } from '@aave/deploy-v3/dist/markets/test/reservesConfigs';
+import { rateStrategyStableTwo } from '@aave/deploy-v3/dist/markets/test/rateStrategies';
 import { TestEnv, makeSuite } from './helpers/make-suite';
 import { ProtocolErrors, RateMode } from '../helpers/types';
 import { formatUnits } from '@ethersproject/units';

diff --git a/test-suites/scenario.spec.ts b/test-suites/scenario.spec.ts
@@ -1,5 +1,5 @@
 import fs from 'fs';
-import AaveConfig from '@aave/deploy-v3/dist/markets/aave';
+import AaveConfig from '@aave/deploy-v3/dist/markets/test';
 import { configuration as actionsConfiguration } from './helpers/actions';
 import { configuration as calculationsConfiguration } from './helpers/utils/calculations';
 import { makeSuite } from './helpers/make-suite';

diff --git a/test-suites/stable-debt-token.spec.ts b/test-suites/stable-debt-token.spec.ts
@@ -98,7 +98,7 @@ makeSuite('StableDebtToken', (testEnv: TestEnv) => {
 
     const name = await stableDebtContract.name();
 
-    expect(name).to.be.equal('Aave Testnet stable debt bearing DAI');
+    expect(name).to.be.equal('Aave Testnet Stable Debt DAI');
     await expect(stableDebtContract.burn(deployer.address, '1')).to.be.revertedWith(
       CALLER_MUST_BE_POOL
     );

diff --git a/test-suites/subgraph-scenarios.spec.ts b/test-suites/subgraph-scenarios.spec.ts
@@ -2,7 +2,7 @@ import { configuration as actionsConfiguration } from './helpers/actions';
 import { configuration as calculationsConfiguration } from './helpers/utils/calculations';
 import { makeSuite } from './helpers/make-suite';
 import { executeStory } from './helpers/scenario-engine';
-import AaveConfig from '@aave/deploy-v3/dist/markets/aave';
+import AaveConfig from '@aave/deploy-v3/dist/markets/test';
 
 makeSuite('Subgraph scenario tests', async (testEnv) => {
   let story: any;