Merge remote-tracking branch 'upstream/master'

lidofinance · Oct 14, 2024 · 45daed6 · 45daed6
2 parents d2ec847 + 7266cb9
commit 45daed6
Show file tree

Hide file tree

Showing 57 changed files with 2,898 additions and 1,550 deletions.
diff --git a/.env.example b/.env.example
@@ -25,9 +25,10 @@ LOCAL_WITHDRAWAL_VAULT_ADDRESS=
 
 # RPC URL for a separate, non Hardhat Network node (Anvil, Infura, Alchemy, etc.)
 MAINNET_RPC_URL=http://localhost:8545
+
 # RPC URL for Hardhat Network forking, required for running tests on mainnet fork with tracing (Infura, Alchemy, etc.)
 # https://hardhat.org/hardhat-network/docs/guides/forking-other-networks#forking-other-networks
-MAINNET_FORKING_URL=
+HARDHAT_FORKING_URL=
 
 # https://docs.lido.fi/deployed-contracts
 MAINNET_LOCATOR_ADDRESS=0xC1d0b3DE6792Bf6b4b37EccdcC24e45978Cfd2Eb
@@ -57,3 +58,6 @@ DEPLOYER=0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266
 GENESIS_TIME=1639659600
 GAS_PRIORITY_FEE=1
 GAS_MAX_FEE=100
+
+# Etherscan API key for verifying contracts
+ETHERSCAN_API_KEY=
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -1,12 +1,20 @@
 name: Coverage
 
-on: [pull_request]
+on:
+  pull_request:
+  push:
+    branches: [ master ]
 
 jobs:
   coverage:
     name: Hardhat
     runs-on: ubuntu-latest
 
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+
     steps:
       - uses: actions/checkout@v4
 

diff --git a/.github/workflows/release-abis.yml b/.github/workflows/release-abis.yml
@@ -18,11 +18,8 @@ jobs:
       - name: Common setup
         uses: ./.github/workflows/setup
 
-      - name: Compile contracts
-        run: yarn compile
-
       - name: Extract ABIs
-        run: yarn extract-abis
+        run: yarn abis:extract
 
       - name: Create ABIs archive
         run: zip -j ABIs.zip lib/abi/*.json

diff --git a/.github/workflows/tests-integration-mainnet.yml b/.github/workflows/tests-integration-mainnet.yml
@@ -10,7 +10,7 @@ jobs:
 
     services:
       hardhat-node:
-        image: feofanov/hardhat-node:2.22.9
+        image: ghcr.io/lidofinance/hardhat-node:2.22.12
         ports:
           - 8545:8545
         env:

diff --git a/.github/workflows/tests-integration-scratch.yml b/.github/workflows/tests-integration-scratch.yml
@@ -1,6 +1,6 @@
 name: Integration Tests
 
-on: [push]
+on: [ push ]
 
 jobs:
   test_hardhat_integration_scratch:
@@ -10,7 +10,7 @@ jobs:
 
     services:
       hardhat-node:
-        image: feofanov/hardhat-node:2.22.9-scratch
+        image: ghcr.io/lidofinance/hardhat-node:2.22.12-scratch
         ports:
           - 8555:8545
 
@@ -36,7 +36,7 @@ jobs:
           NETWORK_STATE_DEFAULTS_FILE: "scripts/scratch/deployed-testnet-defaults.json"
 
       - name: Finalize scratch deployment
-        run: yarn hardhat --network local run --no-compile scripts/scratch/send-hardhat-mine.ts
+        run: yarn hardhat --network local run --no-compile scripts/utils/mine.ts
 
       - name: Run integration tests
         run: yarn test:integration:fork:local

diff --git a/.solcover.js b/.solcover.js
@@ -4,14 +4,10 @@ module.exports = {
   //       https://github.com/sc-forks/solidity-coverage/issues/632#issuecomment-1736629543
   skipFiles: [
     "common/interfaces",
-    "common/test_helpers",
     "0.4.24/template",
-    "0.4.24/test_helpers",
     "0.6.11/deposit_contract.sol",
     "0.6.12/interfaces",
-    "0.6.12/mocks",
     "0.8.9/interfaces",
-    "0.8.9/test_helpers",
     // Skip contracts that are tested by Foundry tests
     "common/lib", // 100% covered by test/common/*.t.sol
     "0.8.9/lib/UnstructuredStorage.sol", // 100% covered by test/0.8.9/unstructuredStorage.t.sol