Add additional Foundry test coverage

.github/workflows/node.js.yml

@@ -25,4 +25,6 @@ jobs:
       - name: Lint check
         run: 'npm run prettier:check'
       - name: Test
+        env:
+          NODE_OPTIONS: '--max_old_space_size=4096'
         run: 'npm run test'

.gitignore

@@ -13,4 +13,8 @@
 /temp-artifacts
 /src/contracts/hardhat-dependency-compiler
 
-.DS_Store
+.DS_Store
+forge-cache
+/report
+lcov.info
+combined-lcov.info

.gitmodules

@@ -0,0 +1,7 @@
+[submodule "lib/forge-std"]
+	path = lib/forge-std
+	url = https://github.com/foundry-rs/forge-std
+	branch = v1.3.0
+[submodule "lib/aave-stk-v1-5"]
+	path = lib/aave-stk-v1-5
+	url = https://github.com/bgd-labs/aave-stk-v1-5

.prettierignore

@@ -1,8 +1,10 @@
-
 artifacts
 cache
 node_modules
 types
 out
 deployments
-temp-artifacts
+temp-artifacts
+lib
+coverage
+forge-cache

combined-coverage.sh

@@ -0,0 +1,33 @@
+
+#!/bin/bash
+
+# @dev
+# This bash script creates coverage reports via Hardhat and Foundry
+# and then merges them, removing uninteresting files
+
+export NODE_OPTIONS="--max_old_space_size=8192"
+
+set -e
+
+npm run hardhat coverage
+forge coverage --report lcov
+
+sed -i -e 's/\/.*gho-core.//g' coverage/lcov.info
+
+lcov \
+    --rc lcov_branch_coverage=1 \
+    --add-tracefile coverage/lcov.info \
+    --add-tracefile lcov.info \
+    --output-file merged-lcov.info
+
+lcov \
+    --rc lcov_branch_coverage=1 \
+    --remove merged-lcov.info \
+    --output-file combined-lcov.info \
+    "*node_modules*" "*test*" "*mock*"
+
+rm merged-lcov.info
+
+lcov \
+    --rc lcov_branch_coverage=1 \
+    --list combined-lcov.info

deploy/07_deploy_stakedAave_upgrade.ts

@@ -1,6 +1,4 @@
-import { ZERO_ADDRESS } from './../src/helpers/constants';
 import { DeployFunction } from 'hardhat-deploy/types';
