Skip to content

Commit 879d16d

Browse files
committed
Merge branch 'master' into fix/dependabot-issues
# Conflicts: # yarn.lock
2 parents 3622f31 + 38c5fea commit 879d16d

File tree

5 files changed

+176
-237
lines changed

5 files changed

+176
-237
lines changed

.github/workflows/release.yml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ jobs:
99

1010
steps:
1111
- uses: actions/checkout@v4
12+
- uses: actions/setup-node@v4
13+
with:
14+
node-version: 20
15+
cache: 'yarn'
16+
- run: yarn
17+
- run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
18+
19+
- name: Fetch tags from git history
20+
run: git fetch --unshallow --tags
1221

1322
- name: Extract version from package.json
1423
id: package_version
@@ -20,16 +29,21 @@ jobs:
2029
VERSION=${{ env.VERSION }}
2130
echo "Searching for version: $VERSION in CHANGELOG.md"
2231
23-
CHANGELOG_OUTPUT=$(npx auto-changelog --stdout)
32+
CHANGELOG_OUTPUT=$(yarn changelog --stdout)
2433
NOTES=$(echo "$CHANGELOG_OUTPUT" | awk "/\/${VERSION//./\\.} \(/ {print; flag=1; next} /^solidity-utils\// {flag=0} flag")
2534
35+
echo "$NOTES"
36+
2637
if [ -z "$NOTES" ]; then
27-
echo "❌ No changelog entry found for version $VERSION"
28-
echo "Use: yarn changelog"
38+
echo "❌ No changelog entry found for version $VERSION. Check the version tag is exist."
2939
exit 1
3040
fi
3141
32-
echo "::set-output name=notes::$NOTES"
42+
{
43+
echo "notes<<EOF"
44+
printf "%s\n" "$NOTES"
45+
echo "EOF"
46+
} >> "$GITHUB_OUTPUT"
3347
shell: bash
3448

3549

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
Change Log
22
==========
33

4+
solidity-utils/6.4.0 (2025-02-03)
5+
---------------------------------
6+
7+
- [SC-1427] Add Change Log and CI for release ([#175](https://github.com/1inch/solidity-utils/pull/175); [e34a821](https://github.com/1inch/solidity-utils/commit/e34a821cb45eb47e6db53305381100850a1525ea)).
8+
- [SC-1426] Permit2 for zksync ([#174](https://github.com/1inch/solidity-utils/pull/174); [8ce00fb](https://github.com/1inch/solidity-utils/commit/8ce00fbab103e27f50e66b0974bf0dd66439f290)).
9+
- [SC-1426] Add `permit2address` method and patch `permit2Contract` method with `chainId` ([#178](https://github.com/1inch/solidity-utils/pull/178); [877c01f](https://github.com/1inch/solidity-utils/commit/877c01f6de0186877bcbc1f1f4e75e12d9e1b431)).
10+
- [SC-1435] Fix Create3 deployment saving on contract source code verification failure ([#179](https://github.com/1inch/solidity-utils/pull/179); [28eaa1a](https://github.com/1inch/solidity-utils/commit/28eaa1a78413c03d96f3333a96f8b34d710a9c0b)).
11+
- [SC-1428] Fix dependabot issues ([#177](https://github.com/1inch/solidity-utils/pull/177); [b799f40](https://github.com/1inch/solidity-utils/commit/b799f406b83d32f3cd48977cb5996cfd79846bb1)).
12+
- [SC-1387] Remove gas usage limitation by using all available gas ([#176](https://github.com/1inch/solidity-utils/pull/176); [5bdc603](https://github.com/1inch/solidity-utils/commit/5bdc603395bae1b6923ce72f865b728cb6b6ad43)).
13+
414
solidity-utils/6.3.2 (2025-01-22)
515
---------------------------------
616

hardhat-setup/networks.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,6 @@ export class Networks {
8181
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
8282
// @ts-ignore
8383
saveDeployments: saveHardhatDeployments,
84-
chains: {
85-
43114: { // TODO: remove after hardhat fix issue since 2.22.3, https://github.com/NomicFoundation/hardhat/pull/6170
86-
hardforkHistory: {
87-
shanghai: 11404279,
88-
cancun: 41263126,
89-
},
90-
},
91-
},
9284
};
9385
if (forkingAccounts) {
9486
this.networks.hardhat!.accounts = forkingAccounts;

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"dotenv": "16.4.5",
5050
"ethereumjs-util": "7.1.5",
5151
"ethers": "6.13.4",
52-
"hardhat": "2.22.15",
52+
"hardhat": "2.23.0",
5353
"hardhat-deploy": "0.14.0",
5454
"mocha-chai-jest-snapshot": "1.1.6",
5555
"node-fetch": "2.7.0"

0 commit comments

Comments
 (0)