Skip to content

Commit

Permalink
Merge pull request #916 from lidofinance/feat/develop-sync
Browse files Browse the repository at this point in the history
feat: sync develop with master
  • Loading branch information
tamtamchik authored Jan 13, 2025
2 parents aa5c7c7 + 9cf4bb9 commit 49c9751
Show file tree
Hide file tree
Showing 6 changed files with 290 additions and 206 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/tests-integration-mainnet.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

services:
hardhat-node:
image: ghcr.io/lidofinance/hardhat-node:2.22.12
image: ghcr.io/lidofinance/hardhat-node:2.22.17
ports:
- 8545:8545
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests-integration-scratch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:

services:
hardhat-node:
image: ghcr.io/lidofinance/hardhat-node:2.22.12-scratch
image: ghcr.io/lidofinance/hardhat-node:2.22.17-scratch
ports:
- 8555:8545

Expand Down
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ This is the core repository of the Lido on Ethereum protocol. The entire codebas
---

<div>
<img alt="Lido" src="https://img.shields.io/badge/v2-version?label=lido&labelColor=rgb(91%2C%20162%2C%20252)&color=white"/>
<img alt="Lido" src="https://img.shields.io/badge/v2.1-version?label=lido&labelColor=rgb(91%2C%20162%2C%20252)&color=white"/>
<img alt="GitHub license" src="https://img.shields.io/github/license/lidofinance/lido-dao?labelColor=orange&color=white"/>
<img alt="Solidity" src="https://img.shields.io/badge/multiver-s?style=flat&label=solidity&labelColor=rgb(86%2C%2085%2C%20212)&color=white"/>
<img alt="Aragon OS" src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Flidofinance%2Fcore%2Fmaster%2Fpackage.json&query=%24.dependencies%5B'%40aragon%2Fos'%5D&style=flat&label=aragon%2Fos&labelColor=rgb(70%2C%20100%2C%20246)&color=white"/>
Expand All @@ -14,7 +14,9 @@ This is the core repository of the Lido on Ethereum protocol. The entire codebas
<img alt="Hardhat" src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Flidofinance%2Fcore%2Fmaster%2Fpackage.json&query=%24.devDependencies.hardhat&style=flat&label=hardhat&labelColor=rgb(251%2C%20240%2C%2056)&color=white" />
<img alt="Ethers" src="https://img.shields.io/badge/dynamic/json?url=https%3A%2F%2Fraw.githubusercontent.com%2Flidofinance%2Fcore%2Fmaster%2Fpackage.json&query=%24.devDependencies.ethers&style=flat&label=ethers&labelColor=rgb(51%2C%2077%2C%20121)&color=white" />
<br/>
<img alt="GitHub tests" src="https://img.shields.io/github/actions/workflow/status/lidofinance/core/tests.yml?label=tests">
<img alt="GitHub unit tests" src="https://img.shields.io/github/actions/workflow/status/lidofinance/core/tests-unit.yml?label=tests:unit">
<img alt="GitHub integration tests (scratch)" src="https://img.shields.io/github/actions/workflow/status/lidofinance/core/tests-integration-scratch.yml?label=tests:integration:scratch">
<img alt="GitHub integration tests (mainnet-fork)" src="https://img.shields.io/github/actions/workflow/status/lidofinance/core/tests-integration-mainnet.yml?label=tests:integration:mainnet-fork">
<img alt="GitHub linters" src="https://img.shields.io/github/actions/workflow/status/lidofinance/core/linters.yml?label=linters">
<img alt="GitHub code analysis" src="https://img.shields.io/github/actions/workflow/status/lidofinance/core/analyse.yml?label=code analysis">
</div>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"ethers": "^6.13.4",
"glob": "^11.0.0",
"globals": "^15.9.0",
"hardhat": "^2.22.16",
"hardhat": "^2.22.17",
"hardhat-contract-sizer": "^2.10.0",
"hardhat-gas-reporter": "^1.0.10",
"hardhat-ignore-warnings": "^0.2.12",
Expand Down
Loading

0 comments on commit 49c9751

Please sign in to comment.