-import { StakedTokenV2Rev4__factory } from '../types';
 import { StakedTokenV2Rev3__factory, STAKE_AAVE_PROXY, waitForTx } from '@aave/deploy-v3';
 
 const func: DeployFunction = async function ({ getNamedAccounts, deployments, ...hre }) {
@@ -11,29 +9,20 @@ const func: DeployFunction = async function ({ getNamedAccounts, deployments, ..
   const stkAaveProxy = await deployments.get(STAKE_AAVE_PROXY);
   const instance = StakedTokenV2Rev3__factory.connect(stkAaveProxy.address, deployerSigner);
 
-  const stakedAaveImpl = await deploy('StakedTokenV2Rev4Impl', {
+  const stakedAaveImpl = await deploy('StakedAaveV3Impl', {
     from: deployer,
-    contract: 'StakedTokenV2Rev4',
+    contract: 'StakedAaveV3',
     args: [
       await instance.STAKED_TOKEN(),
       await instance.REWARD_TOKEN(),
-      await instance.COOLDOWN_SECONDS(),
       await instance.UNSTAKE_WINDOW(),
       await instance.REWARDS_VAULT(),
       await instance.EMISSION_MANAGER(),
       '3153600000', // 100 years from the time of deployment
-      await instance.name(),
-      await instance.symbol(),
-      await instance.decimals(),
-      await instance._aaveGovernance(),
     ],
     log: true,
   });
   console.log(`stakedAaveImpl Logic:         ${stakedAaveImpl.address}`);
-
-  // Initialize implementation
-  const impl = await StakedTokenV2Rev4__factory.connect(stakedAaveImpl.address, deployerSigner);
-  await waitForTx(await impl.initialize(ZERO_ADDRESS));
 };
 
 func.id = 'StkAaveUpgrade';

foundry.toml

@@ -0,0 +1,20 @@
+[profile.default]
+src = 'src/contracts'
+out = 'out'
+test = 'src/contracts/test'
+cache_path = 'forge-cache'
+libs = ["node_modules", "lib"]
+remappings = [
+    '@aave/=node_modules/@aave/',
+    '@aave/core-v3/=node_modules/@aave/core-v3',
+    '@aave/periphery-v3/=node_modules/@aave/periphery-v3',
+    '@openzeppelin/=node_modules/@openzeppelin/',
+    'aave-stk-v1-5/=lib/aave-stk-v1-5/',
+    'ds-test/=lib/forge-std/lib/ds-test/src/',
+    'eth-gas-reporter/=node_modules/eth-gas-reporter/',
+    'forge-std/=lib/forge-std/src/',
+    'hardhat-deploy/=node_modules/hardhat-deploy/',
+    'hardhat/=node_modules/hardhat/',
+]
+
+# See more config options https://github.com/foundry-rs/foundry/tree/master/config

hardhat-remappings.txt

@@ -0,0 +1,3 @@
+ds-test/=lib/forge-std/lib/ds-test/src/
+forge-std/=lib/forge-std/src/
+aave-stk-v1-5/=lib/aave-stk-v1-5/

hardhat.config.ts

@@ -1,4 +1,8 @@
-import { getCommonNetworkConfig, hardhatNetworkSettings } from './src/helpers/hardhat-config';
+import {
+  getCommonNetworkConfig,
+  getRemappings,
+  hardhatNetworkSettings,
+} from './src/helpers/hardhat-config';
 import { config } from 'dotenv';
 import { HardhatUserConfig } from 'hardhat/types';
 import { TASK_COMPILE_SOLIDITY_GET_SOURCE_PATHS } from 'hardhat/builtin-tasks/task-names';
@@ -9,6 +13,7 @@ import 'hardhat-deploy';
 import 'hardhat-contract-sizer';
 import 'hardhat-dependency-compiler';
 import 'hardhat-tracer';
+import 'hardhat-preprocessor';
 
 config();
 
@@ -165,6 +170,21 @@ const hardhatConfig: HardhatUserConfig = {
   tracer: {
     nameTags: {},
   },
+  preprocess: {
+    eachLine: (hre) => ({
+      transform: (line: string) => {
+        if (line.match(/^\s*import /i)) {
+          for (const [from, to] of getRemappings()) {
+            if (line.includes(from)) {
+              line = line.replace(from, to);
+              break;
+            }
+          }
+        }
+        return line;
+      },
+    }),
+  },
 };
 
 export default hardhatConfig;

package.json

@@ -25,11 +25,13 @@
     "prepare": "husky install",
     "compile": "rm -rf ./artifacts ./cache ./types && SKIP_LOAD=true hardhat compile",
     "test": ". ./setup-test-env.sh && hardhat test ./src/test/*.ts ./src/test/**/*.ts",
+    "forge-test": "forge test -vvv --no-match-test 'skip'",
     "test-goerli:fork": ". ./setup-test-env.sh && FORK=goerli npm run test --no-compile",
     "test-goerli:fork:skip-deploy": ". ./setup-test-env.sh && FORK=goerli SKIP_DEPLOY=true npm run test",
     "test:stkAave": ". ./setup-test-env.sh && hardhat test ./src/test/__setup.test.ts ./src/test/stkAave-upgrade.test.ts",
     "test-unit": ". ./setup-test-env.sh && hardhat test ./src/test/unitTests/*.ts",
     "coverage": ". ./setup-test-env.sh && hardhat coverage",
+    "combined-coverage": ". ./setup-test-env.sh && ./combined-coverage.sh",
     "deploy-testnet": ". ./setup-test-env.sh && hardhat deploy-and-setup",
     "deploy-testnet:goerli": "HARDHAT_NETWORK=goerli npm run deploy-testnet",
     "deploy-testnet:goerli:fork": "FORK=goerli npm run deploy-testnet",
@@ -57,6 +59,7 @@
     "hardhat-dependency-compiler": "^1.1.3",
     "hardhat-deploy": "^0.11.22",
     "hardhat-gas-reporter": "^1.0.9",
+    "hardhat-preprocessor": "^0.1.5",
     "hardhat-tracer": "^1.2.1",
     "husky": "^8.0.3",
     "jsondiffpatch": "^0.4.1",